summaryrefslogtreecommitdiff
path: root/libavcodec/eac3dec.c
diff options
context:
space:
mode:
authorTim Walker <tdskywalker@gmail.com>2014-01-17 15:57:40 +0100
committerTim Walker <tdskywalker@gmail.com>2014-01-19 19:12:42 +0100
commitc229f571fd3c7d7b567c27c87b2bbcdaee1b0e9f (patch)
treeb6b72196768c8731b4d4dbf1651fdda6634f7375 /libavcodec/eac3dec.c
parent1f604f96ea70503caa642f68a85be6074a5b3f46 (diff)
(e)ac3: parse and store the Lt/Rt and LFE mix levels.
Diffstat (limited to 'libavcodec/eac3dec.c')
-rw-r--r--libavcodec/eac3dec.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c
index 731735f2c9..dfd78c6ad7 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 */