Mercurial > libavcodec.hg
changeset 7019:81d5c68233e5 libavcodec
move mix level tables from parser to decoder. have parser read bitstream value instead of using an index to a table in the decoder.
| author | jbr |
|---|---|
| date | Sat, 07 Jun 2008 22:30:09 +0000 |
| parents | 885cad616170 |
| children | 40a2db8dbaa2 |
| files | ac3_parser.c ac3dec.c |
| diffstat | 2 files changed, 18 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/ac3_parser.c Sat Jun 07 22:30:03 2008 +0000 +++ b/ac3_parser.c Sat Jun 07 22:30:09 2008 +0000 @@ -33,18 +33,6 @@ 1, 2, 3, 6 }; -/** - * Table for center mix levels - * reference: Section 5.4.2.4 cmixlev - */ -static const uint8_t center_levels[4] = { 4, 5, 6, 5 }; - -/** - * Table for surround mix levels - * reference: Section 5.4.2.5 surmixlev - */ -static const uint8_t surround_levels[4] = { 4, 6, 7, 6 }; - int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) { @@ -64,8 +52,8 @@ hdr->num_blocks = 6; /* set default mix levels */ - hdr->center_mix_level = 3; // -4.5dB - hdr->surround_mix_level = 4; // -6.0dB + hdr->center_mix_level = 1; // -4.5dB + hdr->surround_mix_level = 1; // -6.0dB if(hdr->bitstream_id <= 10) { /* Normal AC-3 */ @@ -87,9 +75,9 @@ skip_bits(gbc, 2); // skip dsurmod } else { if((hdr->channel_mode & 1) && hdr->channel_mode != AC3_CHMODE_MONO) - hdr->center_mix_level = center_levels[get_bits(gbc, 2)]; + hdr->center_mix_level = get_bits(gbc, 2); if(hdr->channel_mode & 4) - hdr->surround_mix_level = surround_levels[get_bits(gbc, 2)]; + hdr->surround_mix_level = get_bits(gbc, 2); } hdr->lfe_on = get_bits1(gbc);
--- a/ac3dec.c Sat Jun 07 22:30:03 2008 +0000 +++ b/ac3dec.c Sat Jun 07 22:30:09 2008 +0000 @@ -95,6 +95,18 @@ }; /** + * Table for center mix levels + * reference: Section 5.4.2.4 cmixlev + */ +static const uint8_t center_levels[4] = { 4, 5, 6, 5 }; + +/** + * Table for surround mix levels + * reference: Section 5.4.2.5 surmixlev + */ +static const uint8_t surround_levels[4] = { 4, 6, 7, 6 }; + +/** * Table for default stereo downmixing coefficients * reference: Section 7.8.2 Downmixing Into Two Channels */ @@ -383,8 +395,8 @@ static void set_downmix_coeffs(AC3DecodeContext *s) { int i; - float cmix = gain_levels[s->center_mix_level]; - float smix = gain_levels[s->surround_mix_level]; + float cmix = gain_levels[center_levels[s->center_mix_level]]; + float smix = gain_levels[surround_levels[s->surround_mix_level]]; for(i=0; i<s->fbw_channels; i++) { s->downmix_coeffs[i][0] = gain_levels[ac3_default_coeffs[s->channel_mode][i][0]];