1. ffmpeg
  2. Commit 6ed3b504f984dc6cefde8d57a57726f9d30e5033
Browse code

Move ff_ac3_critical_band_size_tab in ac3.c for non-hardcoded tables.

This symbol is only ever used to calculate the non-hardcoded tables, so
only enable it in that case, and static to the source unit that uses it.

Signed-off-by: Mans Rullgard <mans@mansr.com>

Diego Elio Pettenò authored on 2011/01/25 10:59:36
Showing 2 changed files
libavcodec/ac3.c
History View file @ 6ed3b50
... ... 
@@ -70,6 +70,12 @@ static const uint8_t bin_to_band_tab[253] = {
70 70 
 };
71 71
72 72 
 #else /* CONFIG_HARDCODED_TABLES */
73 
+static const uint8_t ff_ac3_critical_band_size_tab[AC3_CRITICAL_BANDS]={
74 
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
75 
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3,
76 
+    3, 6, 6, 6, 6, 6, 6, 12, 12, 12, 12, 24, 24, 24, 24, 24
77 
+};
78 
+
73 79 
 static uint8_t band_start_tab[51];
74 80 
 static uint8_t bin_to_band_tab[253];
75 81 
 #endif
libavcodec/ac3tab.c
History View file @ 6ed3b50
... ... 
@@ -292,11 +292,6 @@ const uint16_t ff_ac3_fast_gain_tab[8]= {
292 292 
     0x080, 0x100, 0x180, 0x200, 0x280, 0x300, 0x380, 0x400,
293 293 
 };
294 294
295 
-const uint8_t ff_ac3_critical_band_size_tab[AC3_CRITICAL_BANDS]={
296 
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
297 
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3,
298 
-    3, 6, 6, 6, 6, 6, 6, 12, 12, 12, 12, 24, 24, 24, 24, 24
299 
-};
300 295 
 /**
301 296 
  * Default channel map for a dependent substream defined by acmod
302 297 
  */