virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Make AC3 decoder honor avctx->request_channels

Browse Source 
Originally committed as revision 11220 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Andreas Öman 2007-12-15 07:00:19 +00:00
parent 626464fb53
commit 6708eefe55
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/ac3dec.c
View File

@ -1128,23 +1128,12 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size,
/* channel config */
ctx->out_channels = ctx->channels;
if (avctx->channels == 0) {
avctx->channels = ctx->out_channels;
} else if(ctx->out_channels < avctx->channels) {
av_log(avctx, AV_LOG_ERROR, "Cannot upmix AC3 from %d to %d channels.\n",
ctx->out_channels, avctx->channels);
return -1;
if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
avctx->request_channels < ctx->channels) {
ctx->out_channels = avctx->request_channels;
ctx->output_mode = avctx->request_channels == 1 ? AC3_CHMODE_MONO : AC3_CHMODE_STEREO;
}
if(avctx->channels == 2) {
ctx->output_mode = AC3_CHMODE_STEREO;
} else if(avctx->channels == 1) {
ctx->output_mode = AC3_CHMODE_MONO;
} else if(avctx->channels != ctx->out_channels) {
av_log(avctx, AV_LOG_ERROR, "Cannot downmix AC3 from %d to %d channels.\n",
ctx->out_channels, avctx->channels);
return -1;
}
ctx->out_channels = avctx->channels;
avctx->channels = ctx->out_channels;
/* parse the audio blocks */
for (blk = 0; blk < NB_BLOCKS; blk++) {