Browse code

ac3: define AC3_MAX_CPL_BANDS and use it in ac3dec.h

Justin Ruggles authored on 2011/03/05 06:25:17
Showing 2 changed files
... ...
@@ -36,6 +36,7 @@
36 36
 #define AC3_FRAME_SIZE (AC3_MAX_BLOCKS * 256)
37 37
 #define AC3_WINDOW_SIZE (AC3_BLOCK_SIZE * 2)
38 38
 #define AC3_CRITICAL_BANDS 50
39
+#define AC3_MAX_CPL_BANDS  18
39 40
 
40 41
 #include "ac3tab.h"
41 42
 
... ...
@@ -103,12 +103,12 @@ typedef struct {
103 103
     int cpl_strategy_exists[AC3_MAX_BLOCKS];///< coupling strategy exists               (cplstre)
104 104
     int channel_in_cpl[AC3_MAX_CHANNELS];   ///< channel in coupling                    (chincpl)
105 105
     int phase_flags_in_use;                 ///< phase flags in use                     (phsflginu)
106
-    int phase_flags[18];                    ///< phase flags                            (phsflg)
106
+    int phase_flags[AC3_MAX_CPL_BANDS];     ///< phase flags                            (phsflg)
107 107
     int num_cpl_bands;                      ///< number of coupling bands               (ncplbnd)
108
-    uint8_t cpl_band_sizes[18];             ///< number of coeffs in each coupling band
108
+    uint8_t cpl_band_sizes[AC3_MAX_CPL_BANDS]; ///< number of coeffs in each coupling band
109 109
     int firstchincpl;                       ///< first channel in coupling
110 110
     int first_cpl_coords[AC3_MAX_CHANNELS]; ///< first coupling coordinates states      (firstcplcos)
111
-    int cpl_coords[AC3_MAX_CHANNELS][18];   ///< coupling coordinates                   (cplco)
111
+    int cpl_coords[AC3_MAX_CHANNELS][AC3_MAX_CPL_BANDS]; ///< coupling coordinates      (cplco)
112 112
 ///@}
113 113
 
114 114
 ///@defgroup spx spectral extension