Commit 29ed059b authored by Gildas Bazin's avatar Gildas Bazin

Mark tables as static constants. Patch by Diego Flameeyes Pettenò

parent 84e072de
...@@ -548,7 +548,7 @@ static int dca_subframe_header (dca_state_t * state) ...@@ -548,7 +548,7 @@ static int dca_subframe_header (dca_state_t * state)
/* Scale factors */ /* Scale factors */
for (j = 0; j < state->prim_channels; j++) for (j = 0; j < state->prim_channels; j++)
{ {
int *scale_table; const int *scale_table;
int scale_sum; int scale_sum;
for (k = 0; k < state->subband_activity[j]; k++) for (k = 0; k < state->subband_activity[j]; k++)
...@@ -761,7 +761,7 @@ static int dca_subsubframe (dca_state_t * state) ...@@ -761,7 +761,7 @@ static int dca_subsubframe (dca_state_t * state)
int k, l; int k, l;
int subsubframe = state->current_subsubframe; int subsubframe = state->current_subsubframe;
double *quant_step_table; const double *quant_step_table;
/* FIXME */ /* FIXME */
double subband_samples[DCA_PRIM_CHANNELS_MAX][DCA_SUBBANDS][8]; double subband_samples[DCA_PRIM_CHANNELS_MAX][DCA_SUBBANDS][8];
...@@ -1145,7 +1145,7 @@ static void qmf_32_subbands (dca_state_t * state, int chans, ...@@ -1145,7 +1145,7 @@ static void qmf_32_subbands (dca_state_t * state, int chans,
double samples_in[32][8], sample_t *samples_out, double samples_in[32][8], sample_t *samples_out,
double scale, sample_t bias) double scale, sample_t bias)
{ {
double *prCoeff; const double *prCoeff;
int i, j, k; int i, j, k;
double raXin[32]; double raXin[32];
...@@ -1236,7 +1236,7 @@ static void lfe_interpolation_fir (int nDecimationSelect, int nNumDeciSample, ...@@ -1236,7 +1236,7 @@ static void lfe_interpolation_fir (int nDecimationSelect, int nNumDeciSample,
*/ */
int nDeciFactor, k, J; int nDeciFactor, k, J;
double *prCoeff; const double *prCoeff;
int NumFIRCoef = 512; /* Number of FIR coefficients */ int NumFIRCoef = 512; /* Number of FIR coefficients */
int nInterpIndex = 0; /* Index to the interpolated samples */ int nInterpIndex = 0; /* Index to the interpolated samples */
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
double fir_32bands_perfect[] = static const double fir_32bands_perfect[] =
{ {
+1.135985195E-010, +1.135985195E-010,
-6.022448247E-007, -6.022448247E-007,
...@@ -537,7 +537,7 @@ double fir_32bands_perfect[] = ...@@ -537,7 +537,7 @@ double fir_32bands_perfect[] =
-1.135985195E-010 -1.135985195E-010
}; };
double fir_32bands_nonperfect[] = static const double fir_32bands_nonperfect[] =
{ {
-1.390191784E-007, -1.390191784E-007,
-1.693738625E-007, -1.693738625E-007,
...@@ -1053,7 +1053,7 @@ double fir_32bands_nonperfect[] = ...@@ -1053,7 +1053,7 @@ double fir_32bands_nonperfect[] =
+1.390191784E-007 +1.390191784E-007
}; };
double lfe_fir_64[] = static const double lfe_fir_64[] =
{ {
2.6584343868307770E-004, 2.6584343868307770E-004,
8.1793652498163280E-005, 8.1793652498163280E-005,
...@@ -1569,7 +1569,7 @@ double lfe_fir_64[] = ...@@ -1569,7 +1569,7 @@ double lfe_fir_64[] =
2.6584343868307770E-004 2.6584343868307770E-004
}; };
double lfe_fir_128[] = static const double lfe_fir_128[] =
{ {
0.00053168571, 0.00053168571,
0.00016358691, 0.00016358691,
......
...@@ -29,7 +29,7 @@ typedef struct huff_entry_s ...@@ -29,7 +29,7 @@ typedef struct huff_entry_s
} huff_entry_t; } huff_entry_t;
huff_entry_t bitalloc_a_12[] = static const huff_entry_t bitalloc_a_12[] =
{ {
{ 1, 0, 1}, { 2, 2, 2}, { 3, 6, 3}, { 4, 14, 4}, { 1, 0, 1}, { 2, 2, 2}, { 3, 6, 3}, { 4, 14, 4},
{ 5, 30, 5}, { 6, 62, 6}, { 8, 255, 7}, { 8, 254, 8}, { 5, 30, 5}, { 6, 62, 6}, { 8, 255, 7}, { 8, 254, 8},
...@@ -37,7 +37,7 @@ huff_entry_t bitalloc_a_12[] = ...@@ -37,7 +37,7 @@ huff_entry_t bitalloc_a_12[] =
{ 0, 0, 0} { 0, 0, 0}
}; };
huff_entry_t bitalloc_b_12[] = static const huff_entry_t bitalloc_b_12[] =
{ {
{ 1, 1, 1}, { 2, 0, 2}, { 3, 2, 3}, { 5, 15, 4}, { 1, 1, 1}, { 2, 0, 2}, { 3, 2, 3}, { 5, 15, 4},
{ 5, 12, 5}, { 6, 29, 6}, { 7, 57, 7}, { 7, 56, 8}, { 5, 12, 5}, { 6, 29, 6}, { 7, 57, 7}, { 7, 56, 8},
...@@ -45,7 +45,7 @@ huff_entry_t bitalloc_b_12[] = ...@@ -45,7 +45,7 @@ huff_entry_t bitalloc_b_12[] =
{ 0, 0, 0} { 0, 0, 0}
}; };
huff_entry_t bitalloc_c_12[] = static const huff_entry_t bitalloc_c_12[] =
{ {
{ 2, 0, 1}, { 3, 7, 2}, { 3, 5, 3}, { 3, 4, 4}, { 2, 0, 1}, { 3, 7, 2}, { 3, 5, 3}, { 3, 4, 4},
{ 3, 2, 5}, { 4, 13, 6}, { 4, 12, 7}, { 4, 6, 8}, { 3, 2, 5}, { 4, 13, 6}, { 4, 12, 7}, { 4, 6, 8},
...@@ -53,7 +53,7 @@ huff_entry_t bitalloc_c_12[] = ...@@ -53,7 +53,7 @@ huff_entry_t bitalloc_c_12[] =
{ 0, 0, 0} { 0, 0, 0}
}; };
huff_entry_t bitalloc_d_12[] = static const huff_entry_t bitalloc_d_12[] =
{ {
{ 2, 3, 1}, { 2, 2, 2}, { 2, 0, 3}, { 3, 2, 4}, { 2, 3, 1}, { 2, 2, 2}, { 2, 0, 3}, { 3, 2, 4},
{ 4, 6, 5}, { 5, 14, 6}, { 6, 30, 7}, { 7, 62, 8}, { 4, 6, 5}, { 5, 14, 6}, { 6, 30, 7}, { 7, 62, 8},
...@@ -61,7 +61,7 @@ huff_entry_t bitalloc_d_12[] = ...@@ -61,7 +61,7 @@ huff_entry_t bitalloc_d_12[] =
{ 0, 0, 0} { 0, 0, 0}
}; };
huff_entry_t bitalloc_e_12[] = static const huff_entry_t bitalloc_e_12[] =
{ {
{ 1, 1, 1}, { 2, 0, 2}, { 3, 2, 3}, { 4, 6, 4}, { 1, 1, 1}, { 2, 0, 2}, { 3, 2, 3}, { 4, 6, 4},
{ 5, 14, 5}, { 7, 63, 6}, { 7, 61, 7}, { 8, 124, 8}, { 5, 14, 5}, { 7, 63, 6}, { 7, 61, 7}, { 8, 124, 8},
...@@ -69,7 +69,7 @@ huff_entry_t bitalloc_e_12[] = ...@@ -69,7 +69,7 @@ huff_entry_t bitalloc_e_12[] =
{ 0, 0, 0} { 0, 0, 0}
}; };
huff_entry_t *bitalloc_12[] = static const huff_entry_t *const bitalloc_12[] =
{ {
bitalloc_a_12, bitalloc_a_12,
bitalloc_b_12, bitalloc_b_12,
...@@ -78,7 +78,7 @@ huff_entry_t *bitalloc_12[] = ...@@ -78,7 +78,7 @@ huff_entry_t *bitalloc_12[] =
bitalloc_e_12 bitalloc_e_12
}; };
huff_entry_t scales_a_129[] = static const huff_entry_t scales_a_129[] =
{ {
{ 2, 1, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 0, 2}, { 2, 1, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 0, 2},
{ 4, 15, -2}, { 4, 8, 3}, { 4, 3, -3}, { 5, 28, 4}, { 4, 15, -2}, { 4, 8, 3}, { 4, 3, -3}, { 5, 28, 4},
...@@ -115,7 +115,7 @@ huff_entry_t scales_a_129[] = ...@@ -115,7 +115,7 @@ huff_entry_t scales_a_129[] =
{14, 15024,-64}, { 0, 0, 0} {14, 15024,-64}, { 0, 0, 0}
}; };
huff_entry_t scales_b_129[] = static const huff_entry_t scales_b_129[] =
{ {
{ 3, 3, 0}, { 3, 2, 1}, { 3, 1, -1}, { 4, 15, 2}, { 3, 3, 0}, { 3, 2, 1}, { 3, 1, -1}, { 4, 15, 2},
{ 4, 14, -2}, { 4, 12, 3}, { 4, 11, -3}, { 4, 10, 4}, { 4, 14, -2}, { 4, 12, 3}, { 4, 11, -3}, { 4, 10, 4},
...@@ -152,7 +152,7 @@ huff_entry_t scales_b_129[] = ...@@ -152,7 +152,7 @@ huff_entry_t scales_b_129[] =
{15, 3936,-64}, { 0, 0, 0} {15, 3936,-64}, { 0, 0, 0}
}; };
huff_entry_t scales_c_129[] = static const huff_entry_t scales_c_129[] =
{ {
{ 3, 4, 0}, { 3, 1, 1}, { 3, 0, -1}, { 4, 13, 2}, { 3, 4, 0}, { 3, 1, 1}, { 3, 0, -1}, { 4, 13, 2},
{ 4, 12, -2}, { 4, 7, 3}, { 4, 6, -3}, { 5, 31, 4}, { 4, 12, -2}, { 4, 7, 3}, { 4, 6, -3}, { 5, 31, 4},
...@@ -189,7 +189,7 @@ huff_entry_t scales_c_129[] = ...@@ -189,7 +189,7 @@ huff_entry_t scales_c_129[] =
{15, 20944,-64}, { 0, 0, 0} {15, 20944,-64}, { 0, 0, 0}
}; };
huff_entry_t scales_d_129[] = static const huff_entry_t scales_d_129[] =
{ {
{ 2, 0, 0}, { 3, 5, 1}, { 3, 4, -1}, { 4, 15, 2}, { 2, 0, 0}, { 3, 5, 1}, { 3, 4, -1}, { 4, 15, 2},
{ 4, 14, -2}, { 4, 7, 3}, { 4, 6, -3}, { 5, 26, 4}, { 4, 14, -2}, { 4, 7, 3}, { 4, 6, -3}, { 5, 26, 4},
...@@ -226,7 +226,7 @@ huff_entry_t scales_d_129[] = ...@@ -226,7 +226,7 @@ huff_entry_t scales_d_129[] =
{15, 28516,-64}, { 0, 0, 0} {15, 28516,-64}, { 0, 0, 0}
}; };
huff_entry_t scales_e_129[] = static const huff_entry_t scales_e_129[] =
{ {
{ 4, 14, 0}, { 4, 11, 1}, { 4, 10, -1}, { 4, 7, 2}, { 4, 14, 0}, { 4, 11, 1}, { 4, 10, -1}, { 4, 7, 2},
{ 4, 6, -2}, { 4, 3, 3}, { 4, 2, -3}, { 5, 31, 4}, { 4, 6, -2}, { 4, 3, 3}, { 4, 2, -3}, { 5, 31, 4},
...@@ -263,7 +263,7 @@ huff_entry_t scales_e_129[] = ...@@ -263,7 +263,7 @@ huff_entry_t scales_e_129[] =
{16, 57172,-64}, { 0, 0, 0} {16, 57172,-64}, { 0, 0, 0}
}; };
huff_entry_t *scales_129[] = static const huff_entry_t *const scales_129[] =
{ {
scales_a_129, scales_a_129,
scales_b_129, scales_b_129,
...@@ -272,36 +272,36 @@ huff_entry_t *scales_129[] = ...@@ -272,36 +272,36 @@ huff_entry_t *scales_129[] =
scales_e_129 scales_e_129
}; };
huff_entry_t bitalloc_a_3[] = static const huff_entry_t bitalloc_a_3[] =
{ {
{ 1, 0, 0}, { 2, 2, 1}, { 2, 3, -1}, { 0, 0, 0} { 1, 0, 0}, { 2, 2, 1}, { 2, 3, -1}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_a_4[] = static const huff_entry_t bitalloc_a_4[] =
{ {
{ 1, 0, 0}, { 2, 2, 1}, { 3, 6, 2}, { 3, 7, 3}, { 1, 0, 0}, { 2, 2, 1}, { 3, 6, 2}, { 3, 7, 3},
{ 0, 0, 0} { 0, 0, 0}
}; };
huff_entry_t bitalloc_b_4[] = static const huff_entry_t bitalloc_b_4[] =
{ {
{ 2, 2, 0}, { 3, 6, 1}, { 3, 7, 2}, { 1, 0, 3}, { 2, 2, 0}, { 3, 6, 1}, { 3, 7, 2}, { 1, 0, 3},
{ 0, 0, 0} { 0, 0, 0}
}; };
huff_entry_t bitalloc_c_4[] = static const huff_entry_t bitalloc_c_4[] =
{ {
{ 3, 6, 0}, { 3, 7, 1}, { 1, 0, 2}, { 2, 2, 3}, { 3, 6, 0}, { 3, 7, 1}, { 1, 0, 2}, { 2, 2, 3},
{ 0, 0, 0} { 0, 0, 0}
}; };
huff_entry_t bitalloc_d_4[] = static const huff_entry_t bitalloc_d_4[] =
{ {
{ 2, 0, 0}, { 2, 1, 1}, { 2, 2, 2}, { 2, 3, 3}, { 2, 0, 0}, { 2, 1, 1}, { 2, 2, 2}, { 2, 3, 3},
{ 0, 0, 0} { 0, 0, 0}
}; };
huff_entry_t *tmode[] = static const huff_entry_t *const tmode[] =
{ {
bitalloc_a_4, bitalloc_a_4,
bitalloc_b_4, bitalloc_b_4,
...@@ -309,64 +309,64 @@ huff_entry_t *tmode[] = ...@@ -309,64 +309,64 @@ huff_entry_t *tmode[] =
bitalloc_d_4 bitalloc_d_4
}; };
huff_entry_t bitalloc_a_5[] = static const huff_entry_t bitalloc_a_5[] =
{ {
{ 1, 0, 0}, { 2, 2, 1}, { 3, 6, -1}, { 4, 14, 2}, { 1, 0, 0}, { 2, 2, 1}, { 3, 6, -1}, { 4, 14, 2},
{ 4, 15, -2}, { 0, 0, 0} { 4, 15, -2}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_b_5[] = static const huff_entry_t bitalloc_b_5[] =
{ {
{ 2, 2, 0}, { 2, 0, 1}, { 2, 1, -1}, { 3, 6, 2}, { 2, 2, 0}, { 2, 0, 1}, { 2, 1, -1}, { 3, 6, 2},
{ 3, 7, -2}, { 0, 0, 0} { 3, 7, -2}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_c_5[] = static const huff_entry_t bitalloc_c_5[] =
{ {
{ 1, 0, 0}, { 3, 4, 1}, { 3, 5, -1}, { 3, 6, 2}, { 1, 0, 0}, { 3, 4, 1}, { 3, 5, -1}, { 3, 6, 2},
{ 3, 7, -2}, { 0, 0, 0} { 3, 7, -2}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_a_7[] = static const huff_entry_t bitalloc_a_7[] =
{ {
{ 1, 0, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 4, 2}, { 1, 0, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 4, 2},
{ 4, 14, -2}, { 5, 31, 3}, { 5, 30, -3}, { 0, 0, 0} { 4, 14, -2}, { 5, 31, 3}, { 5, 30, -3}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_b_7[] = static const huff_entry_t bitalloc_b_7[] =
{ {
{ 2, 3, 0}, { 2, 1, 1}, { 2, 0, -1}, { 3, 4, 2}, { 2, 3, 0}, { 2, 1, 1}, { 2, 0, -1}, { 3, 4, 2},
{ 4, 11, -2}, { 5, 21, 3}, { 5, 20, -3}, { 0, 0, 0} { 4, 11, -2}, { 5, 21, 3}, { 5, 20, -3}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_c_7[] = static const huff_entry_t bitalloc_c_7[] =
{ {
{ 2, 3, 0}, { 2, 2, 1}, { 2, 1, -1}, { 4, 3, 2}, { 2, 3, 0}, { 2, 2, 1}, { 2, 1, -1}, { 4, 3, 2},
{ 4, 2, -2}, { 4, 1, 3}, { 4, 0, -3}, { 0, 0, 0} { 4, 2, -2}, { 4, 1, 3}, { 4, 0, -3}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_a_9[] = static const huff_entry_t bitalloc_a_9[] =
{ {
{ 1, 0, 0}, { 3, 7, 1}, { 3, 5, -1}, { 4, 13, 2}, { 1, 0, 0}, { 3, 7, 1}, { 3, 5, -1}, { 4, 13, 2},
{ 4, 9, -2}, { 4, 8, 3}, { 5, 25, -3}, { 6, 49, 4}, { 4, 9, -2}, { 4, 8, 3}, { 5, 25, -3}, { 6, 49, 4},
{ 6, 48, -4}, { 0, 0, 0} { 6, 48, -4}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_b_9[] = static const huff_entry_t bitalloc_b_9[] =
{ {
{ 2, 2, 0}, { 2, 0, 1}, { 3, 7, -1}, { 3, 3, 2}, { 2, 2, 0}, { 2, 0, 1}, { 3, 7, -1}, { 3, 3, 2},
{ 3, 2, -2}, { 5, 27, 3}, { 5, 26, -3}, { 5, 25, 4}, { 3, 2, -2}, { 5, 27, 3}, { 5, 26, -3}, { 5, 25, 4},
{ 5, 24, -4}, { 0, 0, 0} { 5, 24, -4}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_c_9[] = static const huff_entry_t bitalloc_c_9[] =
{ {
{ 2, 2, 0}, { 2, 0, 1}, { 3, 7, -1}, { 3, 6, 2}, { 2, 2, 0}, { 2, 0, 1}, { 3, 7, -1}, { 3, 6, 2},
{ 3, 2, -2}, { 4, 6, 3}, { 5, 15, -3}, { 6, 29, 4}, { 3, 2, -2}, { 4, 6, 3}, { 5, 15, -3}, { 6, 29, 4},
{ 6, 28, -4}, { 0, 0, 0} { 6, 28, -4}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_a_13[] = static const huff_entry_t bitalloc_a_13[] =
{ {
{ 1, 0, 0}, { 3, 4, 1}, { 4, 15, -1}, { 4, 13, 2}, { 1, 0, 0}, { 3, 4, 1}, { 4, 15, -1}, { 4, 13, 2},
{ 4, 12, -2}, { 4, 10, 3}, { 5, 29, -3}, { 5, 22, 4}, { 4, 12, -2}, { 4, 10, 3}, { 5, 29, -3}, { 5, 22, 4},
...@@ -374,7 +374,7 @@ huff_entry_t bitalloc_a_13[] = ...@@ -374,7 +374,7 @@ huff_entry_t bitalloc_a_13[] =
{ 7, 112, -6}, { 0, 0, 0} { 7, 112, -6}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_b_13[] = static const huff_entry_t bitalloc_b_13[] =
{ {
{ 2, 0, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 2, 2}, { 2, 0, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 2, 2},
{ 4, 15, -2}, { 4, 9, 3}, { 4, 7, -3}, { 4, 6, 4}, { 4, 15, -2}, { 4, 9, 3}, { 4, 7, -3}, { 4, 6, 4},
...@@ -382,7 +382,7 @@ huff_entry_t bitalloc_b_13[] = ...@@ -382,7 +382,7 @@ huff_entry_t bitalloc_b_13[] =
{ 6, 56, -6}, { 0, 0, 0} { 6, 56, -6}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_c_13[] = static const huff_entry_t bitalloc_c_13[] =
{ {
{ 3, 5, 0}, { 3, 4, 1}, { 3, 3, -1}, { 3, 2, 2}, { 3, 5, 0}, { 3, 4, 1}, { 3, 3, -1}, { 3, 2, 2},
{ 3, 0, -2}, { 4, 15, 3}, { 4, 14, -3}, { 4, 12, 4}, { 3, 0, -2}, { 4, 15, 3}, { 4, 14, -3}, { 4, 12, 4},
...@@ -390,7 +390,7 @@ huff_entry_t bitalloc_c_13[] = ...@@ -390,7 +390,7 @@ huff_entry_t bitalloc_c_13[] =
{ 5, 4, -6}, { 0, 0, 0} { 5, 4, -6}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_a_17[] = static const huff_entry_t bitalloc_a_17[] =
{ {
{ 2, 1, 0}, { 3, 7, 1}, { 3, 6, -1}, { 3, 4, 2}, { 2, 1, 0}, { 3, 7, 1}, { 3, 6, -1}, { 3, 4, 2},
{ 3, 1, -2}, { 4, 11, 3}, { 4, 10, -3}, { 4, 0, 4}, { 3, 1, -2}, { 4, 11, 3}, { 4, 10, -3}, { 4, 0, 4},
...@@ -399,7 +399,7 @@ huff_entry_t bitalloc_a_17[] = ...@@ -399,7 +399,7 @@ huff_entry_t bitalloc_a_17[] =
{12, 340, -8}, { 0, 0, 0} {12, 340, -8}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_b_17[] = static const huff_entry_t bitalloc_b_17[] =
{ {
{ 2, 0, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 2, 2}, { 2, 0, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 2, 2},
{ 4, 15, -2}, { 4, 9, 3}, { 4, 8, -3}, { 5, 29, 4}, { 4, 15, -2}, { 4, 9, 3}, { 4, 8, -3}, { 5, 29, 4},
...@@ -408,7 +408,7 @@ huff_entry_t bitalloc_b_17[] = ...@@ -408,7 +408,7 @@ huff_entry_t bitalloc_b_17[] =
{ 8, 124, -8}, { 0, 0, 0} { 8, 124, -8}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_c_17[] = static const huff_entry_t bitalloc_c_17[] =
{ {
{ 3, 6, 0}, { 3, 4, 1}, { 3, 3, -1}, { 3, 0, 2}, { 3, 6, 0}, { 3, 4, 1}, { 3, 3, -1}, { 3, 0, 2},
{ 4, 15, -2}, { 4, 11, 3}, { 4, 10, -3}, { 4, 4, 4}, { 4, 15, -2}, { 4, 11, 3}, { 4, 10, -3}, { 4, 4, 4},
...@@ -417,7 +417,7 @@ huff_entry_t bitalloc_c_17[] = ...@@ -417,7 +417,7 @@ huff_entry_t bitalloc_c_17[] =
{ 7, 44, -8}, { 0, 0, 0} { 7, 44, -8}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_d_17[] = static const huff_entry_t bitalloc_d_17[] =
{ {
{ 1, 0, 0}, { 3, 7, 1}, { 3, 6, -1}, { 4, 11, 2}, { 1, 0, 0}, { 3, 7, 1}, { 3, 6, -1}, { 4, 11, 2},
{ 4, 10, -2}, { 5, 19, 3}, { 5, 18, -3}, { 6, 35, 4}, { 4, 10, -2}, { 5, 19, 3}, { 5, 18, -3}, { 6, 35, 4},
...@@ -426,7 +426,7 @@ huff_entry_t bitalloc_d_17[] = ...@@ -426,7 +426,7 @@ huff_entry_t bitalloc_d_17[] =
{ 9, 256, -8}, { 0, 0, 0} { 9, 256, -8}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_e_17[] = static const huff_entry_t bitalloc_e_17[] =
{ {
{ 1, 0, 0}, { 3, 5, 1}, { 3, 4, -1}, { 4, 12, 2}, { 1, 0, 0}, { 3, 5, 1}, { 3, 4, -1}, { 4, 12, 2},
{ 5, 31, -2}, { 5, 28, 3}, { 5, 27, -3}, { 6, 60, 4}, { 5, 31, -2}, { 5, 28, 3}, { 5, 27, -3}, { 6, 60, 4},
...@@ -435,7 +435,7 @@ huff_entry_t bitalloc_e_17[] = ...@@ -435,7 +435,7 @@ huff_entry_t bitalloc_e_17[] =
{ 8, 232, -8}, { 0, 0, 0} { 8, 232, -8}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_f_17[] = static const huff_entry_t bitalloc_f_17[] =
{ {
{ 3, 6, 0}, { 3, 5, 1}, { 3, 4, -1}, { 3, 2, 2}, { 3, 6, 0}, { 3, 5, 1}, { 3, 4, -1}, { 3, 2, 2},
{ 3, 1, -2}, { 4, 15, 3}, { 4, 14, -3}, { 4, 6, 4}, { 3, 1, -2}, { 4, 15, 3}, { 4, 14, -3}, { 4, 6, 4},
...@@ -444,7 +444,7 @@ huff_entry_t bitalloc_f_17[] = ...@@ -444,7 +444,7 @@ huff_entry_t bitalloc_f_17[] =
{ 8, 4, -8}, { 0, 0, 0} { 8, 4, -8}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_g_17[] = static const huff_entry_t bitalloc_g_17[] =
{ {
{ 2, 2, 0}, { 3, 7, 1}, { 3, 6, -1}, { 3, 1, 2}, { 2, 2, 0}, { 3, 7, 1}, { 3, 6, -1}, { 3, 1, 2},
{ 3, 0, -2}, { 4, 5, 3}, { 4, 4, -3}, { 5, 14, 4}, { 3, 0, -2}, { 4, 5, 3}, { 4, 4, -3}, { 5, 14, 4},
...@@ -453,7 +453,7 @@ huff_entry_t bitalloc_g_17[] = ...@@ -453,7 +453,7 @@ huff_entry_t bitalloc_g_17[] =
{ 8, 96, -8}, { 0, 0, 0} { 8, 96, -8}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_a_25[] = static const huff_entry_t bitalloc_a_25[] =
{ {
{ 3, 6, 0}, { 3, 4, 1}, { 3, 3, -1}, { 3, 1, 2}, { 3, 6, 0}, { 3, 4, 1}, { 3, 3, -1}, { 3, 1, 2},
{ 3, 0, -2}, { 4, 15, 3}, { 4, 14, -3}, { 4, 5, 4}, { 3, 0, -2}, { 4, 15, 3}, { 4, 14, -3}, { 4, 5, 4},
...@@ -464,7 +464,7 @@ huff_entry_t bitalloc_a_25[] = ...@@ -464,7 +464,7 @@ huff_entry_t bitalloc_a_25[] =
{14, 10324,-12}, { 0, 0, 0} {14, 10324,-12}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_b_25[] = static const huff_entry_t bitalloc_b_25[] =
{ {
{ 3, 5, 0}, { 3, 2, 1}, { 3, 1, -1}, { 4, 15, 2}, { 3, 5, 0}, { 3, 2, 1}, { 3, 1, -1}, { 4, 15, 2},
{ 4, 14, -2}, { 4, 9, 3}, { 4, 8, -3}, { 4, 6, 4}, { 4, 14, -2}, { 4, 9, 3}, { 4, 8, -3}, { 4, 6, 4},
...@@ -475,7 +475,7 @@ huff_entry_t bitalloc_b_25[] = ...@@ -475,7 +475,7 @@ huff_entry_t bitalloc_b_25[] =
{ 9, 28,-12}, { 0, 0, 0} { 9, 28,-12}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_c_25[] = static const huff_entry_t bitalloc_c_25[] =
{ {
{ 3, 1, 0}, { 4, 15, 1}, { 4, 14, -1}, { 4, 12, 2}, { 3, 1, 0}, { 4, 15, 1}, { 4, 14, -1}, { 4, 12, 2},
{ 4, 11, -2}, { 4, 9, 3}, { 4, 8, -3}, { 4, 6, 4}, { 4, 11, -2}, { 4, 9, 3}, { 4, 8, -3}, { 4, 6, 4},
...@@ -486,7 +486,7 @@ huff_entry_t bitalloc_c_25[] = ...@@ -486,7 +486,7 @@ huff_entry_t bitalloc_c_25[] =
{ 8, 76,-12}, { 0, 0, 0} { 8, 76,-12}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_d_25[] = static const huff_entry_t bitalloc_d_25[] =
{ {
{ 2, 2, 0}, { 3, 7, 1}, { 3, 6, -1}, { 3, 1, 2}, { 2, 2, 0}, { 3, 7, 1}, { 3, 6, -1}, { 3, 1, 2},
{ 3, 0, -2}, { 4, 5, 3}, { 4, 4, -3}, { 5, 13, 4}, { 3, 0, -2}, { 4, 5, 3}, { 4, 4, -3}, { 5, 13, 4},
...@@ -497,7 +497,7 @@ huff_entry_t bitalloc_d_25[] = ...@@ -497,7 +497,7 @@ huff_entry_t bitalloc_d_25[] =
{12, 1920,-12}, { 0, 0, 0} {12, 1920,-12}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_e_25[] = static const huff_entry_t bitalloc_e_25[] =
{ {
{ 2, 3, 0}, { 3, 3, 1}, { 3, 2, -1}, { 4, 11, 2}, { 2, 3, 0}, { 3, 3, 1}, { 3, 2, -1}, { 4, 11, 2},
{ 4, 10, -2}, { 4, 1, 3}, { 4, 0, -3}, { 5, 17, 4}, { 4, 10, -2}, { 4, 1, 3}, { 4, 0, -3}, { 5, 17, 4},
...@@ -508,7 +508,7 @@ huff_entry_t bitalloc_e_25[] = ...@@ -508,7 +508,7 @@ huff_entry_t bitalloc_e_25[] =
{ 8, 60,-12}, { 0, 0, 0} { 8, 60,-12}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_f_25[] = static const huff_entry_t bitalloc_f_25[] =
{ {
{ 3, 1, 0}, { 3, 0, 1}, { 4, 15, -1}, { 4, 14, 2}, { 3, 1, 0}, { 3, 0, 1}, { 4, 15, -1}, { 4, 14, 2},
{ 4, 13, -2}, { 4, 11, 3}, { 4, 10, -3}, { 4, 8, 4}, { 4, 13, -2}, { 4, 11, 3}, { 4, 10, -3}, { 4, 8, 4},
...@@ -519,7 +519,7 @@ huff_entry_t bitalloc_f_25[] = ...@@ -519,7 +519,7 @@ huff_entry_t bitalloc_f_25[] =
{10, 804,-12}, { 0, 0, 0} {10, 804,-12}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_g_25[] = static const huff_entry_t bitalloc_g_25[] =
{ {
{ 2, 1, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 0, 2}, { 2, 1, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 0, 2},
{ 4, 15, -2}, { 4, 8, 3}, { 4, 3, -3}, { 5, 28, 4}, { 4, 15, -2}, { 4, 8, 3}, { 4, 3, -3}, { 5, 28, 4},
...@@ -530,7 +530,7 @@ huff_entry_t bitalloc_g_25[] = ...@@ -530,7 +530,7 @@ huff_entry_t bitalloc_g_25[] =
{10, 936,-12}, { 0, 0, 0} {10, 936,-12}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_a_33[] = static const huff_entry_t bitalloc_a_33[] =
{ {
{ 3, 2, 0}, { 3, 1, 1}, { 3, 0, -1}, { 4, 14, 2}, { 3, 2, 0}, { 3, 1, 1}, { 3, 0, -1}, { 4, 14, 2},
{ 4, 13, -2}, { 4, 12, 3}, { 4, 11, -3}, { 4, 9, 4}, { 4, 13, -2}, { 4, 12, 3}, { 4, 11, -3}, { 4, 9, 4},
...@@ -543,7 +543,7 @@ huff_entry_t bitalloc_a_33[] = ...@@ -543,7 +543,7 @@ huff_entry_t bitalloc_a_33[] =
{13, 5504,-16}, { 0, 0, 0} {13, 5504,-16}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_b_33[] = static const huff_entry_t bitalloc_b_33[] =
{ {
{ 3, 1, 0}, { 4, 15, 1}, { 4, 14, -1}, { 4, 11, 2}, { 3, 1, 0}, { 4, 15, 1}, { 4, 14, -1}, { 4, 11, 2},
{ 4, 10, -2}, { 4, 8, 3}, { 4, 7, -3}, { 4, 4, 4}, { 4, 10, -2}, { 4, 8, 3}, { 4, 7, -3}, { 4, 4, 4},
...@@ -556,7 +556,7 @@ huff_entry_t bitalloc_b_33[] = ...@@ -556,7 +556,7 @@ huff_entry_t bitalloc_b_33[] =
{10, 780,-16}, { 0, 0, 0} {10, 780,-16}, { 0, 0, 0}
}; };
huff_entry_t bitalloc_c_33[] =