Browse code

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

Originally committed as revision 15103 to svn://svn.ffmpeg.org/ffmpeg/trunk

Justin Ruggles authored on 2008/08/31 12:08:18
Showing 3 changed files
... ...
@@ -134,6 +134,7 @@ version <next>
134 134
 - AAC decoder
135 135
 - floating point PCM encoder/decoder
136 136
 - MXF muxer
137
+- E-AC-3 support added to AC-3 decoder
137 138
 
138 139
 version 0.4.9-pre1:
139 140
 
... ...
@@ -27,7 +27,7 @@ OBJS-$(CONFIG_ENCODERS)                += faandct.o jfdctfst.o jfdctint.o
27 27
 
28 28
 OBJS-$(CONFIG_AAC_DECODER)             += aac.o aactab.o mdct.o fft.o
29 29
 OBJS-$(CONFIG_AASC_DECODER)            += aasc.o
30
-OBJS-$(CONFIG_AC3_DECODER)             += ac3dec.o ac3tab.o ac3dec_data.o ac3.o mdct.o fft.o
30
+OBJS-$(CONFIG_AC3_DECODER)             += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o mdct.o fft.o
31 31
 OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc.o ac3tab.o ac3.o
32 32
 OBJS-$(CONFIG_ALAC_DECODER)            += alac.o
33 33
 OBJS-$(CONFIG_ALAC_ENCODER)            += alacenc.o lpc.o
... ...
@@ -317,9 +317,8 @@ static int parse_frame_header(AC3DecodeContext *s)
317 317
         memset(s->channel_uses_aht, 0, sizeof(s->channel_uses_aht));
318 318
         return ac3_parse_header(s);
319 319
     } else {
320
-        /*s->eac3 = 1;
321
-        return ff_eac3_parse_header(s);*/
322
-        return AC3_PARSE_ERROR_BSID;
320
+        s->eac3 = 1;
321
+        return ff_eac3_parse_header(s);
323 322
     }
324 323
 }
325 324
 
... ...
@@ -557,10 +556,8 @@ static void decode_transform_coeffs_ch(AC3DecodeContext *s, int blk, int ch,
557 557
         /* if AHT is used, mantissas for all blocks are encoded in the first
558 558
            block of the frame. */
559 559
         int bin;
560
-        /*
561 560
         if (!blk)
562 561
             ff_eac3_decode_transform_coeffs_aht_ch(s, ch);
563
-        */
564 562
         for (bin = s->start_freq[ch]; bin < s->end_freq[ch]; bin++) {
565 563
             s->fixed_coeffs[ch][bin] = s->pre_mantissa[ch][bin][blk] >> s->dexps[ch][bin];
566 564
         }