diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-06-27 14:43:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-09-22 00:12:27 +0200 |
| commit | fe315feab59f2f99765547096357826bc9454d24 (patch) | |
| tree | 68858786dc19b3219b050f4ee0c27d0acfa0ffba /libavcodec/ac3dec.c | |
| parent | a068594248b784c97d4423812379ca03c6ce5c54 (diff) | |
| download | ffmpeg-fe315feab59f2f99765547096357826bc9454d24.tar.gz | |
avcodec/eac3dec: Check that channel_map does not contain more than EAC3_MAX_CHANNELS
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/ac3dec.c')
| -rw-r--r-- | libavcodec/ac3dec.c | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index ea7e052f8b..eed8ce5b39 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -106,25 +106,6 @@ static const uint8_t ac3_default_coeffs[8][5][2] = { { { 2, 7 }, { 5, 5 }, { 7, 2 }, { 6, 7 }, { 7, 6 }, }, }; -static const uint64_t custom_channel_map_locations[16][2] = { - { 1, AV_CH_FRONT_LEFT }, - { 1, AV_CH_FRONT_CENTER }, - { 1, AV_CH_FRONT_RIGHT }, - { 1, AV_CH_SIDE_LEFT }, - { 1, AV_CH_SIDE_RIGHT }, - { 0, AV_CH_FRONT_LEFT_OF_CENTER | AV_CH_FRONT_RIGHT_OF_CENTER }, - { 0, AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT }, - { 0, AV_CH_BACK_CENTER }, - { 0, AV_CH_TOP_CENTER }, - { 0, AV_CH_SURROUND_DIRECT_LEFT | AV_CH_SURROUND_DIRECT_RIGHT }, - { 0, AV_CH_WIDE_LEFT | AV_CH_WIDE_RIGHT }, - { 0, AV_CH_TOP_FRONT_LEFT | AV_CH_TOP_FRONT_RIGHT}, - { 0, AV_CH_TOP_FRONT_CENTER }, - { 0, AV_CH_TOP_BACK_LEFT | AV_CH_TOP_BACK_RIGHT }, - { 0, AV_CH_LOW_FREQUENCY_2 }, - { 1, AV_CH_LOW_FREQUENCY }, -}; - /** * Symmetrical Dequantization * reference: Section 7.3.3 Expansion of Mantissas for Symmetrical Quantization @@ -1700,7 +1681,7 @@ dependent_frame: channel_layout = ich_layout; for (ch = 0; ch < 16; ch++) { if (s->channel_map & (1 << (EAC3_MAX_CHANNELS - ch - 1))) { - channel_layout |= custom_channel_map_locations[ch][1]; + channel_layout |= ff_eac3_custom_channel_map_locations[ch][1]; } } if (av_get_channel_layout_nb_channels(channel_layout) > EAC3_MAX_CHANNELS) { @@ -1714,9 +1695,9 @@ dependent_frame: for (ch = 0; ch < EAC3_MAX_CHANNELS; ch++) { if (s->channel_map & (1 << (EAC3_MAX_CHANNELS - ch - 1))) { - if (custom_channel_map_locations[ch][0]) { + if (ff_eac3_custom_channel_map_locations[ch][0]) { int index = av_get_channel_layout_channel_index(channel_layout, - custom_channel_map_locations[ch][1]); + ff_eac3_custom_channel_map_locations[ch][1]); if (index < 0) return AVERROR_INVALIDDATA; if (extend >= channel_map_size) @@ -1727,7 +1708,7 @@ dependent_frame: int i; for (i = 0; i < 64; i++) { - if ((1LL << i) & custom_channel_map_locations[ch][1]) { + if ((1LL << i) & ff_eac3_custom_channel_map_locations[ch][1]) { int index = av_get_channel_layout_channel_index(channel_layout, 1LL << i); if (index < 0) |