Commit 1f6a594d authored by Justin Ruggles's avatar Justin Ruggles
Browse files

turn on E-AC-3 decoding support and update the Changelog

Originally committed as revision 15103 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 6685f639
......@@ -134,6 +134,7 @@ version <next>
- AAC decoder
- floating point PCM encoder/decoder
- MXF muxer
- E-AC-3 support added to AC-3 decoder
version 0.4.9-pre1:
......
......@@ -27,7 +27,7 @@ OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o
OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o mdct.o fft.o
OBJS-$(CONFIG_AASC_DECODER) += aasc.o
OBJS-$(CONFIG_AC3_DECODER) += ac3dec.o ac3tab.o ac3dec_data.o ac3.o mdct.o fft.o
OBJS-$(CONFIG_AC3_DECODER) += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o mdct.o fft.o
OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o
OBJS-$(CONFIG_ALAC_DECODER) += alac.o
OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o lpc.o
......
......@@ -317,9 +317,8 @@ static int parse_frame_header(AC3DecodeContext *s)
memset(s->channel_uses_aht, 0, sizeof(s->channel_uses_aht));
return ac3_parse_header(s);
} else {
/*s->eac3 = 1;
return ff_eac3_parse_header(s);*/
return AC3_PARSE_ERROR_BSID;
s->eac3 = 1;
return ff_eac3_parse_header(s);
}
}
......@@ -557,10 +556,8 @@ static void decode_transform_coeffs_ch(AC3DecodeContext *s, int blk, int ch,
/* if AHT is used, mantissas for all blocks are encoded in the first
block of the frame. */
int bin;
/*
if (!blk)
ff_eac3_decode_transform_coeffs_aht_ch(s, ch);
*/
for (bin = s->start_freq[ch]; bin < s->end_freq[ch]; bin++) {
s->fixed_coeffs[ch][bin] = s->pre_mantissa[ch][bin][blk] >> s->dexps[ch][bin];
}
......
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