Mercurial > libavcodec.hg

changeset 7756:2994fe74068f libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
turn on E-AC-3 decoding support and update the Changelog
author jbr
date Sun, 31 Aug 2008 03:08:18 +0000
parents 1c0e498ac7bd
children b04a9742669c
files Makefile ac3dec.c
diffstat 2 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Aug 31 03:01:56 2008 +0000
+++ b/Makefile	Sun Aug 31 03:08:18 2008 +0000
@@ -27,7 +27,7 @@
 
 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
--- a/ac3dec.c	Sun Aug 31 03:01:56 2008 +0000
+++ b/ac3dec.c	Sun Aug 31 03:08:18 2008 +0000
@@ -317,9 +317,8 @@
         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 @@
         /* 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];
         }