generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add check for changing number of channels in DCA.

Browse Source 
Fixes issue 2505.
This commit is contained in:
Daniel Kang 2011-01-18 11:30:33 -05:00 committed by Justin Ruggles
parent 59e2118e97
commit 1360f07e22
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/dca.c
View File

@ -273,6 +273,7 @@ typedef struct {
/* Primary audio coding header */ /* Primary audio coding header */
int subframes; ///< number of subframes int subframes; ///< number of subframes
int is_channels_set; ///< check for if the channel number is already set
int total_channels; ///< number of channels including extensions int total_channels; ///< number of channels including extensions
int prim_channels; ///< number of primary audio channels int prim_channels; ///< number of primary audio channels
int subband_activity[DCA_PRIM_CHANNELS_MAX]; ///< subband activity count int subband_activity[DCA_PRIM_CHANNELS_MAX]; ///< subband activity count
@ -1774,7 +1775,15 @@ static int dca_decode_frame(AVCodecContext * avctx,
unset. Ideally during the first probe for channels the crc should be checked unset. Ideally during the first probe for channels the crc should be checked
and only set avctx->channels when the crc is ok. Right now the decoder could and only set avctx->channels when the crc is ok. Right now the decoder could
set the channels based on a broken first frame.*/ set the channels based on a broken first frame.*/
if (s->is_channels_set == 0) {
s->is_channels_set = 1;
avctx->channels = channels; avctx->channels = channels;
}
if (avctx->channels != channels) {
av_log(avctx, AV_LOG_ERROR, "DCA decoder does not support number of "
"channels changing in stream. Skipping frame.\n");
return -1;
}
if (*data_size < (s->sample_blocks / 8) * 256 * sizeof(int16_t) * channels) if (*data_size < (s->sample_blocks / 8) * 256 * sizeof(int16_t) * channels)
return -1; return -1;