[FFmpeg-soc] [soc]: r2988 - in aac: aac.c aactab.c aactab.h

[superdump]

Author: superdump
Date: Sat Aug  2 10:30:01 2008
New Revision: 2988

Log:
Rename tables used for generating scalefactor VLC tables


Modified:
   aac/aac.c
   aac/aactab.c
   aac/aactab.h

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Sat Aug  2 10:30:01 2008
@@ -566,9 +566,9 @@ static av_cold int aac_decode_init(AVCod
         ff_aac_pow2sf_tab[i] = pow(2, (i - 200)/4.);
 #endif /* CONFIG_HARDCODED_TABLES */
 
-    INIT_VLC_STATIC(&vlc_scalefactors, 7, sizeof(ff_aac_code)/sizeof(ff_aac_code[0]),
-        ff_aac_bits, sizeof(ff_aac_bits[0]), sizeof(ff_aac_bits[0]),
-        ff_aac_code, sizeof(ff_aac_code[0]), sizeof(ff_aac_code[0]),
+    INIT_VLC_STATIC(&vlc_scalefactors, 7, sizeof(ff_aac_scalefactor_code)/sizeof(ff_aac_scalefactor_code[0]),
+        ff_aac_scalefactor_bits, sizeof(ff_aac_scalefactor_bits[0]), sizeof(ff_aac_scalefactor_bits[0]),
+        ff_aac_scalefactor_code, sizeof(ff_aac_scalefactor_code[0]), sizeof(ff_aac_scalefactor_code[0]),
         352);
 
 #ifdef AAC_LTP

Modified: aac/aactab.c
==============================================================================
--- aac/aactab.c	(original)
+++ aac/aactab.c	Sat Aug  2 10:30:01 2008
@@ -45,7 +45,7 @@ const uint8_t ff_aac_num_swb_128[] = {
     12, 12, 12, 14, 14, 14, 15, 15, 15, 15, 15, 15
 };
 
-const uint32_t ff_aac_code[121] = {
+const uint32_t ff_aac_scalefactor_code[121] = {
     0x3ffe8, 0x3ffe6, 0x3ffe7, 0x3ffe5, 0x7fff5, 0x7fff1, 0x7ffed, 0x7fff6,
     0x7ffee, 0x7ffef, 0x7fff0, 0x7fffc, 0x7fffd, 0x7ffff, 0x7fffe, 0x7fff7,
     0x7fff8, 0x7fffb, 0x7fff9, 0x3ffe4, 0x7fffa, 0x3ffe3, 0x1ffef, 0x1fff0,
@@ -64,7 +64,7 @@ const uint32_t ff_aac_code[121] = {
     0x7fff3,
 };
 
-const uint8_t ff_aac_bits[121] = {
+const uint8_t ff_aac_scalefactor_bits[121] = {
     18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
     19, 19, 19, 18, 19, 18, 17, 17, 16, 17, 16, 16, 16, 16, 15, 15,
     14, 14, 14, 14, 14, 14, 13, 13, 12, 12, 12, 11, 12, 11, 10, 10,

Modified: aac/aactab.h
==============================================================================
--- aac/aactab.h	(original)
+++ aac/aactab.h	Sat Aug  2 10:30:01 2008
@@ -43,8 +43,8 @@ DECLARE_ALIGNED(16, extern float, ff_aac
 extern const uint8_t ff_aac_num_swb_1024[];
 extern const uint8_t ff_aac_num_swb_128 [];
 
-extern const uint32_t ff_aac_code  [121];
-extern const uint8_t  ff_aac_bits  [121];
+extern const uint32_t ff_aac_scalefactor_code[121];
+extern const uint8_t  ff_aac_scalefactor_bits[121];
 extern const uint16_t ff_aac_code1 [81];
 extern const uint8_t  ff_aac_bits1 [81];
 extern const uint16_t ff_aac_code2 [81];