[FFmpeg-soc] [soc]: r2223 - in eac3: ac3dec_data.c ac3dec_data.h eac3dec.c

[jbr]

Author: jbr
Date: Tue May 27 03:25:32 2008
New Revision: 2223

Log:
remove a pointless table

Modified:
   eac3/ac3dec_data.c
   eac3/ac3dec_data.h
   eac3/eac3dec.c

Modified: eac3/ac3dec_data.c
==============================================================================
--- eac3/ac3dec_data.c	(original)
+++ eac3/ac3dec_data.c	Tue May 27 03:25:32 2008
@@ -85,17 +85,6 @@ const int16_t ff_eac3_gaq_remap_2_4_b[9]
     { -16352, -8168}
 };
 
-/**
- * Map GAQ mode and gaqgain to Gk
- * Gk = 1 << ff_gaq_gk[GAQ Mode][gaqgain]
- */
-const uint8_t ff_eac3_gaq_gk[4][3]={
-    {0, 0, 0},
-    {0, 1, 0},
-    {0, 2, 0},
-    {0, 1, 2}
-};
-
 static const int16_t vq_hebap1[4][6] = {
 {   7167,    4739,    1106,    4269,   10412,    4820},
 {  -5702,   -3187,  -14483,   -1392,   -2027,     849},

Modified: eac3/ac3dec_data.h
==============================================================================
--- eac3/ac3dec_data.h	(original)
+++ eac3/ac3dec_data.h	Tue May 27 03:25:32 2008
@@ -29,7 +29,6 @@ extern const uint8_t ff_eac3_bits_vs_heb
 extern const int16_t ff_eac3_gaq_remap_1[12];
 extern const int16_t ff_eac3_gaq_remap_2_4_a[9][2];
 extern const int16_t ff_eac3_gaq_remap_2_4_b[9][2];
-extern const uint8_t ff_eac3_gaq_gk[4][3];
 
 extern const int16_t (*ff_eac3_vq_hebap[8])[6];
 extern const uint8_t ff_eac3_frm_expstr[32][6];

Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c	(original)
+++ eac3/eac3dec.c	Tue May 27 03:25:32 2008
@@ -183,7 +183,7 @@ void ff_eac3_get_transform_coeffs_aht_ch
         gs = 0;
         for (bin = s->start_freq[ch]; bin < s->end_freq[ch]; bin++) {
             if (s->hebap[ch][bin] > 7 && s->hebap[ch][bin] < end_bap)
-                s->gaq_gain[gs++] = ff_eac3_gaq_gk[gaq_mode][get_bits1(gbc)];
+                s->gaq_gain[gs++] = get_bits1(gbc) << (gaq_mode-1);
         }
     } else if (gaq_mode == EAC3_GAQ_124) {
         /* read 1.67-bit GAQ gain codes (3 codes in 5 bits) */
@@ -193,9 +193,9 @@ void ff_eac3_get_transform_coeffs_aht_ch
             if (s->hebap[ch][bin] > 7 && s->hebap[ch][bin] < end_bap) {
                 if(gc++ == 2) {
                     int group_gain = get_bits(gbc, 5);
-                    s->gaq_gain[gs++] = ff_eac3_gaq_gk[gaq_mode][gaq_ungroup_tab[group_gain][0]];
-                    s->gaq_gain[gs++] = ff_eac3_gaq_gk[gaq_mode][gaq_ungroup_tab[group_gain][1]];
-                    s->gaq_gain[gs++] = ff_eac3_gaq_gk[gaq_mode][gaq_ungroup_tab[group_gain][2]];
+                    s->gaq_gain[gs++] = gaq_ungroup_tab[group_gain][0];
+                    s->gaq_gain[gs++] = gaq_ungroup_tab[group_gain][1];
+                    s->gaq_gain[gs++] = gaq_ungroup_tab[group_gain][2];
                     gc = 0;
                 }
             }