Skip to content

Commit cd27f5a

Browse files
HO-COOHHO-COOH
authored
Fix deprecated/removed audio channel apis
1 parent 68b5a5f commit cd27f5a

9 files changed

Lines changed: 9 additions & 10 deletions

File tree

‎0_hello_world.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ int main(int argc, const char *argv[])
120120

121121
logging("Video Codec: resolution %d x %d", pLocalCodecParameters->width, pLocalCodecParameters->height);
122122
} else if (pLocalCodecParameters->codec_type == AVMEDIA_TYPE_AUDIO) {
123-
logging("Audio Codec: %d channels, sample rate %d", pLocalCodecParameters->channels, pLocalCodecParameters->sample_rate);
123+
logging("Audio Codec: %d channels, sample rate %d", pLocalCodecParameters->ch_layout.nb_channels, pLocalCodecParameters->sample_rate);
124124
}
125125

126126
// print its name, id and bitrate

‎3_transcoding.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ int prepare_audio_encoder(StreamingContext *sc, int sample_rate, StreamingParams
122122

123123
int OUTPUT_CHANNELS = 2;
124124
int OUTPUT_BIT_RATE = 196000;
125-
sc->audio_avcc->channels = OUTPUT_CHANNELS;
126-
sc->audio_avcc->channel_layout = av_get_default_channel_layout(OUTPUT_CHANNELS);
125+
av_channel_layout_default(&sc->audio_avcc->ch_layout, OUTPUT_CHANNELS);
127126
sc->audio_avcc->sample_rate = sample_rate;
128127
sc->audio_avcc->sample_fmt = sc->audio_avc->sample_fmts[0];
129128
sc->audio_avcc->bit_rate = OUTPUT_BIT_RATE;

‎README-cn.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ AVCodec *pLocalCodec = avcodec_find_decoder(pLocalCodecParameters->codec_id);
353353
if (pLocalCodecParameters->codec_type == AVMEDIA_TYPE_VIDEO) {
354354
printf("Video Codec: resolution %d x %d", pLocalCodecParameters->width, pLocalCodecParameters->height);
355355
} else if (pLocalCodecParameters->codec_type == AVMEDIA_TYPE_AUDIO) {
356-
printf("Audio Codec: %d channels, sample rate %d", pLocalCodecParameters->channels, pLocalCodecParameters->sample_rate);
356+
printf("Audio Codec: %d channels, sample rate %d", pLocalCodecParameters->ch_layout.nb_channels, pLocalCodecParameters->sample_rate);
357357
}
358358
// 通用
359359
printf("\tCodec %s ID %d bit_rate %lld", pLocalCodec->long_name, pLocalCodec->id, pCodecParameters->bit_rate);

‎README-es.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ Ahora, vamos a imprimir la información acerca de los códecs.
374374
if (pLocalCodecParameters->codec_type == AVMEDIA_TYPE_VIDEO) {
375375
printf("Video Codec: resolution %d x %d", pLocalCodecParameters->width, pLocalCodecParameters->height);
376376
} else if (pLocalCodecParameters->codec_type == AVMEDIA_TYPE_AUDIO) {
377-
printf("Audio Codec: %d channels, sample rate %d", pLocalCodecParameters->channels, pLocalCodecParameters->sample_rate);
377+
printf("Audio Codec: %d channels, sample rate %d", pLocalCodecParameters->ch_layout.nb_channels, pLocalCodecParameters->sample_rate);
378378
}
379379
// general
380380
printf("\tCodec %s ID %d bit_rate %lld", pLocalCodec->long_name, pLocalCodec->id, pLocalCodecParameters->bit_rate);

‎README-ko.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ AVCodec *pLocalCodec = avcodec_find_decoder(pLocalCodecParameters->codec_id);
354354
if (pLocalCodecParameters->codec_type == AVMEDIA_TYPE_VIDEO) {
355355
printf("Video Codec: resolution %d x %d", pLocalCodecParameters->width, pLocalCodecParameters->height);
356356
} else if (pLocalCodecParameters->codec_type == AVMEDIA_TYPE_AUDIO) {
357-
printf("Audio Codec: %d channels, sample rate %d", pLocalCodecParameters->channels, pLocalCodecParameters->sample_rate);
357+
printf("Audio Codec: %d channels, sample rate %d", pLocalCodecParameters->ch_layout.nb_channels, pLocalCodecParameters->sample_rate);
358358
}
359359
// general
360360
printf("\tCodec %s ID %d bit_rate %lld", pLocalCodec->long_name, pLocalCodec->id, pLocalCodecParameters->bit_rate);

‎README-pt.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ Agora podemos imprimir informações sobre os codecs.
358358
if (pLocalCodecParameters->codec_type == AVMEDIA_TYPE_VIDEO) {
359359
printf("Video Codec: resolution %d x %d", pLocalCodecParameters->width, pLocalCodecParameters->height);
360360
} else if (pLocalCodecParameters->codec_type == AVMEDIA_TYPE_AUDIO) {
361-
printf("Audio Codec: %d channels, sample rate %d", pLocalCodecParameters->channels, pLocalCodecParameters->sample_rate);
361+
printf("Audio Codec: %d channels, sample rate %d", pLocalCodecParameters->ch_layout.nb_channels, pLocalCodecParameters->sample_rate);
362362
}
363363
// geral
364364
printf("\tCodec %s ID %d bit_rate %lld", pLocalCodec->long_name, pLocalCodec->id, pLocalCodecParameters->bit_rate);

‎README-ru.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ AVCodec *pLocalCodec = avcodec_find_decoder(pLocalCodecParameters->codec_id);
381381
if (pLocalCodecParameters->codec_type == AVMEDIA_TYPE_VIDEO) {
382382
printf("Video Codec: resolution %d x %d", pLocalCodecParameters->width, pLocalCodecParameters->height);
383383
} else if (pLocalCodecParameters->codec_type == AVMEDIA_TYPE_AUDIO) {
384-
printf("Audio Codec: %d channels, sample rate %d", pLocalCodecParameters->channels, pLocalCodecParameters->sample_rate);
384+
printf("Audio Codec: %d channels, sample rate %d", pLocalCodecParameters->ch_layout.nb_channels, pLocalCodecParameters->sample_rate);
385385
}
386386
// общее
387387
printf("\tCodec %s ID %d bit_rate %lld", pLocalCodec->long_name, pLocalCodec->id, pLocalCodecParameters->bit_rate);

‎README-vn.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ AVCodec *pLocalCodec = avcodec_find_decoder(pLocalCodecParameters->codec_id);
358358
if (pLocalCodecParameters->codec_type == AVMEDIA_TYPE_VIDEO) {
359359
printf("Video Codec: resolution %d x %d", pLocalCodecParameters->width, pLocalCodecParameters->height);
360360
} else if (pLocalCodecParameters->codec_type == AVMEDIA_TYPE_AUDIO) {
361-
printf("Audio Codec: %d channels, sample rate %d", pLocalCodecParameters->channels, pLocalCodecParameters->sample_rate);
361+
printf("Audio Codec: %d channels, sample rate %d", pLocalCodecParameters->ch_layout.nb_channels, pLocalCodecParameters->sample_rate);
362362
}
363363
// general
364364
printf("\tCodec %s ID %d bit_rate %lld", pLocalCodec->long_name, pLocalCodec->id, pLocalCodecParameters->bit_rate);

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ Now we can print information about the codecs.
367367
if (pLocalCodecParameters->codec_type == AVMEDIA_TYPE_VIDEO) {
368368
printf("Video Codec: resolution %d x %d", pLocalCodecParameters->width, pLocalCodecParameters->height);
369369
} else if (pLocalCodecParameters->codec_type == AVMEDIA_TYPE_AUDIO) {
370-
printf("Audio Codec: %d channels, sample rate %d", pLocalCodecParameters->channels, pLocalCodecParameters->sample_rate);
370+
printf("Audio Codec: %d channels, sample rate %d", pLocalCodecParameters->ch_layout.nb_channels, pLocalCodecParameters->sample_rate);
371371
}
372372
// general
373373
printf("\tCodec %s ID %d bit_rate %lld", pLocalCodec->long_name, pLocalCodec->id, pLocalCodecParameters->bit_rate);

0 commit comments

Comments
 (0)