[FFmpeg-cvslog] r25969 - in trunk/libavcodec: ac3.h ac3tab.c ac3tab.h

[jbr]

Author: jbr
Date: Tue Dec 14 15:51:47 2010
New Revision: 25969

Log:
cosmetics: use some size macros in ac3tab.c/h

Modified:
   trunk/libavcodec/ac3.h
   trunk/libavcodec/ac3tab.c
   trunk/libavcodec/ac3tab.h

Modified: trunk/libavcodec/ac3.h
==============================================================================
--- trunk/libavcodec/ac3.h	Tue Dec 14 15:51:43 2010	(r25968)
+++ trunk/libavcodec/ac3.h	Tue Dec 14 15:51:47 2010	(r25969)
@@ -27,8 +27,6 @@
 #ifndef AVCODEC_AC3_H
 #define AVCODEC_AC3_H
 
-#include "ac3tab.h"
-
 #define AC3_MAX_CODED_FRAME_SIZE 3840 /* in bytes */
 #define AC3_MAX_CHANNELS 6 /* including LFE channel */
 
@@ -39,6 +37,8 @@
 #define AC3_WINDOW_SIZE (AC3_BLOCK_SIZE * 2)
 #define AC3_CRITICAL_BANDS 50
 
+#include "ac3tab.h"
+
 /* exponent encoding strategy */
 #define EXP_REUSE 0
 #define EXP_NEW   1

Modified: trunk/libavcodec/ac3tab.c
==============================================================================
--- trunk/libavcodec/ac3tab.c	Tue Dec 14 15:51:43 2010	(r25968)
+++ trunk/libavcodec/ac3tab.c	Tue Dec 14 15:51:47 2010	(r25969)
@@ -135,7 +135,7 @@ const uint16_t ff_ac3_bitrate_tab[19] = 
 /* AC-3 MDCT window */
 
 /* MDCT window */
-const int16_t ff_ac3_window[256] = {
+const int16_t ff_ac3_window[AC3_WINDOW_SIZE/2] = {
     4,    7,   12,   16,   21,   28,   34,   42,
    51,   61,   72,   84,   97,  111,  127,  145,
   164,  184,  207,  231,  257,  285,  315,  347,
@@ -199,7 +199,7 @@ const uint8_t ff_ac3_log_add_tab[260]= {
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 };
 
-const uint16_t ff_ac3_hearing_threshold_tab[50][3]= {
+const uint16_t ff_ac3_hearing_threshold_tab[AC3_CRITICAL_BANDS][3]= {
 { 0x04d0,0x04f0,0x0580 },
 { 0x04d0,0x04f0,0x0580 },
 { 0x0440,0x0460,0x04b0 },
@@ -286,7 +286,7 @@ const uint16_t ff_ac3_fast_gain_tab[8]= 
     0x080, 0x100, 0x180, 0x200, 0x280, 0x300, 0x380, 0x400,
 };
 
-const uint8_t ff_ac3_critical_band_size_tab[50]={
+const uint8_t ff_ac3_critical_band_size_tab[AC3_CRITICAL_BANDS]={
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3,
     3, 6, 6, 6, 6, 6, 6, 12, 12, 12, 12, 24, 24, 24, 24, 24

Modified: trunk/libavcodec/ac3tab.h
==============================================================================
--- trunk/libavcodec/ac3tab.h	Tue Dec 14 15:51:43 2010	(r25968)
+++ trunk/libavcodec/ac3tab.h	Tue Dec 14 15:51:47 2010	(r25969)
@@ -23,6 +23,7 @@
 #define AVCODEC_AC3TAB_H
 
 #include "libavutil/common.h"
+#include "ac3.h"
 
 extern const uint16_t ff_ac3_frame_size_tab[38][3];
 extern const uint8_t  ff_ac3_channels_tab[8];
@@ -31,9 +32,9 @@ extern const uint8_t  ff_ac3_enc_channel
 extern const uint8_t  ff_ac3_dec_channel_map[8][2][6];
 extern const uint16_t ff_ac3_sample_rate_tab[3];
 extern const uint16_t ff_ac3_bitrate_tab[19];
-extern const int16_t  ff_ac3_window[256];
+extern const int16_t  ff_ac3_window[AC3_WINDOW_SIZE/2];
 extern const uint8_t  ff_ac3_log_add_tab[260];
-extern const uint16_t ff_ac3_hearing_threshold_tab[50][3];
+extern const uint16_t ff_ac3_hearing_threshold_tab[AC3_CRITICAL_BANDS][3];
 extern const uint8_t  ff_ac3_bap_tab[64];
 extern const uint8_t  ff_ac3_slow_decay_tab[4];
 extern const uint8_t  ff_ac3_fast_decay_tab[4];
@@ -41,7 +42,7 @@ extern const uint16_t ff_ac3_slow_gain_t
 extern const uint16_t ff_ac3_db_per_bit_tab[4];
 extern const int16_t  ff_ac3_floor_tab[8];
 extern const uint16_t ff_ac3_fast_gain_tab[8];
-extern const uint8_t  ff_ac3_critical_band_size_tab[50];
+extern const uint8_t  ff_ac3_critical_band_size_tab[AC3_CRITICAL_BANDS];
 extern const uint16_t ff_eac3_default_chmap[8];
 
 /** Custom channel map locations bitmask