[FFmpeg-soc] [soc]: r3604 - in eac3: ac3dec.c checkout.sh eac3dec.c ffmpeg.patch

[jbr]

Author: jbr
Date: Mon Aug 25 02:07:18 2008
New Revision: 3604

Log:
cosmetics: rename some *get_* to *decode_*

Modified:
   eac3/ac3dec.c
   eac3/checkout.sh
   eac3/eac3dec.c
   eac3/ffmpeg.patch

Modified: eac3/ac3dec.c
==============================================================================
--- eac3/ac3dec.c	(original)
+++ eac3/ac3dec.c	Mon Aug 25 02:07:18 2008
@@ -439,10 +439,10 @@ typedef struct {
 } mant_groups;
 
 /**
- * Get the transform coefficients for a particular channel
+ * Decode the transform coefficients for a particular channel
  * reference: Section 7.3 Quantization and Decoding of Mantissas
  */
-static void ac3_get_transform_coeffs_ch(AC3DecodeContext *s, int ch_index, mant_groups *m)
+static void ac3_decode_transform_coeffs_ch(AC3DecodeContext *s, int ch_index, mant_groups *m)
 {
     GetBitContext *gbc = &s->gbc;
     int i, gcode, tbap, start, end;
@@ -547,17 +547,17 @@ static void remove_dithering(AC3DecodeCo
     }
 }
 
-static void get_transform_coeffs_ch(AC3DecodeContext *s, int blk, int ch,
+static void decode_transform_coeffs_ch(AC3DecodeContext *s, int blk, int ch,
                                     mant_groups *m)
 {
     if (!s->channel_uses_aht[ch]) {
-        ac3_get_transform_coeffs_ch(s, ch, m);
+        ac3_decode_transform_coeffs_ch(s, ch, m);
     } else {
         /* if AHT is used, mantissas for all blocks are encoded in the first
            block of the frame. */
         int bin;
         if (!blk)
-            ff_eac3_get_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++) {
             s->fixed_coeffs[ch][bin] = s->pre_mantissa[ch][bin][blk] >> s->dexps[ch][bin];
         }
@@ -565,9 +565,9 @@ static void get_transform_coeffs_ch(AC3D
 }
 
 /**
- * Get the transform coefficients.
+ * Decode the transform coefficients.
  */
-static void get_transform_coeffs(AC3DecodeContext *s, int blk)
+static void decode_transform_coeffs(AC3DecodeContext *s, int blk)
 {
     int ch, end;
     int got_cplchan = 0;
@@ -577,12 +577,12 @@ static void get_transform_coeffs(AC3Deco
 
     for (ch = 1; ch <= s->channels; ch++) {
         /* transform coefficients for full-bandwidth channel */
-        get_transform_coeffs_ch(s, blk, ch, &m);
+        decode_transform_coeffs_ch(s, blk, ch, &m);
         /* tranform coefficients for coupling channel come right after the
            coefficients for the first coupled channel*/
         if (s->channel_in_cpl[ch])  {
             if (!got_cplchan) {
-                get_transform_coeffs_ch(s, blk, CPL_CH, &m);
+                decode_transform_coeffs_ch(s, blk, CPL_CH, &m);
                 calc_transform_coeffs_cpl(s);
                 got_cplchan = 1;
             }
@@ -1112,7 +1112,7 @@ static int decode_audio_block(AC3DecodeC
 
     /* unpack the transform coefficients
        this also uncouples channels if coupling is in use. */
-    get_transform_coeffs(s, blk);
+    decode_transform_coeffs(s, blk);
 
     /* TODO: generate enhanced coupling coordinates and uncouple */
 

Modified: eac3/checkout.sh
==============================================================================
--- eac3/checkout.sh	(original)
+++ eac3/checkout.sh	Mon Aug 25 02:07:18 2008
@@ -4,7 +4,7 @@ echo "checking out ffmpeg svn"
 for i in $FILES Makefile ac3dec.h ac3dec_data.c; do
     rm -f ffmpeg/libavcodec/$i
 done
-svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk/ ffmpeg -r 14945
+svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk/ ffmpeg -r 14954
 echo "patching ffmpeg"
 cd ffmpeg
 patch -p0 <../ffmpeg.patch

Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c	(original)
+++ eac3/eac3dec.c	Mon Aug 25 02:07:18 2008
@@ -79,7 +79,7 @@ static void idct6(int pre_mant[6])
     pre_mant[5] = even0 - odd0;
 }
 
-void ff_eac3_get_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch)
+void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch)
 {
     int bin, blk, gs;
     int end_bap, gaq_mode;

Modified: eac3/ffmpeg.patch
==============================================================================
--- eac3/ffmpeg.patch	(original)
+++ eac3/ffmpeg.patch	Mon Aug 25 02:07:18 2008
@@ -1,6 +1,6 @@
 Index: libavcodec/ac3dec.h
 ===================================================================
---- libavcodec/ac3dec.h	(revision 14945)
+--- libavcodec/ac3dec.h	(revision 14954)
 +++ libavcodec/ac3dec.h	(working copy)
 @@ -82,7 +82,7 @@
      int phase_flags[18];                    ///< phase flags                            (phsflg)
@@ -25,12 +25,12 @@ Index: libavcodec/ac3dec.h
 + * Decode mantissas in a single channel for the entire frame.
 + * This is used when AHT mode is enabled.
 + */
-+void ff_eac3_get_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch);
++void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch);
 +
  #endif /* FFMPEG_AC3DEC_H */
 Index: libavcodec/Makefile
 ===================================================================
---- libavcodec/Makefile	(revision 14945)
+--- libavcodec/Makefile	(revision 14954)
 +++ libavcodec/Makefile	(working copy)
 @@ -27,7 +27,7 @@
  
@@ -43,7 +43,7 @@ Index: libavcodec/Makefile
  OBJS-$(CONFIG_ALAC_ENCODER)            += alacenc.o lpc.o
 Index: libavcodec/ac3dec_data.c
 ===================================================================
---- libavcodec/ac3dec_data.c	(revision 14945)
+--- libavcodec/ac3dec_data.c	(revision 14954)
 +++ libavcodec/ac3dec_data.c	(working copy)
 @@ -87,18 +87,19 @@
  /**