eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-16 12:00:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

aacdec_usac: error out on receiving too many channels for the current layout

Browse Source 
Verify that we have a correct number of channels.
This commit is contained in:
Lynne
2024-06-02 23:51:28 +02:00
parent 39826eacff
commit 0d93e04bc6
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/aac/aacdec_usac.c
View File

@@ -311,7 +311,7 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx,
int ret, idx; int ret, idx;
uint8_t freq_idx; uint8_t freq_idx;
uint8_t channel_config_idx; uint8_t channel_config_idx;
int nb_elements; int nb_channels = 0;
int samplerate; int samplerate;
int sbr_ratio; int sbr_ratio;
MPEG4AudioConfig *m4ac = &oc->m4ac; MPEG4AudioConfig *m4ac = &oc->m4ac;
@@ -358,7 +358,7 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx,
channel_config_idx = get_bits(gb, 5); /* channelConfigurationIndex */ channel_config_idx = get_bits(gb, 5); /* channelConfigurationIndex */
if (!channel_config_idx) { if (!channel_config_idx) {
/* UsacChannelConfig() */ /* UsacChannelConfig() */
uint8_t nb_channels = get_escaped_value(gb, 5, 8, 16); /* numOutChannels */ nb_channels = get_escaped_value(gb, 5, 8, 16); /* numOutChannels */
if (nb_channels >= 64) if (nb_channels >= 64)
return AVERROR(EINVAL); return AVERROR(EINVAL);
@@ -385,9 +385,14 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx,
if (ret < 0) if (ret < 0)
return ret; return ret;
} else { } else {
int nb_elements;
if ((ret = ff_aac_set_default_channel_config(ac, avctx, layout_map, if ((ret = ff_aac_set_default_channel_config(ac, avctx, layout_map,
&nb_elements, channel_config_idx))) &nb_elements, channel_config_idx)))
return ret; return ret;
/* Fill in the number of expected channels */
for (int i = 0; i < nb_elements; i++)
nb_channels += layout_map[i][0] == TYPE_CPE ? 2 : 1;
} }
/* UsacDecoderConfig */ /* UsacDecoderConfig */
@@ -404,6 +409,13 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx,
memset(e, 0, sizeof(*e)); memset(e, 0, sizeof(*e));
e->type = get_bits(gb, 2); /* usacElementType */ e->type = get_bits(gb, 2); /* usacElementType */
if (e->type != ID_USAC_EXT &&
(elem_id[0] + elem_id[1] + elem_id[2] + 1) > nb_channels) {
av_log(ac->avctx, AV_LOG_ERROR, "Too many channels for the channel "
"configuration\n");
return AVERROR(EINVAL);
}
av_log(ac->avctx, AV_LOG_DEBUG, "Element present: idx %i, type %i\n", av_log(ac->avctx, AV_LOG_DEBUG, "Element present: idx %i, type %i\n",
i, e->type); i, e->type);