RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make DCA decoder honor avctx->request_channels in a more advisory way. 

Originally committed as revision 11221 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Andreas Öman 2007-12-15 07:01:33 +00:00
parent 6708eefe55
commit 79328e9cc7
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/dca.c
View File

@ -1159,23 +1159,12 @@ static int dca_decode_frame(AVCodecContext * avctx,
avctx->bit_rate = s->bit_rate;
channels = s->prim_channels + !!s->lfe;
avctx->channels = avctx->request_channels;
if(avctx->channels == 0) {
avctx->channels = channels;
} else if(channels < avctx->channels) {
av_log(avctx, AV_LOG_WARNING, "DTS source channels are less than "
"specified: output to %d channels.\n", channels);
avctx->channels = channels;
}
if(avctx->channels == 2) {
if(avctx->request_channels == 2 && s->prim_channels > 2) {
channels = 2;
s->output = DCA_STEREO;
} else if(avctx->channels != channels) {
av_log(avctx, AV_LOG_ERROR, "Cannot downmix DTS to %d channels.\n",
avctx->channels);
return -1;
}
channels = avctx->channels;
avctx->channels = channels;
if(*data_size < (s->sample_blocks / 8) * 256 * sizeof(int16_t) * channels)
return -1;
*data_size = 0;