Commit d3cd0c4a authored by Monty's avatar Monty
Browse files

An attempt at a complete version of the patch submitted in #1291. Also

updated autogenerating utils (not tested) and tried to eliminate all 
resulting warnings.


svn path=/trunk/vorbis/; revision=15531
parent d4cbe6a7
......@@ -113,9 +113,8 @@ typedef struct vorbis_info_residue0{
int secondstages[64]; /* expanded out to pointers in lookup */
int booklist[256]; /* list of second stage books */
float classmetric1[64];
float classmetric2[64];
const float classmetric1[64];
const float classmetric2[64];
} vorbis_info_residue0;
/* Mapping backend generic *****************************************/
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -214,7 +214,7 @@ static int floor0_inverse2(vorbis_block *vb,vorbis_look_floor *i,
}
/* export hooks */
vorbis_func_floor floor0_exportbundle={
const vorbis_func_floor floor0_exportbundle={
NULL,&floor0_unpack,&floor0_look,&floor0_free_info,
&floor0_free_look,&floor0_inverse1,&floor0_inverse2
};
......
......@@ -1061,7 +1061,7 @@ static int floor1_inverse2(vorbis_block *vb,vorbis_look_floor *in,void *memo,
}
/* export hooks */
vorbis_func_floor floor1_exportbundle={
const vorbis_func_floor floor1_exportbundle={
&floor1_pack,&floor1_unpack,&floor1_look,&floor1_free_info,
&floor1_free_look,&floor1_inverse1,&floor1_inverse2
};
......@@ -23,7 +23,7 @@ typedef struct highlevel_byblocktype {
} highlevel_byblocktype;
typedef struct highlevel_encode_setup {
void *setup;
const void *setup;
int set_in_stone;
double base_setting;
......
......@@ -852,7 +852,7 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_info_mapping *l){
}
/* export hooks */
vorbis_func_mapping mapping0_exportbundle={
const vorbis_func_mapping mapping0_exportbundle={
&mapping0_pack,
&mapping0_unpack,
&mapping0_free_info,
......
......@@ -22,7 +22,7 @@
overly for only a bin or two of savings. */
#define MAX_ATH 88
static float ATH[]={
static const float ATH[]={
/*15*/ -51, -52, -53, -54, -55, -56, -57, -58,
/*31*/ -59, -60, -61, -62, -63, -64, -65, -66,
/*63*/ -67, -68, -69, -70, -71, -72, -73, -74,
......@@ -48,7 +48,7 @@ static float ATH[]={
/* (Vorbis 0dB, the loudest possible tone, is assumed to be ~100dB SPL
for collection of these curves) */
static float tonemasks[P_BANDS][6][EHMER_MAX]={
static const float tonemasks[P_BANDS][6][EHMER_MAX]={
/* 62.5 Hz */
{{ -60, -60, -60, -60, -60, -60, -60, -60,
-60, -60, -60, -60, -62, -62, -65, -73,
......
......@@ -19,21 +19,21 @@
#include "backends.h"
#include "books/floor/floor_books.h"
static static_codebook *_floor_128x4_books[]={
static const static_codebook*const _floor_128x4_books[]={
&_huff_book_line_128x4_class0,
&_huff_book_line_128x4_0sub0,
&_huff_book_line_128x4_0sub1,
&_huff_book_line_128x4_0sub2,
&_huff_book_line_128x4_0sub3,
};
static static_codebook *_floor_256x4_books[]={
static const static_codebook*const _floor_256x4_books[]={
&_huff_book_line_256x4_class0,
&_huff_book_line_256x4_0sub0,
&_huff_book_line_256x4_0sub1,
&_huff_book_line_256x4_0sub2,
&_huff_book_line_256x4_0sub3,
};
static static_codebook *_floor_128x7_books[]={
static const static_codebook*const _floor_128x7_books[]={
&_huff_book_line_128x7_class0,
&_huff_book_line_128x7_class1,
......@@ -44,7 +44,7 @@ static static_codebook *_floor_128x7_books[]={
&_huff_book_line_128x7_1sub2,
&_huff_book_line_128x7_1sub3,
};
static static_codebook *_floor_256x7_books[]={
static const static_codebook*const _floor_256x7_books[]={
&_huff_book_line_256x7_class0,
&_huff_book_line_256x7_class1,
......@@ -55,7 +55,7 @@ static static_codebook *_floor_256x7_books[]={
&_huff_book_line_256x7_1sub2,
&_huff_book_line_256x7_1sub3,
};
static static_codebook *_floor_128x11_books[]={
static const static_codebook*const _floor_128x11_books[]={
&_huff_book_line_128x11_class1,
&_huff_book_line_128x11_class2,
&_huff_book_line_128x11_class3,
......@@ -70,7 +70,7 @@ static static_codebook *_floor_128x11_books[]={
&_huff_book_line_128x11_3sub2,
&_huff_book_line_128x11_3sub3,
};
static static_codebook *_floor_128x17_books[]={
static const static_codebook*const _floor_128x17_books[]={
&_huff_book_line_128x17_class1,
&_huff_book_line_128x17_class2,
&_huff_book_line_128x17_class3,
......@@ -85,14 +85,14 @@ static static_codebook *_floor_128x17_books[]={
&_huff_book_line_128x17_3sub2,
&_huff_book_line_128x17_3sub3,
};
static static_codebook *_floor_256x4low_books[]={
static const static_codebook*const _floor_256x4low_books[]={
&_huff_book_line_256x4low_class0,
&_huff_book_line_256x4low_0sub0,
&_huff_book_line_256x4low_0sub1,
&_huff_book_line_256x4low_0sub2,
&_huff_book_line_256x4low_0sub3,
};
static static_codebook *_floor_1024x27_books[]={
static const static_codebook*const _floor_1024x27_books[]={
&_huff_book_line_1024x27_class1,
&_huff_book_line_1024x27_class2,
&_huff_book_line_1024x27_class3,
......@@ -110,7 +110,7 @@ static static_codebook *_floor_1024x27_books[]={
&_huff_book_line_1024x27_4sub2,
&_huff_book_line_1024x27_4sub3,
};
static static_codebook *_floor_2048x27_books[]={
static const static_codebook*const _floor_2048x27_books[]={
&_huff_book_line_2048x27_class1,
&_huff_book_line_2048x27_class2,
&_huff_book_line_2048x27_class3,
......@@ -129,7 +129,7 @@ static static_codebook *_floor_2048x27_books[]={
&_huff_book_line_2048x27_4sub3,
};
static static_codebook *_floor_512x17_books[]={
static const static_codebook*const _floor_512x17_books[]={
&_huff_book_line_512x17_class1,
&_huff_book_line_512x17_class2,
&_huff_book_line_512x17_class3,
......@@ -145,7 +145,7 @@ static static_codebook *_floor_512x17_books[]={
&_huff_book_line_512x17_3sub3,
};
static static_codebook **_floor_books[10]={
static const static_codebook*const *const _floor_books[10]={
_floor_128x4_books,
_floor_256x4_books,
_floor_128x7_books,
......@@ -158,7 +158,7 @@ static static_codebook **_floor_books[10]={
_floor_512x17_books,
};
static vorbis_info_floor1 _floor[10]={
static const vorbis_info_floor1 _floor[10]={
/* 128 x 4 */
{
1,{0},{4},{2},{0},
......
......@@ -15,15 +15,15 @@
********************************************************************/
static double _psy_lowpass_11[3]={4.5,5.5,30.,};
static const double _psy_lowpass_11[3]={4.5,5.5,30.,};
static att3 _psy_tone_masteratt_11[3]={
static const att3 _psy_tone_masteratt_11[3]={
{{ 30, 25, 12}, 0, 0}, /* 0 */
{{ 30, 25, 12}, 0, 0}, /* 0 */
{{ 20, 0, -14}, 0, 0}, /* 0 */
};
static vp_adjblock _vp_tonemask_adj_11[3]={
static const vp_adjblock _vp_tonemask_adj_11[3]={
/* adjust for mode zero */
/* 63 125 250 500 1 2 4 8 16 */
{{-20,-20,-20,-20,-20,-16,-10, 0, 0, 0, 0,10, 2, 0,99,99,99}}, /* 0 */
......@@ -32,7 +32,7 @@ static vp_adjblock _vp_tonemask_adj_11[3]={
};
static noise3 _psy_noisebias_11[3]={
static const noise3 _psy_noisebias_11[3]={
/* 63 125 250 500 1k 2k 4k 8k 16k*/
{{{-10,-10,-10,-10, -5, -5, -5, 0, 4, 10, 10, 12, 12, 12, 99, 99, 99},
{-15,-15,-15,-15,-10,-10, -5, 0, 0, 4, 4, 5, 5, 10, 99, 99, 99},
......@@ -47,5 +47,5 @@ static noise3 _psy_noisebias_11[3]={
{-30,-30,-30,-30,-26,-26,-26,-26,-26,-26,-26,-26,-26,-24, 99, 99, 99}}},
};
static double _noise_thresh_11[3]={ .3,.5,.5 };
static const double _noise_thresh_11[3]={ .3,.5,.5 };
......@@ -16,7 +16,7 @@
********************************************************************/
/* stereo mode by base quality level */
static adj_stereo _psy_stereo_modes_16[4]={
static const adj_stereo _psy_stereo_modes_16[4]={
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 */
{{ 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
{ 6, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
......@@ -36,16 +36,16 @@ static adj_stereo _psy_stereo_modes_16[4]={
{ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
};
static double _psy_lowpass_16[4]={6.5,8,30.,99.};
static const double _psy_lowpass_16[4]={6.5,8,30.,99.};
static att3 _psy_tone_masteratt_16[4]={
static const att3 _psy_tone_masteratt_16[4]={
{{ 30, 25, 12}, 0, 0}, /* 0 */
{{ 25, 22, 12}, 0, 0}, /* 0 */
{{ 20, 12, 0}, 0, 0}, /* 0 */
{{ 15, 0, -14}, 0, 0}, /* 0 */
};
static vp_adjblock _vp_tonemask_adj_16[4]={
static const vp_adjblock _vp_tonemask_adj_16[4]={
/* adjust for mode zero */
/* 63 125 250 500 1 2 4 8 16 */
{{-20,-20,-20,-20,-20,-16,-10, 0, 0, 0, 0,10, 0, 0, 0, 0, 0}}, /* 0 */
......@@ -55,7 +55,7 @@ static vp_adjblock _vp_tonemask_adj_16[4]={
};
static noise3 _psy_noisebias_16_short[4]={
static const noise3 _psy_noisebias_16_short[4]={
/* 63 125 250 500 1k 2k 4k 8k 16k*/
{{{-15,-15,-15,-15,-15,-10,-10,-5, 4, 10, 10, 10, 10, 12, 12, 14, 20},
{-15,-15,-15,-15,-15,-10,-10, -5, 0, 0, 4, 5, 5, 6, 8, 8, 15},
......@@ -74,7 +74,7 @@ static noise3 _psy_noisebias_16_short[4]={
{-30,-30,-30,-30,-26,-26,-26,-26,-26,-26,-26,-26,-26,-24,-20,-20,-20}}},
};
static noise3 _psy_noisebias_16_impulse[4]={
static const noise3 _psy_noisebias_16_impulse[4]={
/* 63 125 250 500 1k 2k 4k 8k 16k*/
{{{-15,-15,-15,-15,-15,-10,-10,-5, 4, 10, 10, 10, 10, 12, 12, 14, 20},
{-15,-15,-15,-15,-15,-10,-10, -5, 0, 0, 4, 5, 5, 6, 8, 8, 15},
......@@ -93,7 +93,7 @@ static noise3 _psy_noisebias_16_impulse[4]={
{-30,-30,-30,-30,-26,-26,-26,-26,-26,-26,-26,-26,-26,-24,-20,-20,-20}}},
};
static noise3 _psy_noisebias_16[4]={
static const noise3 _psy_noisebias_16[4]={
/* 63 125 250 500 1k 2k 4k 8k 16k*/
{{{-10,-10,-10,-10, -5, -5, -5, 0, 4, 6, 8, 8, 10, 10, 10, 14, 20},
{-10,-10,-10,-10,-10, -5, -2, -2, 0, 0, 0, 4, 5, 6, 8, 8, 15},
......@@ -112,23 +112,23 @@ static noise3 _psy_noisebias_16[4]={
{-30,-30,-30,-30,-26,-26,-26,-26,-26,-26,-26,-26,-26,-24,-20,-20,-20}}},
};
static noiseguard _psy_noiseguards_16[4]={
static const noiseguard _psy_noiseguards_16[4]={
{10,10,-1},
{10,10,-1},
{20,20,-1},
{20,20,-1},
};
static double _noise_thresh_16[4]={ .3,.5,.5,.5 };
static const double _noise_thresh_16[4]={ .3,.5,.5,.5 };
static int _noise_start_16[3]={ 256,256,9999 };
static int _noise_part_16[4]={ 8,8,8,8 };
static const int _noise_start_16[3]={ 256,256,9999 };
static const int _noise_part_16[4]={ 8,8,8,8 };
static int _psy_ath_floater_16[4]={
static const int _psy_ath_floater_16[4]={
-100,-100,-100,-105,
};
static int _psy_ath_abs_16[4]={
static const int _psy_ath_abs_16[4]={
-130,-130,-130,-140,
};
......
......@@ -18,7 +18,7 @@
/* preecho trigger settings *****************************************/
static vorbis_info_psy_global _psy_global_44[5]={
static const vorbis_info_psy_global _psy_global_44[5]={
{8, /* lines per eighth octave */
{20.f,14.f,12.f,12.f,12.f,12.f,12.f},
......@@ -53,7 +53,7 @@ static vorbis_info_psy_global _psy_global_44[5]={
};
/* noise compander lookups * low, mid, high quality ****************/
static compandblock _psy_compand_44[6]={
static const compandblock _psy_compand_44[6]={
/* sub-mode Z short */
{{
0, 1, 2, 3, 4, 5, 6, 7, /* 7dB */
......@@ -106,7 +106,7 @@ static compandblock _psy_compand_44[6]={
/* tonal masking curve level adjustments *************************/
static vp_adjblock _vp_tonemask_adj_longblock[12]={
static const vp_adjblock _vp_tonemask_adj_longblock[12]={
/* 63 125 250 500 1 2 4 8 16 */
......@@ -146,7 +146,7 @@ static vp_adjblock _vp_tonemask_adj_longblock[12]={
{{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 10 */
};
static vp_adjblock _vp_tonemask_adj_otherblock[12]={
static const vp_adjblock _vp_tonemask_adj_otherblock[12]={
/* 63 125 250 500 1 2 4 8 16 */
{{ -3, -8,-13,-15,-10,-10, -9, -9, -9, -9, -9, 1, 1, 1, 1, 1, 1}}, /* -1 */
......@@ -186,7 +186,7 @@ static vp_adjblock _vp_tonemask_adj_otherblock[12]={
};
/* noise bias (transition block) */
static noise3 _psy_noisebias_trans[12]={
static const noise3 _psy_noisebias_trans[12]={
/* 63 125 250 500 1k 2k 4k 8k 16k*/
/* -1 */
{{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20},
......@@ -269,7 +269,7 @@ static noise3 _psy_noisebias_trans[12]={
};
/* noise bias (long block) */
static noise3 _psy_noisebias_long[12]={
static const noise3 _psy_noisebias_long[12]={
/*63 125 250 500 1k 2k 4k 8k 16k*/
/* -1 */
{{{-10,-10,-10,-10,-10, -4, 0, 0, 0, 6, 6, 6, 6, 10, 10, 12, 20},
......@@ -344,7 +344,7 @@ static noise3 _psy_noisebias_long[12]={
};
/* noise bias (impulse block) */
static noise3 _psy_noisebias_impulse[12]={
static const noise3 _psy_noisebias_impulse[12]={
/* 63 125 250 500 1k 2k 4k 8k 16k*/
/* -1 */
{{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20},
......@@ -413,7 +413,7 @@ static noise3 _psy_noisebias_impulse[12]={
};
/* noise bias (padding block) */
static noise3 _psy_noisebias_padding[12]={
static const noise3 _psy_noisebias_padding[12]={
/* 63 125 250 500 1k 2k 4k 8k 16k*/
/* -1 */
......@@ -471,24 +471,24 @@ static noise3 _psy_noisebias_padding[12]={
};
static noiseguard _psy_noiseguards_44[4]={
static const noiseguard _psy_noiseguards_44[4]={
{3,3,15},
{3,3,15},
{10,10,100},
{10,10,100},
};
static int _psy_tone_suppress[12]={
static const int _psy_tone_suppress[12]={
-20,-20,-20,-20,-20,-24,-30,-40,-40,-45,-45,-45,
};
static int _psy_tone_0dB[12]={
static const int _psy_tone_0dB[12]={
90,90,95,95,95,95,105,105,105,105,105,105,
};
static int _psy_noise_suppress[12]={
static const int _psy_noise_suppress[12]={
-20,-20,-24,-24,-24,-24,-30,-40,-40,-45,-45,-45,
};
static vorbis_info_psy _psy_info_template={
static const vorbis_info_psy _psy_info_template={
/* blockflag */
-1,
/* ath_adjatt, ath_maxatt */
......@@ -506,10 +506,10 @@ static vorbis_info_psy _psy_info_template={
/* ath ****************/
static int _psy_ath_floater[12]={
static const int _psy_ath_floater[12]={
-100,-100,-100,-100,-100,-100,-105,-105,-105,-105,-110,-120,
};
static int _psy_ath_abs[12]={
static const int _psy_ath_abs[12]={
-130,-130,-130,-130,-140,-140,-140,-140,-140,-140,-140,-150,
};
......@@ -522,7 +522,7 @@ static int _psy_ath_abs[12]={
/* various stereo possibilities */
/* stereo mode by base quality level */
static adj_stereo _psy_stereo_modes_44[12]={
static const adj_stereo _psy_stereo_modes_44[12]={
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 -1 */
{{ 4, 4, 4, 4, 4, 4, 4, 3, 2, 2, 1, 0, 0, 0, 0},
{ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 5, 4, 3},
......@@ -615,7 +615,7 @@ static adj_stereo _psy_stereo_modes_44[12]={
};
/* tone master attenuation by base quality mode and bitrate tweak */
static att3 _psy_tone_masteratt_44[12]={
static const att3 _psy_tone_masteratt_44[12]={
{{ 35, 21, 9}, 0, 0}, /* -1 */
{{ 30, 20, 8}, -2, 1.25}, /* 0 */
/* {{ 25, 14, 4}, 0, 0}, *//* 1 */
......@@ -633,34 +633,34 @@ static att3 _psy_tone_masteratt_44[12]={
};
/* lowpass by mode **************/
static double _psy_lowpass_44[12]={
static const double _psy_lowpass_44[12]={
/* 15.1,15.8,16.5,17.9,20.5,48.,999.,999.,999.,999.,999. */
13.9,15.1,15.8,16.5,17.2,18.9,20.1,48.,999.,999.,999.,999.
};
/* noise normalization **********/
static int _noise_start_short_44[11]={
static const int _noise_start_short_44[11]={
/* 16,16,16,16,32,32,9999,9999,9999,9999 */
32,16,16,16,32,9999,9999,9999,9999,9999,9999
};
static int _noise_start_long_44[11]={
static const int _noise_start_long_44[11]={
/* 128,128,128,256,512,512,9999,9999,9999,9999 */
256,128,128,256,512,9999,9999,9999,9999,9999,9999
};
static int _noise_part_short_44[11]={
static const int _noise_part_short_44[11]={
8,8,8,8,8,8,8,8,8,8,8
};
static int _noise_part_long_44[11]={
static const int _noise_part_long_44[11]={
32,32,32,32,32,32,32,32,32,32,32
};
static double _noise_thresh_44[11]={
static const double _noise_thresh_44[11]={
/* .2,.2,.3,.4,.5,.5,9999.,9999.,9999.,9999., */
.2,.2,.2,.4,.6,9999.,9999.,9999.,9999.,9999.,9999.,
};
static double _noise_thresh_5only[2]={
static const double _noise_thresh_5only[2]={
.5,.5,
};
......@@ -15,13 +15,13 @@
********************************************************************/
static att3 _psy_tone_masteratt_8[3]={
static const att3 _psy_tone_masteratt_8[3]={
{{ 32, 25, 12}, 0, 0}, /* 0 */
{{ 30, 25, 12}, 0, 0}, /* 0 */
{{ 20, 0, -14}, 0, 0}, /* 0 */
};
static vp_adjblock _vp_tonemask_adj_8[3]={
static const vp_adjblock _vp_tonemask_adj_8[3]={
/* adjust for mode zero */
/* 63 125 250 500 1 2 4 8 16 */
{{-15,-15,-15,-15,-10,-10, -6, 0, 0, 0, 0,10, 0, 0,99,99,99}}, /* 1 */
......@@ -30,7 +30,7 @@ static vp_adjblock _vp_tonemask_adj_8[3]={
};
static noise3 _psy_noisebias_8[3]={
static const noise3 _psy_noisebias_8[3]={
/* 63 125 250 500 1k 2k 4k 8k 16k*/
{{{-10,-10,-10,-10, -5, -5, -5, 0, 4, 8, 8, 8, 10, 10, 99, 99, 99},
{-10,-10,-10,-10, -5, -5, -5, 0, 0, 4, 4, 4, 4, 4, 99, 99, 99},
......@@ -46,7 +46,7 @@ static noise3 _psy_noisebias_8[3]={
};
/* stereo mode by base quality level */
static adj_stereo _psy_stereo_modes_8[3]={
static const adj_stereo _psy_stereo_modes_8[3]={
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 */
{{ 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
{ 6, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
......@@ -62,12 +62,12 @@ static adj_stereo _psy_stereo_modes_8[3]={
{ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
};
static noiseguard _psy_noiseguards_8[2]={
static const noiseguard _psy_noiseguards_8[2]={
{10,10,-1},
{10,10,-1},
};
static compandblock _psy_compand_8[2]={
static const compandblock _psy_compand_8[2]={
{{
0, 1, 2, 3, 4, 5, 6, 7, /* 7dB */
8, 8, 9, 9,10,10,11, 11, /* 15dB */
......@@ -84,19 +84,19 @@ static compandblock _psy_compand_8[2]={
}},
};
static double _psy_lowpass_8[3]={3.,4.,4.};
static int _noise_start_8[2]={
static const double _psy_lowpass_8[3]={3.,4.,4.};
static const int _noise_start_8[2]={
64,64,
};
static int _noise_part_8[2]={
static const int _noise_part_8[2]={
8,8,
};
static int _psy_ath_floater_8[3]={
static const int _psy_ath_floater_8[3]={
-100,-100,-105,
};
static int _psy_ath_abs_8[3]={
static const int _psy_ath_abs_8[3]={
-130,-130,-140,
};
/********************************************************************
* *
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* This FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
......@@ -17,7 +17,7 @@
/***** residue backends *********************************************/
static static_bookblock _resbook_16s_0={
static const static_bookblock _resbook_16s_0={
{
{0},
{0,0,&_16c0_s_p1_0},
......@@ -31,7 +31,7 @@ static static_bookblock _resbook_16s_0={
{&_16c0_s_p9_0,&_16c0_s_p9_1,&_16c0_s_p9_2}
}
};
static static_bookblock _resbook_16s_1={
static const static_bookblock _resbook_16s_1={
{
{0},
{0,0,&_16c1_s_p1_0},
......@@ -45,7 +45,7 @@ static static_bookblock _resbook_16s_1={
{&_16c1_s_p9_0,&_16c1_s_p9_1,&_16c1_s_p9_2}
}
};
static static_bookblock _resbook_16s_2={
static const static_bookblock _resbook_16s_2={
{
{0},
{0,0,&_16c2_s_p1_0},
......@@ -60,12 +60,12 @@ static static_bookblock _resbook_16s_2={
}
};
static vorbis_residue_template _res_16s_0[]={
static const vorbis_residue_template _res_16s_0[]={
{2,0, &_residue_44_mid,
&_huff_book__16c0_s_single,&_huff_book__16c0_s_single,
&_resbook_16s_0,&_resbook_16s_0},
};
static vorbis_residue_template _res_16s_1[]={
static const vorbis_residue_template _res_16s_1[]={
{2,0, &_residue_44_mid,
&_huff_book__16c1_s_short,&_huff_book__16c1_s_short,
&_resbook_16s_1,&_resbook_16s_1},
......@@ -74,7 +74,7 @@ static vorbis_residue_template _res_16s_1[]={
&_huff_book__16c1_s_long,&_huff_book__16c1_s_long,
&_resbook_16s_1,&_resbook_16s_1}
};
static vorbis_residue_template _res_16s_2[]={
static const vorbis_residue_template _res_16s_2[]={
{2,0, &_residue_44_high,
&_huff_book__16c2_s_short,&_huff_book__16c2_s_short,
&_resbook_16s_2,&_resbook_16s_2},
......@@ -84,13 +84,13 @@ static vorbis_residue_template _res_16s_2[]={
&_resbook_16s_2,&_resbook_16s_2}
};
static vorbis_mapping_template _mapres_template_16_stereo[3]={
static const vorbis_mapping_template _mapres_template_16_stereo[3]={
{ _map_nominal, _res_16s_0 }, /* 0 */
{ _map_nominal, _res_16s_1 }, /* 1 */
{ _map_nominal, _res_16s_2 }, /* 2 */
};