Browse Source

ac3: set default matrix encoding modes in parse_frame_header.

Deduplicates some code.
tags/n2.2-rc1
Tim Walker 11 years ago
parent
commit
1f604f96ea
2 changed files with 2 additions and 9 deletions
  1. +2
    -4
      libavcodec/ac3dec.c
  2. +0
    -5
      libavcodec/eac3dec.c

+ 2
- 4
libavcodec/ac3dec.c View File

@@ -227,10 +227,6 @@ static int ac3_parse_header(AC3DecodeContext *s)

skip_bits(gbc, 2); //skip copyright bit and original bitstream bit

/* default dolby matrix encoding modes */
s->dolby_surround_ex_mode = AC3_DSUREXMOD_NOTINDICATED;
s->dolby_headphone_mode = AC3_DHEADPHONMOD_NOTINDICATED;

/* skip the timecodes or parse the Alternate Bit Stream Syntax
TODO: read & use the xbsi1 downmix levels */
if (s->bitstream_id != 6) {
@@ -290,6 +286,8 @@ static int parse_frame_header(AC3DecodeContext *s)
s->frame_type = hdr.frame_type;
s->substreamid = hdr.substreamid;
s->dolby_surround_mode = hdr.dolby_surround_mode;
s->dolby_surround_ex_mode = AC3_DSUREXMOD_NOTINDICATED;
s->dolby_headphone_mode = AC3_DHEADPHONMOD_NOTINDICATED;

if (s->lfe_on) {
s->start_freq[s->lfe_ch] = 0;


+ 0
- 5
libavcodec/eac3dec.c View File

@@ -341,11 +341,6 @@ int ff_eac3_parse_header(AC3DecodeContext *s)
}
}

/* default dolby matrix encoding modes */
s->dolby_surround_mode = AC3_DSURMOD_NOTINDICATED;
s->dolby_surround_ex_mode = AC3_DSUREXMOD_NOTINDICATED;
s->dolby_headphone_mode = AC3_DHEADPHONMOD_NOTINDICATED;

/* mixing metadata */
if (get_bits1(gbc)) {
/* center and surround mix levels */


Loading…
Cancel
Save