Commit ade75fb8 authored by Tim Walker's avatar Tim Walker

(e)ac3: clip surround mix level indexes.

Values 0-2 are reserved, 3 (-1.5dB) should be used instead.
parent c229f571
...@@ -237,9 +237,9 @@ static int ac3_parse_header(AC3DecodeContext *s) ...@@ -237,9 +237,9 @@ static int ac3_parse_header(AC3DecodeContext *s)
if (get_bits1(gbc)) { if (get_bits1(gbc)) {
s->preferred_downmix = get_bits(gbc, 2); s->preferred_downmix = get_bits(gbc, 2);
s->center_mix_level_ltrt = get_bits(gbc, 3); s->center_mix_level_ltrt = get_bits(gbc, 3);
s->surround_mix_level_ltrt = get_bits(gbc, 3); s->surround_mix_level_ltrt = av_clip(get_bits(gbc, 3), 3, 7);
s->center_mix_level = get_bits(gbc, 3); s->center_mix_level = get_bits(gbc, 3);
s->surround_mix_level = get_bits(gbc, 3); s->surround_mix_level = av_clip(get_bits(gbc, 3), 3, 7);
} }
if (get_bits1(gbc)) { if (get_bits1(gbc)) {
s->dolby_surround_ex_mode = get_bits(gbc, 2); s->dolby_surround_ex_mode = get_bits(gbc, 2);
......
...@@ -353,8 +353,8 @@ int ff_eac3_parse_header(AC3DecodeContext *s) ...@@ -353,8 +353,8 @@ int ff_eac3_parse_header(AC3DecodeContext *s)
} }
if (s->channel_mode & 4) { if (s->channel_mode & 4) {
/* if a surround channel exists */ /* if a surround channel exists */
s->surround_mix_level_ltrt = get_bits(gbc, 3); s->surround_mix_level_ltrt = av_clip(get_bits(gbc, 3), 3, 7);
s->surround_mix_level = get_bits(gbc, 3); s->surround_mix_level = av_clip(get_bits(gbc, 3), 3, 7);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment