[FFmpeg-soc] [soc]: r2048 - in eac3: ac3dec.h checkout.sh ffmpeg.patch

[bwolowiec]

Author: bwolowiec
Date: Wed Mar 26 14:50:45 2008
New Revision: 2048

Log:
updating eac3 svn to ffmpeg rev 12599


Modified:
   eac3/ac3dec.h
   eac3/checkout.sh
   eac3/ffmpeg.patch

Modified: eac3/ac3dec.h
==============================================================================
--- eac3/ac3dec.h	(original)
+++ eac3/ac3dec.h	Wed Mar 26 14:50:45 2008
@@ -28,6 +28,7 @@
 #define AC3DEC_H
 
 #include "ac3tab.h"
+#include "ac3.h"
 #include "ac3dec_data.h"
 #include "bitstream.h"
 #include "dsputil.h"
@@ -49,14 +50,6 @@
 #define MAX_BLOCKS 6
 #define MAX_SPX_CODES 18
 
-/** Stream Type */
-typedef enum {
-    EAC3_STREAM_TYPE_INDEPENDENT = 0,
-    EAC3_STREAM_TYPE_DEPENDENT,
-    EAC3_STREAM_TYPE_AC3_CONVERT,
-    EAC3_STREAM_TYPE_RESERVED
-} EAC3StreamType;
-
 /**
  * table for exponent to scale_factor mapping
  * ff_ac3_scale_factors[i] = 2 ^ -i

Modified: eac3/checkout.sh
==============================================================================
--- eac3/checkout.sh	(original)
+++ eac3/checkout.sh	Wed Mar 26 14:50:45 2008
@@ -4,7 +4,7 @@ echo "checking out ffmpeg svn"
 for i in $FILES Makefile ac3_parser.c ac3enc.c ac3.c ac3.h; do
     rm -f ffmpeg/libavcodec/$i
 done
-svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk/ ffmpeg -r 12191
+svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk/ ffmpeg -r 12599
 echo "patching ffmpeg"
 cd ffmpeg
 patch -p0 <../ffmpeg.patch

Modified: eac3/ffmpeg.patch
==============================================================================
--- eac3/ffmpeg.patch	(original)
+++ eac3/ffmpeg.patch	Wed Mar 26 14:50:45 2008
@@ -1,9 +1,9 @@
 Index: libavcodec/Makefile
 ===================================================================
---- libavcodec/Makefile	(revision 12191)
+--- libavcodec/Makefile	(revision 12599)
 +++ libavcodec/Makefile	(working copy)
-@@ -33,7 +33,7 @@
- HEADERS = avcodec.h opt.h
+@@ -30,7 +30,7 @@
+ OBJS-$(CONFIG_ENCODERS)                += faandct.o jfdctfst.o jfdctint.o
  
  OBJS-$(CONFIG_AASC_DECODER)            += aasc.o
 -OBJS-$(CONFIG_AC3_DECODER)             += ac3dec.o ac3tab.o ac3.o mdct.o fft.o
@@ -13,7 +13,7 @@ Index: libavcodec/Makefile
  OBJS-$(CONFIG_AMV_DECODER)             += sp5xdec.o mjpegdec.o mjpeg.o
 Index: libavcodec/ac3_parser.c
 ===================================================================
---- libavcodec/ac3_parser.c	(revision 12191)
+--- libavcodec/ac3_parser.c	(revision 12599)
 +++ libavcodec/ac3_parser.c	(working copy)
 @@ -38,7 +38,6 @@
  {
@@ -28,10 +28,10 @@ Index: libavcodec/ac3_parser.c
          hdr->channels = ff_ac3_channels_tab[hdr->channel_mode] + hdr->lfe_on;
          hdr->frame_size = ff_ac3_frame_size_tab[frame_size_code][hdr->sr_code] * 2;
 +        hdr->num_blocks = 6;
+         hdr->stream_type = EAC3_STREAM_TYPE_INDEPENDENT;
      } else {
          /* Enhanced AC-3 */
-         hdr->crc1 = 0;
-@@ -101,9 +101,9 @@
+@@ -105,9 +105,9 @@
                  return AC3_PARSE_ERROR_SAMPLE_RATE;
              hdr->sample_rate = ff_ac3_sample_rate_tab[sr_code2] / 2;
              hdr->sr_shift = 1;
@@ -43,7 +43,7 @@ Index: libavcodec/ac3_parser.c
              hdr->sample_rate = ff_ac3_sample_rate_tab[hdr->sr_code];
              hdr->sr_shift = 0;
          }
-@@ -112,7 +112,7 @@
+@@ -116,7 +116,7 @@
          hdr->lfe_on = get_bits1(&gbc);
  
          hdr->bit_rate = (uint32_t)(8.0 * hdr->frame_size * hdr->sample_rate /
@@ -52,18 +52,18 @@ Index: libavcodec/ac3_parser.c
          hdr->channels = ff_ac3_channels_tab[hdr->channel_mode] + hdr->lfe_on;
      }
  
-@@ -133,7 +133,7 @@
-     *sample_rate = hdr.sample_rate;
-     *bit_rate = hdr.bit_rate;
-     *channels = hdr.channels;
--    *samples = AC3_FRAME_SIZE;
-+    *samples = hdr.num_blocks * 256;
+@@ -136,7 +136,7 @@
+     hdr_info->sample_rate = hdr.sample_rate;
+     hdr_info->bit_rate = hdr.bit_rate;
+     hdr_info->channels = hdr.channels;
+-    hdr_info->samples = AC3_FRAME_SIZE;
++    hdr_info->samples = hdr.num_blocks * 256;
      return hdr.frame_size;
  }
  
 Index: libavcodec/ac3.c
 ===================================================================
---- libavcodec/ac3.c	(revision 12191)
+--- libavcodec/ac3.c	(revision 12599)
 +++ libavcodec/ac3.c	(working copy)
 @@ -173,7 +173,8 @@
  }
@@ -96,9 +96,9 @@ Index: libavcodec/ac3.c
  /**
 Index: libavcodec/ac3.h
 ===================================================================
---- libavcodec/ac3.h	(revision 12191)
+--- libavcodec/ac3.h	(revision 12599)
 +++ libavcodec/ac3.h	(working copy)
-@@ -94,6 +94,7 @@
+@@ -95,6 +95,7 @@
      uint32_t bit_rate;
      uint8_t channels;
      uint16_t frame_size;
@@ -106,7 +106,7 @@ Index: libavcodec/ac3.h
      /** @} */
  } AC3HeaderInfo;
  
-@@ -156,10 +157,12 @@
+@@ -163,10 +164,12 @@
   * @param[in]  end        ending bin location
   * @param[in]  snr_offset SNR adjustment
   * @param[in]  floor      noise floor
@@ -122,7 +122,7 @@ Index: libavcodec/ac3.h
                                     int8_t *exp, int start, int end,
 Index: libavcodec/ac3enc.c
 ===================================================================
---- libavcodec/ac3enc.c	(revision 12191)
+--- libavcodec/ac3enc.c	(revision 12599)
 +++ libavcodec/ac3enc.c	(working copy)
 @@ -463,7 +463,8 @@
          for(ch=0;ch<s->nb_all_channels;ch++) {