virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

Browse Source 
Originally committed as revision 15103 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2008-08-31 03:08:18 +00:00
parent 6685f639af
commit 1f6a594de4
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -134,6 +134,7 @@ version <next>
- AAC decoder - AAC decoder
- floating point PCM encoder/decoder - floating point PCM encoder/decoder
- MXF muxer - MXF muxer
- E-AC-3 support added to AC-3 decoder
version 0.4.9-pre1: version 0.4.9-pre1:

2
libavcodec/Makefile
View File

@ -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_AAC_DECODER) += aac.o aactab.o mdct.o fft.o
OBJS-$(CONFIG_AASC_DECODER) += aasc.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_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o
OBJS-$(CONFIG_ALAC_DECODER) += alac.o OBJS-$(CONFIG_ALAC_DECODER) += alac.o
OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o lpc.o OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o lpc.o

7
libavcodec/ac3dec.c
View File

@ -317,9 +317,8 @@ static int parse_frame_header(AC3DecodeContext *s)
memset(s->channel_uses_aht, 0, sizeof(s->channel_uses_aht)); memset(s->channel_uses_aht, 0, sizeof(s->channel_uses_aht));
return ac3_parse_header(s); return ac3_parse_header(s);
} else { } else {
/*s->eac3 = 1; s->eac3 = 1;
return ff_eac3_parse_header(s);*/ return ff_eac3_parse_header(s);
return AC3_PARSE_ERROR_BSID;
} }
} }
@ -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 /* if AHT is used, mantissas for all blocks are encoded in the first
block of the frame. */ block of the frame. */
int bin; int bin;
/*
if (!blk) if (!blk)
ff_eac3_decode_transform_coeffs_aht_ch(s, ch); ff_eac3_decode_transform_coeffs_aht_ch(s, ch);
*/
for (bin = s->start_freq[ch]; bin < s->end_freq[ch]; bin++) { 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]; s->fixed_coeffs[ch][bin] = s->pre_mantissa[ch][bin][blk] >> s->dexps[ch][bin];
} }