NEWS update.

[paraslash.git] / wmadata.h

diff --git a/wmadata.h b/wmadata.h
index 13fe7ad8bf0c8ce8a725f347350d706c945aec43..b5dad0f5af40a15773dce43b4a77e65346ea5b66 100644 (file)
--- a/wmadata.h
+++ b/wmadata.h
@@ -19,15 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/**
- * \file wmadata.h Various WMA tables.
- */
+/** \file wmadata.h Various WMA tables. */
 
+/** Contains huffcodes, huffbits and run/level tables. */
 struct coef_vlc_table {
        /** Total number of codes. */
        int n;
-       /** Number of levels. */
-       int max_level;
        /** VLC bit values. */
        const uint32_t *huffcodes;
        /** VLC bit size. */
@@ -63,7 +60,7 @@ static const uint8_t exponent_band_44100[3][25] = {
        {17, 4, 8, 8, 4, 12, 12, 8, 8, 24, 16, 20, 24, 32, 40, 60, 80, 152,},
 };
 
-const uint16_t wma_hgain_huffcodes[37] = {
+static const uint16_t wma_hgain_huffcodes[37] = {
        0x00003, 0x002e7, 0x00001, 0x005cd, 0x0005d, 0x005c9, 0x0005e, 0x00003,
        0x00016, 0x0000b, 0x00001, 0x00006, 0x00001, 0x00006, 0x00004, 0x00005,
        0x00004, 0x00007, 0x00003, 0x00007, 0x00004, 0x0000a, 0x0000a, 0x00002,
@@ -71,7 +68,7 @@ const uint16_t wma_hgain_huffcodes[37] = {
        0x005c8, 0x000b8, 0x005ca, 0x005cb, 0x005cc,
 };
 
-const uint8_t wma_hgain_huffbits[37] = {
+static const uint8_t wma_hgain_huffbits[37] = {
        10, 12, 10, 13, 9, 13, 9, 8,
        7, 5, 5, 4, 4, 3, 3, 3,
        4, 3, 4, 4, 5, 5, 6, 8,
@@ -81,7 +78,7 @@ const uint8_t wma_hgain_huffbits[37] = {
 
 #define NB_LSP_COEFS 10
 
-const float wma_lsp_codebook[NB_LSP_COEFS][16] = {
+static const float wma_lsp_codebook[NB_LSP_COEFS][16] = {
        {1.98732877, 1.97944528, 1.97179088, 1.96260549, 1.95038374, 1.93336114,
         1.90719232, 1.86191415,},
        {1.97260000, 1.96083160, 1.94982586, 1.93806164, 1.92516608, 1.91010199,
@@ -118,7 +115,7 @@ const float wma_lsp_codebook[NB_LSP_COEFS][16] = {
         -1.86220079, -1.90283983, -1.94820479,},
 };
 
-const uint32_t wma_scale_huffcodes[121] = {
+static const uint32_t wma_scale_huffcodes[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,
@@ -137,7 +134,7 @@ const uint32_t wma_scale_huffcodes[121] = {
        0x7fff3,
 };
 
-const uint8_t wma_scale_huffbits[121] = {
+static const uint8_t wma_scale_huffbits[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,
@@ -1446,7 +1443,6 @@ static const uint16_t levels5[40] = {
 
 #define DEF_COEF_TABLE(_x) { \
                .n = sizeof(coef ## _x ## _huffbits), \
-               .max_level = sizeof(levels ## _x) / 2, \
                .huffcodes = coef ## _x ## _huffcodes, \
                .huffbits = coef ## _x ##_huffbits, \
                .levels = levels ## _x}