diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 21:36:49 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 21:37:06 +0100 |
commit | 3a5a039adee3ee928898df82e20c40212d618195 (patch) | |
tree | 31eded7f2053f1843389c5b3f5bc4b3e36b8491b /libavcodec/eac3dec.c | |
parent | c3d12156839475510e38df0bc3777a8781a3e7a8 (diff) | |
parent | c229f571fd3c7d7b567c27c87b2bbcdaee1b0e9f (diff) | |
download | ffmpeg-3a5a039adee3ee928898df82e20c40212d618195.tar.gz |
Merge commit 'c229f571fd3c7d7b567c27c87b2bbcdaee1b0e9f'
* commit 'c229f571fd3c7d7b567c27c87b2bbcdaee1b0e9f':
(e)ac3: parse and store the Lt/Rt and LFE mix levels.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/eac3dec.c')
-rw-r--r-- | libavcodec/eac3dec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c index 2f6a15b8fd..1d75627b71 100644 --- a/libavcodec/eac3dec.c +++ b/libavcodec/eac3dec.c @@ -345,23 +345,23 @@ int ff_eac3_parse_header(AC3DecodeContext *s) if (get_bits1(gbc)) { /* center and surround mix levels */ if (s->channel_mode > AC3_CHMODE_STEREO) { - skip_bits(gbc, 2); // skip preferred stereo downmix mode + s->preferred_downmix = get_bits(gbc, 2); if (s->channel_mode & 1) { /* if three front channels exist */ - skip_bits(gbc, 3); //skip Lt/Rt center mix level + s->center_mix_level_ltrt = get_bits(gbc, 3); s->center_mix_level = get_bits(gbc, 3); } if (s->channel_mode & 4) { /* if a surround channel exists */ - skip_bits(gbc, 3); //skip Lt/Rt surround mix level + s->surround_mix_level_ltrt = get_bits(gbc, 3); s->surround_mix_level = get_bits(gbc, 3); } } /* lfe mix level */ - if (s->lfe_on && get_bits1(gbc)) { + if (s->lfe_on && (s->lfe_mix_level_exists = get_bits1(gbc))) { // TODO: use LFE mix level - skip_bits(gbc, 5); // skip LFE mix level code + s->lfe_mix_level = get_bits(gbc, 5); } /* info for mixing with other streams and substreams */ |