From 70e33fd284658ec0e612284b3dff49ab12a1264736181c447a703fb449e5dc94 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 24 Jul 2009 10:13:24 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvorbis?expand=0&rev=14 --- libvorbis-1.2.0-aotuv-b5.7.diff | 35943 ++++++++++++++++++++++++++++++ libvorbis-1.2.0-aotuv-b5.diff | 3465 --- libvorbis.changes | 14 + libvorbis.spec | 25 +- 4 files changed, 35971 insertions(+), 3476 deletions(-) create mode 100644 libvorbis-1.2.0-aotuv-b5.7.diff delete mode 100644 libvorbis-1.2.0-aotuv-b5.diff diff --git a/libvorbis-1.2.0-aotuv-b5.7.diff b/libvorbis-1.2.0-aotuv-b5.7.diff new file mode 100644 index 0000000..61f19e9 --- /dev/null +++ b/libvorbis-1.2.0-aotuv-b5.7.diff @@ -0,0 +1,35943 @@ +diff -ruN libvorbis-1.2.0/aoTuV_README-1st.txt aotuv-b5.7_20090301/aoTuV_README-1st.txt +--- libvorbis-1.2.0/aoTuV_README-1st.txt 1970-01-01 01:00:00.000000000 +0100 ++++ aotuv-b5.7_20090301/aoTuV_README-1st.txt 2009-03-02 21:24:48.000000000 +0100 +@@ -0,0 +1,21 @@ ++aoTuV Beta 5.7 ++ ++"aoTuV" tunes up Xiph.Org's libvorbis uniquely. ++A license is taken as "BSD-style license" as well as original libvorbis. ++ ++ ++# NOTICE # ++ ++ Manuke's patch is used for improvement in the speed of sort processing. ++ When "#define OPT_SORT" of "lib/psy.h" is deleted, the conventional ++ processing method is used. ++ Thanks! Manuke. ++ ++ ++aoTuV based on ++ ++Copyright (c) 2002-2008 Xiph.Org Foundation ++Copyright (c) 2003-2009 Aoyumi ++ ++ ++AUTHOR : Aoyumi +diff -ruN libvorbis-1.2.0/aoTuV_technical.txt aotuv-b5.7_20090301/aoTuV_technical.txt +--- libvorbis-1.2.0/aoTuV_technical.txt 1970-01-01 01:00:00.000000000 +0100 ++++ aotuv-b5.7_20090301/aoTuV_technical.txt 2009-03-03 15:26:10.000000000 +0100 +@@ -0,0 +1,226 @@ ++aoTuV beta5.7 technical information ++ ++The differences from the aoTuV beta 5.61... ++ ++ 1. Fixed the problem of floating point exception. (from xiph.org's libvorbis) ++ ++ 2. "libvorbis SVN-Revision 15533" was merged. Some revisions are included ++ in it. ++ ++ 3. The process of the frequency band without the need is omitted now. ++ And the case that speed becomes fast occurs. This change doesn't influence ++ the encoding result. ++ ++ 4. Fixed the problem of a memory access violation. (beta5-M6 afterward) ++ ++ ++2009/03/03 ++Aoyumi ++ ++---------------------------------------------------------------------------- ++ ++aoTuV beta5.61 technical information ++ ++The differences from the aoTuV beta 5.6... ++ ++ 1. Fixed the problem of floating point exception. (beta5.5-M3 afterward) ++ ++ ++2008/12/15 ++Aoyumi ++ ++---------------------------------------------------------------------------- ++ ++aoTuV beta5.6 technical information ++ ++The differences from the aoTuV beta 5.5... ++ ++ 1. "libvorbis SVN-Revision 15530" was merged. The revisions of the ++ security problem are included in it. Therefore this update is important. ++ ++ 2. The pre-amplitude processing was added newly. This is the function ++ to adjustment the volume of sources beforehand.@All the initial values ++ are set now. ++ ++ 3. The part of M3 code was fixed. This is bugfix of the beta5.5. ++ ++...and I tune up a few parameters. ++ ++ ++2008/12/09 ++Aoyumi ++ ++---------------------------------------------------------------------------- ++ ++aoTuV beta5.5 technical information ++ ++ ++The differences from the aoTuV beta 5... ++ ++ 1. The frequency domain width of M6 was revised. ++ ++ 2. For q-1/-2, a pre-echo reduction code was applied (M3). In addition, ++ the M3 code was improved. ++ ++ 3. The floor setup parameters in the low bit-rate were changed. ++ ++ 4. The part including bug of noise normalization was rewritten. ++ ++ 5. "libvorbis 1.2.0" was merged. Furthermore, the revisions of Bug #300 and ++ #1229 were applied. ++ ++ 6. The ATH curve of the high frequency area (more than 32kHz) was revised. ++ ++...and I tune up many parameters. ++ ++ ++2008/03/30 ++Aoyumi ++ ++---------------------------------------------------------------------------- ++ ++aoTuV beta5 technical information ++ ++ ++The differences from the aoTuV beta 4.51... ++ ++ 1. In order to work noise normalization correctly, the value of tone ++ masking is compressed under certain conditions. A floor curve approaches ++ the original audio spectrum line as a result. [New M4] ++ ++ 2. In order to cut down the bitrate, a part of M2 code of beta4 was ++ deleted. ++ ++@3. The ATH curve was changed slightly. ++ ++ 4. Pre-echo decreased slightly. This is based on change of M3 code. ++ ++ 5. In order to decrease artifact by collapse of audio energy, noise ++ normalization processing of point stereo was extended. [32/44.1/48kHz only] ++ ++ 6. The threshold of channel coupling (lossless <=> point) is changed ++ dynamically. This is a method based on a certain idea. [M6] ++ ++...and I tune up many parameters. ++ ++ ++2006/10/24 ++Aoyumi ++ ++---------------------------------------------------------------------------- ++ ++aoTuV beta4.51 technical information ++ ++ ++The differences from the aoTuV beta 4.5... ++ ++ 1. The changed part of "scale.h" of Xiph.Org SVN was reflected in aoTuV. ++ This will solve the problem of the compile by gcc4. ++ ++ 2. A part of portion added by beta4.5 had caused memory access violation. ++ Depending on environment, a problem arises in qualiy-1/-2. This problem was ++ corrected. ++ ++ ++2005/11/17 ++Aoyumi ++ ++---------------------------------------------------------------------------- ++ ++aoTuV beta4.5 technical information ++ ++ ++The differences from the aoTuV beta 4... ++ ++ 1. M4 code of beta3 was deleted. M5 is added as what is replaced with it. ++ The advantage of this method is that the result stabilized more is obtained. ++ Instead, the change width of the bit rate becomes large rather than before. ++ [32/44.1/48kHz only] ++ ++ 2. New M4 was added. There is this for the same purpose as M1. However, ++ it is tuned up only in the low bit rate region according to work and ++ individual parameters. [32/44.1/48kHz only] ++ ++ 3. M2 code was extended. This decreases a specific noise problem. ++ [32/44.1/48kHz only] ++ ++...and I mainly tune up tone/noise masking and noise normalization parameters. ++ ++The above change is applied below quality3. ++ ++ ++2005/11/05 ++Aoyumi ++ ++---------------------------------------------------------------------------- ++ ++aoTuV beta4 technical information ++ ++ ++The differences from the aoTuV beta 3... ++ ++ 1. Adoption of new hypot (point stereo). This works in general better than ++ dipole/round hypot. And when residue is likely to decrease greatly at the ++ time of a reverse phase, added code is made to increase the ratio of lossless. ++ ++ 2. Change of ATH curve. This is not a big change. ++ ++ 3. Residue used for threshold calculation of channel coupling is changed. ++ This one seems to be good selection. ++ ++ 4. HF reduction code of beta3 was deleted. Now, this is not required. ++ ++ 5. The energy deficit of M4 code of beta3 -- correction of a bug Now. ++ ++ 6. The code for pulling downward floor of the frequency range which can ++ be easy to be heard was added (New M2). This works by the low bit rate and ++ has a comparatively good trade-off. ++ ++ 7. Change of threshold calculation of noise normalization. Moreover, it ++ takes phase information into consideration. ++ ++ ++...and I mainly tune up tone/noise masking and noise compander parameters. ++ ++ ++2005/06/18 ++Aoyumi ++ ++---------------------------------------------------------------------------- ++ ++aoTuV beta3 technical information ++ ++ ++The differences from the aoTuV beta 2 and Vorbis 1.1... ++ ++ 1. Dynamic impulse block noise control(q0-10). [32/44.1/48kHz only] ++ Conspicuous pre-echo is reduced. ++ ++ 2. New ATH curve. ++ ++ 3. In order to cancel that a small sound becomes unstable, the noise level ++ of low frequency is lowered under specific conditions. (Only below q3) ++ There is a greatest effect on a piano etc. [32/44.1/48kHz only] ++ ++ 4. The rate of lossless stereo is increased in specific conditions. This ++ improves many of conspicuous problems which a point stereo causes. (e.g ++ drumus's hiss/voice, guitar and brass's distortion) [32/44.1/48kHz only] ++ ++ 5. The action of the noise normalization of point stereo is corrected. It ++ was set to one of the causes of distortion in a long tone (e.g ++ strings/oboe/high tone voice). ++ ++ 6. The HF reduction code was not working normally. This is corrected and ++ it retuned up according to the present condition. [32/44.1/48kHz only] ++ ++ 7. The q-2 mode was added in all sampling frequencies. And nominal bitrate ++ of q-1 are changed into a more nearly average value. Although nominal ++ bitrate is more large at a low sampling frequency, average bitrate hardly ++ differs from the former version. ++ ++ ++...and I mainly tune up tone/noise masking parameters. ++ ++ ++2004/11/21 ++Aoyumi +diff -ruN libvorbis-1.2.0/CHANGES aotuv-b5.7_20090301/CHANGES +--- libvorbis-1.2.0/CHANGES 2007-07-25 18:27:00.000000000 +0200 ++++ aotuv-b5.7_20090301/CHANGES 2009-03-02 21:24:48.000000000 +0100 +@@ -1,3 +1,22 @@ ++libvorbis 1.2.2 (unreleased) -- "Xiph.Org libVorbis I 20081127" ++ ++ * define VENDOR and ENCODER strings ++ * seek correctly in files bigger than 2 GB (Windows) ++ * fix regression from CVE-2008-1420; 1.0b1 files work again ++ * mark all tables as constant to reduce memory occupation ++ ++libvorbis 1.2.1 (unreleased) -- "Xiph.Org libVorbis I 20080501" ++ ++ * Improved robustness with corrupt streams. ++ * New ov_read_filter() vorbisfile call allows filtering decoded ++ audio as floats before converting to integer samples. ++ * Replaced RTP payload format draft with RFC 5215. ++ * Bare bones self test under 'make check'. ++ * Fix a problem encoding some streams between 14 and 28 kHz. ++ * Fix a numerical instability in the edge extrapolation filter. ++ * Build system improvements. ++ * Specification correction. ++ + libvorbis 1.2.0 (2007-07-25) -- "Xiph.Org libVorbis I 20070622" + + * new ov_fopen() convenience call that avoids the common +diff -ruN libvorbis-1.2.0/COPYING aotuv-b5.7_20090301/COPYING +--- libvorbis-1.2.0/COPYING 2004-09-20 23:09:21.000000000 +0200 ++++ aotuv-b5.7_20090301/COPYING 2009-03-02 21:24:48.000000000 +0100 +@@ -1,4 +1,5 @@ +-Copyright (c) 2002-2004 Xiph.org Foundation ++aoTuV - Copyright (c) 2003-2008 Aoyumi ++libvorbis - Copyright (c) 2002-2008 Xiph.org Foundation + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions +diff -ruN libvorbis-1.2.0/examples/decoder_example.c aotuv-b5.7_20090301/examples/decoder_example.c +--- libvorbis-1.2.0/examples/decoder_example.c 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/examples/decoder_example.c 2009-03-02 21:24:48.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: simple example decoder +- last mod: $Id: decoder_example.c 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: decoder_example.c 14811 2008-04-28 21:42:52Z xiphmont $ + + ********************************************************************/ + +@@ -163,7 +163,11 @@ + fprintf(stderr,"Corrupt secondary header. Exiting.\n"); + exit(1); + } +- vorbis_synthesis_headerin(&vi,&vc,&op); ++ result=vorbis_synthesis_headerin(&vi,&vc,&op); ++ if(result<0){ ++ fprintf(stderr,"Corrupt secondary header. Exiting.\n"); ++ exit(1); ++ } + i++; + } + } +@@ -194,108 +198,111 @@ + + /* OK, got and parsed all three headers. Initialize the Vorbis + packet->PCM decoder. */ +- vorbis_synthesis_init(&vd,&vi); /* central decode state */ +- vorbis_block_init(&vd,&vb); /* local state for most of the decode +- so multiple block decodes can +- proceed in parallel. We could init +- multiple vorbis_block structures +- for vd here */ +- +- /* The rest is just a straight decode loop until end of stream */ +- while(!eos){ ++ if(vorbis_synthesis_init(&vd,&vi)==0){ /* central decode state */ ++ vorbis_block_init(&vd,&vb); /* local state for most of the decode ++ so multiple block decodes can ++ proceed in parallel. We could init ++ multiple vorbis_block structures ++ for vd here */ ++ ++ /* The rest is just a straight decode loop until end of stream */ + while(!eos){ +- int result=ogg_sync_pageout(&oy,&og); +- if(result==0)break; /* need more data */ +- if(result<0){ /* missing or corrupt data at this page position */ +- fprintf(stderr,"Corrupt or missing data in bitstream; " +- "continuing...\n"); +- }else{ +- ogg_stream_pagein(&os,&og); /* can safely ignore errors at +- this point */ +- while(1){ +- result=ogg_stream_packetout(&os,&op); +- +- if(result==0)break; /* need more data */ +- if(result<0){ /* missing or corrupt data at this page position */ +- /* no reason to complain; already complained above */ +- }else{ +- /* we have a packet. Decode it */ +- float **pcm; +- int samples; +- +- if(vorbis_synthesis(&vb,&op)==0) /* test for success! */ +- vorbis_synthesis_blockin(&vd,&vb); +- /* +- +- **pcm is a multichannel float vector. In stereo, for +- example, pcm[0] is left, and pcm[1] is right. samples is +- the size of each channel. Convert the float values +- (-1.<=range<=1.) to whatever PCM format and write it out */ ++ while(!eos){ ++ int result=ogg_sync_pageout(&oy,&og); ++ if(result==0)break; /* need more data */ ++ if(result<0){ /* missing or corrupt data at this page position */ ++ fprintf(stderr,"Corrupt or missing data in bitstream; " ++ "continuing...\n"); ++ }else{ ++ ogg_stream_pagein(&os,&og); /* can safely ignore errors at ++ this point */ ++ while(1){ ++ result=ogg_stream_packetout(&os,&op); + +- while((samples=vorbis_synthesis_pcmout(&vd,&pcm))>0){ +- int j; +- int clipflag=0; +- int bout=(samples0){ ++ int j; ++ int clipflag=0; ++ int bout=(samples32767){ +- val=32767; +- clipflag=1; +- } +- if(val<-32768){ +- val=-32768; +- clipflag=1; ++ /* might as well guard against clipping */ ++ if(val>32767){ ++ val=32767; ++ clipflag=1; ++ } ++ if(val<-32768){ ++ val=-32768; ++ clipflag=1; ++ } ++ *ptr=val; ++ ptr+=vi.channels; + } +- *ptr=val; +- ptr+=vi.channels; + } +- } +- +- if(clipflag) +- fprintf(stderr,"Clipping in frame %ld\n",(long)(vd.sequence)); +- +- +- fwrite(convbuffer,2*vi.channels,bout,stdout); +- +- vorbis_synthesis_read(&vd,bout); /* tell libvorbis how +- many samples we +- actually consumed */ +- } ++ ++ if(clipflag) ++ fprintf(stderr,"Clipping in frame %ld\n",(long)(vd.sequence)); ++ ++ ++ fwrite(convbuffer,2*vi.channels,bout,stdout); ++ ++ vorbis_synthesis_read(&vd,bout); /* tell libvorbis how ++ many samples we ++ actually consumed */ ++ } ++ } + } ++ if(ogg_page_eos(&og))eos=1; + } +- if(ogg_page_eos(&og))eos=1; ++ } ++ if(!eos){ ++ buffer=ogg_sync_buffer(&oy,4096); ++ bytes=fread(buffer,1,4096,stdin); ++ ogg_sync_wrote(&oy,bytes); ++ if(bytes==0)eos=1; + } + } +- if(!eos){ +- buffer=ogg_sync_buffer(&oy,4096); +- bytes=fread(buffer,1,4096,stdin); +- ogg_sync_wrote(&oy,bytes); +- if(bytes==0)eos=1; +- } ++ ++ /* ogg_page and ogg_packet structs always point to storage in ++ libvorbis. They're never freed or manipulated directly */ ++ ++ vorbis_block_clear(&vb); ++ vorbis_dsp_clear(&vd); ++ }else{ ++ fprintf(stderr,"Error: Corrupt header during playback initialization.\n"); + } +- ++ + /* clean up this logical bitstream; before exit we see if we're + followed by another [chained] */ +- +- ogg_stream_clear(&os); +- +- /* ogg_page and ogg_packet structs always point to storage in +- libvorbis. They're never freed or manipulated directly */ + +- vorbis_block_clear(&vb); +- vorbis_dsp_clear(&vd); +- vorbis_comment_clear(&vc); ++ ogg_stream_clear(&os); ++ vorbis_comment_clear(&vc); + vorbis_info_clear(&vi); /* must be called last */ + } + +diff -ruN libvorbis-1.2.0/examples/encoder_example.c aotuv-b5.7_20090301/examples/encoder_example.c +--- libvorbis-1.2.0/examples/encoder_example.c 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/examples/encoder_example.c 2009-03-02 21:24:48.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: simple example encoder +- last mod: $Id: encoder_example.c 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: encoder_example.c 14558 2008-03-08 02:23:34Z erikd $ + + ********************************************************************/ + +@@ -62,9 +62,9 @@ + /* this also lets the user set stdin and stdout */ + #endif + +- /* we cheat on the WAV header; we just bypass 44 bytes and never +- verify that it matches 16bit/stereo/44.1kHz. This is just an +- example, after all. */ ++ /* we cheat on the WAV header; we just bypass 44 bytes (simplest WAV ++ header is 44 bytes) and assume that the data is 44.1khz, stereo, 16 bit ++ little endian pcm samples. This is just an example, after all. */ + + #ifdef _WIN32 /* We need to set stdin/stdout to binary mode. Damn windows. */ + /* if we were reading/writing a file, it would also need to in +diff -ruN libvorbis-1.2.0/examples/Makefile.am aotuv-b5.7_20090301/examples/Makefile.am +--- libvorbis-1.2.0/examples/Makefile.am 2004-09-20 01:41:19.000000000 +0200 ++++ aotuv-b5.7_20090301/examples/Makefile.am 2009-03-02 21:24:48.000000000 +0100 +@@ -7,19 +7,25 @@ + noinst_PROGRAMS = decoder_example encoder_example chaining_example\ + vorbisfile_example seeking_example + ++EXTRA_DIST = frameview.pl ++ + # uncomment to build static executables from the example code + #LDFLAGS = -all-static +-LDADD = ../lib/libvorbis.la + + decoder_example_SOURCES = decoder_example.c ++decoder_example_LDADD = $(top_builddir)/lib/libvorbis.la ++ + encoder_example_SOURCES = encoder_example.c +-encoder_example_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la ++encoder_example_LDADD = $(top_builddir)/lib/libvorbisenc.la $(top_builddir)/lib/libvorbis.la ++ + chaining_example_SOURCES = chaining_example.c +-chaining_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la ++chaining_example_LDADD = $(top_builddir)/lib/libvorbisfile.la $(top_builddir)/lib/libvorbis.la ++ + vorbisfile_example_SOURCES = vorbisfile_example.c +-vorbisfile_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la ++vorbisfile_example_LDADD = $(top_builddir)/lib/libvorbisfile.la $(top_builddir)/lib/libvorbis.la ++ + seeking_example_SOURCES = seeking_example.c +-seeking_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la ++seeking_example_LDADD = $(top_builddir)/lib/libvorbisfile.la $(top_builddir)/lib/libvorbis.la + + debug: + $(MAKE) all CFLAGS="@DEBUG@" +diff -ruN libvorbis-1.2.0/include/vorbis/codec.h aotuv-b5.7_20090301/include/vorbis/codec.h +--- libvorbis-1.2.0/include/vorbis/codec.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/include/vorbis/codec.h 2009-03-02 21:24:46.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: libvorbis codec headers +- last mod: $Id: codec.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: codec.h 13571 2007-08-19 09:36:24Z erikd $ + + ********************************************************************/ + +@@ -166,11 +166,11 @@ + extern void vorbis_info_clear(vorbis_info *vi); + extern int vorbis_info_blocksize(vorbis_info *vi,int zo); + extern void vorbis_comment_init(vorbis_comment *vc); +-extern void vorbis_comment_add(vorbis_comment *vc, char *comment); ++extern void vorbis_comment_add(vorbis_comment *vc, const char *comment); + extern void vorbis_comment_add_tag(vorbis_comment *vc, +- char *tag, char *contents); +-extern char *vorbis_comment_query(vorbis_comment *vc, char *tag, int count); +-extern int vorbis_comment_query_count(vorbis_comment *vc, char *tag); ++ const char *tag, const char *contents); ++extern char *vorbis_comment_query(vorbis_comment *vc, const char *tag, int count); ++extern int vorbis_comment_query_count(vorbis_comment *vc, const char *tag); + extern void vorbis_comment_clear(vorbis_comment *vc); + + extern int vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb); +@@ -179,6 +179,8 @@ + extern double vorbis_granule_time(vorbis_dsp_state *v, + ogg_int64_t granulepos); + ++extern const char *vorbis_version_string(void); ++ + /* Vorbis PRIMITIVES: analysis/DSP layer ****************************/ + + extern int vorbis_analysis_init(vorbis_dsp_state *v,vorbis_info *vi); +diff -ruN libvorbis-1.2.0/include/vorbis/vorbisfile.h aotuv-b5.7_20090301/include/vorbis/vorbisfile.h +--- libvorbis-1.2.0/include/vorbis/vorbisfile.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/include/vorbis/vorbisfile.h 2009-03-02 21:24:46.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: stdio-based convenience library for opening/seeking/decoding +- last mod: $Id: vorbisfile.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: vorbisfile.h 15376 2008-10-05 05:04:01Z erikd $ + + ********************************************************************/ + +@@ -50,9 +50,25 @@ + + static int _ov_header_fseek_wrap(FILE *f,ogg_int64_t off,int whence){ + if(f==NULL)return(-1); ++ ++#ifdef __MINGW32__ ++ return fseeko64(f,off,whence); ++#elif defined (_WIN32) ++ return _fseeki64(f,off,whence); ++#else + return fseek(f,off,whence); ++#endif + } + ++/* These structs below (OV_CALLBACKS_DEFAULT etc) are defined here as ++ * static data. That means that every file which includes this header ++ * will get its own copy of these structs whether it uses them or ++ * not. This is essential on platforms such as Windows on which ++ * several different versions of stdio support may be linked to by ++ * different DLLs, and we need to be certain we know which one we're ++ * using (the same one as the main application). ++ */ ++ + static ov_callbacks OV_CALLBACKS_DEFAULT = { + (size_t (*)(void *, size_t, size_t, void *)) fread, + (int (*)(void *, ogg_int64_t, int)) _ov_header_fseek_wrap, +@@ -167,6 +183,9 @@ + + extern long ov_read_float(OggVorbis_File *vf,float ***pcm_channels,int samples, + int *bitstream); ++extern long ov_read_filter(OggVorbis_File *vf,char *buffer,int length, ++ int bigendianp,int word,int sgned,int *bitstream, ++ void (*filter)(float **pcm,long channels,long samples,void *filter_param),void *filter_param); + extern long ov_read(OggVorbis_File *vf,char *buffer,int length, + int bigendianp,int word,int sgned,int *bitstream); + extern int ov_crosslap(OggVorbis_File *vf1,OggVorbis_File *vf2); +@@ -180,4 +199,3 @@ + + #endif + +- +diff -ruN libvorbis-1.2.0/lib/block.c aotuv-b5.7_20090301/lib/block.c +--- libvorbis-1.2.0/lib/block.c 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/block.c 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: PCM data vector blocking, windowing and dis/reassembly +- last mod: $Id: block.c 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: block.c 2008-09-04 aoyumi $ + + Handle windowing, overlap-add, etc of the PCM vectors. This is made + more amusing by Vorbis' current two allowed block sizes. +@@ -106,7 +106,7 @@ + oggpack_writeinit(vbi->packetblob[i]); + } + } +- ++ + return(0); + } + +@@ -235,7 +235,8 @@ + if(!ci->fullbooks){ + ci->fullbooks=_ogg_calloc(ci->books,sizeof(*ci->fullbooks)); + for(i=0;ibooks;i++){ +- vorbis_book_init_decode(ci->fullbooks+i,ci->book_param[i]); ++ if(vorbis_book_init_decode(ci->fullbooks+i,ci->book_param[i])) ++ return -1; + /* decode codebooks are now standalone after init */ + vorbis_staticbook_destroy(ci->book_param[i]); + ci->book_param[i]=NULL; +@@ -287,6 +288,12 @@ + b=v->backend_state; + b->psy_g_look=_vp_global_look(vi); + ++ /* Init (added by aoyumi) */ ++ b->nblock = _ogg_calloc((256*vi->channels), sizeof(*b->nblock)); ++ b->tblock = _ogg_calloc((256*vi->channels), sizeof(*b->tblock)); ++ b->lownoise_compand_level = _ogg_calloc(vi->channels, sizeof(*b->lownoise_compand_level)); ++ b->impadnum = 0; ++ + /* Initialize the envelope state storage */ + b->ve=_ogg_calloc(1,sizeof(*b->ve)); + _ve_envelope_init(b->ve,vi); +@@ -351,6 +358,11 @@ + + drft_clear(&b->fft_look[0]); + drft_clear(&b->fft_look[1]); ++ ++ /* added by aoyumi */ ++ if(b->nblock) _ogg_free(b->nblock); ++ if(b->tblock) _ogg_free(b->tblock); ++ if(b->lownoise_compand_level) _ogg_free(b->lownoise_compand_level); + + } + +@@ -403,7 +415,7 @@ + + static void _preextrapolate_helper(vorbis_dsp_state *v){ + int i; +- int order=32; ++ int order=16; + float *lpc=alloca(order*sizeof(*lpc)); + float *work=alloca(v->pcm_current*sizeof(*work)); + long j; +@@ -418,6 +430,17 @@ + /* prime as above */ + vorbis_lpc_from_data(work,lpc,v->pcm_current-v->centerW,order); + ++#if 0 ++ if(v->vi->channels==2){ ++ if(i==0) ++ _analysis_output("predataL",0,work,v->pcm_current-v->centerW,0,0,0); ++ else ++ _analysis_output("predataR",0,work,v->pcm_current-v->centerW,0,0,0); ++ }else{ ++ _analysis_output("predata",0,work,v->pcm_current-v->centerW,0,0,0); ++ } ++#endif ++ + /* run the predictor filter */ + vorbis_lpc_predict(lpc,work+v->pcm_current-v->centerW-order, + order, +@@ -437,7 +460,19 @@ + int vorbis_analysis_wrote(vorbis_dsp_state *v, int vals){ + vorbis_info *vi=v->vi; + codec_setup_info *ci=vi->codec_setup; ++ highlevel_encode_setup *hi=&(ci->hi); + ++ /* pre-amplitude */ ++ { ++ int i,j; ++ for(i=0;ichannels;j++){ ++ //printf("pcm=%f\n", v->pcmret[j][i]); ++ v->pcmret[j][i]*=hi->pre_amplitude; ++ } ++ } ++ } ++ + if(vals<=0){ + int order=32; + int i; +@@ -683,9 +718,11 @@ + } + + int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi){ +- if(_vds_shared_init(v,vi,0)) return 1; ++ if(_vds_shared_init(v,vi,0)){ ++ vorbis_dsp_clear(v); ++ return 1; ++ } + vorbis_synthesis_restart(v); +- + return 0; + } + +diff -ruN libvorbis-1.2.0/lib/books/coupled/res_books_stereo.h aotuv-b5.7_20090301/lib/books/coupled/res_books_stereo.h +--- libvorbis-1.2.0/lib/books/coupled/res_books_stereo.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/books/coupled/res_books_stereo.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,18 +11,18 @@ + ******************************************************************** + + function: static codebooks autogenerated by huff/huffbuld +- last modified: $Id: res_books_stereo.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last modified: $Id: res_books_stereo.h 15531 2008-11-24 23:50:06Z xiphmont $ + + ********************************************************************/ + + #include "codebook.h" +-static long _vq_quantlist__16c0_s_p1_0[] = { ++static const long _vq_quantlist__16c0_s_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__16c0_s_p1_0[] = { ++static const long _vq_lengthlist__16c0_s_p1_0[] = { + 1, 4, 4, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, + 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -436,33 +436,33 @@ + 0, + }; + +-static float _vq_quantthresh__16c0_s_p1_0[] = { ++static const float _vq_quantthresh__16c0_s_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__16c0_s_p1_0[] = { ++static const long _vq_quantmap__16c0_s_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__16c0_s_p1_0 = { +- _vq_quantthresh__16c0_s_p1_0, +- _vq_quantmap__16c0_s_p1_0, ++static const encode_aux_threshmatch _vq_auxt__16c0_s_p1_0 = { ++ (float *)_vq_quantthresh__16c0_s_p1_0, ++ (long *)_vq_quantmap__16c0_s_p1_0, + 3, + 3 + }; + +-static static_codebook _16c0_s_p1_0 = { ++static const static_codebook _16c0_s_p1_0 = { + 8, 6561, +- _vq_lengthlist__16c0_s_p1_0, ++ (long *)_vq_lengthlist__16c0_s_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__16c0_s_p1_0, ++ (long *)_vq_quantlist__16c0_s_p1_0, + NULL, +- &_vq_auxt__16c0_s_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c0_s_p3_0[] = { ++static const long _vq_quantlist__16c0_s_p3_0[] = { + 2, + 1, + 3, +@@ -470,7 +470,7 @@ + 4, + }; + +-static long _vq_lengthlist__16c0_s_p3_0[] = { ++static const long _vq_lengthlist__16c0_s_p3_0[] = { + 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 6, 6, 7, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -513,33 +513,33 @@ + 0, + }; + +-static float _vq_quantthresh__16c0_s_p3_0[] = { ++static const float _vq_quantthresh__16c0_s_p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__16c0_s_p3_0[] = { ++static const long _vq_quantmap__16c0_s_p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__16c0_s_p3_0 = { +- _vq_quantthresh__16c0_s_p3_0, +- _vq_quantmap__16c0_s_p3_0, ++static const encode_aux_threshmatch _vq_auxt__16c0_s_p3_0 = { ++ (float *)_vq_quantthresh__16c0_s_p3_0, ++ (long *)_vq_quantmap__16c0_s_p3_0, + 5, + 5 + }; + +-static static_codebook _16c0_s_p3_0 = { ++static const static_codebook _16c0_s_p3_0 = { + 4, 625, +- _vq_lengthlist__16c0_s_p3_0, ++ (long *)_vq_lengthlist__16c0_s_p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__16c0_s_p3_0, ++ (long *)_vq_quantlist__16c0_s_p3_0, + NULL, +- &_vq_auxt__16c0_s_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c0_s_p4_0[] = { ++static const long _vq_quantlist__16c0_s_p4_0[] = { + 4, + 3, + 5, +@@ -551,7 +551,7 @@ + 8, + }; + +-static long _vq_lengthlist__16c0_s_p4_0[] = { ++static const long _vq_lengthlist__16c0_s_p4_0[] = { + 1, 3, 2, 7, 8, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, + 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, + 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, +@@ -560,34 +560,34 @@ + 0, + }; + +-static float _vq_quantthresh__16c0_s_p4_0[] = { ++static const float _vq_quantthresh__16c0_s_p4_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__16c0_s_p4_0[] = { ++static const long _vq_quantmap__16c0_s_p4_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__16c0_s_p4_0 = { +- _vq_quantthresh__16c0_s_p4_0, +- _vq_quantmap__16c0_s_p4_0, ++static const encode_aux_threshmatch _vq_auxt__16c0_s_p4_0 = { ++ (float *)_vq_quantthresh__16c0_s_p4_0, ++ (long *)_vq_quantmap__16c0_s_p4_0, + 9, + 9 + }; + +-static static_codebook _16c0_s_p4_0 = { ++static const static_codebook _16c0_s_p4_0 = { + 2, 81, +- _vq_lengthlist__16c0_s_p4_0, ++ (long *)_vq_lengthlist__16c0_s_p4_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__16c0_s_p4_0, ++ (long *)_vq_quantlist__16c0_s_p4_0, + NULL, +- &_vq_auxt__16c0_s_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c0_s_p5_0[] = { ++static const long _vq_quantlist__16c0_s_p5_0[] = { + 4, + 3, + 5, +@@ -599,7 +599,7 @@ + 8, + }; + +-static long _vq_lengthlist__16c0_s_p5_0[] = { ++static const long _vq_lengthlist__16c0_s_p5_0[] = { + 1, 3, 3, 6, 6, 6, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7, + 8, 8, 0, 0, 0, 7, 7, 7, 7, 8, 8, 0, 0, 0, 7, 7, + 8, 8, 9, 9, 0, 0, 0, 7, 7, 8, 8, 9, 9, 0, 0, 0, +@@ -608,34 +608,34 @@ + 10, + }; + +-static float _vq_quantthresh__16c0_s_p5_0[] = { ++static const float _vq_quantthresh__16c0_s_p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__16c0_s_p5_0[] = { ++static const long _vq_quantmap__16c0_s_p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__16c0_s_p5_0 = { +- _vq_quantthresh__16c0_s_p5_0, +- _vq_quantmap__16c0_s_p5_0, ++static const encode_aux_threshmatch _vq_auxt__16c0_s_p5_0 = { ++ (float *)_vq_quantthresh__16c0_s_p5_0, ++ (long *)_vq_quantmap__16c0_s_p5_0, + 9, + 9 + }; + +-static static_codebook _16c0_s_p5_0 = { ++static const static_codebook _16c0_s_p5_0 = { + 2, 81, +- _vq_lengthlist__16c0_s_p5_0, ++ (long *)_vq_lengthlist__16c0_s_p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__16c0_s_p5_0, ++ (long *)_vq_quantlist__16c0_s_p5_0, + NULL, +- &_vq_auxt__16c0_s_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c0_s_p6_0[] = { ++static const long _vq_quantlist__16c0_s_p6_0[] = { + 8, + 7, + 9, +@@ -655,7 +655,7 @@ + 16, + }; + +-static long _vq_lengthlist__16c0_s_p6_0[] = { ++static const long _vq_lengthlist__16c0_s_p6_0[] = { + 1, 3, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, + 11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,11, + 11,11, 0, 0, 0, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11, +@@ -677,42 +677,42 @@ + 14, + }; + +-static float _vq_quantthresh__16c0_s_p6_0[] = { ++static const float _vq_quantthresh__16c0_s_p6_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__16c0_s_p6_0[] = { ++static const long _vq_quantmap__16c0_s_p6_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__16c0_s_p6_0 = { +- _vq_quantthresh__16c0_s_p6_0, +- _vq_quantmap__16c0_s_p6_0, ++static const encode_aux_threshmatch _vq_auxt__16c0_s_p6_0 = { ++ (float *)_vq_quantthresh__16c0_s_p6_0, ++ (long *)_vq_quantmap__16c0_s_p6_0, + 17, + 17 + }; + +-static static_codebook _16c0_s_p6_0 = { ++static const static_codebook _16c0_s_p6_0 = { + 2, 289, +- _vq_lengthlist__16c0_s_p6_0, ++ (long *)_vq_lengthlist__16c0_s_p6_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__16c0_s_p6_0, ++ (long *)_vq_quantlist__16c0_s_p6_0, + NULL, +- &_vq_auxt__16c0_s_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c0_s_p7_0[] = { ++static const long _vq_quantlist__16c0_s_p7_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__16c0_s_p7_0[] = { ++static const long _vq_lengthlist__16c0_s_p7_0[] = { + 1, 4, 4, 6, 6, 6, 7, 6, 6, 4, 7, 7,11,10,10,11, + 11,10, 4, 7, 7,10,10,10,11,10,10, 6,10,10,11,11, + 11,11,11,10, 6, 9, 9,11,12,12,11, 9, 9, 6, 9,10, +@@ -721,33 +721,33 @@ + 13, + }; + +-static float _vq_quantthresh__16c0_s_p7_0[] = { ++static const float _vq_quantthresh__16c0_s_p7_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__16c0_s_p7_0[] = { ++static const long _vq_quantmap__16c0_s_p7_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__16c0_s_p7_0 = { +- _vq_quantthresh__16c0_s_p7_0, +- _vq_quantmap__16c0_s_p7_0, ++static const encode_aux_threshmatch _vq_auxt__16c0_s_p7_0 = { ++ (float *)_vq_quantthresh__16c0_s_p7_0, ++ (long *)_vq_quantmap__16c0_s_p7_0, + 3, + 3 + }; + +-static static_codebook _16c0_s_p7_0 = { ++static const static_codebook _16c0_s_p7_0 = { + 4, 81, +- _vq_lengthlist__16c0_s_p7_0, ++ (long *)_vq_lengthlist__16c0_s_p7_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__16c0_s_p7_0, ++ (long *)_vq_quantlist__16c0_s_p7_0, + NULL, +- &_vq_auxt__16c0_s_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c0_s_p7_1[] = { ++static const long _vq_quantlist__16c0_s_p7_1[] = { + 5, + 4, + 6, +@@ -761,7 +761,7 @@ + 10, + }; + +-static long _vq_lengthlist__16c0_s_p7_1[] = { ++static const long _vq_lengthlist__16c0_s_p7_1[] = { + 1, 3, 4, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, + 8, 8, 8, 9, 9, 9,10,10,10, 6, 7, 8, 8, 8, 8, 9, + 8,10,10,10, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, 7, +@@ -772,35 +772,35 @@ + 11,11,11, 9, 9, 9, 9,10,10, + }; + +-static float _vq_quantthresh__16c0_s_p7_1[] = { ++static const float _vq_quantthresh__16c0_s_p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__16c0_s_p7_1[] = { ++static const long _vq_quantmap__16c0_s_p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__16c0_s_p7_1 = { +- _vq_quantthresh__16c0_s_p7_1, +- _vq_quantmap__16c0_s_p7_1, ++static const encode_aux_threshmatch _vq_auxt__16c0_s_p7_1 = { ++ (float *)_vq_quantthresh__16c0_s_p7_1, ++ (long *)_vq_quantmap__16c0_s_p7_1, + 11, + 11 + }; + +-static static_codebook _16c0_s_p7_1 = { ++static const static_codebook _16c0_s_p7_1 = { + 2, 121, +- _vq_lengthlist__16c0_s_p7_1, ++ (long *)_vq_lengthlist__16c0_s_p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__16c0_s_p7_1, ++ (long *)_vq_quantlist__16c0_s_p7_1, + NULL, +- &_vq_auxt__16c0_s_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16c0_s_p8_0[] = { ++static const long _vq_quantlist__16c0_s_p8_0[] = { + 6, + 5, + 7, +@@ -816,7 +816,7 @@ + 12, + }; + +-static long _vq_lengthlist__16c0_s_p8_0[] = { ++static const long _vq_lengthlist__16c0_s_p8_0[] = { + 1, 4, 4, 7, 7, 7, 7, 7, 6, 8, 8,10,10, 6, 5, 6, + 8, 8, 8, 8, 8, 8, 8, 9,10,10, 7, 6, 6, 8, 8, 8, + 8, 8, 8, 8, 8,10,10, 0, 8, 8, 8, 8, 9, 8, 9, 9, +@@ -830,35 +830,35 @@ + 0,12,13,13,12,13,14,14,14, + }; + +-static float _vq_quantthresh__16c0_s_p8_0[] = { ++static const float _vq_quantthresh__16c0_s_p8_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__16c0_s_p8_0[] = { ++static const long _vq_quantmap__16c0_s_p8_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__16c0_s_p8_0 = { +- _vq_quantthresh__16c0_s_p8_0, +- _vq_quantmap__16c0_s_p8_0, ++static const encode_aux_threshmatch _vq_auxt__16c0_s_p8_0 = { ++ (float *)_vq_quantthresh__16c0_s_p8_0, ++ (long *)_vq_quantmap__16c0_s_p8_0, + 13, + 13 + }; + +-static static_codebook _16c0_s_p8_0 = { ++static const static_codebook _16c0_s_p8_0 = { + 2, 169, +- _vq_lengthlist__16c0_s_p8_0, ++ (long *)_vq_lengthlist__16c0_s_p8_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__16c0_s_p8_0, ++ (long *)_vq_quantlist__16c0_s_p8_0, + NULL, +- &_vq_auxt__16c0_s_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c0_s_p8_1[] = { ++static const long _vq_quantlist__16c0_s_p8_1[] = { + 2, + 1, + 3, +@@ -866,44 +866,44 @@ + 4, + }; + +-static long _vq_lengthlist__16c0_s_p8_1[] = { ++static const long _vq_lengthlist__16c0_s_p8_1[] = { + 1, 4, 3, 5, 5, 7, 7, 7, 6, 6, 7, 7, 7, 5, 5, 7, + 7, 7, 6, 6, 7, 7, 7, 6, 6, + }; + +-static float _vq_quantthresh__16c0_s_p8_1[] = { ++static const float _vq_quantthresh__16c0_s_p8_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__16c0_s_p8_1[] = { ++static const long _vq_quantmap__16c0_s_p8_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__16c0_s_p8_1 = { +- _vq_quantthresh__16c0_s_p8_1, +- _vq_quantmap__16c0_s_p8_1, ++static const encode_aux_threshmatch _vq_auxt__16c0_s_p8_1 = { ++ (float *)_vq_quantthresh__16c0_s_p8_1, ++ (long *)_vq_quantmap__16c0_s_p8_1, + 5, + 5 + }; + +-static static_codebook _16c0_s_p8_1 = { ++static const static_codebook _16c0_s_p8_1 = { + 2, 25, +- _vq_lengthlist__16c0_s_p8_1, ++ (long *)_vq_lengthlist__16c0_s_p8_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__16c0_s_p8_1, ++ (long *)_vq_quantlist__16c0_s_p8_1, + NULL, +- &_vq_auxt__16c0_s_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16c0_s_p9_0[] = { ++static const long _vq_quantlist__16c0_s_p9_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__16c0_s_p9_0[] = { ++static const long _vq_lengthlist__16c0_s_p9_0[] = { + 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, +@@ -912,33 +912,33 @@ + 7, + }; + +-static float _vq_quantthresh__16c0_s_p9_0[] = { ++static const float _vq_quantthresh__16c0_s_p9_0[] = { + -157.5, 157.5, + }; + +-static long _vq_quantmap__16c0_s_p9_0[] = { ++static const long _vq_quantmap__16c0_s_p9_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__16c0_s_p9_0 = { +- _vq_quantthresh__16c0_s_p9_0, +- _vq_quantmap__16c0_s_p9_0, ++static const encode_aux_threshmatch _vq_auxt__16c0_s_p9_0 = { ++ (float *)_vq_quantthresh__16c0_s_p9_0, ++ (long *)_vq_quantmap__16c0_s_p9_0, + 3, + 3 + }; + +-static static_codebook _16c0_s_p9_0 = { ++static const static_codebook _16c0_s_p9_0 = { + 4, 81, +- _vq_lengthlist__16c0_s_p9_0, ++ (long *)_vq_lengthlist__16c0_s_p9_0, + 1, -518803456, 1628680192, 2, 0, +- _vq_quantlist__16c0_s_p9_0, ++ (long *)_vq_quantlist__16c0_s_p9_0, + NULL, +- &_vq_auxt__16c0_s_p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c0_s_p9_1[] = { ++static const long _vq_quantlist__16c0_s_p9_1[] = { + 7, + 6, + 8, +@@ -956,7 +956,7 @@ + 14, + }; + +-static long _vq_lengthlist__16c0_s_p9_1[] = { ++static const long _vq_lengthlist__16c0_s_p9_1[] = { + 1, 5, 5, 5, 5, 9,11,11,10,10,10,10,10,10,10, 7, + 6, 6, 6, 6,10,10,10,10,10,10,10,10,10,10, 7, 6, + 6, 6, 6,10, 9,10,10,10,10,10,10,10,10,10, 7, 7, +@@ -974,35 +974,35 @@ + 10, + }; + +-static float _vq_quantthresh__16c0_s_p9_1[] = { ++static const float _vq_quantthresh__16c0_s_p9_1[] = { + -136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, + 31.5, 52.5, 73.5, 94.5, 115.5, 136.5, + }; + +-static long _vq_quantmap__16c0_s_p9_1[] = { ++static const long _vq_quantmap__16c0_s_p9_1[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__16c0_s_p9_1 = { +- _vq_quantthresh__16c0_s_p9_1, +- _vq_quantmap__16c0_s_p9_1, ++static const encode_aux_threshmatch _vq_auxt__16c0_s_p9_1 = { ++ (float *)_vq_quantthresh__16c0_s_p9_1, ++ (long *)_vq_quantmap__16c0_s_p9_1, + 15, + 15 + }; + +-static static_codebook _16c0_s_p9_1 = { ++static const static_codebook _16c0_s_p9_1 = { + 2, 225, +- _vq_lengthlist__16c0_s_p9_1, ++ (long *)_vq_lengthlist__16c0_s_p9_1, + 1, -520986624, 1620377600, 4, 0, +- _vq_quantlist__16c0_s_p9_1, ++ (long *)_vq_quantlist__16c0_s_p9_1, + NULL, +- &_vq_auxt__16c0_s_p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16c0_s_p9_2[] = { ++static const long _vq_quantlist__16c0_s_p9_2[] = { + 10, + 9, + 11, +@@ -1026,7 +1026,7 @@ + 20, + }; + +-static long _vq_lengthlist__16c0_s_p9_2[] = { ++static const long _vq_lengthlist__16c0_s_p9_2[] = { + 1, 5, 5, 7, 8, 8, 7, 9, 9, 9,12,12,11,12,12,10, + 10,11,12,12,12,11,12,12, 8, 9, 8, 7, 9,10,10,11, + 11,10,11,12,10,12,10,12,12,12,11,12,11, 9, 8, 8, +@@ -1057,37 +1057,37 @@ + 10,11,10,10,11, 9,10,10,10, + }; + +-static float _vq_quantthresh__16c0_s_p9_2[] = { ++static const float _vq_quantthresh__16c0_s_p9_2[] = { + -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, + -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, + 6.5, 7.5, 8.5, 9.5, + }; + +-static long _vq_quantmap__16c0_s_p9_2[] = { ++static const long _vq_quantmap__16c0_s_p9_2[] = { + 19, 17, 15, 13, 11, 9, 7, 5, + 3, 1, 0, 2, 4, 6, 8, 10, + 12, 14, 16, 18, 20, + }; + +-static encode_aux_threshmatch _vq_auxt__16c0_s_p9_2 = { +- _vq_quantthresh__16c0_s_p9_2, +- _vq_quantmap__16c0_s_p9_2, ++static const encode_aux_threshmatch _vq_auxt__16c0_s_p9_2 = { ++ (float *)_vq_quantthresh__16c0_s_p9_2, ++ (long *)_vq_quantmap__16c0_s_p9_2, + 21, + 21 + }; + +-static static_codebook _16c0_s_p9_2 = { ++static const static_codebook _16c0_s_p9_2 = { + 2, 441, +- _vq_lengthlist__16c0_s_p9_2, ++ (long *)_vq_lengthlist__16c0_s_p9_2, + 1, -529268736, 1611661312, 5, 0, +- _vq_quantlist__16c0_s_p9_2, ++ (long *)_vq_quantlist__16c0_s_p9_2, + NULL, +- &_vq_auxt__16c0_s_p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__16c0_s_p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__16c0_s_single[] = { ++static const long _huff_lengthlist__16c0_s_single[] = { + 3, 4,19, 7, 9, 7, 8,11, 9,12, 4, 1,19, 6, 7, 7, + 8,10,11,13,18,18,18,18,18,18,18,18,18,18, 8, 6, + 18, 8, 9, 9,11,12,14,18, 9, 6,18, 9, 7, 8, 9,11, +@@ -1097,9 +1097,9 @@ + 16,16,18,18, + }; + +-static static_codebook _huff_book__16c0_s_single = { ++static const static_codebook _huff_book__16c0_s_single = { + 2, 100, +- _huff_lengthlist__16c0_s_single, ++ (long *)_huff_lengthlist__16c0_s_single, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1108,7 +1108,7 @@ + 0 + }; + +-static long _huff_lengthlist__16c1_s_long[] = { ++static const long _huff_lengthlist__16c1_s_long[] = { + 2, 5,20, 7,10, 7, 8,10,11,11, 4, 2,20, 5, 8, 6, + 7, 9,10,10,20,20,20,20,19,19,19,19,19,19, 7, 5, + 19, 6,10, 7, 9,11,13,17,11, 8,19,10, 7, 7, 8,10, +@@ -1118,9 +1118,9 @@ + 12,11,11,13, + }; + +-static static_codebook _huff_book__16c1_s_long = { ++static const static_codebook _huff_book__16c1_s_long = { + 2, 100, +- _huff_lengthlist__16c1_s_long, ++ (long *)_huff_lengthlist__16c1_s_long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1129,13 +1129,13 @@ + 0 + }; + +-static long _vq_quantlist__16c1_s_p1_0[] = { ++static const long _vq_quantlist__16c1_s_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__16c1_s_p1_0[] = { ++static const long _vq_lengthlist__16c1_s_p1_0[] = { + 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, + 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -1549,33 +1549,33 @@ + 0, + }; + +-static float _vq_quantthresh__16c1_s_p1_0[] = { ++static const float _vq_quantthresh__16c1_s_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__16c1_s_p1_0[] = { ++static const long _vq_quantmap__16c1_s_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__16c1_s_p1_0 = { +- _vq_quantthresh__16c1_s_p1_0, +- _vq_quantmap__16c1_s_p1_0, ++static const encode_aux_threshmatch _vq_auxt__16c1_s_p1_0 = { ++ (float *)_vq_quantthresh__16c1_s_p1_0, ++ (long *)_vq_quantmap__16c1_s_p1_0, + 3, + 3 + }; + +-static static_codebook _16c1_s_p1_0 = { ++static const static_codebook _16c1_s_p1_0 = { + 8, 6561, +- _vq_lengthlist__16c1_s_p1_0, ++ (long *)_vq_lengthlist__16c1_s_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__16c1_s_p1_0, ++ (long *)_vq_quantlist__16c1_s_p1_0, + NULL, +- &_vq_auxt__16c1_s_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c1_s_p3_0[] = { ++static const long _vq_quantlist__16c1_s_p3_0[] = { + 2, + 1, + 3, +@@ -1583,7 +1583,7 @@ + 4, + }; + +-static long _vq_lengthlist__16c1_s_p3_0[] = { ++static const long _vq_lengthlist__16c1_s_p3_0[] = { + 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -1626,33 +1626,33 @@ + 0, + }; + +-static float _vq_quantthresh__16c1_s_p3_0[] = { ++static const float _vq_quantthresh__16c1_s_p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__16c1_s_p3_0[] = { ++static const long _vq_quantmap__16c1_s_p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__16c1_s_p3_0 = { +- _vq_quantthresh__16c1_s_p3_0, +- _vq_quantmap__16c1_s_p3_0, ++static const encode_aux_threshmatch _vq_auxt__16c1_s_p3_0 = { ++ (float *)_vq_quantthresh__16c1_s_p3_0, ++ (long *)_vq_quantmap__16c1_s_p3_0, + 5, + 5 + }; + +-static static_codebook _16c1_s_p3_0 = { ++static const static_codebook _16c1_s_p3_0 = { + 4, 625, +- _vq_lengthlist__16c1_s_p3_0, ++ (long *)_vq_lengthlist__16c1_s_p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__16c1_s_p3_0, ++ (long *)_vq_quantlist__16c1_s_p3_0, + NULL, +- &_vq_auxt__16c1_s_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c1_s_p4_0[] = { ++static const long _vq_quantlist__16c1_s_p4_0[] = { + 4, + 3, + 5, +@@ -1664,7 +1664,7 @@ + 8, + }; + +-static long _vq_lengthlist__16c1_s_p4_0[] = { ++static const long _vq_lengthlist__16c1_s_p4_0[] = { + 1, 2, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, + 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, + 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, +@@ -1673,34 +1673,34 @@ + 0, + }; + +-static float _vq_quantthresh__16c1_s_p4_0[] = { ++static const float _vq_quantthresh__16c1_s_p4_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__16c1_s_p4_0[] = { ++static const long _vq_quantmap__16c1_s_p4_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__16c1_s_p4_0 = { +- _vq_quantthresh__16c1_s_p4_0, +- _vq_quantmap__16c1_s_p4_0, ++static const encode_aux_threshmatch _vq_auxt__16c1_s_p4_0 = { ++ (float *)_vq_quantthresh__16c1_s_p4_0, ++ (long *)_vq_quantmap__16c1_s_p4_0, + 9, + 9 + }; + +-static static_codebook _16c1_s_p4_0 = { ++static const static_codebook _16c1_s_p4_0 = { + 2, 81, +- _vq_lengthlist__16c1_s_p4_0, ++ (long *)_vq_lengthlist__16c1_s_p4_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__16c1_s_p4_0, ++ (long *)_vq_quantlist__16c1_s_p4_0, + NULL, +- &_vq_auxt__16c1_s_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c1_s_p5_0[] = { ++static const long _vq_quantlist__16c1_s_p5_0[] = { + 4, + 3, + 5, +@@ -1712,7 +1712,7 @@ + 8, + }; + +-static long _vq_lengthlist__16c1_s_p5_0[] = { ++static const long _vq_lengthlist__16c1_s_p5_0[] = { + 1, 3, 3, 5, 5, 6, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7, + 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 8, 8, + 8, 8, 9, 9, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, +@@ -1721,34 +1721,34 @@ + 10, + }; + +-static float _vq_quantthresh__16c1_s_p5_0[] = { ++static const float _vq_quantthresh__16c1_s_p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__16c1_s_p5_0[] = { ++static const long _vq_quantmap__16c1_s_p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__16c1_s_p5_0 = { +- _vq_quantthresh__16c1_s_p5_0, +- _vq_quantmap__16c1_s_p5_0, ++static const encode_aux_threshmatch _vq_auxt__16c1_s_p5_0 = { ++ (float *)_vq_quantthresh__16c1_s_p5_0, ++ (long *)_vq_quantmap__16c1_s_p5_0, + 9, + 9 + }; + +-static static_codebook _16c1_s_p5_0 = { ++static const static_codebook _16c1_s_p5_0 = { + 2, 81, +- _vq_lengthlist__16c1_s_p5_0, ++ (long *)_vq_lengthlist__16c1_s_p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__16c1_s_p5_0, ++ (long *)_vq_quantlist__16c1_s_p5_0, + NULL, +- &_vq_auxt__16c1_s_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c1_s_p6_0[] = { ++static const long _vq_quantlist__16c1_s_p6_0[] = { + 8, + 7, + 9, +@@ -1768,7 +1768,7 @@ + 16, + }; + +-static long _vq_lengthlist__16c1_s_p6_0[] = { ++static const long _vq_lengthlist__16c1_s_p6_0[] = { + 1, 3, 3, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11,12, + 12, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11, + 12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11, +@@ -1790,42 +1790,42 @@ + 14, + }; + +-static float _vq_quantthresh__16c1_s_p6_0[] = { ++static const float _vq_quantthresh__16c1_s_p6_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__16c1_s_p6_0[] = { ++static const long _vq_quantmap__16c1_s_p6_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__16c1_s_p6_0 = { +- _vq_quantthresh__16c1_s_p6_0, +- _vq_quantmap__16c1_s_p6_0, ++static const encode_aux_threshmatch _vq_auxt__16c1_s_p6_0 = { ++ (float *)_vq_quantthresh__16c1_s_p6_0, ++ (long *)_vq_quantmap__16c1_s_p6_0, + 17, + 17 + }; + +-static static_codebook _16c1_s_p6_0 = { ++static const static_codebook _16c1_s_p6_0 = { + 2, 289, +- _vq_lengthlist__16c1_s_p6_0, ++ (long *)_vq_lengthlist__16c1_s_p6_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__16c1_s_p6_0, ++ (long *)_vq_quantlist__16c1_s_p6_0, + NULL, +- &_vq_auxt__16c1_s_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c1_s_p7_0[] = { ++static const long _vq_quantlist__16c1_s_p7_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__16c1_s_p7_0[] = { ++static const long _vq_lengthlist__16c1_s_p7_0[] = { + 1, 4, 4, 6, 6, 6, 7, 6, 6, 4, 7, 7,10, 9,10,10, + 10, 9, 4, 7, 7,10,10,10,11,10,10, 6,10,10,11,11, + 11,11,10,10, 6,10, 9,11,11,11,11,10,10, 6,10,10, +@@ -1834,33 +1834,33 @@ + 11, + }; + +-static float _vq_quantthresh__16c1_s_p7_0[] = { ++static const float _vq_quantthresh__16c1_s_p7_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__16c1_s_p7_0[] = { ++static const long _vq_quantmap__16c1_s_p7_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__16c1_s_p7_0 = { +- _vq_quantthresh__16c1_s_p7_0, +- _vq_quantmap__16c1_s_p7_0, ++static const encode_aux_threshmatch _vq_auxt__16c1_s_p7_0 = { ++ (float *)_vq_quantthresh__16c1_s_p7_0, ++ (long *)_vq_quantmap__16c1_s_p7_0, + 3, + 3 + }; + +-static static_codebook _16c1_s_p7_0 = { ++static const static_codebook _16c1_s_p7_0 = { + 4, 81, +- _vq_lengthlist__16c1_s_p7_0, ++ (long *)_vq_lengthlist__16c1_s_p7_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__16c1_s_p7_0, ++ (long *)_vq_quantlist__16c1_s_p7_0, + NULL, +- &_vq_auxt__16c1_s_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c1_s_p7_1[] = { ++static const long _vq_quantlist__16c1_s_p7_1[] = { + 5, + 4, + 6, +@@ -1874,7 +1874,7 @@ + 10, + }; + +-static long _vq_lengthlist__16c1_s_p7_1[] = { ++static const long _vq_lengthlist__16c1_s_p7_1[] = { + 2, 3, 3, 5, 6, 7, 7, 7, 7, 8, 8,10,10,10, 6, 6, + 7, 7, 8, 8, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8, + 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, +@@ -1885,35 +1885,35 @@ + 10,10,10, 8, 8, 8, 8, 9, 9, + }; + +-static float _vq_quantthresh__16c1_s_p7_1[] = { ++static const float _vq_quantthresh__16c1_s_p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__16c1_s_p7_1[] = { ++static const long _vq_quantmap__16c1_s_p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__16c1_s_p7_1 = { +- _vq_quantthresh__16c1_s_p7_1, +- _vq_quantmap__16c1_s_p7_1, ++static const encode_aux_threshmatch _vq_auxt__16c1_s_p7_1 = { ++ (float *)_vq_quantthresh__16c1_s_p7_1, ++ (long *)_vq_quantmap__16c1_s_p7_1, + 11, + 11 + }; + +-static static_codebook _16c1_s_p7_1 = { ++static const static_codebook _16c1_s_p7_1 = { + 2, 121, +- _vq_lengthlist__16c1_s_p7_1, ++ (long *)_vq_lengthlist__16c1_s_p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__16c1_s_p7_1, ++ (long *)_vq_quantlist__16c1_s_p7_1, + NULL, +- &_vq_auxt__16c1_s_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16c1_s_p8_0[] = { ++static const long _vq_quantlist__16c1_s_p8_0[] = { + 6, + 5, + 7, +@@ -1929,7 +1929,7 @@ + 12, + }; + +-static long _vq_lengthlist__16c1_s_p8_0[] = { ++static const long _vq_lengthlist__16c1_s_p8_0[] = { + 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 6, 5, 5, + 7, 8, 8, 9, 8, 8, 9, 9,10,11, 6, 5, 5, 8, 8, 9, + 9, 8, 8, 9,10,10,11, 0, 8, 8, 8, 9, 9, 9, 9, 9, +@@ -1943,35 +1943,35 @@ + 0,12,12,12,12,13,13,14,15, + }; + +-static float _vq_quantthresh__16c1_s_p8_0[] = { ++static const float _vq_quantthresh__16c1_s_p8_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__16c1_s_p8_0[] = { ++static const long _vq_quantmap__16c1_s_p8_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__16c1_s_p8_0 = { +- _vq_quantthresh__16c1_s_p8_0, +- _vq_quantmap__16c1_s_p8_0, ++static const encode_aux_threshmatch _vq_auxt__16c1_s_p8_0 = { ++ (float *)_vq_quantthresh__16c1_s_p8_0, ++ (long *)_vq_quantmap__16c1_s_p8_0, + 13, + 13 + }; + +-static static_codebook _16c1_s_p8_0 = { ++static const static_codebook _16c1_s_p8_0 = { + 2, 169, +- _vq_lengthlist__16c1_s_p8_0, ++ (long *)_vq_lengthlist__16c1_s_p8_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__16c1_s_p8_0, ++ (long *)_vq_quantlist__16c1_s_p8_0, + NULL, +- &_vq_auxt__16c1_s_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c1_s_p8_1[] = { ++static const long _vq_quantlist__16c1_s_p8_1[] = { + 2, + 1, + 3, +@@ -1979,38 +1979,38 @@ + 4, + }; + +-static long _vq_lengthlist__16c1_s_p8_1[] = { ++static const long _vq_lengthlist__16c1_s_p8_1[] = { + 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, + 6, 6, 5, 5, 6, 6, 6, 5, 5, + }; + +-static float _vq_quantthresh__16c1_s_p8_1[] = { ++static const float _vq_quantthresh__16c1_s_p8_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__16c1_s_p8_1[] = { ++static const long _vq_quantmap__16c1_s_p8_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__16c1_s_p8_1 = { +- _vq_quantthresh__16c1_s_p8_1, +- _vq_quantmap__16c1_s_p8_1, ++static const encode_aux_threshmatch _vq_auxt__16c1_s_p8_1 = { ++ (float *)_vq_quantthresh__16c1_s_p8_1, ++ (long *)_vq_quantmap__16c1_s_p8_1, + 5, + 5 + }; + +-static static_codebook _16c1_s_p8_1 = { ++static const static_codebook _16c1_s_p8_1 = { + 2, 25, +- _vq_lengthlist__16c1_s_p8_1, ++ (long *)_vq_lengthlist__16c1_s_p8_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__16c1_s_p8_1, ++ (long *)_vq_quantlist__16c1_s_p8_1, + NULL, +- &_vq_auxt__16c1_s_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16c1_s_p9_0[] = { ++static const long _vq_quantlist__16c1_s_p9_0[] = { + 6, + 5, + 7, +@@ -2026,7 +2026,7 @@ + 12, + }; + +-static long _vq_lengthlist__16c1_s_p9_0[] = { ++static const long _vq_lengthlist__16c1_s_p9_0[] = { + 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, +@@ -2040,35 +2040,35 @@ + 8, 8, 8, 8, 8, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__16c1_s_p9_0[] = { ++static const float _vq_quantthresh__16c1_s_p9_0[] = { + -1732.5, -1417.5, -1102.5, -787.5, -472.5, -157.5, 157.5, 472.5, + 787.5, 1102.5, 1417.5, 1732.5, + }; + +-static long _vq_quantmap__16c1_s_p9_0[] = { ++static const long _vq_quantmap__16c1_s_p9_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__16c1_s_p9_0 = { +- _vq_quantthresh__16c1_s_p9_0, +- _vq_quantmap__16c1_s_p9_0, ++static const encode_aux_threshmatch _vq_auxt__16c1_s_p9_0 = { ++ (float *)_vq_quantthresh__16c1_s_p9_0, ++ (long *)_vq_quantmap__16c1_s_p9_0, + 13, + 13 + }; + +-static static_codebook _16c1_s_p9_0 = { ++static const static_codebook _16c1_s_p9_0 = { + 2, 169, +- _vq_lengthlist__16c1_s_p9_0, ++ (long *)_vq_lengthlist__16c1_s_p9_0, + 1, -513964032, 1628680192, 4, 0, +- _vq_quantlist__16c1_s_p9_0, ++ (long *)_vq_quantlist__16c1_s_p9_0, + NULL, +- &_vq_auxt__16c1_s_p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c1_s_p9_1[] = { ++static const long _vq_quantlist__16c1_s_p9_1[] = { + 7, + 6, + 8, +@@ -2086,7 +2086,7 @@ + 14, + }; + +-static long _vq_lengthlist__16c1_s_p9_1[] = { ++static const long _vq_lengthlist__16c1_s_p9_1[] = { + 1, 4, 4, 4, 4, 8, 8,12,13,14,14,14,14,14,14, 6, + 6, 6, 6, 6,10, 9,14,14,14,14,14,14,14,14, 7, 6, + 5, 6, 6,10, 9,12,13,13,13,13,13,13,13,13, 7, 7, +@@ -2104,35 +2104,35 @@ + 13, + }; + +-static float _vq_quantthresh__16c1_s_p9_1[] = { ++static const float _vq_quantthresh__16c1_s_p9_1[] = { + -136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, + 31.5, 52.5, 73.5, 94.5, 115.5, 136.5, + }; + +-static long _vq_quantmap__16c1_s_p9_1[] = { ++static const long _vq_quantmap__16c1_s_p9_1[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__16c1_s_p9_1 = { +- _vq_quantthresh__16c1_s_p9_1, +- _vq_quantmap__16c1_s_p9_1, ++static const encode_aux_threshmatch _vq_auxt__16c1_s_p9_1 = { ++ (float *)_vq_quantthresh__16c1_s_p9_1, ++ (long *)_vq_quantmap__16c1_s_p9_1, + 15, + 15 + }; + +-static static_codebook _16c1_s_p9_1 = { ++static const static_codebook _16c1_s_p9_1 = { + 2, 225, +- _vq_lengthlist__16c1_s_p9_1, ++ (long *)_vq_lengthlist__16c1_s_p9_1, + 1, -520986624, 1620377600, 4, 0, +- _vq_quantlist__16c1_s_p9_1, ++ (long *)_vq_quantlist__16c1_s_p9_1, + NULL, +- &_vq_auxt__16c1_s_p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16c1_s_p9_2[] = { ++static const long _vq_quantlist__16c1_s_p9_2[] = { + 10, + 9, + 11, +@@ -2156,7 +2156,7 @@ + 20, + }; + +-static long _vq_lengthlist__16c1_s_p9_2[] = { ++static const long _vq_lengthlist__16c1_s_p9_2[] = { + 1, 4, 4, 6, 6, 7, 7, 8, 7, 8, 8, 9, 9, 9, 9,10, + 10,10, 9,10,10,11,12,12, 8, 8, 8, 8, 9, 9, 9, 9, + 10,10,10,10,10,11,11,10,12,11,11,13,11, 7, 7, 8, +@@ -2187,37 +2187,37 @@ + 11,11,11,11,12,11,11,12,11, + }; + +-static float _vq_quantthresh__16c1_s_p9_2[] = { ++static const float _vq_quantthresh__16c1_s_p9_2[] = { + -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, + -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, + 6.5, 7.5, 8.5, 9.5, + }; + +-static long _vq_quantmap__16c1_s_p9_2[] = { ++static const long _vq_quantmap__16c1_s_p9_2[] = { + 19, 17, 15, 13, 11, 9, 7, 5, + 3, 1, 0, 2, 4, 6, 8, 10, + 12, 14, 16, 18, 20, + }; + +-static encode_aux_threshmatch _vq_auxt__16c1_s_p9_2 = { +- _vq_quantthresh__16c1_s_p9_2, +- _vq_quantmap__16c1_s_p9_2, ++static const encode_aux_threshmatch _vq_auxt__16c1_s_p9_2 = { ++ (float *)_vq_quantthresh__16c1_s_p9_2, ++ (long *)_vq_quantmap__16c1_s_p9_2, + 21, + 21 + }; + +-static static_codebook _16c1_s_p9_2 = { ++static const static_codebook _16c1_s_p9_2 = { + 2, 441, +- _vq_lengthlist__16c1_s_p9_2, ++ (long *)_vq_lengthlist__16c1_s_p9_2, + 1, -529268736, 1611661312, 5, 0, +- _vq_quantlist__16c1_s_p9_2, ++ (long *)_vq_quantlist__16c1_s_p9_2, + NULL, +- &_vq_auxt__16c1_s_p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__16c1_s_p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__16c1_s_short[] = { ++static const long _huff_lengthlist__16c1_s_short[] = { + 5, 6,17, 8,12, 9,10,10,12,13, 5, 2,17, 4, 9, 5, + 7, 8,11,13,16,16,16,16,16,16,16,16,16,16, 6, 4, + 16, 5,10, 5, 7,10,14,16,13, 9,16,11, 8, 7, 8, 9, +@@ -2227,9 +2227,9 @@ + 9, 9,10,13, + }; + +-static static_codebook _huff_book__16c1_s_short = { ++static const static_codebook _huff_book__16c1_s_short = { + 2, 100, +- _huff_lengthlist__16c1_s_short, ++ (long *)_huff_lengthlist__16c1_s_short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -2238,7 +2238,7 @@ + 0 + }; + +-static long _huff_lengthlist__16c2_s_long[] = { ++static const long _huff_lengthlist__16c2_s_long[] = { + 4, 7, 9, 9, 9, 8, 9,10,15,19, 5, 4, 5, 6, 7, 7, + 8, 9,14,16, 6, 5, 4, 5, 6, 7, 8,10,12,19, 7, 6, + 5, 4, 5, 6, 7, 9,11,18, 8, 7, 6, 5, 5, 5, 7, 9, +@@ -2248,9 +2248,9 @@ + 14,14,16,18, + }; + +-static static_codebook _huff_book__16c2_s_long = { ++static const static_codebook _huff_book__16c2_s_long = { + 2, 100, +- _huff_lengthlist__16c2_s_long, ++ (long *)_huff_lengthlist__16c2_s_long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -2259,13 +2259,13 @@ + 0 + }; + +-static long _vq_quantlist__16c2_s_p1_0[] = { ++static const long _vq_quantlist__16c2_s_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__16c2_s_p1_0[] = { ++static const long _vq_lengthlist__16c2_s_p1_0[] = { + 1, 3, 3, 0, 0, 0, 0, 0, 0, 4, 5, 5, 0, 0, 0, 0, + 0, 0, 4, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -2274,33 +2274,33 @@ + 0, + }; + +-static float _vq_quantthresh__16c2_s_p1_0[] = { ++static const float _vq_quantthresh__16c2_s_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__16c2_s_p1_0[] = { ++static const long _vq_quantmap__16c2_s_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__16c2_s_p1_0 = { +- _vq_quantthresh__16c2_s_p1_0, +- _vq_quantmap__16c2_s_p1_0, ++static const encode_aux_threshmatch _vq_auxt__16c2_s_p1_0 = { ++ (float *)_vq_quantthresh__16c2_s_p1_0, ++ (long *)_vq_quantmap__16c2_s_p1_0, + 3, + 3 + }; + +-static static_codebook _16c2_s_p1_0 = { ++static const static_codebook _16c2_s_p1_0 = { + 4, 81, +- _vq_lengthlist__16c2_s_p1_0, ++ (long *)_vq_lengthlist__16c2_s_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__16c2_s_p1_0, ++ (long *)_vq_quantlist__16c2_s_p1_0, + NULL, +- &_vq_auxt__16c2_s_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c2_s_p2_0[] = { ++static const long _vq_quantlist__16c2_s_p2_0[] = { + 2, + 1, + 3, +@@ -2308,7 +2308,7 @@ + 4, + }; + +-static long _vq_lengthlist__16c2_s_p2_0[] = { ++static const long _vq_lengthlist__16c2_s_p2_0[] = { + 2, 4, 3, 7, 7, 0, 0, 0, 7, 8, 0, 0, 0, 8, 8, 0, + 0, 0, 8, 8, 0, 0, 0, 8, 8, 4, 5, 4, 8, 8, 0, 0, + 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0, +@@ -2351,33 +2351,33 @@ + 13, + }; + +-static float _vq_quantthresh__16c2_s_p2_0[] = { ++static const float _vq_quantthresh__16c2_s_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__16c2_s_p2_0[] = { ++static const long _vq_quantmap__16c2_s_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__16c2_s_p2_0 = { +- _vq_quantthresh__16c2_s_p2_0, +- _vq_quantmap__16c2_s_p2_0, ++static const encode_aux_threshmatch _vq_auxt__16c2_s_p2_0 = { ++ (float *)_vq_quantthresh__16c2_s_p2_0, ++ (long *)_vq_quantmap__16c2_s_p2_0, + 5, + 5 + }; + +-static static_codebook _16c2_s_p2_0 = { ++static const static_codebook _16c2_s_p2_0 = { + 4, 625, +- _vq_lengthlist__16c2_s_p2_0, ++ (long *)_vq_lengthlist__16c2_s_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__16c2_s_p2_0, ++ (long *)_vq_quantlist__16c2_s_p2_0, + NULL, +- &_vq_auxt__16c2_s_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c2_s_p3_0[] = { ++static const long _vq_quantlist__16c2_s_p3_0[] = { + 4, + 3, + 5, +@@ -2389,7 +2389,7 @@ + 8, + }; + +-static long _vq_lengthlist__16c2_s_p3_0[] = { ++static const long _vq_lengthlist__16c2_s_p3_0[] = { + 1, 3, 3, 6, 6, 7, 7, 8, 8, 0, 0, 0, 6, 6, 7, 7, + 9, 9, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0, 7, 7, + 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0, +@@ -2398,34 +2398,34 @@ + 0, + }; + +-static float _vq_quantthresh__16c2_s_p3_0[] = { ++static const float _vq_quantthresh__16c2_s_p3_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__16c2_s_p3_0[] = { ++static const long _vq_quantmap__16c2_s_p3_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__16c2_s_p3_0 = { +- _vq_quantthresh__16c2_s_p3_0, +- _vq_quantmap__16c2_s_p3_0, ++static const encode_aux_threshmatch _vq_auxt__16c2_s_p3_0 = { ++ (float *)_vq_quantthresh__16c2_s_p3_0, ++ (long *)_vq_quantmap__16c2_s_p3_0, + 9, + 9 + }; + +-static static_codebook _16c2_s_p3_0 = { ++static const static_codebook _16c2_s_p3_0 = { + 2, 81, +- _vq_lengthlist__16c2_s_p3_0, ++ (long *)_vq_lengthlist__16c2_s_p3_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__16c2_s_p3_0, ++ (long *)_vq_quantlist__16c2_s_p3_0, + NULL, +- &_vq_auxt__16c2_s_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c2_s_p4_0[] = { ++static const long _vq_quantlist__16c2_s_p4_0[] = { + 8, + 7, + 9, +@@ -2445,7 +2445,7 @@ + 16, + }; + +-static long _vq_lengthlist__16c2_s_p4_0[] = { ++static const long _vq_lengthlist__16c2_s_p4_0[] = { + 2, 3, 3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9,10, + 10, 0, 0, 0, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10, + 11,11, 0, 0, 0, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10, +@@ -2467,42 +2467,42 @@ + 0, + }; + +-static float _vq_quantthresh__16c2_s_p4_0[] = { ++static const float _vq_quantthresh__16c2_s_p4_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__16c2_s_p4_0[] = { ++static const long _vq_quantmap__16c2_s_p4_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__16c2_s_p4_0 = { +- _vq_quantthresh__16c2_s_p4_0, +- _vq_quantmap__16c2_s_p4_0, ++static const encode_aux_threshmatch _vq_auxt__16c2_s_p4_0 = { ++ (float *)_vq_quantthresh__16c2_s_p4_0, ++ (long *)_vq_quantmap__16c2_s_p4_0, + 17, + 17 + }; + +-static static_codebook _16c2_s_p4_0 = { ++static const static_codebook _16c2_s_p4_0 = { + 2, 289, +- _vq_lengthlist__16c2_s_p4_0, ++ (long *)_vq_lengthlist__16c2_s_p4_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__16c2_s_p4_0, ++ (long *)_vq_quantlist__16c2_s_p4_0, + NULL, +- &_vq_auxt__16c2_s_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c2_s_p5_0[] = { ++static const long _vq_quantlist__16c2_s_p5_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__16c2_s_p5_0[] = { ++static const long _vq_lengthlist__16c2_s_p5_0[] = { + 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 6, 6,10,10,10,10, + 10,10, 4, 7, 6,10,10,10,10,10,10, 5, 9, 9, 9,12, + 11,10,11,12, 7,10,10,12,12,12,12,12,12, 7,10,10, +@@ -2511,33 +2511,33 @@ + 12, + }; + +-static float _vq_quantthresh__16c2_s_p5_0[] = { ++static const float _vq_quantthresh__16c2_s_p5_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__16c2_s_p5_0[] = { ++static const long _vq_quantmap__16c2_s_p5_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__16c2_s_p5_0 = { +- _vq_quantthresh__16c2_s_p5_0, +- _vq_quantmap__16c2_s_p5_0, ++static const encode_aux_threshmatch _vq_auxt__16c2_s_p5_0 = { ++ (float *)_vq_quantthresh__16c2_s_p5_0, ++ (long *)_vq_quantmap__16c2_s_p5_0, + 3, + 3 + }; + +-static static_codebook _16c2_s_p5_0 = { ++static const static_codebook _16c2_s_p5_0 = { + 4, 81, +- _vq_lengthlist__16c2_s_p5_0, ++ (long *)_vq_lengthlist__16c2_s_p5_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__16c2_s_p5_0, ++ (long *)_vq_quantlist__16c2_s_p5_0, + NULL, +- &_vq_auxt__16c2_s_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c2_s_p5_1[] = { ++static const long _vq_quantlist__16c2_s_p5_1[] = { + 5, + 4, + 6, +@@ -2551,7 +2551,7 @@ + 10, + }; + +-static long _vq_lengthlist__16c2_s_p5_1[] = { ++static const long _vq_lengthlist__16c2_s_p5_1[] = { + 2, 3, 3, 6, 6, 7, 7, 7, 7, 8, 8,11,11,11, 6, 6, + 7, 7, 8, 8, 8, 8,11,11,11, 6, 6, 7, 7, 8, 8, 8, + 8,11,11,11, 6, 6, 8, 8, 8, 8, 9, 9,11,11,11, 6, +@@ -2562,35 +2562,35 @@ + 11,11,11, 7, 7, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__16c2_s_p5_1[] = { ++static const float _vq_quantthresh__16c2_s_p5_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__16c2_s_p5_1[] = { ++static const long _vq_quantmap__16c2_s_p5_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__16c2_s_p5_1 = { +- _vq_quantthresh__16c2_s_p5_1, +- _vq_quantmap__16c2_s_p5_1, ++static const encode_aux_threshmatch _vq_auxt__16c2_s_p5_1 = { ++ (float *)_vq_quantthresh__16c2_s_p5_1, ++ (long *)_vq_quantmap__16c2_s_p5_1, + 11, + 11 + }; + +-static static_codebook _16c2_s_p5_1 = { ++static const static_codebook _16c2_s_p5_1 = { + 2, 121, +- _vq_lengthlist__16c2_s_p5_1, ++ (long *)_vq_lengthlist__16c2_s_p5_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__16c2_s_p5_1, ++ (long *)_vq_quantlist__16c2_s_p5_1, + NULL, +- &_vq_auxt__16c2_s_p5_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p5_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16c2_s_p6_0[] = { ++static const long _vq_quantlist__16c2_s_p6_0[] = { + 6, + 5, + 7, +@@ -2606,7 +2606,7 @@ + 12, + }; + +-static long _vq_lengthlist__16c2_s_p6_0[] = { ++static const long _vq_lengthlist__16c2_s_p6_0[] = { + 1, 4, 4, 7, 6, 8, 8, 9, 9,10,10,11,11, 5, 5, 5, + 7, 7, 9, 9, 9, 9,11,11,12,12, 6, 5, 5, 7, 7, 9, + 9,10,10,11,11,12,12, 0, 6, 6, 7, 7, 9, 9,10,10, +@@ -2620,35 +2620,35 @@ + 0, 0, 0, 0, 0, 0, 0, 0, 0, + }; + +-static float _vq_quantthresh__16c2_s_p6_0[] = { ++static const float _vq_quantthresh__16c2_s_p6_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__16c2_s_p6_0[] = { ++static const long _vq_quantmap__16c2_s_p6_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__16c2_s_p6_0 = { +- _vq_quantthresh__16c2_s_p6_0, +- _vq_quantmap__16c2_s_p6_0, ++static const encode_aux_threshmatch _vq_auxt__16c2_s_p6_0 = { ++ (float *)_vq_quantthresh__16c2_s_p6_0, ++ (long *)_vq_quantmap__16c2_s_p6_0, + 13, + 13 + }; + +-static static_codebook _16c2_s_p6_0 = { ++static const static_codebook _16c2_s_p6_0 = { + 2, 169, +- _vq_lengthlist__16c2_s_p6_0, ++ (long *)_vq_lengthlist__16c2_s_p6_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__16c2_s_p6_0, ++ (long *)_vq_quantlist__16c2_s_p6_0, + NULL, +- &_vq_auxt__16c2_s_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c2_s_p6_1[] = { ++static const long _vq_quantlist__16c2_s_p6_1[] = { + 2, + 1, + 3, +@@ -2656,38 +2656,38 @@ + 4, + }; + +-static long _vq_lengthlist__16c2_s_p6_1[] = { ++static const long _vq_lengthlist__16c2_s_p6_1[] = { + 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, + 6, 6, 5, 5, 6, 6, 6, 5, 5, + }; + +-static float _vq_quantthresh__16c2_s_p6_1[] = { ++static const float _vq_quantthresh__16c2_s_p6_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__16c2_s_p6_1[] = { ++static const long _vq_quantmap__16c2_s_p6_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__16c2_s_p6_1 = { +- _vq_quantthresh__16c2_s_p6_1, +- _vq_quantmap__16c2_s_p6_1, ++static const encode_aux_threshmatch _vq_auxt__16c2_s_p6_1 = { ++ (float *)_vq_quantthresh__16c2_s_p6_1, ++ (long *)_vq_quantmap__16c2_s_p6_1, + 5, + 5 + }; + +-static static_codebook _16c2_s_p6_1 = { ++static const static_codebook _16c2_s_p6_1 = { + 2, 25, +- _vq_lengthlist__16c2_s_p6_1, ++ (long *)_vq_lengthlist__16c2_s_p6_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__16c2_s_p6_1, ++ (long *)_vq_quantlist__16c2_s_p6_1, + NULL, +- &_vq_auxt__16c2_s_p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16c2_s_p7_0[] = { ++static const long _vq_quantlist__16c2_s_p7_0[] = { + 6, + 5, + 7, +@@ -2703,7 +2703,7 @@ + 12, + }; + +-static long _vq_lengthlist__16c2_s_p7_0[] = { ++static const long _vq_lengthlist__16c2_s_p7_0[] = { + 1, 4, 4, 7, 7, 8, 8, 9, 9,10,10,11,11, 5, 5, 5, + 8, 8, 9, 9,10,10,11,11,12,12, 6, 5, 5, 8, 8, 9, + 9,10,10,11,11,12,13,18, 6, 6, 7, 7, 9, 9,10,10, +@@ -2717,35 +2717,35 @@ + 18,13,14,13,13,14,13,15,14, + }; + +-static float _vq_quantthresh__16c2_s_p7_0[] = { ++static const float _vq_quantthresh__16c2_s_p7_0[] = { + -60.5, -49.5, -38.5, -27.5, -16.5, -5.5, 5.5, 16.5, + 27.5, 38.5, 49.5, 60.5, + }; + +-static long _vq_quantmap__16c2_s_p7_0[] = { ++static const long _vq_quantmap__16c2_s_p7_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__16c2_s_p7_0 = { +- _vq_quantthresh__16c2_s_p7_0, +- _vq_quantmap__16c2_s_p7_0, ++static const encode_aux_threshmatch _vq_auxt__16c2_s_p7_0 = { ++ (float *)_vq_quantthresh__16c2_s_p7_0, ++ (long *)_vq_quantmap__16c2_s_p7_0, + 13, + 13 + }; + +-static static_codebook _16c2_s_p7_0 = { ++static const static_codebook _16c2_s_p7_0 = { + 2, 169, +- _vq_lengthlist__16c2_s_p7_0, ++ (long *)_vq_lengthlist__16c2_s_p7_0, + 1, -523206656, 1618345984, 4, 0, +- _vq_quantlist__16c2_s_p7_0, ++ (long *)_vq_quantlist__16c2_s_p7_0, + NULL, +- &_vq_auxt__16c2_s_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c2_s_p7_1[] = { ++static const long _vq_quantlist__16c2_s_p7_1[] = { + 5, + 4, + 6, +@@ -2759,7 +2759,7 @@ + 10, + }; + +-static long _vq_lengthlist__16c2_s_p7_1[] = { ++static const long _vq_lengthlist__16c2_s_p7_1[] = { + 2, 4, 4, 6, 6, 7, 7, 7, 7, 7, 7, 9, 9, 9, 6, 6, + 7, 7, 8, 8, 8, 8, 9, 9, 9, 6, 6, 7, 7, 8, 8, 8, + 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 7, +@@ -2770,35 +2770,35 @@ + 9, 9, 9, 7, 7, 7, 7, 8, 8, + }; + +-static float _vq_quantthresh__16c2_s_p7_1[] = { ++static const float _vq_quantthresh__16c2_s_p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__16c2_s_p7_1[] = { ++static const long _vq_quantmap__16c2_s_p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__16c2_s_p7_1 = { +- _vq_quantthresh__16c2_s_p7_1, +- _vq_quantmap__16c2_s_p7_1, ++static const encode_aux_threshmatch _vq_auxt__16c2_s_p7_1 = { ++ (float *)_vq_quantthresh__16c2_s_p7_1, ++ (long *)_vq_quantmap__16c2_s_p7_1, + 11, + 11 + }; + +-static static_codebook _16c2_s_p7_1 = { ++static const static_codebook _16c2_s_p7_1 = { + 2, 121, +- _vq_lengthlist__16c2_s_p7_1, ++ (long *)_vq_lengthlist__16c2_s_p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__16c2_s_p7_1, ++ (long *)_vq_quantlist__16c2_s_p7_1, + NULL, +- &_vq_auxt__16c2_s_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16c2_s_p8_0[] = { ++static const long _vq_quantlist__16c2_s_p8_0[] = { + 7, + 6, + 8, +@@ -2816,7 +2816,7 @@ + 14, + }; + +-static long _vq_lengthlist__16c2_s_p8_0[] = { ++static const long _vq_lengthlist__16c2_s_p8_0[] = { + 1, 4, 4, 7, 6, 7, 7, 6, 6, 8, 8, 9, 9,10,10, 6, + 6, 6, 8, 8, 9, 8, 8, 8, 9, 9,11,10,11,11, 7, 6, + 6, 8, 8, 9, 8, 7, 7, 9, 9,10,10,12,11,14, 8, 8, +@@ -2834,35 +2834,35 @@ + 13, + }; + +-static float _vq_quantthresh__16c2_s_p8_0[] = { ++static const float _vq_quantthresh__16c2_s_p8_0[] = { + -136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, + 31.5, 52.5, 73.5, 94.5, 115.5, 136.5, + }; + +-static long _vq_quantmap__16c2_s_p8_0[] = { ++static const long _vq_quantmap__16c2_s_p8_0[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__16c2_s_p8_0 = { +- _vq_quantthresh__16c2_s_p8_0, +- _vq_quantmap__16c2_s_p8_0, ++static const encode_aux_threshmatch _vq_auxt__16c2_s_p8_0 = { ++ (float *)_vq_quantthresh__16c2_s_p8_0, ++ (long *)_vq_quantmap__16c2_s_p8_0, + 15, + 15 + }; + +-static static_codebook _16c2_s_p8_0 = { ++static const static_codebook _16c2_s_p8_0 = { + 2, 225, +- _vq_lengthlist__16c2_s_p8_0, ++ (long *)_vq_lengthlist__16c2_s_p8_0, + 1, -520986624, 1620377600, 4, 0, +- _vq_quantlist__16c2_s_p8_0, ++ (long *)_vq_quantlist__16c2_s_p8_0, + NULL, +- &_vq_auxt__16c2_s_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c2_s_p8_1[] = { ++static const long _vq_quantlist__16c2_s_p8_1[] = { + 10, + 9, + 11, +@@ -2886,7 +2886,7 @@ + 20, + }; + +-static long _vq_lengthlist__16c2_s_p8_1[] = { ++static const long _vq_lengthlist__16c2_s_p8_1[] = { + 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8,11,12,11, 7, 7, 8, 8, 8, 8, 9, 9, + 9, 9, 9, 9, 9, 9, 9,10, 9, 9,11,11,10, 7, 7, 8, +@@ -2917,37 +2917,37 @@ + 10,11,10,10,10,10,10,10,10, + }; + +-static float _vq_quantthresh__16c2_s_p8_1[] = { ++static const float _vq_quantthresh__16c2_s_p8_1[] = { + -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, + -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, + 6.5, 7.5, 8.5, 9.5, + }; + +-static long _vq_quantmap__16c2_s_p8_1[] = { ++static const long _vq_quantmap__16c2_s_p8_1[] = { + 19, 17, 15, 13, 11, 9, 7, 5, + 3, 1, 0, 2, 4, 6, 8, 10, + 12, 14, 16, 18, 20, + }; + +-static encode_aux_threshmatch _vq_auxt__16c2_s_p8_1 = { +- _vq_quantthresh__16c2_s_p8_1, +- _vq_quantmap__16c2_s_p8_1, ++static const encode_aux_threshmatch _vq_auxt__16c2_s_p8_1 = { ++ (float *)_vq_quantthresh__16c2_s_p8_1, ++ (long *)_vq_quantmap__16c2_s_p8_1, + 21, + 21 + }; + +-static static_codebook _16c2_s_p8_1 = { ++static const static_codebook _16c2_s_p8_1 = { + 2, 441, +- _vq_lengthlist__16c2_s_p8_1, ++ (long *)_vq_lengthlist__16c2_s_p8_1, + 1, -529268736, 1611661312, 5, 0, +- _vq_quantlist__16c2_s_p8_1, ++ (long *)_vq_quantlist__16c2_s_p8_1, + NULL, +- &_vq_auxt__16c2_s_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16c2_s_p9_0[] = { ++static const long _vq_quantlist__16c2_s_p9_0[] = { + 6, + 5, + 7, +@@ -2963,7 +2963,7 @@ + 12, + }; + +-static long _vq_lengthlist__16c2_s_p9_0[] = { ++static const long _vq_lengthlist__16c2_s_p9_0[] = { + 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, +@@ -2977,35 +2977,35 @@ + 8, 8, 8, 8, 8, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__16c2_s_p9_0[] = { ++static const float _vq_quantthresh__16c2_s_p9_0[] = { + -5120.5, -4189.5, -3258.5, -2327.5, -1396.5, -465.5, 465.5, 1396.5, + 2327.5, 3258.5, 4189.5, 5120.5, + }; + +-static long _vq_quantmap__16c2_s_p9_0[] = { ++static const long _vq_quantmap__16c2_s_p9_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__16c2_s_p9_0 = { +- _vq_quantthresh__16c2_s_p9_0, +- _vq_quantmap__16c2_s_p9_0, ++static const encode_aux_threshmatch _vq_auxt__16c2_s_p9_0 = { ++ (float *)_vq_quantthresh__16c2_s_p9_0, ++ (long *)_vq_quantmap__16c2_s_p9_0, + 13, + 13 + }; + +-static static_codebook _16c2_s_p9_0 = { ++static const static_codebook _16c2_s_p9_0 = { + 2, 169, +- _vq_lengthlist__16c2_s_p9_0, ++ (long *)_vq_lengthlist__16c2_s_p9_0, + 1, -510275072, 1631393792, 4, 0, +- _vq_quantlist__16c2_s_p9_0, ++ (long *)_vq_quantlist__16c2_s_p9_0, + NULL, +- &_vq_auxt__16c2_s_p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16c2_s_p9_1[] = { ++static const long _vq_quantlist__16c2_s_p9_1[] = { + 8, + 7, + 9, +@@ -3025,7 +3025,7 @@ + 16, + }; + +-static long _vq_lengthlist__16c2_s_p9_1[] = { ++static const long _vq_lengthlist__16c2_s_p9_1[] = { + 1, 5, 5, 9, 8, 7, 7, 7, 6,10,11,11,11,11,11,11, + 11, 8, 7, 6, 8, 8,10, 9,10,10,10, 9,11,10,10,10, + 10,10, 8, 6, 6, 8, 8, 9, 8, 9, 8, 9,10,10,10,10, +@@ -3047,36 +3047,36 @@ + 10, + }; + +-static float _vq_quantthresh__16c2_s_p9_1[] = { ++static const float _vq_quantthresh__16c2_s_p9_1[] = { + -367.5, -318.5, -269.5, -220.5, -171.5, -122.5, -73.5, -24.5, + 24.5, 73.5, 122.5, 171.5, 220.5, 269.5, 318.5, 367.5, + }; + +-static long _vq_quantmap__16c2_s_p9_1[] = { ++static const long _vq_quantmap__16c2_s_p9_1[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__16c2_s_p9_1 = { +- _vq_quantthresh__16c2_s_p9_1, +- _vq_quantmap__16c2_s_p9_1, ++static const encode_aux_threshmatch _vq_auxt__16c2_s_p9_1 = { ++ (float *)_vq_quantthresh__16c2_s_p9_1, ++ (long *)_vq_quantmap__16c2_s_p9_1, + 17, + 17 + }; + +-static static_codebook _16c2_s_p9_1 = { ++static const static_codebook _16c2_s_p9_1 = { + 2, 289, +- _vq_lengthlist__16c2_s_p9_1, ++ (long *)_vq_lengthlist__16c2_s_p9_1, + 1, -518488064, 1622704128, 5, 0, +- _vq_quantlist__16c2_s_p9_1, ++ (long *)_vq_quantlist__16c2_s_p9_1, + NULL, +- &_vq_auxt__16c2_s_p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16c2_s_p9_2[] = { ++static const long _vq_quantlist__16c2_s_p9_2[] = { + 13, + 12, + 14, +@@ -3106,44 +3106,44 @@ + 26, + }; + +-static long _vq_lengthlist__16c2_s_p9_2[] = { ++static const long _vq_lengthlist__16c2_s_p9_2[] = { + 1, 4, 4, 5, 5, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 8, 7, 8, 7, 7, 4, 4, + }; + +-static float _vq_quantthresh__16c2_s_p9_2[] = { ++static const float _vq_quantthresh__16c2_s_p9_2[] = { + -12.5, -11.5, -10.5, -9.5, -8.5, -7.5, -6.5, -5.5, + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, + 11.5, 12.5, + }; + +-static long _vq_quantmap__16c2_s_p9_2[] = { ++static const long _vq_quantmap__16c2_s_p9_2[] = { + 25, 23, 21, 19, 17, 15, 13, 11, + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, 12, 14, 16, 18, 20, + 22, 24, 26, + }; + +-static encode_aux_threshmatch _vq_auxt__16c2_s_p9_2 = { +- _vq_quantthresh__16c2_s_p9_2, +- _vq_quantmap__16c2_s_p9_2, ++static const encode_aux_threshmatch _vq_auxt__16c2_s_p9_2 = { ++ (float *)_vq_quantthresh__16c2_s_p9_2, ++ (long *)_vq_quantmap__16c2_s_p9_2, + 27, + 27 + }; + +-static static_codebook _16c2_s_p9_2 = { ++static const static_codebook _16c2_s_p9_2 = { + 1, 27, +- _vq_lengthlist__16c2_s_p9_2, ++ (long *)_vq_lengthlist__16c2_s_p9_2, + 1, -528875520, 1611661312, 5, 0, +- _vq_quantlist__16c2_s_p9_2, ++ (long *)_vq_quantlist__16c2_s_p9_2, + NULL, +- &_vq_auxt__16c2_s_p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__16c2_s_p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__16c2_s_short[] = { ++static const long _huff_lengthlist__16c2_s_short[] = { + 7,10,11,11,11,14,15,15,17,14, 8, 6, 7, 7, 8, 9, + 11,11,14,17, 9, 6, 6, 6, 7, 7,10,11,15,16, 9, 6, + 6, 4, 4, 5, 8, 9,12,16,10, 6, 6, 4, 4, 4, 6, 9, +@@ -3153,9 +3153,9 @@ + 15,12,14,14, + }; + +-static static_codebook _huff_book__16c2_s_short = { ++static const static_codebook _huff_book__16c2_s_short = { + 2, 100, +- _huff_lengthlist__16c2_s_short, ++ (long *)_huff_lengthlist__16c2_s_short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -3164,13 +3164,13 @@ + 0 + }; + +-static long _vq_quantlist__8c0_s_p1_0[] = { ++static const long _vq_quantlist__8c0_s_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__8c0_s_p1_0[] = { ++static const long _vq_lengthlist__8c0_s_p1_0[] = { + 1, 5, 4, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, + 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -3584,33 +3584,33 @@ + 0, + }; + +-static float _vq_quantthresh__8c0_s_p1_0[] = { ++static const float _vq_quantthresh__8c0_s_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__8c0_s_p1_0[] = { ++static const long _vq_quantmap__8c0_s_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__8c0_s_p1_0 = { +- _vq_quantthresh__8c0_s_p1_0, +- _vq_quantmap__8c0_s_p1_0, ++static const encode_aux_threshmatch _vq_auxt__8c0_s_p1_0 = { ++ (float *)_vq_quantthresh__8c0_s_p1_0, ++ (long *)_vq_quantmap__8c0_s_p1_0, + 3, + 3 + }; + +-static static_codebook _8c0_s_p1_0 = { ++static const static_codebook _8c0_s_p1_0 = { + 8, 6561, +- _vq_lengthlist__8c0_s_p1_0, ++ (long *)_vq_lengthlist__8c0_s_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__8c0_s_p1_0, ++ (long *)_vq_quantlist__8c0_s_p1_0, + NULL, +- &_vq_auxt__8c0_s_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8c0_s_p3_0[] = { ++static const long _vq_quantlist__8c0_s_p3_0[] = { + 2, + 1, + 3, +@@ -3618,7 +3618,7 @@ + 4, + }; + +-static long _vq_lengthlist__8c0_s_p3_0[] = { ++static const long _vq_lengthlist__8c0_s_p3_0[] = { + 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 6, 7, 7, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -3661,33 +3661,33 @@ + 0, + }; + +-static float _vq_quantthresh__8c0_s_p3_0[] = { ++static const float _vq_quantthresh__8c0_s_p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__8c0_s_p3_0[] = { ++static const long _vq_quantmap__8c0_s_p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__8c0_s_p3_0 = { +- _vq_quantthresh__8c0_s_p3_0, +- _vq_quantmap__8c0_s_p3_0, ++static const encode_aux_threshmatch _vq_auxt__8c0_s_p3_0 = { ++ (float *)_vq_quantthresh__8c0_s_p3_0, ++ (long *)_vq_quantmap__8c0_s_p3_0, + 5, + 5 + }; + +-static static_codebook _8c0_s_p3_0 = { ++static const static_codebook _8c0_s_p3_0 = { + 4, 625, +- _vq_lengthlist__8c0_s_p3_0, ++ (long *)_vq_lengthlist__8c0_s_p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__8c0_s_p3_0, ++ (long *)_vq_quantlist__8c0_s_p3_0, + NULL, +- &_vq_auxt__8c0_s_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8c0_s_p4_0[] = { ++static const long _vq_quantlist__8c0_s_p4_0[] = { + 4, + 3, + 5, +@@ -3699,7 +3699,7 @@ + 8, + }; + +-static long _vq_lengthlist__8c0_s_p4_0[] = { ++static const long _vq_lengthlist__8c0_s_p4_0[] = { + 1, 2, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, + 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, + 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, +@@ -3708,34 +3708,34 @@ + 0, + }; + +-static float _vq_quantthresh__8c0_s_p4_0[] = { ++static const float _vq_quantthresh__8c0_s_p4_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__8c0_s_p4_0[] = { ++static const long _vq_quantmap__8c0_s_p4_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__8c0_s_p4_0 = { +- _vq_quantthresh__8c0_s_p4_0, +- _vq_quantmap__8c0_s_p4_0, ++static const encode_aux_threshmatch _vq_auxt__8c0_s_p4_0 = { ++ (float *)_vq_quantthresh__8c0_s_p4_0, ++ (long *)_vq_quantmap__8c0_s_p4_0, + 9, + 9 + }; + +-static static_codebook _8c0_s_p4_0 = { ++static const static_codebook _8c0_s_p4_0 = { + 2, 81, +- _vq_lengthlist__8c0_s_p4_0, ++ (long *)_vq_lengthlist__8c0_s_p4_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__8c0_s_p4_0, ++ (long *)_vq_quantlist__8c0_s_p4_0, + NULL, +- &_vq_auxt__8c0_s_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8c0_s_p5_0[] = { ++static const long _vq_quantlist__8c0_s_p5_0[] = { + 4, + 3, + 5, +@@ -3747,7 +3747,7 @@ + 8, + }; + +-static long _vq_lengthlist__8c0_s_p5_0[] = { ++static const long _vq_lengthlist__8c0_s_p5_0[] = { + 1, 3, 3, 5, 5, 7, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7, + 8, 8, 0, 0, 0, 7, 7, 7, 7, 8, 9, 0, 0, 0, 8, 8, + 8, 8, 9, 9, 0, 0, 0, 8, 8, 8, 8, 9, 9, 0, 0, 0, +@@ -3756,34 +3756,34 @@ + 10, + }; + +-static float _vq_quantthresh__8c0_s_p5_0[] = { ++static const float _vq_quantthresh__8c0_s_p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__8c0_s_p5_0[] = { ++static const long _vq_quantmap__8c0_s_p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__8c0_s_p5_0 = { +- _vq_quantthresh__8c0_s_p5_0, +- _vq_quantmap__8c0_s_p5_0, ++static const encode_aux_threshmatch _vq_auxt__8c0_s_p5_0 = { ++ (float *)_vq_quantthresh__8c0_s_p5_0, ++ (long *)_vq_quantmap__8c0_s_p5_0, + 9, + 9 + }; + +-static static_codebook _8c0_s_p5_0 = { ++static const static_codebook _8c0_s_p5_0 = { + 2, 81, +- _vq_lengthlist__8c0_s_p5_0, ++ (long *)_vq_lengthlist__8c0_s_p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__8c0_s_p5_0, ++ (long *)_vq_quantlist__8c0_s_p5_0, + NULL, +- &_vq_auxt__8c0_s_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8c0_s_p6_0[] = { ++static const long _vq_quantlist__8c0_s_p6_0[] = { + 8, + 7, + 9, +@@ -3803,7 +3803,7 @@ + 16, + }; + +-static long _vq_lengthlist__8c0_s_p6_0[] = { ++static const long _vq_lengthlist__8c0_s_p6_0[] = { + 1, 3, 3, 6, 6, 8, 8, 9, 9, 8, 8,10, 9,10,10,11, + 11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11, + 11,12, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11, +@@ -3825,42 +3825,42 @@ + 14, + }; + +-static float _vq_quantthresh__8c0_s_p6_0[] = { ++static const float _vq_quantthresh__8c0_s_p6_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__8c0_s_p6_0[] = { ++static const long _vq_quantmap__8c0_s_p6_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__8c0_s_p6_0 = { +- _vq_quantthresh__8c0_s_p6_0, +- _vq_quantmap__8c0_s_p6_0, ++static const encode_aux_threshmatch _vq_auxt__8c0_s_p6_0 = { ++ (float *)_vq_quantthresh__8c0_s_p6_0, ++ (long *)_vq_quantmap__8c0_s_p6_0, + 17, + 17 + }; + +-static static_codebook _8c0_s_p6_0 = { ++static const static_codebook _8c0_s_p6_0 = { + 2, 289, +- _vq_lengthlist__8c0_s_p6_0, ++ (long *)_vq_lengthlist__8c0_s_p6_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__8c0_s_p6_0, ++ (long *)_vq_quantlist__8c0_s_p6_0, + NULL, +- &_vq_auxt__8c0_s_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8c0_s_p7_0[] = { ++static const long _vq_quantlist__8c0_s_p7_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__8c0_s_p7_0[] = { ++static const long _vq_lengthlist__8c0_s_p7_0[] = { + 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,11, 9,10,12, + 9,10, 4, 7, 7,10,10,10,11, 9, 9, 6,11,10,11,11, + 12,11,11,11, 6,10,10,11,11,12,11,10,10, 6, 9,10, +@@ -3869,33 +3869,33 @@ + 10, + }; + +-static float _vq_quantthresh__8c0_s_p7_0[] = { ++static const float _vq_quantthresh__8c0_s_p7_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__8c0_s_p7_0[] = { ++static const long _vq_quantmap__8c0_s_p7_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__8c0_s_p7_0 = { +- _vq_quantthresh__8c0_s_p7_0, +- _vq_quantmap__8c0_s_p7_0, ++static const encode_aux_threshmatch _vq_auxt__8c0_s_p7_0 = { ++ (float *)_vq_quantthresh__8c0_s_p7_0, ++ (long *)_vq_quantmap__8c0_s_p7_0, + 3, + 3 + }; + +-static static_codebook _8c0_s_p7_0 = { ++static const static_codebook _8c0_s_p7_0 = { + 4, 81, +- _vq_lengthlist__8c0_s_p7_0, ++ (long *)_vq_lengthlist__8c0_s_p7_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__8c0_s_p7_0, ++ (long *)_vq_quantlist__8c0_s_p7_0, + NULL, +- &_vq_auxt__8c0_s_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8c0_s_p7_1[] = { ++static const long _vq_quantlist__8c0_s_p7_1[] = { + 5, + 4, + 6, +@@ -3909,7 +3909,7 @@ + 10, + }; + +-static long _vq_lengthlist__8c0_s_p7_1[] = { ++static const long _vq_lengthlist__8c0_s_p7_1[] = { + 1, 3, 3, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10, 7, 7, + 8, 8, 9, 9, 9, 9,10,10, 9, 7, 7, 8, 8, 9, 9, 9, + 9,10,10,10, 8, 8, 9, 9, 9, 9, 9, 9,10,10,10, 8, +@@ -3920,35 +3920,35 @@ + 10,10,10, 9, 9, 9,10,10,10, + }; + +-static float _vq_quantthresh__8c0_s_p7_1[] = { ++static const float _vq_quantthresh__8c0_s_p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__8c0_s_p7_1[] = { ++static const long _vq_quantmap__8c0_s_p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__8c0_s_p7_1 = { +- _vq_quantthresh__8c0_s_p7_1, +- _vq_quantmap__8c0_s_p7_1, ++static const encode_aux_threshmatch _vq_auxt__8c0_s_p7_1 = { ++ (float *)_vq_quantthresh__8c0_s_p7_1, ++ (long *)_vq_quantmap__8c0_s_p7_1, + 11, + 11 + }; + +-static static_codebook _8c0_s_p7_1 = { ++static const static_codebook _8c0_s_p7_1 = { + 2, 121, +- _vq_lengthlist__8c0_s_p7_1, ++ (long *)_vq_lengthlist__8c0_s_p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__8c0_s_p7_1, ++ (long *)_vq_quantlist__8c0_s_p7_1, + NULL, +- &_vq_auxt__8c0_s_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__8c0_s_p8_0[] = { ++static const long _vq_quantlist__8c0_s_p8_0[] = { + 6, + 5, + 7, +@@ -3964,7 +3964,7 @@ + 12, + }; + +-static long _vq_lengthlist__8c0_s_p8_0[] = { ++static const long _vq_lengthlist__8c0_s_p8_0[] = { + 1, 4, 4, 7, 6, 7, 7, 7, 7, 8, 8, 9, 9, 7, 6, 6, + 7, 7, 8, 8, 7, 7, 8, 9,10,10, 7, 6, 6, 7, 7, 8, + 7, 7, 7, 9, 9,10,12, 0, 8, 8, 8, 8, 8, 9, 8, 8, +@@ -3978,35 +3978,35 @@ + 0, 0,13,13,11,13,13,11,12, + }; + +-static float _vq_quantthresh__8c0_s_p8_0[] = { ++static const float _vq_quantthresh__8c0_s_p8_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__8c0_s_p8_0[] = { ++static const long _vq_quantmap__8c0_s_p8_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__8c0_s_p8_0 = { +- _vq_quantthresh__8c0_s_p8_0, +- _vq_quantmap__8c0_s_p8_0, ++static const encode_aux_threshmatch _vq_auxt__8c0_s_p8_0 = { ++ (float *)_vq_quantthresh__8c0_s_p8_0, ++ (long *)_vq_quantmap__8c0_s_p8_0, + 13, + 13 + }; + +-static static_codebook _8c0_s_p8_0 = { ++static const static_codebook _8c0_s_p8_0 = { + 2, 169, +- _vq_lengthlist__8c0_s_p8_0, ++ (long *)_vq_lengthlist__8c0_s_p8_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__8c0_s_p8_0, ++ (long *)_vq_quantlist__8c0_s_p8_0, + NULL, +- &_vq_auxt__8c0_s_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8c0_s_p8_1[] = { ++static const long _vq_quantlist__8c0_s_p8_1[] = { + 2, + 1, + 3, +@@ -4014,44 +4014,44 @@ + 4, + }; + +-static long _vq_lengthlist__8c0_s_p8_1[] = { ++static const long _vq_lengthlist__8c0_s_p8_1[] = { + 1, 3, 4, 5, 5, 7, 6, 6, 6, 5, 7, 7, 7, 6, 6, 7, + 7, 7, 6, 6, 7, 7, 7, 6, 6, + }; + +-static float _vq_quantthresh__8c0_s_p8_1[] = { ++static const float _vq_quantthresh__8c0_s_p8_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__8c0_s_p8_1[] = { ++static const long _vq_quantmap__8c0_s_p8_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__8c0_s_p8_1 = { +- _vq_quantthresh__8c0_s_p8_1, +- _vq_quantmap__8c0_s_p8_1, ++static const encode_aux_threshmatch _vq_auxt__8c0_s_p8_1 = { ++ (float *)_vq_quantthresh__8c0_s_p8_1, ++ (long *)_vq_quantmap__8c0_s_p8_1, + 5, + 5 + }; + +-static static_codebook _8c0_s_p8_1 = { ++static const static_codebook _8c0_s_p8_1 = { + 2, 25, +- _vq_lengthlist__8c0_s_p8_1, ++ (long *)_vq_lengthlist__8c0_s_p8_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__8c0_s_p8_1, ++ (long *)_vq_quantlist__8c0_s_p8_1, + NULL, +- &_vq_auxt__8c0_s_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__8c0_s_p9_0[] = { ++static const long _vq_quantlist__8c0_s_p9_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__8c0_s_p9_0[] = { ++static const long _vq_lengthlist__8c0_s_p9_0[] = { + 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, +@@ -4060,33 +4060,33 @@ + 7, + }; + +-static float _vq_quantthresh__8c0_s_p9_0[] = { ++static const float _vq_quantthresh__8c0_s_p9_0[] = { + -157.5, 157.5, + }; + +-static long _vq_quantmap__8c0_s_p9_0[] = { ++static const long _vq_quantmap__8c0_s_p9_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__8c0_s_p9_0 = { +- _vq_quantthresh__8c0_s_p9_0, +- _vq_quantmap__8c0_s_p9_0, ++static const encode_aux_threshmatch _vq_auxt__8c0_s_p9_0 = { ++ (float *)_vq_quantthresh__8c0_s_p9_0, ++ (long *)_vq_quantmap__8c0_s_p9_0, + 3, + 3 + }; + +-static static_codebook _8c0_s_p9_0 = { ++static const static_codebook _8c0_s_p9_0 = { + 4, 81, +- _vq_lengthlist__8c0_s_p9_0, ++ (long *)_vq_lengthlist__8c0_s_p9_0, + 1, -518803456, 1628680192, 2, 0, +- _vq_quantlist__8c0_s_p9_0, ++ (long *)_vq_quantlist__8c0_s_p9_0, + NULL, +- &_vq_auxt__8c0_s_p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8c0_s_p9_1[] = { ++static const long _vq_quantlist__8c0_s_p9_1[] = { + 7, + 6, + 8, +@@ -4104,7 +4104,7 @@ + 14, + }; + +-static long _vq_lengthlist__8c0_s_p9_1[] = { ++static const long _vq_lengthlist__8c0_s_p9_1[] = { + 1, 4, 4, 5, 5,10, 8,11,11,11,11,11,11,11,11, 6, + 6, 6, 7, 6,11,10,11,11,11,11,11,11,11,11, 7, 5, + 6, 6, 6, 8, 7,11,11,11,11,11,11,11,11,11, 7, 8, +@@ -4122,35 +4122,35 @@ + 11, + }; + +-static float _vq_quantthresh__8c0_s_p9_1[] = { ++static const float _vq_quantthresh__8c0_s_p9_1[] = { + -136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, + 31.5, 52.5, 73.5, 94.5, 115.5, 136.5, + }; + +-static long _vq_quantmap__8c0_s_p9_1[] = { ++static const long _vq_quantmap__8c0_s_p9_1[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__8c0_s_p9_1 = { +- _vq_quantthresh__8c0_s_p9_1, +- _vq_quantmap__8c0_s_p9_1, ++static const encode_aux_threshmatch _vq_auxt__8c0_s_p9_1 = { ++ (float *)_vq_quantthresh__8c0_s_p9_1, ++ (long *)_vq_quantmap__8c0_s_p9_1, + 15, + 15 + }; + +-static static_codebook _8c0_s_p9_1 = { ++static const static_codebook _8c0_s_p9_1 = { + 2, 225, +- _vq_lengthlist__8c0_s_p9_1, ++ (long *)_vq_lengthlist__8c0_s_p9_1, + 1, -520986624, 1620377600, 4, 0, +- _vq_quantlist__8c0_s_p9_1, ++ (long *)_vq_quantlist__8c0_s_p9_1, + NULL, +- &_vq_auxt__8c0_s_p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__8c0_s_p9_2[] = { ++static const long _vq_quantlist__8c0_s_p9_2[] = { + 10, + 9, + 11, +@@ -4174,7 +4174,7 @@ + 20, + }; + +-static long _vq_lengthlist__8c0_s_p9_2[] = { ++static const long _vq_lengthlist__8c0_s_p9_2[] = { + 1, 5, 5, 7, 7, 8, 7, 8, 8,10,10, 9, 9,10,10,10, + 11,11,10,12,11,12,12,12, 9, 8, 8, 8, 8, 8, 9,10, + 10,10,10,11,11,11,10,11,11,12,12,11,12, 8, 8, 7, +@@ -4205,37 +4205,37 @@ + 10,11, 9,11,10, 9,10, 9,10, + }; + +-static float _vq_quantthresh__8c0_s_p9_2[] = { ++static const float _vq_quantthresh__8c0_s_p9_2[] = { + -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, + -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, + 6.5, 7.5, 8.5, 9.5, + }; + +-static long _vq_quantmap__8c0_s_p9_2[] = { ++static const long _vq_quantmap__8c0_s_p9_2[] = { + 19, 17, 15, 13, 11, 9, 7, 5, + 3, 1, 0, 2, 4, 6, 8, 10, + 12, 14, 16, 18, 20, + }; + +-static encode_aux_threshmatch _vq_auxt__8c0_s_p9_2 = { +- _vq_quantthresh__8c0_s_p9_2, +- _vq_quantmap__8c0_s_p9_2, ++static const encode_aux_threshmatch _vq_auxt__8c0_s_p9_2 = { ++ (float *)_vq_quantthresh__8c0_s_p9_2, ++ (long *)_vq_quantmap__8c0_s_p9_2, + 21, + 21 + }; + +-static static_codebook _8c0_s_p9_2 = { ++static const static_codebook _8c0_s_p9_2 = { + 2, 441, +- _vq_lengthlist__8c0_s_p9_2, ++ (long *)_vq_lengthlist__8c0_s_p9_2, + 1, -529268736, 1611661312, 5, 0, +- _vq_quantlist__8c0_s_p9_2, ++ (long *)_vq_quantlist__8c0_s_p9_2, + NULL, +- &_vq_auxt__8c0_s_p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__8c0_s_p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__8c0_s_single[] = { ++static const long _huff_lengthlist__8c0_s_single[] = { + 4, 5,18, 7,10, 6, 7, 8, 9,10, 5, 2,18, 5, 7, 5, + 6, 7, 8,11,17,17,17,17,17,17,17,17,17,17, 7, 4, + 17, 6, 9, 6, 8,10,12,15,11, 7,17, 9, 6, 6, 7, 9, +@@ -4245,9 +4245,9 @@ + 17,16,17,17, + }; + +-static static_codebook _huff_book__8c0_s_single = { ++static const static_codebook _huff_book__8c0_s_single = { + 2, 100, +- _huff_lengthlist__8c0_s_single, ++ (long *)_huff_lengthlist__8c0_s_single, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -4256,13 +4256,13 @@ + 0 + }; + +-static long _vq_quantlist__8c1_s_p1_0[] = { ++static const long _vq_quantlist__8c1_s_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__8c1_s_p1_0[] = { ++static const long _vq_lengthlist__8c1_s_p1_0[] = { + 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, + 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -4676,33 +4676,33 @@ + 0, + }; + +-static float _vq_quantthresh__8c1_s_p1_0[] = { ++static const float _vq_quantthresh__8c1_s_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__8c1_s_p1_0[] = { ++static const long _vq_quantmap__8c1_s_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__8c1_s_p1_0 = { +- _vq_quantthresh__8c1_s_p1_0, +- _vq_quantmap__8c1_s_p1_0, ++static const encode_aux_threshmatch _vq_auxt__8c1_s_p1_0 = { ++ (float *)_vq_quantthresh__8c1_s_p1_0, ++ (long *)_vq_quantmap__8c1_s_p1_0, + 3, + 3 + }; + +-static static_codebook _8c1_s_p1_0 = { ++static const static_codebook _8c1_s_p1_0 = { + 8, 6561, +- _vq_lengthlist__8c1_s_p1_0, ++ (long *)_vq_lengthlist__8c1_s_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__8c1_s_p1_0, ++ (long *)_vq_quantlist__8c1_s_p1_0, + NULL, +- &_vq_auxt__8c1_s_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8c1_s_p3_0[] = { ++static const long _vq_quantlist__8c1_s_p3_0[] = { + 2, + 1, + 3, +@@ -4710,7 +4710,7 @@ + 4, + }; + +-static long _vq_lengthlist__8c1_s_p3_0[] = { ++static const long _vq_lengthlist__8c1_s_p3_0[] = { + 2, 4, 4, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -4753,33 +4753,33 @@ + 0, + }; + +-static float _vq_quantthresh__8c1_s_p3_0[] = { ++static const float _vq_quantthresh__8c1_s_p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__8c1_s_p3_0[] = { ++static const long _vq_quantmap__8c1_s_p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__8c1_s_p3_0 = { +- _vq_quantthresh__8c1_s_p3_0, +- _vq_quantmap__8c1_s_p3_0, ++static const encode_aux_threshmatch _vq_auxt__8c1_s_p3_0 = { ++ (float *)_vq_quantthresh__8c1_s_p3_0, ++ (long *)_vq_quantmap__8c1_s_p3_0, + 5, + 5 + }; + +-static static_codebook _8c1_s_p3_0 = { ++static const static_codebook _8c1_s_p3_0 = { + 4, 625, +- _vq_lengthlist__8c1_s_p3_0, ++ (long *)_vq_lengthlist__8c1_s_p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__8c1_s_p3_0, ++ (long *)_vq_quantlist__8c1_s_p3_0, + NULL, +- &_vq_auxt__8c1_s_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8c1_s_p4_0[] = { ++static const long _vq_quantlist__8c1_s_p4_0[] = { + 4, + 3, + 5, +@@ -4791,7 +4791,7 @@ + 8, + }; + +-static long _vq_lengthlist__8c1_s_p4_0[] = { ++static const long _vq_lengthlist__8c1_s_p4_0[] = { + 1, 2, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, + 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, + 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, +@@ -4800,34 +4800,34 @@ + 0, + }; + +-static float _vq_quantthresh__8c1_s_p4_0[] = { ++static const float _vq_quantthresh__8c1_s_p4_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__8c1_s_p4_0[] = { ++static const long _vq_quantmap__8c1_s_p4_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__8c1_s_p4_0 = { +- _vq_quantthresh__8c1_s_p4_0, +- _vq_quantmap__8c1_s_p4_0, ++static const encode_aux_threshmatch _vq_auxt__8c1_s_p4_0 = { ++ (float *)_vq_quantthresh__8c1_s_p4_0, ++ (long *)_vq_quantmap__8c1_s_p4_0, + 9, + 9 + }; + +-static static_codebook _8c1_s_p4_0 = { ++static const static_codebook _8c1_s_p4_0 = { + 2, 81, +- _vq_lengthlist__8c1_s_p4_0, ++ (long *)_vq_lengthlist__8c1_s_p4_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__8c1_s_p4_0, ++ (long *)_vq_quantlist__8c1_s_p4_0, + NULL, +- &_vq_auxt__8c1_s_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8c1_s_p5_0[] = { ++static const long _vq_quantlist__8c1_s_p5_0[] = { + 4, + 3, + 5, +@@ -4839,7 +4839,7 @@ + 8, + }; + +-static long _vq_lengthlist__8c1_s_p5_0[] = { ++static const long _vq_lengthlist__8c1_s_p5_0[] = { + 1, 3, 3, 4, 5, 6, 6, 8, 8, 0, 0, 0, 8, 8, 7, 7, + 9, 9, 0, 0, 0, 8, 8, 7, 7, 9, 9, 0, 0, 0, 9,10, + 8, 8, 9, 9, 0, 0, 0,10,10, 8, 8, 9, 9, 0, 0, 0, +@@ -4848,34 +4848,34 @@ + 10, + }; + +-static float _vq_quantthresh__8c1_s_p5_0[] = { ++static const float _vq_quantthresh__8c1_s_p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__8c1_s_p5_0[] = { ++static const long _vq_quantmap__8c1_s_p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__8c1_s_p5_0 = { +- _vq_quantthresh__8c1_s_p5_0, +- _vq_quantmap__8c1_s_p5_0, ++static const encode_aux_threshmatch _vq_auxt__8c1_s_p5_0 = { ++ (float *)_vq_quantthresh__8c1_s_p5_0, ++ (long *)_vq_quantmap__8c1_s_p5_0, + 9, + 9 + }; + +-static static_codebook _8c1_s_p5_0 = { ++static const static_codebook _8c1_s_p5_0 = { + 2, 81, +- _vq_lengthlist__8c1_s_p5_0, ++ (long *)_vq_lengthlist__8c1_s_p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__8c1_s_p5_0, ++ (long *)_vq_quantlist__8c1_s_p5_0, + NULL, +- &_vq_auxt__8c1_s_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8c1_s_p6_0[] = { ++static const long _vq_quantlist__8c1_s_p6_0[] = { + 8, + 7, + 9, +@@ -4895,7 +4895,7 @@ + 16, + }; + +-static long _vq_lengthlist__8c1_s_p6_0[] = { ++static const long _vq_lengthlist__8c1_s_p6_0[] = { + 1, 3, 3, 5, 5, 8, 8, 8, 8, 9, 9,10,10,11,11,11, + 11, 0, 0, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,11, + 12,12, 0, 0, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11, +@@ -4917,42 +4917,42 @@ + 14, + }; + +-static float _vq_quantthresh__8c1_s_p6_0[] = { ++static const float _vq_quantthresh__8c1_s_p6_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__8c1_s_p6_0[] = { ++static const long _vq_quantmap__8c1_s_p6_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__8c1_s_p6_0 = { +- _vq_quantthresh__8c1_s_p6_0, +- _vq_quantmap__8c1_s_p6_0, ++static const encode_aux_threshmatch _vq_auxt__8c1_s_p6_0 = { ++ (float *)_vq_quantthresh__8c1_s_p6_0, ++ (long *)_vq_quantmap__8c1_s_p6_0, + 17, + 17 + }; + +-static static_codebook _8c1_s_p6_0 = { ++static const static_codebook _8c1_s_p6_0 = { + 2, 289, +- _vq_lengthlist__8c1_s_p6_0, ++ (long *)_vq_lengthlist__8c1_s_p6_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__8c1_s_p6_0, ++ (long *)_vq_quantlist__8c1_s_p6_0, + NULL, +- &_vq_auxt__8c1_s_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8c1_s_p7_0[] = { ++static const long _vq_quantlist__8c1_s_p7_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__8c1_s_p7_0[] = { ++static const long _vq_lengthlist__8c1_s_p7_0[] = { + 1, 4, 4, 6, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,10, + 9, 9, 5, 7, 7,10, 9, 9,10, 9, 9, 6,10,10,10,10, + 10,11,10,10, 6, 9, 9,10, 9,10,11,10,10, 6, 9, 9, +@@ -4961,33 +4961,33 @@ + 9, + }; + +-static float _vq_quantthresh__8c1_s_p7_0[] = { ++static const float _vq_quantthresh__8c1_s_p7_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__8c1_s_p7_0[] = { ++static const long _vq_quantmap__8c1_s_p7_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__8c1_s_p7_0 = { +- _vq_quantthresh__8c1_s_p7_0, +- _vq_quantmap__8c1_s_p7_0, ++static const encode_aux_threshmatch _vq_auxt__8c1_s_p7_0 = { ++ (float *)_vq_quantthresh__8c1_s_p7_0, ++ (long *)_vq_quantmap__8c1_s_p7_0, + 3, + 3 + }; + +-static static_codebook _8c1_s_p7_0 = { ++static const static_codebook _8c1_s_p7_0 = { + 4, 81, +- _vq_lengthlist__8c1_s_p7_0, ++ (long *)_vq_lengthlist__8c1_s_p7_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__8c1_s_p7_0, ++ (long *)_vq_quantlist__8c1_s_p7_0, + NULL, +- &_vq_auxt__8c1_s_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8c1_s_p7_1[] = { ++static const long _vq_quantlist__8c1_s_p7_1[] = { + 5, + 4, + 6, +@@ -5001,7 +5001,7 @@ + 10, + }; + +-static long _vq_lengthlist__8c1_s_p7_1[] = { ++static const long _vq_lengthlist__8c1_s_p7_1[] = { + 2, 3, 3, 5, 5, 7, 7, 7, 7, 7, 7,10,10, 9, 7, 7, + 7, 7, 8, 8, 8, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, + 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, +@@ -5012,35 +5012,35 @@ + 10,10,10, 8, 8, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__8c1_s_p7_1[] = { ++static const float _vq_quantthresh__8c1_s_p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__8c1_s_p7_1[] = { ++static const long _vq_quantmap__8c1_s_p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__8c1_s_p7_1 = { +- _vq_quantthresh__8c1_s_p7_1, +- _vq_quantmap__8c1_s_p7_1, ++static const encode_aux_threshmatch _vq_auxt__8c1_s_p7_1 = { ++ (float *)_vq_quantthresh__8c1_s_p7_1, ++ (long *)_vq_quantmap__8c1_s_p7_1, + 11, + 11 + }; + +-static static_codebook _8c1_s_p7_1 = { ++static const static_codebook _8c1_s_p7_1 = { + 2, 121, +- _vq_lengthlist__8c1_s_p7_1, ++ (long *)_vq_lengthlist__8c1_s_p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__8c1_s_p7_1, ++ (long *)_vq_quantlist__8c1_s_p7_1, + NULL, +- &_vq_auxt__8c1_s_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__8c1_s_p8_0[] = { ++static const long _vq_quantlist__8c1_s_p8_0[] = { + 6, + 5, + 7, +@@ -5056,7 +5056,7 @@ + 12, + }; + +-static long _vq_lengthlist__8c1_s_p8_0[] = { ++static const long _vq_lengthlist__8c1_s_p8_0[] = { + 1, 4, 4, 6, 6, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 5, + 7, 7, 8, 8, 8, 8, 9,10,11,11, 7, 5, 5, 7, 7, 8, + 8, 9, 9,10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9, +@@ -5070,35 +5070,35 @@ + 0,12,12,11,10,12,11,13,12, + }; + +-static float _vq_quantthresh__8c1_s_p8_0[] = { ++static const float _vq_quantthresh__8c1_s_p8_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__8c1_s_p8_0[] = { ++static const long _vq_quantmap__8c1_s_p8_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__8c1_s_p8_0 = { +- _vq_quantthresh__8c1_s_p8_0, +- _vq_quantmap__8c1_s_p8_0, ++static const encode_aux_threshmatch _vq_auxt__8c1_s_p8_0 = { ++ (float *)_vq_quantthresh__8c1_s_p8_0, ++ (long *)_vq_quantmap__8c1_s_p8_0, + 13, + 13 + }; + +-static static_codebook _8c1_s_p8_0 = { ++static const static_codebook _8c1_s_p8_0 = { + 2, 169, +- _vq_lengthlist__8c1_s_p8_0, ++ (long *)_vq_lengthlist__8c1_s_p8_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__8c1_s_p8_0, ++ (long *)_vq_quantlist__8c1_s_p8_0, + NULL, +- &_vq_auxt__8c1_s_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8c1_s_p8_1[] = { ++static const long _vq_quantlist__8c1_s_p8_1[] = { + 2, + 1, + 3, +@@ -5106,38 +5106,38 @@ + 4, + }; + +-static long _vq_lengthlist__8c1_s_p8_1[] = { ++static const long _vq_lengthlist__8c1_s_p8_1[] = { + 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, + 6, 6, 5, 5, 6, 6, 6, 5, 5, + }; + +-static float _vq_quantthresh__8c1_s_p8_1[] = { ++static const float _vq_quantthresh__8c1_s_p8_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__8c1_s_p8_1[] = { ++static const long _vq_quantmap__8c1_s_p8_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__8c1_s_p8_1 = { +- _vq_quantthresh__8c1_s_p8_1, +- _vq_quantmap__8c1_s_p8_1, ++static const encode_aux_threshmatch _vq_auxt__8c1_s_p8_1 = { ++ (float *)_vq_quantthresh__8c1_s_p8_1, ++ (long *)_vq_quantmap__8c1_s_p8_1, + 5, + 5 + }; + +-static static_codebook _8c1_s_p8_1 = { ++static const static_codebook _8c1_s_p8_1 = { + 2, 25, +- _vq_lengthlist__8c1_s_p8_1, ++ (long *)_vq_lengthlist__8c1_s_p8_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__8c1_s_p8_1, ++ (long *)_vq_quantlist__8c1_s_p8_1, + NULL, +- &_vq_auxt__8c1_s_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__8c1_s_p9_0[] = { ++static const long _vq_quantlist__8c1_s_p9_0[] = { + 6, + 5, + 7, +@@ -5153,7 +5153,7 @@ + 12, + }; + +-static long _vq_lengthlist__8c1_s_p9_0[] = { ++static const long _vq_lengthlist__8c1_s_p9_0[] = { + 1, 3, 3,10,10,10,10,10,10,10,10,10,10, 5, 6, 6, + 10,10,10,10,10,10,10,10,10,10, 6, 7, 8,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, +@@ -5167,35 +5167,35 @@ + 10,10,10,10,10, 9, 9, 9, 9, + }; + +-static float _vq_quantthresh__8c1_s_p9_0[] = { ++static const float _vq_quantthresh__8c1_s_p9_0[] = { + -1732.5, -1417.5, -1102.5, -787.5, -472.5, -157.5, 157.5, 472.5, + 787.5, 1102.5, 1417.5, 1732.5, + }; + +-static long _vq_quantmap__8c1_s_p9_0[] = { ++static const long _vq_quantmap__8c1_s_p9_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__8c1_s_p9_0 = { +- _vq_quantthresh__8c1_s_p9_0, +- _vq_quantmap__8c1_s_p9_0, ++static const encode_aux_threshmatch _vq_auxt__8c1_s_p9_0 = { ++ (float *)_vq_quantthresh__8c1_s_p9_0, ++ (long *)_vq_quantmap__8c1_s_p9_0, + 13, + 13 + }; + +-static static_codebook _8c1_s_p9_0 = { ++static const static_codebook _8c1_s_p9_0 = { + 2, 169, +- _vq_lengthlist__8c1_s_p9_0, ++ (long *)_vq_lengthlist__8c1_s_p9_0, + 1, -513964032, 1628680192, 4, 0, +- _vq_quantlist__8c1_s_p9_0, ++ (long *)_vq_quantlist__8c1_s_p9_0, + NULL, +- &_vq_auxt__8c1_s_p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8c1_s_p9_1[] = { ++static const long _vq_quantlist__8c1_s_p9_1[] = { + 7, + 6, + 8, +@@ -5213,7 +5213,7 @@ + 14, + }; + +-static long _vq_lengthlist__8c1_s_p9_1[] = { ++static const long _vq_lengthlist__8c1_s_p9_1[] = { + 1, 4, 4, 5, 5, 7, 7, 9, 9,11,11,12,12,13,13, 6, + 5, 5, 6, 6, 9, 9,10,10,12,12,12,13,15,14, 6, 5, + 5, 7, 7, 9, 9,10,10,12,12,12,13,14,13,17, 7, 7, +@@ -5231,35 +5231,35 @@ + 15, + }; + +-static float _vq_quantthresh__8c1_s_p9_1[] = { ++static const float _vq_quantthresh__8c1_s_p9_1[] = { + -136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, + 31.5, 52.5, 73.5, 94.5, 115.5, 136.5, + }; + +-static long _vq_quantmap__8c1_s_p9_1[] = { ++static const long _vq_quantmap__8c1_s_p9_1[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__8c1_s_p9_1 = { +- _vq_quantthresh__8c1_s_p9_1, +- _vq_quantmap__8c1_s_p9_1, ++static const encode_aux_threshmatch _vq_auxt__8c1_s_p9_1 = { ++ (float *)_vq_quantthresh__8c1_s_p9_1, ++ (long *)_vq_quantmap__8c1_s_p9_1, + 15, + 15 + }; + +-static static_codebook _8c1_s_p9_1 = { ++static const static_codebook _8c1_s_p9_1 = { + 2, 225, +- _vq_lengthlist__8c1_s_p9_1, ++ (long *)_vq_lengthlist__8c1_s_p9_1, + 1, -520986624, 1620377600, 4, 0, +- _vq_quantlist__8c1_s_p9_1, ++ (long *)_vq_quantlist__8c1_s_p9_1, + NULL, +- &_vq_auxt__8c1_s_p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__8c1_s_p9_2[] = { ++static const long _vq_quantlist__8c1_s_p9_2[] = { + 10, + 9, + 11, +@@ -5283,7 +5283,7 @@ + 20, + }; + +-static long _vq_lengthlist__8c1_s_p9_2[] = { ++static const long _vq_lengthlist__8c1_s_p9_2[] = { + 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 9, 9, 9, + 9, 9, 9, 9, 9,11,11,12, 7, 7, 7, 7, 8, 8, 9, 9, + 9, 9,10,10,10,10,10,10,10,10,11,11,11, 7, 7, 7, +@@ -5314,37 +5314,37 @@ + 10,10,10,10,10,10,10,10,10, + }; + +-static float _vq_quantthresh__8c1_s_p9_2[] = { ++static const float _vq_quantthresh__8c1_s_p9_2[] = { + -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, + -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, + 6.5, 7.5, 8.5, 9.5, + }; + +-static long _vq_quantmap__8c1_s_p9_2[] = { ++static const long _vq_quantmap__8c1_s_p9_2[] = { + 19, 17, 15, 13, 11, 9, 7, 5, + 3, 1, 0, 2, 4, 6, 8, 10, + 12, 14, 16, 18, 20, + }; + +-static encode_aux_threshmatch _vq_auxt__8c1_s_p9_2 = { +- _vq_quantthresh__8c1_s_p9_2, +- _vq_quantmap__8c1_s_p9_2, ++static const encode_aux_threshmatch _vq_auxt__8c1_s_p9_2 = { ++ (float *)_vq_quantthresh__8c1_s_p9_2, ++ (long *)_vq_quantmap__8c1_s_p9_2, + 21, + 21 + }; + +-static static_codebook _8c1_s_p9_2 = { ++static const static_codebook _8c1_s_p9_2 = { + 2, 441, +- _vq_lengthlist__8c1_s_p9_2, ++ (long *)_vq_lengthlist__8c1_s_p9_2, + 1, -529268736, 1611661312, 5, 0, +- _vq_quantlist__8c1_s_p9_2, ++ (long *)_vq_quantlist__8c1_s_p9_2, + NULL, +- &_vq_auxt__8c1_s_p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__8c1_s_p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__8c1_s_single[] = { ++static const long _huff_lengthlist__8c1_s_single[] = { + 4, 6,18, 8,11, 8, 8, 9, 9,10, 4, 4,18, 5, 9, 5, + 6, 7, 8,10,18,18,18,18,17,17,17,17,17,17, 7, 5, + 17, 6,11, 6, 7, 8, 9,12,12, 9,17,12, 8, 8, 9,10, +@@ -5354,9 +5354,9 @@ + 9, 7, 7, 8, + }; + +-static static_codebook _huff_book__8c1_s_single = { ++static const static_codebook _huff_book__8c1_s_single = { + 2, 100, +- _huff_lengthlist__8c1_s_single, ++ (long *)_huff_lengthlist__8c1_s_single, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -5365,7 +5365,7 @@ + 0 + }; + +-static long _huff_lengthlist__44c2_s_long[] = { ++static const long _huff_lengthlist__44c2_s_long[] = { + 6, 6,12,10,10,10, 9,10,12,12, 6, 1,10, 5, 6, 6, + 7, 9,11,14,12, 9, 8,11, 7, 8, 9,11,13,15,10, 5, + 12, 7, 8, 7, 9,12,14,15,10, 6, 7, 8, 5, 6, 7, 9, +@@ -5375,9 +5375,9 @@ + 10, 8, 8, 9, + }; + +-static static_codebook _huff_book__44c2_s_long = { ++static const static_codebook _huff_book__44c2_s_long = { + 2, 100, +- _huff_lengthlist__44c2_s_long, ++ (long *)_huff_lengthlist__44c2_s_long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -5386,13 +5386,13 @@ + 0 + }; + +-static long _vq_quantlist__44c2_s_p1_0[] = { ++static const long _vq_quantlist__44c2_s_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c2_s_p1_0[] = { ++static const long _vq_lengthlist__44c2_s_p1_0[] = { + 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 0, + 0, 0, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -5806,33 +5806,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c2_s_p1_0[] = { ++static const float _vq_quantthresh__44c2_s_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44c2_s_p1_0[] = { ++static const long _vq_quantmap__44c2_s_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c2_s_p1_0 = { +- _vq_quantthresh__44c2_s_p1_0, +- _vq_quantmap__44c2_s_p1_0, ++static const encode_aux_threshmatch _vq_auxt__44c2_s_p1_0 = { ++ (float *)_vq_quantthresh__44c2_s_p1_0, ++ (long *)_vq_quantmap__44c2_s_p1_0, + 3, + 3 + }; + +-static static_codebook _44c2_s_p1_0 = { ++static const static_codebook _44c2_s_p1_0 = { + 8, 6561, +- _vq_lengthlist__44c2_s_p1_0, ++ (long *)_vq_lengthlist__44c2_s_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44c2_s_p1_0, ++ (long *)_vq_quantlist__44c2_s_p1_0, + NULL, +- &_vq_auxt__44c2_s_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c2_s_p2_0[] = { ++static const long _vq_quantlist__44c2_s_p2_0[] = { + 2, + 1, + 3, +@@ -5840,7 +5840,7 @@ + 4, + }; + +-static long _vq_lengthlist__44c2_s_p2_0[] = { ++static const long _vq_lengthlist__44c2_s_p2_0[] = { + 1, 4, 4, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, + 8, 8, 0, 0, 0, 0, 0, 0, 0, 4, 6, 6, 0, 0, 0, 8, + 8, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, +@@ -5883,33 +5883,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c2_s_p2_0[] = { ++static const float _vq_quantthresh__44c2_s_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c2_s_p2_0[] = { ++static const long _vq_quantmap__44c2_s_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c2_s_p2_0 = { +- _vq_quantthresh__44c2_s_p2_0, +- _vq_quantmap__44c2_s_p2_0, ++static const encode_aux_threshmatch _vq_auxt__44c2_s_p2_0 = { ++ (float *)_vq_quantthresh__44c2_s_p2_0, ++ (long *)_vq_quantmap__44c2_s_p2_0, + 5, + 5 + }; + +-static static_codebook _44c2_s_p2_0 = { ++static const static_codebook _44c2_s_p2_0 = { + 4, 625, +- _vq_lengthlist__44c2_s_p2_0, ++ (long *)_vq_lengthlist__44c2_s_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c2_s_p2_0, ++ (long *)_vq_quantlist__44c2_s_p2_0, + NULL, +- &_vq_auxt__44c2_s_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c2_s_p3_0[] = { ++static const long _vq_quantlist__44c2_s_p3_0[] = { + 2, + 1, + 3, +@@ -5917,7 +5917,7 @@ + 4, + }; + +-static long _vq_lengthlist__44c2_s_p3_0[] = { ++static const long _vq_lengthlist__44c2_s_p3_0[] = { + 2, 4, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -5960,33 +5960,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c2_s_p3_0[] = { ++static const float _vq_quantthresh__44c2_s_p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c2_s_p3_0[] = { ++static const long _vq_quantmap__44c2_s_p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c2_s_p3_0 = { +- _vq_quantthresh__44c2_s_p3_0, +- _vq_quantmap__44c2_s_p3_0, ++static const encode_aux_threshmatch _vq_auxt__44c2_s_p3_0 = { ++ (float *)_vq_quantthresh__44c2_s_p3_0, ++ (long *)_vq_quantmap__44c2_s_p3_0, + 5, + 5 + }; + +-static static_codebook _44c2_s_p3_0 = { ++static const static_codebook _44c2_s_p3_0 = { + 4, 625, +- _vq_lengthlist__44c2_s_p3_0, ++ (long *)_vq_lengthlist__44c2_s_p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c2_s_p3_0, ++ (long *)_vq_quantlist__44c2_s_p3_0, + NULL, +- &_vq_auxt__44c2_s_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c2_s_p4_0[] = { ++static const long _vq_quantlist__44c2_s_p4_0[] = { + 4, + 3, + 5, +@@ -5998,7 +5998,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c2_s_p4_0[] = { ++static const long _vq_lengthlist__44c2_s_p4_0[] = { + 1, 3, 3, 6, 6, 0, 0, 0, 0, 0, 6, 6, 6, 6, 0, 0, + 0, 0, 0, 6, 6, 6, 6, 0, 0, 0, 0, 0, 7, 7, 6, 6, + 0, 0, 0, 0, 0, 0, 0, 6, 7, 0, 0, 0, 0, 0, 0, 0, +@@ -6007,34 +6007,34 @@ + 0, + }; + +-static float _vq_quantthresh__44c2_s_p4_0[] = { ++static const float _vq_quantthresh__44c2_s_p4_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c2_s_p4_0[] = { ++static const long _vq_quantmap__44c2_s_p4_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c2_s_p4_0 = { +- _vq_quantthresh__44c2_s_p4_0, +- _vq_quantmap__44c2_s_p4_0, ++static const encode_aux_threshmatch _vq_auxt__44c2_s_p4_0 = { ++ (float *)_vq_quantthresh__44c2_s_p4_0, ++ (long *)_vq_quantmap__44c2_s_p4_0, + 9, + 9 + }; + +-static static_codebook _44c2_s_p4_0 = { ++static const static_codebook _44c2_s_p4_0 = { + 2, 81, +- _vq_lengthlist__44c2_s_p4_0, ++ (long *)_vq_lengthlist__44c2_s_p4_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c2_s_p4_0, ++ (long *)_vq_quantlist__44c2_s_p4_0, + NULL, +- &_vq_auxt__44c2_s_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c2_s_p5_0[] = { ++static const long _vq_quantlist__44c2_s_p5_0[] = { + 4, + 3, + 5, +@@ -6046,7 +6046,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c2_s_p5_0[] = { ++static const long _vq_lengthlist__44c2_s_p5_0[] = { + 1, 3, 3, 6, 6, 7, 7, 9, 9, 0, 7, 7, 7, 7, 7, 7, + 9, 9, 0, 7, 7, 7, 7, 7, 7, 9, 9, 0, 8, 8, 7, 7, + 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0, +@@ -6055,34 +6055,34 @@ + 11, + }; + +-static float _vq_quantthresh__44c2_s_p5_0[] = { ++static const float _vq_quantthresh__44c2_s_p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c2_s_p5_0[] = { ++static const long _vq_quantmap__44c2_s_p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c2_s_p5_0 = { +- _vq_quantthresh__44c2_s_p5_0, +- _vq_quantmap__44c2_s_p5_0, ++static const encode_aux_threshmatch _vq_auxt__44c2_s_p5_0 = { ++ (float *)_vq_quantthresh__44c2_s_p5_0, ++ (long *)_vq_quantmap__44c2_s_p5_0, + 9, + 9 + }; + +-static static_codebook _44c2_s_p5_0 = { ++static const static_codebook _44c2_s_p5_0 = { + 2, 81, +- _vq_lengthlist__44c2_s_p5_0, ++ (long *)_vq_lengthlist__44c2_s_p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c2_s_p5_0, ++ (long *)_vq_quantlist__44c2_s_p5_0, + NULL, +- &_vq_auxt__44c2_s_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c2_s_p6_0[] = { ++static const long _vq_quantlist__44c2_s_p6_0[] = { + 8, + 7, + 9, +@@ -6102,7 +6102,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c2_s_p6_0[] = { ++static const long _vq_lengthlist__44c2_s_p6_0[] = { + 1, 4, 3, 6, 6, 8, 8, 9, 9, 9, 9, 9, 9,10,10,11, + 11, 0, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11, + 12,11, 0, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11, +@@ -6124,42 +6124,42 @@ + 14, + }; + +-static float _vq_quantthresh__44c2_s_p6_0[] = { ++static const float _vq_quantthresh__44c2_s_p6_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c2_s_p6_0[] = { ++static const long _vq_quantmap__44c2_s_p6_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c2_s_p6_0 = { +- _vq_quantthresh__44c2_s_p6_0, +- _vq_quantmap__44c2_s_p6_0, ++static const encode_aux_threshmatch _vq_auxt__44c2_s_p6_0 = { ++ (float *)_vq_quantthresh__44c2_s_p6_0, ++ (long *)_vq_quantmap__44c2_s_p6_0, + 17, + 17 + }; + +-static static_codebook _44c2_s_p6_0 = { ++static const static_codebook _44c2_s_p6_0 = { + 2, 289, +- _vq_lengthlist__44c2_s_p6_0, ++ (long *)_vq_lengthlist__44c2_s_p6_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c2_s_p6_0, ++ (long *)_vq_quantlist__44c2_s_p6_0, + NULL, +- &_vq_auxt__44c2_s_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c2_s_p7_0[] = { ++static const long _vq_quantlist__44c2_s_p7_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c2_s_p7_0[] = { ++static const long _vq_lengthlist__44c2_s_p7_0[] = { + 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, + 9, 9, 4, 7, 7,10, 9, 9,10, 9, 9, 7,10,10,11,10, + 11,11,10,11, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, +@@ -6168,33 +6168,33 @@ + 11, + }; + +-static float _vq_quantthresh__44c2_s_p7_0[] = { ++static const float _vq_quantthresh__44c2_s_p7_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44c2_s_p7_0[] = { ++static const long _vq_quantmap__44c2_s_p7_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c2_s_p7_0 = { +- _vq_quantthresh__44c2_s_p7_0, +- _vq_quantmap__44c2_s_p7_0, ++static const encode_aux_threshmatch _vq_auxt__44c2_s_p7_0 = { ++ (float *)_vq_quantthresh__44c2_s_p7_0, ++ (long *)_vq_quantmap__44c2_s_p7_0, + 3, + 3 + }; + +-static static_codebook _44c2_s_p7_0 = { ++static const static_codebook _44c2_s_p7_0 = { + 4, 81, +- _vq_lengthlist__44c2_s_p7_0, ++ (long *)_vq_lengthlist__44c2_s_p7_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44c2_s_p7_0, ++ (long *)_vq_quantlist__44c2_s_p7_0, + NULL, +- &_vq_auxt__44c2_s_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c2_s_p7_1[] = { ++static const long _vq_quantlist__44c2_s_p7_1[] = { + 5, + 4, + 6, +@@ -6208,7 +6208,7 @@ + 10, + }; + +-static long _vq_lengthlist__44c2_s_p7_1[] = { ++static const long _vq_lengthlist__44c2_s_p7_1[] = { + 2, 3, 4, 6, 6, 7, 7, 7, 7, 7, 7, 9, 7, 7, 6, 6, + 7, 7, 8, 8, 8, 8, 9, 6, 6, 6, 6, 7, 7, 8, 8, 8, + 8,10, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, +@@ -6219,35 +6219,35 @@ + 10,10,10, 8, 8, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__44c2_s_p7_1[] = { ++static const float _vq_quantthresh__44c2_s_p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44c2_s_p7_1[] = { ++static const long _vq_quantmap__44c2_s_p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44c2_s_p7_1 = { +- _vq_quantthresh__44c2_s_p7_1, +- _vq_quantmap__44c2_s_p7_1, ++static const encode_aux_threshmatch _vq_auxt__44c2_s_p7_1 = { ++ (float *)_vq_quantthresh__44c2_s_p7_1, ++ (long *)_vq_quantmap__44c2_s_p7_1, + 11, + 11 + }; + +-static static_codebook _44c2_s_p7_1 = { ++static const static_codebook _44c2_s_p7_1 = { + 2, 121, +- _vq_lengthlist__44c2_s_p7_1, ++ (long *)_vq_lengthlist__44c2_s_p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44c2_s_p7_1, ++ (long *)_vq_quantlist__44c2_s_p7_1, + NULL, +- &_vq_auxt__44c2_s_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c2_s_p8_0[] = { ++static const long _vq_quantlist__44c2_s_p8_0[] = { + 6, + 5, + 7, +@@ -6263,7 +6263,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c2_s_p8_0[] = { ++static const long _vq_lengthlist__44c2_s_p8_0[] = { + 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 6, 5, 5, + 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 6, 5, 7, 7, 8, + 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, +@@ -6277,35 +6277,35 @@ + 0,12,12,12,12,13,12,14,14, + }; + +-static float _vq_quantthresh__44c2_s_p8_0[] = { ++static const float _vq_quantthresh__44c2_s_p8_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44c2_s_p8_0[] = { ++static const long _vq_quantmap__44c2_s_p8_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c2_s_p8_0 = { +- _vq_quantthresh__44c2_s_p8_0, +- _vq_quantmap__44c2_s_p8_0, ++static const encode_aux_threshmatch _vq_auxt__44c2_s_p8_0 = { ++ (float *)_vq_quantthresh__44c2_s_p8_0, ++ (long *)_vq_quantmap__44c2_s_p8_0, + 13, + 13 + }; + +-static static_codebook _44c2_s_p8_0 = { ++static const static_codebook _44c2_s_p8_0 = { + 2, 169, +- _vq_lengthlist__44c2_s_p8_0, ++ (long *)_vq_lengthlist__44c2_s_p8_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44c2_s_p8_0, ++ (long *)_vq_quantlist__44c2_s_p8_0, + NULL, +- &_vq_auxt__44c2_s_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c2_s_p8_1[] = { ++static const long _vq_quantlist__44c2_s_p8_1[] = { + 2, + 1, + 3, +@@ -6313,38 +6313,38 @@ + 4, + }; + +-static long _vq_lengthlist__44c2_s_p8_1[] = { ++static const long _vq_lengthlist__44c2_s_p8_1[] = { + 2, 4, 4, 5, 4, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, + 5, 5, 5, 5, 6, 6, 6, 5, 5, + }; + +-static float _vq_quantthresh__44c2_s_p8_1[] = { ++static const float _vq_quantthresh__44c2_s_p8_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c2_s_p8_1[] = { ++static const long _vq_quantmap__44c2_s_p8_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c2_s_p8_1 = { +- _vq_quantthresh__44c2_s_p8_1, +- _vq_quantmap__44c2_s_p8_1, ++static const encode_aux_threshmatch _vq_auxt__44c2_s_p8_1 = { ++ (float *)_vq_quantthresh__44c2_s_p8_1, ++ (long *)_vq_quantmap__44c2_s_p8_1, + 5, + 5 + }; + +-static static_codebook _44c2_s_p8_1 = { ++static const static_codebook _44c2_s_p8_1 = { + 2, 25, +- _vq_lengthlist__44c2_s_p8_1, ++ (long *)_vq_lengthlist__44c2_s_p8_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c2_s_p8_1, ++ (long *)_vq_quantlist__44c2_s_p8_1, + NULL, +- &_vq_auxt__44c2_s_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c2_s_p9_0[] = { ++static const long _vq_quantlist__44c2_s_p9_0[] = { + 6, + 5, + 7, +@@ -6360,7 +6360,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c2_s_p9_0[] = { ++static const long _vq_lengthlist__44c2_s_p9_0[] = { + 1, 5, 4,12,12,12,12,12,12,12,12,12,12, 4, 9, 8, + 11,11,11,11,11,11,11,11,11,11, 2, 8, 7,11,11,11, + 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, +@@ -6374,35 +6374,35 @@ + 11,11,11,11,11,11,11,11,11, + }; + +-static float _vq_quantthresh__44c2_s_p9_0[] = { ++static const float _vq_quantthresh__44c2_s_p9_0[] = { + -1215.5, -994.5, -773.5, -552.5, -331.5, -110.5, 110.5, 331.5, + 552.5, 773.5, 994.5, 1215.5, + }; + +-static long _vq_quantmap__44c2_s_p9_0[] = { ++static const long _vq_quantmap__44c2_s_p9_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c2_s_p9_0 = { +- _vq_quantthresh__44c2_s_p9_0, +- _vq_quantmap__44c2_s_p9_0, ++static const encode_aux_threshmatch _vq_auxt__44c2_s_p9_0 = { ++ (float *)_vq_quantthresh__44c2_s_p9_0, ++ (long *)_vq_quantmap__44c2_s_p9_0, + 13, + 13 + }; + +-static static_codebook _44c2_s_p9_0 = { ++static const static_codebook _44c2_s_p9_0 = { + 2, 169, +- _vq_lengthlist__44c2_s_p9_0, ++ (long *)_vq_lengthlist__44c2_s_p9_0, + 1, -514541568, 1627103232, 4, 0, +- _vq_quantlist__44c2_s_p9_0, ++ (long *)_vq_quantlist__44c2_s_p9_0, + NULL, +- &_vq_auxt__44c2_s_p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c2_s_p9_1[] = { ++static const long _vq_quantlist__44c2_s_p9_1[] = { + 6, + 5, + 7, +@@ -6418,7 +6418,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c2_s_p9_1[] = { ++static const long _vq_lengthlist__44c2_s_p9_1[] = { + 1, 4, 4, 6, 6, 7, 6, 8, 8,10, 9,10,10, 6, 5, 5, + 7, 7, 8, 7,10, 9,11,11,12,13, 6, 5, 5, 7, 7, 8, + 8,10,10,11,11,13,13,18, 8, 8, 8, 8, 9, 9,10,10, +@@ -6432,35 +6432,35 @@ + 17,13,12,12,10,13,11,14,14, + }; + +-static float _vq_quantthresh__44c2_s_p9_1[] = { ++static const float _vq_quantthresh__44c2_s_p9_1[] = { + -93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, 25.5, + 42.5, 59.5, 76.5, 93.5, + }; + +-static long _vq_quantmap__44c2_s_p9_1[] = { ++static const long _vq_quantmap__44c2_s_p9_1[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c2_s_p9_1 = { +- _vq_quantthresh__44c2_s_p9_1, +- _vq_quantmap__44c2_s_p9_1, ++static const encode_aux_threshmatch _vq_auxt__44c2_s_p9_1 = { ++ (float *)_vq_quantthresh__44c2_s_p9_1, ++ (long *)_vq_quantmap__44c2_s_p9_1, + 13, + 13 + }; + +-static static_codebook _44c2_s_p9_1 = { ++static const static_codebook _44c2_s_p9_1 = { + 2, 169, +- _vq_lengthlist__44c2_s_p9_1, ++ (long *)_vq_lengthlist__44c2_s_p9_1, + 1, -522616832, 1620115456, 4, 0, +- _vq_quantlist__44c2_s_p9_1, ++ (long *)_vq_quantlist__44c2_s_p9_1, + NULL, +- &_vq_auxt__44c2_s_p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c2_s_p9_2[] = { ++static const long _vq_quantlist__44c2_s_p9_2[] = { + 8, + 7, + 9, +@@ -6480,7 +6480,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c2_s_p9_2[] = { ++static const long _vq_lengthlist__44c2_s_p9_2[] = { + 2, 4, 4, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, + 8,10, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, + 9, 9,10, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, +@@ -6502,36 +6502,36 @@ + 10, + }; + +-static float _vq_quantthresh__44c2_s_p9_2[] = { ++static const float _vq_quantthresh__44c2_s_p9_2[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c2_s_p9_2[] = { ++static const long _vq_quantmap__44c2_s_p9_2[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c2_s_p9_2 = { +- _vq_quantthresh__44c2_s_p9_2, +- _vq_quantmap__44c2_s_p9_2, ++static const encode_aux_threshmatch _vq_auxt__44c2_s_p9_2 = { ++ (float *)_vq_quantthresh__44c2_s_p9_2, ++ (long *)_vq_quantmap__44c2_s_p9_2, + 17, + 17 + }; + +-static static_codebook _44c2_s_p9_2 = { ++static const static_codebook _44c2_s_p9_2 = { + 2, 289, +- _vq_lengthlist__44c2_s_p9_2, ++ (long *)_vq_lengthlist__44c2_s_p9_2, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c2_s_p9_2, ++ (long *)_vq_quantlist__44c2_s_p9_2, + NULL, +- &_vq_auxt__44c2_s_p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44c2_s_p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44c2_s_short[] = { ++static const long _huff_lengthlist__44c2_s_short[] = { + 11, 9,13,12,12,11,12,12,13,15, 8, 2,11, 4, 8, 5, + 7,10,12,15,13, 7,10, 9, 8, 8,10,13,17,17,11, 4, + 12, 5, 9, 5, 8,11,14,16,12, 6, 8, 7, 6, 6, 8,11, +@@ -6541,9 +6541,9 @@ + 6, 8, 9,12, + }; + +-static static_codebook _huff_book__44c2_s_short = { ++static const static_codebook _huff_book__44c2_s_short = { + 2, 100, +- _huff_lengthlist__44c2_s_short, ++ (long *)_huff_lengthlist__44c2_s_short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -6552,7 +6552,7 @@ + 0 + }; + +-static long _huff_lengthlist__44c3_s_long[] = { ++static const long _huff_lengthlist__44c3_s_long[] = { + 5, 6,11,11,11,11,10,10,12,11, 5, 2,11, 5, 6, 6, + 7, 9,11,13,13,10, 7,11, 6, 7, 8, 9,10,12,11, 5, + 11, 6, 8, 7, 9,11,14,15,11, 6, 6, 8, 4, 5, 7, 8, +@@ -6562,9 +6562,9 @@ + 9, 8, 8, 8, + }; + +-static static_codebook _huff_book__44c3_s_long = { ++static const static_codebook _huff_book__44c3_s_long = { + 2, 100, +- _huff_lengthlist__44c3_s_long, ++ (long *)_huff_lengthlist__44c3_s_long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -6573,13 +6573,13 @@ + 0 + }; + +-static long _vq_quantlist__44c3_s_p1_0[] = { ++static const long _vq_quantlist__44c3_s_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c3_s_p1_0[] = { ++static const long _vq_lengthlist__44c3_s_p1_0[] = { + 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 0, + 0, 0, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -6993,33 +6993,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c3_s_p1_0[] = { ++static const float _vq_quantthresh__44c3_s_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44c3_s_p1_0[] = { ++static const long _vq_quantmap__44c3_s_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c3_s_p1_0 = { +- _vq_quantthresh__44c3_s_p1_0, +- _vq_quantmap__44c3_s_p1_0, ++static const encode_aux_threshmatch _vq_auxt__44c3_s_p1_0 = { ++ (float *)_vq_quantthresh__44c3_s_p1_0, ++ (long *)_vq_quantmap__44c3_s_p1_0, + 3, + 3 + }; + +-static static_codebook _44c3_s_p1_0 = { ++static const static_codebook _44c3_s_p1_0 = { + 8, 6561, +- _vq_lengthlist__44c3_s_p1_0, ++ (long *)_vq_lengthlist__44c3_s_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44c3_s_p1_0, ++ (long *)_vq_quantlist__44c3_s_p1_0, + NULL, +- &_vq_auxt__44c3_s_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c3_s_p2_0[] = { ++static const long _vq_quantlist__44c3_s_p2_0[] = { + 2, + 1, + 3, +@@ -7027,7 +7027,7 @@ + 4, + }; + +-static long _vq_lengthlist__44c3_s_p2_0[] = { ++static const long _vq_lengthlist__44c3_s_p2_0[] = { + 2, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, + 7, 8, 0, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 7, + 7, 0, 0, 0, 7, 7, 0, 0, 0,10,10, 0, 0, 0, 0, 0, +@@ -7070,33 +7070,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c3_s_p2_0[] = { ++static const float _vq_quantthresh__44c3_s_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c3_s_p2_0[] = { ++static const long _vq_quantmap__44c3_s_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c3_s_p2_0 = { +- _vq_quantthresh__44c3_s_p2_0, +- _vq_quantmap__44c3_s_p2_0, ++static const encode_aux_threshmatch _vq_auxt__44c3_s_p2_0 = { ++ (float *)_vq_quantthresh__44c3_s_p2_0, ++ (long *)_vq_quantmap__44c3_s_p2_0, + 5, + 5 + }; + +-static static_codebook _44c3_s_p2_0 = { ++static const static_codebook _44c3_s_p2_0 = { + 4, 625, +- _vq_lengthlist__44c3_s_p2_0, ++ (long *)_vq_lengthlist__44c3_s_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c3_s_p2_0, ++ (long *)_vq_quantlist__44c3_s_p2_0, + NULL, +- &_vq_auxt__44c3_s_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c3_s_p3_0[] = { ++static const long _vq_quantlist__44c3_s_p3_0[] = { + 2, + 1, + 3, +@@ -7104,7 +7104,7 @@ + 4, + }; + +-static long _vq_lengthlist__44c3_s_p3_0[] = { ++static const long _vq_lengthlist__44c3_s_p3_0[] = { + 2, 4, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -7147,33 +7147,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c3_s_p3_0[] = { ++static const float _vq_quantthresh__44c3_s_p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c3_s_p3_0[] = { ++static const long _vq_quantmap__44c3_s_p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c3_s_p3_0 = { +- _vq_quantthresh__44c3_s_p3_0, +- _vq_quantmap__44c3_s_p3_0, ++static const encode_aux_threshmatch _vq_auxt__44c3_s_p3_0 = { ++ (float *)_vq_quantthresh__44c3_s_p3_0, ++ (long *)_vq_quantmap__44c3_s_p3_0, + 5, + 5 + }; + +-static static_codebook _44c3_s_p3_0 = { ++static const static_codebook _44c3_s_p3_0 = { + 4, 625, +- _vq_lengthlist__44c3_s_p3_0, ++ (long *)_vq_lengthlist__44c3_s_p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c3_s_p3_0, ++ (long *)_vq_quantlist__44c3_s_p3_0, + NULL, +- &_vq_auxt__44c3_s_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c3_s_p4_0[] = { ++static const long _vq_quantlist__44c3_s_p4_0[] = { + 4, + 3, + 5, +@@ -7185,7 +7185,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c3_s_p4_0[] = { ++static const long _vq_lengthlist__44c3_s_p4_0[] = { + 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, + 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6, + 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, +@@ -7194,34 +7194,34 @@ + 0, + }; + +-static float _vq_quantthresh__44c3_s_p4_0[] = { ++static const float _vq_quantthresh__44c3_s_p4_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c3_s_p4_0[] = { ++static const long _vq_quantmap__44c3_s_p4_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c3_s_p4_0 = { +- _vq_quantthresh__44c3_s_p4_0, +- _vq_quantmap__44c3_s_p4_0, ++static const encode_aux_threshmatch _vq_auxt__44c3_s_p4_0 = { ++ (float *)_vq_quantthresh__44c3_s_p4_0, ++ (long *)_vq_quantmap__44c3_s_p4_0, + 9, + 9 + }; + +-static static_codebook _44c3_s_p4_0 = { ++static const static_codebook _44c3_s_p4_0 = { + 2, 81, +- _vq_lengthlist__44c3_s_p4_0, ++ (long *)_vq_lengthlist__44c3_s_p4_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c3_s_p4_0, ++ (long *)_vq_quantlist__44c3_s_p4_0, + NULL, +- &_vq_auxt__44c3_s_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c3_s_p5_0[] = { ++static const long _vq_quantlist__44c3_s_p5_0[] = { + 4, + 3, + 5, +@@ -7233,7 +7233,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c3_s_p5_0[] = { ++static const long _vq_lengthlist__44c3_s_p5_0[] = { + 1, 3, 4, 6, 6, 7, 7, 9, 9, 0, 5, 5, 7, 7, 7, 8, + 9, 9, 0, 5, 5, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 8, + 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, +@@ -7242,34 +7242,34 @@ + 11, + }; + +-static float _vq_quantthresh__44c3_s_p5_0[] = { ++static const float _vq_quantthresh__44c3_s_p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c3_s_p5_0[] = { ++static const long _vq_quantmap__44c3_s_p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c3_s_p5_0 = { +- _vq_quantthresh__44c3_s_p5_0, +- _vq_quantmap__44c3_s_p5_0, ++static const encode_aux_threshmatch _vq_auxt__44c3_s_p5_0 = { ++ (float *)_vq_quantthresh__44c3_s_p5_0, ++ (long *)_vq_quantmap__44c3_s_p5_0, + 9, + 9 + }; + +-static static_codebook _44c3_s_p5_0 = { ++static const static_codebook _44c3_s_p5_0 = { + 2, 81, +- _vq_lengthlist__44c3_s_p5_0, ++ (long *)_vq_lengthlist__44c3_s_p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c3_s_p5_0, ++ (long *)_vq_quantlist__44c3_s_p5_0, + NULL, +- &_vq_auxt__44c3_s_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c3_s_p6_0[] = { ++static const long _vq_quantlist__44c3_s_p6_0[] = { + 8, + 7, + 9, +@@ -7289,7 +7289,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c3_s_p6_0[] = { ++static const long _vq_lengthlist__44c3_s_p6_0[] = { + 2, 3, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, + 10, 0, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10, + 11,11, 0, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, +@@ -7311,42 +7311,42 @@ + 13, + }; + +-static float _vq_quantthresh__44c3_s_p6_0[] = { ++static const float _vq_quantthresh__44c3_s_p6_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c3_s_p6_0[] = { ++static const long _vq_quantmap__44c3_s_p6_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c3_s_p6_0 = { +- _vq_quantthresh__44c3_s_p6_0, +- _vq_quantmap__44c3_s_p6_0, ++static const encode_aux_threshmatch _vq_auxt__44c3_s_p6_0 = { ++ (float *)_vq_quantthresh__44c3_s_p6_0, ++ (long *)_vq_quantmap__44c3_s_p6_0, + 17, + 17 + }; + +-static static_codebook _44c3_s_p6_0 = { ++static const static_codebook _44c3_s_p6_0 = { + 2, 289, +- _vq_lengthlist__44c3_s_p6_0, ++ (long *)_vq_lengthlist__44c3_s_p6_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c3_s_p6_0, ++ (long *)_vq_quantlist__44c3_s_p6_0, + NULL, +- &_vq_auxt__44c3_s_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c3_s_p7_0[] = { ++static const long _vq_quantlist__44c3_s_p7_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c3_s_p7_0[] = { ++static const long _vq_lengthlist__44c3_s_p7_0[] = { + 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, + 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,11,11, + 10,12,11,11, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, +@@ -7355,33 +7355,33 @@ + 10, + }; + +-static float _vq_quantthresh__44c3_s_p7_0[] = { ++static const float _vq_quantthresh__44c3_s_p7_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44c3_s_p7_0[] = { ++static const long _vq_quantmap__44c3_s_p7_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c3_s_p7_0 = { +- _vq_quantthresh__44c3_s_p7_0, +- _vq_quantmap__44c3_s_p7_0, ++static const encode_aux_threshmatch _vq_auxt__44c3_s_p7_0 = { ++ (float *)_vq_quantthresh__44c3_s_p7_0, ++ (long *)_vq_quantmap__44c3_s_p7_0, + 3, + 3 + }; + +-static static_codebook _44c3_s_p7_0 = { ++static const static_codebook _44c3_s_p7_0 = { + 4, 81, +- _vq_lengthlist__44c3_s_p7_0, ++ (long *)_vq_lengthlist__44c3_s_p7_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44c3_s_p7_0, ++ (long *)_vq_quantlist__44c3_s_p7_0, + NULL, +- &_vq_auxt__44c3_s_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c3_s_p7_1[] = { ++static const long _vq_quantlist__44c3_s_p7_1[] = { + 5, + 4, + 6, +@@ -7395,7 +7395,7 @@ + 10, + }; + +-static long _vq_lengthlist__44c3_s_p7_1[] = { ++static const long _vq_lengthlist__44c3_s_p7_1[] = { + 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8,10, 5, 5, 6, 6, + 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, + 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, +@@ -7406,35 +7406,35 @@ + 10,10,10, 8, 8, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__44c3_s_p7_1[] = { ++static const float _vq_quantthresh__44c3_s_p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44c3_s_p7_1[] = { ++static const long _vq_quantmap__44c3_s_p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44c3_s_p7_1 = { +- _vq_quantthresh__44c3_s_p7_1, +- _vq_quantmap__44c3_s_p7_1, ++static const encode_aux_threshmatch _vq_auxt__44c3_s_p7_1 = { ++ (float *)_vq_quantthresh__44c3_s_p7_1, ++ (long *)_vq_quantmap__44c3_s_p7_1, + 11, + 11 + }; + +-static static_codebook _44c3_s_p7_1 = { ++static const static_codebook _44c3_s_p7_1 = { + 2, 121, +- _vq_lengthlist__44c3_s_p7_1, ++ (long *)_vq_lengthlist__44c3_s_p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44c3_s_p7_1, ++ (long *)_vq_quantlist__44c3_s_p7_1, + NULL, +- &_vq_auxt__44c3_s_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c3_s_p8_0[] = { ++static const long _vq_quantlist__44c3_s_p8_0[] = { + 6, + 5, + 7, +@@ -7450,7 +7450,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c3_s_p8_0[] = { ++static const long _vq_lengthlist__44c3_s_p8_0[] = { + 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5, + 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 5, 7, 7, 8, + 8, 8, 8, 9, 9,11,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, +@@ -7464,35 +7464,35 @@ + 0,13,13,12,12,13,12,14,13, + }; + +-static float _vq_quantthresh__44c3_s_p8_0[] = { ++static const float _vq_quantthresh__44c3_s_p8_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44c3_s_p8_0[] = { ++static const long _vq_quantmap__44c3_s_p8_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c3_s_p8_0 = { +- _vq_quantthresh__44c3_s_p8_0, +- _vq_quantmap__44c3_s_p8_0, ++static const encode_aux_threshmatch _vq_auxt__44c3_s_p8_0 = { ++ (float *)_vq_quantthresh__44c3_s_p8_0, ++ (long *)_vq_quantmap__44c3_s_p8_0, + 13, + 13 + }; + +-static static_codebook _44c3_s_p8_0 = { ++static const static_codebook _44c3_s_p8_0 = { + 2, 169, +- _vq_lengthlist__44c3_s_p8_0, ++ (long *)_vq_lengthlist__44c3_s_p8_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44c3_s_p8_0, ++ (long *)_vq_quantlist__44c3_s_p8_0, + NULL, +- &_vq_auxt__44c3_s_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c3_s_p8_1[] = { ++static const long _vq_quantlist__44c3_s_p8_1[] = { + 2, + 1, + 3, +@@ -7500,38 +7500,38 @@ + 4, + }; + +-static long _vq_lengthlist__44c3_s_p8_1[] = { ++static const long _vq_lengthlist__44c3_s_p8_1[] = { + 2, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 4, 5, 5, 5, 6, + 5, 5, 5, 5, 6, 6, 6, 5, 5, + }; + +-static float _vq_quantthresh__44c3_s_p8_1[] = { ++static const float _vq_quantthresh__44c3_s_p8_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c3_s_p8_1[] = { ++static const long _vq_quantmap__44c3_s_p8_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c3_s_p8_1 = { +- _vq_quantthresh__44c3_s_p8_1, +- _vq_quantmap__44c3_s_p8_1, ++static const encode_aux_threshmatch _vq_auxt__44c3_s_p8_1 = { ++ (float *)_vq_quantthresh__44c3_s_p8_1, ++ (long *)_vq_quantmap__44c3_s_p8_1, + 5, + 5 + }; + +-static static_codebook _44c3_s_p8_1 = { ++static const static_codebook _44c3_s_p8_1 = { + 2, 25, +- _vq_lengthlist__44c3_s_p8_1, ++ (long *)_vq_lengthlist__44c3_s_p8_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c3_s_p8_1, ++ (long *)_vq_quantlist__44c3_s_p8_1, + NULL, +- &_vq_auxt__44c3_s_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c3_s_p9_0[] = { ++static const long _vq_quantlist__44c3_s_p9_0[] = { + 6, + 5, + 7, +@@ -7547,7 +7547,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c3_s_p9_0[] = { ++static const long _vq_lengthlist__44c3_s_p9_0[] = { + 1, 4, 4,12,12,12,12,12,12,12,12,12,12, 4, 9, 8, + 12,12,12,12,12,12,12,12,12,12, 2, 9, 7,12,12,12, + 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, +@@ -7561,35 +7561,35 @@ + 11,11,11,11,11,11,11,11,11, + }; + +-static float _vq_quantthresh__44c3_s_p9_0[] = { ++static const float _vq_quantthresh__44c3_s_p9_0[] = { + -1402.5, -1147.5, -892.5, -637.5, -382.5, -127.5, 127.5, 382.5, + 637.5, 892.5, 1147.5, 1402.5, + }; + +-static long _vq_quantmap__44c3_s_p9_0[] = { ++static const long _vq_quantmap__44c3_s_p9_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c3_s_p9_0 = { +- _vq_quantthresh__44c3_s_p9_0, +- _vq_quantmap__44c3_s_p9_0, ++static const encode_aux_threshmatch _vq_auxt__44c3_s_p9_0 = { ++ (float *)_vq_quantthresh__44c3_s_p9_0, ++ (long *)_vq_quantmap__44c3_s_p9_0, + 13, + 13 + }; + +-static static_codebook _44c3_s_p9_0 = { ++static const static_codebook _44c3_s_p9_0 = { + 2, 169, +- _vq_lengthlist__44c3_s_p9_0, ++ (long *)_vq_lengthlist__44c3_s_p9_0, + 1, -514332672, 1627381760, 4, 0, +- _vq_quantlist__44c3_s_p9_0, ++ (long *)_vq_quantlist__44c3_s_p9_0, + NULL, +- &_vq_auxt__44c3_s_p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c3_s_p9_1[] = { ++static const long _vq_quantlist__44c3_s_p9_1[] = { + 7, + 6, + 8, +@@ -7607,7 +7607,7 @@ + 14, + }; + +-static long _vq_lengthlist__44c3_s_p9_1[] = { ++static const long _vq_lengthlist__44c3_s_p9_1[] = { + 1, 4, 4, 6, 6, 7, 7, 8, 7, 9, 9,10,10,10,10, 6, + 5, 5, 7, 7, 8, 8,10, 8,11,10,12,12,13,13, 6, 5, + 5, 7, 7, 8, 8,10, 9,11,11,12,12,13,12,18, 8, 8, +@@ -7625,35 +7625,35 @@ + 15, + }; + +-static float _vq_quantthresh__44c3_s_p9_1[] = { ++static const float _vq_quantthresh__44c3_s_p9_1[] = { + -110.5, -93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, + 25.5, 42.5, 59.5, 76.5, 93.5, 110.5, + }; + +-static long _vq_quantmap__44c3_s_p9_1[] = { ++static const long _vq_quantmap__44c3_s_p9_1[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__44c3_s_p9_1 = { +- _vq_quantthresh__44c3_s_p9_1, +- _vq_quantmap__44c3_s_p9_1, ++static const encode_aux_threshmatch _vq_auxt__44c3_s_p9_1 = { ++ (float *)_vq_quantthresh__44c3_s_p9_1, ++ (long *)_vq_quantmap__44c3_s_p9_1, + 15, + 15 + }; + +-static static_codebook _44c3_s_p9_1 = { ++static const static_codebook _44c3_s_p9_1 = { + 2, 225, +- _vq_lengthlist__44c3_s_p9_1, ++ (long *)_vq_lengthlist__44c3_s_p9_1, + 1, -522338304, 1620115456, 4, 0, +- _vq_quantlist__44c3_s_p9_1, ++ (long *)_vq_quantlist__44c3_s_p9_1, + NULL, +- &_vq_auxt__44c3_s_p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c3_s_p9_2[] = { ++static const long _vq_quantlist__44c3_s_p9_2[] = { + 8, + 7, + 9, +@@ -7673,7 +7673,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c3_s_p9_2[] = { ++static const long _vq_lengthlist__44c3_s_p9_2[] = { + 2, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, + 8,10, 6, 6, 7, 7, 8, 7, 8, 8, 8, 8, 8, 9, 9, 9, + 9, 9,10, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, +@@ -7695,36 +7695,36 @@ + 10, + }; + +-static float _vq_quantthresh__44c3_s_p9_2[] = { ++static const float _vq_quantthresh__44c3_s_p9_2[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c3_s_p9_2[] = { ++static const long _vq_quantmap__44c3_s_p9_2[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c3_s_p9_2 = { +- _vq_quantthresh__44c3_s_p9_2, +- _vq_quantmap__44c3_s_p9_2, ++static const encode_aux_threshmatch _vq_auxt__44c3_s_p9_2 = { ++ (float *)_vq_quantthresh__44c3_s_p9_2, ++ (long *)_vq_quantmap__44c3_s_p9_2, + 17, + 17 + }; + +-static static_codebook _44c3_s_p9_2 = { ++static const static_codebook _44c3_s_p9_2 = { + 2, 289, +- _vq_lengthlist__44c3_s_p9_2, ++ (long *)_vq_lengthlist__44c3_s_p9_2, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c3_s_p9_2, ++ (long *)_vq_quantlist__44c3_s_p9_2, + NULL, +- &_vq_auxt__44c3_s_p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44c3_s_p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44c3_s_short[] = { ++static const long _huff_lengthlist__44c3_s_short[] = { + 10, 9,13,11,14,10,12,13,13,14, 7, 2,12, 5,10, 5, + 7,10,12,14,12, 6, 9, 8, 7, 7, 9,11,13,16,10, 4, + 12, 5,10, 6, 8,12,14,16,12, 6, 8, 7, 6, 5, 7,11, +@@ -7734,9 +7734,9 @@ + 6, 8, 9,11, + }; + +-static static_codebook _huff_book__44c3_s_short = { ++static const static_codebook _huff_book__44c3_s_short = { + 2, 100, +- _huff_lengthlist__44c3_s_short, ++ (long *)_huff_lengthlist__44c3_s_short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -7745,7 +7745,7 @@ + 0 + }; + +-static long _huff_lengthlist__44c4_s_long[] = { ++static const long _huff_lengthlist__44c4_s_long[] = { + 4, 7,11,11,11,11,10,11,12,11, 5, 2,11, 5, 6, 6, + 7, 9,11,12,11, 9, 6,10, 6, 7, 8, 9,10,11,11, 5, + 11, 7, 8, 8, 9,11,13,14,11, 6, 5, 8, 4, 5, 7, 8, +@@ -7755,9 +7755,9 @@ + 9, 8, 7, 7, + }; + +-static static_codebook _huff_book__44c4_s_long = { ++static const static_codebook _huff_book__44c4_s_long = { + 2, 100, +- _huff_lengthlist__44c4_s_long, ++ (long *)_huff_lengthlist__44c4_s_long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -7766,13 +7766,13 @@ + 0 + }; + +-static long _vq_quantlist__44c4_s_p1_0[] = { ++static const long _vq_quantlist__44c4_s_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c4_s_p1_0[] = { ++static const long _vq_lengthlist__44c4_s_p1_0[] = { + 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 0, + 0, 0, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -8186,33 +8186,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c4_s_p1_0[] = { ++static const float _vq_quantthresh__44c4_s_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44c4_s_p1_0[] = { ++static const long _vq_quantmap__44c4_s_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c4_s_p1_0 = { +- _vq_quantthresh__44c4_s_p1_0, +- _vq_quantmap__44c4_s_p1_0, ++static const encode_aux_threshmatch _vq_auxt__44c4_s_p1_0 = { ++ (float *)_vq_quantthresh__44c4_s_p1_0, ++ (long *)_vq_quantmap__44c4_s_p1_0, + 3, + 3 + }; + +-static static_codebook _44c4_s_p1_0 = { ++static const static_codebook _44c4_s_p1_0 = { + 8, 6561, +- _vq_lengthlist__44c4_s_p1_0, ++ (long *)_vq_lengthlist__44c4_s_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44c4_s_p1_0, ++ (long *)_vq_quantlist__44c4_s_p1_0, + NULL, +- &_vq_auxt__44c4_s_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c4_s_p2_0[] = { ++static const long _vq_quantlist__44c4_s_p2_0[] = { + 2, + 1, + 3, +@@ -8220,7 +8220,7 @@ + 4, + }; + +-static long _vq_lengthlist__44c4_s_p2_0[] = { ++static const long _vq_lengthlist__44c4_s_p2_0[] = { + 2, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, + 7, 7, 0, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 7, + 7, 0, 0, 0, 7, 7, 0, 0, 0,10,10, 0, 0, 0, 0, 0, +@@ -8263,33 +8263,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c4_s_p2_0[] = { ++static const float _vq_quantthresh__44c4_s_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c4_s_p2_0[] = { ++static const long _vq_quantmap__44c4_s_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c4_s_p2_0 = { +- _vq_quantthresh__44c4_s_p2_0, +- _vq_quantmap__44c4_s_p2_0, ++static const encode_aux_threshmatch _vq_auxt__44c4_s_p2_0 = { ++ (float *)_vq_quantthresh__44c4_s_p2_0, ++ (long *)_vq_quantmap__44c4_s_p2_0, + 5, + 5 + }; + +-static static_codebook _44c4_s_p2_0 = { ++static const static_codebook _44c4_s_p2_0 = { + 4, 625, +- _vq_lengthlist__44c4_s_p2_0, ++ (long *)_vq_lengthlist__44c4_s_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c4_s_p2_0, ++ (long *)_vq_quantlist__44c4_s_p2_0, + NULL, +- &_vq_auxt__44c4_s_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c4_s_p3_0[] = { ++static const long _vq_quantlist__44c4_s_p3_0[] = { + 2, + 1, + 3, +@@ -8297,7 +8297,7 @@ + 4, + }; + +-static long _vq_lengthlist__44c4_s_p3_0[] = { ++static const long _vq_lengthlist__44c4_s_p3_0[] = { + 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 4, 6, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -8340,33 +8340,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c4_s_p3_0[] = { ++static const float _vq_quantthresh__44c4_s_p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c4_s_p3_0[] = { ++static const long _vq_quantmap__44c4_s_p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c4_s_p3_0 = { +- _vq_quantthresh__44c4_s_p3_0, +- _vq_quantmap__44c4_s_p3_0, ++static const encode_aux_threshmatch _vq_auxt__44c4_s_p3_0 = { ++ (float *)_vq_quantthresh__44c4_s_p3_0, ++ (long *)_vq_quantmap__44c4_s_p3_0, + 5, + 5 + }; + +-static static_codebook _44c4_s_p3_0 = { ++static const static_codebook _44c4_s_p3_0 = { + 4, 625, +- _vq_lengthlist__44c4_s_p3_0, ++ (long *)_vq_lengthlist__44c4_s_p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c4_s_p3_0, ++ (long *)_vq_quantlist__44c4_s_p3_0, + NULL, +- &_vq_auxt__44c4_s_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c4_s_p4_0[] = { ++static const long _vq_quantlist__44c4_s_p4_0[] = { + 4, + 3, + 5, +@@ -8378,7 +8378,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c4_s_p4_0[] = { ++static const long _vq_lengthlist__44c4_s_p4_0[] = { + 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, + 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6, + 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, +@@ -8387,34 +8387,34 @@ + 0, + }; + +-static float _vq_quantthresh__44c4_s_p4_0[] = { ++static const float _vq_quantthresh__44c4_s_p4_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c4_s_p4_0[] = { ++static const long _vq_quantmap__44c4_s_p4_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c4_s_p4_0 = { +- _vq_quantthresh__44c4_s_p4_0, +- _vq_quantmap__44c4_s_p4_0, ++static const encode_aux_threshmatch _vq_auxt__44c4_s_p4_0 = { ++ (float *)_vq_quantthresh__44c4_s_p4_0, ++ (long *)_vq_quantmap__44c4_s_p4_0, + 9, + 9 + }; + +-static static_codebook _44c4_s_p4_0 = { ++static const static_codebook _44c4_s_p4_0 = { + 2, 81, +- _vq_lengthlist__44c4_s_p4_0, ++ (long *)_vq_lengthlist__44c4_s_p4_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c4_s_p4_0, ++ (long *)_vq_quantlist__44c4_s_p4_0, + NULL, +- &_vq_auxt__44c4_s_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c4_s_p5_0[] = { ++static const long _vq_quantlist__44c4_s_p5_0[] = { + 4, + 3, + 5, +@@ -8426,7 +8426,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c4_s_p5_0[] = { ++static const long _vq_lengthlist__44c4_s_p5_0[] = { + 2, 3, 3, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, + 9, 9, 0, 4, 5, 6, 6, 7, 7, 9, 9, 0, 6, 6, 7, 7, + 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10, 9, 0, 0, 0, +@@ -8435,34 +8435,34 @@ + 10, + }; + +-static float _vq_quantthresh__44c4_s_p5_0[] = { ++static const float _vq_quantthresh__44c4_s_p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c4_s_p5_0[] = { ++static const long _vq_quantmap__44c4_s_p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c4_s_p5_0 = { +- _vq_quantthresh__44c4_s_p5_0, +- _vq_quantmap__44c4_s_p5_0, ++static const encode_aux_threshmatch _vq_auxt__44c4_s_p5_0 = { ++ (float *)_vq_quantthresh__44c4_s_p5_0, ++ (long *)_vq_quantmap__44c4_s_p5_0, + 9, + 9 + }; + +-static static_codebook _44c4_s_p5_0 = { ++static const static_codebook _44c4_s_p5_0 = { + 2, 81, +- _vq_lengthlist__44c4_s_p5_0, ++ (long *)_vq_lengthlist__44c4_s_p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c4_s_p5_0, ++ (long *)_vq_quantlist__44c4_s_p5_0, + NULL, +- &_vq_auxt__44c4_s_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c4_s_p6_0[] = { ++static const long _vq_quantlist__44c4_s_p6_0[] = { + 8, + 7, + 9, +@@ -8482,7 +8482,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c4_s_p6_0[] = { ++static const long _vq_lengthlist__44c4_s_p6_0[] = { + 2, 4, 4, 6, 6, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11, + 11, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11, + 11,11, 0, 4, 4, 7, 6, 8, 8, 9, 9, 9, 9,10,10,11, +@@ -8504,42 +8504,42 @@ + 13, + }; + +-static float _vq_quantthresh__44c4_s_p6_0[] = { ++static const float _vq_quantthresh__44c4_s_p6_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c4_s_p6_0[] = { ++static const long _vq_quantmap__44c4_s_p6_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c4_s_p6_0 = { +- _vq_quantthresh__44c4_s_p6_0, +- _vq_quantmap__44c4_s_p6_0, ++static const encode_aux_threshmatch _vq_auxt__44c4_s_p6_0 = { ++ (float *)_vq_quantthresh__44c4_s_p6_0, ++ (long *)_vq_quantmap__44c4_s_p6_0, + 17, + 17 + }; + +-static static_codebook _44c4_s_p6_0 = { ++static const static_codebook _44c4_s_p6_0 = { + 2, 289, +- _vq_lengthlist__44c4_s_p6_0, ++ (long *)_vq_lengthlist__44c4_s_p6_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c4_s_p6_0, ++ (long *)_vq_quantlist__44c4_s_p6_0, + NULL, +- &_vq_auxt__44c4_s_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c4_s_p7_0[] = { ++static const long _vq_quantlist__44c4_s_p7_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c4_s_p7_0[] = { ++static const long _vq_lengthlist__44c4_s_p7_0[] = { + 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, + 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,11,11, + 10,11,11,11, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, +@@ -8548,33 +8548,33 @@ + 10, + }; + +-static float _vq_quantthresh__44c4_s_p7_0[] = { ++static const float _vq_quantthresh__44c4_s_p7_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44c4_s_p7_0[] = { ++static const long _vq_quantmap__44c4_s_p7_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c4_s_p7_0 = { +- _vq_quantthresh__44c4_s_p7_0, +- _vq_quantmap__44c4_s_p7_0, ++static const encode_aux_threshmatch _vq_auxt__44c4_s_p7_0 = { ++ (float *)_vq_quantthresh__44c4_s_p7_0, ++ (long *)_vq_quantmap__44c4_s_p7_0, + 3, + 3 + }; + +-static static_codebook _44c4_s_p7_0 = { ++static const static_codebook _44c4_s_p7_0 = { + 4, 81, +- _vq_lengthlist__44c4_s_p7_0, ++ (long *)_vq_lengthlist__44c4_s_p7_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44c4_s_p7_0, ++ (long *)_vq_quantlist__44c4_s_p7_0, + NULL, +- &_vq_auxt__44c4_s_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c4_s_p7_1[] = { ++static const long _vq_quantlist__44c4_s_p7_1[] = { + 5, + 4, + 6, +@@ -8588,7 +8588,7 @@ + 10, + }; + +-static long _vq_lengthlist__44c4_s_p7_1[] = { ++static const long _vq_lengthlist__44c4_s_p7_1[] = { + 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8,10, 5, 5, 6, 6, + 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, + 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, +@@ -8599,35 +8599,35 @@ + 10,10,10, 8, 8, 8, 8, 9, 9, + }; + +-static float _vq_quantthresh__44c4_s_p7_1[] = { ++static const float _vq_quantthresh__44c4_s_p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44c4_s_p7_1[] = { ++static const long _vq_quantmap__44c4_s_p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44c4_s_p7_1 = { +- _vq_quantthresh__44c4_s_p7_1, +- _vq_quantmap__44c4_s_p7_1, ++static const encode_aux_threshmatch _vq_auxt__44c4_s_p7_1 = { ++ (float *)_vq_quantthresh__44c4_s_p7_1, ++ (long *)_vq_quantmap__44c4_s_p7_1, + 11, + 11 + }; + +-static static_codebook _44c4_s_p7_1 = { ++static const static_codebook _44c4_s_p7_1 = { + 2, 121, +- _vq_lengthlist__44c4_s_p7_1, ++ (long *)_vq_lengthlist__44c4_s_p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44c4_s_p7_1, ++ (long *)_vq_quantlist__44c4_s_p7_1, + NULL, +- &_vq_auxt__44c4_s_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c4_s_p8_0[] = { ++static const long _vq_quantlist__44c4_s_p8_0[] = { + 6, + 5, + 7, +@@ -8643,7 +8643,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c4_s_p8_0[] = { ++static const long _vq_lengthlist__44c4_s_p8_0[] = { + 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5, + 7, 7, 8, 8, 8, 8, 9,10,11,11, 7, 5, 5, 7, 7, 8, + 8, 9, 9,10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9, +@@ -8657,35 +8657,35 @@ + 0,13,12,12,12,12,12,13,13, + }; + +-static float _vq_quantthresh__44c4_s_p8_0[] = { ++static const float _vq_quantthresh__44c4_s_p8_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44c4_s_p8_0[] = { ++static const long _vq_quantmap__44c4_s_p8_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c4_s_p8_0 = { +- _vq_quantthresh__44c4_s_p8_0, +- _vq_quantmap__44c4_s_p8_0, ++static const encode_aux_threshmatch _vq_auxt__44c4_s_p8_0 = { ++ (float *)_vq_quantthresh__44c4_s_p8_0, ++ (long *)_vq_quantmap__44c4_s_p8_0, + 13, + 13 + }; + +-static static_codebook _44c4_s_p8_0 = { ++static const static_codebook _44c4_s_p8_0 = { + 2, 169, +- _vq_lengthlist__44c4_s_p8_0, ++ (long *)_vq_lengthlist__44c4_s_p8_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44c4_s_p8_0, ++ (long *)_vq_quantlist__44c4_s_p8_0, + NULL, +- &_vq_auxt__44c4_s_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c4_s_p8_1[] = { ++static const long _vq_quantlist__44c4_s_p8_1[] = { + 2, + 1, + 3, +@@ -8693,38 +8693,38 @@ + 4, + }; + +-static long _vq_lengthlist__44c4_s_p8_1[] = { ++static const long _vq_lengthlist__44c4_s_p8_1[] = { + 2, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 5, 4, 5, 5, 6, + 5, 5, 5, 5, 6, 6, 6, 5, 5, + }; + +-static float _vq_quantthresh__44c4_s_p8_1[] = { ++static const float _vq_quantthresh__44c4_s_p8_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c4_s_p8_1[] = { ++static const long _vq_quantmap__44c4_s_p8_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c4_s_p8_1 = { +- _vq_quantthresh__44c4_s_p8_1, +- _vq_quantmap__44c4_s_p8_1, ++static const encode_aux_threshmatch _vq_auxt__44c4_s_p8_1 = { ++ (float *)_vq_quantthresh__44c4_s_p8_1, ++ (long *)_vq_quantmap__44c4_s_p8_1, + 5, + 5 + }; + +-static static_codebook _44c4_s_p8_1 = { ++static const static_codebook _44c4_s_p8_1 = { + 2, 25, +- _vq_lengthlist__44c4_s_p8_1, ++ (long *)_vq_lengthlist__44c4_s_p8_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c4_s_p8_1, ++ (long *)_vq_quantlist__44c4_s_p8_1, + NULL, +- &_vq_auxt__44c4_s_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c4_s_p9_0[] = { ++static const long _vq_quantlist__44c4_s_p9_0[] = { + 6, + 5, + 7, +@@ -8740,7 +8740,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c4_s_p9_0[] = { ++static const long _vq_lengthlist__44c4_s_p9_0[] = { + 1, 3, 3,12,12,12,12,12,12,12,12,12,12, 4, 7, 7, + 12,12,12,12,12,12,12,12,12,12, 3, 8, 8,12,12,12, + 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, +@@ -8754,35 +8754,35 @@ + 12,12,12,12,12,12,12,12,12, + }; + +-static float _vq_quantthresh__44c4_s_p9_0[] = { ++static const float _vq_quantthresh__44c4_s_p9_0[] = { + -1732.5, -1417.5, -1102.5, -787.5, -472.5, -157.5, 157.5, 472.5, + 787.5, 1102.5, 1417.5, 1732.5, + }; + +-static long _vq_quantmap__44c4_s_p9_0[] = { ++static const long _vq_quantmap__44c4_s_p9_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c4_s_p9_0 = { +- _vq_quantthresh__44c4_s_p9_0, +- _vq_quantmap__44c4_s_p9_0, ++static const encode_aux_threshmatch _vq_auxt__44c4_s_p9_0 = { ++ (float *)_vq_quantthresh__44c4_s_p9_0, ++ (long *)_vq_quantmap__44c4_s_p9_0, + 13, + 13 + }; + +-static static_codebook _44c4_s_p9_0 = { ++static const static_codebook _44c4_s_p9_0 = { + 2, 169, +- _vq_lengthlist__44c4_s_p9_0, ++ (long *)_vq_lengthlist__44c4_s_p9_0, + 1, -513964032, 1628680192, 4, 0, +- _vq_quantlist__44c4_s_p9_0, ++ (long *)_vq_quantlist__44c4_s_p9_0, + NULL, +- &_vq_auxt__44c4_s_p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c4_s_p9_1[] = { ++static const long _vq_quantlist__44c4_s_p9_1[] = { + 7, + 6, + 8, +@@ -8800,7 +8800,7 @@ + 14, + }; + +-static long _vq_lengthlist__44c4_s_p9_1[] = { ++static const long _vq_lengthlist__44c4_s_p9_1[] = { + 1, 4, 4, 5, 5, 7, 7, 9, 8,10, 9,10,10,10,10, 6, + 5, 5, 7, 7, 9, 8,10, 9,11,10,12,12,13,13, 6, 5, + 5, 7, 7, 9, 9,10,10,11,11,12,12,12,13,19, 8, 8, +@@ -8818,35 +8818,35 @@ + 15, + }; + +-static float _vq_quantthresh__44c4_s_p9_1[] = { ++static const float _vq_quantthresh__44c4_s_p9_1[] = { + -136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, + 31.5, 52.5, 73.5, 94.5, 115.5, 136.5, + }; + +-static long _vq_quantmap__44c4_s_p9_1[] = { ++static const long _vq_quantmap__44c4_s_p9_1[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__44c4_s_p9_1 = { +- _vq_quantthresh__44c4_s_p9_1, +- _vq_quantmap__44c4_s_p9_1, ++static const encode_aux_threshmatch _vq_auxt__44c4_s_p9_1 = { ++ (float *)_vq_quantthresh__44c4_s_p9_1, ++ (long *)_vq_quantmap__44c4_s_p9_1, + 15, + 15 + }; + +-static static_codebook _44c4_s_p9_1 = { ++static const static_codebook _44c4_s_p9_1 = { + 2, 225, +- _vq_lengthlist__44c4_s_p9_1, ++ (long *)_vq_lengthlist__44c4_s_p9_1, + 1, -520986624, 1620377600, 4, 0, +- _vq_quantlist__44c4_s_p9_1, ++ (long *)_vq_quantlist__44c4_s_p9_1, + NULL, +- &_vq_auxt__44c4_s_p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c4_s_p9_2[] = { ++static const long _vq_quantlist__44c4_s_p9_2[] = { + 10, + 9, + 11, +@@ -8870,7 +8870,7 @@ + 20, + }; + +-static long _vq_lengthlist__44c4_s_p9_2[] = { ++static const long _vq_lengthlist__44c4_s_p9_2[] = { + 2, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, + 8, 9, 9, 9, 9,11, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, + 9, 9, 9, 9, 9, 9,10,10,10,10,11, 6, 6, 7, 7, 8, +@@ -8901,37 +8901,37 @@ + 10,10,10,10,10,10,10,10,10, + }; + +-static float _vq_quantthresh__44c4_s_p9_2[] = { ++static const float _vq_quantthresh__44c4_s_p9_2[] = { + -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, + -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, + 6.5, 7.5, 8.5, 9.5, + }; + +-static long _vq_quantmap__44c4_s_p9_2[] = { ++static const long _vq_quantmap__44c4_s_p9_2[] = { + 19, 17, 15, 13, 11, 9, 7, 5, + 3, 1, 0, 2, 4, 6, 8, 10, + 12, 14, 16, 18, 20, + }; + +-static encode_aux_threshmatch _vq_auxt__44c4_s_p9_2 = { +- _vq_quantthresh__44c4_s_p9_2, +- _vq_quantmap__44c4_s_p9_2, ++static const encode_aux_threshmatch _vq_auxt__44c4_s_p9_2 = { ++ (float *)_vq_quantthresh__44c4_s_p9_2, ++ (long *)_vq_quantmap__44c4_s_p9_2, + 21, + 21 + }; + +-static static_codebook _44c4_s_p9_2 = { ++static const static_codebook _44c4_s_p9_2 = { + 2, 441, +- _vq_lengthlist__44c4_s_p9_2, ++ (long *)_vq_lengthlist__44c4_s_p9_2, + 1, -529268736, 1611661312, 5, 0, +- _vq_quantlist__44c4_s_p9_2, ++ (long *)_vq_quantlist__44c4_s_p9_2, + NULL, +- &_vq_auxt__44c4_s_p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44c4_s_p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44c4_s_short[] = { ++static const long _huff_lengthlist__44c4_s_short[] = { + 4, 7,14,10,15,10,12,15,16,15, 4, 2,11, 5,10, 6, + 8,11,14,14,14,10, 7,11, 6, 8,10,11,13,15, 9, 4, + 11, 5, 9, 6, 9,12,14,15,14, 9, 6, 9, 4, 5, 7,10, +@@ -8941,9 +8941,9 @@ + 7, 9,12,17, + }; + +-static static_codebook _huff_book__44c4_s_short = { ++static const static_codebook _huff_book__44c4_s_short = { + 2, 100, +- _huff_lengthlist__44c4_s_short, ++ (long *)_huff_lengthlist__44c4_s_short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -8952,7 +8952,7 @@ + 0 + }; + +-static long _huff_lengthlist__44c5_s_long[] = { ++static const long _huff_lengthlist__44c5_s_long[] = { + 3, 8, 9,13,10,12,12,12,12,12, 6, 4, 6, 8, 6, 8, + 10,10,11,12, 8, 5, 4,10, 4, 7, 8, 9,10,11,13, 8, + 10, 8, 9, 9,11,12,13,14,10, 6, 4, 9, 3, 5, 6, 8, +@@ -8962,9 +8962,9 @@ + 9, 8, 7, 7, + }; + +-static static_codebook _huff_book__44c5_s_long = { ++static const static_codebook _huff_book__44c5_s_long = { + 2, 100, +- _huff_lengthlist__44c5_s_long, ++ (long *)_huff_lengthlist__44c5_s_long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -8973,13 +8973,13 @@ + 0 + }; + +-static long _vq_quantlist__44c5_s_p1_0[] = { ++static const long _vq_quantlist__44c5_s_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c5_s_p1_0[] = { ++static const long _vq_lengthlist__44c5_s_p1_0[] = { + 2, 4, 4, 0, 0, 0, 0, 0, 0, 4, 7, 7, 0, 0, 0, 0, + 0, 0, 4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -9393,33 +9393,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c5_s_p1_0[] = { ++static const float _vq_quantthresh__44c5_s_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44c5_s_p1_0[] = { ++static const long _vq_quantmap__44c5_s_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c5_s_p1_0 = { +- _vq_quantthresh__44c5_s_p1_0, +- _vq_quantmap__44c5_s_p1_0, ++static const encode_aux_threshmatch _vq_auxt__44c5_s_p1_0 = { ++ (float *)_vq_quantthresh__44c5_s_p1_0, ++ (long *)_vq_quantmap__44c5_s_p1_0, + 3, + 3 + }; + +-static static_codebook _44c5_s_p1_0 = { ++static const static_codebook _44c5_s_p1_0 = { + 8, 6561, +- _vq_lengthlist__44c5_s_p1_0, ++ (long *)_vq_lengthlist__44c5_s_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44c5_s_p1_0, ++ (long *)_vq_quantlist__44c5_s_p1_0, + NULL, +- &_vq_auxt__44c5_s_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c5_s_p2_0[] = { ++static const long _vq_quantlist__44c5_s_p2_0[] = { + 2, + 1, + 3, +@@ -9427,7 +9427,7 @@ + 4, + }; + +-static long _vq_lengthlist__44c5_s_p2_0[] = { ++static const long _vq_lengthlist__44c5_s_p2_0[] = { + 2, 4, 4, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, + 8, 7, 0, 0, 0, 0, 0, 0, 0, 4, 6, 6, 0, 0, 0, 8, + 8, 0, 0, 0, 8, 7, 0, 0, 0,10,10, 0, 0, 0, 0, 0, +@@ -9470,33 +9470,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c5_s_p2_0[] = { ++static const float _vq_quantthresh__44c5_s_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c5_s_p2_0[] = { ++static const long _vq_quantmap__44c5_s_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c5_s_p2_0 = { +- _vq_quantthresh__44c5_s_p2_0, +- _vq_quantmap__44c5_s_p2_0, ++static const encode_aux_threshmatch _vq_auxt__44c5_s_p2_0 = { ++ (float *)_vq_quantthresh__44c5_s_p2_0, ++ (long *)_vq_quantmap__44c5_s_p2_0, + 5, + 5 + }; + +-static static_codebook _44c5_s_p2_0 = { ++static const static_codebook _44c5_s_p2_0 = { + 4, 625, +- _vq_lengthlist__44c5_s_p2_0, ++ (long *)_vq_lengthlist__44c5_s_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c5_s_p2_0, ++ (long *)_vq_quantlist__44c5_s_p2_0, + NULL, +- &_vq_auxt__44c5_s_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c5_s_p3_0[] = { ++static const long _vq_quantlist__44c5_s_p3_0[] = { + 2, + 1, + 3, +@@ -9504,7 +9504,7 @@ + 4, + }; + +-static long _vq_lengthlist__44c5_s_p3_0[] = { ++static const long _vq_lengthlist__44c5_s_p3_0[] = { + 2, 4, 3, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 6, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -9547,33 +9547,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c5_s_p3_0[] = { ++static const float _vq_quantthresh__44c5_s_p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c5_s_p3_0[] = { ++static const long _vq_quantmap__44c5_s_p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c5_s_p3_0 = { +- _vq_quantthresh__44c5_s_p3_0, +- _vq_quantmap__44c5_s_p3_0, ++static const encode_aux_threshmatch _vq_auxt__44c5_s_p3_0 = { ++ (float *)_vq_quantthresh__44c5_s_p3_0, ++ (long *)_vq_quantmap__44c5_s_p3_0, + 5, + 5 + }; + +-static static_codebook _44c5_s_p3_0 = { ++static const static_codebook _44c5_s_p3_0 = { + 4, 625, +- _vq_lengthlist__44c5_s_p3_0, ++ (long *)_vq_lengthlist__44c5_s_p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c5_s_p3_0, ++ (long *)_vq_quantlist__44c5_s_p3_0, + NULL, +- &_vq_auxt__44c5_s_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c5_s_p4_0[] = { ++static const long _vq_quantlist__44c5_s_p4_0[] = { + 4, + 3, + 5, +@@ -9585,7 +9585,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c5_s_p4_0[] = { ++static const long _vq_lengthlist__44c5_s_p4_0[] = { + 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, + 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6, + 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, +@@ -9594,34 +9594,34 @@ + 0, + }; + +-static float _vq_quantthresh__44c5_s_p4_0[] = { ++static const float _vq_quantthresh__44c5_s_p4_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c5_s_p4_0[] = { ++static const long _vq_quantmap__44c5_s_p4_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c5_s_p4_0 = { +- _vq_quantthresh__44c5_s_p4_0, +- _vq_quantmap__44c5_s_p4_0, ++static const encode_aux_threshmatch _vq_auxt__44c5_s_p4_0 = { ++ (float *)_vq_quantthresh__44c5_s_p4_0, ++ (long *)_vq_quantmap__44c5_s_p4_0, + 9, + 9 + }; + +-static static_codebook _44c5_s_p4_0 = { ++static const static_codebook _44c5_s_p4_0 = { + 2, 81, +- _vq_lengthlist__44c5_s_p4_0, ++ (long *)_vq_lengthlist__44c5_s_p4_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c5_s_p4_0, ++ (long *)_vq_quantlist__44c5_s_p4_0, + NULL, +- &_vq_auxt__44c5_s_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c5_s_p5_0[] = { ++static const long _vq_quantlist__44c5_s_p5_0[] = { + 4, + 3, + 5, +@@ -9633,7 +9633,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c5_s_p5_0[] = { ++static const long _vq_lengthlist__44c5_s_p5_0[] = { + 2, 4, 3, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, + 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 6, 6, 7, 7, + 7, 7, 9, 9, 0, 0, 0, 7, 6, 7, 7, 9, 9, 0, 0, 0, +@@ -9642,34 +9642,34 @@ + 10, + }; + +-static float _vq_quantthresh__44c5_s_p5_0[] = { ++static const float _vq_quantthresh__44c5_s_p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c5_s_p5_0[] = { ++static const long _vq_quantmap__44c5_s_p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c5_s_p5_0 = { +- _vq_quantthresh__44c5_s_p5_0, +- _vq_quantmap__44c5_s_p5_0, ++static const encode_aux_threshmatch _vq_auxt__44c5_s_p5_0 = { ++ (float *)_vq_quantthresh__44c5_s_p5_0, ++ (long *)_vq_quantmap__44c5_s_p5_0, + 9, + 9 + }; + +-static static_codebook _44c5_s_p5_0 = { ++static const static_codebook _44c5_s_p5_0 = { + 2, 81, +- _vq_lengthlist__44c5_s_p5_0, ++ (long *)_vq_lengthlist__44c5_s_p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c5_s_p5_0, ++ (long *)_vq_quantlist__44c5_s_p5_0, + NULL, +- &_vq_auxt__44c5_s_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c5_s_p6_0[] = { ++static const long _vq_quantlist__44c5_s_p6_0[] = { + 8, + 7, + 9, +@@ -9689,7 +9689,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c5_s_p6_0[] = { ++static const long _vq_lengthlist__44c5_s_p6_0[] = { + 2, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10,10,11, + 11, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11, + 12,12, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11, +@@ -9711,42 +9711,42 @@ + 13, + }; + +-static float _vq_quantthresh__44c5_s_p6_0[] = { ++static const float _vq_quantthresh__44c5_s_p6_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c5_s_p6_0[] = { ++static const long _vq_quantmap__44c5_s_p6_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c5_s_p6_0 = { +- _vq_quantthresh__44c5_s_p6_0, +- _vq_quantmap__44c5_s_p6_0, ++static const encode_aux_threshmatch _vq_auxt__44c5_s_p6_0 = { ++ (float *)_vq_quantthresh__44c5_s_p6_0, ++ (long *)_vq_quantmap__44c5_s_p6_0, + 17, + 17 + }; + +-static static_codebook _44c5_s_p6_0 = { ++static const static_codebook _44c5_s_p6_0 = { + 2, 289, +- _vq_lengthlist__44c5_s_p6_0, ++ (long *)_vq_lengthlist__44c5_s_p6_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c5_s_p6_0, ++ (long *)_vq_quantlist__44c5_s_p6_0, + NULL, +- &_vq_auxt__44c5_s_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c5_s_p7_0[] = { ++static const long _vq_quantlist__44c5_s_p7_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c5_s_p7_0[] = { ++static const long _vq_lengthlist__44c5_s_p7_0[] = { + 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, + 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,11,11, + 10,11,11,11, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, +@@ -9755,33 +9755,33 @@ + 10, + }; + +-static float _vq_quantthresh__44c5_s_p7_0[] = { ++static const float _vq_quantthresh__44c5_s_p7_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44c5_s_p7_0[] = { ++static const long _vq_quantmap__44c5_s_p7_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c5_s_p7_0 = { +- _vq_quantthresh__44c5_s_p7_0, +- _vq_quantmap__44c5_s_p7_0, ++static const encode_aux_threshmatch _vq_auxt__44c5_s_p7_0 = { ++ (float *)_vq_quantthresh__44c5_s_p7_0, ++ (long *)_vq_quantmap__44c5_s_p7_0, + 3, + 3 + }; + +-static static_codebook _44c5_s_p7_0 = { ++static const static_codebook _44c5_s_p7_0 = { + 4, 81, +- _vq_lengthlist__44c5_s_p7_0, ++ (long *)_vq_lengthlist__44c5_s_p7_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44c5_s_p7_0, ++ (long *)_vq_quantlist__44c5_s_p7_0, + NULL, +- &_vq_auxt__44c5_s_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c5_s_p7_1[] = { ++static const long _vq_quantlist__44c5_s_p7_1[] = { + 5, + 4, + 6, +@@ -9795,7 +9795,7 @@ + 10, + }; + +-static long _vq_lengthlist__44c5_s_p7_1[] = { ++static const long _vq_lengthlist__44c5_s_p7_1[] = { + 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, + 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, + 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, +@@ -9806,35 +9806,35 @@ + 10,10,10, 8, 8, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__44c5_s_p7_1[] = { ++static const float _vq_quantthresh__44c5_s_p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44c5_s_p7_1[] = { ++static const long _vq_quantmap__44c5_s_p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44c5_s_p7_1 = { +- _vq_quantthresh__44c5_s_p7_1, +- _vq_quantmap__44c5_s_p7_1, ++static const encode_aux_threshmatch _vq_auxt__44c5_s_p7_1 = { ++ (float *)_vq_quantthresh__44c5_s_p7_1, ++ (long *)_vq_quantmap__44c5_s_p7_1, + 11, + 11 + }; + +-static static_codebook _44c5_s_p7_1 = { ++static const static_codebook _44c5_s_p7_1 = { + 2, 121, +- _vq_lengthlist__44c5_s_p7_1, ++ (long *)_vq_lengthlist__44c5_s_p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44c5_s_p7_1, ++ (long *)_vq_quantlist__44c5_s_p7_1, + NULL, +- &_vq_auxt__44c5_s_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c5_s_p8_0[] = { ++static const long _vq_quantlist__44c5_s_p8_0[] = { + 6, + 5, + 7, +@@ -9850,7 +9850,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c5_s_p8_0[] = { ++static const long _vq_lengthlist__44c5_s_p8_0[] = { + 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5, + 7, 7, 8, 8, 8, 9,10,10,10,10, 7, 5, 5, 7, 7, 8, + 8, 9, 9,10,10,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, +@@ -9864,35 +9864,35 @@ + 0,12,12,12,12,12,12,13,13, + }; + +-static float _vq_quantthresh__44c5_s_p8_0[] = { ++static const float _vq_quantthresh__44c5_s_p8_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44c5_s_p8_0[] = { ++static const long _vq_quantmap__44c5_s_p8_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c5_s_p8_0 = { +- _vq_quantthresh__44c5_s_p8_0, +- _vq_quantmap__44c5_s_p8_0, ++static const encode_aux_threshmatch _vq_auxt__44c5_s_p8_0 = { ++ (float *)_vq_quantthresh__44c5_s_p8_0, ++ (long *)_vq_quantmap__44c5_s_p8_0, + 13, + 13 + }; + +-static static_codebook _44c5_s_p8_0 = { ++static const static_codebook _44c5_s_p8_0 = { + 2, 169, +- _vq_lengthlist__44c5_s_p8_0, ++ (long *)_vq_lengthlist__44c5_s_p8_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44c5_s_p8_0, ++ (long *)_vq_quantlist__44c5_s_p8_0, + NULL, +- &_vq_auxt__44c5_s_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c5_s_p8_1[] = { ++static const long _vq_quantlist__44c5_s_p8_1[] = { + 2, + 1, + 3, +@@ -9900,38 +9900,38 @@ + 4, + }; + +-static long _vq_lengthlist__44c5_s_p8_1[] = { ++static const long _vq_lengthlist__44c5_s_p8_1[] = { + 2, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 4, 5, 5, 5, 6, + 5, 5, 5, 5, 6, 6, 6, 5, 5, + }; + +-static float _vq_quantthresh__44c5_s_p8_1[] = { ++static const float _vq_quantthresh__44c5_s_p8_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c5_s_p8_1[] = { ++static const long _vq_quantmap__44c5_s_p8_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c5_s_p8_1 = { +- _vq_quantthresh__44c5_s_p8_1, +- _vq_quantmap__44c5_s_p8_1, ++static const encode_aux_threshmatch _vq_auxt__44c5_s_p8_1 = { ++ (float *)_vq_quantthresh__44c5_s_p8_1, ++ (long *)_vq_quantmap__44c5_s_p8_1, + 5, + 5 + }; + +-static static_codebook _44c5_s_p8_1 = { ++static const static_codebook _44c5_s_p8_1 = { + 2, 25, +- _vq_lengthlist__44c5_s_p8_1, ++ (long *)_vq_lengthlist__44c5_s_p8_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c5_s_p8_1, ++ (long *)_vq_quantlist__44c5_s_p8_1, + NULL, +- &_vq_auxt__44c5_s_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c5_s_p9_0[] = { ++static const long _vq_quantlist__44c5_s_p9_0[] = { + 7, + 6, + 8, +@@ -9949,7 +9949,7 @@ + 14, + }; + +-static long _vq_lengthlist__44c5_s_p9_0[] = { ++static const long _vq_lengthlist__44c5_s_p9_0[] = { + 1, 3, 3,13,13,13,13,13,13,13,13,13,13,13,13, 4, + 7, 7,13,13,13,13,13,13,13,13,13,13,13,13, 3, 8, + 6,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13, +@@ -9967,35 +9967,35 @@ + 12, + }; + +-static float _vq_quantthresh__44c5_s_p9_0[] = { ++static const float _vq_quantthresh__44c5_s_p9_0[] = { + -2320.5, -1963.5, -1606.5, -1249.5, -892.5, -535.5, -178.5, 178.5, + 535.5, 892.5, 1249.5, 1606.5, 1963.5, 2320.5, + }; + +-static long _vq_quantmap__44c5_s_p9_0[] = { ++static const long _vq_quantmap__44c5_s_p9_0[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__44c5_s_p9_0 = { +- _vq_quantthresh__44c5_s_p9_0, +- _vq_quantmap__44c5_s_p9_0, ++static const encode_aux_threshmatch _vq_auxt__44c5_s_p9_0 = { ++ (float *)_vq_quantthresh__44c5_s_p9_0, ++ (long *)_vq_quantmap__44c5_s_p9_0, + 15, + 15 + }; + +-static static_codebook _44c5_s_p9_0 = { ++static const static_codebook _44c5_s_p9_0 = { + 2, 225, +- _vq_lengthlist__44c5_s_p9_0, ++ (long *)_vq_lengthlist__44c5_s_p9_0, + 1, -512522752, 1628852224, 4, 0, +- _vq_quantlist__44c5_s_p9_0, ++ (long *)_vq_quantlist__44c5_s_p9_0, + NULL, +- &_vq_auxt__44c5_s_p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c5_s_p9_1[] = { ++static const long _vq_quantlist__44c5_s_p9_1[] = { + 8, + 7, + 9, +@@ -10015,7 +10015,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c5_s_p9_1[] = { ++static const long _vq_lengthlist__44c5_s_p9_1[] = { + 1, 4, 4, 5, 5, 7, 7, 9, 8,10, 9,10,10,11,10,11, + 11, 6, 5, 5, 7, 7, 8, 9,10,10,11,10,12,11,12,11, + 13,12, 6, 5, 5, 7, 7, 9, 9,10,10,11,11,12,12,13, +@@ -10037,36 +10037,36 @@ + 15, + }; + +-static float _vq_quantthresh__44c5_s_p9_1[] = { ++static const float _vq_quantthresh__44c5_s_p9_1[] = { + -157.5, -136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, + 10.5, 31.5, 52.5, 73.5, 94.5, 115.5, 136.5, 157.5, + }; + +-static long _vq_quantmap__44c5_s_p9_1[] = { ++static const long _vq_quantmap__44c5_s_p9_1[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c5_s_p9_1 = { +- _vq_quantthresh__44c5_s_p9_1, +- _vq_quantmap__44c5_s_p9_1, ++static const encode_aux_threshmatch _vq_auxt__44c5_s_p9_1 = { ++ (float *)_vq_quantthresh__44c5_s_p9_1, ++ (long *)_vq_quantmap__44c5_s_p9_1, + 17, + 17 + }; + +-static static_codebook _44c5_s_p9_1 = { ++static const static_codebook _44c5_s_p9_1 = { + 2, 289, +- _vq_lengthlist__44c5_s_p9_1, ++ (long *)_vq_lengthlist__44c5_s_p9_1, + 1, -520814592, 1620377600, 5, 0, +- _vq_quantlist__44c5_s_p9_1, ++ (long *)_vq_quantlist__44c5_s_p9_1, + NULL, +- &_vq_auxt__44c5_s_p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c5_s_p9_2[] = { ++static const long _vq_quantlist__44c5_s_p9_2[] = { + 10, + 9, + 11, +@@ -10090,7 +10090,7 @@ + 20, + }; + +-static long _vq_lengthlist__44c5_s_p9_2[] = { ++static const long _vq_lengthlist__44c5_s_p9_2[] = { + 3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 9,11, 5, 6, 7, 7, 8, 7, 8, 8, 8, 8, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11, 5, 5, 7, 7, 7, +@@ -10121,37 +10121,37 @@ + 10,10,10,10,10,10,10,10,10, + }; + +-static float _vq_quantthresh__44c5_s_p9_2[] = { ++static const float _vq_quantthresh__44c5_s_p9_2[] = { + -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, + -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, + 6.5, 7.5, 8.5, 9.5, + }; + +-static long _vq_quantmap__44c5_s_p9_2[] = { ++static const long _vq_quantmap__44c5_s_p9_2[] = { + 19, 17, 15, 13, 11, 9, 7, 5, + 3, 1, 0, 2, 4, 6, 8, 10, + 12, 14, 16, 18, 20, + }; + +-static encode_aux_threshmatch _vq_auxt__44c5_s_p9_2 = { +- _vq_quantthresh__44c5_s_p9_2, +- _vq_quantmap__44c5_s_p9_2, ++static const encode_aux_threshmatch _vq_auxt__44c5_s_p9_2 = { ++ (float *)_vq_quantthresh__44c5_s_p9_2, ++ (long *)_vq_quantmap__44c5_s_p9_2, + 21, + 21 + }; + +-static static_codebook _44c5_s_p9_2 = { ++static const static_codebook _44c5_s_p9_2 = { + 2, 441, +- _vq_lengthlist__44c5_s_p9_2, ++ (long *)_vq_lengthlist__44c5_s_p9_2, + 1, -529268736, 1611661312, 5, 0, +- _vq_quantlist__44c5_s_p9_2, ++ (long *)_vq_quantlist__44c5_s_p9_2, + NULL, +- &_vq_auxt__44c5_s_p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44c5_s_p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44c5_s_short[] = { ++static const long _huff_lengthlist__44c5_s_short[] = { + 5, 8,10,14,11,11,12,16,15,17, 5, 5, 7, 9, 7, 8, + 10,13,17,17, 7, 5, 5,10, 5, 7, 8,11,13,15,10, 8, + 10, 8, 8, 8,11,15,18,18, 8, 5, 5, 8, 3, 4, 6,10, +@@ -10161,9 +10161,9 @@ + 6, 8,11,16, + }; + +-static static_codebook _huff_book__44c5_s_short = { ++static const static_codebook _huff_book__44c5_s_short = { + 2, 100, +- _huff_lengthlist__44c5_s_short, ++ (long *)_huff_lengthlist__44c5_s_short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -10172,7 +10172,7 @@ + 0 + }; + +-static long _huff_lengthlist__44c6_s_long[] = { ++static const long _huff_lengthlist__44c6_s_long[] = { + 3, 8,11,13,14,14,13,13,16,14, 6, 3, 4, 7, 9, 9, + 10,11,14,13,10, 4, 3, 5, 7, 7, 9,10,13,15,12, 7, + 4, 4, 6, 6, 8,10,13,15,12, 8, 6, 6, 6, 6, 8,10, +@@ -10182,9 +10182,9 @@ + 11,10,10,12, + }; + +-static static_codebook _huff_book__44c6_s_long = { ++static const static_codebook _huff_book__44c6_s_long = { + 2, 100, +- _huff_lengthlist__44c6_s_long, ++ (long *)_huff_lengthlist__44c6_s_long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -10193,13 +10193,13 @@ + 0 + }; + +-static long _vq_quantlist__44c6_s_p1_0[] = { ++static const long _vq_quantlist__44c6_s_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c6_s_p1_0[] = { ++static const long _vq_lengthlist__44c6_s_p1_0[] = { + 1, 5, 5, 0, 5, 5, 0, 5, 5, 5, 8, 7, 0, 9, 9, 0, + 9, 8, 5, 7, 8, 0, 9, 9, 0, 8, 9, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 9, 8, 0, 8, 8, 0, 8, 8, 5, 8, 9, +@@ -10208,33 +10208,33 @@ + 8, + }; + +-static float _vq_quantthresh__44c6_s_p1_0[] = { ++static const float _vq_quantthresh__44c6_s_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44c6_s_p1_0[] = { ++static const long _vq_quantmap__44c6_s_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c6_s_p1_0 = { +- _vq_quantthresh__44c6_s_p1_0, +- _vq_quantmap__44c6_s_p1_0, ++static const encode_aux_threshmatch _vq_auxt__44c6_s_p1_0 = { ++ (float *)_vq_quantthresh__44c6_s_p1_0, ++ (long *)_vq_quantmap__44c6_s_p1_0, + 3, + 3 + }; + +-static static_codebook _44c6_s_p1_0 = { ++static const static_codebook _44c6_s_p1_0 = { + 4, 81, +- _vq_lengthlist__44c6_s_p1_0, ++ (long *)_vq_lengthlist__44c6_s_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44c6_s_p1_0, ++ (long *)_vq_quantlist__44c6_s_p1_0, + NULL, +- &_vq_auxt__44c6_s_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c6_s_p2_0[] = { ++static const long _vq_quantlist__44c6_s_p2_0[] = { + 2, + 1, + 3, +@@ -10242,7 +10242,7 @@ + 4, + }; + +-static long _vq_lengthlist__44c6_s_p2_0[] = { ++static const long _vq_lengthlist__44c6_s_p2_0[] = { + 3, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, + 7, 7, 9, 9, 0, 0, 0, 9, 9, 5, 7, 7, 9, 9, 0, 8, + 8,10,10, 0, 8, 7,10, 9, 0,10,10,11,11, 0, 0, 0, +@@ -10285,33 +10285,33 @@ + 13, + }; + +-static float _vq_quantthresh__44c6_s_p2_0[] = { ++static const float _vq_quantthresh__44c6_s_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c6_s_p2_0[] = { ++static const long _vq_quantmap__44c6_s_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c6_s_p2_0 = { +- _vq_quantthresh__44c6_s_p2_0, +- _vq_quantmap__44c6_s_p2_0, ++static const encode_aux_threshmatch _vq_auxt__44c6_s_p2_0 = { ++ (float *)_vq_quantthresh__44c6_s_p2_0, ++ (long *)_vq_quantmap__44c6_s_p2_0, + 5, + 5 + }; + +-static static_codebook _44c6_s_p2_0 = { ++static const static_codebook _44c6_s_p2_0 = { + 4, 625, +- _vq_lengthlist__44c6_s_p2_0, ++ (long *)_vq_lengthlist__44c6_s_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c6_s_p2_0, ++ (long *)_vq_quantlist__44c6_s_p2_0, + NULL, +- &_vq_auxt__44c6_s_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c6_s_p3_0[] = { ++static const long _vq_quantlist__44c6_s_p3_0[] = { + 4, + 3, + 5, +@@ -10323,7 +10323,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c6_s_p3_0[] = { ++static const long _vq_lengthlist__44c6_s_p3_0[] = { + 2, 3, 4, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, + 9,10, 0, 4, 4, 6, 6, 7, 7,10, 9, 0, 5, 5, 7, 7, + 8, 8,10,10, 0, 0, 0, 7, 6, 8, 8,10,10, 0, 0, 0, +@@ -10332,34 +10332,34 @@ + 0, + }; + +-static float _vq_quantthresh__44c6_s_p3_0[] = { ++static const float _vq_quantthresh__44c6_s_p3_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c6_s_p3_0[] = { ++static const long _vq_quantmap__44c6_s_p3_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c6_s_p3_0 = { +- _vq_quantthresh__44c6_s_p3_0, +- _vq_quantmap__44c6_s_p3_0, ++static const encode_aux_threshmatch _vq_auxt__44c6_s_p3_0 = { ++ (float *)_vq_quantthresh__44c6_s_p3_0, ++ (long *)_vq_quantmap__44c6_s_p3_0, + 9, + 9 + }; + +-static static_codebook _44c6_s_p3_0 = { ++static const static_codebook _44c6_s_p3_0 = { + 2, 81, +- _vq_lengthlist__44c6_s_p3_0, ++ (long *)_vq_lengthlist__44c6_s_p3_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c6_s_p3_0, ++ (long *)_vq_quantlist__44c6_s_p3_0, + NULL, +- &_vq_auxt__44c6_s_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c6_s_p4_0[] = { ++static const long _vq_quantlist__44c6_s_p4_0[] = { + 8, + 7, + 9, +@@ -10379,7 +10379,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c6_s_p4_0[] = { ++static const long _vq_lengthlist__44c6_s_p4_0[] = { + 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9,10,10, + 10, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10,10, + 11,11, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10, +@@ -10401,42 +10401,42 @@ + 0, + }; + +-static float _vq_quantthresh__44c6_s_p4_0[] = { ++static const float _vq_quantthresh__44c6_s_p4_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c6_s_p4_0[] = { ++static const long _vq_quantmap__44c6_s_p4_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c6_s_p4_0 = { +- _vq_quantthresh__44c6_s_p4_0, +- _vq_quantmap__44c6_s_p4_0, ++static const encode_aux_threshmatch _vq_auxt__44c6_s_p4_0 = { ++ (float *)_vq_quantthresh__44c6_s_p4_0, ++ (long *)_vq_quantmap__44c6_s_p4_0, + 17, + 17 + }; + +-static static_codebook _44c6_s_p4_0 = { ++static const static_codebook _44c6_s_p4_0 = { + 2, 289, +- _vq_lengthlist__44c6_s_p4_0, ++ (long *)_vq_lengthlist__44c6_s_p4_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c6_s_p4_0, ++ (long *)_vq_quantlist__44c6_s_p4_0, + NULL, +- &_vq_auxt__44c6_s_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c6_s_p5_0[] = { ++static const long _vq_quantlist__44c6_s_p5_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c6_s_p5_0[] = { ++static const long _vq_lengthlist__44c6_s_p5_0[] = { + 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 6, 6, 9, 9,10,10, + 10, 9, 4, 6, 6, 9,10, 9,10, 9,10, 6, 9, 9,10,12, + 11,10,11,11, 7,10, 9,11,12,12,12,12,12, 7,10,10, +@@ -10445,33 +10445,33 @@ + 12, + }; + +-static float _vq_quantthresh__44c6_s_p5_0[] = { ++static const float _vq_quantthresh__44c6_s_p5_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44c6_s_p5_0[] = { ++static const long _vq_quantmap__44c6_s_p5_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c6_s_p5_0 = { +- _vq_quantthresh__44c6_s_p5_0, +- _vq_quantmap__44c6_s_p5_0, ++static const encode_aux_threshmatch _vq_auxt__44c6_s_p5_0 = { ++ (float *)_vq_quantthresh__44c6_s_p5_0, ++ (long *)_vq_quantmap__44c6_s_p5_0, + 3, + 3 + }; + +-static static_codebook _44c6_s_p5_0 = { ++static const static_codebook _44c6_s_p5_0 = { + 4, 81, +- _vq_lengthlist__44c6_s_p5_0, ++ (long *)_vq_lengthlist__44c6_s_p5_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44c6_s_p5_0, ++ (long *)_vq_quantlist__44c6_s_p5_0, + NULL, +- &_vq_auxt__44c6_s_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c6_s_p5_1[] = { ++static const long _vq_quantlist__44c6_s_p5_1[] = { + 5, + 4, + 6, +@@ -10485,7 +10485,7 @@ + 10, + }; + +-static long _vq_lengthlist__44c6_s_p5_1[] = { ++static const long _vq_lengthlist__44c6_s_p5_1[] = { + 3, 5, 4, 6, 6, 7, 7, 8, 8, 8, 8,11, 4, 4, 6, 6, + 7, 7, 8, 8, 8, 8,11, 4, 4, 6, 6, 7, 7, 8, 8, 8, + 8,11, 6, 6, 6, 6, 8, 8, 8, 8, 9, 9,11,11,11, 6, +@@ -10496,35 +10496,35 @@ + 11,10,10, 7, 7, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__44c6_s_p5_1[] = { ++static const float _vq_quantthresh__44c6_s_p5_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44c6_s_p5_1[] = { ++static const long _vq_quantmap__44c6_s_p5_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44c6_s_p5_1 = { +- _vq_quantthresh__44c6_s_p5_1, +- _vq_quantmap__44c6_s_p5_1, ++static const encode_aux_threshmatch _vq_auxt__44c6_s_p5_1 = { ++ (float *)_vq_quantthresh__44c6_s_p5_1, ++ (long *)_vq_quantmap__44c6_s_p5_1, + 11, + 11 + }; + +-static static_codebook _44c6_s_p5_1 = { ++static const static_codebook _44c6_s_p5_1 = { + 2, 121, +- _vq_lengthlist__44c6_s_p5_1, ++ (long *)_vq_lengthlist__44c6_s_p5_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44c6_s_p5_1, ++ (long *)_vq_quantlist__44c6_s_p5_1, + NULL, +- &_vq_auxt__44c6_s_p5_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p5_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c6_s_p6_0[] = { ++static const long _vq_quantlist__44c6_s_p6_0[] = { + 6, + 5, + 7, +@@ -10540,7 +10540,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c6_s_p6_0[] = { ++static const long _vq_lengthlist__44c6_s_p6_0[] = { + 1, 4, 4, 6, 6, 8, 8, 8, 8,10, 9,10,10, 6, 5, 5, + 7, 7, 9, 9, 9, 9,10,10,11,11, 6, 5, 5, 7, 7, 9, + 9,10, 9,11,10,11,11, 0, 6, 6, 7, 7, 9, 9,10,10, +@@ -10554,35 +10554,35 @@ + 0, 0, 0, 0, 0, 0, 0, 0, 0, + }; + +-static float _vq_quantthresh__44c6_s_p6_0[] = { ++static const float _vq_quantthresh__44c6_s_p6_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44c6_s_p6_0[] = { ++static const long _vq_quantmap__44c6_s_p6_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c6_s_p6_0 = { +- _vq_quantthresh__44c6_s_p6_0, +- _vq_quantmap__44c6_s_p6_0, ++static const encode_aux_threshmatch _vq_auxt__44c6_s_p6_0 = { ++ (float *)_vq_quantthresh__44c6_s_p6_0, ++ (long *)_vq_quantmap__44c6_s_p6_0, + 13, + 13 + }; + +-static static_codebook _44c6_s_p6_0 = { ++static const static_codebook _44c6_s_p6_0 = { + 2, 169, +- _vq_lengthlist__44c6_s_p6_0, ++ (long *)_vq_lengthlist__44c6_s_p6_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44c6_s_p6_0, ++ (long *)_vq_quantlist__44c6_s_p6_0, + NULL, +- &_vq_auxt__44c6_s_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c6_s_p6_1[] = { ++static const long _vq_quantlist__44c6_s_p6_1[] = { + 2, + 1, + 3, +@@ -10590,38 +10590,38 @@ + 4, + }; + +-static long _vq_lengthlist__44c6_s_p6_1[] = { ++static const long _vq_lengthlist__44c6_s_p6_1[] = { + 3, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 4, 4, 5, 5, 6, + 5, 5, 5, 5, 6, 6, 6, 5, 5, + }; + +-static float _vq_quantthresh__44c6_s_p6_1[] = { ++static const float _vq_quantthresh__44c6_s_p6_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c6_s_p6_1[] = { ++static const long _vq_quantmap__44c6_s_p6_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c6_s_p6_1 = { +- _vq_quantthresh__44c6_s_p6_1, +- _vq_quantmap__44c6_s_p6_1, ++static const encode_aux_threshmatch _vq_auxt__44c6_s_p6_1 = { ++ (float *)_vq_quantthresh__44c6_s_p6_1, ++ (long *)_vq_quantmap__44c6_s_p6_1, + 5, + 5 + }; + +-static static_codebook _44c6_s_p6_1 = { ++static const static_codebook _44c6_s_p6_1 = { + 2, 25, +- _vq_lengthlist__44c6_s_p6_1, ++ (long *)_vq_lengthlist__44c6_s_p6_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c6_s_p6_1, ++ (long *)_vq_quantlist__44c6_s_p6_1, + NULL, +- &_vq_auxt__44c6_s_p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c6_s_p7_0[] = { ++static const long _vq_quantlist__44c6_s_p7_0[] = { + 6, + 5, + 7, +@@ -10637,7 +10637,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c6_s_p7_0[] = { ++static const long _vq_lengthlist__44c6_s_p7_0[] = { + 1, 4, 4, 6, 6, 8, 8, 8, 8,10,10,11,10, 6, 5, 5, + 7, 7, 8, 8, 9, 9,10,10,12,11, 6, 5, 5, 7, 7, 8, + 8, 9, 9,10,10,12,11,21, 7, 7, 7, 7, 9, 9,10,10, +@@ -10651,35 +10651,35 @@ + 20,13,13,13,13,13,13,14,14, + }; + +-static float _vq_quantthresh__44c6_s_p7_0[] = { ++static const float _vq_quantthresh__44c6_s_p7_0[] = { + -60.5, -49.5, -38.5, -27.5, -16.5, -5.5, 5.5, 16.5, + 27.5, 38.5, 49.5, 60.5, + }; + +-static long _vq_quantmap__44c6_s_p7_0[] = { ++static const long _vq_quantmap__44c6_s_p7_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c6_s_p7_0 = { +- _vq_quantthresh__44c6_s_p7_0, +- _vq_quantmap__44c6_s_p7_0, ++static const encode_aux_threshmatch _vq_auxt__44c6_s_p7_0 = { ++ (float *)_vq_quantthresh__44c6_s_p7_0, ++ (long *)_vq_quantmap__44c6_s_p7_0, + 13, + 13 + }; + +-static static_codebook _44c6_s_p7_0 = { ++static const static_codebook _44c6_s_p7_0 = { + 2, 169, +- _vq_lengthlist__44c6_s_p7_0, ++ (long *)_vq_lengthlist__44c6_s_p7_0, + 1, -523206656, 1618345984, 4, 0, +- _vq_quantlist__44c6_s_p7_0, ++ (long *)_vq_quantlist__44c6_s_p7_0, + NULL, +- &_vq_auxt__44c6_s_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c6_s_p7_1[] = { ++static const long _vq_quantlist__44c6_s_p7_1[] = { + 5, + 4, + 6, +@@ -10693,7 +10693,7 @@ + 10, + }; + +-static long _vq_lengthlist__44c6_s_p7_1[] = { ++static const long _vq_lengthlist__44c6_s_p7_1[] = { + 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 9, 5, 5, 6, 6, + 7, 7, 7, 7, 8, 7, 8, 5, 5, 6, 6, 7, 7, 7, 7, 7, + 7, 9, 6, 6, 7, 7, 7, 7, 8, 7, 7, 8, 9, 9, 9, 7, +@@ -10704,35 +10704,35 @@ + 9, 8, 8, 7, 7, 7, 7, 8, 8, + }; + +-static float _vq_quantthresh__44c6_s_p7_1[] = { ++static const float _vq_quantthresh__44c6_s_p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44c6_s_p7_1[] = { ++static const long _vq_quantmap__44c6_s_p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44c6_s_p7_1 = { +- _vq_quantthresh__44c6_s_p7_1, +- _vq_quantmap__44c6_s_p7_1, ++static const encode_aux_threshmatch _vq_auxt__44c6_s_p7_1 = { ++ (float *)_vq_quantthresh__44c6_s_p7_1, ++ (long *)_vq_quantmap__44c6_s_p7_1, + 11, + 11 + }; + +-static static_codebook _44c6_s_p7_1 = { ++static const static_codebook _44c6_s_p7_1 = { + 2, 121, +- _vq_lengthlist__44c6_s_p7_1, ++ (long *)_vq_lengthlist__44c6_s_p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44c6_s_p7_1, ++ (long *)_vq_quantlist__44c6_s_p7_1, + NULL, +- &_vq_auxt__44c6_s_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c6_s_p8_0[] = { ++static const long _vq_quantlist__44c6_s_p8_0[] = { + 7, + 6, + 8, +@@ -10750,7 +10750,7 @@ + 14, + }; + +-static long _vq_lengthlist__44c6_s_p8_0[] = { ++static const long _vq_lengthlist__44c6_s_p8_0[] = { + 1, 4, 4, 7, 7, 8, 8, 7, 7, 8, 7, 9, 8,10, 9, 6, + 5, 5, 8, 8, 9, 9, 8, 8, 9, 9,11,10,11,10, 6, 5, + 5, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11,11,18, 8, 8, +@@ -10768,35 +10768,35 @@ + 14, + }; + +-static float _vq_quantthresh__44c6_s_p8_0[] = { ++static const float _vq_quantthresh__44c6_s_p8_0[] = { + -136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, + 31.5, 52.5, 73.5, 94.5, 115.5, 136.5, + }; + +-static long _vq_quantmap__44c6_s_p8_0[] = { ++static const long _vq_quantmap__44c6_s_p8_0[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__44c6_s_p8_0 = { +- _vq_quantthresh__44c6_s_p8_0, +- _vq_quantmap__44c6_s_p8_0, ++static const encode_aux_threshmatch _vq_auxt__44c6_s_p8_0 = { ++ (float *)_vq_quantthresh__44c6_s_p8_0, ++ (long *)_vq_quantmap__44c6_s_p8_0, + 15, + 15 + }; + +-static static_codebook _44c6_s_p8_0 = { ++static const static_codebook _44c6_s_p8_0 = { + 2, 225, +- _vq_lengthlist__44c6_s_p8_0, ++ (long *)_vq_lengthlist__44c6_s_p8_0, + 1, -520986624, 1620377600, 4, 0, +- _vq_quantlist__44c6_s_p8_0, ++ (long *)_vq_quantlist__44c6_s_p8_0, + NULL, +- &_vq_auxt__44c6_s_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c6_s_p8_1[] = { ++static const long _vq_quantlist__44c6_s_p8_1[] = { + 10, + 9, + 11, +@@ -10820,7 +10820,7 @@ + 20, + }; + +-static long _vq_lengthlist__44c6_s_p8_1[] = { ++static const long _vq_lengthlist__44c6_s_p8_1[] = { + 3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, +@@ -10851,37 +10851,37 @@ + 10,10,10,10,10,10,10,10,10, + }; + +-static float _vq_quantthresh__44c6_s_p8_1[] = { ++static const float _vq_quantthresh__44c6_s_p8_1[] = { + -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, + -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, + 6.5, 7.5, 8.5, 9.5, + }; + +-static long _vq_quantmap__44c6_s_p8_1[] = { ++static const long _vq_quantmap__44c6_s_p8_1[] = { + 19, 17, 15, 13, 11, 9, 7, 5, + 3, 1, 0, 2, 4, 6, 8, 10, + 12, 14, 16, 18, 20, + }; + +-static encode_aux_threshmatch _vq_auxt__44c6_s_p8_1 = { +- _vq_quantthresh__44c6_s_p8_1, +- _vq_quantmap__44c6_s_p8_1, ++static const encode_aux_threshmatch _vq_auxt__44c6_s_p8_1 = { ++ (float *)_vq_quantthresh__44c6_s_p8_1, ++ (long *)_vq_quantmap__44c6_s_p8_1, + 21, + 21 + }; + +-static static_codebook _44c6_s_p8_1 = { ++static const static_codebook _44c6_s_p8_1 = { + 2, 441, +- _vq_lengthlist__44c6_s_p8_1, ++ (long *)_vq_lengthlist__44c6_s_p8_1, + 1, -529268736, 1611661312, 5, 0, +- _vq_quantlist__44c6_s_p8_1, ++ (long *)_vq_quantlist__44c6_s_p8_1, + NULL, +- &_vq_auxt__44c6_s_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c6_s_p9_0[] = { ++static const long _vq_quantlist__44c6_s_p9_0[] = { + 6, + 5, + 7, +@@ -10897,7 +10897,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c6_s_p9_0[] = { ++static const long _vq_lengthlist__44c6_s_p9_0[] = { + 1, 3, 3,11,11,11,11,11,11,11,11,11,11, 4, 7, 7, + 11,11,11,11,11,11,11,11,11,11, 5, 8, 9,11,11,11, + 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, +@@ -10911,35 +10911,35 @@ + 10,10,10,10,10,10,10,10,10, + }; + +-static float _vq_quantthresh__44c6_s_p9_0[] = { ++static const float _vq_quantthresh__44c6_s_p9_0[] = { + -3503.5, -2866.5, -2229.5, -1592.5, -955.5, -318.5, 318.5, 955.5, + 1592.5, 2229.5, 2866.5, 3503.5, + }; + +-static long _vq_quantmap__44c6_s_p9_0[] = { ++static const long _vq_quantmap__44c6_s_p9_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c6_s_p9_0 = { +- _vq_quantthresh__44c6_s_p9_0, +- _vq_quantmap__44c6_s_p9_0, ++static const encode_aux_threshmatch _vq_auxt__44c6_s_p9_0 = { ++ (float *)_vq_quantthresh__44c6_s_p9_0, ++ (long *)_vq_quantmap__44c6_s_p9_0, + 13, + 13 + }; + +-static static_codebook _44c6_s_p9_0 = { ++static const static_codebook _44c6_s_p9_0 = { + 2, 169, +- _vq_lengthlist__44c6_s_p9_0, ++ (long *)_vq_lengthlist__44c6_s_p9_0, + 1, -511845376, 1630791680, 4, 0, +- _vq_quantlist__44c6_s_p9_0, ++ (long *)_vq_quantlist__44c6_s_p9_0, + NULL, +- &_vq_auxt__44c6_s_p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c6_s_p9_1[] = { ++static const long _vq_quantlist__44c6_s_p9_1[] = { + 6, + 5, + 7, +@@ -10955,7 +10955,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c6_s_p9_1[] = { ++static const long _vq_lengthlist__44c6_s_p9_1[] = { + 1, 4, 4, 7, 7, 7, 7, 7, 6, 8, 8, 8, 8, 6, 6, 6, + 8, 8, 8, 8, 8, 7, 9, 8,10,10, 5, 6, 6, 8, 8, 9, + 9, 8, 8,10,10,10,10,16, 9, 9, 9, 9, 9, 9, 9, 8, +@@ -10969,35 +10969,35 @@ + 15,12,10,11,11,13,11,12,13, + }; + +-static float _vq_quantthresh__44c6_s_p9_1[] = { ++static const float _vq_quantthresh__44c6_s_p9_1[] = { + -269.5, -220.5, -171.5, -122.5, -73.5, -24.5, 24.5, 73.5, + 122.5, 171.5, 220.5, 269.5, + }; + +-static long _vq_quantmap__44c6_s_p9_1[] = { ++static const long _vq_quantmap__44c6_s_p9_1[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c6_s_p9_1 = { +- _vq_quantthresh__44c6_s_p9_1, +- _vq_quantmap__44c6_s_p9_1, ++static const encode_aux_threshmatch _vq_auxt__44c6_s_p9_1 = { ++ (float *)_vq_quantthresh__44c6_s_p9_1, ++ (long *)_vq_quantmap__44c6_s_p9_1, + 13, + 13 + }; + +-static static_codebook _44c6_s_p9_1 = { ++static const static_codebook _44c6_s_p9_1 = { + 2, 169, +- _vq_lengthlist__44c6_s_p9_1, ++ (long *)_vq_lengthlist__44c6_s_p9_1, + 1, -518889472, 1622704128, 4, 0, +- _vq_quantlist__44c6_s_p9_1, ++ (long *)_vq_quantlist__44c6_s_p9_1, + NULL, +- &_vq_auxt__44c6_s_p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c6_s_p9_2[] = { ++static const long _vq_quantlist__44c6_s_p9_2[] = { + 24, + 23, + 25, +@@ -11049,14 +11049,14 @@ + 48, + }; + +-static long _vq_lengthlist__44c6_s_p9_2[] = { ++static const long _vq_lengthlist__44c6_s_p9_2[] = { + 2, 4, 3, 4, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, + }; + +-static float _vq_quantthresh__44c6_s_p9_2[] = { ++static const float _vq_quantthresh__44c6_s_p9_2[] = { + -23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, + -15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, +@@ -11065,7 +11065,7 @@ + 16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, + }; + +-static long _vq_quantmap__44c6_s_p9_2[] = { ++static const long _vq_quantmap__44c6_s_p9_2[] = { + 47, 45, 43, 41, 39, 37, 35, 33, + 31, 29, 27, 25, 23, 21, 19, 17, + 15, 13, 11, 9, 7, 5, 3, 1, +@@ -11075,25 +11075,25 @@ + 48, + }; + +-static encode_aux_threshmatch _vq_auxt__44c6_s_p9_2 = { +- _vq_quantthresh__44c6_s_p9_2, +- _vq_quantmap__44c6_s_p9_2, ++static const encode_aux_threshmatch _vq_auxt__44c6_s_p9_2 = { ++ (float *)_vq_quantthresh__44c6_s_p9_2, ++ (long *)_vq_quantmap__44c6_s_p9_2, + 49, + 49 + }; + +-static static_codebook _44c6_s_p9_2 = { ++static const static_codebook _44c6_s_p9_2 = { + 1, 49, +- _vq_lengthlist__44c6_s_p9_2, ++ (long *)_vq_lengthlist__44c6_s_p9_2, + 1, -526909440, 1611661312, 6, 0, +- _vq_quantlist__44c6_s_p9_2, ++ (long *)_vq_quantlist__44c6_s_p9_2, + NULL, +- &_vq_auxt__44c6_s_p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44c6_s_p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44c6_s_short[] = { ++static const long _huff_lengthlist__44c6_s_short[] = { + 3, 9,11,11,13,14,19,17,17,19, 5, 4, 5, 8,10,10, + 13,16,18,19, 7, 4, 4, 5, 8, 9,12,14,17,19, 8, 6, + 5, 5, 7, 7,10,13,16,18,10, 8, 7, 6, 5, 5, 8,11, +@@ -11103,9 +11103,9 @@ + 9,10,17,18, + }; + +-static static_codebook _huff_book__44c6_s_short = { ++static const static_codebook _huff_book__44c6_s_short = { + 2, 100, +- _huff_lengthlist__44c6_s_short, ++ (long *)_huff_lengthlist__44c6_s_short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -11114,7 +11114,7 @@ + 0 + }; + +-static long _huff_lengthlist__44c7_s_long[] = { ++static const long _huff_lengthlist__44c7_s_long[] = { + 3, 8,11,13,15,14,14,13,15,14, 6, 4, 5, 7, 9,10, + 11,11,14,13,10, 4, 3, 5, 7, 8, 9,10,13,13,12, 7, + 4, 4, 5, 6, 8, 9,12,14,13, 9, 6, 5, 5, 6, 8, 9, +@@ -11124,9 +11124,9 @@ + 11,10,10,12, + }; + +-static static_codebook _huff_book__44c7_s_long = { ++static const static_codebook _huff_book__44c7_s_long = { + 2, 100, +- _huff_lengthlist__44c7_s_long, ++ (long *)_huff_lengthlist__44c7_s_long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -11135,13 +11135,13 @@ + 0 + }; + +-static long _vq_quantlist__44c7_s_p1_0[] = { ++static const long _vq_quantlist__44c7_s_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c7_s_p1_0[] = { ++static const long _vq_lengthlist__44c7_s_p1_0[] = { + 1, 5, 5, 0, 5, 5, 0, 5, 5, 5, 8, 7, 0, 9, 9, 0, + 9, 8, 5, 7, 8, 0, 9, 9, 0, 8, 9, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 9, 9, 0, 8, 8, 0, 8, 8, 5, 8, 9, +@@ -11150,33 +11150,33 @@ + 8, + }; + +-static float _vq_quantthresh__44c7_s_p1_0[] = { ++static const float _vq_quantthresh__44c7_s_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44c7_s_p1_0[] = { ++static const long _vq_quantmap__44c7_s_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c7_s_p1_0 = { +- _vq_quantthresh__44c7_s_p1_0, +- _vq_quantmap__44c7_s_p1_0, ++static const encode_aux_threshmatch _vq_auxt__44c7_s_p1_0 = { ++ (float *)_vq_quantthresh__44c7_s_p1_0, ++ (long *)_vq_quantmap__44c7_s_p1_0, + 3, + 3 + }; + +-static static_codebook _44c7_s_p1_0 = { ++static const static_codebook _44c7_s_p1_0 = { + 4, 81, +- _vq_lengthlist__44c7_s_p1_0, ++ (long *)_vq_lengthlist__44c7_s_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44c7_s_p1_0, ++ (long *)_vq_quantlist__44c7_s_p1_0, + NULL, +- &_vq_auxt__44c7_s_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c7_s_p2_0[] = { ++static const long _vq_quantlist__44c7_s_p2_0[] = { + 2, + 1, + 3, +@@ -11184,7 +11184,7 @@ + 4, + }; + +-static long _vq_lengthlist__44c7_s_p2_0[] = { ++static const long _vq_lengthlist__44c7_s_p2_0[] = { + 3, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, + 7, 7, 9, 9, 0, 0, 0, 9, 9, 5, 7, 7, 9, 9, 0, 8, + 8,10,10, 0, 8, 7,10, 9, 0,10,10,11,11, 0, 0, 0, +@@ -11227,33 +11227,33 @@ + 13, + }; + +-static float _vq_quantthresh__44c7_s_p2_0[] = { ++static const float _vq_quantthresh__44c7_s_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c7_s_p2_0[] = { ++static const long _vq_quantmap__44c7_s_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c7_s_p2_0 = { +- _vq_quantthresh__44c7_s_p2_0, +- _vq_quantmap__44c7_s_p2_0, ++static const encode_aux_threshmatch _vq_auxt__44c7_s_p2_0 = { ++ (float *)_vq_quantthresh__44c7_s_p2_0, ++ (long *)_vq_quantmap__44c7_s_p2_0, + 5, + 5 + }; + +-static static_codebook _44c7_s_p2_0 = { ++static const static_codebook _44c7_s_p2_0 = { + 4, 625, +- _vq_lengthlist__44c7_s_p2_0, ++ (long *)_vq_lengthlist__44c7_s_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c7_s_p2_0, ++ (long *)_vq_quantlist__44c7_s_p2_0, + NULL, +- &_vq_auxt__44c7_s_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c7_s_p3_0[] = { ++static const long _vq_quantlist__44c7_s_p3_0[] = { + 4, + 3, + 5, +@@ -11265,7 +11265,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c7_s_p3_0[] = { ++static const long _vq_lengthlist__44c7_s_p3_0[] = { + 2, 4, 4, 5, 5, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, + 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 5, 5, 6, 6, + 8, 8,10,10, 0, 0, 0, 6, 6, 8, 8,10,10, 0, 0, 0, +@@ -11274,34 +11274,34 @@ + 0, + }; + +-static float _vq_quantthresh__44c7_s_p3_0[] = { ++static const float _vq_quantthresh__44c7_s_p3_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c7_s_p3_0[] = { ++static const long _vq_quantmap__44c7_s_p3_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c7_s_p3_0 = { +- _vq_quantthresh__44c7_s_p3_0, +- _vq_quantmap__44c7_s_p3_0, ++static const encode_aux_threshmatch _vq_auxt__44c7_s_p3_0 = { ++ (float *)_vq_quantthresh__44c7_s_p3_0, ++ (long *)_vq_quantmap__44c7_s_p3_0, + 9, + 9 + }; + +-static static_codebook _44c7_s_p3_0 = { ++static const static_codebook _44c7_s_p3_0 = { + 2, 81, +- _vq_lengthlist__44c7_s_p3_0, ++ (long *)_vq_lengthlist__44c7_s_p3_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c7_s_p3_0, ++ (long *)_vq_quantlist__44c7_s_p3_0, + NULL, +- &_vq_auxt__44c7_s_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c7_s_p4_0[] = { ++static const long _vq_quantlist__44c7_s_p4_0[] = { + 8, + 7, + 9, +@@ -11321,7 +11321,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c7_s_p4_0[] = { ++static const long _vq_lengthlist__44c7_s_p4_0[] = { + 3, 4, 4, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, + 11, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11, + 12,12, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11, +@@ -11343,42 +11343,42 @@ + 0, + }; + +-static float _vq_quantthresh__44c7_s_p4_0[] = { ++static const float _vq_quantthresh__44c7_s_p4_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c7_s_p4_0[] = { ++static const long _vq_quantmap__44c7_s_p4_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c7_s_p4_0 = { +- _vq_quantthresh__44c7_s_p4_0, +- _vq_quantmap__44c7_s_p4_0, ++static const encode_aux_threshmatch _vq_auxt__44c7_s_p4_0 = { ++ (float *)_vq_quantthresh__44c7_s_p4_0, ++ (long *)_vq_quantmap__44c7_s_p4_0, + 17, + 17 + }; + +-static static_codebook _44c7_s_p4_0 = { ++static const static_codebook _44c7_s_p4_0 = { + 2, 289, +- _vq_lengthlist__44c7_s_p4_0, ++ (long *)_vq_lengthlist__44c7_s_p4_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c7_s_p4_0, ++ (long *)_vq_quantlist__44c7_s_p4_0, + NULL, +- &_vq_auxt__44c7_s_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c7_s_p5_0[] = { ++static const long _vq_quantlist__44c7_s_p5_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c7_s_p5_0[] = { ++static const long _vq_lengthlist__44c7_s_p5_0[] = { + 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 6, 7,10,10,10,10, + 10, 9, 4, 6, 6,10,10,10,10, 9,10, 5,10,10, 9,11, + 12,10,11,12, 7,10,10,11,12,12,12,12,12, 7,10,10, +@@ -11387,33 +11387,33 @@ + 12, + }; + +-static float _vq_quantthresh__44c7_s_p5_0[] = { ++static const float _vq_quantthresh__44c7_s_p5_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44c7_s_p5_0[] = { ++static const long _vq_quantmap__44c7_s_p5_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c7_s_p5_0 = { +- _vq_quantthresh__44c7_s_p5_0, +- _vq_quantmap__44c7_s_p5_0, ++static const encode_aux_threshmatch _vq_auxt__44c7_s_p5_0 = { ++ (float *)_vq_quantthresh__44c7_s_p5_0, ++ (long *)_vq_quantmap__44c7_s_p5_0, + 3, + 3 + }; + +-static static_codebook _44c7_s_p5_0 = { ++static const static_codebook _44c7_s_p5_0 = { + 4, 81, +- _vq_lengthlist__44c7_s_p5_0, ++ (long *)_vq_lengthlist__44c7_s_p5_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44c7_s_p5_0, ++ (long *)_vq_quantlist__44c7_s_p5_0, + NULL, +- &_vq_auxt__44c7_s_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c7_s_p5_1[] = { ++static const long _vq_quantlist__44c7_s_p5_1[] = { + 5, + 4, + 6, +@@ -11427,7 +11427,7 @@ + 10, + }; + +-static long _vq_lengthlist__44c7_s_p5_1[] = { ++static const long _vq_lengthlist__44c7_s_p5_1[] = { + 3, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,11, 4, 4, 6, 6, + 7, 7, 8, 8, 9, 9,11, 4, 4, 6, 6, 7, 7, 8, 8, 9, + 9,12, 5, 5, 6, 6, 7, 7, 9, 9, 9, 9,12,12,12, 6, +@@ -11438,35 +11438,35 @@ + 11,11,11, 7, 7, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__44c7_s_p5_1[] = { ++static const float _vq_quantthresh__44c7_s_p5_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44c7_s_p5_1[] = { ++static const long _vq_quantmap__44c7_s_p5_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44c7_s_p5_1 = { +- _vq_quantthresh__44c7_s_p5_1, +- _vq_quantmap__44c7_s_p5_1, ++static const encode_aux_threshmatch _vq_auxt__44c7_s_p5_1 = { ++ (float *)_vq_quantthresh__44c7_s_p5_1, ++ (long *)_vq_quantmap__44c7_s_p5_1, + 11, + 11 + }; + +-static static_codebook _44c7_s_p5_1 = { ++static const static_codebook _44c7_s_p5_1 = { + 2, 121, +- _vq_lengthlist__44c7_s_p5_1, ++ (long *)_vq_lengthlist__44c7_s_p5_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44c7_s_p5_1, ++ (long *)_vq_quantlist__44c7_s_p5_1, + NULL, +- &_vq_auxt__44c7_s_p5_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p5_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c7_s_p6_0[] = { ++static const long _vq_quantlist__44c7_s_p6_0[] = { + 6, + 5, + 7, +@@ -11482,7 +11482,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c7_s_p6_0[] = { ++static const long _vq_lengthlist__44c7_s_p6_0[] = { + 1, 4, 4, 6, 6, 7, 7, 8, 7, 9, 8,10,10, 6, 5, 5, + 7, 7, 8, 8, 9, 9, 9,10,11,11, 7, 5, 5, 7, 7, 8, + 8, 9, 9,10,10,11,11, 0, 7, 7, 7, 7, 9, 8, 9, 9, +@@ -11496,35 +11496,35 @@ + 0, 0, 0, 0, 0, 0, 0, 0, 0, + }; + +-static float _vq_quantthresh__44c7_s_p6_0[] = { ++static const float _vq_quantthresh__44c7_s_p6_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44c7_s_p6_0[] = { ++static const long _vq_quantmap__44c7_s_p6_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c7_s_p6_0 = { +- _vq_quantthresh__44c7_s_p6_0, +- _vq_quantmap__44c7_s_p6_0, ++static const encode_aux_threshmatch _vq_auxt__44c7_s_p6_0 = { ++ (float *)_vq_quantthresh__44c7_s_p6_0, ++ (long *)_vq_quantmap__44c7_s_p6_0, + 13, + 13 + }; + +-static static_codebook _44c7_s_p6_0 = { ++static const static_codebook _44c7_s_p6_0 = { + 2, 169, +- _vq_lengthlist__44c7_s_p6_0, ++ (long *)_vq_lengthlist__44c7_s_p6_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44c7_s_p6_0, ++ (long *)_vq_quantlist__44c7_s_p6_0, + NULL, +- &_vq_auxt__44c7_s_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c7_s_p6_1[] = { ++static const long _vq_quantlist__44c7_s_p6_1[] = { + 2, + 1, + 3, +@@ -11532,38 +11532,38 @@ + 4, + }; + +-static long _vq_lengthlist__44c7_s_p6_1[] = { ++static const long _vq_lengthlist__44c7_s_p6_1[] = { + 3, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 4, 4, 5, 5, 6, + 5, 5, 5, 5, 6, 6, 6, 5, 5, + }; + +-static float _vq_quantthresh__44c7_s_p6_1[] = { ++static const float _vq_quantthresh__44c7_s_p6_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c7_s_p6_1[] = { ++static const long _vq_quantmap__44c7_s_p6_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c7_s_p6_1 = { +- _vq_quantthresh__44c7_s_p6_1, +- _vq_quantmap__44c7_s_p6_1, ++static const encode_aux_threshmatch _vq_auxt__44c7_s_p6_1 = { ++ (float *)_vq_quantthresh__44c7_s_p6_1, ++ (long *)_vq_quantmap__44c7_s_p6_1, + 5, + 5 + }; + +-static static_codebook _44c7_s_p6_1 = { ++static const static_codebook _44c7_s_p6_1 = { + 2, 25, +- _vq_lengthlist__44c7_s_p6_1, ++ (long *)_vq_lengthlist__44c7_s_p6_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c7_s_p6_1, ++ (long *)_vq_quantlist__44c7_s_p6_1, + NULL, +- &_vq_auxt__44c7_s_p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c7_s_p7_0[] = { ++static const long _vq_quantlist__44c7_s_p7_0[] = { + 6, + 5, + 7, +@@ -11579,7 +11579,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c7_s_p7_0[] = { ++static const long _vq_lengthlist__44c7_s_p7_0[] = { + 1, 4, 4, 6, 6, 7, 8, 9, 9,10,10,12,11, 6, 5, 5, + 7, 7, 8, 8, 9,10,11,11,12,12, 7, 5, 5, 7, 7, 8, + 8,10,10,11,11,12,12,20, 7, 7, 7, 7, 8, 9,10,10, +@@ -11593,35 +11593,35 @@ + 19,13,13,13,13,14,14,15,15, + }; + +-static float _vq_quantthresh__44c7_s_p7_0[] = { ++static const float _vq_quantthresh__44c7_s_p7_0[] = { + -60.5, -49.5, -38.5, -27.5, -16.5, -5.5, 5.5, 16.5, + 27.5, 38.5, 49.5, 60.5, + }; + +-static long _vq_quantmap__44c7_s_p7_0[] = { ++static const long _vq_quantmap__44c7_s_p7_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c7_s_p7_0 = { +- _vq_quantthresh__44c7_s_p7_0, +- _vq_quantmap__44c7_s_p7_0, ++static const encode_aux_threshmatch _vq_auxt__44c7_s_p7_0 = { ++ (float *)_vq_quantthresh__44c7_s_p7_0, ++ (long *)_vq_quantmap__44c7_s_p7_0, + 13, + 13 + }; + +-static static_codebook _44c7_s_p7_0 = { ++static const static_codebook _44c7_s_p7_0 = { + 2, 169, +- _vq_lengthlist__44c7_s_p7_0, ++ (long *)_vq_lengthlist__44c7_s_p7_0, + 1, -523206656, 1618345984, 4, 0, +- _vq_quantlist__44c7_s_p7_0, ++ (long *)_vq_quantlist__44c7_s_p7_0, + NULL, +- &_vq_auxt__44c7_s_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c7_s_p7_1[] = { ++static const long _vq_quantlist__44c7_s_p7_1[] = { + 5, + 4, + 6, +@@ -11635,7 +11635,7 @@ + 10, + }; + +-static long _vq_lengthlist__44c7_s_p7_1[] = { ++static const long _vq_lengthlist__44c7_s_p7_1[] = { + 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 8, 6, 6, 7, 7, + 7, 7, 7, 7, 7, 7, 8, 6, 6, 6, 7, 7, 7, 7, 7, 7, + 7, 8, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 7, +@@ -11646,35 +11646,35 @@ + 8, 8, 8, 7, 7, 7, 7, 7, 7, + }; + +-static float _vq_quantthresh__44c7_s_p7_1[] = { ++static const float _vq_quantthresh__44c7_s_p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44c7_s_p7_1[] = { ++static const long _vq_quantmap__44c7_s_p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44c7_s_p7_1 = { +- _vq_quantthresh__44c7_s_p7_1, +- _vq_quantmap__44c7_s_p7_1, ++static const encode_aux_threshmatch _vq_auxt__44c7_s_p7_1 = { ++ (float *)_vq_quantthresh__44c7_s_p7_1, ++ (long *)_vq_quantmap__44c7_s_p7_1, + 11, + 11 + }; + +-static static_codebook _44c7_s_p7_1 = { ++static const static_codebook _44c7_s_p7_1 = { + 2, 121, +- _vq_lengthlist__44c7_s_p7_1, ++ (long *)_vq_lengthlist__44c7_s_p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44c7_s_p7_1, ++ (long *)_vq_quantlist__44c7_s_p7_1, + NULL, +- &_vq_auxt__44c7_s_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c7_s_p8_0[] = { ++static const long _vq_quantlist__44c7_s_p8_0[] = { + 7, + 6, + 8, +@@ -11692,7 +11692,7 @@ + 14, + }; + +-static long _vq_lengthlist__44c7_s_p8_0[] = { ++static const long _vq_lengthlist__44c7_s_p8_0[] = { + 1, 4, 4, 7, 7, 8, 8, 8, 7, 9, 8, 9, 9,10,10, 6, + 5, 5, 7, 7, 9, 9, 8, 8,10, 9,11,10,12,11, 6, 5, + 5, 8, 7, 9, 9, 8, 8,10,10,11,11,12,11,19, 8, 8, +@@ -11710,35 +11710,35 @@ + 14, + }; + +-static float _vq_quantthresh__44c7_s_p8_0[] = { ++static const float _vq_quantthresh__44c7_s_p8_0[] = { + -136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, + 31.5, 52.5, 73.5, 94.5, 115.5, 136.5, + }; + +-static long _vq_quantmap__44c7_s_p8_0[] = { ++static const long _vq_quantmap__44c7_s_p8_0[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__44c7_s_p8_0 = { +- _vq_quantthresh__44c7_s_p8_0, +- _vq_quantmap__44c7_s_p8_0, ++static const encode_aux_threshmatch _vq_auxt__44c7_s_p8_0 = { ++ (float *)_vq_quantthresh__44c7_s_p8_0, ++ (long *)_vq_quantmap__44c7_s_p8_0, + 15, + 15 + }; + +-static static_codebook _44c7_s_p8_0 = { ++static const static_codebook _44c7_s_p8_0 = { + 2, 225, +- _vq_lengthlist__44c7_s_p8_0, ++ (long *)_vq_lengthlist__44c7_s_p8_0, + 1, -520986624, 1620377600, 4, 0, +- _vq_quantlist__44c7_s_p8_0, ++ (long *)_vq_quantlist__44c7_s_p8_0, + NULL, +- &_vq_auxt__44c7_s_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c7_s_p8_1[] = { ++static const long _vq_quantlist__44c7_s_p8_1[] = { + 10, + 9, + 11, +@@ -11762,7 +11762,7 @@ + 20, + }; + +-static long _vq_lengthlist__44c7_s_p8_1[] = { ++static const long _vq_lengthlist__44c7_s_p8_1[] = { + 3, 5, 5, 7, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, +@@ -11793,37 +11793,37 @@ + 10,10,10,10,10,10,10,10,10, + }; + +-static float _vq_quantthresh__44c7_s_p8_1[] = { ++static const float _vq_quantthresh__44c7_s_p8_1[] = { + -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, + -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, + 6.5, 7.5, 8.5, 9.5, + }; + +-static long _vq_quantmap__44c7_s_p8_1[] = { ++static const long _vq_quantmap__44c7_s_p8_1[] = { + 19, 17, 15, 13, 11, 9, 7, 5, + 3, 1, 0, 2, 4, 6, 8, 10, + 12, 14, 16, 18, 20, + }; + +-static encode_aux_threshmatch _vq_auxt__44c7_s_p8_1 = { +- _vq_quantthresh__44c7_s_p8_1, +- _vq_quantmap__44c7_s_p8_1, ++static const encode_aux_threshmatch _vq_auxt__44c7_s_p8_1 = { ++ (float *)_vq_quantthresh__44c7_s_p8_1, ++ (long *)_vq_quantmap__44c7_s_p8_1, + 21, + 21 + }; + +-static static_codebook _44c7_s_p8_1 = { ++static const static_codebook _44c7_s_p8_1 = { + 2, 441, +- _vq_lengthlist__44c7_s_p8_1, ++ (long *)_vq_lengthlist__44c7_s_p8_1, + 1, -529268736, 1611661312, 5, 0, +- _vq_quantlist__44c7_s_p8_1, ++ (long *)_vq_quantlist__44c7_s_p8_1, + NULL, +- &_vq_auxt__44c7_s_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c7_s_p9_0[] = { ++static const long _vq_quantlist__44c7_s_p9_0[] = { + 6, + 5, + 7, +@@ -11839,7 +11839,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c7_s_p9_0[] = { ++static const long _vq_lengthlist__44c7_s_p9_0[] = { + 1, 3, 3,11,11,11,11,11,11,11,11,11,11, 4, 6, 6, + 11,11,11,11,11,11,11,11,11,11, 4, 7, 7,11,11,11, + 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, +@@ -11853,35 +11853,35 @@ + 11,11,11,11,11,11,11,11,11, + }; + +-static float _vq_quantthresh__44c7_s_p9_0[] = { ++static const float _vq_quantthresh__44c7_s_p9_0[] = { + -3503.5, -2866.5, -2229.5, -1592.5, -955.5, -318.5, 318.5, 955.5, + 1592.5, 2229.5, 2866.5, 3503.5, + }; + +-static long _vq_quantmap__44c7_s_p9_0[] = { ++static const long _vq_quantmap__44c7_s_p9_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c7_s_p9_0 = { +- _vq_quantthresh__44c7_s_p9_0, +- _vq_quantmap__44c7_s_p9_0, ++static const encode_aux_threshmatch _vq_auxt__44c7_s_p9_0 = { ++ (float *)_vq_quantthresh__44c7_s_p9_0, ++ (long *)_vq_quantmap__44c7_s_p9_0, + 13, + 13 + }; + +-static static_codebook _44c7_s_p9_0 = { ++static const static_codebook _44c7_s_p9_0 = { + 2, 169, +- _vq_lengthlist__44c7_s_p9_0, ++ (long *)_vq_lengthlist__44c7_s_p9_0, + 1, -511845376, 1630791680, 4, 0, +- _vq_quantlist__44c7_s_p9_0, ++ (long *)_vq_quantlist__44c7_s_p9_0, + NULL, +- &_vq_auxt__44c7_s_p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c7_s_p9_1[] = { ++static const long _vq_quantlist__44c7_s_p9_1[] = { + 6, + 5, + 7, +@@ -11897,7 +11897,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c7_s_p9_1[] = { ++static const long _vq_lengthlist__44c7_s_p9_1[] = { + 1, 4, 4, 7, 7, 7, 7, 7, 6, 8, 8, 8, 8, 6, 6, 6, + 8, 8, 9, 8, 8, 7, 9, 8,11,10, 5, 6, 6, 8, 8, 9, + 8, 8, 8,10, 9,11,11,16, 8, 8, 9, 8, 9, 9, 9, 8, +@@ -11911,35 +11911,35 @@ + 15,11,11,10,10,12,12,12,12, + }; + +-static float _vq_quantthresh__44c7_s_p9_1[] = { ++static const float _vq_quantthresh__44c7_s_p9_1[] = { + -269.5, -220.5, -171.5, -122.5, -73.5, -24.5, 24.5, 73.5, + 122.5, 171.5, 220.5, 269.5, + }; + +-static long _vq_quantmap__44c7_s_p9_1[] = { ++static const long _vq_quantmap__44c7_s_p9_1[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c7_s_p9_1 = { +- _vq_quantthresh__44c7_s_p9_1, +- _vq_quantmap__44c7_s_p9_1, ++static const encode_aux_threshmatch _vq_auxt__44c7_s_p9_1 = { ++ (float *)_vq_quantthresh__44c7_s_p9_1, ++ (long *)_vq_quantmap__44c7_s_p9_1, + 13, + 13 + }; + +-static static_codebook _44c7_s_p9_1 = { ++static const static_codebook _44c7_s_p9_1 = { + 2, 169, +- _vq_lengthlist__44c7_s_p9_1, ++ (long *)_vq_lengthlist__44c7_s_p9_1, + 1, -518889472, 1622704128, 4, 0, +- _vq_quantlist__44c7_s_p9_1, ++ (long *)_vq_quantlist__44c7_s_p9_1, + NULL, +- &_vq_auxt__44c7_s_p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c7_s_p9_2[] = { ++static const long _vq_quantlist__44c7_s_p9_2[] = { + 24, + 23, + 25, +@@ -11991,14 +11991,14 @@ + 48, + }; + +-static long _vq_lengthlist__44c7_s_p9_2[] = { ++static const long _vq_lengthlist__44c7_s_p9_2[] = { + 2, 4, 3, 4, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, + }; + +-static float _vq_quantthresh__44c7_s_p9_2[] = { ++static const float _vq_quantthresh__44c7_s_p9_2[] = { + -23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, + -15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, +@@ -12007,7 +12007,7 @@ + 16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, + }; + +-static long _vq_quantmap__44c7_s_p9_2[] = { ++static const long _vq_quantmap__44c7_s_p9_2[] = { + 47, 45, 43, 41, 39, 37, 35, 33, + 31, 29, 27, 25, 23, 21, 19, 17, + 15, 13, 11, 9, 7, 5, 3, 1, +@@ -12017,25 +12017,25 @@ + 48, + }; + +-static encode_aux_threshmatch _vq_auxt__44c7_s_p9_2 = { +- _vq_quantthresh__44c7_s_p9_2, +- _vq_quantmap__44c7_s_p9_2, ++static const encode_aux_threshmatch _vq_auxt__44c7_s_p9_2 = { ++ (float *)_vq_quantthresh__44c7_s_p9_2, ++ (long *)_vq_quantmap__44c7_s_p9_2, + 49, + 49 + }; + +-static static_codebook _44c7_s_p9_2 = { ++static const static_codebook _44c7_s_p9_2 = { + 1, 49, +- _vq_lengthlist__44c7_s_p9_2, ++ (long *)_vq_lengthlist__44c7_s_p9_2, + 1, -526909440, 1611661312, 6, 0, +- _vq_quantlist__44c7_s_p9_2, ++ (long *)_vq_quantlist__44c7_s_p9_2, + NULL, +- &_vq_auxt__44c7_s_p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44c7_s_p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44c7_s_short[] = { ++static const long _huff_lengthlist__44c7_s_short[] = { + 4,11,12,14,15,15,17,17,18,18, 5, 6, 6, 8, 9,10, + 13,17,18,19, 7, 5, 4, 6, 8, 9,11,15,19,19, 8, 6, + 5, 5, 6, 7,11,14,16,17, 9, 7, 7, 6, 7, 7,10,13, +@@ -12045,9 +12045,9 @@ + 10, 9,11,14, + }; + +-static static_codebook _huff_book__44c7_s_short = { ++static const static_codebook _huff_book__44c7_s_short = { + 2, 100, +- _huff_lengthlist__44c7_s_short, ++ (long *)_huff_lengthlist__44c7_s_short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -12056,7 +12056,7 @@ + 0 + }; + +-static long _huff_lengthlist__44c8_s_long[] = { ++static const long _huff_lengthlist__44c8_s_long[] = { + 3, 8,12,13,14,14,14,13,14,14, 6, 4, 5, 8,10,10, + 11,11,14,13, 9, 5, 4, 5, 7, 8, 9,10,13,13,12, 7, + 5, 4, 5, 6, 8, 9,12,13,13, 9, 6, 5, 5, 5, 7, 9, +@@ -12066,9 +12066,9 @@ + 11, 9, 9,10, + }; + +-static static_codebook _huff_book__44c8_s_long = { ++static const static_codebook _huff_book__44c8_s_long = { + 2, 100, +- _huff_lengthlist__44c8_s_long, ++ (long *)_huff_lengthlist__44c8_s_long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -12077,13 +12077,13 @@ + 0 + }; + +-static long _vq_quantlist__44c8_s_p1_0[] = { ++static const long _vq_quantlist__44c8_s_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c8_s_p1_0[] = { ++static const long _vq_lengthlist__44c8_s_p1_0[] = { + 1, 5, 5, 0, 5, 5, 0, 5, 5, 5, 7, 7, 0, 9, 8, 0, + 9, 8, 6, 7, 7, 0, 8, 9, 0, 8, 9, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 9, 8, 0, 8, 8, 0, 8, 8, 5, 8, 9, +@@ -12092,33 +12092,33 @@ + 8, + }; + +-static float _vq_quantthresh__44c8_s_p1_0[] = { ++static const float _vq_quantthresh__44c8_s_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44c8_s_p1_0[] = { ++static const long _vq_quantmap__44c8_s_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c8_s_p1_0 = { +- _vq_quantthresh__44c8_s_p1_0, +- _vq_quantmap__44c8_s_p1_0, ++static const encode_aux_threshmatch _vq_auxt__44c8_s_p1_0 = { ++ (float *)_vq_quantthresh__44c8_s_p1_0, ++ (long *)_vq_quantmap__44c8_s_p1_0, + 3, + 3 + }; + +-static static_codebook _44c8_s_p1_0 = { ++static const static_codebook _44c8_s_p1_0 = { + 4, 81, +- _vq_lengthlist__44c8_s_p1_0, ++ (long *)_vq_lengthlist__44c8_s_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44c8_s_p1_0, ++ (long *)_vq_quantlist__44c8_s_p1_0, + NULL, +- &_vq_auxt__44c8_s_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c8_s_p2_0[] = { ++static const long _vq_quantlist__44c8_s_p2_0[] = { + 2, + 1, + 3, +@@ -12126,7 +12126,7 @@ + 4, + }; + +-static long _vq_lengthlist__44c8_s_p2_0[] = { ++static const long _vq_lengthlist__44c8_s_p2_0[] = { + 3, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, + 7, 7, 9, 9, 0, 0, 0, 9, 9, 5, 7, 7, 9, 9, 0, 8, + 7,10, 9, 0, 8, 7,10, 9, 0,10,10,11,11, 0, 0, 0, +@@ -12169,33 +12169,33 @@ + 13, + }; + +-static float _vq_quantthresh__44c8_s_p2_0[] = { ++static const float _vq_quantthresh__44c8_s_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c8_s_p2_0[] = { ++static const long _vq_quantmap__44c8_s_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c8_s_p2_0 = { +- _vq_quantthresh__44c8_s_p2_0, +- _vq_quantmap__44c8_s_p2_0, ++static const encode_aux_threshmatch _vq_auxt__44c8_s_p2_0 = { ++ (float *)_vq_quantthresh__44c8_s_p2_0, ++ (long *)_vq_quantmap__44c8_s_p2_0, + 5, + 5 + }; + +-static static_codebook _44c8_s_p2_0 = { ++static const static_codebook _44c8_s_p2_0 = { + 4, 625, +- _vq_lengthlist__44c8_s_p2_0, ++ (long *)_vq_lengthlist__44c8_s_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c8_s_p2_0, ++ (long *)_vq_quantlist__44c8_s_p2_0, + NULL, +- &_vq_auxt__44c8_s_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c8_s_p3_0[] = { ++static const long _vq_quantlist__44c8_s_p3_0[] = { + 4, + 3, + 5, +@@ -12207,7 +12207,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c8_s_p3_0[] = { ++static const long _vq_lengthlist__44c8_s_p3_0[] = { + 2, 4, 4, 5, 5, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, + 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 5, 5, 6, 6, + 8, 8,10,10, 0, 0, 0, 6, 6, 8, 8,10,10, 0, 0, 0, +@@ -12216,34 +12216,34 @@ + 0, + }; + +-static float _vq_quantthresh__44c8_s_p3_0[] = { ++static const float _vq_quantthresh__44c8_s_p3_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c8_s_p3_0[] = { ++static const long _vq_quantmap__44c8_s_p3_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c8_s_p3_0 = { +- _vq_quantthresh__44c8_s_p3_0, +- _vq_quantmap__44c8_s_p3_0, ++static const encode_aux_threshmatch _vq_auxt__44c8_s_p3_0 = { ++ (float *)_vq_quantthresh__44c8_s_p3_0, ++ (long *)_vq_quantmap__44c8_s_p3_0, + 9, + 9 + }; + +-static static_codebook _44c8_s_p3_0 = { ++static const static_codebook _44c8_s_p3_0 = { + 2, 81, +- _vq_lengthlist__44c8_s_p3_0, ++ (long *)_vq_lengthlist__44c8_s_p3_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c8_s_p3_0, ++ (long *)_vq_quantlist__44c8_s_p3_0, + NULL, +- &_vq_auxt__44c8_s_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c8_s_p4_0[] = { ++static const long _vq_quantlist__44c8_s_p4_0[] = { + 8, + 7, + 9, +@@ -12263,7 +12263,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c8_s_p4_0[] = { ++static const long _vq_lengthlist__44c8_s_p4_0[] = { + 3, 4, 4, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, + 11, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 8,10,10,11,11, + 11,11, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11, +@@ -12285,42 +12285,42 @@ + 0, + }; + +-static float _vq_quantthresh__44c8_s_p4_0[] = { ++static const float _vq_quantthresh__44c8_s_p4_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c8_s_p4_0[] = { ++static const long _vq_quantmap__44c8_s_p4_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c8_s_p4_0 = { +- _vq_quantthresh__44c8_s_p4_0, +- _vq_quantmap__44c8_s_p4_0, ++static const encode_aux_threshmatch _vq_auxt__44c8_s_p4_0 = { ++ (float *)_vq_quantthresh__44c8_s_p4_0, ++ (long *)_vq_quantmap__44c8_s_p4_0, + 17, + 17 + }; + +-static static_codebook _44c8_s_p4_0 = { ++static const static_codebook _44c8_s_p4_0 = { + 2, 289, +- _vq_lengthlist__44c8_s_p4_0, ++ (long *)_vq_lengthlist__44c8_s_p4_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c8_s_p4_0, ++ (long *)_vq_quantlist__44c8_s_p4_0, + NULL, +- &_vq_auxt__44c8_s_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c8_s_p5_0[] = { ++static const long _vq_quantlist__44c8_s_p5_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c8_s_p5_0[] = { ++static const long _vq_lengthlist__44c8_s_p5_0[] = { + 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 7, 6,10,10,10,10, + 10,10, 4, 6, 6,10,10,10,10, 9,10, 5,10,10, 9,11, + 11,10,11,11, 7,10,10,11,12,12,12,12,12, 7,10,10, +@@ -12329,33 +12329,33 @@ + 12, + }; + +-static float _vq_quantthresh__44c8_s_p5_0[] = { ++static const float _vq_quantthresh__44c8_s_p5_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44c8_s_p5_0[] = { ++static const long _vq_quantmap__44c8_s_p5_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c8_s_p5_0 = { +- _vq_quantthresh__44c8_s_p5_0, +- _vq_quantmap__44c8_s_p5_0, ++static const encode_aux_threshmatch _vq_auxt__44c8_s_p5_0 = { ++ (float *)_vq_quantthresh__44c8_s_p5_0, ++ (long *)_vq_quantmap__44c8_s_p5_0, + 3, + 3 + }; + +-static static_codebook _44c8_s_p5_0 = { ++static const static_codebook _44c8_s_p5_0 = { + 4, 81, +- _vq_lengthlist__44c8_s_p5_0, ++ (long *)_vq_lengthlist__44c8_s_p5_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44c8_s_p5_0, ++ (long *)_vq_quantlist__44c8_s_p5_0, + NULL, +- &_vq_auxt__44c8_s_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c8_s_p5_1[] = { ++static const long _vq_quantlist__44c8_s_p5_1[] = { + 5, + 4, + 6, +@@ -12369,7 +12369,7 @@ + 10, + }; + +-static long _vq_lengthlist__44c8_s_p5_1[] = { ++static const long _vq_lengthlist__44c8_s_p5_1[] = { + 3, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,11, 4, 5, 6, 6, + 7, 7, 8, 8, 8, 8,11, 5, 5, 6, 6, 7, 7, 8, 8, 8, + 9,12, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,12,12,12, 6, +@@ -12380,35 +12380,35 @@ + 11,11,11, 7, 7, 7, 7, 8, 8, + }; + +-static float _vq_quantthresh__44c8_s_p5_1[] = { ++static const float _vq_quantthresh__44c8_s_p5_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44c8_s_p5_1[] = { ++static const long _vq_quantmap__44c8_s_p5_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44c8_s_p5_1 = { +- _vq_quantthresh__44c8_s_p5_1, +- _vq_quantmap__44c8_s_p5_1, ++static const encode_aux_threshmatch _vq_auxt__44c8_s_p5_1 = { ++ (float *)_vq_quantthresh__44c8_s_p5_1, ++ (long *)_vq_quantmap__44c8_s_p5_1, + 11, + 11 + }; + +-static static_codebook _44c8_s_p5_1 = { ++static const static_codebook _44c8_s_p5_1 = { + 2, 121, +- _vq_lengthlist__44c8_s_p5_1, ++ (long *)_vq_lengthlist__44c8_s_p5_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44c8_s_p5_1, ++ (long *)_vq_quantlist__44c8_s_p5_1, + NULL, +- &_vq_auxt__44c8_s_p5_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p5_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c8_s_p6_0[] = { ++static const long _vq_quantlist__44c8_s_p6_0[] = { + 6, + 5, + 7, +@@ -12424,7 +12424,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c8_s_p6_0[] = { ++static const long _vq_lengthlist__44c8_s_p6_0[] = { + 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5, + 7, 7, 8, 8, 9, 9,10,10,11,11, 6, 5, 5, 7, 7, 8, + 8, 9, 9,10,10,11,11, 0, 7, 7, 7, 7, 9, 9,10,10, +@@ -12438,35 +12438,35 @@ + 0, 0, 0, 0, 0, 0, 0, 0, 0, + }; + +-static float _vq_quantthresh__44c8_s_p6_0[] = { ++static const float _vq_quantthresh__44c8_s_p6_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44c8_s_p6_0[] = { ++static const long _vq_quantmap__44c8_s_p6_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c8_s_p6_0 = { +- _vq_quantthresh__44c8_s_p6_0, +- _vq_quantmap__44c8_s_p6_0, ++static const encode_aux_threshmatch _vq_auxt__44c8_s_p6_0 = { ++ (float *)_vq_quantthresh__44c8_s_p6_0, ++ (long *)_vq_quantmap__44c8_s_p6_0, + 13, + 13 + }; + +-static static_codebook _44c8_s_p6_0 = { ++static const static_codebook _44c8_s_p6_0 = { + 2, 169, +- _vq_lengthlist__44c8_s_p6_0, ++ (long *)_vq_lengthlist__44c8_s_p6_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44c8_s_p6_0, ++ (long *)_vq_quantlist__44c8_s_p6_0, + NULL, +- &_vq_auxt__44c8_s_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c8_s_p6_1[] = { ++static const long _vq_quantlist__44c8_s_p6_1[] = { + 2, + 1, + 3, +@@ -12474,38 +12474,38 @@ + 4, + }; + +-static long _vq_lengthlist__44c8_s_p6_1[] = { ++static const long _vq_lengthlist__44c8_s_p6_1[] = { + 3, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 4, 4, 5, 5, 6, + 5, 5, 5, 5, 6, 6, 6, 5, 5, + }; + +-static float _vq_quantthresh__44c8_s_p6_1[] = { ++static const float _vq_quantthresh__44c8_s_p6_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c8_s_p6_1[] = { ++static const long _vq_quantmap__44c8_s_p6_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c8_s_p6_1 = { +- _vq_quantthresh__44c8_s_p6_1, +- _vq_quantmap__44c8_s_p6_1, ++static const encode_aux_threshmatch _vq_auxt__44c8_s_p6_1 = { ++ (float *)_vq_quantthresh__44c8_s_p6_1, ++ (long *)_vq_quantmap__44c8_s_p6_1, + 5, + 5 + }; + +-static static_codebook _44c8_s_p6_1 = { ++static const static_codebook _44c8_s_p6_1 = { + 2, 25, +- _vq_lengthlist__44c8_s_p6_1, ++ (long *)_vq_lengthlist__44c8_s_p6_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c8_s_p6_1, ++ (long *)_vq_quantlist__44c8_s_p6_1, + NULL, +- &_vq_auxt__44c8_s_p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c8_s_p7_0[] = { ++static const long _vq_quantlist__44c8_s_p7_0[] = { + 6, + 5, + 7, +@@ -12521,7 +12521,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c8_s_p7_0[] = { ++static const long _vq_lengthlist__44c8_s_p7_0[] = { + 1, 4, 4, 6, 6, 8, 7, 9, 9,10,10,12,12, 6, 5, 5, + 7, 7, 8, 8,10,10,11,11,12,12, 7, 5, 5, 7, 7, 8, + 8,10,10,11,11,12,12,21, 7, 7, 7, 7, 8, 9,10,10, +@@ -12535,35 +12535,35 @@ + 20,13,13,13,13,14,13,15,15, + }; + +-static float _vq_quantthresh__44c8_s_p7_0[] = { ++static const float _vq_quantthresh__44c8_s_p7_0[] = { + -60.5, -49.5, -38.5, -27.5, -16.5, -5.5, 5.5, 16.5, + 27.5, 38.5, 49.5, 60.5, + }; + +-static long _vq_quantmap__44c8_s_p7_0[] = { ++static const long _vq_quantmap__44c8_s_p7_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c8_s_p7_0 = { +- _vq_quantthresh__44c8_s_p7_0, +- _vq_quantmap__44c8_s_p7_0, ++static const encode_aux_threshmatch _vq_auxt__44c8_s_p7_0 = { ++ (float *)_vq_quantthresh__44c8_s_p7_0, ++ (long *)_vq_quantmap__44c8_s_p7_0, + 13, + 13 + }; + +-static static_codebook _44c8_s_p7_0 = { ++static const static_codebook _44c8_s_p7_0 = { + 2, 169, +- _vq_lengthlist__44c8_s_p7_0, ++ (long *)_vq_lengthlist__44c8_s_p7_0, + 1, -523206656, 1618345984, 4, 0, +- _vq_quantlist__44c8_s_p7_0, ++ (long *)_vq_quantlist__44c8_s_p7_0, + NULL, +- &_vq_auxt__44c8_s_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c8_s_p7_1[] = { ++static const long _vq_quantlist__44c8_s_p7_1[] = { + 5, + 4, + 6, +@@ -12577,7 +12577,7 @@ + 10, + }; + +-static long _vq_lengthlist__44c8_s_p7_1[] = { ++static const long _vq_lengthlist__44c8_s_p7_1[] = { + 4, 5, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 6, 6, 6, 7, + 7, 7, 7, 7, 7, 7, 8, 6, 6, 6, 6, 7, 7, 7, 7, 7, + 7, 8, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 7, +@@ -12588,35 +12588,35 @@ + 8, 8, 8, 7, 7, 7, 7, 7, 7, + }; + +-static float _vq_quantthresh__44c8_s_p7_1[] = { ++static const float _vq_quantthresh__44c8_s_p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44c8_s_p7_1[] = { ++static const long _vq_quantmap__44c8_s_p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44c8_s_p7_1 = { +- _vq_quantthresh__44c8_s_p7_1, +- _vq_quantmap__44c8_s_p7_1, ++static const encode_aux_threshmatch _vq_auxt__44c8_s_p7_1 = { ++ (float *)_vq_quantthresh__44c8_s_p7_1, ++ (long *)_vq_quantmap__44c8_s_p7_1, + 11, + 11 + }; + +-static static_codebook _44c8_s_p7_1 = { ++static const static_codebook _44c8_s_p7_1 = { + 2, 121, +- _vq_lengthlist__44c8_s_p7_1, ++ (long *)_vq_lengthlist__44c8_s_p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44c8_s_p7_1, ++ (long *)_vq_quantlist__44c8_s_p7_1, + NULL, +- &_vq_auxt__44c8_s_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c8_s_p8_0[] = { ++static const long _vq_quantlist__44c8_s_p8_0[] = { + 7, + 6, + 8, +@@ -12634,7 +12634,7 @@ + 14, + }; + +-static long _vq_lengthlist__44c8_s_p8_0[] = { ++static const long _vq_lengthlist__44c8_s_p8_0[] = { + 1, 4, 4, 7, 6, 8, 8, 8, 7, 9, 8,10,10,11,10, 6, + 5, 5, 7, 7, 9, 9, 8, 8,10,10,11,11,12,11, 6, 5, + 5, 7, 7, 9, 9, 9, 9,10,10,11,11,12,12,20, 8, 8, +@@ -12652,35 +12652,35 @@ + 15, + }; + +-static float _vq_quantthresh__44c8_s_p8_0[] = { ++static const float _vq_quantthresh__44c8_s_p8_0[] = { + -136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, + 31.5, 52.5, 73.5, 94.5, 115.5, 136.5, + }; + +-static long _vq_quantmap__44c8_s_p8_0[] = { ++static const long _vq_quantmap__44c8_s_p8_0[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__44c8_s_p8_0 = { +- _vq_quantthresh__44c8_s_p8_0, +- _vq_quantmap__44c8_s_p8_0, ++static const encode_aux_threshmatch _vq_auxt__44c8_s_p8_0 = { ++ (float *)_vq_quantthresh__44c8_s_p8_0, ++ (long *)_vq_quantmap__44c8_s_p8_0, + 15, + 15 + }; + +-static static_codebook _44c8_s_p8_0 = { ++static const static_codebook _44c8_s_p8_0 = { + 2, 225, +- _vq_lengthlist__44c8_s_p8_0, ++ (long *)_vq_lengthlist__44c8_s_p8_0, + 1, -520986624, 1620377600, 4, 0, +- _vq_quantlist__44c8_s_p8_0, ++ (long *)_vq_quantlist__44c8_s_p8_0, + NULL, +- &_vq_auxt__44c8_s_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c8_s_p8_1[] = { ++static const long _vq_quantlist__44c8_s_p8_1[] = { + 10, + 9, + 11, +@@ -12704,7 +12704,7 @@ + 20, + }; + +-static long _vq_lengthlist__44c8_s_p8_1[] = { ++static const long _vq_lengthlist__44c8_s_p8_1[] = { + 4, 5, 5, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, +@@ -12735,37 +12735,37 @@ + 10, 9, 9,10,10, 9,10, 9, 9, + }; + +-static float _vq_quantthresh__44c8_s_p8_1[] = { ++static const float _vq_quantthresh__44c8_s_p8_1[] = { + -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, + -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, + 6.5, 7.5, 8.5, 9.5, + }; + +-static long _vq_quantmap__44c8_s_p8_1[] = { ++static const long _vq_quantmap__44c8_s_p8_1[] = { + 19, 17, 15, 13, 11, 9, 7, 5, + 3, 1, 0, 2, 4, 6, 8, 10, + 12, 14, 16, 18, 20, + }; + +-static encode_aux_threshmatch _vq_auxt__44c8_s_p8_1 = { +- _vq_quantthresh__44c8_s_p8_1, +- _vq_quantmap__44c8_s_p8_1, ++static const encode_aux_threshmatch _vq_auxt__44c8_s_p8_1 = { ++ (float *)_vq_quantthresh__44c8_s_p8_1, ++ (long *)_vq_quantmap__44c8_s_p8_1, + 21, + 21 + }; + +-static static_codebook _44c8_s_p8_1 = { ++static const static_codebook _44c8_s_p8_1 = { + 2, 441, +- _vq_lengthlist__44c8_s_p8_1, ++ (long *)_vq_lengthlist__44c8_s_p8_1, + 1, -529268736, 1611661312, 5, 0, +- _vq_quantlist__44c8_s_p8_1, ++ (long *)_vq_quantlist__44c8_s_p8_1, + NULL, +- &_vq_auxt__44c8_s_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c8_s_p9_0[] = { ++static const long _vq_quantlist__44c8_s_p9_0[] = { + 8, + 7, + 9, +@@ -12785,7 +12785,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c8_s_p9_0[] = { ++static const long _vq_lengthlist__44c8_s_p9_0[] = { + 1, 4, 3,11,11,11,11,11,11,11,11,11,11,11,11,11, + 11, 4, 7, 7,11,11,11,11,11,11,11,11,11,11,11,11, + 11,11, 4, 8,11,11,11,11,11,11,11,11,11,11,11,11, +@@ -12807,36 +12807,36 @@ + 10, + }; + +-static float _vq_quantthresh__44c8_s_p9_0[] = { ++static const float _vq_quantthresh__44c8_s_p9_0[] = { + -6982.5, -6051.5, -5120.5, -4189.5, -3258.5, -2327.5, -1396.5, -465.5, + 465.5, 1396.5, 2327.5, 3258.5, 4189.5, 5120.5, 6051.5, 6982.5, + }; + +-static long _vq_quantmap__44c8_s_p9_0[] = { ++static const long _vq_quantmap__44c8_s_p9_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c8_s_p9_0 = { +- _vq_quantthresh__44c8_s_p9_0, +- _vq_quantmap__44c8_s_p9_0, ++static const encode_aux_threshmatch _vq_auxt__44c8_s_p9_0 = { ++ (float *)_vq_quantthresh__44c8_s_p9_0, ++ (long *)_vq_quantmap__44c8_s_p9_0, + 17, + 17 + }; + +-static static_codebook _44c8_s_p9_0 = { ++static const static_codebook _44c8_s_p9_0 = { + 2, 289, +- _vq_lengthlist__44c8_s_p9_0, ++ (long *)_vq_lengthlist__44c8_s_p9_0, + 1, -509798400, 1631393792, 5, 0, +- _vq_quantlist__44c8_s_p9_0, ++ (long *)_vq_quantlist__44c8_s_p9_0, + NULL, +- &_vq_auxt__44c8_s_p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c8_s_p9_1[] = { ++static const long _vq_quantlist__44c8_s_p9_1[] = { + 9, + 8, + 10, +@@ -12858,7 +12858,7 @@ + 18, + }; + +-static long _vq_lengthlist__44c8_s_p9_1[] = { ++static const long _vq_lengthlist__44c8_s_p9_1[] = { + 1, 4, 4, 7, 6, 7, 7, 7, 7, 8, 8, 9, 9,10,10,10, + 10,11,11, 6, 6, 6, 8, 8, 9, 8, 8, 7,10, 8,11,10, + 12,11,12,12,13,13, 5, 5, 6, 8, 8, 9, 9, 8, 8,10, +@@ -12884,37 +12884,37 @@ + 14,13,13,14,14,15,14,15,14, + }; + +-static float _vq_quantthresh__44c8_s_p9_1[] = { ++static const float _vq_quantthresh__44c8_s_p9_1[] = { + -416.5, -367.5, -318.5, -269.5, -220.5, -171.5, -122.5, -73.5, + -24.5, 24.5, 73.5, 122.5, 171.5, 220.5, 269.5, 318.5, + 367.5, 416.5, + }; + +-static long _vq_quantmap__44c8_s_p9_1[] = { ++static const long _vq_quantmap__44c8_s_p9_1[] = { + 17, 15, 13, 11, 9, 7, 5, 3, + 1, 0, 2, 4, 6, 8, 10, 12, + 14, 16, 18, + }; + +-static encode_aux_threshmatch _vq_auxt__44c8_s_p9_1 = { +- _vq_quantthresh__44c8_s_p9_1, +- _vq_quantmap__44c8_s_p9_1, ++static const encode_aux_threshmatch _vq_auxt__44c8_s_p9_1 = { ++ (float *)_vq_quantthresh__44c8_s_p9_1, ++ (long *)_vq_quantmap__44c8_s_p9_1, + 19, + 19 + }; + +-static static_codebook _44c8_s_p9_1 = { ++static const static_codebook _44c8_s_p9_1 = { + 2, 361, +- _vq_lengthlist__44c8_s_p9_1, ++ (long *)_vq_lengthlist__44c8_s_p9_1, + 1, -518287360, 1622704128, 5, 0, +- _vq_quantlist__44c8_s_p9_1, ++ (long *)_vq_quantlist__44c8_s_p9_1, + NULL, +- &_vq_auxt__44c8_s_p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c8_s_p9_2[] = { ++static const long _vq_quantlist__44c8_s_p9_2[] = { + 24, + 23, + 25, +@@ -12966,14 +12966,14 @@ + 48, + }; + +-static long _vq_lengthlist__44c8_s_p9_2[] = { ++static const long _vq_lengthlist__44c8_s_p9_2[] = { + 2, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, + }; + +-static float _vq_quantthresh__44c8_s_p9_2[] = { ++static const float _vq_quantthresh__44c8_s_p9_2[] = { + -23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, + -15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, +@@ -12982,7 +12982,7 @@ + 16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, + }; + +-static long _vq_quantmap__44c8_s_p9_2[] = { ++static const long _vq_quantmap__44c8_s_p9_2[] = { + 47, 45, 43, 41, 39, 37, 35, 33, + 31, 29, 27, 25, 23, 21, 19, 17, + 15, 13, 11, 9, 7, 5, 3, 1, +@@ -12992,25 +12992,25 @@ + 48, + }; + +-static encode_aux_threshmatch _vq_auxt__44c8_s_p9_2 = { +- _vq_quantthresh__44c8_s_p9_2, +- _vq_quantmap__44c8_s_p9_2, ++static const encode_aux_threshmatch _vq_auxt__44c8_s_p9_2 = { ++ (float *)_vq_quantthresh__44c8_s_p9_2, ++ (long *)_vq_quantmap__44c8_s_p9_2, + 49, + 49 + }; + +-static static_codebook _44c8_s_p9_2 = { ++static const static_codebook _44c8_s_p9_2 = { + 1, 49, +- _vq_lengthlist__44c8_s_p9_2, ++ (long *)_vq_lengthlist__44c8_s_p9_2, + 1, -526909440, 1611661312, 6, 0, +- _vq_quantlist__44c8_s_p9_2, ++ (long *)_vq_quantlist__44c8_s_p9_2, + NULL, +- &_vq_auxt__44c8_s_p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44c8_s_p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44c8_s_short[] = { ++static const long _huff_lengthlist__44c8_s_short[] = { + 4,11,13,14,15,15,18,17,19,17, 5, 6, 8, 9,10,10, + 12,15,19,19, 6, 6, 6, 6, 8, 8,11,14,18,19, 8, 6, + 5, 4, 6, 7,10,13,16,17, 9, 7, 6, 5, 6, 7, 9,12, +@@ -13020,9 +13020,9 @@ + 10, 9,11,14, + }; + +-static static_codebook _huff_book__44c8_s_short = { ++static const static_codebook _huff_book__44c8_s_short = { + 2, 100, +- _huff_lengthlist__44c8_s_short, ++ (long *)_huff_lengthlist__44c8_s_short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -13031,7 +13031,7 @@ + 0 + }; + +-static long _huff_lengthlist__44c9_s_long[] = { ++static const long _huff_lengthlist__44c9_s_long[] = { + 3, 8,12,14,15,15,15,13,15,15, 6, 5, 8,10,12,12, + 13,12,14,13,10, 6, 5, 6, 8, 9,11,11,13,13,13, 8, + 5, 4, 5, 6, 8,10,11,13,14,10, 7, 5, 4, 5, 7, 9, +@@ -13041,9 +13041,9 @@ + 10, 9, 8, 9, + }; + +-static static_codebook _huff_book__44c9_s_long = { ++static const static_codebook _huff_book__44c9_s_long = { + 2, 100, +- _huff_lengthlist__44c9_s_long, ++ (long *)_huff_lengthlist__44c9_s_long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -13052,13 +13052,13 @@ + 0 + }; + +-static long _vq_quantlist__44c9_s_p1_0[] = { ++static const long _vq_quantlist__44c9_s_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c9_s_p1_0[] = { ++static const long _vq_lengthlist__44c9_s_p1_0[] = { + 1, 5, 5, 0, 5, 5, 0, 5, 5, 6, 8, 8, 0, 9, 8, 0, + 9, 8, 6, 8, 8, 0, 8, 9, 0, 8, 9, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 8, 8, 0, 7, 7, 0, 8, 8, 5, 8, 8, +@@ -13067,33 +13067,33 @@ + 7, + }; + +-static float _vq_quantthresh__44c9_s_p1_0[] = { ++static const float _vq_quantthresh__44c9_s_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44c9_s_p1_0[] = { ++static const long _vq_quantmap__44c9_s_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c9_s_p1_0 = { +- _vq_quantthresh__44c9_s_p1_0, +- _vq_quantmap__44c9_s_p1_0, ++static const encode_aux_threshmatch _vq_auxt__44c9_s_p1_0 = { ++ (float *)_vq_quantthresh__44c9_s_p1_0, ++ (long *)_vq_quantmap__44c9_s_p1_0, + 3, + 3 + }; + +-static static_codebook _44c9_s_p1_0 = { ++static const static_codebook _44c9_s_p1_0 = { + 4, 81, +- _vq_lengthlist__44c9_s_p1_0, ++ (long *)_vq_lengthlist__44c9_s_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44c9_s_p1_0, ++ (long *)_vq_quantlist__44c9_s_p1_0, + NULL, +- &_vq_auxt__44c9_s_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c9_s_p2_0[] = { ++static const long _vq_quantlist__44c9_s_p2_0[] = { + 2, + 1, + 3, +@@ -13101,7 +13101,7 @@ + 4, + }; + +-static long _vq_lengthlist__44c9_s_p2_0[] = { ++static const long _vq_lengthlist__44c9_s_p2_0[] = { + 3, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, + 7, 7, 9, 9, 0, 0, 0, 9, 9, 6, 7, 7, 9, 8, 0, 8, + 8, 9, 9, 0, 8, 7, 9, 9, 0, 9,10,10,10, 0, 0, 0, +@@ -13144,33 +13144,33 @@ + 12, + }; + +-static float _vq_quantthresh__44c9_s_p2_0[] = { ++static const float _vq_quantthresh__44c9_s_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c9_s_p2_0[] = { ++static const long _vq_quantmap__44c9_s_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c9_s_p2_0 = { +- _vq_quantthresh__44c9_s_p2_0, +- _vq_quantmap__44c9_s_p2_0, ++static const encode_aux_threshmatch _vq_auxt__44c9_s_p2_0 = { ++ (float *)_vq_quantthresh__44c9_s_p2_0, ++ (long *)_vq_quantmap__44c9_s_p2_0, + 5, + 5 + }; + +-static static_codebook _44c9_s_p2_0 = { ++static const static_codebook _44c9_s_p2_0 = { + 4, 625, +- _vq_lengthlist__44c9_s_p2_0, ++ (long *)_vq_lengthlist__44c9_s_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c9_s_p2_0, ++ (long *)_vq_quantlist__44c9_s_p2_0, + NULL, +- &_vq_auxt__44c9_s_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c9_s_p3_0[] = { ++static const long _vq_quantlist__44c9_s_p3_0[] = { + 4, + 3, + 5, +@@ -13182,7 +13182,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c9_s_p3_0[] = { ++static const long _vq_lengthlist__44c9_s_p3_0[] = { + 3, 4, 4, 5, 5, 6, 6, 8, 8, 0, 4, 4, 5, 5, 6, 7, + 8, 8, 0, 4, 4, 5, 5, 7, 7, 8, 8, 0, 5, 5, 6, 6, + 7, 7, 9, 9, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0, +@@ -13191,34 +13191,34 @@ + 0, + }; + +-static float _vq_quantthresh__44c9_s_p3_0[] = { ++static const float _vq_quantthresh__44c9_s_p3_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c9_s_p3_0[] = { ++static const long _vq_quantmap__44c9_s_p3_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c9_s_p3_0 = { +- _vq_quantthresh__44c9_s_p3_0, +- _vq_quantmap__44c9_s_p3_0, ++static const encode_aux_threshmatch _vq_auxt__44c9_s_p3_0 = { ++ (float *)_vq_quantthresh__44c9_s_p3_0, ++ (long *)_vq_quantmap__44c9_s_p3_0, + 9, + 9 + }; + +-static static_codebook _44c9_s_p3_0 = { ++static const static_codebook _44c9_s_p3_0 = { + 2, 81, +- _vq_lengthlist__44c9_s_p3_0, ++ (long *)_vq_lengthlist__44c9_s_p3_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c9_s_p3_0, ++ (long *)_vq_quantlist__44c9_s_p3_0, + NULL, +- &_vq_auxt__44c9_s_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c9_s_p4_0[] = { ++static const long _vq_quantlist__44c9_s_p4_0[] = { + 8, + 7, + 9, +@@ -13238,7 +13238,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c9_s_p4_0[] = { ++static const long _vq_lengthlist__44c9_s_p4_0[] = { + 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,10, + 10, 0, 5, 4, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, + 11,11, 0, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10, +@@ -13260,42 +13260,42 @@ + 0, + }; + +-static float _vq_quantthresh__44c9_s_p4_0[] = { ++static const float _vq_quantthresh__44c9_s_p4_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c9_s_p4_0[] = { ++static const long _vq_quantmap__44c9_s_p4_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c9_s_p4_0 = { +- _vq_quantthresh__44c9_s_p4_0, +- _vq_quantmap__44c9_s_p4_0, ++static const encode_aux_threshmatch _vq_auxt__44c9_s_p4_0 = { ++ (float *)_vq_quantthresh__44c9_s_p4_0, ++ (long *)_vq_quantmap__44c9_s_p4_0, + 17, + 17 + }; + +-static static_codebook _44c9_s_p4_0 = { ++static const static_codebook _44c9_s_p4_0 = { + 2, 289, +- _vq_lengthlist__44c9_s_p4_0, ++ (long *)_vq_lengthlist__44c9_s_p4_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c9_s_p4_0, ++ (long *)_vq_quantlist__44c9_s_p4_0, + NULL, +- &_vq_auxt__44c9_s_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c9_s_p5_0[] = { ++static const long _vq_quantlist__44c9_s_p5_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c9_s_p5_0[] = { ++static const long _vq_lengthlist__44c9_s_p5_0[] = { + 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 7, 6, 9,10,10,10, + 10, 9, 4, 6, 7, 9,10,10,10, 9,10, 5, 9, 9, 9,11, + 11,10,11,11, 7,10, 9,11,12,11,12,12,12, 7, 9,10, +@@ -13304,33 +13304,33 @@ + 12, + }; + +-static float _vq_quantthresh__44c9_s_p5_0[] = { ++static const float _vq_quantthresh__44c9_s_p5_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44c9_s_p5_0[] = { ++static const long _vq_quantmap__44c9_s_p5_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c9_s_p5_0 = { +- _vq_quantthresh__44c9_s_p5_0, +- _vq_quantmap__44c9_s_p5_0, ++static const encode_aux_threshmatch _vq_auxt__44c9_s_p5_0 = { ++ (float *)_vq_quantthresh__44c9_s_p5_0, ++ (long *)_vq_quantmap__44c9_s_p5_0, + 3, + 3 + }; + +-static static_codebook _44c9_s_p5_0 = { ++static const static_codebook _44c9_s_p5_0 = { + 4, 81, +- _vq_lengthlist__44c9_s_p5_0, ++ (long *)_vq_lengthlist__44c9_s_p5_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44c9_s_p5_0, ++ (long *)_vq_quantlist__44c9_s_p5_0, + NULL, +- &_vq_auxt__44c9_s_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c9_s_p5_1[] = { ++static const long _vq_quantlist__44c9_s_p5_1[] = { + 5, + 4, + 6, +@@ -13344,7 +13344,7 @@ + 10, + }; + +-static long _vq_lengthlist__44c9_s_p5_1[] = { ++static const long _vq_lengthlist__44c9_s_p5_1[] = { + 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7,11, 5, 5, 6, 6, + 7, 7, 7, 7, 8, 8,11, 5, 5, 6, 6, 7, 7, 7, 7, 8, + 8,11, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,11,11,11, 6, +@@ -13355,35 +13355,35 @@ + 11,11,11, 7, 7, 7, 7, 7, 7, + }; + +-static float _vq_quantthresh__44c9_s_p5_1[] = { ++static const float _vq_quantthresh__44c9_s_p5_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44c9_s_p5_1[] = { ++static const long _vq_quantmap__44c9_s_p5_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44c9_s_p5_1 = { +- _vq_quantthresh__44c9_s_p5_1, +- _vq_quantmap__44c9_s_p5_1, ++static const encode_aux_threshmatch _vq_auxt__44c9_s_p5_1 = { ++ (float *)_vq_quantthresh__44c9_s_p5_1, ++ (long *)_vq_quantmap__44c9_s_p5_1, + 11, + 11 + }; + +-static static_codebook _44c9_s_p5_1 = { ++static const static_codebook _44c9_s_p5_1 = { + 2, 121, +- _vq_lengthlist__44c9_s_p5_1, ++ (long *)_vq_lengthlist__44c9_s_p5_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44c9_s_p5_1, ++ (long *)_vq_quantlist__44c9_s_p5_1, + NULL, +- &_vq_auxt__44c9_s_p5_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p5_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c9_s_p6_0[] = { ++static const long _vq_quantlist__44c9_s_p6_0[] = { + 6, + 5, + 7, +@@ -13399,7 +13399,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c9_s_p6_0[] = { ++static const long _vq_lengthlist__44c9_s_p6_0[] = { + 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 5, 4, 4, + 6, 6, 8, 8, 9, 9, 9, 9,10,10, 6, 4, 4, 6, 6, 8, + 8, 9, 9, 9, 9,10,10, 0, 6, 6, 7, 7, 8, 8, 9, 9, +@@ -13413,35 +13413,35 @@ + 0, 0, 0, 0, 0, 0, 0, 0, 0, + }; + +-static float _vq_quantthresh__44c9_s_p6_0[] = { ++static const float _vq_quantthresh__44c9_s_p6_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44c9_s_p6_0[] = { ++static const long _vq_quantmap__44c9_s_p6_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c9_s_p6_0 = { +- _vq_quantthresh__44c9_s_p6_0, +- _vq_quantmap__44c9_s_p6_0, ++static const encode_aux_threshmatch _vq_auxt__44c9_s_p6_0 = { ++ (float *)_vq_quantthresh__44c9_s_p6_0, ++ (long *)_vq_quantmap__44c9_s_p6_0, + 13, + 13 + }; + +-static static_codebook _44c9_s_p6_0 = { ++static const static_codebook _44c9_s_p6_0 = { + 2, 169, +- _vq_lengthlist__44c9_s_p6_0, ++ (long *)_vq_lengthlist__44c9_s_p6_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44c9_s_p6_0, ++ (long *)_vq_quantlist__44c9_s_p6_0, + NULL, +- &_vq_auxt__44c9_s_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c9_s_p6_1[] = { ++static const long _vq_quantlist__44c9_s_p6_1[] = { + 2, + 1, + 3, +@@ -13449,38 +13449,38 @@ + 4, + }; + +-static long _vq_lengthlist__44c9_s_p6_1[] = { ++static const long _vq_lengthlist__44c9_s_p6_1[] = { + 4, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, + }; + +-static float _vq_quantthresh__44c9_s_p6_1[] = { ++static const float _vq_quantthresh__44c9_s_p6_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c9_s_p6_1[] = { ++static const long _vq_quantmap__44c9_s_p6_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c9_s_p6_1 = { +- _vq_quantthresh__44c9_s_p6_1, +- _vq_quantmap__44c9_s_p6_1, ++static const encode_aux_threshmatch _vq_auxt__44c9_s_p6_1 = { ++ (float *)_vq_quantthresh__44c9_s_p6_1, ++ (long *)_vq_quantmap__44c9_s_p6_1, + 5, + 5 + }; + +-static static_codebook _44c9_s_p6_1 = { ++static const static_codebook _44c9_s_p6_1 = { + 2, 25, +- _vq_lengthlist__44c9_s_p6_1, ++ (long *)_vq_lengthlist__44c9_s_p6_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c9_s_p6_1, ++ (long *)_vq_quantlist__44c9_s_p6_1, + NULL, +- &_vq_auxt__44c9_s_p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c9_s_p7_0[] = { ++static const long _vq_quantlist__44c9_s_p7_0[] = { + 6, + 5, + 7, +@@ -13496,7 +13496,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c9_s_p7_0[] = { ++static const long _vq_lengthlist__44c9_s_p7_0[] = { + 2, 4, 4, 6, 6, 7, 7, 8, 8,10,10,11,11, 6, 4, 4, + 6, 6, 8, 8, 9, 9,10,10,12,12, 6, 4, 5, 6, 6, 8, + 8, 9, 9,10,10,12,12,20, 6, 6, 6, 6, 8, 8, 9,10, +@@ -13510,35 +13510,35 @@ + 19,12,12,12,12,13,13,14,14, + }; + +-static float _vq_quantthresh__44c9_s_p7_0[] = { ++static const float _vq_quantthresh__44c9_s_p7_0[] = { + -60.5, -49.5, -38.5, -27.5, -16.5, -5.5, 5.5, 16.5, + 27.5, 38.5, 49.5, 60.5, + }; + +-static long _vq_quantmap__44c9_s_p7_0[] = { ++static const long _vq_quantmap__44c9_s_p7_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c9_s_p7_0 = { +- _vq_quantthresh__44c9_s_p7_0, +- _vq_quantmap__44c9_s_p7_0, ++static const encode_aux_threshmatch _vq_auxt__44c9_s_p7_0 = { ++ (float *)_vq_quantthresh__44c9_s_p7_0, ++ (long *)_vq_quantmap__44c9_s_p7_0, + 13, + 13 + }; + +-static static_codebook _44c9_s_p7_0 = { ++static const static_codebook _44c9_s_p7_0 = { + 2, 169, +- _vq_lengthlist__44c9_s_p7_0, ++ (long *)_vq_lengthlist__44c9_s_p7_0, + 1, -523206656, 1618345984, 4, 0, +- _vq_quantlist__44c9_s_p7_0, ++ (long *)_vq_quantlist__44c9_s_p7_0, + NULL, +- &_vq_auxt__44c9_s_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c9_s_p7_1[] = { ++static const long _vq_quantlist__44c9_s_p7_1[] = { + 5, + 4, + 6, +@@ -13552,7 +13552,7 @@ + 10, + }; + +-static long _vq_lengthlist__44c9_s_p7_1[] = { ++static const long _vq_lengthlist__44c9_s_p7_1[] = { + 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, + 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 7, 7, 7, 7, 7, + 7, 8, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 6, +@@ -13563,35 +13563,35 @@ + 8, 8, 8, 7, 7, 7, 7, 7, 7, + }; + +-static float _vq_quantthresh__44c9_s_p7_1[] = { ++static const float _vq_quantthresh__44c9_s_p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44c9_s_p7_1[] = { ++static const long _vq_quantmap__44c9_s_p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44c9_s_p7_1 = { +- _vq_quantthresh__44c9_s_p7_1, +- _vq_quantmap__44c9_s_p7_1, ++static const encode_aux_threshmatch _vq_auxt__44c9_s_p7_1 = { ++ (float *)_vq_quantthresh__44c9_s_p7_1, ++ (long *)_vq_quantmap__44c9_s_p7_1, + 11, + 11 + }; + +-static static_codebook _44c9_s_p7_1 = { ++static const static_codebook _44c9_s_p7_1 = { + 2, 121, +- _vq_lengthlist__44c9_s_p7_1, ++ (long *)_vq_lengthlist__44c9_s_p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44c9_s_p7_1, ++ (long *)_vq_quantlist__44c9_s_p7_1, + NULL, +- &_vq_auxt__44c9_s_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c9_s_p8_0[] = { ++static const long _vq_quantlist__44c9_s_p8_0[] = { + 7, + 6, + 8, +@@ -13609,7 +13609,7 @@ + 14, + }; + +-static long _vq_lengthlist__44c9_s_p8_0[] = { ++static const long _vq_lengthlist__44c9_s_p8_0[] = { + 1, 4, 4, 7, 6, 8, 8, 8, 8, 9, 9,10,10,11,10, 6, + 5, 5, 7, 7, 9, 9, 8, 9,10,10,11,11,12,12, 6, 5, + 5, 7, 7, 9, 9, 9, 9,10,10,11,11,12,12,21, 7, 8, +@@ -13627,35 +13627,35 @@ + 14, + }; + +-static float _vq_quantthresh__44c9_s_p8_0[] = { ++static const float _vq_quantthresh__44c9_s_p8_0[] = { + -136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, + 31.5, 52.5, 73.5, 94.5, 115.5, 136.5, + }; + +-static long _vq_quantmap__44c9_s_p8_0[] = { ++static const long _vq_quantmap__44c9_s_p8_0[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__44c9_s_p8_0 = { +- _vq_quantthresh__44c9_s_p8_0, +- _vq_quantmap__44c9_s_p8_0, ++static const encode_aux_threshmatch _vq_auxt__44c9_s_p8_0 = { ++ (float *)_vq_quantthresh__44c9_s_p8_0, ++ (long *)_vq_quantmap__44c9_s_p8_0, + 15, + 15 + }; + +-static static_codebook _44c9_s_p8_0 = { ++static const static_codebook _44c9_s_p8_0 = { + 2, 225, +- _vq_lengthlist__44c9_s_p8_0, ++ (long *)_vq_lengthlist__44c9_s_p8_0, + 1, -520986624, 1620377600, 4, 0, +- _vq_quantlist__44c9_s_p8_0, ++ (long *)_vq_quantlist__44c9_s_p8_0, + NULL, +- &_vq_auxt__44c9_s_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c9_s_p8_1[] = { ++static const long _vq_quantlist__44c9_s_p8_1[] = { + 10, + 9, + 11, +@@ -13679,7 +13679,7 @@ + 20, + }; + +-static long _vq_lengthlist__44c9_s_p8_1[] = { ++static const long _vq_lengthlist__44c9_s_p8_1[] = { + 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, +@@ -13710,37 +13710,37 @@ + 9, 9, 9,10, 9, 9, 9, 9, 9, + }; + +-static float _vq_quantthresh__44c9_s_p8_1[] = { ++static const float _vq_quantthresh__44c9_s_p8_1[] = { + -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, + -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, + 6.5, 7.5, 8.5, 9.5, + }; + +-static long _vq_quantmap__44c9_s_p8_1[] = { ++static const long _vq_quantmap__44c9_s_p8_1[] = { + 19, 17, 15, 13, 11, 9, 7, 5, + 3, 1, 0, 2, 4, 6, 8, 10, + 12, 14, 16, 18, 20, + }; + +-static encode_aux_threshmatch _vq_auxt__44c9_s_p8_1 = { +- _vq_quantthresh__44c9_s_p8_1, +- _vq_quantmap__44c9_s_p8_1, ++static const encode_aux_threshmatch _vq_auxt__44c9_s_p8_1 = { ++ (float *)_vq_quantthresh__44c9_s_p8_1, ++ (long *)_vq_quantmap__44c9_s_p8_1, + 21, + 21 + }; + +-static static_codebook _44c9_s_p8_1 = { ++static const static_codebook _44c9_s_p8_1 = { + 2, 441, +- _vq_lengthlist__44c9_s_p8_1, ++ (long *)_vq_lengthlist__44c9_s_p8_1, + 1, -529268736, 1611661312, 5, 0, +- _vq_quantlist__44c9_s_p8_1, ++ (long *)_vq_quantlist__44c9_s_p8_1, + NULL, +- &_vq_auxt__44c9_s_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c9_s_p9_0[] = { ++static const long _vq_quantlist__44c9_s_p9_0[] = { + 9, + 8, + 10, +@@ -13762,7 +13762,7 @@ + 18, + }; + +-static long _vq_lengthlist__44c9_s_p9_0[] = { ++static const long _vq_lengthlist__44c9_s_p9_0[] = { + 1, 4, 3,12,12,12,12,12,12,12,12,12,12,12,12,12, + 12,12,12, 4, 5, 6,12,12,12,12,12,12,12,12,12,12, + 12,12,12,12,12,12, 4, 6, 6,12,12,12,12,12,12,12, +@@ -13788,37 +13788,37 @@ + 11,11,11,11,11,11,11,11,11, + }; + +-static float _vq_quantthresh__44c9_s_p9_0[] = { ++static const float _vq_quantthresh__44c9_s_p9_0[] = { + -7913.5, -6982.5, -6051.5, -5120.5, -4189.5, -3258.5, -2327.5, -1396.5, + -465.5, 465.5, 1396.5, 2327.5, 3258.5, 4189.5, 5120.5, 6051.5, + 6982.5, 7913.5, + }; + +-static long _vq_quantmap__44c9_s_p9_0[] = { ++static const long _vq_quantmap__44c9_s_p9_0[] = { + 17, 15, 13, 11, 9, 7, 5, 3, + 1, 0, 2, 4, 6, 8, 10, 12, + 14, 16, 18, + }; + +-static encode_aux_threshmatch _vq_auxt__44c9_s_p9_0 = { +- _vq_quantthresh__44c9_s_p9_0, +- _vq_quantmap__44c9_s_p9_0, ++static const encode_aux_threshmatch _vq_auxt__44c9_s_p9_0 = { ++ (float *)_vq_quantthresh__44c9_s_p9_0, ++ (long *)_vq_quantmap__44c9_s_p9_0, + 19, + 19 + }; + +-static static_codebook _44c9_s_p9_0 = { ++static const static_codebook _44c9_s_p9_0 = { + 2, 361, +- _vq_lengthlist__44c9_s_p9_0, ++ (long *)_vq_lengthlist__44c9_s_p9_0, + 1, -508535424, 1631393792, 5, 0, +- _vq_quantlist__44c9_s_p9_0, ++ (long *)_vq_quantlist__44c9_s_p9_0, + NULL, +- &_vq_auxt__44c9_s_p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c9_s_p9_1[] = { ++static const long _vq_quantlist__44c9_s_p9_1[] = { + 9, + 8, + 10, +@@ -13840,7 +13840,7 @@ + 18, + }; + +-static long _vq_lengthlist__44c9_s_p9_1[] = { ++static const long _vq_lengthlist__44c9_s_p9_1[] = { + 1, 4, 4, 7, 7, 7, 7, 8, 7, 9, 8, 9, 9,10,10,11, + 11,11,11, 6, 5, 5, 8, 8, 9, 9, 9, 8,10, 9,11,10, + 12,12,13,12,13,13, 5, 5, 5, 8, 8, 9, 9, 9, 9,10, +@@ -13866,37 +13866,37 @@ + 13,13,13,14,13,14,15,15,15, + }; + +-static float _vq_quantthresh__44c9_s_p9_1[] = { ++static const float _vq_quantthresh__44c9_s_p9_1[] = { + -416.5, -367.5, -318.5, -269.5, -220.5, -171.5, -122.5, -73.5, + -24.5, 24.5, 73.5, 122.5, 171.5, 220.5, 269.5, 318.5, + 367.5, 416.5, + }; + +-static long _vq_quantmap__44c9_s_p9_1[] = { ++static const long _vq_quantmap__44c9_s_p9_1[] = { + 17, 15, 13, 11, 9, 7, 5, 3, + 1, 0, 2, 4, 6, 8, 10, 12, + 14, 16, 18, + }; + +-static encode_aux_threshmatch _vq_auxt__44c9_s_p9_1 = { +- _vq_quantthresh__44c9_s_p9_1, +- _vq_quantmap__44c9_s_p9_1, ++static const encode_aux_threshmatch _vq_auxt__44c9_s_p9_1 = { ++ (float *)_vq_quantthresh__44c9_s_p9_1, ++ (long *)_vq_quantmap__44c9_s_p9_1, + 19, + 19 + }; + +-static static_codebook _44c9_s_p9_1 = { ++static const static_codebook _44c9_s_p9_1 = { + 2, 361, +- _vq_lengthlist__44c9_s_p9_1, ++ (long *)_vq_lengthlist__44c9_s_p9_1, + 1, -518287360, 1622704128, 5, 0, +- _vq_quantlist__44c9_s_p9_1, ++ (long *)_vq_quantlist__44c9_s_p9_1, + NULL, +- &_vq_auxt__44c9_s_p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c9_s_p9_2[] = { ++static const long _vq_quantlist__44c9_s_p9_2[] = { + 24, + 23, + 25, +@@ -13948,14 +13948,14 @@ + 48, + }; + +-static long _vq_lengthlist__44c9_s_p9_2[] = { ++static const long _vq_lengthlist__44c9_s_p9_2[] = { + 2, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, + }; + +-static float _vq_quantthresh__44c9_s_p9_2[] = { ++static const float _vq_quantthresh__44c9_s_p9_2[] = { + -23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, + -15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, +@@ -13964,7 +13964,7 @@ + 16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, + }; + +-static long _vq_quantmap__44c9_s_p9_2[] = { ++static const long _vq_quantmap__44c9_s_p9_2[] = { + 47, 45, 43, 41, 39, 37, 35, 33, + 31, 29, 27, 25, 23, 21, 19, 17, + 15, 13, 11, 9, 7, 5, 3, 1, +@@ -13974,25 +13974,25 @@ + 48, + }; + +-static encode_aux_threshmatch _vq_auxt__44c9_s_p9_2 = { +- _vq_quantthresh__44c9_s_p9_2, +- _vq_quantmap__44c9_s_p9_2, ++static const encode_aux_threshmatch _vq_auxt__44c9_s_p9_2 = { ++ (float *)_vq_quantthresh__44c9_s_p9_2, ++ (long *)_vq_quantmap__44c9_s_p9_2, + 49, + 49 + }; + +-static static_codebook _44c9_s_p9_2 = { ++static const static_codebook _44c9_s_p9_2 = { + 1, 49, +- _vq_lengthlist__44c9_s_p9_2, ++ (long *)_vq_lengthlist__44c9_s_p9_2, + 1, -526909440, 1611661312, 6, 0, +- _vq_quantlist__44c9_s_p9_2, ++ (long *)_vq_quantlist__44c9_s_p9_2, + NULL, +- &_vq_auxt__44c9_s_p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44c9_s_p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44c9_s_short[] = { ++static const long _huff_lengthlist__44c9_s_short[] = { + 5,13,18,16,17,17,19,18,19,19, 5, 7,10,11,12,12, + 13,16,17,18, 6, 6, 7, 7, 9, 9,10,14,17,19, 8, 7, + 6, 5, 6, 7, 9,12,19,17, 8, 7, 7, 6, 5, 6, 8,11, +@@ -14002,9 +14002,9 @@ + 9, 8,10,13, + }; + +-static static_codebook _huff_book__44c9_s_short = { ++static const static_codebook _huff_book__44c9_s_short = { + 2, 100, +- _huff_lengthlist__44c9_s_short, ++ (long *)_huff_lengthlist__44c9_s_short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -14013,7 +14013,7 @@ + 0 + }; + +-static long _huff_lengthlist__44c0_s_long[] = { ++static const long _huff_lengthlist__44c0_s_long[] = { + 5, 4, 8, 9, 8, 9,10,12,15, 4, 1, 5, 5, 6, 8,11, + 12,12, 8, 5, 8, 9, 9,11,13,12,12, 9, 5, 8, 5, 7, + 9,12,13,13, 8, 6, 8, 7, 7, 9,11,11,11, 9, 7, 9, +@@ -14022,9 +14022,9 @@ + 12, + }; + +-static static_codebook _huff_book__44c0_s_long = { ++static const static_codebook _huff_book__44c0_s_long = { + 2, 81, +- _huff_lengthlist__44c0_s_long, ++ (long *)_huff_lengthlist__44c0_s_long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -14033,13 +14033,13 @@ + 0 + }; + +-static long _vq_quantlist__44c0_s_p1_0[] = { ++static const long _vq_quantlist__44c0_s_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c0_s_p1_0[] = { ++static const long _vq_lengthlist__44c0_s_p1_0[] = { + 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, + 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -14453,33 +14453,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c0_s_p1_0[] = { ++static const float _vq_quantthresh__44c0_s_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44c0_s_p1_0[] = { ++static const long _vq_quantmap__44c0_s_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_s_p1_0 = { +- _vq_quantthresh__44c0_s_p1_0, +- _vq_quantmap__44c0_s_p1_0, ++static const encode_aux_threshmatch _vq_auxt__44c0_s_p1_0 = { ++ (float *)_vq_quantthresh__44c0_s_p1_0, ++ (long *)_vq_quantmap__44c0_s_p1_0, + 3, + 3 + }; + +-static static_codebook _44c0_s_p1_0 = { ++static const static_codebook _44c0_s_p1_0 = { + 8, 6561, +- _vq_lengthlist__44c0_s_p1_0, ++ (long *)_vq_lengthlist__44c0_s_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44c0_s_p1_0, ++ (long *)_vq_quantlist__44c0_s_p1_0, + NULL, +- &_vq_auxt__44c0_s_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_s_p2_0[] = { ++static const long _vq_quantlist__44c0_s_p2_0[] = { + 2, + 1, + 3, +@@ -14487,7 +14487,7 @@ + 4, + }; + +-static long _vq_lengthlist__44c0_s_p2_0[] = { ++static const long _vq_lengthlist__44c0_s_p2_0[] = { + 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -14530,33 +14530,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c0_s_p2_0[] = { ++static const float _vq_quantthresh__44c0_s_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c0_s_p2_0[] = { ++static const long _vq_quantmap__44c0_s_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_s_p2_0 = { +- _vq_quantthresh__44c0_s_p2_0, +- _vq_quantmap__44c0_s_p2_0, ++static const encode_aux_threshmatch _vq_auxt__44c0_s_p2_0 = { ++ (float *)_vq_quantthresh__44c0_s_p2_0, ++ (long *)_vq_quantmap__44c0_s_p2_0, + 5, + 5 + }; + +-static static_codebook _44c0_s_p2_0 = { ++static const static_codebook _44c0_s_p2_0 = { + 4, 625, +- _vq_lengthlist__44c0_s_p2_0, ++ (long *)_vq_lengthlist__44c0_s_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c0_s_p2_0, ++ (long *)_vq_quantlist__44c0_s_p2_0, + NULL, +- &_vq_auxt__44c0_s_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_s_p3_0[] = { ++static const long _vq_quantlist__44c0_s_p3_0[] = { + 4, + 3, + 5, +@@ -14568,7 +14568,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c0_s_p3_0[] = { ++static const long _vq_lengthlist__44c0_s_p3_0[] = { + 1, 3, 2, 8, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, + 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, + 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, +@@ -14577,34 +14577,34 @@ + 0, + }; + +-static float _vq_quantthresh__44c0_s_p3_0[] = { ++static const float _vq_quantthresh__44c0_s_p3_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c0_s_p3_0[] = { ++static const long _vq_quantmap__44c0_s_p3_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_s_p3_0 = { +- _vq_quantthresh__44c0_s_p3_0, +- _vq_quantmap__44c0_s_p3_0, ++static const encode_aux_threshmatch _vq_auxt__44c0_s_p3_0 = { ++ (float *)_vq_quantthresh__44c0_s_p3_0, ++ (long *)_vq_quantmap__44c0_s_p3_0, + 9, + 9 + }; + +-static static_codebook _44c0_s_p3_0 = { ++static const static_codebook _44c0_s_p3_0 = { + 2, 81, +- _vq_lengthlist__44c0_s_p3_0, ++ (long *)_vq_lengthlist__44c0_s_p3_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c0_s_p3_0, ++ (long *)_vq_quantlist__44c0_s_p3_0, + NULL, +- &_vq_auxt__44c0_s_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_s_p4_0[] = { ++static const long _vq_quantlist__44c0_s_p4_0[] = { + 4, + 3, + 5, +@@ -14616,7 +14616,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c0_s_p4_0[] = { ++static const long _vq_lengthlist__44c0_s_p4_0[] = { + 1, 3, 3, 6, 6, 6, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7, + 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 7, 7, + 7, 8, 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, +@@ -14625,34 +14625,34 @@ + 10, + }; + +-static float _vq_quantthresh__44c0_s_p4_0[] = { ++static const float _vq_quantthresh__44c0_s_p4_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c0_s_p4_0[] = { ++static const long _vq_quantmap__44c0_s_p4_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_s_p4_0 = { +- _vq_quantthresh__44c0_s_p4_0, +- _vq_quantmap__44c0_s_p4_0, ++static const encode_aux_threshmatch _vq_auxt__44c0_s_p4_0 = { ++ (float *)_vq_quantthresh__44c0_s_p4_0, ++ (long *)_vq_quantmap__44c0_s_p4_0, + 9, + 9 + }; + +-static static_codebook _44c0_s_p4_0 = { ++static const static_codebook _44c0_s_p4_0 = { + 2, 81, +- _vq_lengthlist__44c0_s_p4_0, ++ (long *)_vq_lengthlist__44c0_s_p4_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c0_s_p4_0, ++ (long *)_vq_quantlist__44c0_s_p4_0, + NULL, +- &_vq_auxt__44c0_s_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_s_p5_0[] = { ++static const long _vq_quantlist__44c0_s_p5_0[] = { + 8, + 7, + 9, +@@ -14672,7 +14672,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c0_s_p5_0[] = { ++static const long _vq_lengthlist__44c0_s_p5_0[] = { + 1, 4, 3, 6, 6, 8, 7, 8, 8, 8, 8, 9, 9,10,10,11, + 11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9, 9,10,10,10, + 11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, +@@ -14694,42 +14694,42 @@ + 14, + }; + +-static float _vq_quantthresh__44c0_s_p5_0[] = { ++static const float _vq_quantthresh__44c0_s_p5_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c0_s_p5_0[] = { ++static const long _vq_quantmap__44c0_s_p5_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_s_p5_0 = { +- _vq_quantthresh__44c0_s_p5_0, +- _vq_quantmap__44c0_s_p5_0, ++static const encode_aux_threshmatch _vq_auxt__44c0_s_p5_0 = { ++ (float *)_vq_quantthresh__44c0_s_p5_0, ++ (long *)_vq_quantmap__44c0_s_p5_0, + 17, + 17 + }; + +-static static_codebook _44c0_s_p5_0 = { ++static const static_codebook _44c0_s_p5_0 = { + 2, 289, +- _vq_lengthlist__44c0_s_p5_0, ++ (long *)_vq_lengthlist__44c0_s_p5_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c0_s_p5_0, ++ (long *)_vq_quantlist__44c0_s_p5_0, + NULL, +- &_vq_auxt__44c0_s_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_s_p6_0[] = { ++static const long _vq_quantlist__44c0_s_p6_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c0_s_p6_0[] = { ++static const long _vq_lengthlist__44c0_s_p6_0[] = { + 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,10, + 9, 9, 4, 6, 7,10, 9, 9,11, 9, 9, 7,10,10,11,11, + 11,12,10,11, 6, 9, 9,11,10,11,11,10,10, 6, 9, 9, +@@ -14738,33 +14738,33 @@ + 10, + }; + +-static float _vq_quantthresh__44c0_s_p6_0[] = { ++static const float _vq_quantthresh__44c0_s_p6_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44c0_s_p6_0[] = { ++static const long _vq_quantmap__44c0_s_p6_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_s_p6_0 = { +- _vq_quantthresh__44c0_s_p6_0, +- _vq_quantmap__44c0_s_p6_0, ++static const encode_aux_threshmatch _vq_auxt__44c0_s_p6_0 = { ++ (float *)_vq_quantthresh__44c0_s_p6_0, ++ (long *)_vq_quantmap__44c0_s_p6_0, + 3, + 3 + }; + +-static static_codebook _44c0_s_p6_0 = { ++static const static_codebook _44c0_s_p6_0 = { + 4, 81, +- _vq_lengthlist__44c0_s_p6_0, ++ (long *)_vq_lengthlist__44c0_s_p6_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44c0_s_p6_0, ++ (long *)_vq_quantlist__44c0_s_p6_0, + NULL, +- &_vq_auxt__44c0_s_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_s_p6_1[] = { ++static const long _vq_quantlist__44c0_s_p6_1[] = { + 5, + 4, + 6, +@@ -14778,7 +14778,7 @@ + 10, + }; + +-static long _vq_lengthlist__44c0_s_p6_1[] = { ++static const long _vq_lengthlist__44c0_s_p6_1[] = { + 2, 3, 3, 6, 6, 7, 7, 7, 7, 7, 8,10,10,10, 6, 6, + 7, 7, 8, 8, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8, + 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, +@@ -14789,35 +14789,35 @@ + 10,10,10, 8, 8, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__44c0_s_p6_1[] = { ++static const float _vq_quantthresh__44c0_s_p6_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44c0_s_p6_1[] = { ++static const long _vq_quantmap__44c0_s_p6_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_s_p6_1 = { +- _vq_quantthresh__44c0_s_p6_1, +- _vq_quantmap__44c0_s_p6_1, ++static const encode_aux_threshmatch _vq_auxt__44c0_s_p6_1 = { ++ (float *)_vq_quantthresh__44c0_s_p6_1, ++ (long *)_vq_quantmap__44c0_s_p6_1, + 11, + 11 + }; + +-static static_codebook _44c0_s_p6_1 = { ++static const static_codebook _44c0_s_p6_1 = { + 2, 121, +- _vq_lengthlist__44c0_s_p6_1, ++ (long *)_vq_lengthlist__44c0_s_p6_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44c0_s_p6_1, ++ (long *)_vq_quantlist__44c0_s_p6_1, + NULL, +- &_vq_auxt__44c0_s_p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_s_p7_0[] = { ++static const long _vq_quantlist__44c0_s_p7_0[] = { + 6, + 5, + 7, +@@ -14833,7 +14833,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c0_s_p7_0[] = { ++static const long _vq_lengthlist__44c0_s_p7_0[] = { + 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 7, 5, 5, + 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 6, 7, 7, 8, + 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, +@@ -14847,35 +14847,35 @@ + 0,12,12,11,11,12,12,13,13, + }; + +-static float _vq_quantthresh__44c0_s_p7_0[] = { ++static const float _vq_quantthresh__44c0_s_p7_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44c0_s_p7_0[] = { ++static const long _vq_quantmap__44c0_s_p7_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_s_p7_0 = { +- _vq_quantthresh__44c0_s_p7_0, +- _vq_quantmap__44c0_s_p7_0, ++static const encode_aux_threshmatch _vq_auxt__44c0_s_p7_0 = { ++ (float *)_vq_quantthresh__44c0_s_p7_0, ++ (long *)_vq_quantmap__44c0_s_p7_0, + 13, + 13 + }; + +-static static_codebook _44c0_s_p7_0 = { ++static const static_codebook _44c0_s_p7_0 = { + 2, 169, +- _vq_lengthlist__44c0_s_p7_0, ++ (long *)_vq_lengthlist__44c0_s_p7_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44c0_s_p7_0, ++ (long *)_vq_quantlist__44c0_s_p7_0, + NULL, +- &_vq_auxt__44c0_s_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_s_p7_1[] = { ++static const long _vq_quantlist__44c0_s_p7_1[] = { + 2, + 1, + 3, +@@ -14883,38 +14883,38 @@ + 4, + }; + +-static long _vq_lengthlist__44c0_s_p7_1[] = { ++static const long _vq_lengthlist__44c0_s_p7_1[] = { + 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, + 6, 6, 5, 5, 6, 6, 6, 5, 5, + }; + +-static float _vq_quantthresh__44c0_s_p7_1[] = { ++static const float _vq_quantthresh__44c0_s_p7_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c0_s_p7_1[] = { ++static const long _vq_quantmap__44c0_s_p7_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_s_p7_1 = { +- _vq_quantthresh__44c0_s_p7_1, +- _vq_quantmap__44c0_s_p7_1, ++static const encode_aux_threshmatch _vq_auxt__44c0_s_p7_1 = { ++ (float *)_vq_quantthresh__44c0_s_p7_1, ++ (long *)_vq_quantmap__44c0_s_p7_1, + 5, + 5 + }; + +-static static_codebook _44c0_s_p7_1 = { ++static const static_codebook _44c0_s_p7_1 = { + 2, 25, +- _vq_lengthlist__44c0_s_p7_1, ++ (long *)_vq_lengthlist__44c0_s_p7_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c0_s_p7_1, ++ (long *)_vq_quantlist__44c0_s_p7_1, + NULL, +- &_vq_auxt__44c0_s_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_s_p8_0[] = { ++static const long _vq_quantlist__44c0_s_p8_0[] = { + 2, + 1, + 3, +@@ -14922,7 +14922,7 @@ + 4, + }; + +-static long _vq_lengthlist__44c0_s_p8_0[] = { ++static const long _vq_lengthlist__44c0_s_p8_0[] = { + 1, 5, 5,10,10, 6, 9, 8,10,10, 6,10, 9,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, +@@ -14965,33 +14965,33 @@ + 11, + }; + +-static float _vq_quantthresh__44c0_s_p8_0[] = { ++static const float _vq_quantthresh__44c0_s_p8_0[] = { + -331.5, -110.5, 110.5, 331.5, + }; + +-static long _vq_quantmap__44c0_s_p8_0[] = { ++static const long _vq_quantmap__44c0_s_p8_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_s_p8_0 = { +- _vq_quantthresh__44c0_s_p8_0, +- _vq_quantmap__44c0_s_p8_0, ++static const encode_aux_threshmatch _vq_auxt__44c0_s_p8_0 = { ++ (float *)_vq_quantthresh__44c0_s_p8_0, ++ (long *)_vq_quantmap__44c0_s_p8_0, + 5, + 5 + }; + +-static static_codebook _44c0_s_p8_0 = { ++static const static_codebook _44c0_s_p8_0 = { + 4, 625, +- _vq_lengthlist__44c0_s_p8_0, ++ (long *)_vq_lengthlist__44c0_s_p8_0, + 1, -518283264, 1627103232, 3, 0, +- _vq_quantlist__44c0_s_p8_0, ++ (long *)_vq_quantlist__44c0_s_p8_0, + NULL, +- &_vq_auxt__44c0_s_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_s_p8_1[] = { ++static const long _vq_quantlist__44c0_s_p8_1[] = { + 6, + 5, + 7, +@@ -15007,7 +15007,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c0_s_p8_1[] = { ++static const long _vq_lengthlist__44c0_s_p8_1[] = { + 1, 4, 4, 6, 6, 7, 7, 9, 9,11,12,13,12, 6, 5, 5, + 7, 7, 8, 8,10, 9,12,12,12,12, 6, 5, 5, 7, 7, 8, + 8,10, 9,12,11,11,13,16, 7, 7, 8, 8, 9, 9,10,10, +@@ -15021,35 +15021,35 @@ + 16,13,13,12,12,14,14,15,13, + }; + +-static float _vq_quantthresh__44c0_s_p8_1[] = { ++static const float _vq_quantthresh__44c0_s_p8_1[] = { + -93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, 25.5, + 42.5, 59.5, 76.5, 93.5, + }; + +-static long _vq_quantmap__44c0_s_p8_1[] = { ++static const long _vq_quantmap__44c0_s_p8_1[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_s_p8_1 = { +- _vq_quantthresh__44c0_s_p8_1, +- _vq_quantmap__44c0_s_p8_1, ++static const encode_aux_threshmatch _vq_auxt__44c0_s_p8_1 = { ++ (float *)_vq_quantthresh__44c0_s_p8_1, ++ (long *)_vq_quantmap__44c0_s_p8_1, + 13, + 13 + }; + +-static static_codebook _44c0_s_p8_1 = { ++static const static_codebook _44c0_s_p8_1 = { + 2, 169, +- _vq_lengthlist__44c0_s_p8_1, ++ (long *)_vq_lengthlist__44c0_s_p8_1, + 1, -522616832, 1620115456, 4, 0, +- _vq_quantlist__44c0_s_p8_1, ++ (long *)_vq_quantlist__44c0_s_p8_1, + NULL, +- &_vq_auxt__44c0_s_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_s_p8_2[] = { ++static const long _vq_quantlist__44c0_s_p8_2[] = { + 8, + 7, + 9, +@@ -15069,7 +15069,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c0_s_p8_2[] = { ++static const long _vq_lengthlist__44c0_s_p8_2[] = { + 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, + 8,10,10,10, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9, + 9, 9,10,10,10, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, +@@ -15091,36 +15091,36 @@ + 10, + }; + +-static float _vq_quantthresh__44c0_s_p8_2[] = { ++static const float _vq_quantthresh__44c0_s_p8_2[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c0_s_p8_2[] = { ++static const long _vq_quantmap__44c0_s_p8_2[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_s_p8_2 = { +- _vq_quantthresh__44c0_s_p8_2, +- _vq_quantmap__44c0_s_p8_2, ++static const encode_aux_threshmatch _vq_auxt__44c0_s_p8_2 = { ++ (float *)_vq_quantthresh__44c0_s_p8_2, ++ (long *)_vq_quantmap__44c0_s_p8_2, + 17, + 17 + }; + +-static static_codebook _44c0_s_p8_2 = { ++static const static_codebook _44c0_s_p8_2 = { + 2, 289, +- _vq_lengthlist__44c0_s_p8_2, ++ (long *)_vq_lengthlist__44c0_s_p8_2, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c0_s_p8_2, ++ (long *)_vq_quantlist__44c0_s_p8_2, + NULL, +- &_vq_auxt__44c0_s_p8_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_s_p8_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44c0_s_short[] = { ++static const long _huff_lengthlist__44c0_s_short[] = { + 9, 8,12,11,12,13,14,14,16, 6, 1, 5, 6, 6, 9,12, + 14,17, 9, 4, 5, 9, 7, 9,13,15,16, 8, 5, 8, 6, 8, + 10,13,17,17, 9, 6, 7, 7, 8, 9,13,15,17,11, 8, 9, +@@ -15129,9 +15129,9 @@ + 12, + }; + +-static static_codebook _huff_book__44c0_s_short = { ++static const static_codebook _huff_book__44c0_s_short = { + 2, 81, +- _huff_lengthlist__44c0_s_short, ++ (long *)_huff_lengthlist__44c0_s_short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -15140,7 +15140,7 @@ + 0 + }; + +-static long _huff_lengthlist__44c0_sm_long[] = { ++static const long _huff_lengthlist__44c0_sm_long[] = { + 5, 4, 9,10, 9,10,11,12,13, 4, 1, 5, 7, 7, 9,11, + 12,14, 8, 5, 7, 9, 8,10,13,13,13,10, 7, 9, 4, 6, + 7,10,12,14, 9, 6, 7, 6, 6, 7,10,12,12, 9, 8, 9, +@@ -15149,9 +15149,9 @@ + 13, + }; + +-static static_codebook _huff_book__44c0_sm_long = { ++static const static_codebook _huff_book__44c0_sm_long = { + 2, 81, +- _huff_lengthlist__44c0_sm_long, ++ (long *)_huff_lengthlist__44c0_sm_long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -15160,13 +15160,13 @@ + 0 + }; + +-static long _vq_quantlist__44c0_sm_p1_0[] = { ++static const long _vq_quantlist__44c0_sm_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c0_sm_p1_0[] = { ++static const long _vq_lengthlist__44c0_sm_p1_0[] = { + 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, + 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -15580,33 +15580,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c0_sm_p1_0[] = { ++static const float _vq_quantthresh__44c0_sm_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44c0_sm_p1_0[] = { ++static const long _vq_quantmap__44c0_sm_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_sm_p1_0 = { +- _vq_quantthresh__44c0_sm_p1_0, +- _vq_quantmap__44c0_sm_p1_0, ++static const encode_aux_threshmatch _vq_auxt__44c0_sm_p1_0 = { ++ (float *)_vq_quantthresh__44c0_sm_p1_0, ++ (long *)_vq_quantmap__44c0_sm_p1_0, + 3, + 3 + }; + +-static static_codebook _44c0_sm_p1_0 = { ++static const static_codebook _44c0_sm_p1_0 = { + 8, 6561, +- _vq_lengthlist__44c0_sm_p1_0, ++ (long *)_vq_lengthlist__44c0_sm_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44c0_sm_p1_0, ++ (long *)_vq_quantlist__44c0_sm_p1_0, + NULL, +- &_vq_auxt__44c0_sm_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_sm_p2_0[] = { ++static const long _vq_quantlist__44c0_sm_p2_0[] = { + 2, + 1, + 3, +@@ -15614,7 +15614,7 @@ + 4, + }; + +-static long _vq_lengthlist__44c0_sm_p2_0[] = { ++static const long _vq_lengthlist__44c0_sm_p2_0[] = { + 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -15657,33 +15657,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c0_sm_p2_0[] = { ++static const float _vq_quantthresh__44c0_sm_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c0_sm_p2_0[] = { ++static const long _vq_quantmap__44c0_sm_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_sm_p2_0 = { +- _vq_quantthresh__44c0_sm_p2_0, +- _vq_quantmap__44c0_sm_p2_0, ++static const encode_aux_threshmatch _vq_auxt__44c0_sm_p2_0 = { ++ (float *)_vq_quantthresh__44c0_sm_p2_0, ++ (long *)_vq_quantmap__44c0_sm_p2_0, + 5, + 5 + }; + +-static static_codebook _44c0_sm_p2_0 = { ++static const static_codebook _44c0_sm_p2_0 = { + 4, 625, +- _vq_lengthlist__44c0_sm_p2_0, ++ (long *)_vq_lengthlist__44c0_sm_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c0_sm_p2_0, ++ (long *)_vq_quantlist__44c0_sm_p2_0, + NULL, +- &_vq_auxt__44c0_sm_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_sm_p3_0[] = { ++static const long _vq_quantlist__44c0_sm_p3_0[] = { + 4, + 3, + 5, +@@ -15695,7 +15695,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c0_sm_p3_0[] = { ++static const long _vq_lengthlist__44c0_sm_p3_0[] = { + 1, 3, 3, 7, 7, 0, 0, 0, 0, 0, 5, 4, 7, 7, 0, 0, + 0, 0, 0, 5, 5, 7, 7, 0, 0, 0, 0, 0, 6, 7, 8, 8, + 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, +@@ -15704,34 +15704,34 @@ + 0, + }; + +-static float _vq_quantthresh__44c0_sm_p3_0[] = { ++static const float _vq_quantthresh__44c0_sm_p3_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c0_sm_p3_0[] = { ++static const long _vq_quantmap__44c0_sm_p3_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_sm_p3_0 = { +- _vq_quantthresh__44c0_sm_p3_0, +- _vq_quantmap__44c0_sm_p3_0, ++static const encode_aux_threshmatch _vq_auxt__44c0_sm_p3_0 = { ++ (float *)_vq_quantthresh__44c0_sm_p3_0, ++ (long *)_vq_quantmap__44c0_sm_p3_0, + 9, + 9 + }; + +-static static_codebook _44c0_sm_p3_0 = { ++static const static_codebook _44c0_sm_p3_0 = { + 2, 81, +- _vq_lengthlist__44c0_sm_p3_0, ++ (long *)_vq_lengthlist__44c0_sm_p3_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c0_sm_p3_0, ++ (long *)_vq_quantlist__44c0_sm_p3_0, + NULL, +- &_vq_auxt__44c0_sm_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_sm_p4_0[] = { ++static const long _vq_quantlist__44c0_sm_p4_0[] = { + 4, + 3, + 5, +@@ -15743,7 +15743,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c0_sm_p4_0[] = { ++static const long _vq_lengthlist__44c0_sm_p4_0[] = { + 1, 4, 3, 6, 6, 7, 7, 9, 9, 0, 5, 5, 7, 7, 8, 7, + 9, 9, 0, 5, 5, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 8, + 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, +@@ -15752,34 +15752,34 @@ + 11, + }; + +-static float _vq_quantthresh__44c0_sm_p4_0[] = { ++static const float _vq_quantthresh__44c0_sm_p4_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c0_sm_p4_0[] = { ++static const long _vq_quantmap__44c0_sm_p4_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_sm_p4_0 = { +- _vq_quantthresh__44c0_sm_p4_0, +- _vq_quantmap__44c0_sm_p4_0, ++static const encode_aux_threshmatch _vq_auxt__44c0_sm_p4_0 = { ++ (float *)_vq_quantthresh__44c0_sm_p4_0, ++ (long *)_vq_quantmap__44c0_sm_p4_0, + 9, + 9 + }; + +-static static_codebook _44c0_sm_p4_0 = { ++static const static_codebook _44c0_sm_p4_0 = { + 2, 81, +- _vq_lengthlist__44c0_sm_p4_0, ++ (long *)_vq_lengthlist__44c0_sm_p4_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c0_sm_p4_0, ++ (long *)_vq_quantlist__44c0_sm_p4_0, + NULL, +- &_vq_auxt__44c0_sm_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_sm_p5_0[] = { ++static const long _vq_quantlist__44c0_sm_p5_0[] = { + 8, + 7, + 9, +@@ -15799,7 +15799,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c0_sm_p5_0[] = { ++static const long _vq_lengthlist__44c0_sm_p5_0[] = { + 1, 4, 4, 6, 6, 8, 8, 8, 8, 8, 8, 9, 9,10,10,11, + 11, 0, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,11, + 11,11, 0, 5, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, +@@ -15821,42 +15821,42 @@ + 14, + }; + +-static float _vq_quantthresh__44c0_sm_p5_0[] = { ++static const float _vq_quantthresh__44c0_sm_p5_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c0_sm_p5_0[] = { ++static const long _vq_quantmap__44c0_sm_p5_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_sm_p5_0 = { +- _vq_quantthresh__44c0_sm_p5_0, +- _vq_quantmap__44c0_sm_p5_0, ++static const encode_aux_threshmatch _vq_auxt__44c0_sm_p5_0 = { ++ (float *)_vq_quantthresh__44c0_sm_p5_0, ++ (long *)_vq_quantmap__44c0_sm_p5_0, + 17, + 17 + }; + +-static static_codebook _44c0_sm_p5_0 = { ++static const static_codebook _44c0_sm_p5_0 = { + 2, 289, +- _vq_lengthlist__44c0_sm_p5_0, ++ (long *)_vq_lengthlist__44c0_sm_p5_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c0_sm_p5_0, ++ (long *)_vq_quantlist__44c0_sm_p5_0, + NULL, +- &_vq_auxt__44c0_sm_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_sm_p6_0[] = { ++static const long _vq_quantlist__44c0_sm_p6_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c0_sm_p6_0[] = { ++static const long _vq_lengthlist__44c0_sm_p6_0[] = { + 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, + 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,10,11, + 11,11,10,10, 6, 9, 9,11,11,10,11,10,10, 6, 9, 9, +@@ -15865,33 +15865,33 @@ + 11, + }; + +-static float _vq_quantthresh__44c0_sm_p6_0[] = { ++static const float _vq_quantthresh__44c0_sm_p6_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44c0_sm_p6_0[] = { ++static const long _vq_quantmap__44c0_sm_p6_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_sm_p6_0 = { +- _vq_quantthresh__44c0_sm_p6_0, +- _vq_quantmap__44c0_sm_p6_0, ++static const encode_aux_threshmatch _vq_auxt__44c0_sm_p6_0 = { ++ (float *)_vq_quantthresh__44c0_sm_p6_0, ++ (long *)_vq_quantmap__44c0_sm_p6_0, + 3, + 3 + }; + +-static static_codebook _44c0_sm_p6_0 = { ++static const static_codebook _44c0_sm_p6_0 = { + 4, 81, +- _vq_lengthlist__44c0_sm_p6_0, ++ (long *)_vq_lengthlist__44c0_sm_p6_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44c0_sm_p6_0, ++ (long *)_vq_quantlist__44c0_sm_p6_0, + NULL, +- &_vq_auxt__44c0_sm_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_sm_p6_1[] = { ++static const long _vq_quantlist__44c0_sm_p6_1[] = { + 5, + 4, + 6, +@@ -15905,7 +15905,7 @@ + 10, + }; + +-static long _vq_lengthlist__44c0_sm_p6_1[] = { ++static const long _vq_lengthlist__44c0_sm_p6_1[] = { + 2, 4, 4, 6, 6, 7, 7, 7, 7, 7, 8, 9, 5, 5, 6, 6, + 7, 7, 8, 8, 8, 8, 9, 5, 5, 6, 6, 7, 7, 8, 8, 8, + 8,10, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, +@@ -15916,35 +15916,35 @@ + 10,10,10, 8, 8, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__44c0_sm_p6_1[] = { ++static const float _vq_quantthresh__44c0_sm_p6_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44c0_sm_p6_1[] = { ++static const long _vq_quantmap__44c0_sm_p6_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_sm_p6_1 = { +- _vq_quantthresh__44c0_sm_p6_1, +- _vq_quantmap__44c0_sm_p6_1, ++static const encode_aux_threshmatch _vq_auxt__44c0_sm_p6_1 = { ++ (float *)_vq_quantthresh__44c0_sm_p6_1, ++ (long *)_vq_quantmap__44c0_sm_p6_1, + 11, + 11 + }; + +-static static_codebook _44c0_sm_p6_1 = { ++static const static_codebook _44c0_sm_p6_1 = { + 2, 121, +- _vq_lengthlist__44c0_sm_p6_1, ++ (long *)_vq_lengthlist__44c0_sm_p6_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44c0_sm_p6_1, ++ (long *)_vq_quantlist__44c0_sm_p6_1, + NULL, +- &_vq_auxt__44c0_sm_p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_sm_p7_0[] = { ++static const long _vq_quantlist__44c0_sm_p7_0[] = { + 6, + 5, + 7, +@@ -15960,7 +15960,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c0_sm_p7_0[] = { ++static const long _vq_lengthlist__44c0_sm_p7_0[] = { + 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 7, 5, 5, + 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 6, 5, 7, 7, 8, + 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, +@@ -15974,35 +15974,35 @@ + 0,12,12,11,11,13,12,14,14, + }; + +-static float _vq_quantthresh__44c0_sm_p7_0[] = { ++static const float _vq_quantthresh__44c0_sm_p7_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44c0_sm_p7_0[] = { ++static const long _vq_quantmap__44c0_sm_p7_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_sm_p7_0 = { +- _vq_quantthresh__44c0_sm_p7_0, +- _vq_quantmap__44c0_sm_p7_0, ++static const encode_aux_threshmatch _vq_auxt__44c0_sm_p7_0 = { ++ (float *)_vq_quantthresh__44c0_sm_p7_0, ++ (long *)_vq_quantmap__44c0_sm_p7_0, + 13, + 13 + }; + +-static static_codebook _44c0_sm_p7_0 = { ++static const static_codebook _44c0_sm_p7_0 = { + 2, 169, +- _vq_lengthlist__44c0_sm_p7_0, ++ (long *)_vq_lengthlist__44c0_sm_p7_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44c0_sm_p7_0, ++ (long *)_vq_quantlist__44c0_sm_p7_0, + NULL, +- &_vq_auxt__44c0_sm_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_sm_p7_1[] = { ++static const long _vq_quantlist__44c0_sm_p7_1[] = { + 2, + 1, + 3, +@@ -16010,38 +16010,38 @@ + 4, + }; + +-static long _vq_lengthlist__44c0_sm_p7_1[] = { ++static const long _vq_lengthlist__44c0_sm_p7_1[] = { + 2, 4, 4, 4, 4, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, + 6, 6, 5, 5, 6, 6, 6, 5, 5, + }; + +-static float _vq_quantthresh__44c0_sm_p7_1[] = { ++static const float _vq_quantthresh__44c0_sm_p7_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c0_sm_p7_1[] = { ++static const long _vq_quantmap__44c0_sm_p7_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_sm_p7_1 = { +- _vq_quantthresh__44c0_sm_p7_1, +- _vq_quantmap__44c0_sm_p7_1, ++static const encode_aux_threshmatch _vq_auxt__44c0_sm_p7_1 = { ++ (float *)_vq_quantthresh__44c0_sm_p7_1, ++ (long *)_vq_quantmap__44c0_sm_p7_1, + 5, + 5 + }; + +-static static_codebook _44c0_sm_p7_1 = { ++static const static_codebook _44c0_sm_p7_1 = { + 2, 25, +- _vq_lengthlist__44c0_sm_p7_1, ++ (long *)_vq_lengthlist__44c0_sm_p7_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c0_sm_p7_1, ++ (long *)_vq_quantlist__44c0_sm_p7_1, + NULL, +- &_vq_auxt__44c0_sm_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_sm_p8_0[] = { ++static const long _vq_quantlist__44c0_sm_p8_0[] = { + 4, + 3, + 5, +@@ -16053,7 +16053,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c0_sm_p8_0[] = { ++static const long _vq_lengthlist__44c0_sm_p8_0[] = { + 1, 3, 3,11,11,11,11,11,11, 3, 7, 6,11,11,11,11, + 11,11, 4, 8, 7,11,11,11,11,11,11,11,11,11,11,11, + 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, +@@ -16062,34 +16062,34 @@ + 12, + }; + +-static float _vq_quantthresh__44c0_sm_p8_0[] = { ++static const float _vq_quantthresh__44c0_sm_p8_0[] = { + -773.5, -552.5, -331.5, -110.5, 110.5, 331.5, 552.5, 773.5, + }; + +-static long _vq_quantmap__44c0_sm_p8_0[] = { ++static const long _vq_quantmap__44c0_sm_p8_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_sm_p8_0 = { +- _vq_quantthresh__44c0_sm_p8_0, +- _vq_quantmap__44c0_sm_p8_0, ++static const encode_aux_threshmatch _vq_auxt__44c0_sm_p8_0 = { ++ (float *)_vq_quantthresh__44c0_sm_p8_0, ++ (long *)_vq_quantmap__44c0_sm_p8_0, + 9, + 9 + }; + +-static static_codebook _44c0_sm_p8_0 = { ++static const static_codebook _44c0_sm_p8_0 = { + 2, 81, +- _vq_lengthlist__44c0_sm_p8_0, ++ (long *)_vq_lengthlist__44c0_sm_p8_0, + 1, -516186112, 1627103232, 4, 0, +- _vq_quantlist__44c0_sm_p8_0, ++ (long *)_vq_quantlist__44c0_sm_p8_0, + NULL, +- &_vq_auxt__44c0_sm_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_sm_p8_1[] = { ++static const long _vq_quantlist__44c0_sm_p8_1[] = { + 6, + 5, + 7, +@@ -16105,7 +16105,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c0_sm_p8_1[] = { ++static const long _vq_lengthlist__44c0_sm_p8_1[] = { + 1, 4, 4, 6, 6, 7, 7, 9, 9,10,11,12,12, 6, 5, 5, + 7, 7, 8, 8,10,10,12,11,12,12, 6, 5, 5, 7, 7, 8, + 8,10,10,12,11,12,12,17, 7, 7, 8, 8, 9, 9,10,10, +@@ -16119,35 +16119,35 @@ + 20,13,13,12,12,16,13,15,13, + }; + +-static float _vq_quantthresh__44c0_sm_p8_1[] = { ++static const float _vq_quantthresh__44c0_sm_p8_1[] = { + -93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, 25.5, + 42.5, 59.5, 76.5, 93.5, + }; + +-static long _vq_quantmap__44c0_sm_p8_1[] = { ++static const long _vq_quantmap__44c0_sm_p8_1[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_sm_p8_1 = { +- _vq_quantthresh__44c0_sm_p8_1, +- _vq_quantmap__44c0_sm_p8_1, ++static const encode_aux_threshmatch _vq_auxt__44c0_sm_p8_1 = { ++ (float *)_vq_quantthresh__44c0_sm_p8_1, ++ (long *)_vq_quantmap__44c0_sm_p8_1, + 13, + 13 + }; + +-static static_codebook _44c0_sm_p8_1 = { ++static const static_codebook _44c0_sm_p8_1 = { + 2, 169, +- _vq_lengthlist__44c0_sm_p8_1, ++ (long *)_vq_lengthlist__44c0_sm_p8_1, + 1, -522616832, 1620115456, 4, 0, +- _vq_quantlist__44c0_sm_p8_1, ++ (long *)_vq_quantlist__44c0_sm_p8_1, + NULL, +- &_vq_auxt__44c0_sm_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c0_sm_p8_2[] = { ++static const long _vq_quantlist__44c0_sm_p8_2[] = { + 8, + 7, + 9, +@@ -16167,7 +16167,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c0_sm_p8_2[] = { ++static const long _vq_lengthlist__44c0_sm_p8_2[] = { + 2, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, + 8,10, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, + 9, 9,10, 6, 6, 7, 7, 8, 7, 8, 8, 9, 9, 9, 9, 9, +@@ -16189,36 +16189,36 @@ + 9, + }; + +-static float _vq_quantthresh__44c0_sm_p8_2[] = { ++static const float _vq_quantthresh__44c0_sm_p8_2[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c0_sm_p8_2[] = { ++static const long _vq_quantmap__44c0_sm_p8_2[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c0_sm_p8_2 = { +- _vq_quantthresh__44c0_sm_p8_2, +- _vq_quantmap__44c0_sm_p8_2, ++static const encode_aux_threshmatch _vq_auxt__44c0_sm_p8_2 = { ++ (float *)_vq_quantthresh__44c0_sm_p8_2, ++ (long *)_vq_quantmap__44c0_sm_p8_2, + 17, + 17 + }; + +-static static_codebook _44c0_sm_p8_2 = { ++static const static_codebook _44c0_sm_p8_2 = { + 2, 289, +- _vq_lengthlist__44c0_sm_p8_2, ++ (long *)_vq_lengthlist__44c0_sm_p8_2, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c0_sm_p8_2, ++ (long *)_vq_quantlist__44c0_sm_p8_2, + NULL, +- &_vq_auxt__44c0_sm_p8_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44c0_sm_p8_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44c0_sm_short[] = { ++static const long _huff_lengthlist__44c0_sm_short[] = { + 6, 6,12,13,13,14,16,17,17, 4, 2, 5, 8, 7, 9,12, + 15,15, 9, 4, 5, 9, 7, 9,12,16,18,11, 6, 7, 4, 6, + 8,11,14,18,10, 5, 6, 5, 5, 7,10,14,17,10, 5, 7, +@@ -16227,9 +16227,9 @@ + 12, + }; + +-static static_codebook _huff_book__44c0_sm_short = { ++static const static_codebook _huff_book__44c0_sm_short = { + 2, 81, +- _huff_lengthlist__44c0_sm_short, ++ (long *)_huff_lengthlist__44c0_sm_short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -16238,7 +16238,7 @@ + 0 + }; + +-static long _huff_lengthlist__44c1_s_long[] = { ++static const long _huff_lengthlist__44c1_s_long[] = { + 5, 5, 9,10, 9, 9,10,11,12, 5, 1, 5, 6, 6, 7,10, + 12,14, 9, 5, 6, 8, 8,10,12,14,14,10, 5, 8, 5, 6, + 8,11,13,14, 9, 5, 7, 6, 6, 8,10,12,11, 9, 7, 9, +@@ -16247,9 +16247,9 @@ + 11, + }; + +-static static_codebook _huff_book__44c1_s_long = { ++static const static_codebook _huff_book__44c1_s_long = { + 2, 81, +- _huff_lengthlist__44c1_s_long, ++ (long *)_huff_lengthlist__44c1_s_long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -16258,13 +16258,13 @@ + 0 + }; + +-static long _vq_quantlist__44c1_s_p1_0[] = { ++static const long _vq_quantlist__44c1_s_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c1_s_p1_0[] = { ++static const long _vq_lengthlist__44c1_s_p1_0[] = { + 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 7, 6, 0, 0, 0, 0, + 0, 0, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -16678,33 +16678,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c1_s_p1_0[] = { ++static const float _vq_quantthresh__44c1_s_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44c1_s_p1_0[] = { ++static const long _vq_quantmap__44c1_s_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_s_p1_0 = { +- _vq_quantthresh__44c1_s_p1_0, +- _vq_quantmap__44c1_s_p1_0, ++static const encode_aux_threshmatch _vq_auxt__44c1_s_p1_0 = { ++ (float *)_vq_quantthresh__44c1_s_p1_0, ++ (long *)_vq_quantmap__44c1_s_p1_0, + 3, + 3 + }; + +-static static_codebook _44c1_s_p1_0 = { ++static const static_codebook _44c1_s_p1_0 = { + 8, 6561, +- _vq_lengthlist__44c1_s_p1_0, ++ (long *)_vq_lengthlist__44c1_s_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44c1_s_p1_0, ++ (long *)_vq_quantlist__44c1_s_p1_0, + NULL, +- &_vq_auxt__44c1_s_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_s_p2_0[] = { ++static const long _vq_quantlist__44c1_s_p2_0[] = { + 2, + 1, + 3, +@@ -16712,7 +16712,7 @@ + 4, + }; + +-static long _vq_lengthlist__44c1_s_p2_0[] = { ++static const long _vq_lengthlist__44c1_s_p2_0[] = { + 2, 3, 4, 6, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -16755,33 +16755,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c1_s_p2_0[] = { ++static const float _vq_quantthresh__44c1_s_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c1_s_p2_0[] = { ++static const long _vq_quantmap__44c1_s_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_s_p2_0 = { +- _vq_quantthresh__44c1_s_p2_0, +- _vq_quantmap__44c1_s_p2_0, ++static const encode_aux_threshmatch _vq_auxt__44c1_s_p2_0 = { ++ (float *)_vq_quantthresh__44c1_s_p2_0, ++ (long *)_vq_quantmap__44c1_s_p2_0, + 5, + 5 + }; + +-static static_codebook _44c1_s_p2_0 = { ++static const static_codebook _44c1_s_p2_0 = { + 4, 625, +- _vq_lengthlist__44c1_s_p2_0, ++ (long *)_vq_lengthlist__44c1_s_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c1_s_p2_0, ++ (long *)_vq_quantlist__44c1_s_p2_0, + NULL, +- &_vq_auxt__44c1_s_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_s_p3_0[] = { ++static const long _vq_quantlist__44c1_s_p3_0[] = { + 4, + 3, + 5, +@@ -16793,7 +16793,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c1_s_p3_0[] = { ++static const long _vq_lengthlist__44c1_s_p3_0[] = { + 1, 3, 2, 7, 7, 0, 0, 0, 0, 0,13,13, 6, 6, 0, 0, + 0, 0, 0,12, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, + 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, +@@ -16802,34 +16802,34 @@ + 0, + }; + +-static float _vq_quantthresh__44c1_s_p3_0[] = { ++static const float _vq_quantthresh__44c1_s_p3_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c1_s_p3_0[] = { ++static const long _vq_quantmap__44c1_s_p3_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_s_p3_0 = { +- _vq_quantthresh__44c1_s_p3_0, +- _vq_quantmap__44c1_s_p3_0, ++static const encode_aux_threshmatch _vq_auxt__44c1_s_p3_0 = { ++ (float *)_vq_quantthresh__44c1_s_p3_0, ++ (long *)_vq_quantmap__44c1_s_p3_0, + 9, + 9 + }; + +-static static_codebook _44c1_s_p3_0 = { ++static const static_codebook _44c1_s_p3_0 = { + 2, 81, +- _vq_lengthlist__44c1_s_p3_0, ++ (long *)_vq_lengthlist__44c1_s_p3_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c1_s_p3_0, ++ (long *)_vq_quantlist__44c1_s_p3_0, + NULL, +- &_vq_auxt__44c1_s_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_s_p4_0[] = { ++static const long _vq_quantlist__44c1_s_p4_0[] = { + 4, + 3, + 5, +@@ -16841,7 +16841,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c1_s_p4_0[] = { ++static const long _vq_lengthlist__44c1_s_p4_0[] = { + 1, 3, 3, 6, 5, 6, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7, + 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 7, 7, + 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0, +@@ -16850,34 +16850,34 @@ + 11, + }; + +-static float _vq_quantthresh__44c1_s_p4_0[] = { ++static const float _vq_quantthresh__44c1_s_p4_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c1_s_p4_0[] = { ++static const long _vq_quantmap__44c1_s_p4_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_s_p4_0 = { +- _vq_quantthresh__44c1_s_p4_0, +- _vq_quantmap__44c1_s_p4_0, ++static const encode_aux_threshmatch _vq_auxt__44c1_s_p4_0 = { ++ (float *)_vq_quantthresh__44c1_s_p4_0, ++ (long *)_vq_quantmap__44c1_s_p4_0, + 9, + 9 + }; + +-static static_codebook _44c1_s_p4_0 = { ++static const static_codebook _44c1_s_p4_0 = { + 2, 81, +- _vq_lengthlist__44c1_s_p4_0, ++ (long *)_vq_lengthlist__44c1_s_p4_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c1_s_p4_0, ++ (long *)_vq_quantlist__44c1_s_p4_0, + NULL, +- &_vq_auxt__44c1_s_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_s_p5_0[] = { ++static const long _vq_quantlist__44c1_s_p5_0[] = { + 8, + 7, + 9, +@@ -16897,7 +16897,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c1_s_p5_0[] = { ++static const long _vq_lengthlist__44c1_s_p5_0[] = { + 1, 4, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, + 11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10, + 11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, +@@ -16919,42 +16919,42 @@ + 14, + }; + +-static float _vq_quantthresh__44c1_s_p5_0[] = { ++static const float _vq_quantthresh__44c1_s_p5_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c1_s_p5_0[] = { ++static const long _vq_quantmap__44c1_s_p5_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_s_p5_0 = { +- _vq_quantthresh__44c1_s_p5_0, +- _vq_quantmap__44c1_s_p5_0, ++static const encode_aux_threshmatch _vq_auxt__44c1_s_p5_0 = { ++ (float *)_vq_quantthresh__44c1_s_p5_0, ++ (long *)_vq_quantmap__44c1_s_p5_0, + 17, + 17 + }; + +-static static_codebook _44c1_s_p5_0 = { ++static const static_codebook _44c1_s_p5_0 = { + 2, 289, +- _vq_lengthlist__44c1_s_p5_0, ++ (long *)_vq_lengthlist__44c1_s_p5_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c1_s_p5_0, ++ (long *)_vq_quantlist__44c1_s_p5_0, + NULL, +- &_vq_auxt__44c1_s_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_s_p6_0[] = { ++static const long _vq_quantlist__44c1_s_p6_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c1_s_p6_0[] = { ++static const long _vq_lengthlist__44c1_s_p6_0[] = { + 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, + 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 6,10,10,11,11, + 11,11,10,10, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, +@@ -16963,33 +16963,33 @@ + 11, + }; + +-static float _vq_quantthresh__44c1_s_p6_0[] = { ++static const float _vq_quantthresh__44c1_s_p6_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44c1_s_p6_0[] = { ++static const long _vq_quantmap__44c1_s_p6_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_s_p6_0 = { +- _vq_quantthresh__44c1_s_p6_0, +- _vq_quantmap__44c1_s_p6_0, ++static const encode_aux_threshmatch _vq_auxt__44c1_s_p6_0 = { ++ (float *)_vq_quantthresh__44c1_s_p6_0, ++ (long *)_vq_quantmap__44c1_s_p6_0, + 3, + 3 + }; + +-static static_codebook _44c1_s_p6_0 = { ++static const static_codebook _44c1_s_p6_0 = { + 4, 81, +- _vq_lengthlist__44c1_s_p6_0, ++ (long *)_vq_lengthlist__44c1_s_p6_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44c1_s_p6_0, ++ (long *)_vq_quantlist__44c1_s_p6_0, + NULL, +- &_vq_auxt__44c1_s_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_s_p6_1[] = { ++static const long _vq_quantlist__44c1_s_p6_1[] = { + 5, + 4, + 6, +@@ -17003,7 +17003,7 @@ + 10, + }; + +-static long _vq_lengthlist__44c1_s_p6_1[] = { ++static const long _vq_lengthlist__44c1_s_p6_1[] = { + 2, 3, 3, 6, 6, 7, 7, 7, 7, 8, 8,10,10,10, 6, 6, + 7, 7, 8, 8, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8, + 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, +@@ -17014,35 +17014,35 @@ + 10,10,10, 8, 8, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__44c1_s_p6_1[] = { ++static const float _vq_quantthresh__44c1_s_p6_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44c1_s_p6_1[] = { ++static const long _vq_quantmap__44c1_s_p6_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_s_p6_1 = { +- _vq_quantthresh__44c1_s_p6_1, +- _vq_quantmap__44c1_s_p6_1, ++static const encode_aux_threshmatch _vq_auxt__44c1_s_p6_1 = { ++ (float *)_vq_quantthresh__44c1_s_p6_1, ++ (long *)_vq_quantmap__44c1_s_p6_1, + 11, + 11 + }; + +-static static_codebook _44c1_s_p6_1 = { ++static const static_codebook _44c1_s_p6_1 = { + 2, 121, +- _vq_lengthlist__44c1_s_p6_1, ++ (long *)_vq_lengthlist__44c1_s_p6_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44c1_s_p6_1, ++ (long *)_vq_quantlist__44c1_s_p6_1, + NULL, +- &_vq_auxt__44c1_s_p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_s_p7_0[] = { ++static const long _vq_quantlist__44c1_s_p7_0[] = { + 6, + 5, + 7, +@@ -17058,7 +17058,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c1_s_p7_0[] = { ++static const long _vq_lengthlist__44c1_s_p7_0[] = { + 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8,10, 9, 7, 5, 6, + 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 5, 7, 7, 8, + 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, +@@ -17072,35 +17072,35 @@ + 0,12,11,11,11,13,10,14,13, + }; + +-static float _vq_quantthresh__44c1_s_p7_0[] = { ++static const float _vq_quantthresh__44c1_s_p7_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44c1_s_p7_0[] = { ++static const long _vq_quantmap__44c1_s_p7_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_s_p7_0 = { +- _vq_quantthresh__44c1_s_p7_0, +- _vq_quantmap__44c1_s_p7_0, ++static const encode_aux_threshmatch _vq_auxt__44c1_s_p7_0 = { ++ (float *)_vq_quantthresh__44c1_s_p7_0, ++ (long *)_vq_quantmap__44c1_s_p7_0, + 13, + 13 + }; + +-static static_codebook _44c1_s_p7_0 = { ++static const static_codebook _44c1_s_p7_0 = { + 2, 169, +- _vq_lengthlist__44c1_s_p7_0, ++ (long *)_vq_lengthlist__44c1_s_p7_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44c1_s_p7_0, ++ (long *)_vq_quantlist__44c1_s_p7_0, + NULL, +- &_vq_auxt__44c1_s_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_s_p7_1[] = { ++static const long _vq_quantlist__44c1_s_p7_1[] = { + 2, + 1, + 3, +@@ -17108,38 +17108,38 @@ + 4, + }; + +-static long _vq_lengthlist__44c1_s_p7_1[] = { ++static const long _vq_lengthlist__44c1_s_p7_1[] = { + 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, + 6, 6, 5, 5, 6, 6, 6, 5, 5, + }; + +-static float _vq_quantthresh__44c1_s_p7_1[] = { ++static const float _vq_quantthresh__44c1_s_p7_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c1_s_p7_1[] = { ++static const long _vq_quantmap__44c1_s_p7_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_s_p7_1 = { +- _vq_quantthresh__44c1_s_p7_1, +- _vq_quantmap__44c1_s_p7_1, ++static const encode_aux_threshmatch _vq_auxt__44c1_s_p7_1 = { ++ (float *)_vq_quantthresh__44c1_s_p7_1, ++ (long *)_vq_quantmap__44c1_s_p7_1, + 5, + 5 + }; + +-static static_codebook _44c1_s_p7_1 = { ++static const static_codebook _44c1_s_p7_1 = { + 2, 25, +- _vq_lengthlist__44c1_s_p7_1, ++ (long *)_vq_lengthlist__44c1_s_p7_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c1_s_p7_1, ++ (long *)_vq_quantlist__44c1_s_p7_1, + NULL, +- &_vq_auxt__44c1_s_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_s_p8_0[] = { ++static const long _vq_quantlist__44c1_s_p8_0[] = { + 6, + 5, + 7, +@@ -17155,7 +17155,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c1_s_p8_0[] = { ++static const long _vq_lengthlist__44c1_s_p8_0[] = { + 1, 4, 3,10,10,10,10,10,10,10,10,10,10, 4, 8, 6, + 10,10,10,10,10,10,10,10,10,10, 4, 8, 7,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, +@@ -17169,35 +17169,35 @@ + 10,10,10,10,10,10,10,10,10, + }; + +-static float _vq_quantthresh__44c1_s_p8_0[] = { ++static const float _vq_quantthresh__44c1_s_p8_0[] = { + -1215.5, -994.5, -773.5, -552.5, -331.5, -110.5, 110.5, 331.5, + 552.5, 773.5, 994.5, 1215.5, + }; + +-static long _vq_quantmap__44c1_s_p8_0[] = { ++static const long _vq_quantmap__44c1_s_p8_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_s_p8_0 = { +- _vq_quantthresh__44c1_s_p8_0, +- _vq_quantmap__44c1_s_p8_0, ++static const encode_aux_threshmatch _vq_auxt__44c1_s_p8_0 = { ++ (float *)_vq_quantthresh__44c1_s_p8_0, ++ (long *)_vq_quantmap__44c1_s_p8_0, + 13, + 13 + }; + +-static static_codebook _44c1_s_p8_0 = { ++static const static_codebook _44c1_s_p8_0 = { + 2, 169, +- _vq_lengthlist__44c1_s_p8_0, ++ (long *)_vq_lengthlist__44c1_s_p8_0, + 1, -514541568, 1627103232, 4, 0, +- _vq_quantlist__44c1_s_p8_0, ++ (long *)_vq_quantlist__44c1_s_p8_0, + NULL, +- &_vq_auxt__44c1_s_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_s_p8_1[] = { ++static const long _vq_quantlist__44c1_s_p8_1[] = { + 6, + 5, + 7, +@@ -17213,7 +17213,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c1_s_p8_1[] = { ++static const long _vq_lengthlist__44c1_s_p8_1[] = { + 1, 4, 4, 6, 5, 7, 7, 9, 9,10,10,12,12, 6, 5, 5, + 7, 7, 8, 8,10,10,12,11,12,12, 6, 5, 5, 7, 7, 8, + 8,10,10,11,11,12,12,15, 7, 7, 8, 8, 9, 9,11,11, +@@ -17227,35 +17227,35 @@ + 16,13,12,12,11,14,12,15,13, + }; + +-static float _vq_quantthresh__44c1_s_p8_1[] = { ++static const float _vq_quantthresh__44c1_s_p8_1[] = { + -93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, 25.5, + 42.5, 59.5, 76.5, 93.5, + }; + +-static long _vq_quantmap__44c1_s_p8_1[] = { ++static const long _vq_quantmap__44c1_s_p8_1[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_s_p8_1 = { +- _vq_quantthresh__44c1_s_p8_1, +- _vq_quantmap__44c1_s_p8_1, ++static const encode_aux_threshmatch _vq_auxt__44c1_s_p8_1 = { ++ (float *)_vq_quantthresh__44c1_s_p8_1, ++ (long *)_vq_quantmap__44c1_s_p8_1, + 13, + 13 + }; + +-static static_codebook _44c1_s_p8_1 = { ++static const static_codebook _44c1_s_p8_1 = { + 2, 169, +- _vq_lengthlist__44c1_s_p8_1, ++ (long *)_vq_lengthlist__44c1_s_p8_1, + 1, -522616832, 1620115456, 4, 0, +- _vq_quantlist__44c1_s_p8_1, ++ (long *)_vq_quantlist__44c1_s_p8_1, + NULL, +- &_vq_auxt__44c1_s_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_s_p8_2[] = { ++static const long _vq_quantlist__44c1_s_p8_2[] = { + 8, + 7, + 9, +@@ -17275,7 +17275,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c1_s_p8_2[] = { ++static const long _vq_lengthlist__44c1_s_p8_2[] = { + 2, 4, 4, 6, 6, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, + 8,10,10,10, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, + 9, 9,10,10,10, 7, 7, 8, 7, 8, 8, 9, 9, 9, 9, 9, +@@ -17297,36 +17297,36 @@ + 9, + }; + +-static float _vq_quantthresh__44c1_s_p8_2[] = { ++static const float _vq_quantthresh__44c1_s_p8_2[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c1_s_p8_2[] = { ++static const long _vq_quantmap__44c1_s_p8_2[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_s_p8_2 = { +- _vq_quantthresh__44c1_s_p8_2, +- _vq_quantmap__44c1_s_p8_2, ++static const encode_aux_threshmatch _vq_auxt__44c1_s_p8_2 = { ++ (float *)_vq_quantthresh__44c1_s_p8_2, ++ (long *)_vq_quantmap__44c1_s_p8_2, + 17, + 17 + }; + +-static static_codebook _44c1_s_p8_2 = { ++static const static_codebook _44c1_s_p8_2 = { + 2, 289, +- _vq_lengthlist__44c1_s_p8_2, ++ (long *)_vq_lengthlist__44c1_s_p8_2, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c1_s_p8_2, ++ (long *)_vq_quantlist__44c1_s_p8_2, + NULL, +- &_vq_auxt__44c1_s_p8_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_s_p8_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44c1_s_short[] = { ++static const long _huff_lengthlist__44c1_s_short[] = { + 6, 8,13,12,13,14,15,16,16, 4, 2, 4, 7, 6, 8,11, + 13,15,10, 4, 4, 8, 6, 8,11,14,17,11, 5, 6, 5, 6, + 8,12,14,17,11, 5, 5, 6, 5, 7,10,13,16,12, 6, 7, +@@ -17335,9 +17335,9 @@ + 11, + }; + +-static static_codebook _huff_book__44c1_s_short = { ++static const static_codebook _huff_book__44c1_s_short = { + 2, 81, +- _huff_lengthlist__44c1_s_short, ++ (long *)_huff_lengthlist__44c1_s_short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -17346,7 +17346,7 @@ + 0 + }; + +-static long _huff_lengthlist__44c1_sm_long[] = { ++static const long _huff_lengthlist__44c1_sm_long[] = { + 5, 4, 8,10, 9, 9,10,11,12, 4, 2, 5, 6, 6, 8,10, + 11,13, 8, 4, 6, 8, 7, 9,12,12,14,10, 6, 8, 4, 5, + 6, 9,11,12, 9, 5, 6, 5, 5, 6, 9,11,11, 9, 7, 9, +@@ -17355,9 +17355,9 @@ + 11, + }; + +-static static_codebook _huff_book__44c1_sm_long = { ++static const static_codebook _huff_book__44c1_sm_long = { + 2, 81, +- _huff_lengthlist__44c1_sm_long, ++ (long *)_huff_lengthlist__44c1_sm_long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -17366,13 +17366,13 @@ + 0 + }; + +-static long _vq_quantlist__44c1_sm_p1_0[] = { ++static const long _vq_quantlist__44c1_sm_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c1_sm_p1_0[] = { ++static const long _vq_lengthlist__44c1_sm_p1_0[] = { + 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, + 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -17786,33 +17786,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c1_sm_p1_0[] = { ++static const float _vq_quantthresh__44c1_sm_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44c1_sm_p1_0[] = { ++static const long _vq_quantmap__44c1_sm_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_sm_p1_0 = { +- _vq_quantthresh__44c1_sm_p1_0, +- _vq_quantmap__44c1_sm_p1_0, ++static const encode_aux_threshmatch _vq_auxt__44c1_sm_p1_0 = { ++ (float *)_vq_quantthresh__44c1_sm_p1_0, ++ (long *)_vq_quantmap__44c1_sm_p1_0, + 3, + 3 + }; + +-static static_codebook _44c1_sm_p1_0 = { ++static const static_codebook _44c1_sm_p1_0 = { + 8, 6561, +- _vq_lengthlist__44c1_sm_p1_0, ++ (long *)_vq_lengthlist__44c1_sm_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44c1_sm_p1_0, ++ (long *)_vq_quantlist__44c1_sm_p1_0, + NULL, +- &_vq_auxt__44c1_sm_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_sm_p2_0[] = { ++static const long _vq_quantlist__44c1_sm_p2_0[] = { + 2, + 1, + 3, +@@ -17820,7 +17820,7 @@ + 4, + }; + +-static long _vq_lengthlist__44c1_sm_p2_0[] = { ++static const long _vq_lengthlist__44c1_sm_p2_0[] = { + 2, 3, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -17863,33 +17863,33 @@ + 0, + }; + +-static float _vq_quantthresh__44c1_sm_p2_0[] = { ++static const float _vq_quantthresh__44c1_sm_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c1_sm_p2_0[] = { ++static const long _vq_quantmap__44c1_sm_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_sm_p2_0 = { +- _vq_quantthresh__44c1_sm_p2_0, +- _vq_quantmap__44c1_sm_p2_0, ++static const encode_aux_threshmatch _vq_auxt__44c1_sm_p2_0 = { ++ (float *)_vq_quantthresh__44c1_sm_p2_0, ++ (long *)_vq_quantmap__44c1_sm_p2_0, + 5, + 5 + }; + +-static static_codebook _44c1_sm_p2_0 = { ++static const static_codebook _44c1_sm_p2_0 = { + 4, 625, +- _vq_lengthlist__44c1_sm_p2_0, ++ (long *)_vq_lengthlist__44c1_sm_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c1_sm_p2_0, ++ (long *)_vq_quantlist__44c1_sm_p2_0, + NULL, +- &_vq_auxt__44c1_sm_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_sm_p3_0[] = { ++static const long _vq_quantlist__44c1_sm_p3_0[] = { + 4, + 3, + 5, +@@ -17901,7 +17901,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c1_sm_p3_0[] = { ++static const long _vq_lengthlist__44c1_sm_p3_0[] = { + 1, 3, 3, 7, 7, 0, 0, 0, 0, 0, 5, 5, 6, 6, 0, 0, + 0, 0, 0, 5, 5, 7, 7, 0, 0, 0, 0, 0, 7, 7, 7, 7, + 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, +@@ -17910,34 +17910,34 @@ + 0, + }; + +-static float _vq_quantthresh__44c1_sm_p3_0[] = { ++static const float _vq_quantthresh__44c1_sm_p3_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c1_sm_p3_0[] = { ++static const long _vq_quantmap__44c1_sm_p3_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_sm_p3_0 = { +- _vq_quantthresh__44c1_sm_p3_0, +- _vq_quantmap__44c1_sm_p3_0, ++static const encode_aux_threshmatch _vq_auxt__44c1_sm_p3_0 = { ++ (float *)_vq_quantthresh__44c1_sm_p3_0, ++ (long *)_vq_quantmap__44c1_sm_p3_0, + 9, + 9 + }; + +-static static_codebook _44c1_sm_p3_0 = { ++static const static_codebook _44c1_sm_p3_0 = { + 2, 81, +- _vq_lengthlist__44c1_sm_p3_0, ++ (long *)_vq_lengthlist__44c1_sm_p3_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c1_sm_p3_0, ++ (long *)_vq_quantlist__44c1_sm_p3_0, + NULL, +- &_vq_auxt__44c1_sm_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_sm_p4_0[] = { ++static const long _vq_quantlist__44c1_sm_p4_0[] = { + 4, + 3, + 5, +@@ -17949,7 +17949,7 @@ + 8, + }; + +-static long _vq_lengthlist__44c1_sm_p4_0[] = { ++static const long _vq_lengthlist__44c1_sm_p4_0[] = { + 1, 3, 3, 6, 6, 7, 7, 9, 9, 0, 6, 6, 7, 7, 8, 8, + 9, 9, 0, 6, 6, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 8, + 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, +@@ -17958,34 +17958,34 @@ + 11, + }; + +-static float _vq_quantthresh__44c1_sm_p4_0[] = { ++static const float _vq_quantthresh__44c1_sm_p4_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44c1_sm_p4_0[] = { ++static const long _vq_quantmap__44c1_sm_p4_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_sm_p4_0 = { +- _vq_quantthresh__44c1_sm_p4_0, +- _vq_quantmap__44c1_sm_p4_0, ++static const encode_aux_threshmatch _vq_auxt__44c1_sm_p4_0 = { ++ (float *)_vq_quantthresh__44c1_sm_p4_0, ++ (long *)_vq_quantmap__44c1_sm_p4_0, + 9, + 9 + }; + +-static static_codebook _44c1_sm_p4_0 = { ++static const static_codebook _44c1_sm_p4_0 = { + 2, 81, +- _vq_lengthlist__44c1_sm_p4_0, ++ (long *)_vq_lengthlist__44c1_sm_p4_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44c1_sm_p4_0, ++ (long *)_vq_quantlist__44c1_sm_p4_0, + NULL, +- &_vq_auxt__44c1_sm_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_sm_p5_0[] = { ++static const long _vq_quantlist__44c1_sm_p5_0[] = { + 8, + 7, + 9, +@@ -18005,7 +18005,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c1_sm_p5_0[] = { ++static const long _vq_lengthlist__44c1_sm_p5_0[] = { + 2, 3, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, + 11, 0, 5, 5, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10,10, + 11,11, 0, 5, 5, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10, +@@ -18027,42 +18027,42 @@ + 14, + }; + +-static float _vq_quantthresh__44c1_sm_p5_0[] = { ++static const float _vq_quantthresh__44c1_sm_p5_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c1_sm_p5_0[] = { ++static const long _vq_quantmap__44c1_sm_p5_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_sm_p5_0 = { +- _vq_quantthresh__44c1_sm_p5_0, +- _vq_quantmap__44c1_sm_p5_0, ++static const encode_aux_threshmatch _vq_auxt__44c1_sm_p5_0 = { ++ (float *)_vq_quantthresh__44c1_sm_p5_0, ++ (long *)_vq_quantmap__44c1_sm_p5_0, + 17, + 17 + }; + +-static static_codebook _44c1_sm_p5_0 = { ++static const static_codebook _44c1_sm_p5_0 = { + 2, 289, +- _vq_lengthlist__44c1_sm_p5_0, ++ (long *)_vq_lengthlist__44c1_sm_p5_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c1_sm_p5_0, ++ (long *)_vq_quantlist__44c1_sm_p5_0, + NULL, +- &_vq_auxt__44c1_sm_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_sm_p6_0[] = { ++static const long _vq_quantlist__44c1_sm_p6_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44c1_sm_p6_0[] = { ++static const long _vq_lengthlist__44c1_sm_p6_0[] = { + 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, + 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,10,11, + 11,11,10,10, 6, 9, 9,11,11,10,11,10,10, 6, 9, 9, +@@ -18071,33 +18071,33 @@ + 11, + }; + +-static float _vq_quantthresh__44c1_sm_p6_0[] = { ++static const float _vq_quantthresh__44c1_sm_p6_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44c1_sm_p6_0[] = { ++static const long _vq_quantmap__44c1_sm_p6_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_sm_p6_0 = { +- _vq_quantthresh__44c1_sm_p6_0, +- _vq_quantmap__44c1_sm_p6_0, ++static const encode_aux_threshmatch _vq_auxt__44c1_sm_p6_0 = { ++ (float *)_vq_quantthresh__44c1_sm_p6_0, ++ (long *)_vq_quantmap__44c1_sm_p6_0, + 3, + 3 + }; + +-static static_codebook _44c1_sm_p6_0 = { ++static const static_codebook _44c1_sm_p6_0 = { + 4, 81, +- _vq_lengthlist__44c1_sm_p6_0, ++ (long *)_vq_lengthlist__44c1_sm_p6_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44c1_sm_p6_0, ++ (long *)_vq_quantlist__44c1_sm_p6_0, + NULL, +- &_vq_auxt__44c1_sm_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_sm_p6_1[] = { ++static const long _vq_quantlist__44c1_sm_p6_1[] = { + 5, + 4, + 6, +@@ -18111,7 +18111,7 @@ + 10, + }; + +-static long _vq_lengthlist__44c1_sm_p6_1[] = { ++static const long _vq_lengthlist__44c1_sm_p6_1[] = { + 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8,10, 5, 5, 6, 6, + 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, + 8,10, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, +@@ -18122,35 +18122,35 @@ + 10,10,10, 8, 8, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__44c1_sm_p6_1[] = { ++static const float _vq_quantthresh__44c1_sm_p6_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44c1_sm_p6_1[] = { ++static const long _vq_quantmap__44c1_sm_p6_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_sm_p6_1 = { +- _vq_quantthresh__44c1_sm_p6_1, +- _vq_quantmap__44c1_sm_p6_1, ++static const encode_aux_threshmatch _vq_auxt__44c1_sm_p6_1 = { ++ (float *)_vq_quantthresh__44c1_sm_p6_1, ++ (long *)_vq_quantmap__44c1_sm_p6_1, + 11, + 11 + }; + +-static static_codebook _44c1_sm_p6_1 = { ++static const static_codebook _44c1_sm_p6_1 = { + 2, 121, +- _vq_lengthlist__44c1_sm_p6_1, ++ (long *)_vq_lengthlist__44c1_sm_p6_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44c1_sm_p6_1, ++ (long *)_vq_quantlist__44c1_sm_p6_1, + NULL, +- &_vq_auxt__44c1_sm_p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_sm_p7_0[] = { ++static const long _vq_quantlist__44c1_sm_p7_0[] = { + 6, + 5, + 7, +@@ -18166,7 +18166,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c1_sm_p7_0[] = { ++static const long _vq_lengthlist__44c1_sm_p7_0[] = { + 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 7, 5, 5, + 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 6, 7, 7, 8, + 8, 8, 8, 9, 9,11,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, +@@ -18180,35 +18180,35 @@ + 0,12,12,11,11,13,12,14,13, + }; + +-static float _vq_quantthresh__44c1_sm_p7_0[] = { ++static const float _vq_quantthresh__44c1_sm_p7_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44c1_sm_p7_0[] = { ++static const long _vq_quantmap__44c1_sm_p7_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_sm_p7_0 = { +- _vq_quantthresh__44c1_sm_p7_0, +- _vq_quantmap__44c1_sm_p7_0, ++static const encode_aux_threshmatch _vq_auxt__44c1_sm_p7_0 = { ++ (float *)_vq_quantthresh__44c1_sm_p7_0, ++ (long *)_vq_quantmap__44c1_sm_p7_0, + 13, + 13 + }; + +-static static_codebook _44c1_sm_p7_0 = { ++static const static_codebook _44c1_sm_p7_0 = { + 2, 169, +- _vq_lengthlist__44c1_sm_p7_0, ++ (long *)_vq_lengthlist__44c1_sm_p7_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44c1_sm_p7_0, ++ (long *)_vq_quantlist__44c1_sm_p7_0, + NULL, +- &_vq_auxt__44c1_sm_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_sm_p7_1[] = { ++static const long _vq_quantlist__44c1_sm_p7_1[] = { + 2, + 1, + 3, +@@ -18216,38 +18216,38 @@ + 4, + }; + +-static long _vq_lengthlist__44c1_sm_p7_1[] = { ++static const long _vq_lengthlist__44c1_sm_p7_1[] = { + 2, 4, 4, 4, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, + 5, 5, 5, 5, 6, 6, 6, 5, 5, + }; + +-static float _vq_quantthresh__44c1_sm_p7_1[] = { ++static const float _vq_quantthresh__44c1_sm_p7_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44c1_sm_p7_1[] = { ++static const long _vq_quantmap__44c1_sm_p7_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_sm_p7_1 = { +- _vq_quantthresh__44c1_sm_p7_1, +- _vq_quantmap__44c1_sm_p7_1, ++static const encode_aux_threshmatch _vq_auxt__44c1_sm_p7_1 = { ++ (float *)_vq_quantthresh__44c1_sm_p7_1, ++ (long *)_vq_quantmap__44c1_sm_p7_1, + 5, + 5 + }; + +-static static_codebook _44c1_sm_p7_1 = { ++static const static_codebook _44c1_sm_p7_1 = { + 2, 25, +- _vq_lengthlist__44c1_sm_p7_1, ++ (long *)_vq_lengthlist__44c1_sm_p7_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44c1_sm_p7_1, ++ (long *)_vq_quantlist__44c1_sm_p7_1, + NULL, +- &_vq_auxt__44c1_sm_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_sm_p8_0[] = { ++static const long _vq_quantlist__44c1_sm_p8_0[] = { + 6, + 5, + 7, +@@ -18263,7 +18263,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c1_sm_p8_0[] = { ++static const long _vq_lengthlist__44c1_sm_p8_0[] = { + 1, 3, 3,13,13,13,13,13,13,13,13,13,13, 3, 6, 6, + 13,13,13,13,13,13,13,13,13,13, 4, 8, 7,13,13,13, + 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13, +@@ -18277,35 +18277,35 @@ + 13,13,13,13,13,13,13,13,13, + }; + +-static float _vq_quantthresh__44c1_sm_p8_0[] = { ++static const float _vq_quantthresh__44c1_sm_p8_0[] = { + -1215.5, -994.5, -773.5, -552.5, -331.5, -110.5, 110.5, 331.5, + 552.5, 773.5, 994.5, 1215.5, + }; + +-static long _vq_quantmap__44c1_sm_p8_0[] = { ++static const long _vq_quantmap__44c1_sm_p8_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_sm_p8_0 = { +- _vq_quantthresh__44c1_sm_p8_0, +- _vq_quantmap__44c1_sm_p8_0, ++static const encode_aux_threshmatch _vq_auxt__44c1_sm_p8_0 = { ++ (float *)_vq_quantthresh__44c1_sm_p8_0, ++ (long *)_vq_quantmap__44c1_sm_p8_0, + 13, + 13 + }; + +-static static_codebook _44c1_sm_p8_0 = { ++static const static_codebook _44c1_sm_p8_0 = { + 2, 169, +- _vq_lengthlist__44c1_sm_p8_0, ++ (long *)_vq_lengthlist__44c1_sm_p8_0, + 1, -514541568, 1627103232, 4, 0, +- _vq_quantlist__44c1_sm_p8_0, ++ (long *)_vq_quantlist__44c1_sm_p8_0, + NULL, +- &_vq_auxt__44c1_sm_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_sm_p8_1[] = { ++static const long _vq_quantlist__44c1_sm_p8_1[] = { + 6, + 5, + 7, +@@ -18321,7 +18321,7 @@ + 12, + }; + +-static long _vq_lengthlist__44c1_sm_p8_1[] = { ++static const long _vq_lengthlist__44c1_sm_p8_1[] = { + 1, 4, 4, 6, 6, 7, 7, 9, 9,10,11,12,12, 6, 5, 5, + 7, 7, 8, 7,10,10,11,11,12,12, 6, 5, 5, 7, 7, 8, + 8,10,10,11,11,12,12,16, 7, 7, 8, 8, 9, 9,11,11, +@@ -18335,35 +18335,35 @@ + 20,13,12,12,12,14,12,14,13, + }; + +-static float _vq_quantthresh__44c1_sm_p8_1[] = { ++static const float _vq_quantthresh__44c1_sm_p8_1[] = { + -93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, 25.5, + 42.5, 59.5, 76.5, 93.5, + }; + +-static long _vq_quantmap__44c1_sm_p8_1[] = { ++static const long _vq_quantmap__44c1_sm_p8_1[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_sm_p8_1 = { +- _vq_quantthresh__44c1_sm_p8_1, +- _vq_quantmap__44c1_sm_p8_1, ++static const encode_aux_threshmatch _vq_auxt__44c1_sm_p8_1 = { ++ (float *)_vq_quantthresh__44c1_sm_p8_1, ++ (long *)_vq_quantmap__44c1_sm_p8_1, + 13, + 13 + }; + +-static static_codebook _44c1_sm_p8_1 = { ++static const static_codebook _44c1_sm_p8_1 = { + 2, 169, +- _vq_lengthlist__44c1_sm_p8_1, ++ (long *)_vq_lengthlist__44c1_sm_p8_1, + 1, -522616832, 1620115456, 4, 0, +- _vq_quantlist__44c1_sm_p8_1, ++ (long *)_vq_quantlist__44c1_sm_p8_1, + NULL, +- &_vq_auxt__44c1_sm_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44c1_sm_p8_2[] = { ++static const long _vq_quantlist__44c1_sm_p8_2[] = { + 8, + 7, + 9, +@@ -18383,7 +18383,7 @@ + 16, + }; + +-static long _vq_lengthlist__44c1_sm_p8_2[] = { ++static const long _vq_lengthlist__44c1_sm_p8_2[] = { + 2, 5, 5, 6, 6, 7, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, + 8,10, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, + 9, 9,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, +@@ -18405,36 +18405,36 @@ + 9, + }; + +-static float _vq_quantthresh__44c1_sm_p8_2[] = { ++static const float _vq_quantthresh__44c1_sm_p8_2[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44c1_sm_p8_2[] = { ++static const long _vq_quantmap__44c1_sm_p8_2[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44c1_sm_p8_2 = { +- _vq_quantthresh__44c1_sm_p8_2, +- _vq_quantmap__44c1_sm_p8_2, ++static const encode_aux_threshmatch _vq_auxt__44c1_sm_p8_2 = { ++ (float *)_vq_quantthresh__44c1_sm_p8_2, ++ (long *)_vq_quantmap__44c1_sm_p8_2, + 17, + 17 + }; + +-static static_codebook _44c1_sm_p8_2 = { ++static const static_codebook _44c1_sm_p8_2 = { + 2, 289, +- _vq_lengthlist__44c1_sm_p8_2, ++ (long *)_vq_lengthlist__44c1_sm_p8_2, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44c1_sm_p8_2, ++ (long *)_vq_quantlist__44c1_sm_p8_2, + NULL, +- &_vq_auxt__44c1_sm_p8_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44c1_sm_p8_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44c1_sm_short[] = { ++static const long _huff_lengthlist__44c1_sm_short[] = { + 4, 7,13,14,14,15,16,18,18, 4, 2, 5, 8, 7, 9,12, + 15,15,10, 4, 5,10, 6, 8,11,15,17,12, 5, 7, 5, 6, + 8,11,14,17,11, 5, 6, 6, 5, 6, 9,13,17,12, 6, 7, +@@ -18443,9 +18443,9 @@ + 11, + }; + +-static static_codebook _huff_book__44c1_sm_short = { ++static const static_codebook _huff_book__44c1_sm_short = { + 2, 81, +- _huff_lengthlist__44c1_sm_short, ++ (long *)_huff_lengthlist__44c1_sm_short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -18454,7 +18454,7 @@ + 0 + }; + +-static long _huff_lengthlist__44cn1_s_long[] = { ++static const long _huff_lengthlist__44cn1_s_long[] = { + 4, 4, 7, 8, 7, 8,10,12,17, 3, 1, 6, 6, 7, 8,10, + 12,15, 7, 6, 9, 9, 9,11,12,14,17, 8, 6, 9, 6, 7, + 9,11,13,17, 7, 6, 9, 7, 7, 8, 9,12,15, 8, 8,10, +@@ -18463,9 +18463,9 @@ + 20, + }; + +-static static_codebook _huff_book__44cn1_s_long = { ++static const static_codebook _huff_book__44cn1_s_long = { + 2, 81, +- _huff_lengthlist__44cn1_s_long, ++ (long *)_huff_lengthlist__44cn1_s_long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -18474,13 +18474,13 @@ + 0 + }; + +-static long _vq_quantlist__44cn1_s_p1_0[] = { ++static const long _vq_quantlist__44cn1_s_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44cn1_s_p1_0[] = { ++static const long _vq_lengthlist__44cn1_s_p1_0[] = { + 1, 4, 4, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, + 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -18894,33 +18894,33 @@ + 0, + }; + +-static float _vq_quantthresh__44cn1_s_p1_0[] = { ++static const float _vq_quantthresh__44cn1_s_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44cn1_s_p1_0[] = { ++static const long _vq_quantmap__44cn1_s_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_s_p1_0 = { +- _vq_quantthresh__44cn1_s_p1_0, +- _vq_quantmap__44cn1_s_p1_0, ++static const encode_aux_threshmatch _vq_auxt__44cn1_s_p1_0 = { ++ (float *)_vq_quantthresh__44cn1_s_p1_0, ++ (long *)_vq_quantmap__44cn1_s_p1_0, + 3, + 3 + }; + +-static static_codebook _44cn1_s_p1_0 = { ++static const static_codebook _44cn1_s_p1_0 = { + 8, 6561, +- _vq_lengthlist__44cn1_s_p1_0, ++ (long *)_vq_lengthlist__44cn1_s_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44cn1_s_p1_0, ++ (long *)_vq_quantlist__44cn1_s_p1_0, + NULL, +- &_vq_auxt__44cn1_s_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_s_p2_0[] = { ++static const long _vq_quantlist__44cn1_s_p2_0[] = { + 2, + 1, + 3, +@@ -18928,7 +18928,7 @@ + 4, + }; + +-static long _vq_lengthlist__44cn1_s_p2_0[] = { ++static const long _vq_lengthlist__44cn1_s_p2_0[] = { + 1, 4, 4, 7, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -18971,33 +18971,33 @@ + 0, + }; + +-static float _vq_quantthresh__44cn1_s_p2_0[] = { ++static const float _vq_quantthresh__44cn1_s_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44cn1_s_p2_0[] = { ++static const long _vq_quantmap__44cn1_s_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_s_p2_0 = { +- _vq_quantthresh__44cn1_s_p2_0, +- _vq_quantmap__44cn1_s_p2_0, ++static const encode_aux_threshmatch _vq_auxt__44cn1_s_p2_0 = { ++ (float *)_vq_quantthresh__44cn1_s_p2_0, ++ (long *)_vq_quantmap__44cn1_s_p2_0, + 5, + 5 + }; + +-static static_codebook _44cn1_s_p2_0 = { ++static const static_codebook _44cn1_s_p2_0 = { + 4, 625, +- _vq_lengthlist__44cn1_s_p2_0, ++ (long *)_vq_lengthlist__44cn1_s_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44cn1_s_p2_0, ++ (long *)_vq_quantlist__44cn1_s_p2_0, + NULL, +- &_vq_auxt__44cn1_s_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_s_p3_0[] = { ++static const long _vq_quantlist__44cn1_s_p3_0[] = { + 4, + 3, + 5, +@@ -19009,7 +19009,7 @@ + 8, + }; + +-static long _vq_lengthlist__44cn1_s_p3_0[] = { ++static const long _vq_lengthlist__44cn1_s_p3_0[] = { + 1, 2, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, + 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, + 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, +@@ -19018,34 +19018,34 @@ + 0, + }; + +-static float _vq_quantthresh__44cn1_s_p3_0[] = { ++static const float _vq_quantthresh__44cn1_s_p3_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44cn1_s_p3_0[] = { ++static const long _vq_quantmap__44cn1_s_p3_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_s_p3_0 = { +- _vq_quantthresh__44cn1_s_p3_0, +- _vq_quantmap__44cn1_s_p3_0, ++static const encode_aux_threshmatch _vq_auxt__44cn1_s_p3_0 = { ++ (float *)_vq_quantthresh__44cn1_s_p3_0, ++ (long *)_vq_quantmap__44cn1_s_p3_0, + 9, + 9 + }; + +-static static_codebook _44cn1_s_p3_0 = { ++static const static_codebook _44cn1_s_p3_0 = { + 2, 81, +- _vq_lengthlist__44cn1_s_p3_0, ++ (long *)_vq_lengthlist__44cn1_s_p3_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44cn1_s_p3_0, ++ (long *)_vq_quantlist__44cn1_s_p3_0, + NULL, +- &_vq_auxt__44cn1_s_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_s_p4_0[] = { ++static const long _vq_quantlist__44cn1_s_p4_0[] = { + 4, + 3, + 5, +@@ -19057,7 +19057,7 @@ + 8, + }; + +-static long _vq_lengthlist__44cn1_s_p4_0[] = { ++static const long _vq_lengthlist__44cn1_s_p4_0[] = { + 1, 3, 3, 6, 6, 6, 6, 8, 8, 0, 0, 0, 6, 6, 7, 7, + 9, 9, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0, 7, 7, + 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0, +@@ -19066,34 +19066,34 @@ + 11, + }; + +-static float _vq_quantthresh__44cn1_s_p4_0[] = { ++static const float _vq_quantthresh__44cn1_s_p4_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44cn1_s_p4_0[] = { ++static const long _vq_quantmap__44cn1_s_p4_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_s_p4_0 = { +- _vq_quantthresh__44cn1_s_p4_0, +- _vq_quantmap__44cn1_s_p4_0, ++static const encode_aux_threshmatch _vq_auxt__44cn1_s_p4_0 = { ++ (float *)_vq_quantthresh__44cn1_s_p4_0, ++ (long *)_vq_quantmap__44cn1_s_p4_0, + 9, + 9 + }; + +-static static_codebook _44cn1_s_p4_0 = { ++static const static_codebook _44cn1_s_p4_0 = { + 2, 81, +- _vq_lengthlist__44cn1_s_p4_0, ++ (long *)_vq_lengthlist__44cn1_s_p4_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44cn1_s_p4_0, ++ (long *)_vq_quantlist__44cn1_s_p4_0, + NULL, +- &_vq_auxt__44cn1_s_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_s_p5_0[] = { ++static const long _vq_quantlist__44cn1_s_p5_0[] = { + 8, + 7, + 9, +@@ -19113,7 +19113,7 @@ + 16, + }; + +-static long _vq_lengthlist__44cn1_s_p5_0[] = { ++static const long _vq_lengthlist__44cn1_s_p5_0[] = { + 1, 4, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,10, + 10, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10, + 11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, +@@ -19135,42 +19135,42 @@ + 14, + }; + +-static float _vq_quantthresh__44cn1_s_p5_0[] = { ++static const float _vq_quantthresh__44cn1_s_p5_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44cn1_s_p5_0[] = { ++static const long _vq_quantmap__44cn1_s_p5_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_s_p5_0 = { +- _vq_quantthresh__44cn1_s_p5_0, +- _vq_quantmap__44cn1_s_p5_0, ++static const encode_aux_threshmatch _vq_auxt__44cn1_s_p5_0 = { ++ (float *)_vq_quantthresh__44cn1_s_p5_0, ++ (long *)_vq_quantmap__44cn1_s_p5_0, + 17, + 17 + }; + +-static static_codebook _44cn1_s_p5_0 = { ++static const static_codebook _44cn1_s_p5_0 = { + 2, 289, +- _vq_lengthlist__44cn1_s_p5_0, ++ (long *)_vq_lengthlist__44cn1_s_p5_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44cn1_s_p5_0, ++ (long *)_vq_quantlist__44cn1_s_p5_0, + NULL, +- &_vq_auxt__44cn1_s_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_s_p6_0[] = { ++static const long _vq_quantlist__44cn1_s_p6_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44cn1_s_p6_0[] = { ++static const long _vq_lengthlist__44cn1_s_p6_0[] = { + 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 6, 6,10, 9, 9,11, + 9, 9, 4, 6, 6,10, 9, 9,10, 9, 9, 7,10,10,11,11, + 11,12,11,11, 7, 9, 9,11,11,10,11,10,10, 7, 9, 9, +@@ -19179,33 +19179,33 @@ + 10, + }; + +-static float _vq_quantthresh__44cn1_s_p6_0[] = { ++static const float _vq_quantthresh__44cn1_s_p6_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44cn1_s_p6_0[] = { ++static const long _vq_quantmap__44cn1_s_p6_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_s_p6_0 = { +- _vq_quantthresh__44cn1_s_p6_0, +- _vq_quantmap__44cn1_s_p6_0, ++static const encode_aux_threshmatch _vq_auxt__44cn1_s_p6_0 = { ++ (float *)_vq_quantthresh__44cn1_s_p6_0, ++ (long *)_vq_quantmap__44cn1_s_p6_0, + 3, + 3 + }; + +-static static_codebook _44cn1_s_p6_0 = { ++static const static_codebook _44cn1_s_p6_0 = { + 4, 81, +- _vq_lengthlist__44cn1_s_p6_0, ++ (long *)_vq_lengthlist__44cn1_s_p6_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44cn1_s_p6_0, ++ (long *)_vq_quantlist__44cn1_s_p6_0, + NULL, +- &_vq_auxt__44cn1_s_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_s_p6_1[] = { ++static const long _vq_quantlist__44cn1_s_p6_1[] = { + 5, + 4, + 6, +@@ -19219,7 +19219,7 @@ + 10, + }; + +-static long _vq_lengthlist__44cn1_s_p6_1[] = { ++static const long _vq_lengthlist__44cn1_s_p6_1[] = { + 1, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 7, 6, + 8, 8, 8, 8, 8, 8,10,10,10, 7, 6, 7, 7, 8, 8, 8, + 8,10,10,10, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, +@@ -19230,35 +19230,35 @@ + 10,10,10, 9, 9, 9, 9, 9, 9, + }; + +-static float _vq_quantthresh__44cn1_s_p6_1[] = { ++static const float _vq_quantthresh__44cn1_s_p6_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44cn1_s_p6_1[] = { ++static const long _vq_quantmap__44cn1_s_p6_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_s_p6_1 = { +- _vq_quantthresh__44cn1_s_p6_1, +- _vq_quantmap__44cn1_s_p6_1, ++static const encode_aux_threshmatch _vq_auxt__44cn1_s_p6_1 = { ++ (float *)_vq_quantthresh__44cn1_s_p6_1, ++ (long *)_vq_quantmap__44cn1_s_p6_1, + 11, + 11 + }; + +-static static_codebook _44cn1_s_p6_1 = { ++static const static_codebook _44cn1_s_p6_1 = { + 2, 121, +- _vq_lengthlist__44cn1_s_p6_1, ++ (long *)_vq_lengthlist__44cn1_s_p6_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44cn1_s_p6_1, ++ (long *)_vq_quantlist__44cn1_s_p6_1, + NULL, +- &_vq_auxt__44cn1_s_p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_s_p7_0[] = { ++static const long _vq_quantlist__44cn1_s_p7_0[] = { + 6, + 5, + 7, +@@ -19274,7 +19274,7 @@ + 12, + }; + +-static long _vq_lengthlist__44cn1_s_p7_0[] = { ++static const long _vq_lengthlist__44cn1_s_p7_0[] = { + 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5, + 7, 7, 8, 8, 8, 8, 9, 9,11,11, 7, 5, 5, 7, 7, 8, + 8, 8, 8, 9,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9, +@@ -19288,35 +19288,35 @@ + 0,13,13,12,12,13,13,13,14, + }; + +-static float _vq_quantthresh__44cn1_s_p7_0[] = { ++static const float _vq_quantthresh__44cn1_s_p7_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44cn1_s_p7_0[] = { ++static const long _vq_quantmap__44cn1_s_p7_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_s_p7_0 = { +- _vq_quantthresh__44cn1_s_p7_0, +- _vq_quantmap__44cn1_s_p7_0, ++static const encode_aux_threshmatch _vq_auxt__44cn1_s_p7_0 = { ++ (float *)_vq_quantthresh__44cn1_s_p7_0, ++ (long *)_vq_quantmap__44cn1_s_p7_0, + 13, + 13 + }; + +-static static_codebook _44cn1_s_p7_0 = { ++static const static_codebook _44cn1_s_p7_0 = { + 2, 169, +- _vq_lengthlist__44cn1_s_p7_0, ++ (long *)_vq_lengthlist__44cn1_s_p7_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44cn1_s_p7_0, ++ (long *)_vq_quantlist__44cn1_s_p7_0, + NULL, +- &_vq_auxt__44cn1_s_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_s_p7_1[] = { ++static const long _vq_quantlist__44cn1_s_p7_1[] = { + 2, + 1, + 3, +@@ -19324,38 +19324,38 @@ + 4, + }; + +-static long _vq_lengthlist__44cn1_s_p7_1[] = { ++static const long _vq_lengthlist__44cn1_s_p7_1[] = { + 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, + 6, 6, 5, 5, 6, 6, 6, 5, 5, + }; + +-static float _vq_quantthresh__44cn1_s_p7_1[] = { ++static const float _vq_quantthresh__44cn1_s_p7_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44cn1_s_p7_1[] = { ++static const long _vq_quantmap__44cn1_s_p7_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_s_p7_1 = { +- _vq_quantthresh__44cn1_s_p7_1, +- _vq_quantmap__44cn1_s_p7_1, ++static const encode_aux_threshmatch _vq_auxt__44cn1_s_p7_1 = { ++ (float *)_vq_quantthresh__44cn1_s_p7_1, ++ (long *)_vq_quantmap__44cn1_s_p7_1, + 5, + 5 + }; + +-static static_codebook _44cn1_s_p7_1 = { ++static const static_codebook _44cn1_s_p7_1 = { + 2, 25, +- _vq_lengthlist__44cn1_s_p7_1, ++ (long *)_vq_lengthlist__44cn1_s_p7_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44cn1_s_p7_1, ++ (long *)_vq_quantlist__44cn1_s_p7_1, + NULL, +- &_vq_auxt__44cn1_s_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_s_p8_0[] = { ++static const long _vq_quantlist__44cn1_s_p8_0[] = { + 2, + 1, + 3, +@@ -19363,7 +19363,7 @@ + 4, + }; + +-static long _vq_lengthlist__44cn1_s_p8_0[] = { ++static const long _vq_lengthlist__44cn1_s_p8_0[] = { + 1, 7, 7,11,11, 8,11,11,11,11, 4,11, 3,11,11,11, + 11,11,11,11,11,11,11,11,11,11,11,10,11,11,11,11, + 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, +@@ -19406,33 +19406,33 @@ + 12, + }; + +-static float _vq_quantthresh__44cn1_s_p8_0[] = { ++static const float _vq_quantthresh__44cn1_s_p8_0[] = { + -331.5, -110.5, 110.5, 331.5, + }; + +-static long _vq_quantmap__44cn1_s_p8_0[] = { ++static const long _vq_quantmap__44cn1_s_p8_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_s_p8_0 = { +- _vq_quantthresh__44cn1_s_p8_0, +- _vq_quantmap__44cn1_s_p8_0, ++static const encode_aux_threshmatch _vq_auxt__44cn1_s_p8_0 = { ++ (float *)_vq_quantthresh__44cn1_s_p8_0, ++ (long *)_vq_quantmap__44cn1_s_p8_0, + 5, + 5 + }; + +-static static_codebook _44cn1_s_p8_0 = { ++static const static_codebook _44cn1_s_p8_0 = { + 4, 625, +- _vq_lengthlist__44cn1_s_p8_0, ++ (long *)_vq_lengthlist__44cn1_s_p8_0, + 1, -518283264, 1627103232, 3, 0, +- _vq_quantlist__44cn1_s_p8_0, ++ (long *)_vq_quantlist__44cn1_s_p8_0, + NULL, +- &_vq_auxt__44cn1_s_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_s_p8_1[] = { ++static const long _vq_quantlist__44cn1_s_p8_1[] = { + 6, + 5, + 7, +@@ -19448,7 +19448,7 @@ + 12, + }; + +-static long _vq_lengthlist__44cn1_s_p8_1[] = { ++static const long _vq_lengthlist__44cn1_s_p8_1[] = { + 1, 4, 4, 6, 6, 8, 8, 9,10,10,11,11,11, 6, 5, 5, + 7, 7, 8, 8, 9,10, 9,11,11,12, 5, 5, 5, 7, 7, 8, + 9,10,10,12,12,14,13,15, 7, 7, 8, 8, 9,10,11,11, +@@ -19462,35 +19462,35 @@ + 15,12,12,11,11,14,12,13,14, + }; + +-static float _vq_quantthresh__44cn1_s_p8_1[] = { ++static const float _vq_quantthresh__44cn1_s_p8_1[] = { + -93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, 25.5, + 42.5, 59.5, 76.5, 93.5, + }; + +-static long _vq_quantmap__44cn1_s_p8_1[] = { ++static const long _vq_quantmap__44cn1_s_p8_1[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_s_p8_1 = { +- _vq_quantthresh__44cn1_s_p8_1, +- _vq_quantmap__44cn1_s_p8_1, ++static const encode_aux_threshmatch _vq_auxt__44cn1_s_p8_1 = { ++ (float *)_vq_quantthresh__44cn1_s_p8_1, ++ (long *)_vq_quantmap__44cn1_s_p8_1, + 13, + 13 + }; + +-static static_codebook _44cn1_s_p8_1 = { ++static const static_codebook _44cn1_s_p8_1 = { + 2, 169, +- _vq_lengthlist__44cn1_s_p8_1, ++ (long *)_vq_lengthlist__44cn1_s_p8_1, + 1, -522616832, 1620115456, 4, 0, +- _vq_quantlist__44cn1_s_p8_1, ++ (long *)_vq_quantlist__44cn1_s_p8_1, + NULL, +- &_vq_auxt__44cn1_s_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_s_p8_2[] = { ++static const long _vq_quantlist__44cn1_s_p8_2[] = { + 8, + 7, + 9, +@@ -19510,7 +19510,7 @@ + 16, + }; + +-static long _vq_lengthlist__44cn1_s_p8_2[] = { ++static const long _vq_lengthlist__44cn1_s_p8_2[] = { + 3, 4, 3, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9, + 9,10,11,11, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, + 9, 9,10,10,10, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9, 9, +@@ -19532,36 +19532,36 @@ + 9, + }; + +-static float _vq_quantthresh__44cn1_s_p8_2[] = { ++static const float _vq_quantthresh__44cn1_s_p8_2[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44cn1_s_p8_2[] = { ++static const long _vq_quantmap__44cn1_s_p8_2[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_s_p8_2 = { +- _vq_quantthresh__44cn1_s_p8_2, +- _vq_quantmap__44cn1_s_p8_2, ++static const encode_aux_threshmatch _vq_auxt__44cn1_s_p8_2 = { ++ (float *)_vq_quantthresh__44cn1_s_p8_2, ++ (long *)_vq_quantmap__44cn1_s_p8_2, + 17, + 17 + }; + +-static static_codebook _44cn1_s_p8_2 = { ++static const static_codebook _44cn1_s_p8_2 = { + 2, 289, +- _vq_lengthlist__44cn1_s_p8_2, ++ (long *)_vq_lengthlist__44cn1_s_p8_2, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44cn1_s_p8_2, ++ (long *)_vq_quantlist__44cn1_s_p8_2, + NULL, +- &_vq_auxt__44cn1_s_p8_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_s_p8_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44cn1_s_short[] = { ++static const long _huff_lengthlist__44cn1_s_short[] = { + 10, 9,12,15,12,13,16,14,16, 7, 1, 5,14, 7,10,13, + 16,16, 9, 4, 6,16, 8,11,16,16,16,14, 4, 7,16, 9, + 12,14,16,16,10, 5, 7,14, 9,12,14,15,15,13, 8, 9, +@@ -19570,9 +19570,9 @@ + 10, + }; + +-static static_codebook _huff_book__44cn1_s_short = { ++static const static_codebook _huff_book__44cn1_s_short = { + 2, 81, +- _huff_lengthlist__44cn1_s_short, ++ (long *)_huff_lengthlist__44cn1_s_short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -19581,7 +19581,7 @@ + 0 + }; + +-static long _huff_lengthlist__44cn1_sm_long[] = { ++static const long _huff_lengthlist__44cn1_sm_long[] = { + 3, 3, 8, 8, 8, 8,10,12,14, 3, 2, 6, 7, 7, 8,10, + 12,16, 7, 6, 7, 9, 8,10,12,14,16, 8, 6, 8, 4, 5, + 7, 9,11,13, 7, 6, 8, 5, 6, 7, 9,11,14, 8, 8,10, +@@ -19590,9 +19590,9 @@ + 17, + }; + +-static static_codebook _huff_book__44cn1_sm_long = { ++static const static_codebook _huff_book__44cn1_sm_long = { + 2, 81, +- _huff_lengthlist__44cn1_sm_long, ++ (long *)_huff_lengthlist__44cn1_sm_long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -19601,13 +19601,13 @@ + 0 + }; + +-static long _vq_quantlist__44cn1_sm_p1_0[] = { ++static const long _vq_quantlist__44cn1_sm_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44cn1_sm_p1_0[] = { ++static const long _vq_lengthlist__44cn1_sm_p1_0[] = { + 1, 4, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, + 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -20021,33 +20021,33 @@ + 0, + }; + +-static float _vq_quantthresh__44cn1_sm_p1_0[] = { ++static const float _vq_quantthresh__44cn1_sm_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44cn1_sm_p1_0[] = { ++static const long _vq_quantmap__44cn1_sm_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p1_0 = { +- _vq_quantthresh__44cn1_sm_p1_0, +- _vq_quantmap__44cn1_sm_p1_0, ++static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p1_0 = { ++ (float *)_vq_quantthresh__44cn1_sm_p1_0, ++ (long *)_vq_quantmap__44cn1_sm_p1_0, + 3, + 3 + }; + +-static static_codebook _44cn1_sm_p1_0 = { ++static const static_codebook _44cn1_sm_p1_0 = { + 8, 6561, +- _vq_lengthlist__44cn1_sm_p1_0, ++ (long *)_vq_lengthlist__44cn1_sm_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44cn1_sm_p1_0, ++ (long *)_vq_quantlist__44cn1_sm_p1_0, + NULL, +- &_vq_auxt__44cn1_sm_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_sm_p2_0[] = { ++static const long _vq_quantlist__44cn1_sm_p2_0[] = { + 2, + 1, + 3, +@@ -20055,7 +20055,7 @@ + 4, + }; + +-static long _vq_lengthlist__44cn1_sm_p2_0[] = { ++static const long _vq_lengthlist__44cn1_sm_p2_0[] = { + 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -20098,33 +20098,33 @@ + 0, + }; + +-static float _vq_quantthresh__44cn1_sm_p2_0[] = { ++static const float _vq_quantthresh__44cn1_sm_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44cn1_sm_p2_0[] = { ++static const long _vq_quantmap__44cn1_sm_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p2_0 = { +- _vq_quantthresh__44cn1_sm_p2_0, +- _vq_quantmap__44cn1_sm_p2_0, ++static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p2_0 = { ++ (float *)_vq_quantthresh__44cn1_sm_p2_0, ++ (long *)_vq_quantmap__44cn1_sm_p2_0, + 5, + 5 + }; + +-static static_codebook _44cn1_sm_p2_0 = { ++static const static_codebook _44cn1_sm_p2_0 = { + 4, 625, +- _vq_lengthlist__44cn1_sm_p2_0, ++ (long *)_vq_lengthlist__44cn1_sm_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44cn1_sm_p2_0, ++ (long *)_vq_quantlist__44cn1_sm_p2_0, + NULL, +- &_vq_auxt__44cn1_sm_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_sm_p3_0[] = { ++static const long _vq_quantlist__44cn1_sm_p3_0[] = { + 4, + 3, + 5, +@@ -20136,7 +20136,7 @@ + 8, + }; + +-static long _vq_lengthlist__44cn1_sm_p3_0[] = { ++static const long _vq_lengthlist__44cn1_sm_p3_0[] = { + 1, 3, 4, 7, 7, 0, 0, 0, 0, 0, 4, 4, 7, 7, 0, 0, + 0, 0, 0, 4, 5, 7, 7, 0, 0, 0, 0, 0, 6, 7, 8, 8, + 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, +@@ -20145,34 +20145,34 @@ + 0, + }; + +-static float _vq_quantthresh__44cn1_sm_p3_0[] = { ++static const float _vq_quantthresh__44cn1_sm_p3_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44cn1_sm_p3_0[] = { ++static const long _vq_quantmap__44cn1_sm_p3_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p3_0 = { +- _vq_quantthresh__44cn1_sm_p3_0, +- _vq_quantmap__44cn1_sm_p3_0, ++static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p3_0 = { ++ (float *)_vq_quantthresh__44cn1_sm_p3_0, ++ (long *)_vq_quantmap__44cn1_sm_p3_0, + 9, + 9 + }; + +-static static_codebook _44cn1_sm_p3_0 = { ++static const static_codebook _44cn1_sm_p3_0 = { + 2, 81, +- _vq_lengthlist__44cn1_sm_p3_0, ++ (long *)_vq_lengthlist__44cn1_sm_p3_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44cn1_sm_p3_0, ++ (long *)_vq_quantlist__44cn1_sm_p3_0, + NULL, +- &_vq_auxt__44cn1_sm_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_sm_p4_0[] = { ++static const long _vq_quantlist__44cn1_sm_p4_0[] = { + 4, + 3, + 5, +@@ -20184,7 +20184,7 @@ + 8, + }; + +-static long _vq_lengthlist__44cn1_sm_p4_0[] = { ++static const long _vq_lengthlist__44cn1_sm_p4_0[] = { + 1, 4, 3, 6, 6, 7, 7, 9, 9, 0, 5, 5, 7, 7, 8, 7, + 9, 9, 0, 5, 5, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 8, + 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, +@@ -20193,34 +20193,34 @@ + 11, + }; + +-static float _vq_quantthresh__44cn1_sm_p4_0[] = { ++static const float _vq_quantthresh__44cn1_sm_p4_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44cn1_sm_p4_0[] = { ++static const long _vq_quantmap__44cn1_sm_p4_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p4_0 = { +- _vq_quantthresh__44cn1_sm_p4_0, +- _vq_quantmap__44cn1_sm_p4_0, ++static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p4_0 = { ++ (float *)_vq_quantthresh__44cn1_sm_p4_0, ++ (long *)_vq_quantmap__44cn1_sm_p4_0, + 9, + 9 + }; + +-static static_codebook _44cn1_sm_p4_0 = { ++static const static_codebook _44cn1_sm_p4_0 = { + 2, 81, +- _vq_lengthlist__44cn1_sm_p4_0, ++ (long *)_vq_lengthlist__44cn1_sm_p4_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44cn1_sm_p4_0, ++ (long *)_vq_quantlist__44cn1_sm_p4_0, + NULL, +- &_vq_auxt__44cn1_sm_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_sm_p5_0[] = { ++static const long _vq_quantlist__44cn1_sm_p5_0[] = { + 8, + 7, + 9, +@@ -20240,7 +20240,7 @@ + 16, + }; + +-static long _vq_lengthlist__44cn1_sm_p5_0[] = { ++static const long _vq_lengthlist__44cn1_sm_p5_0[] = { + 1, 4, 4, 6, 6, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11, + 11, 0, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11, + 12,12, 0, 6, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11, +@@ -20262,42 +20262,42 @@ + 14, + }; + +-static float _vq_quantthresh__44cn1_sm_p5_0[] = { ++static const float _vq_quantthresh__44cn1_sm_p5_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44cn1_sm_p5_0[] = { ++static const long _vq_quantmap__44cn1_sm_p5_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p5_0 = { +- _vq_quantthresh__44cn1_sm_p5_0, +- _vq_quantmap__44cn1_sm_p5_0, ++static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p5_0 = { ++ (float *)_vq_quantthresh__44cn1_sm_p5_0, ++ (long *)_vq_quantmap__44cn1_sm_p5_0, + 17, + 17 + }; + +-static static_codebook _44cn1_sm_p5_0 = { ++static const static_codebook _44cn1_sm_p5_0 = { + 2, 289, +- _vq_lengthlist__44cn1_sm_p5_0, ++ (long *)_vq_lengthlist__44cn1_sm_p5_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44cn1_sm_p5_0, ++ (long *)_vq_quantlist__44cn1_sm_p5_0, + NULL, +- &_vq_auxt__44cn1_sm_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_sm_p6_0[] = { ++static const long _vq_quantlist__44cn1_sm_p6_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44cn1_sm_p6_0[] = { ++static const long _vq_lengthlist__44cn1_sm_p6_0[] = { + 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 6,10, 9, 9,11, + 9, 9, 4, 6, 7,10, 9, 9,11, 9, 9, 7,10,10,10,11, + 11,11,11,10, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, +@@ -20306,33 +20306,33 @@ + 10, + }; + +-static float _vq_quantthresh__44cn1_sm_p6_0[] = { ++static const float _vq_quantthresh__44cn1_sm_p6_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44cn1_sm_p6_0[] = { ++static const long _vq_quantmap__44cn1_sm_p6_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p6_0 = { +- _vq_quantthresh__44cn1_sm_p6_0, +- _vq_quantmap__44cn1_sm_p6_0, ++static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p6_0 = { ++ (float *)_vq_quantthresh__44cn1_sm_p6_0, ++ (long *)_vq_quantmap__44cn1_sm_p6_0, + 3, + 3 + }; + +-static static_codebook _44cn1_sm_p6_0 = { ++static const static_codebook _44cn1_sm_p6_0 = { + 4, 81, +- _vq_lengthlist__44cn1_sm_p6_0, ++ (long *)_vq_lengthlist__44cn1_sm_p6_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44cn1_sm_p6_0, ++ (long *)_vq_quantlist__44cn1_sm_p6_0, + NULL, +- &_vq_auxt__44cn1_sm_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_sm_p6_1[] = { ++static const long _vq_quantlist__44cn1_sm_p6_1[] = { + 5, + 4, + 6, +@@ -20346,7 +20346,7 @@ + 10, + }; + +-static long _vq_lengthlist__44cn1_sm_p6_1[] = { ++static const long _vq_lengthlist__44cn1_sm_p6_1[] = { + 2, 4, 4, 5, 5, 7, 7, 7, 7, 8, 8,10, 5, 5, 6, 6, + 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, + 8,10, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, +@@ -20357,35 +20357,35 @@ + 10,10,10, 8, 9, 8, 8, 9, 8, + }; + +-static float _vq_quantthresh__44cn1_sm_p6_1[] = { ++static const float _vq_quantthresh__44cn1_sm_p6_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44cn1_sm_p6_1[] = { ++static const long _vq_quantmap__44cn1_sm_p6_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p6_1 = { +- _vq_quantthresh__44cn1_sm_p6_1, +- _vq_quantmap__44cn1_sm_p6_1, ++static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p6_1 = { ++ (float *)_vq_quantthresh__44cn1_sm_p6_1, ++ (long *)_vq_quantmap__44cn1_sm_p6_1, + 11, + 11 + }; + +-static static_codebook _44cn1_sm_p6_1 = { ++static const static_codebook _44cn1_sm_p6_1 = { + 2, 121, +- _vq_lengthlist__44cn1_sm_p6_1, ++ (long *)_vq_lengthlist__44cn1_sm_p6_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44cn1_sm_p6_1, ++ (long *)_vq_quantlist__44cn1_sm_p6_1, + NULL, +- &_vq_auxt__44cn1_sm_p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_sm_p7_0[] = { ++static const long _vq_quantlist__44cn1_sm_p7_0[] = { + 6, + 5, + 7, +@@ -20401,7 +20401,7 @@ + 12, + }; + +-static long _vq_lengthlist__44cn1_sm_p7_0[] = { ++static const long _vq_lengthlist__44cn1_sm_p7_0[] = { + 1, 4, 4, 6, 6, 7, 7, 7, 7, 9, 9,10,10, 7, 5, 5, + 7, 7, 8, 8, 8, 8,10, 9,11,10, 7, 5, 5, 7, 7, 8, + 8, 8, 8, 9,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9, +@@ -20415,35 +20415,35 @@ + 0,13,12,12,12,13,13,13,14, + }; + +-static float _vq_quantthresh__44cn1_sm_p7_0[] = { ++static const float _vq_quantthresh__44cn1_sm_p7_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44cn1_sm_p7_0[] = { ++static const long _vq_quantmap__44cn1_sm_p7_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p7_0 = { +- _vq_quantthresh__44cn1_sm_p7_0, +- _vq_quantmap__44cn1_sm_p7_0, ++static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p7_0 = { ++ (float *)_vq_quantthresh__44cn1_sm_p7_0, ++ (long *)_vq_quantmap__44cn1_sm_p7_0, + 13, + 13 + }; + +-static static_codebook _44cn1_sm_p7_0 = { ++static const static_codebook _44cn1_sm_p7_0 = { + 2, 169, +- _vq_lengthlist__44cn1_sm_p7_0, ++ (long *)_vq_lengthlist__44cn1_sm_p7_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44cn1_sm_p7_0, ++ (long *)_vq_quantlist__44cn1_sm_p7_0, + NULL, +- &_vq_auxt__44cn1_sm_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_sm_p7_1[] = { ++static const long _vq_quantlist__44cn1_sm_p7_1[] = { + 2, + 1, + 3, +@@ -20451,38 +20451,38 @@ + 4, + }; + +-static long _vq_lengthlist__44cn1_sm_p7_1[] = { ++static const long _vq_lengthlist__44cn1_sm_p7_1[] = { + 2, 4, 4, 4, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, + 5, 5, 5, 5, 6, 6, 6, 5, 5, + }; + +-static float _vq_quantthresh__44cn1_sm_p7_1[] = { ++static const float _vq_quantthresh__44cn1_sm_p7_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44cn1_sm_p7_1[] = { ++static const long _vq_quantmap__44cn1_sm_p7_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p7_1 = { +- _vq_quantthresh__44cn1_sm_p7_1, +- _vq_quantmap__44cn1_sm_p7_1, ++static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p7_1 = { ++ (float *)_vq_quantthresh__44cn1_sm_p7_1, ++ (long *)_vq_quantmap__44cn1_sm_p7_1, + 5, + 5 + }; + +-static static_codebook _44cn1_sm_p7_1 = { ++static const static_codebook _44cn1_sm_p7_1 = { + 2, 25, +- _vq_lengthlist__44cn1_sm_p7_1, ++ (long *)_vq_lengthlist__44cn1_sm_p7_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44cn1_sm_p7_1, ++ (long *)_vq_quantlist__44cn1_sm_p7_1, + NULL, +- &_vq_auxt__44cn1_sm_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_sm_p8_0[] = { ++static const long _vq_quantlist__44cn1_sm_p8_0[] = { + 4, + 3, + 5, +@@ -20494,7 +20494,7 @@ + 8, + }; + +-static long _vq_lengthlist__44cn1_sm_p8_0[] = { ++static const long _vq_lengthlist__44cn1_sm_p8_0[] = { + 1, 4, 4,12,11,13,13,14,14, 4, 7, 7,11,13,14,14, + 14,14, 3, 8, 3,14,14,14,14,14,14,14,10,12,14,14, + 14,14,14,14,14,14, 5,14, 8,14,14,14,14,14,12,14, +@@ -20503,34 +20503,34 @@ + 14, + }; + +-static float _vq_quantthresh__44cn1_sm_p8_0[] = { ++static const float _vq_quantthresh__44cn1_sm_p8_0[] = { + -773.5, -552.5, -331.5, -110.5, 110.5, 331.5, 552.5, 773.5, + }; + +-static long _vq_quantmap__44cn1_sm_p8_0[] = { ++static const long _vq_quantmap__44cn1_sm_p8_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p8_0 = { +- _vq_quantthresh__44cn1_sm_p8_0, +- _vq_quantmap__44cn1_sm_p8_0, ++static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p8_0 = { ++ (float *)_vq_quantthresh__44cn1_sm_p8_0, ++ (long *)_vq_quantmap__44cn1_sm_p8_0, + 9, + 9 + }; + +-static static_codebook _44cn1_sm_p8_0 = { ++static const static_codebook _44cn1_sm_p8_0 = { + 2, 81, +- _vq_lengthlist__44cn1_sm_p8_0, ++ (long *)_vq_lengthlist__44cn1_sm_p8_0, + 1, -516186112, 1627103232, 4, 0, +- _vq_quantlist__44cn1_sm_p8_0, ++ (long *)_vq_quantlist__44cn1_sm_p8_0, + NULL, +- &_vq_auxt__44cn1_sm_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_sm_p8_1[] = { ++static const long _vq_quantlist__44cn1_sm_p8_1[] = { + 6, + 5, + 7, +@@ -20546,7 +20546,7 @@ + 12, + }; + +-static long _vq_lengthlist__44cn1_sm_p8_1[] = { ++static const long _vq_lengthlist__44cn1_sm_p8_1[] = { + 1, 4, 4, 6, 6, 8, 8, 9, 9,10,11,11,11, 6, 5, 5, + 7, 7, 8, 8,10,10,10,11,11,11, 6, 5, 5, 7, 7, 8, + 8,10,10,11,12,12,12,14, 7, 7, 7, 8, 9, 9,11,11, +@@ -20560,35 +20560,35 @@ + 17,12,12,11,10,13,11,13,13, + }; + +-static float _vq_quantthresh__44cn1_sm_p8_1[] = { ++static const float _vq_quantthresh__44cn1_sm_p8_1[] = { + -93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, 25.5, + 42.5, 59.5, 76.5, 93.5, + }; + +-static long _vq_quantmap__44cn1_sm_p8_1[] = { ++static const long _vq_quantmap__44cn1_sm_p8_1[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p8_1 = { +- _vq_quantthresh__44cn1_sm_p8_1, +- _vq_quantmap__44cn1_sm_p8_1, ++static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p8_1 = { ++ (float *)_vq_quantthresh__44cn1_sm_p8_1, ++ (long *)_vq_quantmap__44cn1_sm_p8_1, + 13, + 13 + }; + +-static static_codebook _44cn1_sm_p8_1 = { ++static const static_codebook _44cn1_sm_p8_1 = { + 2, 169, +- _vq_lengthlist__44cn1_sm_p8_1, ++ (long *)_vq_lengthlist__44cn1_sm_p8_1, + 1, -522616832, 1620115456, 4, 0, +- _vq_quantlist__44cn1_sm_p8_1, ++ (long *)_vq_quantlist__44cn1_sm_p8_1, + NULL, +- &_vq_auxt__44cn1_sm_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44cn1_sm_p8_2[] = { ++static const long _vq_quantlist__44cn1_sm_p8_2[] = { + 8, + 7, + 9, +@@ -20608,7 +20608,7 @@ + 16, + }; + +-static long _vq_lengthlist__44cn1_sm_p8_2[] = { ++static const long _vq_lengthlist__44cn1_sm_p8_2[] = { + 3, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, + 9,10, 6, 6, 6, 6, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, + 9, 9,10, 6, 6, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, +@@ -20630,36 +20630,36 @@ + 9, + }; + +-static float _vq_quantthresh__44cn1_sm_p8_2[] = { ++static const float _vq_quantthresh__44cn1_sm_p8_2[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44cn1_sm_p8_2[] = { ++static const long _vq_quantmap__44cn1_sm_p8_2[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44cn1_sm_p8_2 = { +- _vq_quantthresh__44cn1_sm_p8_2, +- _vq_quantmap__44cn1_sm_p8_2, ++static const encode_aux_threshmatch _vq_auxt__44cn1_sm_p8_2 = { ++ (float *)_vq_quantthresh__44cn1_sm_p8_2, ++ (long *)_vq_quantmap__44cn1_sm_p8_2, + 17, + 17 + }; + +-static static_codebook _44cn1_sm_p8_2 = { ++static const static_codebook _44cn1_sm_p8_2 = { + 2, 289, +- _vq_lengthlist__44cn1_sm_p8_2, ++ (long *)_vq_lengthlist__44cn1_sm_p8_2, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44cn1_sm_p8_2, ++ (long *)_vq_quantlist__44cn1_sm_p8_2, + NULL, +- &_vq_auxt__44cn1_sm_p8_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44cn1_sm_p8_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44cn1_sm_short[] = { ++static const long _huff_lengthlist__44cn1_sm_short[] = { + 5, 6,12,14,12,14,16,17,18, 4, 2, 5,11, 7,10,12, + 14,15, 9, 4, 5,11, 7,10,13,15,18,15, 6, 7, 5, 6, + 8,11,13,16,11, 5, 6, 5, 5, 6, 9,13,15,12, 5, 7, +@@ -20668,9 +20668,9 @@ + 9, + }; + +-static static_codebook _huff_book__44cn1_sm_short = { ++static const static_codebook _huff_book__44cn1_sm_short = { + 2, 81, +- _huff_lengthlist__44cn1_sm_short, ++ (long *)_huff_lengthlist__44cn1_sm_short, + 0, 0, 0, 0, 0, + NULL, + NULL, +diff -ruN libvorbis-1.2.0/lib/books/floor/floor_books.h aotuv-b5.7_20090301/lib/books/floor/floor_books.h +--- libvorbis-1.2.0/lib/books/floor/floor_books.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/books/floor/floor_books.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,19 +11,19 @@ + ******************************************************************** + + function: static codebooks autogenerated by huff/huffbuld +- last modified: $Id: floor_books.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last modified: $Id: floor_books.h 15531 2008-11-24 23:50:06Z xiphmont $ + + ********************************************************************/ + + #include "codebook.h" + +-static long _huff_lengthlist_line_256x7_0sub1[] = { ++static const long _huff_lengthlist_line_256x7_0sub1[] = { + 0, 2, 3, 3, 3, 3, 4, 3, 4, + }; + +-static static_codebook _huff_book_line_256x7_0sub1 = { ++static const static_codebook _huff_book_line_256x7_0sub1 = { + 1, 9, +- _huff_lengthlist_line_256x7_0sub1, ++ (long *)_huff_lengthlist_line_256x7_0sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -32,14 +32,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_256x7_0sub2[] = { ++static const long _huff_lengthlist_line_256x7_0sub2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 3, 4, 3, 5, 3, + 6, 3, 6, 4, 6, 4, 7, 5, 7, + }; + +-static static_codebook _huff_book_line_256x7_0sub2 = { ++static const static_codebook _huff_book_line_256x7_0sub2 = { + 1, 25, +- _huff_lengthlist_line_256x7_0sub2, ++ (long *)_huff_lengthlist_line_256x7_0sub2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -48,16 +48,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_256x7_0sub3[] = { ++static const long _huff_lengthlist_line_256x7_0sub3[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 2, 5, 3, 5, 3, + 6, 3, 6, 4, 7, 6, 7, 8, 7, 9, 8, 9, 9, 9,10, 9, + 11,13,11,13,10,10,13,13,13,13,13,13,12,12,12,12, + }; + +-static static_codebook _huff_book_line_256x7_0sub3 = { ++static const static_codebook _huff_book_line_256x7_0sub3 = { + 1, 64, +- _huff_lengthlist_line_256x7_0sub3, ++ (long *)_huff_lengthlist_line_256x7_0sub3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -66,13 +66,13 @@ + 0 + }; + +-static long _huff_lengthlist_line_256x7_1sub1[] = { ++static const long _huff_lengthlist_line_256x7_1sub1[] = { + 0, 3, 3, 3, 3, 2, 4, 3, 4, + }; + +-static static_codebook _huff_book_line_256x7_1sub1 = { ++static const static_codebook _huff_book_line_256x7_1sub1 = { + 1, 9, +- _huff_lengthlist_line_256x7_1sub1, ++ (long *)_huff_lengthlist_line_256x7_1sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -81,14 +81,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_256x7_1sub2[] = { ++static const long _huff_lengthlist_line_256x7_1sub2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 4, 3, 4, 4, + 5, 4, 6, 5, 6, 7, 6, 8, 8, + }; + +-static static_codebook _huff_book_line_256x7_1sub2 = { ++static const static_codebook _huff_book_line_256x7_1sub2 = { + 1, 25, +- _huff_lengthlist_line_256x7_1sub2, ++ (long *)_huff_lengthlist_line_256x7_1sub2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -97,16 +97,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_256x7_1sub3[] = { ++static const long _huff_lengthlist_line_256x7_1sub3[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 4, 3, 6, 3, 7, + 3, 8, 5, 8, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, + }; + +-static static_codebook _huff_book_line_256x7_1sub3 = { ++static const static_codebook _huff_book_line_256x7_1sub3 = { + 1, 64, +- _huff_lengthlist_line_256x7_1sub3, ++ (long *)_huff_lengthlist_line_256x7_1sub3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -115,16 +115,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_256x7_class0[] = { ++static const long _huff_lengthlist_line_256x7_class0[] = { + 7, 5, 5, 9, 9, 6, 6, 9,12, 8, 7, 8,11, 8, 9,15, + 6, 3, 3, 7, 7, 4, 3, 6, 9, 6, 5, 6, 8, 6, 8,15, + 8, 5, 5, 9, 8, 5, 4, 6,10, 7, 5, 5,11, 8, 7,15, + 14,15,13,13,13,13, 8,11,15,10, 7, 6,11, 9,10,15, + }; + +-static static_codebook _huff_book_line_256x7_class0 = { ++static const static_codebook _huff_book_line_256x7_class0 = { + 1, 64, +- _huff_lengthlist_line_256x7_class0, ++ (long *)_huff_lengthlist_line_256x7_class0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -133,7 +133,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_256x7_class1[] = { ++static const long _huff_lengthlist_line_256x7_class1[] = { + 5, 6, 8,15, 6, 9,10,15,10,11,12,15,15,15,15,15, + 4, 6, 7,15, 6, 7, 8,15, 9, 8, 9,15,15,15,15,15, + 6, 8, 9,15, 7, 7, 8,15,10, 9,10,15,15,15,15,15, +@@ -152,9 +152,9 @@ + 15,15,15,15,15,15,13,15,15,15,15,15,15,15,15,15, + }; + +-static static_codebook _huff_book_line_256x7_class1 = { ++static const static_codebook _huff_book_line_256x7_class1 = { + 1, 256, +- _huff_lengthlist_line_256x7_class1, ++ (long *)_huff_lengthlist_line_256x7_class1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -163,7 +163,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_512x17_0sub0[] = { ++static const long _huff_lengthlist_line_512x17_0sub0[] = { + 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 6, 5, 6, 6, 6, 6, 5, 6, 6, 7, 6, 7, 6, 7, 6, + 7, 6, 8, 7, 8, 7, 8, 7, 8, 7, 8, 7, 9, 7, 9, 7, +@@ -174,9 +174,9 @@ + 18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18, + }; + +-static static_codebook _huff_book_line_512x17_0sub0 = { ++static const static_codebook _huff_book_line_512x17_0sub0 = { + 1, 128, +- _huff_lengthlist_line_512x17_0sub0, ++ (long *)_huff_lengthlist_line_512x17_0sub0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -185,14 +185,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_512x17_1sub0[] = { ++static const long _huff_lengthlist_line_512x17_1sub0[] = { + 2, 4, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 6, 5, + 6, 5, 6, 6, 7, 6, 7, 6, 8, 7, 8, 7, 8, 7, 8, 7, + }; + +-static static_codebook _huff_book_line_512x17_1sub0 = { ++static const static_codebook _huff_book_line_512x17_1sub0 = { + 1, 32, +- _huff_lengthlist_line_512x17_1sub0, ++ (long *)_huff_lengthlist_line_512x17_1sub0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -201,7 +201,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_512x17_1sub1[] = { ++static const long _huff_lengthlist_line_512x17_1sub1[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 4, 3, 5, 3, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 6, 5, +@@ -212,9 +212,9 @@ + 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15, + }; + +-static static_codebook _huff_book_line_512x17_1sub1 = { ++static const static_codebook _huff_book_line_512x17_1sub1 = { + 1, 128, +- _huff_lengthlist_line_512x17_1sub1, ++ (long *)_huff_lengthlist_line_512x17_1sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -223,14 +223,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_512x17_2sub1[] = { ++static const long _huff_lengthlist_line_512x17_2sub1[] = { + 0, 4, 5, 4, 4, 4, 5, 4, 4, 4, 5, 4, 5, 4, 5, 3, + 5, 3, + }; + +-static static_codebook _huff_book_line_512x17_2sub1 = { ++static const static_codebook _huff_book_line_512x17_2sub1 = { + 1, 18, +- _huff_lengthlist_line_512x17_2sub1, ++ (long *)_huff_lengthlist_line_512x17_2sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -239,16 +239,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_512x17_2sub2[] = { ++static const long _huff_lengthlist_line_512x17_2sub2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 4, 3, 4, 3, 4, 4, 5, 4, 5, 4, 6, 4, 6, 5, + 6, 5, 7, 5, 7, 6, 8, 6, 8, 6, 8, 7, 8, 7, 9, 7, + 9, 8, + }; + +-static static_codebook _huff_book_line_512x17_2sub2 = { ++static const static_codebook _huff_book_line_512x17_2sub2 = { + 1, 50, +- _huff_lengthlist_line_512x17_2sub2, ++ (long *)_huff_lengthlist_line_512x17_2sub2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -257,7 +257,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_512x17_2sub3[] = { ++static const long _huff_lengthlist_line_512x17_2sub3[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -268,9 +268,9 @@ + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + }; + +-static static_codebook _huff_book_line_512x17_2sub3 = { ++static const static_codebook _huff_book_line_512x17_2sub3 = { + 1, 128, +- _huff_lengthlist_line_512x17_2sub3, ++ (long *)_huff_lengthlist_line_512x17_2sub3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -279,14 +279,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_512x17_3sub1[] = { ++static const long _huff_lengthlist_line_512x17_3sub1[] = { + 0, 4, 4, 4, 4, 4, 4, 3, 4, 4, 4, 4, 4, 5, 4, 5, + 5, 5, + }; + +-static static_codebook _huff_book_line_512x17_3sub1 = { ++static const static_codebook _huff_book_line_512x17_3sub1 = { + 1, 18, +- _huff_lengthlist_line_512x17_3sub1, ++ (long *)_huff_lengthlist_line_512x17_3sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -295,16 +295,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_512x17_3sub2[] = { ++static const long _huff_lengthlist_line_512x17_3sub2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 2, 3, 3, 4, 3, 5, 4, 6, 4, 6, 5, 7, 6, 7, + 6, 8, 6, 8, 7, 9, 8,10, 8,12, 9,13,10,15,10,15, + 11,14, + }; + +-static static_codebook _huff_book_line_512x17_3sub2 = { ++static const static_codebook _huff_book_line_512x17_3sub2 = { + 1, 50, +- _huff_lengthlist_line_512x17_3sub2, ++ (long *)_huff_lengthlist_line_512x17_3sub2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -313,7 +313,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_512x17_3sub3[] = { ++static const long _huff_lengthlist_line_512x17_3sub3[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -324,9 +324,9 @@ + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + }; + +-static static_codebook _huff_book_line_512x17_3sub3 = { ++static const static_codebook _huff_book_line_512x17_3sub3 = { + 1, 128, +- _huff_lengthlist_line_512x17_3sub3, ++ (long *)_huff_lengthlist_line_512x17_3sub3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -335,13 +335,13 @@ + 0 + }; + +-static long _huff_lengthlist_line_512x17_class1[] = { ++static const long _huff_lengthlist_line_512x17_class1[] = { + 1, 2, 3, 6, 5, 4, 7, 7, + }; + +-static static_codebook _huff_book_line_512x17_class1 = { ++static const static_codebook _huff_book_line_512x17_class1 = { + 1, 8, +- _huff_lengthlist_line_512x17_class1, ++ (long *)_huff_lengthlist_line_512x17_class1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -350,16 +350,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_512x17_class2[] = { ++static const long _huff_lengthlist_line_512x17_class2[] = { + 3, 3, 3,14, 5, 4, 4,11, 8, 6, 6,10,17,12,11,17, + 6, 5, 5,15, 5, 3, 4,11, 8, 5, 5, 8,16, 9,10,14, + 10, 8, 9,17, 8, 6, 6,13,10, 7, 7,10,16,11,13,14, + 17,17,17,17,17,16,16,16,16,15,16,16,16,16,16,16, + }; + +-static static_codebook _huff_book_line_512x17_class2 = { ++static const static_codebook _huff_book_line_512x17_class2 = { + 1, 64, +- _huff_lengthlist_line_512x17_class2, ++ (long *)_huff_lengthlist_line_512x17_class2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -368,16 +368,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_512x17_class3[] = { ++static const long _huff_lengthlist_line_512x17_class3[] = { + 2, 4, 6,17, 4, 5, 7,17, 8, 7,10,17,17,17,17,17, + 3, 4, 6,15, 3, 3, 6,15, 7, 6, 9,17,17,17,17,17, + 6, 8,10,17, 6, 6, 8,16, 9, 8,10,17,17,15,16,17, + 17,17,17,17,12,15,15,16,12,15,15,16,16,16,16,16, + }; + +-static static_codebook _huff_book_line_512x17_class3 = { ++static const static_codebook _huff_book_line_512x17_class3 = { + 1, 64, +- _huff_lengthlist_line_512x17_class3, ++ (long *)_huff_lengthlist_line_512x17_class3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -386,7 +386,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x4_class0[] = { ++static const long _huff_lengthlist_line_128x4_class0[] = { + 7, 7, 7,11, 6, 6, 7,11, 7, 6, 6,10,12,10,10,13, + 7, 7, 8,11, 7, 7, 7,11, 7, 6, 7,10,11,10,10,13, + 10,10, 9,12, 9, 9, 9,11, 8, 8, 8,11,13,11,10,14, +@@ -405,9 +405,9 @@ + 17,17,15,17,17,17,17,17,17,13,12,17,17,17,14,17, + }; + +-static static_codebook _huff_book_line_128x4_class0 = { ++static const static_codebook _huff_book_line_128x4_class0 = { + 1, 256, +- _huff_lengthlist_line_128x4_class0, ++ (long *)_huff_lengthlist_line_128x4_class0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -416,13 +416,13 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x4_0sub0[] = { ++static const long _huff_lengthlist_line_128x4_0sub0[] = { + 2, 2, 2, 2, + }; + +-static static_codebook _huff_book_line_128x4_0sub0 = { ++static const static_codebook _huff_book_line_128x4_0sub0 = { + 1, 4, +- _huff_lengthlist_line_128x4_0sub0, ++ (long *)_huff_lengthlist_line_128x4_0sub0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -431,13 +431,13 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x4_0sub1[] = { ++static const long _huff_lengthlist_line_128x4_0sub1[] = { + 0, 0, 0, 0, 3, 2, 3, 2, 3, 3, + }; + +-static static_codebook _huff_book_line_128x4_0sub1 = { ++static const static_codebook _huff_book_line_128x4_0sub1 = { + 1, 10, +- _huff_lengthlist_line_128x4_0sub1, ++ (long *)_huff_lengthlist_line_128x4_0sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -446,14 +446,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x4_0sub2[] = { ++static const long _huff_lengthlist_line_128x4_0sub2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 4, 3, 4, 3, + 4, 4, 5, 4, 5, 4, 6, 5, 6, + }; + +-static static_codebook _huff_book_line_128x4_0sub2 = { ++static const static_codebook _huff_book_line_128x4_0sub2 = { + 1, 25, +- _huff_lengthlist_line_128x4_0sub2, ++ (long *)_huff_lengthlist_line_128x4_0sub2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -462,16 +462,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x4_0sub3[] = { ++static const long _huff_lengthlist_line_128x4_0sub3[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 3, 5, 3, 5, 3, + 5, 4, 6, 5, 6, 5, 7, 6, 6, 7, 7, 9, 9,11,11,16, + 11,14,10,11,11,13,16,15,15,15,15,15,15,15,15,15, + }; + +-static static_codebook _huff_book_line_128x4_0sub3 = { ++static const static_codebook _huff_book_line_128x4_0sub3 = { + 1, 64, +- _huff_lengthlist_line_128x4_0sub3, ++ (long *)_huff_lengthlist_line_128x4_0sub3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -480,7 +480,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_256x4_class0[] = { ++static const long _huff_lengthlist_line_256x4_class0[] = { + 6, 7, 7,12, 6, 6, 7,12, 7, 6, 6,10,15,12,11,13, + 7, 7, 8,13, 7, 7, 8,12, 7, 7, 7,11,12,12,11,13, + 10, 9, 9,11, 9, 9, 9,10,10, 8, 8,12,14,12,12,14, +@@ -499,9 +499,9 @@ + 15,12,11,15,13,11,11,15,12,14,11,13,15,15,13,13, + }; + +-static static_codebook _huff_book_line_256x4_class0 = { ++static const static_codebook _huff_book_line_256x4_class0 = { + 1, 256, +- _huff_lengthlist_line_256x4_class0, ++ (long *)_huff_lengthlist_line_256x4_class0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -510,13 +510,13 @@ + 0 + }; + +-static long _huff_lengthlist_line_256x4_0sub0[] = { ++static const long _huff_lengthlist_line_256x4_0sub0[] = { + 2, 2, 2, 2, + }; + +-static static_codebook _huff_book_line_256x4_0sub0 = { ++static const static_codebook _huff_book_line_256x4_0sub0 = { + 1, 4, +- _huff_lengthlist_line_256x4_0sub0, ++ (long *)_huff_lengthlist_line_256x4_0sub0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -525,13 +525,13 @@ + 0 + }; + +-static long _huff_lengthlist_line_256x4_0sub1[] = { ++static const long _huff_lengthlist_line_256x4_0sub1[] = { + 0, 0, 0, 0, 2, 2, 3, 3, 3, 3, + }; + +-static static_codebook _huff_book_line_256x4_0sub1 = { ++static const static_codebook _huff_book_line_256x4_0sub1 = { + 1, 10, +- _huff_lengthlist_line_256x4_0sub1, ++ (long *)_huff_lengthlist_line_256x4_0sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -540,14 +540,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_256x4_0sub2[] = { ++static const long _huff_lengthlist_line_256x4_0sub2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 3, 4, 3, 4, 3, + 5, 3, 5, 4, 5, 4, 6, 4, 6, + }; + +-static static_codebook _huff_book_line_256x4_0sub2 = { ++static const static_codebook _huff_book_line_256x4_0sub2 = { + 1, 25, +- _huff_lengthlist_line_256x4_0sub2, ++ (long *)_huff_lengthlist_line_256x4_0sub2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -556,16 +556,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_256x4_0sub3[] = { ++static const long _huff_lengthlist_line_256x4_0sub3[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 3, 5, 3, 5, 3, + 6, 4, 7, 4, 7, 5, 7, 6, 7, 6, 7, 8,10,13,13,13, + 13,13,13,13,13,13,13,13,13,13,13,12,12,12,12,12, + }; + +-static static_codebook _huff_book_line_256x4_0sub3 = { ++static const static_codebook _huff_book_line_256x4_0sub3 = { + 1, 64, +- _huff_lengthlist_line_256x4_0sub3, ++ (long *)_huff_lengthlist_line_256x4_0sub3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -574,16 +574,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x7_class0[] = { ++static const long _huff_lengthlist_line_128x7_class0[] = { + 10, 7, 8,13, 9, 6, 7,11,10, 8, 8,12,17,17,17,17, + 7, 5, 5, 9, 6, 4, 4, 8, 8, 5, 5, 8,16,14,13,16, + 7, 5, 5, 7, 6, 3, 3, 5, 8, 5, 4, 7,14,12,12,15, + 10, 7, 8, 9, 7, 5, 5, 6, 9, 6, 5, 5,15,12, 9,10, + }; + +-static static_codebook _huff_book_line_128x7_class0 = { ++static const static_codebook _huff_book_line_128x7_class0 = { + 1, 64, +- _huff_lengthlist_line_128x7_class0, ++ (long *)_huff_lengthlist_line_128x7_class0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -592,7 +592,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x7_class1[] = { ++static const long _huff_lengthlist_line_128x7_class1[] = { + 8,13,17,17, 8,11,17,17,11,13,17,17,17,17,17,17, + 6,10,16,17, 6,10,15,17, 8,10,16,17,17,17,17,17, + 9,13,15,17, 8,11,17,17,10,12,17,17,17,17,17,17, +@@ -611,9 +611,9 @@ + 12,15,17,17,11,14,17,17,11,10,15,17,17,16,17,17, + }; + +-static static_codebook _huff_book_line_128x7_class1 = { ++static const static_codebook _huff_book_line_128x7_class1 = { + 1, 256, +- _huff_lengthlist_line_128x7_class1, ++ (long *)_huff_lengthlist_line_128x7_class1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -622,13 +622,13 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x7_0sub1[] = { ++static const long _huff_lengthlist_line_128x7_0sub1[] = { + 0, 3, 3, 3, 3, 3, 3, 3, 3, + }; + +-static static_codebook _huff_book_line_128x7_0sub1 = { ++static const static_codebook _huff_book_line_128x7_0sub1 = { + 1, 9, +- _huff_lengthlist_line_128x7_0sub1, ++ (long *)_huff_lengthlist_line_128x7_0sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -637,14 +637,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x7_0sub2[] = { ++static const long _huff_lengthlist_line_128x7_0sub2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 4, 4, 4, 4, + 5, 4, 5, 4, 5, 4, 6, 4, 6, + }; + +-static static_codebook _huff_book_line_128x7_0sub2 = { ++static const static_codebook _huff_book_line_128x7_0sub2 = { + 1, 25, +- _huff_lengthlist_line_128x7_0sub2, ++ (long *)_huff_lengthlist_line_128x7_0sub2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -653,16 +653,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x7_0sub3[] = { ++static const long _huff_lengthlist_line_128x7_0sub3[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 3, 5, 3, 5, 4, + 5, 4, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, + 7, 8, 9,11,13,13,13,13,13,13,13,13,13,13,13,13, + }; + +-static static_codebook _huff_book_line_128x7_0sub3 = { ++static const static_codebook _huff_book_line_128x7_0sub3 = { + 1, 64, +- _huff_lengthlist_line_128x7_0sub3, ++ (long *)_huff_lengthlist_line_128x7_0sub3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -671,13 +671,13 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x7_1sub1[] = { ++static const long _huff_lengthlist_line_128x7_1sub1[] = { + 0, 3, 3, 2, 3, 3, 4, 3, 4, + }; + +-static static_codebook _huff_book_line_128x7_1sub1 = { ++static const static_codebook _huff_book_line_128x7_1sub1 = { + 1, 9, +- _huff_lengthlist_line_128x7_1sub1, ++ (long *)_huff_lengthlist_line_128x7_1sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -686,14 +686,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x7_1sub2[] = { ++static const long _huff_lengthlist_line_128x7_1sub2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 3, 6, 3, 6, 3, + 6, 3, 7, 3, 8, 4, 9, 4, 9, + }; + +-static static_codebook _huff_book_line_128x7_1sub2 = { ++static const static_codebook _huff_book_line_128x7_1sub2 = { + 1, 25, +- _huff_lengthlist_line_128x7_1sub2, ++ (long *)_huff_lengthlist_line_128x7_1sub2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -702,16 +702,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x7_1sub3[] = { ++static const long _huff_lengthlist_line_128x7_1sub3[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 7, 2, 7, 3, 8, 4, + 9, 5, 9, 8,10,11,11,12,14,14,14,14,14,14,14,14, + 14,14,14,14,14,14,14,14,14,14,14,14,13,13,13,13, + }; + +-static static_codebook _huff_book_line_128x7_1sub3 = { ++static const static_codebook _huff_book_line_128x7_1sub3 = { + 1, 64, +- _huff_lengthlist_line_128x7_1sub3, ++ (long *)_huff_lengthlist_line_128x7_1sub3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -720,13 +720,13 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x11_class1[] = { ++static const long _huff_lengthlist_line_128x11_class1[] = { + 1, 6, 3, 7, 2, 4, 5, 7, + }; + +-static static_codebook _huff_book_line_128x11_class1 = { ++static const static_codebook _huff_book_line_128x11_class1 = { + 1, 8, +- _huff_lengthlist_line_128x11_class1, ++ (long *)_huff_lengthlist_line_128x11_class1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -735,16 +735,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x11_class2[] = { ++static const long _huff_lengthlist_line_128x11_class2[] = { + 1, 6,12,16, 4,12,15,16, 9,15,16,16,16,16,16,16, + 2, 5,11,16, 5,11,13,16, 9,13,16,16,16,16,16,16, + 4, 8,12,16, 5, 9,12,16, 9,13,15,16,16,16,16,16, + 15,16,16,16,11,14,13,16,12,15,16,16,16,16,16,15, + }; + +-static static_codebook _huff_book_line_128x11_class2 = { ++static const static_codebook _huff_book_line_128x11_class2 = { + 1, 64, +- _huff_lengthlist_line_128x11_class2, ++ (long *)_huff_lengthlist_line_128x11_class2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -753,16 +753,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x11_class3[] = { ++static const long _huff_lengthlist_line_128x11_class3[] = { + 7, 6, 9,17, 7, 6, 8,17,12, 9,11,16,16,16,16,16, + 5, 4, 7,16, 5, 3, 6,14, 9, 6, 8,15,16,16,16,16, + 5, 4, 6,13, 3, 2, 4,11, 7, 4, 6,13,16,11,10,14, + 12,12,12,16, 9, 7,10,15,12, 9,11,16,16,15,15,16, + }; + +-static static_codebook _huff_book_line_128x11_class3 = { ++static const static_codebook _huff_book_line_128x11_class3 = { + 1, 64, +- _huff_lengthlist_line_128x11_class3, ++ (long *)_huff_lengthlist_line_128x11_class3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -771,7 +771,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x11_0sub0[] = { ++static const long _huff_lengthlist_line_128x11_0sub0[] = { + 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, + 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 6, 6, 6, 7, 6, + 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 8, 6, 8, 6, 8, 7, +@@ -782,9 +782,9 @@ + 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17, + }; + +-static static_codebook _huff_book_line_128x11_0sub0 = { ++static const static_codebook _huff_book_line_128x11_0sub0 = { + 1, 128, +- _huff_lengthlist_line_128x11_0sub0, ++ (long *)_huff_lengthlist_line_128x11_0sub0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -793,14 +793,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x11_1sub0[] = { ++static const long _huff_lengthlist_line_128x11_1sub0[] = { + 2, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, + 6, 5, 6, 5, 6, 5, 7, 6, 7, 6, 7, 6, 8, 6, 8, 6, + }; + +-static static_codebook _huff_book_line_128x11_1sub0 = { ++static const static_codebook _huff_book_line_128x11_1sub0 = { + 1, 32, +- _huff_lengthlist_line_128x11_1sub0, ++ (long *)_huff_lengthlist_line_128x11_1sub0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -809,7 +809,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x11_1sub1[] = { ++static const long _huff_lengthlist_line_128x11_1sub1[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 5, 3, 5, 3, 6, 4, 6, 4, 7, 4, 7, 4, 7, 4, 8, 4, +@@ -820,9 +820,9 @@ + 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14, + }; + +-static static_codebook _huff_book_line_128x11_1sub1 = { ++static const static_codebook _huff_book_line_128x11_1sub1 = { + 1, 128, +- _huff_lengthlist_line_128x11_1sub1, ++ (long *)_huff_lengthlist_line_128x11_1sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -831,14 +831,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x11_2sub1[] = { ++static const long _huff_lengthlist_line_128x11_2sub1[] = { + 0, 4, 5, 4, 5, 4, 5, 3, 5, 3, 5, 3, 5, 4, 4, 4, + 5, 5, + }; + +-static static_codebook _huff_book_line_128x11_2sub1 = { ++static const static_codebook _huff_book_line_128x11_2sub1 = { + 1, 18, +- _huff_lengthlist_line_128x11_2sub1, ++ (long *)_huff_lengthlist_line_128x11_2sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -847,16 +847,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x11_2sub2[] = { ++static const long _huff_lengthlist_line_128x11_2sub2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 3, 3, 3, 4, 4, 4, 4, 5, 4, 5, 4, 6, 5, 7, + 5, 7, 6, 8, 6, 8, 6, 9, 7, 9, 7,10, 7, 9, 8,11, + 8,11, + }; + +-static static_codebook _huff_book_line_128x11_2sub2 = { ++static const static_codebook _huff_book_line_128x11_2sub2 = { + 1, 50, +- _huff_lengthlist_line_128x11_2sub2, ++ (long *)_huff_lengthlist_line_128x11_2sub2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -865,7 +865,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x11_2sub3[] = { ++static const long _huff_lengthlist_line_128x11_2sub3[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -876,9 +876,9 @@ + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + }; + +-static static_codebook _huff_book_line_128x11_2sub3 = { ++static const static_codebook _huff_book_line_128x11_2sub3 = { + 1, 128, +- _huff_lengthlist_line_128x11_2sub3, ++ (long *)_huff_lengthlist_line_128x11_2sub3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -887,14 +887,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x11_3sub1[] = { ++static const long _huff_lengthlist_line_128x11_3sub1[] = { + 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 4, + 5, 4, + }; + +-static static_codebook _huff_book_line_128x11_3sub1 = { ++static const static_codebook _huff_book_line_128x11_3sub1 = { + 1, 18, +- _huff_lengthlist_line_128x11_3sub1, ++ (long *)_huff_lengthlist_line_128x11_3sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -903,16 +903,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x11_3sub2[] = { ++static const long _huff_lengthlist_line_128x11_3sub2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 5, 3, 5, 4, 6, 4, 6, 4, 7, 4, 7, 4, 8, 4, + 8, 4, 9, 4, 9, 4,10, 4,10, 5,10, 5,11, 5,12, 6, + 12, 6, + }; + +-static static_codebook _huff_book_line_128x11_3sub2 = { ++static const static_codebook _huff_book_line_128x11_3sub2 = { + 1, 50, +- _huff_lengthlist_line_128x11_3sub2, ++ (long *)_huff_lengthlist_line_128x11_3sub2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -921,7 +921,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x11_3sub3[] = { ++static const long _huff_lengthlist_line_128x11_3sub3[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -932,9 +932,9 @@ + 10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9, 9, + }; + +-static static_codebook _huff_book_line_128x11_3sub3 = { ++static const static_codebook _huff_book_line_128x11_3sub3 = { + 1, 128, +- _huff_lengthlist_line_128x11_3sub3, ++ (long *)_huff_lengthlist_line_128x11_3sub3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -943,13 +943,13 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x17_class1[] = { ++static const long _huff_lengthlist_line_128x17_class1[] = { + 1, 3, 4, 7, 2, 5, 6, 7, + }; + +-static static_codebook _huff_book_line_128x17_class1 = { ++static const static_codebook _huff_book_line_128x17_class1 = { + 1, 8, +- _huff_lengthlist_line_128x17_class1, ++ (long *)_huff_lengthlist_line_128x17_class1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -958,16 +958,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x17_class2[] = { ++static const long _huff_lengthlist_line_128x17_class2[] = { + 1, 4,10,19, 3, 8,13,19, 7,12,19,19,19,19,19,19, + 2, 6,11,19, 8,13,19,19, 9,11,19,19,19,19,19,19, + 6, 7,13,19, 9,13,19,19,10,13,18,18,18,18,18,18, + 18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18, + }; + +-static static_codebook _huff_book_line_128x17_class2 = { ++static const static_codebook _huff_book_line_128x17_class2 = { + 1, 64, +- _huff_lengthlist_line_128x17_class2, ++ (long *)_huff_lengthlist_line_128x17_class2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -976,16 +976,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x17_class3[] = { ++static const long _huff_lengthlist_line_128x17_class3[] = { + 3, 6,10,17, 4, 8,11,20, 8,10,11,20,20,20,20,20, + 2, 4, 8,18, 4, 6, 8,17, 7, 8,10,20,20,17,20,20, + 3, 5, 8,17, 3, 4, 6,17, 8, 8,10,17,17,12,16,20, + 13,13,15,20,10,10,12,20,15,14,15,20,20,20,19,19, + }; + +-static static_codebook _huff_book_line_128x17_class3 = { ++static const static_codebook _huff_book_line_128x17_class3 = { + 1, 64, +- _huff_lengthlist_line_128x17_class3, ++ (long *)_huff_lengthlist_line_128x17_class3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -994,7 +994,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x17_0sub0[] = { ++static const long _huff_lengthlist_line_128x17_0sub0[] = { + 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, + 7, 5, 7, 5, 7, 5, 7, 5, 7, 5, 7, 5, 8, 5, 8, 5, + 8, 5, 8, 5, 8, 6, 8, 6, 8, 6, 9, 6, 9, 6, 9, 6, +@@ -1005,9 +1005,9 @@ + 20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20, + }; + +-static static_codebook _huff_book_line_128x17_0sub0 = { ++static const static_codebook _huff_book_line_128x17_0sub0 = { + 1, 128, +- _huff_lengthlist_line_128x17_0sub0, ++ (long *)_huff_lengthlist_line_128x17_0sub0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1016,14 +1016,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x17_1sub0[] = { ++static const long _huff_lengthlist_line_128x17_1sub0[] = { + 2, 5, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 6, 5, + 6, 5, 6, 5, 7, 6, 7, 6, 7, 6, 8, 6, 9, 7, 9, 7, + }; + +-static static_codebook _huff_book_line_128x17_1sub0 = { ++static const static_codebook _huff_book_line_128x17_1sub0 = { + 1, 32, +- _huff_lengthlist_line_128x17_1sub0, ++ (long *)_huff_lengthlist_line_128x17_1sub0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1032,7 +1032,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x17_1sub1[] = { ++static const long _huff_lengthlist_line_128x17_1sub1[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 4, 3, 5, 3, 5, 3, 6, 3, 6, 4, 6, 4, 7, 4, 7, 5, +@@ -1043,9 +1043,9 @@ + 17,17,17,17,17,17,16,16,16,16,16,16,16,16,16,16, + }; + +-static static_codebook _huff_book_line_128x17_1sub1 = { ++static const static_codebook _huff_book_line_128x17_1sub1 = { + 1, 128, +- _huff_lengthlist_line_128x17_1sub1, ++ (long *)_huff_lengthlist_line_128x17_1sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1054,14 +1054,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x17_2sub1[] = { ++static const long _huff_lengthlist_line_128x17_2sub1[] = { + 0, 4, 5, 4, 6, 4, 8, 3, 9, 3, 9, 2, 9, 3, 8, 4, + 9, 4, + }; + +-static static_codebook _huff_book_line_128x17_2sub1 = { ++static const static_codebook _huff_book_line_128x17_2sub1 = { + 1, 18, +- _huff_lengthlist_line_128x17_2sub1, ++ (long *)_huff_lengthlist_line_128x17_2sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1070,16 +1070,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x17_2sub2[] = { ++static const long _huff_lengthlist_line_128x17_2sub2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 5, 1, 5, 3, 5, 3, 5, 4, 7, 5,10, 7,10, 7, + 12,10,14,10,14, 9,14,11,14,14,14,13,13,13,13,13, + 13,13, + }; + +-static static_codebook _huff_book_line_128x17_2sub2 = { ++static const static_codebook _huff_book_line_128x17_2sub2 = { + 1, 50, +- _huff_lengthlist_line_128x17_2sub2, ++ (long *)_huff_lengthlist_line_128x17_2sub2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1088,7 +1088,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x17_2sub3[] = { ++static const long _huff_lengthlist_line_128x17_2sub3[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -1099,9 +1099,9 @@ + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + }; + +-static static_codebook _huff_book_line_128x17_2sub3 = { ++static const static_codebook _huff_book_line_128x17_2sub3 = { + 1, 128, +- _huff_lengthlist_line_128x17_2sub3, ++ (long *)_huff_lengthlist_line_128x17_2sub3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1110,14 +1110,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x17_3sub1[] = { ++static const long _huff_lengthlist_line_128x17_3sub1[] = { + 0, 4, 4, 4, 4, 4, 4, 4, 5, 3, 5, 3, 5, 4, 6, 4, + 6, 4, + }; + +-static static_codebook _huff_book_line_128x17_3sub1 = { ++static const static_codebook _huff_book_line_128x17_3sub1 = { + 1, 18, +- _huff_lengthlist_line_128x17_3sub1, ++ (long *)_huff_lengthlist_line_128x17_3sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1126,16 +1126,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x17_3sub2[] = { ++static const long _huff_lengthlist_line_128x17_3sub2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 5, 3, 6, 3, 6, 4, 7, 4, 7, 4, 7, 4, 8, 4, + 8, 4, 8, 4, 8, 4, 9, 4, 9, 5,10, 5,10, 7,10, 8, + 10, 8, + }; + +-static static_codebook _huff_book_line_128x17_3sub2 = { ++static const static_codebook _huff_book_line_128x17_3sub2 = { + 1, 50, +- _huff_lengthlist_line_128x17_3sub2, ++ (long *)_huff_lengthlist_line_128x17_3sub2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1144,7 +1144,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_128x17_3sub3[] = { ++static const long _huff_lengthlist_line_128x17_3sub3[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -1155,9 +1155,9 @@ + 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, + }; + +-static static_codebook _huff_book_line_128x17_3sub3 = { ++static const static_codebook _huff_book_line_128x17_3sub3 = { + 1, 128, +- _huff_lengthlist_line_128x17_3sub3, ++ (long *)_huff_lengthlist_line_128x17_3sub3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1166,13 +1166,13 @@ + 0 + }; + +-static long _huff_lengthlist_line_1024x27_class1[] = { ++static const long _huff_lengthlist_line_1024x27_class1[] = { + 2,10, 8,14, 7,12,11,14, 1, 5, 3, 7, 4, 9, 7,13, + }; + +-static static_codebook _huff_book_line_1024x27_class1 = { ++static const static_codebook _huff_book_line_1024x27_class1 = { + 1, 16, +- _huff_lengthlist_line_1024x27_class1, ++ (long *)_huff_lengthlist_line_1024x27_class1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1181,13 +1181,13 @@ + 0 + }; + +-static long _huff_lengthlist_line_1024x27_class2[] = { ++static const long _huff_lengthlist_line_1024x27_class2[] = { + 1, 4, 2, 6, 3, 7, 5, 7, + }; + +-static static_codebook _huff_book_line_1024x27_class2 = { ++static const static_codebook _huff_book_line_1024x27_class2 = { + 1, 8, +- _huff_lengthlist_line_1024x27_class2, ++ (long *)_huff_lengthlist_line_1024x27_class2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1196,7 +1196,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_1024x27_class3[] = { ++static const long _huff_lengthlist_line_1024x27_class3[] = { + 1, 5, 7,21, 5, 8, 9,21,10, 9,12,20,20,16,20,20, + 4, 8, 9,20, 6, 8, 9,20,11,11,13,20,20,15,17,20, + 9,11,14,20, 8,10,15,20,11,13,15,20,20,20,20,20, +@@ -1215,9 +1215,9 @@ + 20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20, + }; + +-static static_codebook _huff_book_line_1024x27_class3 = { ++static const static_codebook _huff_book_line_1024x27_class3 = { + 1, 256, +- _huff_lengthlist_line_1024x27_class3, ++ (long *)_huff_lengthlist_line_1024x27_class3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1226,16 +1226,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_1024x27_class4[] = { ++static const long _huff_lengthlist_line_1024x27_class4[] = { + 2, 3, 7,13, 4, 4, 7,15, 8, 6, 9,17,21,16,15,21, + 2, 5, 7,11, 5, 5, 7,14, 9, 7,10,16,17,15,16,21, + 4, 7,10,17, 7, 7, 9,15,11, 9,11,16,21,18,15,21, + 18,21,21,21,15,17,17,19,21,19,18,20,21,21,21,20, + }; + +-static static_codebook _huff_book_line_1024x27_class4 = { ++static const static_codebook _huff_book_line_1024x27_class4 = { + 1, 64, +- _huff_lengthlist_line_1024x27_class4, ++ (long *)_huff_lengthlist_line_1024x27_class4, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1244,7 +1244,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_1024x27_0sub0[] = { ++static const long _huff_lengthlist_line_1024x27_0sub0[] = { + 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, + 6, 5, 6, 5, 6, 5, 6, 5, 7, 5, 7, 5, 7, 5, 7, 5, + 8, 6, 8, 6, 8, 6, 9, 6, 9, 6,10, 6,10, 6,11, 6, +@@ -1255,9 +1255,9 @@ + 22,22,22,22,22,22,21,21,21,21,21,21,21,21,21,21, + }; + +-static static_codebook _huff_book_line_1024x27_0sub0 = { ++static const static_codebook _huff_book_line_1024x27_0sub0 = { + 1, 128, +- _huff_lengthlist_line_1024x27_0sub0, ++ (long *)_huff_lengthlist_line_1024x27_0sub0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1266,14 +1266,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_1024x27_1sub0[] = { ++static const long _huff_lengthlist_line_1024x27_1sub0[] = { + 2, 5, 5, 4, 5, 4, 5, 4, 5, 4, 6, 5, 6, 5, 6, 5, + 6, 5, 7, 5, 7, 6, 8, 6, 8, 6, 8, 6, 9, 6, 9, 6, + }; + +-static static_codebook _huff_book_line_1024x27_1sub0 = { ++static const static_codebook _huff_book_line_1024x27_1sub0 = { + 1, 32, +- _huff_lengthlist_line_1024x27_1sub0, ++ (long *)_huff_lengthlist_line_1024x27_1sub0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1282,7 +1282,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_1024x27_1sub1[] = { ++static const long _huff_lengthlist_line_1024x27_1sub1[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 5, 8, 4, 9, 4, 9, 4, 9, 4, 9, 4, 9, 4, 9, 4, +@@ -1293,9 +1293,9 @@ + 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19, + }; + +-static static_codebook _huff_book_line_1024x27_1sub1 = { ++static const static_codebook _huff_book_line_1024x27_1sub1 = { + 1, 128, +- _huff_lengthlist_line_1024x27_1sub1, ++ (long *)_huff_lengthlist_line_1024x27_1sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1304,14 +1304,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_1024x27_2sub0[] = { ++static const long _huff_lengthlist_line_1024x27_2sub0[] = { + 1, 5, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, + 6, 6, 7, 7, 7, 7, 8, 7, 8, 8, 9, 8,10, 9,10, 9, + }; + +-static static_codebook _huff_book_line_1024x27_2sub0 = { ++static const static_codebook _huff_book_line_1024x27_2sub0 = { + 1, 32, +- _huff_lengthlist_line_1024x27_2sub0, ++ (long *)_huff_lengthlist_line_1024x27_2sub0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1320,7 +1320,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_1024x27_2sub1[] = { ++static const long _huff_lengthlist_line_1024x27_2sub1[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 4, 3, 4, 3, 4, 4, 5, 4, 5, 4, 5, 5, 6, 5, 6, 5, +@@ -1331,9 +1331,9 @@ + 16,16,16,16,16,16,16,16,16,16,16,16,16,16,15,15, + }; + +-static static_codebook _huff_book_line_1024x27_2sub1 = { ++static const static_codebook _huff_book_line_1024x27_2sub1 = { + 1, 128, +- _huff_lengthlist_line_1024x27_2sub1, ++ (long *)_huff_lengthlist_line_1024x27_2sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1342,14 +1342,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_1024x27_3sub1[] = { ++static const long _huff_lengthlist_line_1024x27_3sub1[] = { + 0, 4, 5, 4, 5, 3, 5, 3, 5, 3, 5, 4, 4, 4, 4, 5, + 5, 5, + }; + +-static static_codebook _huff_book_line_1024x27_3sub1 = { ++static const static_codebook _huff_book_line_1024x27_3sub1 = { + 1, 18, +- _huff_lengthlist_line_1024x27_3sub1, ++ (long *)_huff_lengthlist_line_1024x27_3sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1358,16 +1358,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_1024x27_3sub2[] = { ++static const long _huff_lengthlist_line_1024x27_3sub2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 3, 3, 4, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, + 5, 7, 5, 8, 6, 8, 6, 9, 7,10, 7,10, 8,10, 8,11, + 9,11, + }; + +-static static_codebook _huff_book_line_1024x27_3sub2 = { ++static const static_codebook _huff_book_line_1024x27_3sub2 = { + 1, 50, +- _huff_lengthlist_line_1024x27_3sub2, ++ (long *)_huff_lengthlist_line_1024x27_3sub2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1376,7 +1376,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_1024x27_3sub3[] = { ++static const long _huff_lengthlist_line_1024x27_3sub3[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -1387,9 +1387,9 @@ + 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, + }; + +-static static_codebook _huff_book_line_1024x27_3sub3 = { ++static const static_codebook _huff_book_line_1024x27_3sub3 = { + 1, 128, +- _huff_lengthlist_line_1024x27_3sub3, ++ (long *)_huff_lengthlist_line_1024x27_3sub3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1398,14 +1398,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_1024x27_4sub1[] = { ++static const long _huff_lengthlist_line_1024x27_4sub1[] = { + 0, 4, 5, 4, 5, 4, 5, 4, 5, 3, 5, 3, 5, 3, 5, 4, + 5, 4, + }; + +-static static_codebook _huff_book_line_1024x27_4sub1 = { ++static const static_codebook _huff_book_line_1024x27_4sub1 = { + 1, 18, +- _huff_lengthlist_line_1024x27_4sub1, ++ (long *)_huff_lengthlist_line_1024x27_4sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1414,16 +1414,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_1024x27_4sub2[] = { ++static const long _huff_lengthlist_line_1024x27_4sub2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 4, 2, 4, 2, 5, 3, 5, 4, 6, 6, 6, 7, 7, 8, + 7, 8, 7, 8, 7, 9, 8, 9, 8, 9, 8,10, 8,11, 9,12, + 9,12, + }; + +-static static_codebook _huff_book_line_1024x27_4sub2 = { ++static const static_codebook _huff_book_line_1024x27_4sub2 = { + 1, 50, +- _huff_lengthlist_line_1024x27_4sub2, ++ (long *)_huff_lengthlist_line_1024x27_4sub2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1432,7 +1432,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_1024x27_4sub3[] = { ++static const long _huff_lengthlist_line_1024x27_4sub3[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -1443,9 +1443,9 @@ + 11,11,11,11,11,11,11,11,11,11,10,10,10,10,10,10, + }; + +-static static_codebook _huff_book_line_1024x27_4sub3 = { ++static const static_codebook _huff_book_line_1024x27_4sub3 = { + 1, 128, +- _huff_lengthlist_line_1024x27_4sub3, ++ (long *)_huff_lengthlist_line_1024x27_4sub3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1454,13 +1454,13 @@ + 0 + }; + +-static long _huff_lengthlist_line_2048x27_class1[] = { ++static const long _huff_lengthlist_line_2048x27_class1[] = { + 2, 6, 8, 9, 7,11,13,13, 1, 3, 5, 5, 6, 6,12,10, + }; + +-static static_codebook _huff_book_line_2048x27_class1 = { ++static const static_codebook _huff_book_line_2048x27_class1 = { + 1, 16, +- _huff_lengthlist_line_2048x27_class1, ++ (long *)_huff_lengthlist_line_2048x27_class1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1469,13 +1469,13 @@ + 0 + }; + +-static long _huff_lengthlist_line_2048x27_class2[] = { ++static const long _huff_lengthlist_line_2048x27_class2[] = { + 1, 2, 3, 6, 4, 7, 5, 7, + }; + +-static static_codebook _huff_book_line_2048x27_class2 = { ++static const static_codebook _huff_book_line_2048x27_class2 = { + 1, 8, +- _huff_lengthlist_line_2048x27_class2, ++ (long *)_huff_lengthlist_line_2048x27_class2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1484,7 +1484,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_2048x27_class3[] = { ++static const long _huff_lengthlist_line_2048x27_class3[] = { + 3, 3, 6,16, 5, 5, 7,16, 9, 8,11,16,16,16,16,16, + 5, 5, 8,16, 5, 5, 7,16, 8, 7, 9,16,16,16,16,16, + 9, 9,12,16, 6, 8,11,16, 9,10,11,16,16,16,16,16, +@@ -1503,9 +1503,9 @@ + 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, + }; + +-static static_codebook _huff_book_line_2048x27_class3 = { ++static const static_codebook _huff_book_line_2048x27_class3 = { + 1, 256, +- _huff_lengthlist_line_2048x27_class3, ++ (long *)_huff_lengthlist_line_2048x27_class3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1514,16 +1514,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_2048x27_class4[] = { ++static const long _huff_lengthlist_line_2048x27_class4[] = { + 2, 4, 7,13, 4, 5, 7,15, 8, 7,10,16,16,14,16,16, + 2, 4, 7,16, 3, 4, 7,14, 8, 8,10,16,16,16,15,16, + 6, 8,11,16, 7, 7, 9,16,11, 9,13,16,16,16,15,16, + 16,16,16,16,14,16,16,16,16,16,16,16,16,16,16,16, + }; + +-static static_codebook _huff_book_line_2048x27_class4 = { ++static const static_codebook _huff_book_line_2048x27_class4 = { + 1, 64, +- _huff_lengthlist_line_2048x27_class4, ++ (long *)_huff_lengthlist_line_2048x27_class4, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1532,7 +1532,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_2048x27_0sub0[] = { ++static const long _huff_lengthlist_line_2048x27_0sub0[] = { + 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, + 6, 5, 7, 5, 7, 5, 7, 5, 8, 5, 8, 5, 8, 5, 9, 5, + 9, 6,10, 6,10, 6,11, 6,11, 6,11, 6,11, 6,11, 6, +@@ -1543,9 +1543,9 @@ + 17,17,17,17,17,17,17,17,17,17,17,17,16,16,16,16, + }; + +-static static_codebook _huff_book_line_2048x27_0sub0 = { ++static const static_codebook _huff_book_line_2048x27_0sub0 = { + 1, 128, +- _huff_lengthlist_line_2048x27_0sub0, ++ (long *)_huff_lengthlist_line_2048x27_0sub0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1554,14 +1554,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_2048x27_1sub0[] = { ++static const long _huff_lengthlist_line_2048x27_1sub0[] = { + 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 6, 6, 6, 6, 6, 6, 7, 6, 7, 6, 7, 6, 7, 6, + }; + +-static static_codebook _huff_book_line_2048x27_1sub0 = { ++static const static_codebook _huff_book_line_2048x27_1sub0 = { + 1, 32, +- _huff_lengthlist_line_2048x27_1sub0, ++ (long *)_huff_lengthlist_line_2048x27_1sub0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1570,7 +1570,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_2048x27_1sub1[] = { ++static const long _huff_lengthlist_line_2048x27_1sub1[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 6, 5, 7, 5, 7, 4, 7, 4, 8, 4, 8, 4, 8, 4, 8, 3, +@@ -1581,9 +1581,9 @@ + 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,14, + }; + +-static static_codebook _huff_book_line_2048x27_1sub1 = { ++static const static_codebook _huff_book_line_2048x27_1sub1 = { + 1, 128, +- _huff_lengthlist_line_2048x27_1sub1, ++ (long *)_huff_lengthlist_line_2048x27_1sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1592,14 +1592,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_2048x27_2sub0[] = { ++static const long _huff_lengthlist_line_2048x27_2sub0[] = { + 2, 4, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 6, 5, + 6, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, + }; + +-static static_codebook _huff_book_line_2048x27_2sub0 = { ++static const static_codebook _huff_book_line_2048x27_2sub0 = { + 1, 32, +- _huff_lengthlist_line_2048x27_2sub0, ++ (long *)_huff_lengthlist_line_2048x27_2sub0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1608,7 +1608,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_2048x27_2sub1[] = { ++static const long _huff_lengthlist_line_2048x27_2sub1[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 3, 4, 3, 4, 3, 4, 4, 5, 4, 5, 5, 5, 6, 6, 6, 7, +@@ -1619,9 +1619,9 @@ + 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, + }; + +-static static_codebook _huff_book_line_2048x27_2sub1 = { ++static const static_codebook _huff_book_line_2048x27_2sub1 = { + 1, 128, +- _huff_lengthlist_line_2048x27_2sub1, ++ (long *)_huff_lengthlist_line_2048x27_2sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1630,14 +1630,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_2048x27_3sub1[] = { ++static const long _huff_lengthlist_line_2048x27_3sub1[] = { + 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, + }; + +-static static_codebook _huff_book_line_2048x27_3sub1 = { ++static const static_codebook _huff_book_line_2048x27_3sub1 = { + 1, 18, +- _huff_lengthlist_line_2048x27_3sub1, ++ (long *)_huff_lengthlist_line_2048x27_3sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1646,16 +1646,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_2048x27_3sub2[] = { ++static const long _huff_lengthlist_line_2048x27_3sub2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, + 6, 7, 6, 7, 6, 8, 6, 9, 7, 9, 7, 9, 9,11, 9,12, + 10,12, + }; + +-static static_codebook _huff_book_line_2048x27_3sub2 = { ++static const static_codebook _huff_book_line_2048x27_3sub2 = { + 1, 50, +- _huff_lengthlist_line_2048x27_3sub2, ++ (long *)_huff_lengthlist_line_2048x27_3sub2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1664,7 +1664,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_2048x27_3sub3[] = { ++static const long _huff_lengthlist_line_2048x27_3sub3[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -1675,9 +1675,9 @@ + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + }; + +-static static_codebook _huff_book_line_2048x27_3sub3 = { ++static const static_codebook _huff_book_line_2048x27_3sub3 = { + 1, 128, +- _huff_lengthlist_line_2048x27_3sub3, ++ (long *)_huff_lengthlist_line_2048x27_3sub3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1686,14 +1686,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_2048x27_4sub1[] = { ++static const long _huff_lengthlist_line_2048x27_4sub1[] = { + 0, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, + 4, 5, + }; + +-static static_codebook _huff_book_line_2048x27_4sub1 = { ++static const static_codebook _huff_book_line_2048x27_4sub1 = { + 1, 18, +- _huff_lengthlist_line_2048x27_4sub1, ++ (long *)_huff_lengthlist_line_2048x27_4sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1702,16 +1702,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_2048x27_4sub2[] = { ++static const long _huff_lengthlist_line_2048x27_4sub2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 3, 2, 4, 3, 4, 4, 4, 5, 5, 6, 5, 6, 5, 7, + 6, 6, 6, 7, 7, 7, 8, 9, 9, 9,12,10,11,10,10,12, + 10,10, + }; + +-static static_codebook _huff_book_line_2048x27_4sub2 = { ++static const static_codebook _huff_book_line_2048x27_4sub2 = { + 1, 50, +- _huff_lengthlist_line_2048x27_4sub2, ++ (long *)_huff_lengthlist_line_2048x27_4sub2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1720,7 +1720,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_2048x27_4sub3[] = { ++static const long _huff_lengthlist_line_2048x27_4sub3[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -1731,9 +1731,9 @@ + 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, + }; + +-static static_codebook _huff_book_line_2048x27_4sub3 = { ++static const static_codebook _huff_book_line_2048x27_4sub3 = { + 1, 128, +- _huff_lengthlist_line_2048x27_4sub3, ++ (long *)_huff_lengthlist_line_2048x27_4sub3, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1742,7 +1742,7 @@ + 0 + }; + +-static long _huff_lengthlist_line_256x4low_class0[] = { ++static const long _huff_lengthlist_line_256x4low_class0[] = { + 4, 5, 6,11, 5, 5, 6,10, 7, 7, 6, 6,14,13, 9, 9, + 6, 6, 6,10, 6, 6, 6, 9, 8, 7, 7, 9,14,12, 8,11, + 8, 7, 7,11, 8, 8, 7,11, 9, 9, 7, 9,13,11, 9,13, +@@ -1761,9 +1761,9 @@ + 18,18,18,18,18,18,18,18,18,12,13,18,16,11, 9,18, + }; + +-static static_codebook _huff_book_line_256x4low_class0 = { ++static const static_codebook _huff_book_line_256x4low_class0 = { + 1, 256, +- _huff_lengthlist_line_256x4low_class0, ++ (long *)_huff_lengthlist_line_256x4low_class0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1772,13 +1772,13 @@ + 0 + }; + +-static long _huff_lengthlist_line_256x4low_0sub0[] = { ++static const long _huff_lengthlist_line_256x4low_0sub0[] = { + 1, 3, 2, 3, + }; + +-static static_codebook _huff_book_line_256x4low_0sub0 = { ++static const static_codebook _huff_book_line_256x4low_0sub0 = { + 1, 4, +- _huff_lengthlist_line_256x4low_0sub0, ++ (long *)_huff_lengthlist_line_256x4low_0sub0, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1787,13 +1787,13 @@ + 0 + }; + +-static long _huff_lengthlist_line_256x4low_0sub1[] = { ++static const long _huff_lengthlist_line_256x4low_0sub1[] = { + 0, 0, 0, 0, 2, 3, 2, 3, 3, 3, + }; + +-static static_codebook _huff_book_line_256x4low_0sub1 = { ++static const static_codebook _huff_book_line_256x4low_0sub1 = { + 1, 10, +- _huff_lengthlist_line_256x4low_0sub1, ++ (long *)_huff_lengthlist_line_256x4low_0sub1, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1802,14 +1802,14 @@ + 0 + }; + +-static long _huff_lengthlist_line_256x4low_0sub2[] = { ++static const long _huff_lengthlist_line_256x4low_0sub2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 4, 3, 4, + 4, 4, 4, 4, 5, 5, 5, 6, 6, + }; + +-static static_codebook _huff_book_line_256x4low_0sub2 = { ++static const static_codebook _huff_book_line_256x4low_0sub2 = { + 1, 25, +- _huff_lengthlist_line_256x4low_0sub2, ++ (long *)_huff_lengthlist_line_256x4low_0sub2, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1818,16 +1818,16 @@ + 0 + }; + +-static long _huff_lengthlist_line_256x4low_0sub3[] = { ++static const long _huff_lengthlist_line_256x4low_0sub3[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 2, 4, 3, 5, 4, + 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 7, 7, 8, 6, 9, + 7,12,11,16,13,16,12,15,13,15,12,14,12,15,15,15, + }; + +-static static_codebook _huff_book_line_256x4low_0sub3 = { ++static const static_codebook _huff_book_line_256x4low_0sub3 = { + 1, 64, +- _huff_lengthlist_line_256x4low_0sub3, ++ (long *)_huff_lengthlist_line_256x4low_0sub3, + 0, 0, 0, 0, 0, + NULL, + NULL, +diff -ruN libvorbis-1.2.0/lib/books/uncoupled/res_books_uncoupled.h aotuv-b5.7_20090301/lib/books/uncoupled/res_books_uncoupled.h +--- libvorbis-1.2.0/lib/books/uncoupled/res_books_uncoupled.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/books/uncoupled/res_books_uncoupled.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,18 +11,18 @@ + ******************************************************************** + + function: static codebooks autogenerated by huff/huffbuld +- last modified: $Id: res_books_uncoupled.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last modified: $Id: res_books_uncoupled.h 15531 2008-11-24 23:50:06Z xiphmont $ + + ********************************************************************/ + + #include "codebook.h" +-static long _vq_quantlist__16u0__p1_0[] = { ++static const long _vq_quantlist__16u0__p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__16u0__p1_0[] = { ++static const long _vq_lengthlist__16u0__p1_0[] = { + 1, 4, 4, 5, 7, 7, 5, 7, 8, 5, 8, 8, 8,10,10, 8, + 10,11, 5, 8, 8, 8,10,10, 8,10,10, 4, 9, 9, 9,12, + 11, 8,11,11, 8,12,11,10,12,14,10,13,13, 7,11,11, +@@ -31,39 +31,39 @@ + 12, + }; + +-static float _vq_quantthresh__16u0__p1_0[] = { ++static const float _vq_quantthresh__16u0__p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__16u0__p1_0[] = { ++static const long _vq_quantmap__16u0__p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__16u0__p1_0 = { +- _vq_quantthresh__16u0__p1_0, +- _vq_quantmap__16u0__p1_0, ++static const encode_aux_threshmatch _vq_auxt__16u0__p1_0 = { ++ (float *)_vq_quantthresh__16u0__p1_0, ++ (long *)_vq_quantmap__16u0__p1_0, + 3, + 3 + }; + +-static static_codebook _16u0__p1_0 = { ++static const static_codebook _16u0__p1_0 = { + 4, 81, +- _vq_lengthlist__16u0__p1_0, ++ (long *)_vq_lengthlist__16u0__p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__16u0__p1_0, ++ (long *)_vq_quantlist__16u0__p1_0, + NULL, +- &_vq_auxt__16u0__p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u0__p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u0__p2_0[] = { ++static const long _vq_quantlist__16u0__p2_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__16u0__p2_0[] = { ++static const long _vq_lengthlist__16u0__p2_0[] = { + 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 9, 7, + 8, 9, 5, 7, 7, 7, 9, 8, 7, 9, 7, 4, 7, 7, 7, 9, + 9, 7, 8, 8, 6, 9, 8, 7, 8,11, 9,11,10, 6, 8, 9, +@@ -72,33 +72,33 @@ + 8, + }; + +-static float _vq_quantthresh__16u0__p2_0[] = { ++static const float _vq_quantthresh__16u0__p2_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__16u0__p2_0[] = { ++static const long _vq_quantmap__16u0__p2_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__16u0__p2_0 = { +- _vq_quantthresh__16u0__p2_0, +- _vq_quantmap__16u0__p2_0, ++static const encode_aux_threshmatch _vq_auxt__16u0__p2_0 = { ++ (float *)_vq_quantthresh__16u0__p2_0, ++ (long *)_vq_quantmap__16u0__p2_0, + 3, + 3 + }; + +-static static_codebook _16u0__p2_0 = { ++static const static_codebook _16u0__p2_0 = { + 4, 81, +- _vq_lengthlist__16u0__p2_0, ++ (long *)_vq_lengthlist__16u0__p2_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__16u0__p2_0, ++ (long *)_vq_quantlist__16u0__p2_0, + NULL, +- &_vq_auxt__16u0__p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u0__p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u0__p3_0[] = { ++static const long _vq_quantlist__16u0__p3_0[] = { + 2, + 1, + 3, +@@ -106,7 +106,7 @@ + 4, + }; + +-static long _vq_lengthlist__16u0__p3_0[] = { ++static const long _vq_lengthlist__16u0__p3_0[] = { + 1, 5, 5, 7, 7, 6, 7, 7, 8, 8, 6, 7, 8, 8, 8, 8, + 9, 9,11,11, 8, 9, 9,11,11, 6, 9, 8,10,10, 8,10, + 10,11,11, 8,10,10,11,11,10,11,10,13,12, 9,11,10, +@@ -149,33 +149,33 @@ + 18, + }; + +-static float _vq_quantthresh__16u0__p3_0[] = { ++static const float _vq_quantthresh__16u0__p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__16u0__p3_0[] = { ++static const long _vq_quantmap__16u0__p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__16u0__p3_0 = { +- _vq_quantthresh__16u0__p3_0, +- _vq_quantmap__16u0__p3_0, ++static const encode_aux_threshmatch _vq_auxt__16u0__p3_0 = { ++ (float *)_vq_quantthresh__16u0__p3_0, ++ (long *)_vq_quantmap__16u0__p3_0, + 5, + 5 + }; + +-static static_codebook _16u0__p3_0 = { ++static const static_codebook _16u0__p3_0 = { + 4, 625, +- _vq_lengthlist__16u0__p3_0, ++ (long *)_vq_lengthlist__16u0__p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__16u0__p3_0, ++ (long *)_vq_quantlist__16u0__p3_0, + NULL, +- &_vq_auxt__16u0__p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u0__p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u0__p4_0[] = { ++static const long _vq_quantlist__16u0__p4_0[] = { + 2, + 1, + 3, +@@ -183,7 +183,7 @@ + 4, + }; + +-static long _vq_lengthlist__16u0__p4_0[] = { ++static const long _vq_lengthlist__16u0__p4_0[] = { + 3, 5, 5, 8, 8, 6, 6, 6, 9, 9, 6, 6, 6, 9, 9, 9, + 10, 9,11,11, 9, 9, 9,11,11, 6, 7, 7,10,10, 7, 7, + 8,10,10, 7, 7, 8,10,10,10,10,10,11,12, 9,10,10, +@@ -226,33 +226,33 @@ + 11, + }; + +-static float _vq_quantthresh__16u0__p4_0[] = { ++static const float _vq_quantthresh__16u0__p4_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__16u0__p4_0[] = { ++static const long _vq_quantmap__16u0__p4_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__16u0__p4_0 = { +- _vq_quantthresh__16u0__p4_0, +- _vq_quantmap__16u0__p4_0, ++static const encode_aux_threshmatch _vq_auxt__16u0__p4_0 = { ++ (float *)_vq_quantthresh__16u0__p4_0, ++ (long *)_vq_quantmap__16u0__p4_0, + 5, + 5 + }; + +-static static_codebook _16u0__p4_0 = { ++static const static_codebook _16u0__p4_0 = { + 4, 625, +- _vq_lengthlist__16u0__p4_0, ++ (long *)_vq_lengthlist__16u0__p4_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__16u0__p4_0, ++ (long *)_vq_quantlist__16u0__p4_0, + NULL, +- &_vq_auxt__16u0__p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u0__p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u0__p5_0[] = { ++static const long _vq_quantlist__16u0__p5_0[] = { + 4, + 3, + 5, +@@ -264,7 +264,7 @@ + 8, + }; + +-static long _vq_lengthlist__16u0__p5_0[] = { ++static const long _vq_lengthlist__16u0__p5_0[] = { + 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 8, 8, 8, + 9, 9, 4, 6, 6, 8, 8, 8, 8, 9, 9, 7, 8, 8, 9, 9, + 9, 9,11,10, 7, 8, 8, 9, 9, 9, 9,10,11, 7, 8, 8, +@@ -273,34 +273,34 @@ + 12, + }; + +-static float _vq_quantthresh__16u0__p5_0[] = { ++static const float _vq_quantthresh__16u0__p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__16u0__p5_0[] = { ++static const long _vq_quantmap__16u0__p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__16u0__p5_0 = { +- _vq_quantthresh__16u0__p5_0, +- _vq_quantmap__16u0__p5_0, ++static const encode_aux_threshmatch _vq_auxt__16u0__p5_0 = { ++ (float *)_vq_quantthresh__16u0__p5_0, ++ (long *)_vq_quantmap__16u0__p5_0, + 9, + 9 + }; + +-static static_codebook _16u0__p5_0 = { ++static const static_codebook _16u0__p5_0 = { + 2, 81, +- _vq_lengthlist__16u0__p5_0, ++ (long *)_vq_lengthlist__16u0__p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__16u0__p5_0, ++ (long *)_vq_quantlist__16u0__p5_0, + NULL, +- &_vq_auxt__16u0__p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u0__p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u0__p6_0[] = { ++static const long _vq_quantlist__16u0__p6_0[] = { + 6, + 5, + 7, +@@ -316,7 +316,7 @@ + 12, + }; + +-static long _vq_lengthlist__16u0__p6_0[] = { ++static const long _vq_lengthlist__16u0__p6_0[] = { + 1, 4, 4, 7, 7,10,10,12,12,13,13,18,17, 3, 6, 6, + 9, 9,11,11,13,13,14,14,18,17, 3, 6, 6, 9, 9,11, + 11,13,13,14,14,17,18, 7, 9, 9,11,11,13,13,14,14, +@@ -330,35 +330,35 @@ + 18, 0,19, 0, 0, 0, 0, 0, 0, + }; + +-static float _vq_quantthresh__16u0__p6_0[] = { ++static const float _vq_quantthresh__16u0__p6_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__16u0__p6_0[] = { ++static const long _vq_quantmap__16u0__p6_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__16u0__p6_0 = { +- _vq_quantthresh__16u0__p6_0, +- _vq_quantmap__16u0__p6_0, ++static const encode_aux_threshmatch _vq_auxt__16u0__p6_0 = { ++ (float *)_vq_quantthresh__16u0__p6_0, ++ (long *)_vq_quantmap__16u0__p6_0, + 13, + 13 + }; + +-static static_codebook _16u0__p6_0 = { ++static const static_codebook _16u0__p6_0 = { + 2, 169, +- _vq_lengthlist__16u0__p6_0, ++ (long *)_vq_lengthlist__16u0__p6_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__16u0__p6_0, ++ (long *)_vq_quantlist__16u0__p6_0, + NULL, +- &_vq_auxt__16u0__p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u0__p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u0__p6_1[] = { ++static const long _vq_quantlist__16u0__p6_1[] = { + 2, + 1, + 3, +@@ -366,44 +366,44 @@ + 4, + }; + +-static long _vq_lengthlist__16u0__p6_1[] = { ++static const long _vq_lengthlist__16u0__p6_1[] = { + 1, 4, 5, 6, 6, 4, 6, 6, 6, 6, 4, 6, 6, 6, 6, 6, + 6, 6, 7, 7, 6, 6, 6, 7, 7, + }; + +-static float _vq_quantthresh__16u0__p6_1[] = { ++static const float _vq_quantthresh__16u0__p6_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__16u0__p6_1[] = { ++static const long _vq_quantmap__16u0__p6_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__16u0__p6_1 = { +- _vq_quantthresh__16u0__p6_1, +- _vq_quantmap__16u0__p6_1, ++static const encode_aux_threshmatch _vq_auxt__16u0__p6_1 = { ++ (float *)_vq_quantthresh__16u0__p6_1, ++ (long *)_vq_quantmap__16u0__p6_1, + 5, + 5 + }; + +-static static_codebook _16u0__p6_1 = { ++static const static_codebook _16u0__p6_1 = { + 2, 25, +- _vq_lengthlist__16u0__p6_1, ++ (long *)_vq_lengthlist__16u0__p6_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__16u0__p6_1, ++ (long *)_vq_quantlist__16u0__p6_1, + NULL, +- &_vq_auxt__16u0__p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16u0__p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16u0__p7_0[] = { ++static const long _vq_quantlist__16u0__p7_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__16u0__p7_0[] = { ++static const long _vq_lengthlist__16u0__p7_0[] = { + 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, +@@ -412,33 +412,33 @@ + 7, + }; + +-static float _vq_quantthresh__16u0__p7_0[] = { ++static const float _vq_quantthresh__16u0__p7_0[] = { + -157.5, 157.5, + }; + +-static long _vq_quantmap__16u0__p7_0[] = { ++static const long _vq_quantmap__16u0__p7_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__16u0__p7_0 = { +- _vq_quantthresh__16u0__p7_0, +- _vq_quantmap__16u0__p7_0, ++static const encode_aux_threshmatch _vq_auxt__16u0__p7_0 = { ++ (float *)_vq_quantthresh__16u0__p7_0, ++ (long *)_vq_quantmap__16u0__p7_0, + 3, + 3 + }; + +-static static_codebook _16u0__p7_0 = { ++static const static_codebook _16u0__p7_0 = { + 4, 81, +- _vq_lengthlist__16u0__p7_0, ++ (long *)_vq_lengthlist__16u0__p7_0, + 1, -518803456, 1628680192, 2, 0, +- _vq_quantlist__16u0__p7_0, ++ (long *)_vq_quantlist__16u0__p7_0, + NULL, +- &_vq_auxt__16u0__p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u0__p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u0__p7_1[] = { ++static const long _vq_quantlist__16u0__p7_1[] = { + 7, + 6, + 8, +@@ -456,7 +456,7 @@ + 14, + }; + +-static long _vq_lengthlist__16u0__p7_1[] = { ++static const long _vq_lengthlist__16u0__p7_1[] = { + 1, 5, 5, 6, 5, 9,10,11,11,10,10,10,10,10,10, 5, + 8, 8, 8,10,10,10,10,10,10,10,10,10,10,10, 5, 8, + 9, 9, 9,10,10,10,10,10,10,10,10,10,10, 5,10, 8, +@@ -474,35 +474,35 @@ + 10, + }; + +-static float _vq_quantthresh__16u0__p7_1[] = { ++static const float _vq_quantthresh__16u0__p7_1[] = { + -136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, + 31.5, 52.5, 73.5, 94.5, 115.5, 136.5, + }; + +-static long _vq_quantmap__16u0__p7_1[] = { ++static const long _vq_quantmap__16u0__p7_1[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__16u0__p7_1 = { +- _vq_quantthresh__16u0__p7_1, +- _vq_quantmap__16u0__p7_1, ++static const encode_aux_threshmatch _vq_auxt__16u0__p7_1 = { ++ (float *)_vq_quantthresh__16u0__p7_1, ++ (long *)_vq_quantmap__16u0__p7_1, + 15, + 15 + }; + +-static static_codebook _16u0__p7_1 = { ++static const static_codebook _16u0__p7_1 = { + 2, 225, +- _vq_lengthlist__16u0__p7_1, ++ (long *)_vq_lengthlist__16u0__p7_1, + 1, -520986624, 1620377600, 4, 0, +- _vq_quantlist__16u0__p7_1, ++ (long *)_vq_quantlist__16u0__p7_1, + NULL, +- &_vq_auxt__16u0__p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16u0__p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16u0__p7_2[] = { ++static const long _vq_quantlist__16u0__p7_2[] = { + 10, + 9, + 11, +@@ -526,7 +526,7 @@ + 20, + }; + +-static long _vq_lengthlist__16u0__p7_2[] = { ++static const long _vq_lengthlist__16u0__p7_2[] = { + 1, 6, 6, 7, 8, 7, 7,10, 9,10, 9,11,10, 9,11,10, + 9, 9, 9, 9,10, 6, 8, 7, 9, 9, 8, 8,10,10, 9,11, + 11,12,12,10, 9,11, 9,12,10, 9, 6, 9, 8, 9,12, 8, +@@ -557,46 +557,46 @@ + 10,10,12,11,10,11,11,11,10, + }; + +-static float _vq_quantthresh__16u0__p7_2[] = { ++static const float _vq_quantthresh__16u0__p7_2[] = { + -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, + -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, + 6.5, 7.5, 8.5, 9.5, + }; + +-static long _vq_quantmap__16u0__p7_2[] = { ++static const long _vq_quantmap__16u0__p7_2[] = { + 19, 17, 15, 13, 11, 9, 7, 5, + 3, 1, 0, 2, 4, 6, 8, 10, + 12, 14, 16, 18, 20, + }; + +-static encode_aux_threshmatch _vq_auxt__16u0__p7_2 = { +- _vq_quantthresh__16u0__p7_2, +- _vq_quantmap__16u0__p7_2, ++static const encode_aux_threshmatch _vq_auxt__16u0__p7_2 = { ++ (float *)_vq_quantthresh__16u0__p7_2, ++ (long *)_vq_quantmap__16u0__p7_2, + 21, + 21 + }; + +-static static_codebook _16u0__p7_2 = { ++static const static_codebook _16u0__p7_2 = { + 2, 441, +- _vq_lengthlist__16u0__p7_2, ++ (long *)_vq_lengthlist__16u0__p7_2, + 1, -529268736, 1611661312, 5, 0, +- _vq_quantlist__16u0__p7_2, ++ (long *)_vq_quantlist__16u0__p7_2, + NULL, +- &_vq_auxt__16u0__p7_2, ++ (encode_aux_threshmatch *)&_vq_auxt__16u0__p7_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__16u0__single[] = { ++static const long _huff_lengthlist__16u0__single[] = { + 3, 5, 8, 7,14, 8, 9,19, 5, 2, 5, 5, 9, 6, 9,19, + 8, 4, 5, 7, 8, 9,13,19, 7, 4, 6, 5, 9, 6, 9,19, + 12, 8, 7, 9,10,11,13,19, 8, 5, 8, 6, 9, 6, 7,19, + 8, 8,10, 7, 7, 4, 5,19,12,17,19,15,18,13,11,18, + }; + +-static static_codebook _huff_book__16u0__single = { ++static const static_codebook _huff_book__16u0__single = { + 2, 64, +- _huff_lengthlist__16u0__single, ++ (long *)_huff_lengthlist__16u0__single, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -605,7 +605,7 @@ + 0 + }; + +-static long _huff_lengthlist__16u1__long[] = { ++static const long _huff_lengthlist__16u1__long[] = { + 3, 6,10, 8,12, 8,14, 8,14,19, 5, 3, 5, 5, 7, 6, + 11, 7,16,19, 7, 5, 6, 7, 7, 9,11,12,19,19, 6, 4, + 7, 5, 7, 6,10, 7,18,18, 8, 6, 7, 7, 7, 7, 8, 9, +@@ -615,9 +615,9 @@ + 16,13,16,18, + }; + +-static static_codebook _huff_book__16u1__long = { ++static const static_codebook _huff_book__16u1__long = { + 2, 100, +- _huff_lengthlist__16u1__long, ++ (long *)_huff_lengthlist__16u1__long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -626,13 +626,13 @@ + 0 + }; + +-static long _vq_quantlist__16u1__p1_0[] = { ++static const long _vq_quantlist__16u1__p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__16u1__p1_0[] = { ++static const long _vq_lengthlist__16u1__p1_0[] = { + 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 7, 7,10,10, 7, + 9,10, 5, 7, 8, 7,10, 9, 7,10,10, 5, 8, 8, 8,10, + 10, 8,10,10, 7,10,10,10,11,12,10,12,13, 7,10,10, +@@ -641,39 +641,39 @@ + 11, + }; + +-static float _vq_quantthresh__16u1__p1_0[] = { ++static const float _vq_quantthresh__16u1__p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__16u1__p1_0[] = { ++static const long _vq_quantmap__16u1__p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__16u1__p1_0 = { +- _vq_quantthresh__16u1__p1_0, +- _vq_quantmap__16u1__p1_0, ++static const encode_aux_threshmatch _vq_auxt__16u1__p1_0 = { ++ (float *)_vq_quantthresh__16u1__p1_0, ++ (long *)_vq_quantmap__16u1__p1_0, + 3, + 3 + }; + +-static static_codebook _16u1__p1_0 = { ++static const static_codebook _16u1__p1_0 = { + 4, 81, +- _vq_lengthlist__16u1__p1_0, ++ (long *)_vq_lengthlist__16u1__p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__16u1__p1_0, ++ (long *)_vq_quantlist__16u1__p1_0, + NULL, +- &_vq_auxt__16u1__p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u1__p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u1__p2_0[] = { ++static const long _vq_quantlist__16u1__p2_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__16u1__p2_0[] = { ++static const long _vq_lengthlist__16u1__p2_0[] = { + 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 7, 8, 6, + 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 7, 5, 6, 6, 6, 8, + 8, 6, 8, 8, 6, 8, 8, 7, 7,10, 8, 9, 9, 6, 8, 8, +@@ -682,33 +682,33 @@ + 8, + }; + +-static float _vq_quantthresh__16u1__p2_0[] = { ++static const float _vq_quantthresh__16u1__p2_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__16u1__p2_0[] = { ++static const long _vq_quantmap__16u1__p2_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__16u1__p2_0 = { +- _vq_quantthresh__16u1__p2_0, +- _vq_quantmap__16u1__p2_0, ++static const encode_aux_threshmatch _vq_auxt__16u1__p2_0 = { ++ (float *)_vq_quantthresh__16u1__p2_0, ++ (long *)_vq_quantmap__16u1__p2_0, + 3, + 3 + }; + +-static static_codebook _16u1__p2_0 = { ++static const static_codebook _16u1__p2_0 = { + 4, 81, +- _vq_lengthlist__16u1__p2_0, ++ (long *)_vq_lengthlist__16u1__p2_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__16u1__p2_0, ++ (long *)_vq_quantlist__16u1__p2_0, + NULL, +- &_vq_auxt__16u1__p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u1__p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u1__p3_0[] = { ++static const long _vq_quantlist__16u1__p3_0[] = { + 2, + 1, + 3, +@@ -716,7 +716,7 @@ + 4, + }; + +-static long _vq_lengthlist__16u1__p3_0[] = { ++static const long _vq_lengthlist__16u1__p3_0[] = { + 1, 5, 5, 8, 8, 6, 7, 7, 9, 9, 5, 7, 7, 9, 9, 9, + 10, 9,11,11, 9, 9,10,11,11, 6, 8, 8,10,10, 8, 9, + 10,11,11, 8, 9,10,11,11,10,11,11,12,13,10,11,11, +@@ -759,33 +759,33 @@ + 16, + }; + +-static float _vq_quantthresh__16u1__p3_0[] = { ++static const float _vq_quantthresh__16u1__p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__16u1__p3_0[] = { ++static const long _vq_quantmap__16u1__p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__16u1__p3_0 = { +- _vq_quantthresh__16u1__p3_0, +- _vq_quantmap__16u1__p3_0, ++static const encode_aux_threshmatch _vq_auxt__16u1__p3_0 = { ++ (float *)_vq_quantthresh__16u1__p3_0, ++ (long *)_vq_quantmap__16u1__p3_0, + 5, + 5 + }; + +-static static_codebook _16u1__p3_0 = { ++static const static_codebook _16u1__p3_0 = { + 4, 625, +- _vq_lengthlist__16u1__p3_0, ++ (long *)_vq_lengthlist__16u1__p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__16u1__p3_0, ++ (long *)_vq_quantlist__16u1__p3_0, + NULL, +- &_vq_auxt__16u1__p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u1__p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u1__p4_0[] = { ++static const long _vq_quantlist__16u1__p4_0[] = { + 2, + 1, + 3, +@@ -793,7 +793,7 @@ + 4, + }; + +-static long _vq_lengthlist__16u1__p4_0[] = { ++static const long _vq_lengthlist__16u1__p4_0[] = { + 4, 5, 5, 8, 8, 6, 6, 7, 9, 9, 6, 6, 6, 9, 9, 9, + 10, 9,11,11, 9, 9,10,11,11, 6, 7, 7,10, 9, 7, 7, + 8, 9,10, 7, 7, 8,10,10,10,10,10,10,12, 9, 9,10, +@@ -836,33 +836,33 @@ + 11, + }; + +-static float _vq_quantthresh__16u1__p4_0[] = { ++static const float _vq_quantthresh__16u1__p4_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__16u1__p4_0[] = { ++static const long _vq_quantmap__16u1__p4_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__16u1__p4_0 = { +- _vq_quantthresh__16u1__p4_0, +- _vq_quantmap__16u1__p4_0, ++static const encode_aux_threshmatch _vq_auxt__16u1__p4_0 = { ++ (float *)_vq_quantthresh__16u1__p4_0, ++ (long *)_vq_quantmap__16u1__p4_0, + 5, + 5 + }; + +-static static_codebook _16u1__p4_0 = { ++static const static_codebook _16u1__p4_0 = { + 4, 625, +- _vq_lengthlist__16u1__p4_0, ++ (long *)_vq_lengthlist__16u1__p4_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__16u1__p4_0, ++ (long *)_vq_quantlist__16u1__p4_0, + NULL, +- &_vq_auxt__16u1__p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u1__p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u1__p5_0[] = { ++static const long _vq_quantlist__16u1__p5_0[] = { + 4, + 3, + 5, +@@ -874,7 +874,7 @@ + 8, + }; + +-static long _vq_lengthlist__16u1__p5_0[] = { ++static const long _vq_lengthlist__16u1__p5_0[] = { + 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 8, 8, 8, + 10,10, 4, 5, 6, 8, 8, 8, 8,10,10, 7, 8, 8, 9, 9, + 9, 9,11,11, 7, 8, 8, 9, 9, 9, 9,11,11, 7, 8, 8, +@@ -883,34 +883,34 @@ + 13, + }; + +-static float _vq_quantthresh__16u1__p5_0[] = { ++static const float _vq_quantthresh__16u1__p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__16u1__p5_0[] = { ++static const long _vq_quantmap__16u1__p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__16u1__p5_0 = { +- _vq_quantthresh__16u1__p5_0, +- _vq_quantmap__16u1__p5_0, ++static const encode_aux_threshmatch _vq_auxt__16u1__p5_0 = { ++ (float *)_vq_quantthresh__16u1__p5_0, ++ (long *)_vq_quantmap__16u1__p5_0, + 9, + 9 + }; + +-static static_codebook _16u1__p5_0 = { ++static const static_codebook _16u1__p5_0 = { + 2, 81, +- _vq_lengthlist__16u1__p5_0, ++ (long *)_vq_lengthlist__16u1__p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__16u1__p5_0, ++ (long *)_vq_quantlist__16u1__p5_0, + NULL, +- &_vq_auxt__16u1__p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u1__p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u1__p6_0[] = { ++static const long _vq_quantlist__16u1__p6_0[] = { + 4, + 3, + 5, +@@ -922,7 +922,7 @@ + 8, + }; + +-static long _vq_lengthlist__16u1__p6_0[] = { ++static const long _vq_lengthlist__16u1__p6_0[] = { + 3, 4, 4, 6, 6, 7, 7, 9, 9, 4, 4, 4, 6, 6, 8, 8, + 9, 9, 4, 4, 4, 6, 6, 7, 7, 9, 9, 6, 6, 6, 7, 7, + 8, 8,10, 9, 6, 6, 6, 7, 7, 8, 8, 9,10, 7, 8, 7, +@@ -931,40 +931,40 @@ + 11, + }; + +-static float _vq_quantthresh__16u1__p6_0[] = { ++static const float _vq_quantthresh__16u1__p6_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__16u1__p6_0[] = { ++static const long _vq_quantmap__16u1__p6_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__16u1__p6_0 = { +- _vq_quantthresh__16u1__p6_0, +- _vq_quantmap__16u1__p6_0, ++static const encode_aux_threshmatch _vq_auxt__16u1__p6_0 = { ++ (float *)_vq_quantthresh__16u1__p6_0, ++ (long *)_vq_quantmap__16u1__p6_0, + 9, + 9 + }; + +-static static_codebook _16u1__p6_0 = { ++static const static_codebook _16u1__p6_0 = { + 2, 81, +- _vq_lengthlist__16u1__p6_0, ++ (long *)_vq_lengthlist__16u1__p6_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__16u1__p6_0, ++ (long *)_vq_quantlist__16u1__p6_0, + NULL, +- &_vq_auxt__16u1__p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u1__p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u1__p7_0[] = { ++static const long _vq_quantlist__16u1__p7_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__16u1__p7_0[] = { ++static const long _vq_lengthlist__16u1__p7_0[] = { + 1, 4, 4, 4, 8, 8, 4, 8, 8, 5,11, 9, 8,12,11, 8, + 12,11, 5,10,11, 8,11,12, 8,11,12, 4,11,11,11,14, + 13,10,13,13, 8,14,13,12,14,16,12,16,15, 8,14,14, +@@ -973,33 +973,33 @@ + 13, + }; + +-static float _vq_quantthresh__16u1__p7_0[] = { ++static const float _vq_quantthresh__16u1__p7_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__16u1__p7_0[] = { ++static const long _vq_quantmap__16u1__p7_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__16u1__p7_0 = { +- _vq_quantthresh__16u1__p7_0, +- _vq_quantmap__16u1__p7_0, ++static const encode_aux_threshmatch _vq_auxt__16u1__p7_0 = { ++ (float *)_vq_quantthresh__16u1__p7_0, ++ (long *)_vq_quantmap__16u1__p7_0, + 3, + 3 + }; + +-static static_codebook _16u1__p7_0 = { ++static const static_codebook _16u1__p7_0 = { + 4, 81, +- _vq_lengthlist__16u1__p7_0, ++ (long *)_vq_lengthlist__16u1__p7_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__16u1__p7_0, ++ (long *)_vq_quantlist__16u1__p7_0, + NULL, +- &_vq_auxt__16u1__p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u1__p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u1__p7_1[] = { ++static const long _vq_quantlist__16u1__p7_1[] = { + 5, + 4, + 6, +@@ -1013,7 +1013,7 @@ + 10, + }; + +-static long _vq_lengthlist__16u1__p7_1[] = { ++static const long _vq_lengthlist__16u1__p7_1[] = { + 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 6, 5, 7, 7, + 8, 8, 8, 8, 8, 8, 4, 5, 6, 7, 7, 8, 8, 8, 8, 8, + 8, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8, +@@ -1024,35 +1024,35 @@ + 8, 9, 9,10,10,10,10,10,10, + }; + +-static float _vq_quantthresh__16u1__p7_1[] = { ++static const float _vq_quantthresh__16u1__p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__16u1__p7_1[] = { ++static const long _vq_quantmap__16u1__p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__16u1__p7_1 = { +- _vq_quantthresh__16u1__p7_1, +- _vq_quantmap__16u1__p7_1, ++static const encode_aux_threshmatch _vq_auxt__16u1__p7_1 = { ++ (float *)_vq_quantthresh__16u1__p7_1, ++ (long *)_vq_quantmap__16u1__p7_1, + 11, + 11 + }; + +-static static_codebook _16u1__p7_1 = { ++static const static_codebook _16u1__p7_1 = { + 2, 121, +- _vq_lengthlist__16u1__p7_1, ++ (long *)_vq_lengthlist__16u1__p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__16u1__p7_1, ++ (long *)_vq_quantlist__16u1__p7_1, + NULL, +- &_vq_auxt__16u1__p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16u1__p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16u1__p8_0[] = { ++static const long _vq_quantlist__16u1__p8_0[] = { + 5, + 4, + 6, +@@ -1066,7 +1066,7 @@ + 10, + }; + +-static long _vq_lengthlist__16u1__p8_0[] = { ++static const long _vq_lengthlist__16u1__p8_0[] = { + 1, 4, 4, 5, 5, 8, 8,10,10,12,12, 4, 7, 7, 8, 8, + 9, 9,12,11,14,13, 4, 7, 7, 7, 8, 9,10,11,11,13, + 12, 5, 8, 8, 9, 9,11,11,12,13,15,14, 5, 7, 8, 9, +@@ -1077,35 +1077,35 @@ + 13,14,14,15,15,16,16,15,16, + }; + +-static float _vq_quantthresh__16u1__p8_0[] = { ++static const float _vq_quantthresh__16u1__p8_0[] = { + -49.5, -38.5, -27.5, -16.5, -5.5, 5.5, 16.5, 27.5, + 38.5, 49.5, + }; + +-static long _vq_quantmap__16u1__p8_0[] = { ++static const long _vq_quantmap__16u1__p8_0[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__16u1__p8_0 = { +- _vq_quantthresh__16u1__p8_0, +- _vq_quantmap__16u1__p8_0, ++static const encode_aux_threshmatch _vq_auxt__16u1__p8_0 = { ++ (float *)_vq_quantthresh__16u1__p8_0, ++ (long *)_vq_quantmap__16u1__p8_0, + 11, + 11 + }; + +-static static_codebook _16u1__p8_0 = { ++static const static_codebook _16u1__p8_0 = { + 2, 121, +- _vq_lengthlist__16u1__p8_0, ++ (long *)_vq_lengthlist__16u1__p8_0, + 1, -524582912, 1618345984, 4, 0, +- _vq_quantlist__16u1__p8_0, ++ (long *)_vq_quantlist__16u1__p8_0, + NULL, +- &_vq_auxt__16u1__p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u1__p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u1__p8_1[] = { ++static const long _vq_quantlist__16u1__p8_1[] = { + 5, + 4, + 6, +@@ -1119,7 +1119,7 @@ + 10, + }; + +-static long _vq_lengthlist__16u1__p8_1[] = { ++static const long _vq_lengthlist__16u1__p8_1[] = { + 2, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 4, 6, 6, 7, 7, + 8, 7, 8, 8, 8, 8, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, + 8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 9, 6, 7, 7, 7, +@@ -1130,35 +1130,35 @@ + 8, 9, 9, 9, 9, 9, 9, 9, 9, + }; + +-static float _vq_quantthresh__16u1__p8_1[] = { ++static const float _vq_quantthresh__16u1__p8_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__16u1__p8_1[] = { ++static const long _vq_quantmap__16u1__p8_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__16u1__p8_1 = { +- _vq_quantthresh__16u1__p8_1, +- _vq_quantmap__16u1__p8_1, ++static const encode_aux_threshmatch _vq_auxt__16u1__p8_1 = { ++ (float *)_vq_quantthresh__16u1__p8_1, ++ (long *)_vq_quantmap__16u1__p8_1, + 11, + 11 + }; + +-static static_codebook _16u1__p8_1 = { ++static const static_codebook _16u1__p8_1 = { + 2, 121, +- _vq_lengthlist__16u1__p8_1, ++ (long *)_vq_lengthlist__16u1__p8_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__16u1__p8_1, ++ (long *)_vq_quantlist__16u1__p8_1, + NULL, +- &_vq_auxt__16u1__p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16u1__p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16u1__p9_0[] = { ++static const long _vq_quantlist__16u1__p9_0[] = { + 7, + 6, + 8, +@@ -1176,7 +1176,7 @@ + 14, + }; + +-static long _vq_lengthlist__16u1__p9_0[] = { ++static const long _vq_lengthlist__16u1__p9_0[] = { + 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, +@@ -1194,35 +1194,35 @@ + 8, + }; + +-static float _vq_quantthresh__16u1__p9_0[] = { ++static const float _vq_quantthresh__16u1__p9_0[] = { + -1657.5, -1402.5, -1147.5, -892.5, -637.5, -382.5, -127.5, 127.5, + 382.5, 637.5, 892.5, 1147.5, 1402.5, 1657.5, + }; + +-static long _vq_quantmap__16u1__p9_0[] = { ++static const long _vq_quantmap__16u1__p9_0[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__16u1__p9_0 = { +- _vq_quantthresh__16u1__p9_0, +- _vq_quantmap__16u1__p9_0, ++static const encode_aux_threshmatch _vq_auxt__16u1__p9_0 = { ++ (float *)_vq_quantthresh__16u1__p9_0, ++ (long *)_vq_quantmap__16u1__p9_0, + 15, + 15 + }; + +-static static_codebook _16u1__p9_0 = { ++static const static_codebook _16u1__p9_0 = { + 2, 225, +- _vq_lengthlist__16u1__p9_0, ++ (long *)_vq_lengthlist__16u1__p9_0, + 1, -514071552, 1627381760, 4, 0, +- _vq_quantlist__16u1__p9_0, ++ (long *)_vq_quantlist__16u1__p9_0, + NULL, +- &_vq_auxt__16u1__p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u1__p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u1__p9_1[] = { ++static const long _vq_quantlist__16u1__p9_1[] = { + 7, + 6, + 8, +@@ -1240,7 +1240,7 @@ + 14, + }; + +-static long _vq_lengthlist__16u1__p9_1[] = { ++static const long _vq_lengthlist__16u1__p9_1[] = { + 1, 6, 5, 9, 9,10,10, 6, 7, 9, 9,10,10,10,10, 5, + 10, 8,10, 8,10,10, 8, 8,10, 9,10,10,10,10, 5, 8, + 9,10,10,10,10, 8,10,10,10,10,10,10,10, 9,10,10, +@@ -1258,35 +1258,35 @@ + 9, + }; + +-static float _vq_quantthresh__16u1__p9_1[] = { ++static const float _vq_quantthresh__16u1__p9_1[] = { + -110.5, -93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, + 25.5, 42.5, 59.5, 76.5, 93.5, 110.5, + }; + +-static long _vq_quantmap__16u1__p9_1[] = { ++static const long _vq_quantmap__16u1__p9_1[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__16u1__p9_1 = { +- _vq_quantthresh__16u1__p9_1, +- _vq_quantmap__16u1__p9_1, ++static const encode_aux_threshmatch _vq_auxt__16u1__p9_1 = { ++ (float *)_vq_quantthresh__16u1__p9_1, ++ (long *)_vq_quantmap__16u1__p9_1, + 15, + 15 + }; + +-static static_codebook _16u1__p9_1 = { ++static const static_codebook _16u1__p9_1 = { + 2, 225, +- _vq_lengthlist__16u1__p9_1, ++ (long *)_vq_lengthlist__16u1__p9_1, + 1, -522338304, 1620115456, 4, 0, +- _vq_quantlist__16u1__p9_1, ++ (long *)_vq_quantlist__16u1__p9_1, + NULL, +- &_vq_auxt__16u1__p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16u1__p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16u1__p9_2[] = { ++static const long _vq_quantlist__16u1__p9_2[] = { + 8, + 7, + 9, +@@ -1306,7 +1306,7 @@ + 16, + }; + +-static long _vq_lengthlist__16u1__p9_2[] = { ++static const long _vq_lengthlist__16u1__p9_2[] = { + 1, 6, 6, 7, 8, 8,11,10, 9, 9,11, 9,10, 9,11,11, + 9, 6, 7, 6,11, 8,11, 9,10,10,11, 9,11,10,10,10, + 11, 9, 5, 7, 7, 8, 8,10,11, 8, 8,11, 9, 9,10,11, +@@ -1328,36 +1328,36 @@ + 10, + }; + +-static float _vq_quantthresh__16u1__p9_2[] = { ++static const float _vq_quantthresh__16u1__p9_2[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__16u1__p9_2[] = { ++static const long _vq_quantmap__16u1__p9_2[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__16u1__p9_2 = { +- _vq_quantthresh__16u1__p9_2, +- _vq_quantmap__16u1__p9_2, ++static const encode_aux_threshmatch _vq_auxt__16u1__p9_2 = { ++ (float *)_vq_quantthresh__16u1__p9_2, ++ (long *)_vq_quantmap__16u1__p9_2, + 17, + 17 + }; + +-static static_codebook _16u1__p9_2 = { ++static const static_codebook _16u1__p9_2 = { + 2, 289, +- _vq_lengthlist__16u1__p9_2, ++ (long *)_vq_lengthlist__16u1__p9_2, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__16u1__p9_2, ++ (long *)_vq_quantlist__16u1__p9_2, + NULL, +- &_vq_auxt__16u1__p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__16u1__p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__16u1__short[] = { ++static const long _huff_lengthlist__16u1__short[] = { + 5, 7,10, 9,11,10,15,11,13,16, 6, 4, 6, 6, 7, 7, + 10, 9,12,16,10, 6, 5, 6, 6, 7,10,11,16,16, 9, 6, + 7, 6, 7, 7,10, 8,14,16,11, 6, 5, 4, 5, 6, 8, 9, +@@ -1367,9 +1367,9 @@ + 16,16,16,16, + }; + +-static static_codebook _huff_book__16u1__short = { ++static const static_codebook _huff_book__16u1__short = { + 2, 100, +- _huff_lengthlist__16u1__short, ++ (long *)_huff_lengthlist__16u1__short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1378,7 +1378,7 @@ + 0 + }; + +-static long _huff_lengthlist__16u2__long[] = { ++static const long _huff_lengthlist__16u2__long[] = { + 5, 7,10,10,10,11,11,13,18,19, 6, 5, 5, 6, 7, 8, + 9,12,19,19, 8, 5, 4, 4, 6, 7, 9,13,19,19, 8, 5, + 4, 4, 5, 6, 8,12,17,19, 7, 5, 5, 4, 4, 5, 7,12, +@@ -1388,9 +1388,9 @@ + 13,14,18,18, + }; + +-static static_codebook _huff_book__16u2__long = { ++static const static_codebook _huff_book__16u2__long = { + 2, 100, +- _huff_lengthlist__16u2__long, ++ (long *)_huff_lengthlist__16u2__long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1399,7 +1399,7 @@ + 0 + }; + +-static long _huff_lengthlist__16u2__short[] = { ++static const long _huff_lengthlist__16u2__short[] = { + 8,11,12,12,14,15,16,16,16,16, 9, 7, 7, 8, 9,11, + 13,14,16,16,13, 7, 6, 6, 7, 9,12,13,15,16,15, 7, + 6, 5, 4, 6,10,11,14,16,12, 8, 7, 4, 2, 4, 7,10, +@@ -1409,9 +1409,9 @@ + 16,16,16,16, + }; + +-static static_codebook _huff_book__16u2__short = { ++static const static_codebook _huff_book__16u2__short = { + 2, 100, +- _huff_lengthlist__16u2__short, ++ (long *)_huff_lengthlist__16u2__short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -1420,13 +1420,13 @@ + 0 + }; + +-static long _vq_quantlist__16u2_p1_0[] = { ++static const long _vq_quantlist__16u2_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__16u2_p1_0[] = { ++static const long _vq_lengthlist__16u2_p1_0[] = { + 1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 9, 9, 7, + 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 9, 5, 7, 7, 8, 9, + 9, 7, 9, 9, 7, 9, 9, 9,10,10, 9,10,10, 7, 9, 9, +@@ -1435,33 +1435,33 @@ + 10, + }; + +-static float _vq_quantthresh__16u2_p1_0[] = { ++static const float _vq_quantthresh__16u2_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__16u2_p1_0[] = { ++static const long _vq_quantmap__16u2_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__16u2_p1_0 = { +- _vq_quantthresh__16u2_p1_0, +- _vq_quantmap__16u2_p1_0, ++static const encode_aux_threshmatch _vq_auxt__16u2_p1_0 = { ++ (float *)_vq_quantthresh__16u2_p1_0, ++ (long *)_vq_quantmap__16u2_p1_0, + 3, + 3 + }; + +-static static_codebook _16u2_p1_0 = { ++static const static_codebook _16u2_p1_0 = { + 4, 81, +- _vq_lengthlist__16u2_p1_0, ++ (long *)_vq_lengthlist__16u2_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__16u2_p1_0, ++ (long *)_vq_quantlist__16u2_p1_0, + NULL, +- &_vq_auxt__16u2_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u2_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u2_p2_0[] = { ++static const long _vq_quantlist__16u2_p2_0[] = { + 2, + 1, + 3, +@@ -1469,7 +1469,7 @@ + 4, + }; + +-static long _vq_lengthlist__16u2_p2_0[] = { ++static const long _vq_lengthlist__16u2_p2_0[] = { + 3, 5, 5, 8, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 9, + 10, 9,11,11, 9, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8, + 8,10,10, 7, 8, 8,10,10,10,10,10,12,12, 9,10,10, +@@ -1512,33 +1512,33 @@ + 13, + }; + +-static float _vq_quantthresh__16u2_p2_0[] = { ++static const float _vq_quantthresh__16u2_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__16u2_p2_0[] = { ++static const long _vq_quantmap__16u2_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__16u2_p2_0 = { +- _vq_quantthresh__16u2_p2_0, +- _vq_quantmap__16u2_p2_0, ++static const encode_aux_threshmatch _vq_auxt__16u2_p2_0 = { ++ (float *)_vq_quantthresh__16u2_p2_0, ++ (long *)_vq_quantmap__16u2_p2_0, + 5, + 5 + }; + +-static static_codebook _16u2_p2_0 = { ++static const static_codebook _16u2_p2_0 = { + 4, 625, +- _vq_lengthlist__16u2_p2_0, ++ (long *)_vq_lengthlist__16u2_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__16u2_p2_0, ++ (long *)_vq_quantlist__16u2_p2_0, + NULL, +- &_vq_auxt__16u2_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u2_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u2_p3_0[] = { ++static const long _vq_quantlist__16u2_p3_0[] = { + 4, + 3, + 5, +@@ -1550,7 +1550,7 @@ + 8, + }; + +-static long _vq_lengthlist__16u2_p3_0[] = { ++static const long _vq_lengthlist__16u2_p3_0[] = { + 2, 4, 4, 6, 6, 7, 7, 9, 9, 4, 5, 5, 6, 6, 8, 7, + 9, 9, 4, 5, 5, 6, 6, 7, 8, 9, 9, 6, 6, 6, 7, 7, + 8, 8,10,10, 6, 6, 6, 7, 7, 8, 8, 9,10, 7, 8, 7, +@@ -1559,34 +1559,34 @@ + 11, + }; + +-static float _vq_quantthresh__16u2_p3_0[] = { ++static const float _vq_quantthresh__16u2_p3_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__16u2_p3_0[] = { ++static const long _vq_quantmap__16u2_p3_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__16u2_p3_0 = { +- _vq_quantthresh__16u2_p3_0, +- _vq_quantmap__16u2_p3_0, ++static const encode_aux_threshmatch _vq_auxt__16u2_p3_0 = { ++ (float *)_vq_quantthresh__16u2_p3_0, ++ (long *)_vq_quantmap__16u2_p3_0, + 9, + 9 + }; + +-static static_codebook _16u2_p3_0 = { ++static const static_codebook _16u2_p3_0 = { + 2, 81, +- _vq_lengthlist__16u2_p3_0, ++ (long *)_vq_lengthlist__16u2_p3_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__16u2_p3_0, ++ (long *)_vq_quantlist__16u2_p3_0, + NULL, +- &_vq_auxt__16u2_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u2_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u2_p4_0[] = { ++static const long _vq_quantlist__16u2_p4_0[] = { + 8, + 7, + 9, +@@ -1606,7 +1606,7 @@ + 16, + }; + +-static long _vq_lengthlist__16u2_p4_0[] = { ++static const long _vq_lengthlist__16u2_p4_0[] = { + 2, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11,11, + 11, 5, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11, + 12,11, 5, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11, +@@ -1628,42 +1628,42 @@ + 14, + }; + +-static float _vq_quantthresh__16u2_p4_0[] = { ++static const float _vq_quantthresh__16u2_p4_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__16u2_p4_0[] = { ++static const long _vq_quantmap__16u2_p4_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__16u2_p4_0 = { +- _vq_quantthresh__16u2_p4_0, +- _vq_quantmap__16u2_p4_0, ++static const encode_aux_threshmatch _vq_auxt__16u2_p4_0 = { ++ (float *)_vq_quantthresh__16u2_p4_0, ++ (long *)_vq_quantmap__16u2_p4_0, + 17, + 17 + }; + +-static static_codebook _16u2_p4_0 = { ++static const static_codebook _16u2_p4_0 = { + 2, 289, +- _vq_lengthlist__16u2_p4_0, ++ (long *)_vq_lengthlist__16u2_p4_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__16u2_p4_0, ++ (long *)_vq_quantlist__16u2_p4_0, + NULL, +- &_vq_auxt__16u2_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u2_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u2_p5_0[] = { ++static const long _vq_quantlist__16u2_p5_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__16u2_p5_0[] = { ++static const long _vq_lengthlist__16u2_p5_0[] = { + 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 8, 7,10, 9, 7, + 10, 9, 5, 8, 9, 7, 9,10, 7, 9,10, 4, 9, 9, 9,11, + 11, 8,11,11, 7,11,11,10,10,13,10,14,13, 7,11,11, +@@ -1672,33 +1672,33 @@ + 10, + }; + +-static float _vq_quantthresh__16u2_p5_0[] = { ++static const float _vq_quantthresh__16u2_p5_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__16u2_p5_0[] = { ++static const long _vq_quantmap__16u2_p5_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__16u2_p5_0 = { +- _vq_quantthresh__16u2_p5_0, +- _vq_quantmap__16u2_p5_0, ++static const encode_aux_threshmatch _vq_auxt__16u2_p5_0 = { ++ (float *)_vq_quantthresh__16u2_p5_0, ++ (long *)_vq_quantmap__16u2_p5_0, + 3, + 3 + }; + +-static static_codebook _16u2_p5_0 = { ++static const static_codebook _16u2_p5_0 = { + 4, 81, +- _vq_lengthlist__16u2_p5_0, ++ (long *)_vq_lengthlist__16u2_p5_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__16u2_p5_0, ++ (long *)_vq_quantlist__16u2_p5_0, + NULL, +- &_vq_auxt__16u2_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u2_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u2_p5_1[] = { ++static const long _vq_quantlist__16u2_p5_1[] = { + 5, + 4, + 6, +@@ -1712,7 +1712,7 @@ + 10, + }; + +-static long _vq_lengthlist__16u2_p5_1[] = { ++static const long _vq_lengthlist__16u2_p5_1[] = { + 2, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 5, 5, 5, 7, 7, + 7, 7, 8, 8, 8, 8, 5, 5, 6, 7, 7, 7, 7, 8, 8, 8, + 8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7, +@@ -1723,35 +1723,35 @@ + 8, 8, 8, 9, 9, 9, 9, 9, 9, + }; + +-static float _vq_quantthresh__16u2_p5_1[] = { ++static const float _vq_quantthresh__16u2_p5_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__16u2_p5_1[] = { ++static const long _vq_quantmap__16u2_p5_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__16u2_p5_1 = { +- _vq_quantthresh__16u2_p5_1, +- _vq_quantmap__16u2_p5_1, ++static const encode_aux_threshmatch _vq_auxt__16u2_p5_1 = { ++ (float *)_vq_quantthresh__16u2_p5_1, ++ (long *)_vq_quantmap__16u2_p5_1, + 11, + 11 + }; + +-static static_codebook _16u2_p5_1 = { ++static const static_codebook _16u2_p5_1 = { + 2, 121, +- _vq_lengthlist__16u2_p5_1, ++ (long *)_vq_lengthlist__16u2_p5_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__16u2_p5_1, ++ (long *)_vq_quantlist__16u2_p5_1, + NULL, +- &_vq_auxt__16u2_p5_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16u2_p5_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16u2_p6_0[] = { ++static const long _vq_quantlist__16u2_p6_0[] = { + 6, + 5, + 7, +@@ -1767,7 +1767,7 @@ + 12, + }; + +-static long _vq_lengthlist__16u2_p6_0[] = { ++static const long _vq_lengthlist__16u2_p6_0[] = { + 1, 4, 4, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 4, 6, 6, + 8, 8, 9, 9, 9, 9,10,10,12,11, 4, 6, 6, 8, 8, 9, + 9, 9, 9,10,10,11,12, 7, 8, 8, 9, 9,10,10,10,10, +@@ -1781,35 +1781,35 @@ + 12,13,13,14,14,14,14,15,15, + }; + +-static float _vq_quantthresh__16u2_p6_0[] = { ++static const float _vq_quantthresh__16u2_p6_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__16u2_p6_0[] = { ++static const long _vq_quantmap__16u2_p6_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__16u2_p6_0 = { +- _vq_quantthresh__16u2_p6_0, +- _vq_quantmap__16u2_p6_0, ++static const encode_aux_threshmatch _vq_auxt__16u2_p6_0 = { ++ (float *)_vq_quantthresh__16u2_p6_0, ++ (long *)_vq_quantmap__16u2_p6_0, + 13, + 13 + }; + +-static static_codebook _16u2_p6_0 = { ++static const static_codebook _16u2_p6_0 = { + 2, 169, +- _vq_lengthlist__16u2_p6_0, ++ (long *)_vq_lengthlist__16u2_p6_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__16u2_p6_0, ++ (long *)_vq_quantlist__16u2_p6_0, + NULL, +- &_vq_auxt__16u2_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u2_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u2_p6_1[] = { ++static const long _vq_quantlist__16u2_p6_1[] = { + 2, + 1, + 3, +@@ -1817,38 +1817,38 @@ + 4, + }; + +-static long _vq_lengthlist__16u2_p6_1[] = { ++static const long _vq_lengthlist__16u2_p6_1[] = { + 2, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 6, 6, 5, 5, 5, 6, 6, + }; + +-static float _vq_quantthresh__16u2_p6_1[] = { ++static const float _vq_quantthresh__16u2_p6_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__16u2_p6_1[] = { ++static const long _vq_quantmap__16u2_p6_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__16u2_p6_1 = { +- _vq_quantthresh__16u2_p6_1, +- _vq_quantmap__16u2_p6_1, ++static const encode_aux_threshmatch _vq_auxt__16u2_p6_1 = { ++ (float *)_vq_quantthresh__16u2_p6_1, ++ (long *)_vq_quantmap__16u2_p6_1, + 5, + 5 + }; + +-static static_codebook _16u2_p6_1 = { ++static const static_codebook _16u2_p6_1 = { + 2, 25, +- _vq_lengthlist__16u2_p6_1, ++ (long *)_vq_lengthlist__16u2_p6_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__16u2_p6_1, ++ (long *)_vq_quantlist__16u2_p6_1, + NULL, +- &_vq_auxt__16u2_p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16u2_p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16u2_p7_0[] = { ++static const long _vq_quantlist__16u2_p7_0[] = { + 6, + 5, + 7, +@@ -1864,7 +1864,7 @@ + 12, + }; + +-static long _vq_lengthlist__16u2_p7_0[] = { ++static const long _vq_lengthlist__16u2_p7_0[] = { + 1, 4, 4, 7, 7, 7, 7, 8, 8, 9, 9,10,10, 4, 6, 6, + 9, 9, 9, 9, 9, 9,10,10,11,11, 4, 6, 6, 8, 9, 9, + 9, 9, 9,10,11,12,11, 7, 8, 9,10,10,10,10,11,10, +@@ -1878,35 +1878,35 @@ + 12,13,13,13,14,14,14,15,14, + }; + +-static float _vq_quantthresh__16u2_p7_0[] = { ++static const float _vq_quantthresh__16u2_p7_0[] = { + -60.5, -49.5, -38.5, -27.5, -16.5, -5.5, 5.5, 16.5, + 27.5, 38.5, 49.5, 60.5, + }; + +-static long _vq_quantmap__16u2_p7_0[] = { ++static const long _vq_quantmap__16u2_p7_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__16u2_p7_0 = { +- _vq_quantthresh__16u2_p7_0, +- _vq_quantmap__16u2_p7_0, ++static const encode_aux_threshmatch _vq_auxt__16u2_p7_0 = { ++ (float *)_vq_quantthresh__16u2_p7_0, ++ (long *)_vq_quantmap__16u2_p7_0, + 13, + 13 + }; + +-static static_codebook _16u2_p7_0 = { ++static const static_codebook _16u2_p7_0 = { + 2, 169, +- _vq_lengthlist__16u2_p7_0, ++ (long *)_vq_lengthlist__16u2_p7_0, + 1, -523206656, 1618345984, 4, 0, +- _vq_quantlist__16u2_p7_0, ++ (long *)_vq_quantlist__16u2_p7_0, + NULL, +- &_vq_auxt__16u2_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u2_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u2_p7_1[] = { ++static const long _vq_quantlist__16u2_p7_1[] = { + 5, + 4, + 6, +@@ -1920,7 +1920,7 @@ + 10, + }; + +-static long _vq_lengthlist__16u2_p7_1[] = { ++static const long _vq_lengthlist__16u2_p7_1[] = { + 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 6, 7, 7, + 7, 7, 7, 7, 8, 8, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, + 8, 6, 6, 7, 7, 7, 8, 7, 8, 8, 8, 8, 6, 7, 7, 7, +@@ -1931,35 +1931,35 @@ + 8, 8, 8, 8, 8, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__16u2_p7_1[] = { ++static const float _vq_quantthresh__16u2_p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__16u2_p7_1[] = { ++static const long _vq_quantmap__16u2_p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__16u2_p7_1 = { +- _vq_quantthresh__16u2_p7_1, +- _vq_quantmap__16u2_p7_1, ++static const encode_aux_threshmatch _vq_auxt__16u2_p7_1 = { ++ (float *)_vq_quantthresh__16u2_p7_1, ++ (long *)_vq_quantmap__16u2_p7_1, + 11, + 11 + }; + +-static static_codebook _16u2_p7_1 = { ++static const static_codebook _16u2_p7_1 = { + 2, 121, +- _vq_lengthlist__16u2_p7_1, ++ (long *)_vq_lengthlist__16u2_p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__16u2_p7_1, ++ (long *)_vq_quantlist__16u2_p7_1, + NULL, +- &_vq_auxt__16u2_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16u2_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16u2_p8_0[] = { ++static const long _vq_quantlist__16u2_p8_0[] = { + 7, + 6, + 8, +@@ -1977,7 +1977,7 @@ + 14, + }; + +-static long _vq_lengthlist__16u2_p8_0[] = { ++static const long _vq_lengthlist__16u2_p8_0[] = { + 1, 5, 5, 7, 7, 8, 8, 7, 7, 8, 8,10, 9,11,11, 4, + 6, 6, 8, 8,10, 9, 9, 8, 9, 9,10,10,12,14, 4, 6, + 7, 8, 9, 9,10, 9, 8, 9, 9,10,12,12,11, 7, 8, 8, +@@ -1995,35 +1995,35 @@ + 14, + }; + +-static float _vq_quantthresh__16u2_p8_0[] = { ++static const float _vq_quantthresh__16u2_p8_0[] = { + -136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, + 31.5, 52.5, 73.5, 94.5, 115.5, 136.5, + }; + +-static long _vq_quantmap__16u2_p8_0[] = { ++static const long _vq_quantmap__16u2_p8_0[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__16u2_p8_0 = { +- _vq_quantthresh__16u2_p8_0, +- _vq_quantmap__16u2_p8_0, ++static const encode_aux_threshmatch _vq_auxt__16u2_p8_0 = { ++ (float *)_vq_quantthresh__16u2_p8_0, ++ (long *)_vq_quantmap__16u2_p8_0, + 15, + 15 + }; + +-static static_codebook _16u2_p8_0 = { ++static const static_codebook _16u2_p8_0 = { + 2, 225, +- _vq_lengthlist__16u2_p8_0, ++ (long *)_vq_lengthlist__16u2_p8_0, + 1, -520986624, 1620377600, 4, 0, +- _vq_quantlist__16u2_p8_0, ++ (long *)_vq_quantlist__16u2_p8_0, + NULL, +- &_vq_auxt__16u2_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u2_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u2_p8_1[] = { ++static const long _vq_quantlist__16u2_p8_1[] = { + 10, + 9, + 11, +@@ -2047,7 +2047,7 @@ + 20, + }; + +-static long _vq_lengthlist__16u2_p8_1[] = { ++static const long _vq_lengthlist__16u2_p8_1[] = { + 2, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10, 9,10, 9, 9, + 9,10,10,10,10, 5, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9, + 10, 9,10,10,10,10,10,10,11,10, 5, 6, 6, 7, 7, 8, +@@ -2078,37 +2078,37 @@ + 11,11,10,11,11,11,10,11,11, + }; + +-static float _vq_quantthresh__16u2_p8_1[] = { ++static const float _vq_quantthresh__16u2_p8_1[] = { + -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, + -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, + 6.5, 7.5, 8.5, 9.5, + }; + +-static long _vq_quantmap__16u2_p8_1[] = { ++static const long _vq_quantmap__16u2_p8_1[] = { + 19, 17, 15, 13, 11, 9, 7, 5, + 3, 1, 0, 2, 4, 6, 8, 10, + 12, 14, 16, 18, 20, + }; + +-static encode_aux_threshmatch _vq_auxt__16u2_p8_1 = { +- _vq_quantthresh__16u2_p8_1, +- _vq_quantmap__16u2_p8_1, ++static const encode_aux_threshmatch _vq_auxt__16u2_p8_1 = { ++ (float *)_vq_quantthresh__16u2_p8_1, ++ (long *)_vq_quantmap__16u2_p8_1, + 21, + 21 + }; + +-static static_codebook _16u2_p8_1 = { ++static const static_codebook _16u2_p8_1 = { + 2, 441, +- _vq_lengthlist__16u2_p8_1, ++ (long *)_vq_lengthlist__16u2_p8_1, + 1, -529268736, 1611661312, 5, 0, +- _vq_quantlist__16u2_p8_1, ++ (long *)_vq_quantlist__16u2_p8_1, + NULL, +- &_vq_auxt__16u2_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16u2_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16u2_p9_0[] = { ++static const long _vq_quantlist__16u2_p9_0[] = { + 5586, + 4655, + 6517, +@@ -2126,7 +2126,7 @@ + 5651, + }; + +-static long _vq_lengthlist__16u2_p9_0[] = { ++static const long _vq_lengthlist__16u2_p9_0[] = { + 1,10,10,10,10,10,10,10,10,10,10,10,10, 5, 4,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, +@@ -2144,35 +2144,35 @@ + 5, + }; + +-static float _vq_quantthresh__16u2_p9_0[] = { ++static const float _vq_quantthresh__16u2_p9_0[] = { + -5120.5, -4189.5, -3258.5, -2327.5, -1396.5, -498, -32.5, 32.5, + 498, 1396.5, 2327.5, 3258.5, 4189.5, 5120.5, + }; + +-static long _vq_quantmap__16u2_p9_0[] = { ++static const long _vq_quantmap__16u2_p9_0[] = { + 11, 9, 7, 5, 3, 1, 13, 0, + 14, 2, 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__16u2_p9_0 = { +- _vq_quantthresh__16u2_p9_0, +- _vq_quantmap__16u2_p9_0, ++static const encode_aux_threshmatch _vq_auxt__16u2_p9_0 = { ++ (float *)_vq_quantthresh__16u2_p9_0, ++ (long *)_vq_quantmap__16u2_p9_0, + 15, + 15 + }; + +-static static_codebook _16u2_p9_0 = { ++static const static_codebook _16u2_p9_0 = { + 2, 225, +- _vq_lengthlist__16u2_p9_0, ++ (long *)_vq_lengthlist__16u2_p9_0, + 1, -510275072, 1611661312, 14, 0, +- _vq_quantlist__16u2_p9_0, ++ (long *)_vq_quantlist__16u2_p9_0, + NULL, +- &_vq_auxt__16u2_p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__16u2_p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__16u2_p9_1[] = { ++static const long _vq_quantlist__16u2_p9_1[] = { + 392, + 343, + 441, +@@ -2194,7 +2194,7 @@ + 396, + }; + +-static long _vq_lengthlist__16u2_p9_1[] = { ++static const long _vq_lengthlist__16u2_p9_1[] = { + 1,12,10,12,10,12,10,12,11,12,12,12,12,12,12,12, + 12, 5, 5, 9,10,12,11,11,12,12,12,12,12,12,12,12, + 12,12,12,12,10, 9, 9,11, 9,11,11,12,11,12,12,12, +@@ -2220,37 +2220,37 @@ + 11,11,11,11,11,11,11, 5, 4, + }; + +-static float _vq_quantthresh__16u2_p9_1[] = { ++static const float _vq_quantthresh__16u2_p9_1[] = { + -367.5, -318.5, -269.5, -220.5, -171.5, -122.5, -73.5, -26.5, + -2, 2, 26.5, 73.5, 122.5, 171.5, 220.5, 269.5, + 318.5, 367.5, + }; + +-static long _vq_quantmap__16u2_p9_1[] = { ++static const long _vq_quantmap__16u2_p9_1[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 17, 0, 18, 2, 4, 6, 8, 10, + 12, 14, 16, + }; + +-static encode_aux_threshmatch _vq_auxt__16u2_p9_1 = { +- _vq_quantthresh__16u2_p9_1, +- _vq_quantmap__16u2_p9_1, ++static const encode_aux_threshmatch _vq_auxt__16u2_p9_1 = { ++ (float *)_vq_quantthresh__16u2_p9_1, ++ (long *)_vq_quantmap__16u2_p9_1, + 19, + 19 + }; + +-static static_codebook _16u2_p9_1 = { ++static const static_codebook _16u2_p9_1 = { + 2, 361, +- _vq_lengthlist__16u2_p9_1, ++ (long *)_vq_lengthlist__16u2_p9_1, + 1, -518488064, 1611661312, 10, 0, +- _vq_quantlist__16u2_p9_1, ++ (long *)_vq_quantlist__16u2_p9_1, + NULL, +- &_vq_auxt__16u2_p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__16u2_p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__16u2_p9_2[] = { ++static const long _vq_quantlist__16u2_p9_2[] = { + 24, + 23, + 25, +@@ -2302,14 +2302,14 @@ + 48, + }; + +-static long _vq_lengthlist__16u2_p9_2[] = { ++static const long _vq_lengthlist__16u2_p9_2[] = { + 1, 3, 3, 4, 7, 7, 7, 8, 7, 7, 7, 7, 8, 8, 8, 8, + 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 9, 9, 8, 9, 9, + 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,12,12,10, + 11, + }; + +-static float _vq_quantthresh__16u2_p9_2[] = { ++static const float _vq_quantthresh__16u2_p9_2[] = { + -23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, + -15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, +@@ -2318,7 +2318,7 @@ + 16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, + }; + +-static long _vq_quantmap__16u2_p9_2[] = { ++static const long _vq_quantmap__16u2_p9_2[] = { + 47, 45, 43, 41, 39, 37, 35, 33, + 31, 29, 27, 25, 23, 21, 19, 17, + 15, 13, 11, 9, 7, 5, 3, 1, +@@ -2328,31 +2328,31 @@ + 48, + }; + +-static encode_aux_threshmatch _vq_auxt__16u2_p9_2 = { +- _vq_quantthresh__16u2_p9_2, +- _vq_quantmap__16u2_p9_2, ++static const encode_aux_threshmatch _vq_auxt__16u2_p9_2 = { ++ (float *)_vq_quantthresh__16u2_p9_2, ++ (long *)_vq_quantmap__16u2_p9_2, + 49, + 49 + }; + +-static static_codebook _16u2_p9_2 = { ++static const static_codebook _16u2_p9_2 = { + 1, 49, +- _vq_lengthlist__16u2_p9_2, ++ (long *)_vq_lengthlist__16u2_p9_2, + 1, -526909440, 1611661312, 6, 0, +- _vq_quantlist__16u2_p9_2, ++ (long *)_vq_quantlist__16u2_p9_2, + NULL, +- &_vq_auxt__16u2_p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__16u2_p9_2, + NULL, + 0 + }; + +-static long _vq_quantlist__8u0__p1_0[] = { ++static const long _vq_quantlist__8u0__p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__8u0__p1_0[] = { ++static const long _vq_lengthlist__8u0__p1_0[] = { + 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 8,10,10, 7, + 10,10, 5, 8, 8, 7,10,10, 8,10,10, 4, 9, 8, 8,11, + 11, 8,11,11, 7,11,11,10,11,13,10,13,13, 7,11,11, +@@ -2361,39 +2361,39 @@ + 11, + }; + +-static float _vq_quantthresh__8u0__p1_0[] = { ++static const float _vq_quantthresh__8u0__p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__8u0__p1_0[] = { ++static const long _vq_quantmap__8u0__p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__8u0__p1_0 = { +- _vq_quantthresh__8u0__p1_0, +- _vq_quantmap__8u0__p1_0, ++static const encode_aux_threshmatch _vq_auxt__8u0__p1_0 = { ++ (float *)_vq_quantthresh__8u0__p1_0, ++ (long *)_vq_quantmap__8u0__p1_0, + 3, + 3 + }; + +-static static_codebook _8u0__p1_0 = { ++static const static_codebook _8u0__p1_0 = { + 4, 81, +- _vq_lengthlist__8u0__p1_0, ++ (long *)_vq_lengthlist__8u0__p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__8u0__p1_0, ++ (long *)_vq_quantlist__8u0__p1_0, + NULL, +- &_vq_auxt__8u0__p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8u0__p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8u0__p2_0[] = { ++static const long _vq_quantlist__8u0__p2_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__8u0__p2_0[] = { ++static const long _vq_lengthlist__8u0__p2_0[] = { + 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 6, 7, 8, 6, + 7, 8, 5, 7, 7, 6, 8, 8, 7, 9, 7, 5, 7, 7, 7, 9, + 9, 7, 8, 8, 6, 9, 8, 7, 7,10, 8,10,10, 6, 8, 8, +@@ -2402,33 +2402,33 @@ + 8, + }; + +-static float _vq_quantthresh__8u0__p2_0[] = { ++static const float _vq_quantthresh__8u0__p2_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__8u0__p2_0[] = { ++static const long _vq_quantmap__8u0__p2_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__8u0__p2_0 = { +- _vq_quantthresh__8u0__p2_0, +- _vq_quantmap__8u0__p2_0, ++static const encode_aux_threshmatch _vq_auxt__8u0__p2_0 = { ++ (float *)_vq_quantthresh__8u0__p2_0, ++ (long *)_vq_quantmap__8u0__p2_0, + 3, + 3 + }; + +-static static_codebook _8u0__p2_0 = { ++static const static_codebook _8u0__p2_0 = { + 4, 81, +- _vq_lengthlist__8u0__p2_0, ++ (long *)_vq_lengthlist__8u0__p2_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__8u0__p2_0, ++ (long *)_vq_quantlist__8u0__p2_0, + NULL, +- &_vq_auxt__8u0__p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8u0__p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8u0__p3_0[] = { ++static const long _vq_quantlist__8u0__p3_0[] = { + 2, + 1, + 3, +@@ -2436,7 +2436,7 @@ + 4, + }; + +-static long _vq_lengthlist__8u0__p3_0[] = { ++static const long _vq_lengthlist__8u0__p3_0[] = { + 1, 5, 5, 7, 7, 6, 7, 7, 9, 9, 6, 7, 7, 9, 9, 8, + 10, 9,11,11, 8, 9, 9,11,11, 6, 8, 8,10,10, 8,10, + 10,11,11, 8,10,10,11,11,10,11,11,12,12,10,11,11, +@@ -2479,33 +2479,33 @@ + 16, + }; + +-static float _vq_quantthresh__8u0__p3_0[] = { ++static const float _vq_quantthresh__8u0__p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__8u0__p3_0[] = { ++static const long _vq_quantmap__8u0__p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__8u0__p3_0 = { +- _vq_quantthresh__8u0__p3_0, +- _vq_quantmap__8u0__p3_0, ++static const encode_aux_threshmatch _vq_auxt__8u0__p3_0 = { ++ (float *)_vq_quantthresh__8u0__p3_0, ++ (long *)_vq_quantmap__8u0__p3_0, + 5, + 5 + }; + +-static static_codebook _8u0__p3_0 = { ++static const static_codebook _8u0__p3_0 = { + 4, 625, +- _vq_lengthlist__8u0__p3_0, ++ (long *)_vq_lengthlist__8u0__p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__8u0__p3_0, ++ (long *)_vq_quantlist__8u0__p3_0, + NULL, +- &_vq_auxt__8u0__p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8u0__p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8u0__p4_0[] = { ++static const long _vq_quantlist__8u0__p4_0[] = { + 2, + 1, + 3, +@@ -2513,7 +2513,7 @@ + 4, + }; + +-static long _vq_lengthlist__8u0__p4_0[] = { ++static const long _vq_lengthlist__8u0__p4_0[] = { + 3, 5, 5, 8, 8, 5, 6, 7, 9, 9, 6, 7, 6, 9, 9, 9, + 9, 9,10,11, 9, 9, 9,11,10, 6, 7, 7,10,10, 7, 7, + 8,10,10, 7, 8, 8,10,10,10,10,10,10,11, 9,10,10, +@@ -2556,33 +2556,33 @@ + 12, + }; + +-static float _vq_quantthresh__8u0__p4_0[] = { ++static const float _vq_quantthresh__8u0__p4_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__8u0__p4_0[] = { ++static const long _vq_quantmap__8u0__p4_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__8u0__p4_0 = { +- _vq_quantthresh__8u0__p4_0, +- _vq_quantmap__8u0__p4_0, ++static const encode_aux_threshmatch _vq_auxt__8u0__p4_0 = { ++ (float *)_vq_quantthresh__8u0__p4_0, ++ (long *)_vq_quantmap__8u0__p4_0, + 5, + 5 + }; + +-static static_codebook _8u0__p4_0 = { ++static const static_codebook _8u0__p4_0 = { + 4, 625, +- _vq_lengthlist__8u0__p4_0, ++ (long *)_vq_lengthlist__8u0__p4_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__8u0__p4_0, ++ (long *)_vq_quantlist__8u0__p4_0, + NULL, +- &_vq_auxt__8u0__p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8u0__p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8u0__p5_0[] = { ++static const long _vq_quantlist__8u0__p5_0[] = { + 4, + 3, + 5, +@@ -2594,7 +2594,7 @@ + 8, + }; + +-static long _vq_lengthlist__8u0__p5_0[] = { ++static const long _vq_lengthlist__8u0__p5_0[] = { + 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 7, 8, 8, + 10,10, 4, 6, 6, 8, 8, 8, 8,10,10, 6, 8, 8, 9, 9, + 9, 9,11,11, 7, 8, 8, 9, 9, 9, 9,11,11, 7, 8, 8, +@@ -2603,34 +2603,34 @@ + 12, + }; + +-static float _vq_quantthresh__8u0__p5_0[] = { ++static const float _vq_quantthresh__8u0__p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__8u0__p5_0[] = { ++static const long _vq_quantmap__8u0__p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__8u0__p5_0 = { +- _vq_quantthresh__8u0__p5_0, +- _vq_quantmap__8u0__p5_0, ++static const encode_aux_threshmatch _vq_auxt__8u0__p5_0 = { ++ (float *)_vq_quantthresh__8u0__p5_0, ++ (long *)_vq_quantmap__8u0__p5_0, + 9, + 9 + }; + +-static static_codebook _8u0__p5_0 = { ++static const static_codebook _8u0__p5_0 = { + 2, 81, +- _vq_lengthlist__8u0__p5_0, ++ (long *)_vq_lengthlist__8u0__p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__8u0__p5_0, ++ (long *)_vq_quantlist__8u0__p5_0, + NULL, +- &_vq_auxt__8u0__p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8u0__p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8u0__p6_0[] = { ++static const long _vq_quantlist__8u0__p6_0[] = { + 6, + 5, + 7, +@@ -2646,7 +2646,7 @@ + 12, + }; + +-static long _vq_lengthlist__8u0__p6_0[] = { ++static const long _vq_lengthlist__8u0__p6_0[] = { + 1, 4, 4, 7, 7, 9, 9,11,11,12,12,16,16, 3, 6, 6, + 9, 9,11,11,12,12,13,14,18,16, 3, 6, 7, 9, 9,11, + 11,13,12,14,14,17,16, 7, 9, 9,11,11,12,12,14,14, +@@ -2660,35 +2660,35 @@ + 16, 0,15, 0,17, 0, 0, 0, 0, + }; + +-static float _vq_quantthresh__8u0__p6_0[] = { ++static const float _vq_quantthresh__8u0__p6_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__8u0__p6_0[] = { ++static const long _vq_quantmap__8u0__p6_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__8u0__p6_0 = { +- _vq_quantthresh__8u0__p6_0, +- _vq_quantmap__8u0__p6_0, ++static const encode_aux_threshmatch _vq_auxt__8u0__p6_0 = { ++ (float *)_vq_quantthresh__8u0__p6_0, ++ (long *)_vq_quantmap__8u0__p6_0, + 13, + 13 + }; + +-static static_codebook _8u0__p6_0 = { ++static const static_codebook _8u0__p6_0 = { + 2, 169, +- _vq_lengthlist__8u0__p6_0, ++ (long *)_vq_lengthlist__8u0__p6_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__8u0__p6_0, ++ (long *)_vq_quantlist__8u0__p6_0, + NULL, +- &_vq_auxt__8u0__p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8u0__p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8u0__p6_1[] = { ++static const long _vq_quantlist__8u0__p6_1[] = { + 2, + 1, + 3, +@@ -2696,44 +2696,44 @@ + 4, + }; + +-static long _vq_lengthlist__8u0__p6_1[] = { ++static const long _vq_lengthlist__8u0__p6_1[] = { + 1, 4, 4, 6, 6, 4, 6, 5, 7, 7, 4, 5, 6, 7, 7, 6, + 7, 7, 7, 7, 6, 7, 7, 7, 7, + }; + +-static float _vq_quantthresh__8u0__p6_1[] = { ++static const float _vq_quantthresh__8u0__p6_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__8u0__p6_1[] = { ++static const long _vq_quantmap__8u0__p6_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__8u0__p6_1 = { +- _vq_quantthresh__8u0__p6_1, +- _vq_quantmap__8u0__p6_1, ++static const encode_aux_threshmatch _vq_auxt__8u0__p6_1 = { ++ (float *)_vq_quantthresh__8u0__p6_1, ++ (long *)_vq_quantmap__8u0__p6_1, + 5, + 5 + }; + +-static static_codebook _8u0__p6_1 = { ++static const static_codebook _8u0__p6_1 = { + 2, 25, +- _vq_lengthlist__8u0__p6_1, ++ (long *)_vq_lengthlist__8u0__p6_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__8u0__p6_1, ++ (long *)_vq_quantlist__8u0__p6_1, + NULL, +- &_vq_auxt__8u0__p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__8u0__p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__8u0__p7_0[] = { ++static const long _vq_quantlist__8u0__p7_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__8u0__p7_0[] = { ++static const long _vq_lengthlist__8u0__p7_0[] = { + 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, +@@ -2742,33 +2742,33 @@ + 7, + }; + +-static float _vq_quantthresh__8u0__p7_0[] = { ++static const float _vq_quantthresh__8u0__p7_0[] = { + -157.5, 157.5, + }; + +-static long _vq_quantmap__8u0__p7_0[] = { ++static const long _vq_quantmap__8u0__p7_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__8u0__p7_0 = { +- _vq_quantthresh__8u0__p7_0, +- _vq_quantmap__8u0__p7_0, ++static const encode_aux_threshmatch _vq_auxt__8u0__p7_0 = { ++ (float *)_vq_quantthresh__8u0__p7_0, ++ (long *)_vq_quantmap__8u0__p7_0, + 3, + 3 + }; + +-static static_codebook _8u0__p7_0 = { ++static const static_codebook _8u0__p7_0 = { + 4, 81, +- _vq_lengthlist__8u0__p7_0, ++ (long *)_vq_lengthlist__8u0__p7_0, + 1, -518803456, 1628680192, 2, 0, +- _vq_quantlist__8u0__p7_0, ++ (long *)_vq_quantlist__8u0__p7_0, + NULL, +- &_vq_auxt__8u0__p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8u0__p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8u0__p7_1[] = { ++static const long _vq_quantlist__8u0__p7_1[] = { + 7, + 6, + 8, +@@ -2786,7 +2786,7 @@ + 14, + }; + +-static long _vq_lengthlist__8u0__p7_1[] = { ++static const long _vq_lengthlist__8u0__p7_1[] = { + 1, 5, 5, 5, 5,10,10,11,11,11,11,11,11,11,11, 5, + 7, 6, 8, 8, 9,10,11,11,11,11,11,11,11,11, 6, 6, + 7, 9, 7,11,10,11,11,11,11,11,11,11,11, 5, 6, 6, +@@ -2804,35 +2804,35 @@ + 10, + }; + +-static float _vq_quantthresh__8u0__p7_1[] = { ++static const float _vq_quantthresh__8u0__p7_1[] = { + -136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, + 31.5, 52.5, 73.5, 94.5, 115.5, 136.5, + }; + +-static long _vq_quantmap__8u0__p7_1[] = { ++static const long _vq_quantmap__8u0__p7_1[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__8u0__p7_1 = { +- _vq_quantthresh__8u0__p7_1, +- _vq_quantmap__8u0__p7_1, ++static const encode_aux_threshmatch _vq_auxt__8u0__p7_1 = { ++ (float *)_vq_quantthresh__8u0__p7_1, ++ (long *)_vq_quantmap__8u0__p7_1, + 15, + 15 + }; + +-static static_codebook _8u0__p7_1 = { ++static const static_codebook _8u0__p7_1 = { + 2, 225, +- _vq_lengthlist__8u0__p7_1, ++ (long *)_vq_lengthlist__8u0__p7_1, + 1, -520986624, 1620377600, 4, 0, +- _vq_quantlist__8u0__p7_1, ++ (long *)_vq_quantlist__8u0__p7_1, + NULL, +- &_vq_auxt__8u0__p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__8u0__p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__8u0__p7_2[] = { ++static const long _vq_quantlist__8u0__p7_2[] = { + 10, + 9, + 11, +@@ -2856,7 +2856,7 @@ + 20, + }; + +-static long _vq_lengthlist__8u0__p7_2[] = { ++static const long _vq_lengthlist__8u0__p7_2[] = { + 1, 6, 5, 7, 7, 9, 9, 9, 9,10,12,12,10,11,11,10, + 11,11,11,10,11, 6, 8, 8, 9, 9,10,10, 9,10,11,11, + 10,11,11,11,11,10,11,11,11,11, 6, 7, 8, 9, 9, 9, +@@ -2887,46 +2887,46 @@ + 11,12,11,11,11,10,10,11,11, + }; + +-static float _vq_quantthresh__8u0__p7_2[] = { ++static const float _vq_quantthresh__8u0__p7_2[] = { + -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, + -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, + 6.5, 7.5, 8.5, 9.5, + }; + +-static long _vq_quantmap__8u0__p7_2[] = { ++static const long _vq_quantmap__8u0__p7_2[] = { + 19, 17, 15, 13, 11, 9, 7, 5, + 3, 1, 0, 2, 4, 6, 8, 10, + 12, 14, 16, 18, 20, + }; + +-static encode_aux_threshmatch _vq_auxt__8u0__p7_2 = { +- _vq_quantthresh__8u0__p7_2, +- _vq_quantmap__8u0__p7_2, ++static const encode_aux_threshmatch _vq_auxt__8u0__p7_2 = { ++ (float *)_vq_quantthresh__8u0__p7_2, ++ (long *)_vq_quantmap__8u0__p7_2, + 21, + 21 + }; + +-static static_codebook _8u0__p7_2 = { ++static const static_codebook _8u0__p7_2 = { + 2, 441, +- _vq_lengthlist__8u0__p7_2, ++ (long *)_vq_lengthlist__8u0__p7_2, + 1, -529268736, 1611661312, 5, 0, +- _vq_quantlist__8u0__p7_2, ++ (long *)_vq_quantlist__8u0__p7_2, + NULL, +- &_vq_auxt__8u0__p7_2, ++ (encode_aux_threshmatch *)&_vq_auxt__8u0__p7_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__8u0__single[] = { ++static const long _huff_lengthlist__8u0__single[] = { + 4, 7,11, 9,12, 8, 7,10, 6, 4, 5, 5, 7, 5, 6,16, + 9, 5, 5, 6, 7, 7, 9,16, 7, 4, 6, 5, 7, 5, 7,17, + 10, 7, 7, 8, 7, 7, 8,18, 7, 5, 6, 4, 5, 4, 5,15, + 7, 6, 7, 5, 6, 4, 5,15,12,13,18,12,17,11, 9,17, + }; + +-static static_codebook _huff_book__8u0__single = { ++static const static_codebook _huff_book__8u0__single = { + 2, 64, +- _huff_lengthlist__8u0__single, ++ (long *)_huff_lengthlist__8u0__single, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -2935,13 +2935,13 @@ + 0 + }; + +-static long _vq_quantlist__8u1__p1_0[] = { ++static const long _vq_quantlist__8u1__p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__8u1__p1_0[] = { ++static const long _vq_lengthlist__8u1__p1_0[] = { + 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 7, 9,10, 7, + 9, 9, 5, 8, 8, 7,10, 9, 7, 9, 9, 5, 8, 8, 8,10, + 10, 8,10,10, 7,10,10, 9,10,12,10,12,12, 7,10,10, +@@ -2950,39 +2950,39 @@ + 10, + }; + +-static float _vq_quantthresh__8u1__p1_0[] = { ++static const float _vq_quantthresh__8u1__p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__8u1__p1_0[] = { ++static const long _vq_quantmap__8u1__p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__8u1__p1_0 = { +- _vq_quantthresh__8u1__p1_0, +- _vq_quantmap__8u1__p1_0, ++static const encode_aux_threshmatch _vq_auxt__8u1__p1_0 = { ++ (float *)_vq_quantthresh__8u1__p1_0, ++ (long *)_vq_quantmap__8u1__p1_0, + 3, + 3 + }; + +-static static_codebook _8u1__p1_0 = { ++static const static_codebook _8u1__p1_0 = { + 4, 81, +- _vq_lengthlist__8u1__p1_0, ++ (long *)_vq_lengthlist__8u1__p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__8u1__p1_0, ++ (long *)_vq_quantlist__8u1__p1_0, + NULL, +- &_vq_auxt__8u1__p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8u1__p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8u1__p2_0[] = { ++static const long _vq_quantlist__8u1__p2_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__8u1__p2_0[] = { ++static const long _vq_lengthlist__8u1__p2_0[] = { + 3, 4, 5, 5, 6, 6, 5, 6, 6, 5, 7, 6, 6, 7, 8, 6, + 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 7, 5, 6, 6, 7, 8, + 8, 6, 7, 7, 6, 8, 7, 7, 7, 9, 8, 9, 9, 6, 7, 8, +@@ -2991,33 +2991,33 @@ + 7, + }; + +-static float _vq_quantthresh__8u1__p2_0[] = { ++static const float _vq_quantthresh__8u1__p2_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__8u1__p2_0[] = { ++static const long _vq_quantmap__8u1__p2_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__8u1__p2_0 = { +- _vq_quantthresh__8u1__p2_0, +- _vq_quantmap__8u1__p2_0, ++static const encode_aux_threshmatch _vq_auxt__8u1__p2_0 = { ++ (float *)_vq_quantthresh__8u1__p2_0, ++ (long *)_vq_quantmap__8u1__p2_0, + 3, + 3 + }; + +-static static_codebook _8u1__p2_0 = { ++static const static_codebook _8u1__p2_0 = { + 4, 81, +- _vq_lengthlist__8u1__p2_0, ++ (long *)_vq_lengthlist__8u1__p2_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__8u1__p2_0, ++ (long *)_vq_quantlist__8u1__p2_0, + NULL, +- &_vq_auxt__8u1__p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8u1__p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8u1__p3_0[] = { ++static const long _vq_quantlist__8u1__p3_0[] = { + 2, + 1, + 3, +@@ -3025,7 +3025,7 @@ + 4, + }; + +-static long _vq_lengthlist__8u1__p3_0[] = { ++static const long _vq_lengthlist__8u1__p3_0[] = { + 1, 5, 5, 7, 7, 6, 7, 7, 9, 9, 6, 7, 7, 9, 9, 8, + 10, 9,11,11, 9, 9, 9,11,11, 6, 8, 8,10,10, 8,10, + 10,11,11, 8, 9,10,11,11,10,11,11,12,12,10,11,11, +@@ -3068,33 +3068,33 @@ + 16, + }; + +-static float _vq_quantthresh__8u1__p3_0[] = { ++static const float _vq_quantthresh__8u1__p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__8u1__p3_0[] = { ++static const long _vq_quantmap__8u1__p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__8u1__p3_0 = { +- _vq_quantthresh__8u1__p3_0, +- _vq_quantmap__8u1__p3_0, ++static const encode_aux_threshmatch _vq_auxt__8u1__p3_0 = { ++ (float *)_vq_quantthresh__8u1__p3_0, ++ (long *)_vq_quantmap__8u1__p3_0, + 5, + 5 + }; + +-static static_codebook _8u1__p3_0 = { ++static const static_codebook _8u1__p3_0 = { + 4, 625, +- _vq_lengthlist__8u1__p3_0, ++ (long *)_vq_lengthlist__8u1__p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__8u1__p3_0, ++ (long *)_vq_quantlist__8u1__p3_0, + NULL, +- &_vq_auxt__8u1__p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8u1__p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8u1__p4_0[] = { ++static const long _vq_quantlist__8u1__p4_0[] = { + 2, + 1, + 3, +@@ -3102,7 +3102,7 @@ + 4, + }; + +-static long _vq_lengthlist__8u1__p4_0[] = { ++static const long _vq_lengthlist__8u1__p4_0[] = { + 4, 5, 5, 9, 9, 6, 7, 7, 9, 9, 6, 7, 7, 9, 9, 9, + 9, 9,11,11, 9, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 7, + 8, 9,10, 7, 7, 8, 9,10, 9, 9,10,10,11, 9, 9,10, +@@ -3145,33 +3145,33 @@ + 10, + }; + +-static float _vq_quantthresh__8u1__p4_0[] = { ++static const float _vq_quantthresh__8u1__p4_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__8u1__p4_0[] = { ++static const long _vq_quantmap__8u1__p4_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__8u1__p4_0 = { +- _vq_quantthresh__8u1__p4_0, +- _vq_quantmap__8u1__p4_0, ++static const encode_aux_threshmatch _vq_auxt__8u1__p4_0 = { ++ (float *)_vq_quantthresh__8u1__p4_0, ++ (long *)_vq_quantmap__8u1__p4_0, + 5, + 5 + }; + +-static static_codebook _8u1__p4_0 = { ++static const static_codebook _8u1__p4_0 = { + 4, 625, +- _vq_lengthlist__8u1__p4_0, ++ (long *)_vq_lengthlist__8u1__p4_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__8u1__p4_0, ++ (long *)_vq_quantlist__8u1__p4_0, + NULL, +- &_vq_auxt__8u1__p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8u1__p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8u1__p5_0[] = { ++static const long _vq_quantlist__8u1__p5_0[] = { + 4, + 3, + 5, +@@ -3183,7 +3183,7 @@ + 8, + }; + +-static long _vq_lengthlist__8u1__p5_0[] = { ++static const long _vq_lengthlist__8u1__p5_0[] = { + 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 5, 8, 7, 8, 8, + 10,10, 4, 6, 6, 8, 8, 8, 8,10,10, 7, 8, 8, 9, 9, + 9, 9,11,11, 7, 8, 8, 9, 9, 9, 9,11,11, 8, 8, 8, +@@ -3192,34 +3192,34 @@ + 13, + }; + +-static float _vq_quantthresh__8u1__p5_0[] = { ++static const float _vq_quantthresh__8u1__p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__8u1__p5_0[] = { ++static const long _vq_quantmap__8u1__p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__8u1__p5_0 = { +- _vq_quantthresh__8u1__p5_0, +- _vq_quantmap__8u1__p5_0, ++static const encode_aux_threshmatch _vq_auxt__8u1__p5_0 = { ++ (float *)_vq_quantthresh__8u1__p5_0, ++ (long *)_vq_quantmap__8u1__p5_0, + 9, + 9 + }; + +-static static_codebook _8u1__p5_0 = { ++static const static_codebook _8u1__p5_0 = { + 2, 81, +- _vq_lengthlist__8u1__p5_0, ++ (long *)_vq_lengthlist__8u1__p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__8u1__p5_0, ++ (long *)_vq_quantlist__8u1__p5_0, + NULL, +- &_vq_auxt__8u1__p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8u1__p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8u1__p6_0[] = { ++static const long _vq_quantlist__8u1__p6_0[] = { + 4, + 3, + 5, +@@ -3231,7 +3231,7 @@ + 8, + }; + +-static long _vq_lengthlist__8u1__p6_0[] = { ++static const long _vq_lengthlist__8u1__p6_0[] = { + 3, 4, 4, 6, 6, 7, 7, 9, 9, 4, 4, 5, 6, 6, 7, 7, + 9, 9, 4, 4, 4, 6, 6, 7, 7, 9, 9, 6, 6, 6, 7, 7, + 8, 8, 9, 9, 6, 6, 6, 7, 7, 8, 8, 9, 9, 7, 7, 7, +@@ -3240,40 +3240,40 @@ + 10, + }; + +-static float _vq_quantthresh__8u1__p6_0[] = { ++static const float _vq_quantthresh__8u1__p6_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__8u1__p6_0[] = { ++static const long _vq_quantmap__8u1__p6_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__8u1__p6_0 = { +- _vq_quantthresh__8u1__p6_0, +- _vq_quantmap__8u1__p6_0, ++static const encode_aux_threshmatch _vq_auxt__8u1__p6_0 = { ++ (float *)_vq_quantthresh__8u1__p6_0, ++ (long *)_vq_quantmap__8u1__p6_0, + 9, + 9 + }; + +-static static_codebook _8u1__p6_0 = { ++static const static_codebook _8u1__p6_0 = { + 2, 81, +- _vq_lengthlist__8u1__p6_0, ++ (long *)_vq_lengthlist__8u1__p6_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__8u1__p6_0, ++ (long *)_vq_quantlist__8u1__p6_0, + NULL, +- &_vq_auxt__8u1__p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8u1__p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8u1__p7_0[] = { ++static const long _vq_quantlist__8u1__p7_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__8u1__p7_0[] = { ++static const long _vq_lengthlist__8u1__p7_0[] = { + 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 9, 8,10,10, 8, + 10,10, 5, 9, 9, 7,10,10, 8,10,10, 4,10,10, 9,12, + 12, 9,11,11, 7,12,11,10,11,13,10,13,13, 7,12,12, +@@ -3282,33 +3282,33 @@ + 11, + }; + +-static float _vq_quantthresh__8u1__p7_0[] = { ++static const float _vq_quantthresh__8u1__p7_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__8u1__p7_0[] = { ++static const long _vq_quantmap__8u1__p7_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__8u1__p7_0 = { +- _vq_quantthresh__8u1__p7_0, +- _vq_quantmap__8u1__p7_0, ++static const encode_aux_threshmatch _vq_auxt__8u1__p7_0 = { ++ (float *)_vq_quantthresh__8u1__p7_0, ++ (long *)_vq_quantmap__8u1__p7_0, + 3, + 3 + }; + +-static static_codebook _8u1__p7_0 = { ++static const static_codebook _8u1__p7_0 = { + 4, 81, +- _vq_lengthlist__8u1__p7_0, ++ (long *)_vq_lengthlist__8u1__p7_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__8u1__p7_0, ++ (long *)_vq_quantlist__8u1__p7_0, + NULL, +- &_vq_auxt__8u1__p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8u1__p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8u1__p7_1[] = { ++static const long _vq_quantlist__8u1__p7_1[] = { + 5, + 4, + 6, +@@ -3322,7 +3322,7 @@ + 10, + }; + +-static long _vq_lengthlist__8u1__p7_1[] = { ++static const long _vq_lengthlist__8u1__p7_1[] = { + 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 5, 5, 7, 7, + 8, 8, 9, 9, 9, 9, 4, 5, 5, 7, 7, 8, 8, 9, 9, 9, + 9, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8, +@@ -3333,35 +3333,35 @@ + 9, 9, 9, 9, 9,10,10,10,10, + }; + +-static float _vq_quantthresh__8u1__p7_1[] = { ++static const float _vq_quantthresh__8u1__p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__8u1__p7_1[] = { ++static const long _vq_quantmap__8u1__p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__8u1__p7_1 = { +- _vq_quantthresh__8u1__p7_1, +- _vq_quantmap__8u1__p7_1, ++static const encode_aux_threshmatch _vq_auxt__8u1__p7_1 = { ++ (float *)_vq_quantthresh__8u1__p7_1, ++ (long *)_vq_quantmap__8u1__p7_1, + 11, + 11 + }; + +-static static_codebook _8u1__p7_1 = { ++static const static_codebook _8u1__p7_1 = { + 2, 121, +- _vq_lengthlist__8u1__p7_1, ++ (long *)_vq_lengthlist__8u1__p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__8u1__p7_1, ++ (long *)_vq_quantlist__8u1__p7_1, + NULL, +- &_vq_auxt__8u1__p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__8u1__p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__8u1__p8_0[] = { ++static const long _vq_quantlist__8u1__p8_0[] = { + 5, + 4, + 6, +@@ -3375,7 +3375,7 @@ + 10, + }; + +-static long _vq_lengthlist__8u1__p8_0[] = { ++static const long _vq_lengthlist__8u1__p8_0[] = { + 1, 4, 4, 6, 6, 8, 8,10,10,11,11, 4, 6, 6, 7, 7, + 9, 9,11,11,13,12, 4, 6, 6, 7, 7, 9, 9,11,11,12, + 12, 6, 7, 7, 9, 9,11,11,12,12,13,13, 6, 7, 7, 9, +@@ -3386,35 +3386,35 @@ + 12,13,13,14,14,15,15,15,15, + }; + +-static float _vq_quantthresh__8u1__p8_0[] = { ++static const float _vq_quantthresh__8u1__p8_0[] = { + -49.5, -38.5, -27.5, -16.5, -5.5, 5.5, 16.5, 27.5, + 38.5, 49.5, + }; + +-static long _vq_quantmap__8u1__p8_0[] = { ++static const long _vq_quantmap__8u1__p8_0[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__8u1__p8_0 = { +- _vq_quantthresh__8u1__p8_0, +- _vq_quantmap__8u1__p8_0, ++static const encode_aux_threshmatch _vq_auxt__8u1__p8_0 = { ++ (float *)_vq_quantthresh__8u1__p8_0, ++ (long *)_vq_quantmap__8u1__p8_0, + 11, + 11 + }; + +-static static_codebook _8u1__p8_0 = { ++static const static_codebook _8u1__p8_0 = { + 2, 121, +- _vq_lengthlist__8u1__p8_0, ++ (long *)_vq_lengthlist__8u1__p8_0, + 1, -524582912, 1618345984, 4, 0, +- _vq_quantlist__8u1__p8_0, ++ (long *)_vq_quantlist__8u1__p8_0, + NULL, +- &_vq_auxt__8u1__p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8u1__p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8u1__p8_1[] = { ++static const long _vq_quantlist__8u1__p8_1[] = { + 5, + 4, + 6, +@@ -3428,7 +3428,7 @@ + 10, + }; + +-static long _vq_lengthlist__8u1__p8_1[] = { ++static const long _vq_lengthlist__8u1__p8_1[] = { + 2, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 5, 6, 6, 7, 7, + 7, 7, 8, 8, 8, 8, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, + 8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7, +@@ -3439,35 +3439,35 @@ + 8, 8, 8, 8, 8, 9, 9, 9, 9, + }; + +-static float _vq_quantthresh__8u1__p8_1[] = { ++static const float _vq_quantthresh__8u1__p8_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__8u1__p8_1[] = { ++static const long _vq_quantmap__8u1__p8_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__8u1__p8_1 = { +- _vq_quantthresh__8u1__p8_1, +- _vq_quantmap__8u1__p8_1, ++static const encode_aux_threshmatch _vq_auxt__8u1__p8_1 = { ++ (float *)_vq_quantthresh__8u1__p8_1, ++ (long *)_vq_quantmap__8u1__p8_1, + 11, + 11 + }; + +-static static_codebook _8u1__p8_1 = { ++static const static_codebook _8u1__p8_1 = { + 2, 121, +- _vq_lengthlist__8u1__p8_1, ++ (long *)_vq_lengthlist__8u1__p8_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__8u1__p8_1, ++ (long *)_vq_quantlist__8u1__p8_1, + NULL, +- &_vq_auxt__8u1__p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__8u1__p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__8u1__p9_0[] = { ++static const long _vq_quantlist__8u1__p9_0[] = { + 7, + 6, + 8, +@@ -3485,7 +3485,7 @@ + 14, + }; + +-static long _vq_lengthlist__8u1__p9_0[] = { ++static const long _vq_lengthlist__8u1__p9_0[] = { + 1, 4, 4,11,11,11,11,11,11,11,11,11,11,11,11, 3, + 11, 8,11,11,11,11,11,11,11,11,11,11,11,11, 3, 9, + 9,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, +@@ -3503,35 +3503,35 @@ + 10, + }; + +-static float _vq_quantthresh__8u1__p9_0[] = { ++static const float _vq_quantthresh__8u1__p9_0[] = { + -1657.5, -1402.5, -1147.5, -892.5, -637.5, -382.5, -127.5, 127.5, + 382.5, 637.5, 892.5, 1147.5, 1402.5, 1657.5, + }; + +-static long _vq_quantmap__8u1__p9_0[] = { ++static const long _vq_quantmap__8u1__p9_0[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__8u1__p9_0 = { +- _vq_quantthresh__8u1__p9_0, +- _vq_quantmap__8u1__p9_0, ++static const encode_aux_threshmatch _vq_auxt__8u1__p9_0 = { ++ (float *)_vq_quantthresh__8u1__p9_0, ++ (long *)_vq_quantmap__8u1__p9_0, + 15, + 15 + }; + +-static static_codebook _8u1__p9_0 = { ++static const static_codebook _8u1__p9_0 = { + 2, 225, +- _vq_lengthlist__8u1__p9_0, ++ (long *)_vq_lengthlist__8u1__p9_0, + 1, -514071552, 1627381760, 4, 0, +- _vq_quantlist__8u1__p9_0, ++ (long *)_vq_quantlist__8u1__p9_0, + NULL, +- &_vq_auxt__8u1__p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__8u1__p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__8u1__p9_1[] = { ++static const long _vq_quantlist__8u1__p9_1[] = { + 7, + 6, + 8, +@@ -3549,7 +3549,7 @@ + 14, + }; + +-static long _vq_lengthlist__8u1__p9_1[] = { ++static const long _vq_lengthlist__8u1__p9_1[] = { + 1, 4, 4, 7, 7, 9, 9, 7, 7, 8, 8,10,10,11,11, 4, + 7, 7, 9, 9,10,10, 8, 8,10,10,10,11,10,11, 4, 7, + 7, 9, 9,10,10, 8, 8,10, 9,11,11,11,11, 7, 9, 9, +@@ -3567,35 +3567,35 @@ + 13, + }; + +-static float _vq_quantthresh__8u1__p9_1[] = { ++static const float _vq_quantthresh__8u1__p9_1[] = { + -110.5, -93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, + 25.5, 42.5, 59.5, 76.5, 93.5, 110.5, + }; + +-static long _vq_quantmap__8u1__p9_1[] = { ++static const long _vq_quantmap__8u1__p9_1[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__8u1__p9_1 = { +- _vq_quantthresh__8u1__p9_1, +- _vq_quantmap__8u1__p9_1, ++static const encode_aux_threshmatch _vq_auxt__8u1__p9_1 = { ++ (float *)_vq_quantthresh__8u1__p9_1, ++ (long *)_vq_quantmap__8u1__p9_1, + 15, + 15 + }; + +-static static_codebook _8u1__p9_1 = { ++static const static_codebook _8u1__p9_1 = { + 2, 225, +- _vq_lengthlist__8u1__p9_1, ++ (long *)_vq_lengthlist__8u1__p9_1, + 1, -522338304, 1620115456, 4, 0, +- _vq_quantlist__8u1__p9_1, ++ (long *)_vq_quantlist__8u1__p9_1, + NULL, +- &_vq_auxt__8u1__p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__8u1__p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__8u1__p9_2[] = { ++static const long _vq_quantlist__8u1__p9_2[] = { + 8, + 7, + 9, +@@ -3615,7 +3615,7 @@ + 16, + }; + +-static long _vq_lengthlist__8u1__p9_2[] = { ++static const long _vq_lengthlist__8u1__p9_2[] = { + 2, 5, 4, 6, 6, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, + 9, 5, 6, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, + 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9, +@@ -3637,36 +3637,36 @@ + 10, + }; + +-static float _vq_quantthresh__8u1__p9_2[] = { ++static const float _vq_quantthresh__8u1__p9_2[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__8u1__p9_2[] = { ++static const long _vq_quantmap__8u1__p9_2[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__8u1__p9_2 = { +- _vq_quantthresh__8u1__p9_2, +- _vq_quantmap__8u1__p9_2, ++static const encode_aux_threshmatch _vq_auxt__8u1__p9_2 = { ++ (float *)_vq_quantthresh__8u1__p9_2, ++ (long *)_vq_quantmap__8u1__p9_2, + 17, + 17 + }; + +-static static_codebook _8u1__p9_2 = { ++static const static_codebook _8u1__p9_2 = { + 2, 289, +- _vq_lengthlist__8u1__p9_2, ++ (long *)_vq_lengthlist__8u1__p9_2, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__8u1__p9_2, ++ (long *)_vq_quantlist__8u1__p9_2, + NULL, +- &_vq_auxt__8u1__p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__8u1__p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__8u1__single[] = { ++static const long _huff_lengthlist__8u1__single[] = { + 4, 7,13, 9,15, 9,16, 8,10,13, 7, 5, 8, 6, 9, 7, + 10, 7,10,11,11, 6, 7, 8, 8, 9, 9, 9,12,16, 8, 5, + 8, 6, 8, 6, 9, 7,10,12,11, 7, 7, 7, 6, 7, 7, 7, +@@ -3676,9 +3676,9 @@ + 13, 8, 8,15, + }; + +-static static_codebook _huff_book__8u1__single = { ++static const static_codebook _huff_book__8u1__single = { + 2, 100, +- _huff_lengthlist__8u1__single, ++ (long *)_huff_lengthlist__8u1__single, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -3687,16 +3687,16 @@ + 0 + }; + +-static long _huff_lengthlist__44u0__long[] = { ++static const long _huff_lengthlist__44u0__long[] = { + 5, 8,13,10,17,11,11,15, 7, 2, 4, 5, 8, 7, 9,16, + 13, 4, 3, 5, 6, 8,11,20,10, 4, 5, 5, 7, 6, 8,18, + 15, 7, 6, 7, 8,10,14,20,10, 6, 7, 6, 9, 7, 8,17, + 9, 8,10, 8,10, 5, 4,11,12,17,19,14,16,10, 7,12, + }; + +-static static_codebook _huff_book__44u0__long = { ++static const static_codebook _huff_book__44u0__long = { + 2, 64, +- _huff_lengthlist__44u0__long, ++ (long *)_huff_lengthlist__44u0__long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -3705,13 +3705,13 @@ + 0 + }; + +-static long _vq_quantlist__44u0__p1_0[] = { ++static const long _vq_quantlist__44u0__p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u0__p1_0[] = { ++static const long _vq_lengthlist__44u0__p1_0[] = { + 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,11,11, 8, + 10,10, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11, + 11, 8,11,11, 8,12,11,11,13,13,11,13,14, 7,11,11, +@@ -3720,39 +3720,39 @@ + 13, + }; + +-static float _vq_quantthresh__44u0__p1_0[] = { ++static const float _vq_quantthresh__44u0__p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u0__p1_0[] = { ++static const long _vq_quantmap__44u0__p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u0__p1_0 = { +- _vq_quantthresh__44u0__p1_0, +- _vq_quantmap__44u0__p1_0, ++static const encode_aux_threshmatch _vq_auxt__44u0__p1_0 = { ++ (float *)_vq_quantthresh__44u0__p1_0, ++ (long *)_vq_quantmap__44u0__p1_0, + 3, + 3 + }; + +-static static_codebook _44u0__p1_0 = { ++static const static_codebook _44u0__p1_0 = { + 4, 81, +- _vq_lengthlist__44u0__p1_0, ++ (long *)_vq_lengthlist__44u0__p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u0__p1_0, ++ (long *)_vq_quantlist__44u0__p1_0, + NULL, +- &_vq_auxt__44u0__p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u0__p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u0__p2_0[] = { ++static const long _vq_quantlist__44u0__p2_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u0__p2_0[] = { ++static const long _vq_lengthlist__44u0__p2_0[] = { + 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 8, 6, + 8, 8, 5, 7, 7, 6, 8, 8, 7, 8, 8, 4, 7, 7, 7, 8, + 8, 7, 8, 8, 7, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8, +@@ -3761,33 +3761,33 @@ + 9, + }; + +-static float _vq_quantthresh__44u0__p2_0[] = { ++static const float _vq_quantthresh__44u0__p2_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u0__p2_0[] = { ++static const long _vq_quantmap__44u0__p2_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u0__p2_0 = { +- _vq_quantthresh__44u0__p2_0, +- _vq_quantmap__44u0__p2_0, ++static const encode_aux_threshmatch _vq_auxt__44u0__p2_0 = { ++ (float *)_vq_quantthresh__44u0__p2_0, ++ (long *)_vq_quantmap__44u0__p2_0, + 3, + 3 + }; + +-static static_codebook _44u0__p2_0 = { ++static const static_codebook _44u0__p2_0 = { + 4, 81, +- _vq_lengthlist__44u0__p2_0, ++ (long *)_vq_lengthlist__44u0__p2_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u0__p2_0, ++ (long *)_vq_quantlist__44u0__p2_0, + NULL, +- &_vq_auxt__44u0__p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u0__p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u0__p3_0[] = { ++static const long _vq_quantlist__44u0__p3_0[] = { + 2, + 1, + 3, +@@ -3795,7 +3795,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u0__p3_0[] = { ++static const long _vq_lengthlist__44u0__p3_0[] = { + 1, 5, 5, 8, 8, 5, 8, 7, 9, 9, 5, 7, 8, 9, 9, 9, + 10, 9,12,12, 9, 9,10,12,12, 6, 8, 8,11,10, 8,10, + 10,11,11, 8, 9,10,11,11,10,11,11,14,13,10,11,11, +@@ -3838,33 +3838,33 @@ + 19, + }; + +-static float _vq_quantthresh__44u0__p3_0[] = { ++static const float _vq_quantthresh__44u0__p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u0__p3_0[] = { ++static const long _vq_quantmap__44u0__p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u0__p3_0 = { +- _vq_quantthresh__44u0__p3_0, +- _vq_quantmap__44u0__p3_0, ++static const encode_aux_threshmatch _vq_auxt__44u0__p3_0 = { ++ (float *)_vq_quantthresh__44u0__p3_0, ++ (long *)_vq_quantmap__44u0__p3_0, + 5, + 5 + }; + +-static static_codebook _44u0__p3_0 = { ++static const static_codebook _44u0__p3_0 = { + 4, 625, +- _vq_lengthlist__44u0__p3_0, ++ (long *)_vq_lengthlist__44u0__p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u0__p3_0, ++ (long *)_vq_quantlist__44u0__p3_0, + NULL, +- &_vq_auxt__44u0__p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u0__p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u0__p4_0[] = { ++static const long _vq_quantlist__44u0__p4_0[] = { + 2, + 1, + 3, +@@ -3872,7 +3872,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u0__p4_0[] = { ++static const long _vq_lengthlist__44u0__p4_0[] = { + 4, 5, 5, 9, 9, 5, 6, 6, 9, 9, 5, 6, 6, 9, 9, 9, + 10, 9,12,12, 9, 9,10,12,12, 5, 7, 7,10,10, 7, 7, + 8,10,10, 6, 7, 8,10,10,10,10,10,11,13,10, 9,10, +@@ -3915,33 +3915,33 @@ + 12, + }; + +-static float _vq_quantthresh__44u0__p4_0[] = { ++static const float _vq_quantthresh__44u0__p4_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u0__p4_0[] = { ++static const long _vq_quantmap__44u0__p4_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u0__p4_0 = { +- _vq_quantthresh__44u0__p4_0, +- _vq_quantmap__44u0__p4_0, ++static const encode_aux_threshmatch _vq_auxt__44u0__p4_0 = { ++ (float *)_vq_quantthresh__44u0__p4_0, ++ (long *)_vq_quantmap__44u0__p4_0, + 5, + 5 + }; + +-static static_codebook _44u0__p4_0 = { ++static const static_codebook _44u0__p4_0 = { + 4, 625, +- _vq_lengthlist__44u0__p4_0, ++ (long *)_vq_lengthlist__44u0__p4_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u0__p4_0, ++ (long *)_vq_quantlist__44u0__p4_0, + NULL, +- &_vq_auxt__44u0__p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u0__p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u0__p5_0[] = { ++static const long _vq_quantlist__44u0__p5_0[] = { + 4, + 3, + 5, +@@ -3953,7 +3953,7 @@ + 8, + }; + +-static long _vq_lengthlist__44u0__p5_0[] = { ++static const long _vq_lengthlist__44u0__p5_0[] = { + 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 8, 8, 8, + 9, 9, 4, 6, 6, 8, 8, 8, 8, 9, 9, 7, 8, 8, 9, 9, + 9, 9,11,10, 7, 8, 8, 9, 9, 9, 9,10,10, 7, 8, 8, +@@ -3962,34 +3962,34 @@ + 12, + }; + +-static float _vq_quantthresh__44u0__p5_0[] = { ++static const float _vq_quantthresh__44u0__p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44u0__p5_0[] = { ++static const long _vq_quantmap__44u0__p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44u0__p5_0 = { +- _vq_quantthresh__44u0__p5_0, +- _vq_quantmap__44u0__p5_0, ++static const encode_aux_threshmatch _vq_auxt__44u0__p5_0 = { ++ (float *)_vq_quantthresh__44u0__p5_0, ++ (long *)_vq_quantmap__44u0__p5_0, + 9, + 9 + }; + +-static static_codebook _44u0__p5_0 = { ++static const static_codebook _44u0__p5_0 = { + 2, 81, +- _vq_lengthlist__44u0__p5_0, ++ (long *)_vq_lengthlist__44u0__p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44u0__p5_0, ++ (long *)_vq_quantlist__44u0__p5_0, + NULL, +- &_vq_auxt__44u0__p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u0__p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u0__p6_0[] = { ++static const long _vq_quantlist__44u0__p6_0[] = { + 6, + 5, + 7, +@@ -4005,7 +4005,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u0__p6_0[] = { ++static const long _vq_lengthlist__44u0__p6_0[] = { + 1, 4, 4, 6, 6, 8, 8,10, 9,11,10,14,13, 4, 6, 5, + 8, 8, 9, 9,11,10,11,11,14,14, 4, 5, 6, 8, 8, 9, + 9,10,10,11,11,14,14, 6, 8, 8, 9, 9,10,10,11,11, +@@ -4019,35 +4019,35 @@ + 15,17,16,17,18,17,17,18, 0, + }; + +-static float _vq_quantthresh__44u0__p6_0[] = { ++static const float _vq_quantthresh__44u0__p6_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44u0__p6_0[] = { ++static const long _vq_quantmap__44u0__p6_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u0__p6_0 = { +- _vq_quantthresh__44u0__p6_0, +- _vq_quantmap__44u0__p6_0, ++static const encode_aux_threshmatch _vq_auxt__44u0__p6_0 = { ++ (float *)_vq_quantthresh__44u0__p6_0, ++ (long *)_vq_quantmap__44u0__p6_0, + 13, + 13 + }; + +-static static_codebook _44u0__p6_0 = { ++static const static_codebook _44u0__p6_0 = { + 2, 169, +- _vq_lengthlist__44u0__p6_0, ++ (long *)_vq_lengthlist__44u0__p6_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44u0__p6_0, ++ (long *)_vq_quantlist__44u0__p6_0, + NULL, +- &_vq_auxt__44u0__p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u0__p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u0__p6_1[] = { ++static const long _vq_quantlist__44u0__p6_1[] = { + 2, + 1, + 3, +@@ -4055,38 +4055,38 @@ + 4, + }; + +-static long _vq_lengthlist__44u0__p6_1[] = { ++static const long _vq_lengthlist__44u0__p6_1[] = { + 2, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, + 6, 6, 6, 6, 5, 6, 6, 6, 6, + }; + +-static float _vq_quantthresh__44u0__p6_1[] = { ++static const float _vq_quantthresh__44u0__p6_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u0__p6_1[] = { ++static const long _vq_quantmap__44u0__p6_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u0__p6_1 = { +- _vq_quantthresh__44u0__p6_1, +- _vq_quantmap__44u0__p6_1, ++static const encode_aux_threshmatch _vq_auxt__44u0__p6_1 = { ++ (float *)_vq_quantthresh__44u0__p6_1, ++ (long *)_vq_quantmap__44u0__p6_1, + 5, + 5 + }; + +-static static_codebook _44u0__p6_1 = { ++static const static_codebook _44u0__p6_1 = { + 2, 25, +- _vq_lengthlist__44u0__p6_1, ++ (long *)_vq_lengthlist__44u0__p6_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u0__p6_1, ++ (long *)_vq_quantlist__44u0__p6_1, + NULL, +- &_vq_auxt__44u0__p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u0__p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u0__p7_0[] = { ++static const long _vq_quantlist__44u0__p7_0[] = { + 2, + 1, + 3, +@@ -4094,7 +4094,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u0__p7_0[] = { ++static const long _vq_lengthlist__44u0__p7_0[] = { + 1, 4, 4,11,11, 9,11,11,11,11,11,11,11,11,11,11, + 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, + 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, +@@ -4137,33 +4137,33 @@ + 10, + }; + +-static float _vq_quantthresh__44u0__p7_0[] = { ++static const float _vq_quantthresh__44u0__p7_0[] = { + -253.5, -84.5, 84.5, 253.5, + }; + +-static long _vq_quantmap__44u0__p7_0[] = { ++static const long _vq_quantmap__44u0__p7_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u0__p7_0 = { +- _vq_quantthresh__44u0__p7_0, +- _vq_quantmap__44u0__p7_0, ++static const encode_aux_threshmatch _vq_auxt__44u0__p7_0 = { ++ (float *)_vq_quantthresh__44u0__p7_0, ++ (long *)_vq_quantmap__44u0__p7_0, + 5, + 5 + }; + +-static static_codebook _44u0__p7_0 = { ++static const static_codebook _44u0__p7_0 = { + 4, 625, +- _vq_lengthlist__44u0__p7_0, ++ (long *)_vq_lengthlist__44u0__p7_0, + 1, -518709248, 1626677248, 3, 0, +- _vq_quantlist__44u0__p7_0, ++ (long *)_vq_quantlist__44u0__p7_0, + NULL, +- &_vq_auxt__44u0__p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u0__p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u0__p7_1[] = { ++static const long _vq_quantlist__44u0__p7_1[] = { + 6, + 5, + 7, +@@ -4179,7 +4179,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u0__p7_1[] = { ++static const long _vq_lengthlist__44u0__p7_1[] = { + 1, 4, 4, 6, 6, 6, 6, 7, 7, 8, 8, 9, 9, 5, 7, 7, + 8, 7, 7, 7, 9, 8,10, 9,10,11, 5, 7, 7, 8, 8, 7, + 7, 8, 9,10,10,11,11, 6, 8, 8, 9, 9, 9, 9,11,10, +@@ -4193,35 +4193,35 @@ + 15,15,15,15,15,15,15,15,15, + }; + +-static float _vq_quantthresh__44u0__p7_1[] = { ++static const float _vq_quantthresh__44u0__p7_1[] = { + -71.5, -58.5, -45.5, -32.5, -19.5, -6.5, 6.5, 19.5, + 32.5, 45.5, 58.5, 71.5, + }; + +-static long _vq_quantmap__44u0__p7_1[] = { ++static const long _vq_quantmap__44u0__p7_1[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u0__p7_1 = { +- _vq_quantthresh__44u0__p7_1, +- _vq_quantmap__44u0__p7_1, ++static const encode_aux_threshmatch _vq_auxt__44u0__p7_1 = { ++ (float *)_vq_quantthresh__44u0__p7_1, ++ (long *)_vq_quantmap__44u0__p7_1, + 13, + 13 + }; + +-static static_codebook _44u0__p7_1 = { ++static const static_codebook _44u0__p7_1 = { + 2, 169, +- _vq_lengthlist__44u0__p7_1, ++ (long *)_vq_lengthlist__44u0__p7_1, + 1, -523010048, 1618608128, 4, 0, +- _vq_quantlist__44u0__p7_1, ++ (long *)_vq_quantlist__44u0__p7_1, + NULL, +- &_vq_auxt__44u0__p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u0__p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u0__p7_2[] = { ++static const long _vq_quantlist__44u0__p7_2[] = { + 6, + 5, + 7, +@@ -4237,7 +4237,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u0__p7_2[] = { ++static const long _vq_lengthlist__44u0__p7_2[] = { + 2, 5, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 5, 5, 6, + 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 5, 6, 5, 7, 7, 8, + 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8, 8, 8, 8, 9, 8, +@@ -4251,44 +4251,44 @@ + 9, 9, 9,10, 9, 9,10,10, 9, + }; + +-static float _vq_quantthresh__44u0__p7_2[] = { ++static const float _vq_quantthresh__44u0__p7_2[] = { + -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, + 2.5, 3.5, 4.5, 5.5, + }; + +-static long _vq_quantmap__44u0__p7_2[] = { ++static const long _vq_quantmap__44u0__p7_2[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u0__p7_2 = { +- _vq_quantthresh__44u0__p7_2, +- _vq_quantmap__44u0__p7_2, ++static const encode_aux_threshmatch _vq_auxt__44u0__p7_2 = { ++ (float *)_vq_quantthresh__44u0__p7_2, ++ (long *)_vq_quantmap__44u0__p7_2, + 13, + 13 + }; + +-static static_codebook _44u0__p7_2 = { ++static const static_codebook _44u0__p7_2 = { + 2, 169, +- _vq_lengthlist__44u0__p7_2, ++ (long *)_vq_lengthlist__44u0__p7_2, + 1, -531103744, 1611661312, 4, 0, +- _vq_quantlist__44u0__p7_2, ++ (long *)_vq_quantlist__44u0__p7_2, + NULL, +- &_vq_auxt__44u0__p7_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44u0__p7_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44u0__short[] = { ++static const long _huff_lengthlist__44u0__short[] = { + 12,13,14,13,17,12,15,17, 5, 5, 6,10,10,11,15,16, + 4, 3, 3, 7, 5, 7,10,16, 7, 7, 7,10, 9,11,12,16, + 6, 5, 5, 9, 5, 6,10,16, 8, 7, 7, 9, 6, 7, 9,16, + 11, 7, 3, 6, 4, 5, 8,16,12, 9, 4, 8, 5, 7, 9,16, + }; + +-static static_codebook _huff_book__44u0__short = { ++static const static_codebook _huff_book__44u0__short = { + 2, 64, +- _huff_lengthlist__44u0__short, ++ (long *)_huff_lengthlist__44u0__short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -4297,16 +4297,16 @@ + 0 + }; + +-static long _huff_lengthlist__44u1__long[] = { ++static const long _huff_lengthlist__44u1__long[] = { + 5, 8,13,10,17,11,11,15, 7, 2, 4, 5, 8, 7, 9,16, + 13, 4, 3, 5, 6, 8,11,20,10, 4, 5, 5, 7, 6, 8,18, + 15, 7, 6, 7, 8,10,14,20,10, 6, 7, 6, 9, 7, 8,17, + 9, 8,10, 8,10, 5, 4,11,12,17,19,14,16,10, 7,12, + }; + +-static static_codebook _huff_book__44u1__long = { ++static const static_codebook _huff_book__44u1__long = { + 2, 64, +- _huff_lengthlist__44u1__long, ++ (long *)_huff_lengthlist__44u1__long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -4315,13 +4315,13 @@ + 0 + }; + +-static long _vq_quantlist__44u1__p1_0[] = { ++static const long _vq_quantlist__44u1__p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u1__p1_0[] = { ++static const long _vq_lengthlist__44u1__p1_0[] = { + 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,11,11, 8, + 10,10, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11, + 11, 8,11,11, 8,12,11,11,13,13,11,13,14, 7,11,11, +@@ -4330,39 +4330,39 @@ + 13, + }; + +-static float _vq_quantthresh__44u1__p1_0[] = { ++static const float _vq_quantthresh__44u1__p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u1__p1_0[] = { ++static const long _vq_quantmap__44u1__p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u1__p1_0 = { +- _vq_quantthresh__44u1__p1_0, +- _vq_quantmap__44u1__p1_0, ++static const encode_aux_threshmatch _vq_auxt__44u1__p1_0 = { ++ (float *)_vq_quantthresh__44u1__p1_0, ++ (long *)_vq_quantmap__44u1__p1_0, + 3, + 3 + }; + +-static static_codebook _44u1__p1_0 = { ++static const static_codebook _44u1__p1_0 = { + 4, 81, +- _vq_lengthlist__44u1__p1_0, ++ (long *)_vq_lengthlist__44u1__p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u1__p1_0, ++ (long *)_vq_quantlist__44u1__p1_0, + NULL, +- &_vq_auxt__44u1__p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u1__p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u1__p2_0[] = { ++static const long _vq_quantlist__44u1__p2_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u1__p2_0[] = { ++static const long _vq_lengthlist__44u1__p2_0[] = { + 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 8, 6, + 8, 8, 5, 7, 7, 6, 8, 8, 7, 8, 8, 4, 7, 7, 7, 8, + 8, 7, 8, 8, 7, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8, +@@ -4371,33 +4371,33 @@ + 9, + }; + +-static float _vq_quantthresh__44u1__p2_0[] = { ++static const float _vq_quantthresh__44u1__p2_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u1__p2_0[] = { ++static const long _vq_quantmap__44u1__p2_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u1__p2_0 = { +- _vq_quantthresh__44u1__p2_0, +- _vq_quantmap__44u1__p2_0, ++static const encode_aux_threshmatch _vq_auxt__44u1__p2_0 = { ++ (float *)_vq_quantthresh__44u1__p2_0, ++ (long *)_vq_quantmap__44u1__p2_0, + 3, + 3 + }; + +-static static_codebook _44u1__p2_0 = { ++static const static_codebook _44u1__p2_0 = { + 4, 81, +- _vq_lengthlist__44u1__p2_0, ++ (long *)_vq_lengthlist__44u1__p2_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u1__p2_0, ++ (long *)_vq_quantlist__44u1__p2_0, + NULL, +- &_vq_auxt__44u1__p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u1__p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u1__p3_0[] = { ++static const long _vq_quantlist__44u1__p3_0[] = { + 2, + 1, + 3, +@@ -4405,7 +4405,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u1__p3_0[] = { ++static const long _vq_lengthlist__44u1__p3_0[] = { + 1, 5, 5, 8, 8, 5, 8, 7, 9, 9, 5, 7, 8, 9, 9, 9, + 10, 9,12,12, 9, 9,10,12,12, 6, 8, 8,11,10, 8,10, + 10,11,11, 8, 9,10,11,11,10,11,11,14,13,10,11,11, +@@ -4448,33 +4448,33 @@ + 19, + }; + +-static float _vq_quantthresh__44u1__p3_0[] = { ++static const float _vq_quantthresh__44u1__p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u1__p3_0[] = { ++static const long _vq_quantmap__44u1__p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u1__p3_0 = { +- _vq_quantthresh__44u1__p3_0, +- _vq_quantmap__44u1__p3_0, ++static const encode_aux_threshmatch _vq_auxt__44u1__p3_0 = { ++ (float *)_vq_quantthresh__44u1__p3_0, ++ (long *)_vq_quantmap__44u1__p3_0, + 5, + 5 + }; + +-static static_codebook _44u1__p3_0 = { ++static const static_codebook _44u1__p3_0 = { + 4, 625, +- _vq_lengthlist__44u1__p3_0, ++ (long *)_vq_lengthlist__44u1__p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u1__p3_0, ++ (long *)_vq_quantlist__44u1__p3_0, + NULL, +- &_vq_auxt__44u1__p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u1__p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u1__p4_0[] = { ++static const long _vq_quantlist__44u1__p4_0[] = { + 2, + 1, + 3, +@@ -4482,7 +4482,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u1__p4_0[] = { ++static const long _vq_lengthlist__44u1__p4_0[] = { + 4, 5, 5, 9, 9, 5, 6, 6, 9, 9, 5, 6, 6, 9, 9, 9, + 10, 9,12,12, 9, 9,10,12,12, 5, 7, 7,10,10, 7, 7, + 8,10,10, 6, 7, 8,10,10,10,10,10,11,13,10, 9,10, +@@ -4525,33 +4525,33 @@ + 12, + }; + +-static float _vq_quantthresh__44u1__p4_0[] = { ++static const float _vq_quantthresh__44u1__p4_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u1__p4_0[] = { ++static const long _vq_quantmap__44u1__p4_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u1__p4_0 = { +- _vq_quantthresh__44u1__p4_0, +- _vq_quantmap__44u1__p4_0, ++static const encode_aux_threshmatch _vq_auxt__44u1__p4_0 = { ++ (float *)_vq_quantthresh__44u1__p4_0, ++ (long *)_vq_quantmap__44u1__p4_0, + 5, + 5 + }; + +-static static_codebook _44u1__p4_0 = { ++static const static_codebook _44u1__p4_0 = { + 4, 625, +- _vq_lengthlist__44u1__p4_0, ++ (long *)_vq_lengthlist__44u1__p4_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u1__p4_0, ++ (long *)_vq_quantlist__44u1__p4_0, + NULL, +- &_vq_auxt__44u1__p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u1__p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u1__p5_0[] = { ++static const long _vq_quantlist__44u1__p5_0[] = { + 4, + 3, + 5, +@@ -4563,7 +4563,7 @@ + 8, + }; + +-static long _vq_lengthlist__44u1__p5_0[] = { ++static const long _vq_lengthlist__44u1__p5_0[] = { + 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 8, 8, 8, + 9, 9, 4, 6, 6, 8, 8, 8, 8, 9, 9, 7, 8, 8, 9, 9, + 9, 9,11,10, 7, 8, 8, 9, 9, 9, 9,10,10, 7, 8, 8, +@@ -4572,34 +4572,34 @@ + 12, + }; + +-static float _vq_quantthresh__44u1__p5_0[] = { ++static const float _vq_quantthresh__44u1__p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44u1__p5_0[] = { ++static const long _vq_quantmap__44u1__p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44u1__p5_0 = { +- _vq_quantthresh__44u1__p5_0, +- _vq_quantmap__44u1__p5_0, ++static const encode_aux_threshmatch _vq_auxt__44u1__p5_0 = { ++ (float *)_vq_quantthresh__44u1__p5_0, ++ (long *)_vq_quantmap__44u1__p5_0, + 9, + 9 + }; + +-static static_codebook _44u1__p5_0 = { ++static const static_codebook _44u1__p5_0 = { + 2, 81, +- _vq_lengthlist__44u1__p5_0, ++ (long *)_vq_lengthlist__44u1__p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44u1__p5_0, ++ (long *)_vq_quantlist__44u1__p5_0, + NULL, +- &_vq_auxt__44u1__p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u1__p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u1__p6_0[] = { ++static const long _vq_quantlist__44u1__p6_0[] = { + 6, + 5, + 7, +@@ -4615,7 +4615,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u1__p6_0[] = { ++static const long _vq_lengthlist__44u1__p6_0[] = { + 1, 4, 4, 6, 6, 8, 8,10, 9,11,10,14,13, 4, 6, 5, + 8, 8, 9, 9,11,10,11,11,14,14, 4, 5, 6, 8, 8, 9, + 9,10,10,11,11,14,14, 6, 8, 8, 9, 9,10,10,11,11, +@@ -4629,35 +4629,35 @@ + 15,17,16,17,18,17,17,18, 0, + }; + +-static float _vq_quantthresh__44u1__p6_0[] = { ++static const float _vq_quantthresh__44u1__p6_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44u1__p6_0[] = { ++static const long _vq_quantmap__44u1__p6_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u1__p6_0 = { +- _vq_quantthresh__44u1__p6_0, +- _vq_quantmap__44u1__p6_0, ++static const encode_aux_threshmatch _vq_auxt__44u1__p6_0 = { ++ (float *)_vq_quantthresh__44u1__p6_0, ++ (long *)_vq_quantmap__44u1__p6_0, + 13, + 13 + }; + +-static static_codebook _44u1__p6_0 = { ++static const static_codebook _44u1__p6_0 = { + 2, 169, +- _vq_lengthlist__44u1__p6_0, ++ (long *)_vq_lengthlist__44u1__p6_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44u1__p6_0, ++ (long *)_vq_quantlist__44u1__p6_0, + NULL, +- &_vq_auxt__44u1__p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u1__p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u1__p6_1[] = { ++static const long _vq_quantlist__44u1__p6_1[] = { + 2, + 1, + 3, +@@ -4665,38 +4665,38 @@ + 4, + }; + +-static long _vq_lengthlist__44u1__p6_1[] = { ++static const long _vq_lengthlist__44u1__p6_1[] = { + 2, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, + 6, 6, 6, 6, 5, 6, 6, 6, 6, + }; + +-static float _vq_quantthresh__44u1__p6_1[] = { ++static const float _vq_quantthresh__44u1__p6_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u1__p6_1[] = { ++static const long _vq_quantmap__44u1__p6_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u1__p6_1 = { +- _vq_quantthresh__44u1__p6_1, +- _vq_quantmap__44u1__p6_1, ++static const encode_aux_threshmatch _vq_auxt__44u1__p6_1 = { ++ (float *)_vq_quantthresh__44u1__p6_1, ++ (long *)_vq_quantmap__44u1__p6_1, + 5, + 5 + }; + +-static static_codebook _44u1__p6_1 = { ++static const static_codebook _44u1__p6_1 = { + 2, 25, +- _vq_lengthlist__44u1__p6_1, ++ (long *)_vq_lengthlist__44u1__p6_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u1__p6_1, ++ (long *)_vq_quantlist__44u1__p6_1, + NULL, +- &_vq_auxt__44u1__p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u1__p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u1__p7_0[] = { ++static const long _vq_quantlist__44u1__p7_0[] = { + 3, + 2, + 4, +@@ -4706,40 +4706,40 @@ + 6, + }; + +-static long _vq_lengthlist__44u1__p7_0[] = { ++static const long _vq_lengthlist__44u1__p7_0[] = { + 1, 3, 2, 9, 9, 7, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, + }; + +-static float _vq_quantthresh__44u1__p7_0[] = { ++static const float _vq_quantthresh__44u1__p7_0[] = { + -422.5, -253.5, -84.5, 84.5, 253.5, 422.5, + }; + +-static long _vq_quantmap__44u1__p7_0[] = { ++static const long _vq_quantmap__44u1__p7_0[] = { + 5, 3, 1, 0, 2, 4, 6, + }; + +-static encode_aux_threshmatch _vq_auxt__44u1__p7_0 = { +- _vq_quantthresh__44u1__p7_0, +- _vq_quantmap__44u1__p7_0, ++static const encode_aux_threshmatch _vq_auxt__44u1__p7_0 = { ++ (float *)_vq_quantthresh__44u1__p7_0, ++ (long *)_vq_quantmap__44u1__p7_0, + 7, + 7 + }; + +-static static_codebook _44u1__p7_0 = { ++static const static_codebook _44u1__p7_0 = { + 2, 49, +- _vq_lengthlist__44u1__p7_0, ++ (long *)_vq_lengthlist__44u1__p7_0, + 1, -518017024, 1626677248, 3, 0, +- _vq_quantlist__44u1__p7_0, ++ (long *)_vq_quantlist__44u1__p7_0, + NULL, +- &_vq_auxt__44u1__p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u1__p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u1__p7_1[] = { ++static const long _vq_quantlist__44u1__p7_1[] = { + 6, + 5, + 7, +@@ -4755,7 +4755,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u1__p7_1[] = { ++static const long _vq_lengthlist__44u1__p7_1[] = { + 1, 4, 4, 6, 6, 6, 6, 7, 7, 8, 8, 9, 9, 5, 7, 7, + 8, 7, 7, 7, 9, 8,10, 9,10,11, 5, 7, 7, 8, 8, 7, + 7, 8, 9,10,10,11,11, 6, 8, 8, 9, 9, 9, 9,11,10, +@@ -4769,35 +4769,35 @@ + 15,15,15,15,15,15,15,15,15, + }; + +-static float _vq_quantthresh__44u1__p7_1[] = { ++static const float _vq_quantthresh__44u1__p7_1[] = { + -71.5, -58.5, -45.5, -32.5, -19.5, -6.5, 6.5, 19.5, + 32.5, 45.5, 58.5, 71.5, + }; + +-static long _vq_quantmap__44u1__p7_1[] = { ++static const long _vq_quantmap__44u1__p7_1[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u1__p7_1 = { +- _vq_quantthresh__44u1__p7_1, +- _vq_quantmap__44u1__p7_1, ++static const encode_aux_threshmatch _vq_auxt__44u1__p7_1 = { ++ (float *)_vq_quantthresh__44u1__p7_1, ++ (long *)_vq_quantmap__44u1__p7_1, + 13, + 13 + }; + +-static static_codebook _44u1__p7_1 = { ++static const static_codebook _44u1__p7_1 = { + 2, 169, +- _vq_lengthlist__44u1__p7_1, ++ (long *)_vq_lengthlist__44u1__p7_1, + 1, -523010048, 1618608128, 4, 0, +- _vq_quantlist__44u1__p7_1, ++ (long *)_vq_quantlist__44u1__p7_1, + NULL, +- &_vq_auxt__44u1__p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u1__p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u1__p7_2[] = { ++static const long _vq_quantlist__44u1__p7_2[] = { + 6, + 5, + 7, +@@ -4813,7 +4813,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u1__p7_2[] = { ++static const long _vq_lengthlist__44u1__p7_2[] = { + 2, 5, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 5, 5, 6, + 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 5, 6, 5, 7, 7, 8, + 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8, 8, 8, 8, 9, 8, +@@ -4827,44 +4827,44 @@ + 9, 9, 9,10, 9, 9,10,10, 9, + }; + +-static float _vq_quantthresh__44u1__p7_2[] = { ++static const float _vq_quantthresh__44u1__p7_2[] = { + -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, + 2.5, 3.5, 4.5, 5.5, + }; + +-static long _vq_quantmap__44u1__p7_2[] = { ++static const long _vq_quantmap__44u1__p7_2[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u1__p7_2 = { +- _vq_quantthresh__44u1__p7_2, +- _vq_quantmap__44u1__p7_2, ++static const encode_aux_threshmatch _vq_auxt__44u1__p7_2 = { ++ (float *)_vq_quantthresh__44u1__p7_2, ++ (long *)_vq_quantmap__44u1__p7_2, + 13, + 13 + }; + +-static static_codebook _44u1__p7_2 = { ++static const static_codebook _44u1__p7_2 = { + 2, 169, +- _vq_lengthlist__44u1__p7_2, ++ (long *)_vq_lengthlist__44u1__p7_2, + 1, -531103744, 1611661312, 4, 0, +- _vq_quantlist__44u1__p7_2, ++ (long *)_vq_quantlist__44u1__p7_2, + NULL, +- &_vq_auxt__44u1__p7_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44u1__p7_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44u1__short[] = { ++static const long _huff_lengthlist__44u1__short[] = { + 12,13,14,13,17,12,15,17, 5, 5, 6,10,10,11,15,16, + 4, 3, 3, 7, 5, 7,10,16, 7, 7, 7,10, 9,11,12,16, + 6, 5, 5, 9, 5, 6,10,16, 8, 7, 7, 9, 6, 7, 9,16, + 11, 7, 3, 6, 4, 5, 8,16,12, 9, 4, 8, 5, 7, 9,16, + }; + +-static static_codebook _huff_book__44u1__short = { ++static const static_codebook _huff_book__44u1__short = { + 2, 64, +- _huff_lengthlist__44u1__short, ++ (long *)_huff_lengthlist__44u1__short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -4873,16 +4873,16 @@ + 0 + }; + +-static long _huff_lengthlist__44u2__long[] = { ++static const long _huff_lengthlist__44u2__long[] = { + 5, 9,14,12,15,13,10,13, 7, 4, 5, 6, 8, 7, 8,12, + 13, 4, 3, 5, 5, 6, 9,15,12, 6, 5, 6, 6, 6, 7,14, + 14, 7, 4, 6, 4, 6, 8,15,12, 6, 6, 5, 5, 5, 6,14, + 9, 7, 8, 6, 7, 5, 4,10,10,13,14,14,15,10, 6, 8, + }; + +-static static_codebook _huff_book__44u2__long = { ++static const static_codebook _huff_book__44u2__long = { + 2, 64, +- _huff_lengthlist__44u2__long, ++ (long *)_huff_lengthlist__44u2__long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -4891,13 +4891,13 @@ + 0 + }; + +-static long _vq_quantlist__44u2__p1_0[] = { ++static const long _vq_quantlist__44u2__p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u2__p1_0[] = { ++static const long _vq_lengthlist__44u2__p1_0[] = { + 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,11,11, 8, + 10,11, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11, + 11, 8,11,11, 8,11,11,11,13,14,11,13,13, 7,11,11, +@@ -4906,39 +4906,39 @@ + 13, + }; + +-static float _vq_quantthresh__44u2__p1_0[] = { ++static const float _vq_quantthresh__44u2__p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u2__p1_0[] = { ++static const long _vq_quantmap__44u2__p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u2__p1_0 = { +- _vq_quantthresh__44u2__p1_0, +- _vq_quantmap__44u2__p1_0, ++static const encode_aux_threshmatch _vq_auxt__44u2__p1_0 = { ++ (float *)_vq_quantthresh__44u2__p1_0, ++ (long *)_vq_quantmap__44u2__p1_0, + 3, + 3 + }; + +-static static_codebook _44u2__p1_0 = { ++static const static_codebook _44u2__p1_0 = { + 4, 81, +- _vq_lengthlist__44u2__p1_0, ++ (long *)_vq_lengthlist__44u2__p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u2__p1_0, ++ (long *)_vq_quantlist__44u2__p1_0, + NULL, +- &_vq_auxt__44u2__p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u2__p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u2__p2_0[] = { ++static const long _vq_quantlist__44u2__p2_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u2__p2_0[] = { ++static const long _vq_lengthlist__44u2__p2_0[] = { + 2, 5, 5, 5, 6, 6, 5, 6, 6, 5, 6, 6, 7, 8, 8, 6, + 8, 8, 5, 6, 6, 6, 8, 7, 7, 8, 8, 5, 6, 6, 7, 8, + 8, 6, 8, 8, 6, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8, +@@ -4947,33 +4947,33 @@ + 9, + }; + +-static float _vq_quantthresh__44u2__p2_0[] = { ++static const float _vq_quantthresh__44u2__p2_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u2__p2_0[] = { ++static const long _vq_quantmap__44u2__p2_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u2__p2_0 = { +- _vq_quantthresh__44u2__p2_0, +- _vq_quantmap__44u2__p2_0, ++static const encode_aux_threshmatch _vq_auxt__44u2__p2_0 = { ++ (float *)_vq_quantthresh__44u2__p2_0, ++ (long *)_vq_quantmap__44u2__p2_0, + 3, + 3 + }; + +-static static_codebook _44u2__p2_0 = { ++static const static_codebook _44u2__p2_0 = { + 4, 81, +- _vq_lengthlist__44u2__p2_0, ++ (long *)_vq_lengthlist__44u2__p2_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u2__p2_0, ++ (long *)_vq_quantlist__44u2__p2_0, + NULL, +- &_vq_auxt__44u2__p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u2__p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u2__p3_0[] = { ++static const long _vq_quantlist__44u2__p3_0[] = { + 2, + 1, + 3, +@@ -4981,7 +4981,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u2__p3_0[] = { ++static const long _vq_lengthlist__44u2__p3_0[] = { + 2, 4, 4, 7, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 8, + 9, 9,12,11, 8, 9, 9,11,12, 5, 7, 7,10,10, 7, 9, + 9,11,11, 7, 9, 9,10,11,10,11,11,13,13, 9,10,11, +@@ -5024,33 +5024,33 @@ + 0, + }; + +-static float _vq_quantthresh__44u2__p3_0[] = { ++static const float _vq_quantthresh__44u2__p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u2__p3_0[] = { ++static const long _vq_quantmap__44u2__p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u2__p3_0 = { +- _vq_quantthresh__44u2__p3_0, +- _vq_quantmap__44u2__p3_0, ++static const encode_aux_threshmatch _vq_auxt__44u2__p3_0 = { ++ (float *)_vq_quantthresh__44u2__p3_0, ++ (long *)_vq_quantmap__44u2__p3_0, + 5, + 5 + }; + +-static static_codebook _44u2__p3_0 = { ++static const static_codebook _44u2__p3_0 = { + 4, 625, +- _vq_lengthlist__44u2__p3_0, ++ (long *)_vq_lengthlist__44u2__p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u2__p3_0, ++ (long *)_vq_quantlist__44u2__p3_0, + NULL, +- &_vq_auxt__44u2__p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u2__p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u2__p4_0[] = { ++static const long _vq_quantlist__44u2__p4_0[] = { + 2, + 1, + 3, +@@ -5058,7 +5058,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u2__p4_0[] = { ++static const long _vq_lengthlist__44u2__p4_0[] = { + 4, 5, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 9, + 9, 9,11,11, 9, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8, + 8,10,10, 7, 7, 8,10,10,10,10,10,11,12, 9,10,10, +@@ -5101,33 +5101,33 @@ + 13, + }; + +-static float _vq_quantthresh__44u2__p4_0[] = { ++static const float _vq_quantthresh__44u2__p4_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u2__p4_0[] = { ++static const long _vq_quantmap__44u2__p4_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u2__p4_0 = { +- _vq_quantthresh__44u2__p4_0, +- _vq_quantmap__44u2__p4_0, ++static const encode_aux_threshmatch _vq_auxt__44u2__p4_0 = { ++ (float *)_vq_quantthresh__44u2__p4_0, ++ (long *)_vq_quantmap__44u2__p4_0, + 5, + 5 + }; + +-static static_codebook _44u2__p4_0 = { ++static const static_codebook _44u2__p4_0 = { + 4, 625, +- _vq_lengthlist__44u2__p4_0, ++ (long *)_vq_lengthlist__44u2__p4_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u2__p4_0, ++ (long *)_vq_quantlist__44u2__p4_0, + NULL, +- &_vq_auxt__44u2__p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u2__p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u2__p5_0[] = { ++static const long _vq_quantlist__44u2__p5_0[] = { + 4, + 3, + 5, +@@ -5139,7 +5139,7 @@ + 8, + }; + +-static long _vq_lengthlist__44u2__p5_0[] = { ++static const long _vq_lengthlist__44u2__p5_0[] = { + 1, 4, 4, 7, 7, 8, 8, 9, 9, 4, 6, 5, 8, 8, 8, 8, + 10,10, 4, 5, 6, 8, 8, 8, 8,10,10, 7, 8, 8, 9, 9, + 9, 9,11,11, 7, 8, 8, 9, 9, 9, 9,11,11, 8, 8, 8, +@@ -5148,34 +5148,34 @@ + 13, + }; + +-static float _vq_quantthresh__44u2__p5_0[] = { ++static const float _vq_quantthresh__44u2__p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44u2__p5_0[] = { ++static const long _vq_quantmap__44u2__p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44u2__p5_0 = { +- _vq_quantthresh__44u2__p5_0, +- _vq_quantmap__44u2__p5_0, ++static const encode_aux_threshmatch _vq_auxt__44u2__p5_0 = { ++ (float *)_vq_quantthresh__44u2__p5_0, ++ (long *)_vq_quantmap__44u2__p5_0, + 9, + 9 + }; + +-static static_codebook _44u2__p5_0 = { ++static const static_codebook _44u2__p5_0 = { + 2, 81, +- _vq_lengthlist__44u2__p5_0, ++ (long *)_vq_lengthlist__44u2__p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44u2__p5_0, ++ (long *)_vq_quantlist__44u2__p5_0, + NULL, +- &_vq_auxt__44u2__p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u2__p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u2__p6_0[] = { ++static const long _vq_quantlist__44u2__p6_0[] = { + 6, + 5, + 7, +@@ -5191,7 +5191,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u2__p6_0[] = { ++static const long _vq_lengthlist__44u2__p6_0[] = { + 1, 4, 4, 6, 6, 8, 8,10,10,11,11,14,13, 4, 6, 5, + 8, 8, 9, 9,11,10,12,11,15,14, 4, 5, 6, 8, 8, 9, + 9,11,11,11,11,14,14, 6, 8, 8,10, 9,11,11,11,11, +@@ -5205,35 +5205,35 @@ + 15,17,17,16,18,17,18, 0, 0, + }; + +-static float _vq_quantthresh__44u2__p6_0[] = { ++static const float _vq_quantthresh__44u2__p6_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44u2__p6_0[] = { ++static const long _vq_quantmap__44u2__p6_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u2__p6_0 = { +- _vq_quantthresh__44u2__p6_0, +- _vq_quantmap__44u2__p6_0, ++static const encode_aux_threshmatch _vq_auxt__44u2__p6_0 = { ++ (float *)_vq_quantthresh__44u2__p6_0, ++ (long *)_vq_quantmap__44u2__p6_0, + 13, + 13 + }; + +-static static_codebook _44u2__p6_0 = { ++static const static_codebook _44u2__p6_0 = { + 2, 169, +- _vq_lengthlist__44u2__p6_0, ++ (long *)_vq_lengthlist__44u2__p6_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44u2__p6_0, ++ (long *)_vq_quantlist__44u2__p6_0, + NULL, +- &_vq_auxt__44u2__p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u2__p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u2__p6_1[] = { ++static const long _vq_quantlist__44u2__p6_1[] = { + 2, + 1, + 3, +@@ -5241,38 +5241,38 @@ + 4, + }; + +-static long _vq_lengthlist__44u2__p6_1[] = { ++static const long _vq_lengthlist__44u2__p6_1[] = { + 2, 4, 4, 5, 5, 4, 5, 5, 6, 5, 4, 5, 5, 5, 6, 5, + 6, 5, 6, 6, 5, 5, 6, 6, 6, + }; + +-static float _vq_quantthresh__44u2__p6_1[] = { ++static const float _vq_quantthresh__44u2__p6_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u2__p6_1[] = { ++static const long _vq_quantmap__44u2__p6_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u2__p6_1 = { +- _vq_quantthresh__44u2__p6_1, +- _vq_quantmap__44u2__p6_1, ++static const encode_aux_threshmatch _vq_auxt__44u2__p6_1 = { ++ (float *)_vq_quantthresh__44u2__p6_1, ++ (long *)_vq_quantmap__44u2__p6_1, + 5, + 5 + }; + +-static static_codebook _44u2__p6_1 = { ++static const static_codebook _44u2__p6_1 = { + 2, 25, +- _vq_lengthlist__44u2__p6_1, ++ (long *)_vq_lengthlist__44u2__p6_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u2__p6_1, ++ (long *)_vq_quantlist__44u2__p6_1, + NULL, +- &_vq_auxt__44u2__p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u2__p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u2__p7_0[] = { ++static const long _vq_quantlist__44u2__p7_0[] = { + 4, + 3, + 5, +@@ -5284,7 +5284,7 @@ + 8, + }; + +-static long _vq_lengthlist__44u2__p7_0[] = { ++static const long _vq_lengthlist__44u2__p7_0[] = { + 1, 3, 2,12,12,12,12,12,12, 4,12,12,12,12,12,12, + 12,12, 5,12,12,12,12,12,12,12,12,12,12,11,11,11, + 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, +@@ -5293,34 +5293,34 @@ + 11, + }; + +-static float _vq_quantthresh__44u2__p7_0[] = { ++static const float _vq_quantthresh__44u2__p7_0[] = { + -591.5, -422.5, -253.5, -84.5, 84.5, 253.5, 422.5, 591.5, + }; + +-static long _vq_quantmap__44u2__p7_0[] = { ++static const long _vq_quantmap__44u2__p7_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44u2__p7_0 = { +- _vq_quantthresh__44u2__p7_0, +- _vq_quantmap__44u2__p7_0, ++static const encode_aux_threshmatch _vq_auxt__44u2__p7_0 = { ++ (float *)_vq_quantthresh__44u2__p7_0, ++ (long *)_vq_quantmap__44u2__p7_0, + 9, + 9 + }; + +-static static_codebook _44u2__p7_0 = { ++static const static_codebook _44u2__p7_0 = { + 2, 81, +- _vq_lengthlist__44u2__p7_0, ++ (long *)_vq_lengthlist__44u2__p7_0, + 1, -516612096, 1626677248, 4, 0, +- _vq_quantlist__44u2__p7_0, ++ (long *)_vq_quantlist__44u2__p7_0, + NULL, +- &_vq_auxt__44u2__p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u2__p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u2__p7_1[] = { ++static const long _vq_quantlist__44u2__p7_1[] = { + 6, + 5, + 7, +@@ -5336,7 +5336,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u2__p7_1[] = { ++static const long _vq_lengthlist__44u2__p7_1[] = { + 1, 4, 4, 7, 6, 7, 6, 8, 7, 9, 7, 9, 8, 4, 7, 6, + 8, 8, 9, 8,10, 9,10,10,11,11, 4, 7, 7, 8, 8, 8, + 8, 9,10,11,11,11,11, 6, 8, 8,10,10,10,10,11,11, +@@ -5350,35 +5350,35 @@ + 14,14,14,17,15,17,17,17,17, + }; + +-static float _vq_quantthresh__44u2__p7_1[] = { ++static const float _vq_quantthresh__44u2__p7_1[] = { + -71.5, -58.5, -45.5, -32.5, -19.5, -6.5, 6.5, 19.5, + 32.5, 45.5, 58.5, 71.5, + }; + +-static long _vq_quantmap__44u2__p7_1[] = { ++static const long _vq_quantmap__44u2__p7_1[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u2__p7_1 = { +- _vq_quantthresh__44u2__p7_1, +- _vq_quantmap__44u2__p7_1, ++static const encode_aux_threshmatch _vq_auxt__44u2__p7_1 = { ++ (float *)_vq_quantthresh__44u2__p7_1, ++ (long *)_vq_quantmap__44u2__p7_1, + 13, + 13 + }; + +-static static_codebook _44u2__p7_1 = { ++static const static_codebook _44u2__p7_1 = { + 2, 169, +- _vq_lengthlist__44u2__p7_1, ++ (long *)_vq_lengthlist__44u2__p7_1, + 1, -523010048, 1618608128, 4, 0, +- _vq_quantlist__44u2__p7_1, ++ (long *)_vq_quantlist__44u2__p7_1, + NULL, +- &_vq_auxt__44u2__p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u2__p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u2__p7_2[] = { ++static const long _vq_quantlist__44u2__p7_2[] = { + 6, + 5, + 7, +@@ -5394,7 +5394,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u2__p7_2[] = { ++static const long _vq_lengthlist__44u2__p7_2[] = { + 2, 5, 5, 6, 6, 7, 7, 8, 7, 8, 8, 8, 8, 5, 6, 6, + 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 5, 6, 6, 7, 7, 8, + 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7, 8, 8, 8, 8, 8, +@@ -5408,44 +5408,44 @@ + 9, 9, 9, 9, 9, 9, 9, 9, 9, + }; + +-static float _vq_quantthresh__44u2__p7_2[] = { ++static const float _vq_quantthresh__44u2__p7_2[] = { + -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, + 2.5, 3.5, 4.5, 5.5, + }; + +-static long _vq_quantmap__44u2__p7_2[] = { ++static const long _vq_quantmap__44u2__p7_2[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u2__p7_2 = { +- _vq_quantthresh__44u2__p7_2, +- _vq_quantmap__44u2__p7_2, ++static const encode_aux_threshmatch _vq_auxt__44u2__p7_2 = { ++ (float *)_vq_quantthresh__44u2__p7_2, ++ (long *)_vq_quantmap__44u2__p7_2, + 13, + 13 + }; + +-static static_codebook _44u2__p7_2 = { ++static const static_codebook _44u2__p7_2 = { + 2, 169, +- _vq_lengthlist__44u2__p7_2, ++ (long *)_vq_lengthlist__44u2__p7_2, + 1, -531103744, 1611661312, 4, 0, +- _vq_quantlist__44u2__p7_2, ++ (long *)_vq_quantlist__44u2__p7_2, + NULL, +- &_vq_auxt__44u2__p7_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44u2__p7_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44u2__short[] = { ++static const long _huff_lengthlist__44u2__short[] = { + 13,15,17,17,15,15,12,17,11, 9, 7,10,10, 9,12,17, + 10, 6, 3, 6, 5, 7,10,17,15,10, 6, 9, 8, 9,11,17, + 15, 8, 4, 7, 3, 5, 9,16,16,10, 5, 8, 4, 5, 8,16, + 13,11, 5, 8, 3, 3, 5,14,13,12, 7,10, 5, 5, 7,14, + }; + +-static static_codebook _huff_book__44u2__short = { ++static const static_codebook _huff_book__44u2__short = { + 2, 64, +- _huff_lengthlist__44u2__short, ++ (long *)_huff_lengthlist__44u2__short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -5454,16 +5454,16 @@ + 0 + }; + +-static long _huff_lengthlist__44u3__long[] = { ++static const long _huff_lengthlist__44u3__long[] = { + 6, 9,13,12,14,11,10,13, 8, 4, 5, 7, 8, 7, 8,12, + 11, 4, 3, 5, 5, 7, 9,14,11, 6, 5, 6, 6, 6, 7,13, + 13, 7, 5, 6, 4, 5, 7,14,11, 7, 6, 6, 5, 5, 6,13, + 9, 7, 8, 6, 7, 5, 3, 9, 9,12,13,12,14,10, 6, 7, + }; + +-static static_codebook _huff_book__44u3__long = { ++static const static_codebook _huff_book__44u3__long = { + 2, 64, +- _huff_lengthlist__44u3__long, ++ (long *)_huff_lengthlist__44u3__long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -5472,13 +5472,13 @@ + 0 + }; + +-static long _vq_quantlist__44u3__p1_0[] = { ++static const long _vq_quantlist__44u3__p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u3__p1_0[] = { ++static const long _vq_lengthlist__44u3__p1_0[] = { + 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,10,11, 8, + 10,11, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11, + 11, 8,11,11, 8,11,11,11,13,14,11,14,14, 8,11,11, +@@ -5487,39 +5487,39 @@ + 13, + }; + +-static float _vq_quantthresh__44u3__p1_0[] = { ++static const float _vq_quantthresh__44u3__p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u3__p1_0[] = { ++static const long _vq_quantmap__44u3__p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u3__p1_0 = { +- _vq_quantthresh__44u3__p1_0, +- _vq_quantmap__44u3__p1_0, ++static const encode_aux_threshmatch _vq_auxt__44u3__p1_0 = { ++ (float *)_vq_quantthresh__44u3__p1_0, ++ (long *)_vq_quantmap__44u3__p1_0, + 3, + 3 + }; + +-static static_codebook _44u3__p1_0 = { ++static const static_codebook _44u3__p1_0 = { + 4, 81, +- _vq_lengthlist__44u3__p1_0, ++ (long *)_vq_lengthlist__44u3__p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u3__p1_0, ++ (long *)_vq_quantlist__44u3__p1_0, + NULL, +- &_vq_auxt__44u3__p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u3__p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u3__p2_0[] = { ++static const long _vq_quantlist__44u3__p2_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u3__p2_0[] = { ++static const long _vq_lengthlist__44u3__p2_0[] = { + 2, 5, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 7, 8, 8, 6, + 8, 8, 5, 6, 6, 6, 8, 8, 7, 8, 8, 5, 7, 6, 7, 8, + 8, 6, 8, 8, 7, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8, +@@ -5528,33 +5528,33 @@ + 9, + }; + +-static float _vq_quantthresh__44u3__p2_0[] = { ++static const float _vq_quantthresh__44u3__p2_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u3__p2_0[] = { ++static const long _vq_quantmap__44u3__p2_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u3__p2_0 = { +- _vq_quantthresh__44u3__p2_0, +- _vq_quantmap__44u3__p2_0, ++static const encode_aux_threshmatch _vq_auxt__44u3__p2_0 = { ++ (float *)_vq_quantthresh__44u3__p2_0, ++ (long *)_vq_quantmap__44u3__p2_0, + 3, + 3 + }; + +-static static_codebook _44u3__p2_0 = { ++static const static_codebook _44u3__p2_0 = { + 4, 81, +- _vq_lengthlist__44u3__p2_0, ++ (long *)_vq_lengthlist__44u3__p2_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u3__p2_0, ++ (long *)_vq_quantlist__44u3__p2_0, + NULL, +- &_vq_auxt__44u3__p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u3__p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u3__p3_0[] = { ++static const long _vq_quantlist__44u3__p3_0[] = { + 2, + 1, + 3, +@@ -5562,7 +5562,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u3__p3_0[] = { ++static const long _vq_lengthlist__44u3__p3_0[] = { + 2, 4, 4, 7, 7, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 8, + 9, 9,12,12, 8, 9, 9,11,12, 5, 7, 7,10,10, 7, 9, + 9,11,11, 7, 9, 9,10,11,10,11,11,13,13, 9,10,11, +@@ -5605,33 +5605,33 @@ + 0, + }; + +-static float _vq_quantthresh__44u3__p3_0[] = { ++static const float _vq_quantthresh__44u3__p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u3__p3_0[] = { ++static const long _vq_quantmap__44u3__p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u3__p3_0 = { +- _vq_quantthresh__44u3__p3_0, +- _vq_quantmap__44u3__p3_0, ++static const encode_aux_threshmatch _vq_auxt__44u3__p3_0 = { ++ (float *)_vq_quantthresh__44u3__p3_0, ++ (long *)_vq_quantmap__44u3__p3_0, + 5, + 5 + }; + +-static static_codebook _44u3__p3_0 = { ++static const static_codebook _44u3__p3_0 = { + 4, 625, +- _vq_lengthlist__44u3__p3_0, ++ (long *)_vq_lengthlist__44u3__p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u3__p3_0, ++ (long *)_vq_quantlist__44u3__p3_0, + NULL, +- &_vq_auxt__44u3__p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u3__p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u3__p4_0[] = { ++static const long _vq_quantlist__44u3__p4_0[] = { + 2, + 1, + 3, +@@ -5639,7 +5639,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u3__p4_0[] = { ++static const long _vq_lengthlist__44u3__p4_0[] = { + 4, 5, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 9, + 9, 9,11,11, 9, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8, + 8,10,10, 7, 7, 8,10,10, 9,10,10,11,12, 9,10,10, +@@ -5682,33 +5682,33 @@ + 13, + }; + +-static float _vq_quantthresh__44u3__p4_0[] = { ++static const float _vq_quantthresh__44u3__p4_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u3__p4_0[] = { ++static const long _vq_quantmap__44u3__p4_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u3__p4_0 = { +- _vq_quantthresh__44u3__p4_0, +- _vq_quantmap__44u3__p4_0, ++static const encode_aux_threshmatch _vq_auxt__44u3__p4_0 = { ++ (float *)_vq_quantthresh__44u3__p4_0, ++ (long *)_vq_quantmap__44u3__p4_0, + 5, + 5 + }; + +-static static_codebook _44u3__p4_0 = { ++static const static_codebook _44u3__p4_0 = { + 4, 625, +- _vq_lengthlist__44u3__p4_0, ++ (long *)_vq_lengthlist__44u3__p4_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u3__p4_0, ++ (long *)_vq_quantlist__44u3__p4_0, + NULL, +- &_vq_auxt__44u3__p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u3__p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u3__p5_0[] = { ++static const long _vq_quantlist__44u3__p5_0[] = { + 4, + 3, + 5, +@@ -5720,7 +5720,7 @@ + 8, + }; + +-static long _vq_lengthlist__44u3__p5_0[] = { ++static const long _vq_lengthlist__44u3__p5_0[] = { + 2, 3, 3, 6, 6, 7, 7, 9, 9, 4, 5, 5, 7, 7, 8, 8, + 10,10, 4, 5, 5, 7, 7, 8, 8,10,10, 6, 7, 7, 8, 8, + 9, 9,11,10, 6, 7, 7, 8, 8, 9, 9,10,10, 7, 8, 8, +@@ -5729,34 +5729,34 @@ + 12, + }; + +-static float _vq_quantthresh__44u3__p5_0[] = { ++static const float _vq_quantthresh__44u3__p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44u3__p5_0[] = { ++static const long _vq_quantmap__44u3__p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44u3__p5_0 = { +- _vq_quantthresh__44u3__p5_0, +- _vq_quantmap__44u3__p5_0, ++static const encode_aux_threshmatch _vq_auxt__44u3__p5_0 = { ++ (float *)_vq_quantthresh__44u3__p5_0, ++ (long *)_vq_quantmap__44u3__p5_0, + 9, + 9 + }; + +-static static_codebook _44u3__p5_0 = { ++static const static_codebook _44u3__p5_0 = { + 2, 81, +- _vq_lengthlist__44u3__p5_0, ++ (long *)_vq_lengthlist__44u3__p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44u3__p5_0, ++ (long *)_vq_quantlist__44u3__p5_0, + NULL, +- &_vq_auxt__44u3__p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u3__p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u3__p6_0[] = { ++static const long _vq_quantlist__44u3__p6_0[] = { + 6, + 5, + 7, +@@ -5772,7 +5772,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u3__p6_0[] = { ++static const long _vq_lengthlist__44u3__p6_0[] = { + 1, 4, 4, 6, 6, 8, 8, 9, 9,10,11,13,14, 4, 6, 5, + 8, 8, 9, 9,10,10,11,11,14,14, 4, 6, 6, 8, 8, 9, + 9,10,10,11,11,14,14, 6, 8, 8, 9, 9,10,10,11,11, +@@ -5786,35 +5786,35 @@ + 15,16,16,16,17,18,16,20,18, + }; + +-static float _vq_quantthresh__44u3__p6_0[] = { ++static const float _vq_quantthresh__44u3__p6_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44u3__p6_0[] = { ++static const long _vq_quantmap__44u3__p6_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u3__p6_0 = { +- _vq_quantthresh__44u3__p6_0, +- _vq_quantmap__44u3__p6_0, ++static const encode_aux_threshmatch _vq_auxt__44u3__p6_0 = { ++ (float *)_vq_quantthresh__44u3__p6_0, ++ (long *)_vq_quantmap__44u3__p6_0, + 13, + 13 + }; + +-static static_codebook _44u3__p6_0 = { ++static const static_codebook _44u3__p6_0 = { + 2, 169, +- _vq_lengthlist__44u3__p6_0, ++ (long *)_vq_lengthlist__44u3__p6_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44u3__p6_0, ++ (long *)_vq_quantlist__44u3__p6_0, + NULL, +- &_vq_auxt__44u3__p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u3__p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u3__p6_1[] = { ++static const long _vq_quantlist__44u3__p6_1[] = { + 2, + 1, + 3, +@@ -5822,38 +5822,38 @@ + 4, + }; + +-static long _vq_lengthlist__44u3__p6_1[] = { ++static const long _vq_lengthlist__44u3__p6_1[] = { + 2, 4, 4, 5, 5, 4, 5, 5, 6, 5, 4, 5, 5, 5, 6, 5, + 6, 5, 6, 6, 5, 5, 6, 6, 6, + }; + +-static float _vq_quantthresh__44u3__p6_1[] = { ++static const float _vq_quantthresh__44u3__p6_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u3__p6_1[] = { ++static const long _vq_quantmap__44u3__p6_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u3__p6_1 = { +- _vq_quantthresh__44u3__p6_1, +- _vq_quantmap__44u3__p6_1, ++static const encode_aux_threshmatch _vq_auxt__44u3__p6_1 = { ++ (float *)_vq_quantthresh__44u3__p6_1, ++ (long *)_vq_quantmap__44u3__p6_1, + 5, + 5 + }; + +-static static_codebook _44u3__p6_1 = { ++static const static_codebook _44u3__p6_1 = { + 2, 25, +- _vq_lengthlist__44u3__p6_1, ++ (long *)_vq_lengthlist__44u3__p6_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u3__p6_1, ++ (long *)_vq_quantlist__44u3__p6_1, + NULL, +- &_vq_auxt__44u3__p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u3__p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u3__p7_0[] = { ++static const long _vq_quantlist__44u3__p7_0[] = { + 4, + 3, + 5, +@@ -5865,7 +5865,7 @@ + 8, + }; + +-static long _vq_lengthlist__44u3__p7_0[] = { ++static const long _vq_lengthlist__44u3__p7_0[] = { + 1, 3, 3,10,10,10,10,10,10, 4,10,10,10,10,10,10, + 10,10, 4,10,10,10,10,10,10,10,10,10,10, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, +@@ -5874,34 +5874,34 @@ + 9, + }; + +-static float _vq_quantthresh__44u3__p7_0[] = { ++static const float _vq_quantthresh__44u3__p7_0[] = { + -892.5, -637.5, -382.5, -127.5, 127.5, 382.5, 637.5, 892.5, + }; + +-static long _vq_quantmap__44u3__p7_0[] = { ++static const long _vq_quantmap__44u3__p7_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44u3__p7_0 = { +- _vq_quantthresh__44u3__p7_0, +- _vq_quantmap__44u3__p7_0, ++static const encode_aux_threshmatch _vq_auxt__44u3__p7_0 = { ++ (float *)_vq_quantthresh__44u3__p7_0, ++ (long *)_vq_quantmap__44u3__p7_0, + 9, + 9 + }; + +-static static_codebook _44u3__p7_0 = { ++static const static_codebook _44u3__p7_0 = { + 2, 81, +- _vq_lengthlist__44u3__p7_0, ++ (long *)_vq_lengthlist__44u3__p7_0, + 1, -515907584, 1627381760, 4, 0, +- _vq_quantlist__44u3__p7_0, ++ (long *)_vq_quantlist__44u3__p7_0, + NULL, +- &_vq_auxt__44u3__p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u3__p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u3__p7_1[] = { ++static const long _vq_quantlist__44u3__p7_1[] = { + 7, + 6, + 8, +@@ -5919,7 +5919,7 @@ + 14, + }; + +-static long _vq_lengthlist__44u3__p7_1[] = { ++static const long _vq_lengthlist__44u3__p7_1[] = { + 1, 4, 4, 6, 6, 7, 6, 8, 7, 9, 8,10, 9,11,11, 4, + 7, 7, 8, 7, 9, 9,10,10,11,11,11,11,12,12, 4, 7, + 7, 7, 7, 9, 9,10,10,11,11,12,12,12,11, 6, 8, 8, +@@ -5937,35 +5937,35 @@ + 17, + }; + +-static float _vq_quantthresh__44u3__p7_1[] = { ++static const float _vq_quantthresh__44u3__p7_1[] = { + -110.5, -93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, + 25.5, 42.5, 59.5, 76.5, 93.5, 110.5, + }; + +-static long _vq_quantmap__44u3__p7_1[] = { ++static const long _vq_quantmap__44u3__p7_1[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__44u3__p7_1 = { +- _vq_quantthresh__44u3__p7_1, +- _vq_quantmap__44u3__p7_1, ++static const encode_aux_threshmatch _vq_auxt__44u3__p7_1 = { ++ (float *)_vq_quantthresh__44u3__p7_1, ++ (long *)_vq_quantmap__44u3__p7_1, + 15, + 15 + }; + +-static static_codebook _44u3__p7_1 = { ++static const static_codebook _44u3__p7_1 = { + 2, 225, +- _vq_lengthlist__44u3__p7_1, ++ (long *)_vq_lengthlist__44u3__p7_1, + 1, -522338304, 1620115456, 4, 0, +- _vq_quantlist__44u3__p7_1, ++ (long *)_vq_quantlist__44u3__p7_1, + NULL, +- &_vq_auxt__44u3__p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u3__p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u3__p7_2[] = { ++static const long _vq_quantlist__44u3__p7_2[] = { + 8, + 7, + 9, +@@ -5985,7 +5985,7 @@ + 16, + }; + +-static long _vq_lengthlist__44u3__p7_2[] = { ++static const long _vq_lengthlist__44u3__p7_2[] = { + 2, 5, 5, 7, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, + 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, + 10,10, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 9, 9, 9, +@@ -6007,45 +6007,45 @@ + 11, + }; + +-static float _vq_quantthresh__44u3__p7_2[] = { ++static const float _vq_quantthresh__44u3__p7_2[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44u3__p7_2[] = { ++static const long _vq_quantmap__44u3__p7_2[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44u3__p7_2 = { +- _vq_quantthresh__44u3__p7_2, +- _vq_quantmap__44u3__p7_2, ++static const encode_aux_threshmatch _vq_auxt__44u3__p7_2 = { ++ (float *)_vq_quantthresh__44u3__p7_2, ++ (long *)_vq_quantmap__44u3__p7_2, + 17, + 17 + }; + +-static static_codebook _44u3__p7_2 = { ++static const static_codebook _44u3__p7_2 = { + 2, 289, +- _vq_lengthlist__44u3__p7_2, ++ (long *)_vq_lengthlist__44u3__p7_2, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44u3__p7_2, ++ (long *)_vq_quantlist__44u3__p7_2, + NULL, +- &_vq_auxt__44u3__p7_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44u3__p7_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44u3__short[] = { ++static const long _huff_lengthlist__44u3__short[] = { + 14,14,14,15,13,15,12,16,10, 8, 7, 9, 9, 8,12,16, + 10, 5, 4, 6, 5, 6, 9,16,14, 8, 6, 8, 7, 8,10,16, + 14, 7, 4, 6, 3, 5, 8,16,15, 9, 5, 7, 4, 4, 7,16, + 13,10, 6, 7, 4, 3, 4,13,13,12, 7, 9, 5, 5, 6,12, + }; + +-static static_codebook _huff_book__44u3__short = { ++static const static_codebook _huff_book__44u3__short = { + 2, 64, +- _huff_lengthlist__44u3__short, ++ (long *)_huff_lengthlist__44u3__short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -6054,16 +6054,16 @@ + 0 + }; + +-static long _huff_lengthlist__44u4__long[] = { ++static const long _huff_lengthlist__44u4__long[] = { + 3, 8,12,12,13,12,11,13, 5, 4, 6, 7, 8, 8, 9,13, + 9, 5, 4, 5, 5, 7, 9,13, 9, 6, 5, 6, 6, 7, 8,12, + 12, 7, 5, 6, 4, 5, 8,13,11, 7, 6, 6, 5, 5, 6,12, + 10, 8, 8, 7, 7, 5, 3, 8,10,12,13,12,12, 9, 6, 7, + }; + +-static static_codebook _huff_book__44u4__long = { ++static const static_codebook _huff_book__44u4__long = { + 2, 64, +- _huff_lengthlist__44u4__long, ++ (long *)_huff_lengthlist__44u4__long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -6072,13 +6072,13 @@ + 0 + }; + +-static long _vq_quantlist__44u4__p1_0[] = { ++static const long _vq_quantlist__44u4__p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u4__p1_0[] = { ++static const long _vq_lengthlist__44u4__p1_0[] = { + 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,10,11, 8, + 10,11, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11, + 11, 8,11,11, 8,11,11,11,13,14,11,15,14, 8,11,11, +@@ -6087,39 +6087,39 @@ + 13, + }; + +-static float _vq_quantthresh__44u4__p1_0[] = { ++static const float _vq_quantthresh__44u4__p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u4__p1_0[] = { ++static const long _vq_quantmap__44u4__p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u4__p1_0 = { +- _vq_quantthresh__44u4__p1_0, +- _vq_quantmap__44u4__p1_0, ++static const encode_aux_threshmatch _vq_auxt__44u4__p1_0 = { ++ (float *)_vq_quantthresh__44u4__p1_0, ++ (long *)_vq_quantmap__44u4__p1_0, + 3, + 3 + }; + +-static static_codebook _44u4__p1_0 = { ++static const static_codebook _44u4__p1_0 = { + 4, 81, +- _vq_lengthlist__44u4__p1_0, ++ (long *)_vq_lengthlist__44u4__p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u4__p1_0, ++ (long *)_vq_quantlist__44u4__p1_0, + NULL, +- &_vq_auxt__44u4__p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u4__p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u4__p2_0[] = { ++static const long _vq_quantlist__44u4__p2_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u4__p2_0[] = { ++static const long _vq_lengthlist__44u4__p2_0[] = { + 2, 5, 5, 5, 6, 6, 5, 6, 6, 5, 6, 6, 7, 8, 8, 6, + 8, 8, 5, 6, 6, 6, 8, 8, 7, 8, 8, 5, 7, 6, 6, 8, + 8, 6, 8, 8, 6, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8, +@@ -6128,33 +6128,33 @@ + 9, + }; + +-static float _vq_quantthresh__44u4__p2_0[] = { ++static const float _vq_quantthresh__44u4__p2_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u4__p2_0[] = { ++static const long _vq_quantmap__44u4__p2_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u4__p2_0 = { +- _vq_quantthresh__44u4__p2_0, +- _vq_quantmap__44u4__p2_0, ++static const encode_aux_threshmatch _vq_auxt__44u4__p2_0 = { ++ (float *)_vq_quantthresh__44u4__p2_0, ++ (long *)_vq_quantmap__44u4__p2_0, + 3, + 3 + }; + +-static static_codebook _44u4__p2_0 = { ++static const static_codebook _44u4__p2_0 = { + 4, 81, +- _vq_lengthlist__44u4__p2_0, ++ (long *)_vq_lengthlist__44u4__p2_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u4__p2_0, ++ (long *)_vq_quantlist__44u4__p2_0, + NULL, +- &_vq_auxt__44u4__p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u4__p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u4__p3_0[] = { ++static const long _vq_quantlist__44u4__p3_0[] = { + 2, + 1, + 3, +@@ -6162,7 +6162,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u4__p3_0[] = { ++static const long _vq_lengthlist__44u4__p3_0[] = { + 2, 4, 4, 8, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 8, + 10, 9,12,12, 8, 9,10,12,12, 5, 7, 7,10,10, 7, 9, + 9,11,11, 7, 9, 9,11,11,10,12,11,14,14, 9,10,11, +@@ -6205,33 +6205,33 @@ + 0, + }; + +-static float _vq_quantthresh__44u4__p3_0[] = { ++static const float _vq_quantthresh__44u4__p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u4__p3_0[] = { ++static const long _vq_quantmap__44u4__p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u4__p3_0 = { +- _vq_quantthresh__44u4__p3_0, +- _vq_quantmap__44u4__p3_0, ++static const encode_aux_threshmatch _vq_auxt__44u4__p3_0 = { ++ (float *)_vq_quantthresh__44u4__p3_0, ++ (long *)_vq_quantmap__44u4__p3_0, + 5, + 5 + }; + +-static static_codebook _44u4__p3_0 = { ++static const static_codebook _44u4__p3_0 = { + 4, 625, +- _vq_lengthlist__44u4__p3_0, ++ (long *)_vq_lengthlist__44u4__p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u4__p3_0, ++ (long *)_vq_quantlist__44u4__p3_0, + NULL, +- &_vq_auxt__44u4__p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u4__p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u4__p4_0[] = { ++static const long _vq_quantlist__44u4__p4_0[] = { + 2, + 1, + 3, +@@ -6239,7 +6239,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u4__p4_0[] = { ++static const long _vq_lengthlist__44u4__p4_0[] = { + 4, 5, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 9, + 9, 9,11,11, 8, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8, + 8,10,10, 7, 7, 8,10,10, 9,10,10,11,12, 9,10,10, +@@ -6282,33 +6282,33 @@ + 13, + }; + +-static float _vq_quantthresh__44u4__p4_0[] = { ++static const float _vq_quantthresh__44u4__p4_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u4__p4_0[] = { ++static const long _vq_quantmap__44u4__p4_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u4__p4_0 = { +- _vq_quantthresh__44u4__p4_0, +- _vq_quantmap__44u4__p4_0, ++static const encode_aux_threshmatch _vq_auxt__44u4__p4_0 = { ++ (float *)_vq_quantthresh__44u4__p4_0, ++ (long *)_vq_quantmap__44u4__p4_0, + 5, + 5 + }; + +-static static_codebook _44u4__p4_0 = { ++static const static_codebook _44u4__p4_0 = { + 4, 625, +- _vq_lengthlist__44u4__p4_0, ++ (long *)_vq_lengthlist__44u4__p4_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u4__p4_0, ++ (long *)_vq_quantlist__44u4__p4_0, + NULL, +- &_vq_auxt__44u4__p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u4__p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u4__p5_0[] = { ++static const long _vq_quantlist__44u4__p5_0[] = { + 4, + 3, + 5, +@@ -6320,7 +6320,7 @@ + 8, + }; + +-static long _vq_lengthlist__44u4__p5_0[] = { ++static const long _vq_lengthlist__44u4__p5_0[] = { + 2, 3, 3, 6, 6, 7, 7, 9, 9, 4, 5, 5, 7, 7, 8, 8, + 10, 9, 4, 5, 5, 7, 7, 8, 8,10,10, 6, 7, 7, 8, 8, + 9, 9,11,10, 6, 7, 7, 8, 8, 9, 9,10,11, 7, 8, 8, +@@ -6329,34 +6329,34 @@ + 12, + }; + +-static float _vq_quantthresh__44u4__p5_0[] = { ++static const float _vq_quantthresh__44u4__p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44u4__p5_0[] = { ++static const long _vq_quantmap__44u4__p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44u4__p5_0 = { +- _vq_quantthresh__44u4__p5_0, +- _vq_quantmap__44u4__p5_0, ++static const encode_aux_threshmatch _vq_auxt__44u4__p5_0 = { ++ (float *)_vq_quantthresh__44u4__p5_0, ++ (long *)_vq_quantmap__44u4__p5_0, + 9, + 9 + }; + +-static static_codebook _44u4__p5_0 = { ++static const static_codebook _44u4__p5_0 = { + 2, 81, +- _vq_lengthlist__44u4__p5_0, ++ (long *)_vq_lengthlist__44u4__p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44u4__p5_0, ++ (long *)_vq_quantlist__44u4__p5_0, + NULL, +- &_vq_auxt__44u4__p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u4__p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u4__p6_0[] = { ++static const long _vq_quantlist__44u4__p6_0[] = { + 6, + 5, + 7, +@@ -6372,7 +6372,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u4__p6_0[] = { ++static const long _vq_lengthlist__44u4__p6_0[] = { + 1, 4, 4, 6, 6, 8, 8, 9, 9,11,10,13,13, 4, 6, 5, + 8, 8, 9, 9,10,10,11,11,14,14, 4, 6, 6, 8, 8, 9, + 9,10,10,11,11,14,14, 6, 8, 8, 9, 9,10,10,11,11, +@@ -6386,35 +6386,35 @@ + 16,16,16,17,17,18,17,20,21, + }; + +-static float _vq_quantthresh__44u4__p6_0[] = { ++static const float _vq_quantthresh__44u4__p6_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44u4__p6_0[] = { ++static const long _vq_quantmap__44u4__p6_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u4__p6_0 = { +- _vq_quantthresh__44u4__p6_0, +- _vq_quantmap__44u4__p6_0, ++static const encode_aux_threshmatch _vq_auxt__44u4__p6_0 = { ++ (float *)_vq_quantthresh__44u4__p6_0, ++ (long *)_vq_quantmap__44u4__p6_0, + 13, + 13 + }; + +-static static_codebook _44u4__p6_0 = { ++static const static_codebook _44u4__p6_0 = { + 2, 169, +- _vq_lengthlist__44u4__p6_0, ++ (long *)_vq_lengthlist__44u4__p6_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44u4__p6_0, ++ (long *)_vq_quantlist__44u4__p6_0, + NULL, +- &_vq_auxt__44u4__p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u4__p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u4__p6_1[] = { ++static const long _vq_quantlist__44u4__p6_1[] = { + 2, + 1, + 3, +@@ -6422,38 +6422,38 @@ + 4, + }; + +-static long _vq_lengthlist__44u4__p6_1[] = { ++static const long _vq_lengthlist__44u4__p6_1[] = { + 2, 4, 4, 5, 5, 4, 5, 5, 6, 5, 4, 5, 5, 5, 6, 5, + 6, 5, 6, 6, 5, 5, 6, 6, 6, + }; + +-static float _vq_quantthresh__44u4__p6_1[] = { ++static const float _vq_quantthresh__44u4__p6_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u4__p6_1[] = { ++static const long _vq_quantmap__44u4__p6_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u4__p6_1 = { +- _vq_quantthresh__44u4__p6_1, +- _vq_quantmap__44u4__p6_1, ++static const encode_aux_threshmatch _vq_auxt__44u4__p6_1 = { ++ (float *)_vq_quantthresh__44u4__p6_1, ++ (long *)_vq_quantmap__44u4__p6_1, + 5, + 5 + }; + +-static static_codebook _44u4__p6_1 = { ++static const static_codebook _44u4__p6_1 = { + 2, 25, +- _vq_lengthlist__44u4__p6_1, ++ (long *)_vq_lengthlist__44u4__p6_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u4__p6_1, ++ (long *)_vq_quantlist__44u4__p6_1, + NULL, +- &_vq_auxt__44u4__p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u4__p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u4__p7_0[] = { ++static const long _vq_quantlist__44u4__p7_0[] = { + 6, + 5, + 7, +@@ -6469,7 +6469,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u4__p7_0[] = { ++static const long _vq_lengthlist__44u4__p7_0[] = { + 1, 3, 3,12,12,12,12,12,12,12,12,12,12, 3,12,11, + 12,12,12,12,12,12,12,12,12,12, 4,11,10,12,12,12, + 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, +@@ -6483,35 +6483,35 @@ + 11,11,11,11,11,11,11,11,11, + }; + +-static float _vq_quantthresh__44u4__p7_0[] = { ++static const float _vq_quantthresh__44u4__p7_0[] = { + -1402.5, -1147.5, -892.5, -637.5, -382.5, -127.5, 127.5, 382.5, + 637.5, 892.5, 1147.5, 1402.5, + }; + +-static long _vq_quantmap__44u4__p7_0[] = { ++static const long _vq_quantmap__44u4__p7_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u4__p7_0 = { +- _vq_quantthresh__44u4__p7_0, +- _vq_quantmap__44u4__p7_0, ++static const encode_aux_threshmatch _vq_auxt__44u4__p7_0 = { ++ (float *)_vq_quantthresh__44u4__p7_0, ++ (long *)_vq_quantmap__44u4__p7_0, + 13, + 13 + }; + +-static static_codebook _44u4__p7_0 = { ++static const static_codebook _44u4__p7_0 = { + 2, 169, +- _vq_lengthlist__44u4__p7_0, ++ (long *)_vq_lengthlist__44u4__p7_0, + 1, -514332672, 1627381760, 4, 0, +- _vq_quantlist__44u4__p7_0, ++ (long *)_vq_quantlist__44u4__p7_0, + NULL, +- &_vq_auxt__44u4__p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u4__p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u4__p7_1[] = { ++static const long _vq_quantlist__44u4__p7_1[] = { + 7, + 6, + 8, +@@ -6529,7 +6529,7 @@ + 14, + }; + +-static long _vq_lengthlist__44u4__p7_1[] = { ++static const long _vq_lengthlist__44u4__p7_1[] = { + 1, 4, 4, 6, 6, 7, 7, 9, 8,10, 8,10, 9,11,11, 4, + 7, 6, 8, 7, 9, 9,10,10,11,10,11,10,12,10, 4, 6, + 7, 8, 8, 9, 9,10,10,11,11,11,11,12,12, 6, 8, 8, +@@ -6547,35 +6547,35 @@ + 16, + }; + +-static float _vq_quantthresh__44u4__p7_1[] = { ++static const float _vq_quantthresh__44u4__p7_1[] = { + -110.5, -93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, + 25.5, 42.5, 59.5, 76.5, 93.5, 110.5, + }; + +-static long _vq_quantmap__44u4__p7_1[] = { ++static const long _vq_quantmap__44u4__p7_1[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__44u4__p7_1 = { +- _vq_quantthresh__44u4__p7_1, +- _vq_quantmap__44u4__p7_1, ++static const encode_aux_threshmatch _vq_auxt__44u4__p7_1 = { ++ (float *)_vq_quantthresh__44u4__p7_1, ++ (long *)_vq_quantmap__44u4__p7_1, + 15, + 15 + }; + +-static static_codebook _44u4__p7_1 = { ++static const static_codebook _44u4__p7_1 = { + 2, 225, +- _vq_lengthlist__44u4__p7_1, ++ (long *)_vq_lengthlist__44u4__p7_1, + 1, -522338304, 1620115456, 4, 0, +- _vq_quantlist__44u4__p7_1, ++ (long *)_vq_quantlist__44u4__p7_1, + NULL, +- &_vq_auxt__44u4__p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u4__p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u4__p7_2[] = { ++static const long _vq_quantlist__44u4__p7_2[] = { + 8, + 7, + 9, +@@ -6595,7 +6595,7 @@ + 16, + }; + +-static long _vq_lengthlist__44u4__p7_2[] = { ++static const long _vq_lengthlist__44u4__p7_2[] = { + 2, 5, 5, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, + 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, + 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, +@@ -6617,45 +6617,45 @@ + 10, + }; + +-static float _vq_quantthresh__44u4__p7_2[] = { ++static const float _vq_quantthresh__44u4__p7_2[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44u4__p7_2[] = { ++static const long _vq_quantmap__44u4__p7_2[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44u4__p7_2 = { +- _vq_quantthresh__44u4__p7_2, +- _vq_quantmap__44u4__p7_2, ++static const encode_aux_threshmatch _vq_auxt__44u4__p7_2 = { ++ (float *)_vq_quantthresh__44u4__p7_2, ++ (long *)_vq_quantmap__44u4__p7_2, + 17, + 17 + }; + +-static static_codebook _44u4__p7_2 = { ++static const static_codebook _44u4__p7_2 = { + 2, 289, +- _vq_lengthlist__44u4__p7_2, ++ (long *)_vq_lengthlist__44u4__p7_2, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44u4__p7_2, ++ (long *)_vq_quantlist__44u4__p7_2, + NULL, +- &_vq_auxt__44u4__p7_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44u4__p7_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44u4__short[] = { ++static const long _huff_lengthlist__44u4__short[] = { + 14,17,15,17,16,14,13,16,10, 7, 7,10,13,10,15,16, + 9, 4, 4, 6, 5, 7, 9,16,12, 8, 7, 8, 8, 8,11,16, + 14, 7, 4, 6, 3, 5, 8,15,13, 8, 5, 7, 4, 5, 7,16, + 12, 9, 6, 8, 3, 3, 5,16,14,13, 7,10, 5, 5, 7,15, + }; + +-static static_codebook _huff_book__44u4__short = { ++static const static_codebook _huff_book__44u4__short = { + 2, 64, +- _huff_lengthlist__44u4__short, ++ (long *)_huff_lengthlist__44u4__short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -6664,7 +6664,7 @@ + 0 + }; + +-static long _huff_lengthlist__44u5__long[] = { ++static const long _huff_lengthlist__44u5__long[] = { + 3, 8,13,12,14,12,16,11,13,14, 5, 4, 5, 6, 7, 8, + 10, 9,12,15,10, 5, 5, 5, 6, 8, 9, 9,13,15,10, 5, + 5, 6, 6, 7, 8, 8,11,13,12, 7, 5, 6, 4, 6, 7, 7, +@@ -6674,9 +6674,9 @@ + 14, 8, 7, 8, + }; + +-static static_codebook _huff_book__44u5__long = { ++static const static_codebook _huff_book__44u5__long = { + 2, 100, +- _huff_lengthlist__44u5__long, ++ (long *)_huff_lengthlist__44u5__long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -6685,13 +6685,13 @@ + 0 + }; + +-static long _vq_quantlist__44u5__p1_0[] = { ++static const long _vq_quantlist__44u5__p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u5__p1_0[] = { ++static const long _vq_lengthlist__44u5__p1_0[] = { + 1, 4, 4, 5, 8, 7, 5, 7, 7, 5, 8, 8, 8,10,10, 7, + 9,10, 5, 8, 8, 7,10, 9, 8,10,10, 5, 8, 8, 8,10, + 10, 8,10,10, 8,10,10,10,12,13,10,13,13, 7,10,10, +@@ -6700,39 +6700,39 @@ + 12, + }; + +-static float _vq_quantthresh__44u5__p1_0[] = { ++static const float _vq_quantthresh__44u5__p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u5__p1_0[] = { ++static const long _vq_quantmap__44u5__p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u5__p1_0 = { +- _vq_quantthresh__44u5__p1_0, +- _vq_quantmap__44u5__p1_0, ++static const encode_aux_threshmatch _vq_auxt__44u5__p1_0 = { ++ (float *)_vq_quantthresh__44u5__p1_0, ++ (long *)_vq_quantmap__44u5__p1_0, + 3, + 3 + }; + +-static static_codebook _44u5__p1_0 = { ++static const static_codebook _44u5__p1_0 = { + 4, 81, +- _vq_lengthlist__44u5__p1_0, ++ (long *)_vq_lengthlist__44u5__p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u5__p1_0, ++ (long *)_vq_quantlist__44u5__p1_0, + NULL, +- &_vq_auxt__44u5__p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u5__p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u5__p2_0[] = { ++static const long _vq_quantlist__44u5__p2_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u5__p2_0[] = { ++static const long _vq_lengthlist__44u5__p2_0[] = { + 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 8, 8, 6, + 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 8, 5, 6, 6, 6, 8, + 8, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 7, +@@ -6741,33 +6741,33 @@ + 9, + }; + +-static float _vq_quantthresh__44u5__p2_0[] = { ++static const float _vq_quantthresh__44u5__p2_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u5__p2_0[] = { ++static const long _vq_quantmap__44u5__p2_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u5__p2_0 = { +- _vq_quantthresh__44u5__p2_0, +- _vq_quantmap__44u5__p2_0, ++static const encode_aux_threshmatch _vq_auxt__44u5__p2_0 = { ++ (float *)_vq_quantthresh__44u5__p2_0, ++ (long *)_vq_quantmap__44u5__p2_0, + 3, + 3 + }; + +-static static_codebook _44u5__p2_0 = { ++static const static_codebook _44u5__p2_0 = { + 4, 81, +- _vq_lengthlist__44u5__p2_0, ++ (long *)_vq_lengthlist__44u5__p2_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u5__p2_0, ++ (long *)_vq_quantlist__44u5__p2_0, + NULL, +- &_vq_auxt__44u5__p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u5__p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u5__p3_0[] = { ++static const long _vq_quantlist__44u5__p3_0[] = { + 2, + 1, + 3, +@@ -6775,7 +6775,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u5__p3_0[] = { ++static const long _vq_lengthlist__44u5__p3_0[] = { + 2, 4, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8, + 10, 9,13,12, 8, 9,10,12,12, 5, 7, 7,10,10, 7, 9, + 9,11,11, 6, 8, 9,11,11,10,11,11,14,14, 9,10,11, +@@ -6818,33 +6818,33 @@ + 0, + }; + +-static float _vq_quantthresh__44u5__p3_0[] = { ++static const float _vq_quantthresh__44u5__p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u5__p3_0[] = { ++static const long _vq_quantmap__44u5__p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u5__p3_0 = { +- _vq_quantthresh__44u5__p3_0, +- _vq_quantmap__44u5__p3_0, ++static const encode_aux_threshmatch _vq_auxt__44u5__p3_0 = { ++ (float *)_vq_quantthresh__44u5__p3_0, ++ (long *)_vq_quantmap__44u5__p3_0, + 5, + 5 + }; + +-static static_codebook _44u5__p3_0 = { ++static const static_codebook _44u5__p3_0 = { + 4, 625, +- _vq_lengthlist__44u5__p3_0, ++ (long *)_vq_lengthlist__44u5__p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u5__p3_0, ++ (long *)_vq_quantlist__44u5__p3_0, + NULL, +- &_vq_auxt__44u5__p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u5__p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u5__p4_0[] = { ++static const long _vq_quantlist__44u5__p4_0[] = { + 2, + 1, + 3, +@@ -6852,7 +6852,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u5__p4_0[] = { ++static const long _vq_lengthlist__44u5__p4_0[] = { + 4, 5, 5, 8, 8, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 8, + 9, 9,11,11, 8, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 8, + 8,10,10, 6, 7, 8, 9,10, 9,10,10,11,12, 9, 9,10, +@@ -6895,33 +6895,33 @@ + 12, + }; + +-static float _vq_quantthresh__44u5__p4_0[] = { ++static const float _vq_quantthresh__44u5__p4_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u5__p4_0[] = { ++static const long _vq_quantmap__44u5__p4_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u5__p4_0 = { +- _vq_quantthresh__44u5__p4_0, +- _vq_quantmap__44u5__p4_0, ++static const encode_aux_threshmatch _vq_auxt__44u5__p4_0 = { ++ (float *)_vq_quantthresh__44u5__p4_0, ++ (long *)_vq_quantmap__44u5__p4_0, + 5, + 5 + }; + +-static static_codebook _44u5__p4_0 = { ++static const static_codebook _44u5__p4_0 = { + 4, 625, +- _vq_lengthlist__44u5__p4_0, ++ (long *)_vq_lengthlist__44u5__p4_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u5__p4_0, ++ (long *)_vq_quantlist__44u5__p4_0, + NULL, +- &_vq_auxt__44u5__p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u5__p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u5__p5_0[] = { ++static const long _vq_quantlist__44u5__p5_0[] = { + 4, + 3, + 5, +@@ -6933,7 +6933,7 @@ + 8, + }; + +-static long _vq_lengthlist__44u5__p5_0[] = { ++static const long _vq_lengthlist__44u5__p5_0[] = { + 2, 3, 3, 6, 6, 8, 8,10,10, 4, 5, 5, 8, 7, 8, 8, + 11,10, 3, 5, 5, 7, 8, 8, 8,10,11, 6, 8, 7,10, 9, + 10,10,11,11, 6, 7, 8, 9, 9, 9,10,11,12, 8, 8, 8, +@@ -6942,34 +6942,34 @@ + 14, + }; + +-static float _vq_quantthresh__44u5__p5_0[] = { ++static const float _vq_quantthresh__44u5__p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44u5__p5_0[] = { ++static const long _vq_quantmap__44u5__p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44u5__p5_0 = { +- _vq_quantthresh__44u5__p5_0, +- _vq_quantmap__44u5__p5_0, ++static const encode_aux_threshmatch _vq_auxt__44u5__p5_0 = { ++ (float *)_vq_quantthresh__44u5__p5_0, ++ (long *)_vq_quantmap__44u5__p5_0, + 9, + 9 + }; + +-static static_codebook _44u5__p5_0 = { ++static const static_codebook _44u5__p5_0 = { + 2, 81, +- _vq_lengthlist__44u5__p5_0, ++ (long *)_vq_lengthlist__44u5__p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44u5__p5_0, ++ (long *)_vq_quantlist__44u5__p5_0, + NULL, +- &_vq_auxt__44u5__p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u5__p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u5__p6_0[] = { ++static const long _vq_quantlist__44u5__p6_0[] = { + 4, + 3, + 5, +@@ -6981,7 +6981,7 @@ + 8, + }; + +-static long _vq_lengthlist__44u5__p6_0[] = { ++static const long _vq_lengthlist__44u5__p6_0[] = { + 3, 4, 4, 5, 5, 7, 7, 9, 9, 4, 5, 4, 6, 6, 7, 7, + 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 7, + 8, 8,10,10, 6, 6, 6, 7, 7, 8, 8,10,10, 7, 7, 7, +@@ -6990,40 +6990,40 @@ + 11, + }; + +-static float _vq_quantthresh__44u5__p6_0[] = { ++static const float _vq_quantthresh__44u5__p6_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44u5__p6_0[] = { ++static const long _vq_quantmap__44u5__p6_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44u5__p6_0 = { +- _vq_quantthresh__44u5__p6_0, +- _vq_quantmap__44u5__p6_0, ++static const encode_aux_threshmatch _vq_auxt__44u5__p6_0 = { ++ (float *)_vq_quantthresh__44u5__p6_0, ++ (long *)_vq_quantmap__44u5__p6_0, + 9, + 9 + }; + +-static static_codebook _44u5__p6_0 = { ++static const static_codebook _44u5__p6_0 = { + 2, 81, +- _vq_lengthlist__44u5__p6_0, ++ (long *)_vq_lengthlist__44u5__p6_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44u5__p6_0, ++ (long *)_vq_quantlist__44u5__p6_0, + NULL, +- &_vq_auxt__44u5__p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u5__p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u5__p7_0[] = { ++static const long _vq_quantlist__44u5__p7_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u5__p7_0[] = { ++static const long _vq_lengthlist__44u5__p7_0[] = { + 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 9, 8,11,10, 7, + 11,10, 5, 9, 9, 7,10,10, 8,10,11, 4, 9, 9, 9,12, + 12, 9,12,12, 8,12,12,11,12,12,10,12,13, 7,12,12, +@@ -7032,33 +7032,33 @@ + 12, + }; + +-static float _vq_quantthresh__44u5__p7_0[] = { ++static const float _vq_quantthresh__44u5__p7_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44u5__p7_0[] = { ++static const long _vq_quantmap__44u5__p7_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u5__p7_0 = { +- _vq_quantthresh__44u5__p7_0, +- _vq_quantmap__44u5__p7_0, ++static const encode_aux_threshmatch _vq_auxt__44u5__p7_0 = { ++ (float *)_vq_quantthresh__44u5__p7_0, ++ (long *)_vq_quantmap__44u5__p7_0, + 3, + 3 + }; + +-static static_codebook _44u5__p7_0 = { ++static const static_codebook _44u5__p7_0 = { + 4, 81, +- _vq_lengthlist__44u5__p7_0, ++ (long *)_vq_lengthlist__44u5__p7_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44u5__p7_0, ++ (long *)_vq_quantlist__44u5__p7_0, + NULL, +- &_vq_auxt__44u5__p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u5__p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u5__p7_1[] = { ++static const long _vq_quantlist__44u5__p7_1[] = { + 5, + 4, + 6, +@@ -7072,7 +7072,7 @@ + 10, + }; + +-static long _vq_lengthlist__44u5__p7_1[] = { ++static const long _vq_lengthlist__44u5__p7_1[] = { + 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 5, 5, 7, 7, + 8, 8, 9, 8, 8, 9, 4, 5, 5, 7, 7, 8, 8, 9, 9, 8, + 9, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 6, 7, 7, 8, +@@ -7083,35 +7083,35 @@ + 9, 9, 9, 9, 9,10,10,10,10, + }; + +-static float _vq_quantthresh__44u5__p7_1[] = { ++static const float _vq_quantthresh__44u5__p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44u5__p7_1[] = { ++static const long _vq_quantmap__44u5__p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44u5__p7_1 = { +- _vq_quantthresh__44u5__p7_1, +- _vq_quantmap__44u5__p7_1, ++static const encode_aux_threshmatch _vq_auxt__44u5__p7_1 = { ++ (float *)_vq_quantthresh__44u5__p7_1, ++ (long *)_vq_quantmap__44u5__p7_1, + 11, + 11 + }; + +-static static_codebook _44u5__p7_1 = { ++static const static_codebook _44u5__p7_1 = { + 2, 121, +- _vq_lengthlist__44u5__p7_1, ++ (long *)_vq_lengthlist__44u5__p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44u5__p7_1, ++ (long *)_vq_quantlist__44u5__p7_1, + NULL, +- &_vq_auxt__44u5__p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u5__p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u5__p8_0[] = { ++static const long _vq_quantlist__44u5__p8_0[] = { + 5, + 4, + 6, +@@ -7125,7 +7125,7 @@ + 10, + }; + +-static long _vq_lengthlist__44u5__p8_0[] = { ++static const long _vq_lengthlist__44u5__p8_0[] = { + 1, 4, 4, 6, 6, 8, 8, 9, 9,10,10, 4, 6, 6, 7, 7, + 9, 9,10,10,11,11, 4, 6, 6, 7, 7, 9, 9,10,10,11, + 11, 6, 8, 7, 9, 9,10,10,11,11,13,12, 6, 8, 8, 9, +@@ -7136,35 +7136,35 @@ + 12,13,13,14,14,14,14,15,15, + }; + +-static float _vq_quantthresh__44u5__p8_0[] = { ++static const float _vq_quantthresh__44u5__p8_0[] = { + -49.5, -38.5, -27.5, -16.5, -5.5, 5.5, 16.5, 27.5, + 38.5, 49.5, + }; + +-static long _vq_quantmap__44u5__p8_0[] = { ++static const long _vq_quantmap__44u5__p8_0[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44u5__p8_0 = { +- _vq_quantthresh__44u5__p8_0, +- _vq_quantmap__44u5__p8_0, ++static const encode_aux_threshmatch _vq_auxt__44u5__p8_0 = { ++ (float *)_vq_quantthresh__44u5__p8_0, ++ (long *)_vq_quantmap__44u5__p8_0, + 11, + 11 + }; + +-static static_codebook _44u5__p8_0 = { ++static const static_codebook _44u5__p8_0 = { + 2, 121, +- _vq_lengthlist__44u5__p8_0, ++ (long *)_vq_lengthlist__44u5__p8_0, + 1, -524582912, 1618345984, 4, 0, +- _vq_quantlist__44u5__p8_0, ++ (long *)_vq_quantlist__44u5__p8_0, + NULL, +- &_vq_auxt__44u5__p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u5__p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u5__p8_1[] = { ++static const long _vq_quantlist__44u5__p8_1[] = { + 5, + 4, + 6, +@@ -7178,7 +7178,7 @@ + 10, + }; + +-static long _vq_lengthlist__44u5__p8_1[] = { ++static const long _vq_lengthlist__44u5__p8_1[] = { + 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 5, 7, 6, + 7, 7, 8, 8, 8, 8, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, + 8, 6, 7, 6, 7, 7, 8, 8, 8, 8, 8, 8, 6, 6, 7, 7, +@@ -7189,35 +7189,35 @@ + 8, 8, 8, 8, 8, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__44u5__p8_1[] = { ++static const float _vq_quantthresh__44u5__p8_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44u5__p8_1[] = { ++static const long _vq_quantmap__44u5__p8_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44u5__p8_1 = { +- _vq_quantthresh__44u5__p8_1, +- _vq_quantmap__44u5__p8_1, ++static const encode_aux_threshmatch _vq_auxt__44u5__p8_1 = { ++ (float *)_vq_quantthresh__44u5__p8_1, ++ (long *)_vq_quantmap__44u5__p8_1, + 11, + 11 + }; + +-static static_codebook _44u5__p8_1 = { ++static const static_codebook _44u5__p8_1 = { + 2, 121, +- _vq_lengthlist__44u5__p8_1, ++ (long *)_vq_lengthlist__44u5__p8_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44u5__p8_1, ++ (long *)_vq_quantlist__44u5__p8_1, + NULL, +- &_vq_auxt__44u5__p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u5__p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u5__p9_0[] = { ++static const long _vq_quantlist__44u5__p9_0[] = { + 6, + 5, + 7, +@@ -7233,7 +7233,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u5__p9_0[] = { ++static const long _vq_lengthlist__44u5__p9_0[] = { + 1, 3, 2,12,10,13,13,13,13,13,13,13,13, 4, 9, 9, + 13,13,13,13,13,13,13,13,13,13, 5,10, 9,13,13,13, + 13,13,13,13,13,13,13,12,13,13,13,13,13,13,13,13, +@@ -7247,35 +7247,35 @@ + 12,12,12,12,12,12,12,12,12, + }; + +-static float _vq_quantthresh__44u5__p9_0[] = { ++static const float _vq_quantthresh__44u5__p9_0[] = { + -1402.5, -1147.5, -892.5, -637.5, -382.5, -127.5, 127.5, 382.5, + 637.5, 892.5, 1147.5, 1402.5, + }; + +-static long _vq_quantmap__44u5__p9_0[] = { ++static const long _vq_quantmap__44u5__p9_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u5__p9_0 = { +- _vq_quantthresh__44u5__p9_0, +- _vq_quantmap__44u5__p9_0, ++static const encode_aux_threshmatch _vq_auxt__44u5__p9_0 = { ++ (float *)_vq_quantthresh__44u5__p9_0, ++ (long *)_vq_quantmap__44u5__p9_0, + 13, + 13 + }; + +-static static_codebook _44u5__p9_0 = { ++static const static_codebook _44u5__p9_0 = { + 2, 169, +- _vq_lengthlist__44u5__p9_0, ++ (long *)_vq_lengthlist__44u5__p9_0, + 1, -514332672, 1627381760, 4, 0, +- _vq_quantlist__44u5__p9_0, ++ (long *)_vq_quantlist__44u5__p9_0, + NULL, +- &_vq_auxt__44u5__p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u5__p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u5__p9_1[] = { ++static const long _vq_quantlist__44u5__p9_1[] = { + 7, + 6, + 8, +@@ -7293,7 +7293,7 @@ + 14, + }; + +-static long _vq_lengthlist__44u5__p9_1[] = { ++static const long _vq_lengthlist__44u5__p9_1[] = { + 1, 4, 4, 7, 7, 8, 8, 8, 7, 8, 7, 9, 8, 9, 9, 4, + 7, 6, 9, 8,10,10, 9, 8, 9, 9, 9, 9, 9, 8, 5, 6, + 6, 8, 9,10,10, 9, 9, 9,10,10,10,10,11, 7, 8, 8, +@@ -7311,35 +7311,35 @@ + 14, + }; + +-static float _vq_quantthresh__44u5__p9_1[] = { ++static const float _vq_quantthresh__44u5__p9_1[] = { + -110.5, -93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, + 25.5, 42.5, 59.5, 76.5, 93.5, 110.5, + }; + +-static long _vq_quantmap__44u5__p9_1[] = { ++static const long _vq_quantmap__44u5__p9_1[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__44u5__p9_1 = { +- _vq_quantthresh__44u5__p9_1, +- _vq_quantmap__44u5__p9_1, ++static const encode_aux_threshmatch _vq_auxt__44u5__p9_1 = { ++ (float *)_vq_quantthresh__44u5__p9_1, ++ (long *)_vq_quantmap__44u5__p9_1, + 15, + 15 + }; + +-static static_codebook _44u5__p9_1 = { ++static const static_codebook _44u5__p9_1 = { + 2, 225, +- _vq_lengthlist__44u5__p9_1, ++ (long *)_vq_lengthlist__44u5__p9_1, + 1, -522338304, 1620115456, 4, 0, +- _vq_quantlist__44u5__p9_1, ++ (long *)_vq_quantlist__44u5__p9_1, + NULL, +- &_vq_auxt__44u5__p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u5__p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u5__p9_2[] = { ++static const long _vq_quantlist__44u5__p9_2[] = { + 8, + 7, + 9, +@@ -7359,7 +7359,7 @@ + 16, + }; + +-static long _vq_lengthlist__44u5__p9_2[] = { ++static const long _vq_lengthlist__44u5__p9_2[] = { + 2, 5, 5, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, + 9, 5, 6, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, + 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 9, +@@ -7381,36 +7381,36 @@ + 10, + }; + +-static float _vq_quantthresh__44u5__p9_2[] = { ++static const float _vq_quantthresh__44u5__p9_2[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44u5__p9_2[] = { ++static const long _vq_quantmap__44u5__p9_2[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44u5__p9_2 = { +- _vq_quantthresh__44u5__p9_2, +- _vq_quantmap__44u5__p9_2, ++static const encode_aux_threshmatch _vq_auxt__44u5__p9_2 = { ++ (float *)_vq_quantthresh__44u5__p9_2, ++ (long *)_vq_quantmap__44u5__p9_2, + 17, + 17 + }; + +-static static_codebook _44u5__p9_2 = { ++static const static_codebook _44u5__p9_2 = { + 2, 289, +- _vq_lengthlist__44u5__p9_2, ++ (long *)_vq_lengthlist__44u5__p9_2, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44u5__p9_2, ++ (long *)_vq_quantlist__44u5__p9_2, + NULL, +- &_vq_auxt__44u5__p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44u5__p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44u5__short[] = { ++static const long _huff_lengthlist__44u5__short[] = { + 4,10,17,13,17,13,17,17,17,17, 3, 6, 8, 9,11, 9, + 15,12,16,17, 6, 5, 5, 7, 7, 8,10,11,17,17, 7, 8, + 7, 9, 9,10,13,13,17,17, 8, 6, 5, 7, 4, 7, 5, 8, +@@ -7420,9 +7420,9 @@ + 6, 8,15,17, + }; + +-static static_codebook _huff_book__44u5__short = { ++static const static_codebook _huff_book__44u5__short = { + 2, 100, +- _huff_lengthlist__44u5__short, ++ (long *)_huff_lengthlist__44u5__short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -7431,7 +7431,7 @@ + 0 + }; + +-static long _huff_lengthlist__44u6__long[] = { ++static const long _huff_lengthlist__44u6__long[] = { + 3, 9,14,13,14,13,16,12,13,14, 5, 4, 6, 6, 8, 9, + 11,10,12,15,10, 5, 5, 6, 6, 8,10,10,13,16,10, 6, + 6, 6, 6, 8, 9, 9,12,14,13, 7, 6, 6, 4, 6, 6, 7, +@@ -7441,9 +7441,9 @@ + 13, 8, 7, 7, + }; + +-static static_codebook _huff_book__44u6__long = { ++static const static_codebook _huff_book__44u6__long = { + 2, 100, +- _huff_lengthlist__44u6__long, ++ (long *)_huff_lengthlist__44u6__long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -7452,13 +7452,13 @@ + 0 + }; + +-static long _vq_quantlist__44u6__p1_0[] = { ++static const long _vq_quantlist__44u6__p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u6__p1_0[] = { ++static const long _vq_lengthlist__44u6__p1_0[] = { + 1, 4, 4, 4, 8, 7, 5, 7, 7, 5, 8, 8, 8,10,10, 7, + 9,10, 5, 8, 8, 7,10, 9, 8,10,10, 5, 8, 8, 8,10, + 10, 8,10,10, 8,10,10,10,12,13,10,13,13, 7,10,10, +@@ -7467,39 +7467,39 @@ + 12, + }; + +-static float _vq_quantthresh__44u6__p1_0[] = { ++static const float _vq_quantthresh__44u6__p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u6__p1_0[] = { ++static const long _vq_quantmap__44u6__p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u6__p1_0 = { +- _vq_quantthresh__44u6__p1_0, +- _vq_quantmap__44u6__p1_0, ++static const encode_aux_threshmatch _vq_auxt__44u6__p1_0 = { ++ (float *)_vq_quantthresh__44u6__p1_0, ++ (long *)_vq_quantmap__44u6__p1_0, + 3, + 3 + }; + +-static static_codebook _44u6__p1_0 = { ++static const static_codebook _44u6__p1_0 = { + 4, 81, +- _vq_lengthlist__44u6__p1_0, ++ (long *)_vq_lengthlist__44u6__p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u6__p1_0, ++ (long *)_vq_quantlist__44u6__p1_0, + NULL, +- &_vq_auxt__44u6__p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u6__p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u6__p2_0[] = { ++static const long _vq_quantlist__44u6__p2_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u6__p2_0[] = { ++static const long _vq_lengthlist__44u6__p2_0[] = { + 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 8, 8, 6, + 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 8, 5, 6, 6, 6, 8, + 8, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 7, 7, +@@ -7508,33 +7508,33 @@ + 9, + }; + +-static float _vq_quantthresh__44u6__p2_0[] = { ++static const float _vq_quantthresh__44u6__p2_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u6__p2_0[] = { ++static const long _vq_quantmap__44u6__p2_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u6__p2_0 = { +- _vq_quantthresh__44u6__p2_0, +- _vq_quantmap__44u6__p2_0, ++static const encode_aux_threshmatch _vq_auxt__44u6__p2_0 = { ++ (float *)_vq_quantthresh__44u6__p2_0, ++ (long *)_vq_quantmap__44u6__p2_0, + 3, + 3 + }; + +-static static_codebook _44u6__p2_0 = { ++static const static_codebook _44u6__p2_0 = { + 4, 81, +- _vq_lengthlist__44u6__p2_0, ++ (long *)_vq_lengthlist__44u6__p2_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u6__p2_0, ++ (long *)_vq_quantlist__44u6__p2_0, + NULL, +- &_vq_auxt__44u6__p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u6__p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u6__p3_0[] = { ++static const long _vq_quantlist__44u6__p3_0[] = { + 2, + 1, + 3, +@@ -7542,7 +7542,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u6__p3_0[] = { ++static const long _vq_lengthlist__44u6__p3_0[] = { + 2, 5, 4, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8, + 9, 9,13,12, 8, 9,10,12,13, 5, 7, 7,10, 9, 7, 9, + 9,11,11, 7, 8, 9,11,11,10,11,11,14,14, 9,10,11, +@@ -7585,33 +7585,33 @@ + 19, + }; + +-static float _vq_quantthresh__44u6__p3_0[] = { ++static const float _vq_quantthresh__44u6__p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u6__p3_0[] = { ++static const long _vq_quantmap__44u6__p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u6__p3_0 = { +- _vq_quantthresh__44u6__p3_0, +- _vq_quantmap__44u6__p3_0, ++static const encode_aux_threshmatch _vq_auxt__44u6__p3_0 = { ++ (float *)_vq_quantthresh__44u6__p3_0, ++ (long *)_vq_quantmap__44u6__p3_0, + 5, + 5 + }; + +-static static_codebook _44u6__p3_0 = { ++static const static_codebook _44u6__p3_0 = { + 4, 625, +- _vq_lengthlist__44u6__p3_0, ++ (long *)_vq_lengthlist__44u6__p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u6__p3_0, ++ (long *)_vq_quantlist__44u6__p3_0, + NULL, +- &_vq_auxt__44u6__p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u6__p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u6__p4_0[] = { ++static const long _vq_quantlist__44u6__p4_0[] = { + 2, + 1, + 3, +@@ -7619,7 +7619,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u6__p4_0[] = { ++static const long _vq_lengthlist__44u6__p4_0[] = { + 4, 5, 5, 8, 8, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 8, + 9, 9,11,11, 8, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 8, + 8,10,10, 7, 7, 8, 9,10, 9,10,10,11,11, 9, 9,10, +@@ -7662,33 +7662,33 @@ + 13, + }; + +-static float _vq_quantthresh__44u6__p4_0[] = { ++static const float _vq_quantthresh__44u6__p4_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u6__p4_0[] = { ++static const long _vq_quantmap__44u6__p4_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u6__p4_0 = { +- _vq_quantthresh__44u6__p4_0, +- _vq_quantmap__44u6__p4_0, ++static const encode_aux_threshmatch _vq_auxt__44u6__p4_0 = { ++ (float *)_vq_quantthresh__44u6__p4_0, ++ (long *)_vq_quantmap__44u6__p4_0, + 5, + 5 + }; + +-static static_codebook _44u6__p4_0 = { ++static const static_codebook _44u6__p4_0 = { + 4, 625, +- _vq_lengthlist__44u6__p4_0, ++ (long *)_vq_lengthlist__44u6__p4_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u6__p4_0, ++ (long *)_vq_quantlist__44u6__p4_0, + NULL, +- &_vq_auxt__44u6__p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u6__p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u6__p5_0[] = { ++static const long _vq_quantlist__44u6__p5_0[] = { + 4, + 3, + 5, +@@ -7700,7 +7700,7 @@ + 8, + }; + +-static long _vq_lengthlist__44u6__p5_0[] = { ++static const long _vq_lengthlist__44u6__p5_0[] = { + 2, 3, 3, 6, 6, 8, 8,10,10, 4, 5, 5, 8, 7, 8, 8, + 11,11, 3, 5, 5, 7, 8, 8, 8,11,11, 6, 8, 7, 9, 9, + 10, 9,12,11, 6, 7, 8, 9, 9, 9,10,11,12, 8, 8, 8, +@@ -7709,34 +7709,34 @@ + 14, + }; + +-static float _vq_quantthresh__44u6__p5_0[] = { ++static const float _vq_quantthresh__44u6__p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44u6__p5_0[] = { ++static const long _vq_quantmap__44u6__p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44u6__p5_0 = { +- _vq_quantthresh__44u6__p5_0, +- _vq_quantmap__44u6__p5_0, ++static const encode_aux_threshmatch _vq_auxt__44u6__p5_0 = { ++ (float *)_vq_quantthresh__44u6__p5_0, ++ (long *)_vq_quantmap__44u6__p5_0, + 9, + 9 + }; + +-static static_codebook _44u6__p5_0 = { ++static const static_codebook _44u6__p5_0 = { + 2, 81, +- _vq_lengthlist__44u6__p5_0, ++ (long *)_vq_lengthlist__44u6__p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44u6__p5_0, ++ (long *)_vq_quantlist__44u6__p5_0, + NULL, +- &_vq_auxt__44u6__p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u6__p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u6__p6_0[] = { ++static const long _vq_quantlist__44u6__p6_0[] = { + 4, + 3, + 5, +@@ -7748,7 +7748,7 @@ + 8, + }; + +-static long _vq_lengthlist__44u6__p6_0[] = { ++static const long _vq_lengthlist__44u6__p6_0[] = { + 3, 4, 4, 5, 5, 7, 7, 9, 9, 4, 5, 4, 6, 6, 7, 7, + 9, 9, 4, 4, 5, 6, 6, 7, 8, 9, 9, 5, 6, 6, 7, 7, + 8, 8,10,10, 5, 6, 6, 7, 7, 8, 8,10,10, 7, 8, 7, +@@ -7757,40 +7757,40 @@ + 12, + }; + +-static float _vq_quantthresh__44u6__p6_0[] = { ++static const float _vq_quantthresh__44u6__p6_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44u6__p6_0[] = { ++static const long _vq_quantmap__44u6__p6_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44u6__p6_0 = { +- _vq_quantthresh__44u6__p6_0, +- _vq_quantmap__44u6__p6_0, ++static const encode_aux_threshmatch _vq_auxt__44u6__p6_0 = { ++ (float *)_vq_quantthresh__44u6__p6_0, ++ (long *)_vq_quantmap__44u6__p6_0, + 9, + 9 + }; + +-static static_codebook _44u6__p6_0 = { ++static const static_codebook _44u6__p6_0 = { + 2, 81, +- _vq_lengthlist__44u6__p6_0, ++ (long *)_vq_lengthlist__44u6__p6_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44u6__p6_0, ++ (long *)_vq_quantlist__44u6__p6_0, + NULL, +- &_vq_auxt__44u6__p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u6__p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u6__p7_0[] = { ++static const long _vq_quantlist__44u6__p7_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u6__p7_0[] = { ++static const long _vq_lengthlist__44u6__p7_0[] = { + 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 8, 7,10,10, 8, + 10,10, 5, 8, 9, 7,10,10, 7,10, 9, 4, 8, 8, 9,11, + 11, 8,11,11, 7,11,11,10,10,13,10,13,13, 7,11,11, +@@ -7799,33 +7799,33 @@ + 10, + }; + +-static float _vq_quantthresh__44u6__p7_0[] = { ++static const float _vq_quantthresh__44u6__p7_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44u6__p7_0[] = { ++static const long _vq_quantmap__44u6__p7_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u6__p7_0 = { +- _vq_quantthresh__44u6__p7_0, +- _vq_quantmap__44u6__p7_0, ++static const encode_aux_threshmatch _vq_auxt__44u6__p7_0 = { ++ (float *)_vq_quantthresh__44u6__p7_0, ++ (long *)_vq_quantmap__44u6__p7_0, + 3, + 3 + }; + +-static static_codebook _44u6__p7_0 = { ++static const static_codebook _44u6__p7_0 = { + 4, 81, +- _vq_lengthlist__44u6__p7_0, ++ (long *)_vq_lengthlist__44u6__p7_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44u6__p7_0, ++ (long *)_vq_quantlist__44u6__p7_0, + NULL, +- &_vq_auxt__44u6__p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u6__p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u6__p7_1[] = { ++static const long _vq_quantlist__44u6__p7_1[] = { + 5, + 4, + 6, +@@ -7839,7 +7839,7 @@ + 10, + }; + +-static long _vq_lengthlist__44u6__p7_1[] = { ++static const long _vq_lengthlist__44u6__p7_1[] = { + 3, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 5, 5, 7, 6, + 8, 8, 8, 8, 8, 8, 4, 5, 5, 6, 7, 8, 8, 8, 8, 8, + 8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7, +@@ -7850,35 +7850,35 @@ + 8, 8, 8, 9, 9, 9, 9, 9, 9, + }; + +-static float _vq_quantthresh__44u6__p7_1[] = { ++static const float _vq_quantthresh__44u6__p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44u6__p7_1[] = { ++static const long _vq_quantmap__44u6__p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44u6__p7_1 = { +- _vq_quantthresh__44u6__p7_1, +- _vq_quantmap__44u6__p7_1, ++static const encode_aux_threshmatch _vq_auxt__44u6__p7_1 = { ++ (float *)_vq_quantthresh__44u6__p7_1, ++ (long *)_vq_quantmap__44u6__p7_1, + 11, + 11 + }; + +-static static_codebook _44u6__p7_1 = { ++static const static_codebook _44u6__p7_1 = { + 2, 121, +- _vq_lengthlist__44u6__p7_1, ++ (long *)_vq_lengthlist__44u6__p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44u6__p7_1, ++ (long *)_vq_quantlist__44u6__p7_1, + NULL, +- &_vq_auxt__44u6__p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u6__p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u6__p8_0[] = { ++static const long _vq_quantlist__44u6__p8_0[] = { + 5, + 4, + 6, +@@ -7892,7 +7892,7 @@ + 10, + }; + +-static long _vq_lengthlist__44u6__p8_0[] = { ++static const long _vq_lengthlist__44u6__p8_0[] = { + 1, 4, 4, 6, 6, 8, 8, 9, 9,10,10, 4, 6, 6, 7, 7, + 9, 9,10,10,11,11, 4, 6, 6, 7, 7, 9, 9,10,10,11, + 11, 6, 8, 8, 9, 9,10,10,11,11,12,12, 6, 8, 8, 9, +@@ -7903,35 +7903,35 @@ + 12,13,13,14,14,14,15,15,15, + }; + +-static float _vq_quantthresh__44u6__p8_0[] = { ++static const float _vq_quantthresh__44u6__p8_0[] = { + -49.5, -38.5, -27.5, -16.5, -5.5, 5.5, 16.5, 27.5, + 38.5, 49.5, + }; + +-static long _vq_quantmap__44u6__p8_0[] = { ++static const long _vq_quantmap__44u6__p8_0[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44u6__p8_0 = { +- _vq_quantthresh__44u6__p8_0, +- _vq_quantmap__44u6__p8_0, ++static const encode_aux_threshmatch _vq_auxt__44u6__p8_0 = { ++ (float *)_vq_quantthresh__44u6__p8_0, ++ (long *)_vq_quantmap__44u6__p8_0, + 11, + 11 + }; + +-static static_codebook _44u6__p8_0 = { ++static const static_codebook _44u6__p8_0 = { + 2, 121, +- _vq_lengthlist__44u6__p8_0, ++ (long *)_vq_lengthlist__44u6__p8_0, + 1, -524582912, 1618345984, 4, 0, +- _vq_quantlist__44u6__p8_0, ++ (long *)_vq_quantlist__44u6__p8_0, + NULL, +- &_vq_auxt__44u6__p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u6__p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u6__p8_1[] = { ++static const long _vq_quantlist__44u6__p8_1[] = { + 5, + 4, + 6, +@@ -7945,7 +7945,7 @@ + 10, + }; + +-static long _vq_lengthlist__44u6__p8_1[] = { ++static const long _vq_lengthlist__44u6__p8_1[] = { + 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 5, 7, 7, + 7, 7, 8, 7, 8, 8, 5, 5, 6, 6, 7, 7, 7, 7, 7, 8, + 8, 6, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 6, 6, 7, 7, +@@ -7956,35 +7956,35 @@ + 8, 8, 8, 8, 8, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__44u6__p8_1[] = { ++static const float _vq_quantthresh__44u6__p8_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44u6__p8_1[] = { ++static const long _vq_quantmap__44u6__p8_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44u6__p8_1 = { +- _vq_quantthresh__44u6__p8_1, +- _vq_quantmap__44u6__p8_1, ++static const encode_aux_threshmatch _vq_auxt__44u6__p8_1 = { ++ (float *)_vq_quantthresh__44u6__p8_1, ++ (long *)_vq_quantmap__44u6__p8_1, + 11, + 11 + }; + +-static static_codebook _44u6__p8_1 = { ++static const static_codebook _44u6__p8_1 = { + 2, 121, +- _vq_lengthlist__44u6__p8_1, ++ (long *)_vq_lengthlist__44u6__p8_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44u6__p8_1, ++ (long *)_vq_quantlist__44u6__p8_1, + NULL, +- &_vq_auxt__44u6__p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u6__p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u6__p9_0[] = { ++static const long _vq_quantlist__44u6__p9_0[] = { + 7, + 6, + 8, +@@ -8002,7 +8002,7 @@ + 14, + }; + +-static long _vq_lengthlist__44u6__p9_0[] = { ++static const long _vq_lengthlist__44u6__p9_0[] = { + 1, 3, 2, 9, 8,15,15,15,15,15,15,15,15,15,15, 4, + 8, 9,13,14,14,14,14,14,14,14,14,14,14,14, 5, 8, + 9,14,14,14,14,14,14,14,14,14,14,14,14,11,14,14, +@@ -8020,35 +8020,35 @@ + 14, + }; + +-static float _vq_quantthresh__44u6__p9_0[] = { ++static const float _vq_quantthresh__44u6__p9_0[] = { + -1657.5, -1402.5, -1147.5, -892.5, -637.5, -382.5, -127.5, 127.5, + 382.5, 637.5, 892.5, 1147.5, 1402.5, 1657.5, + }; + +-static long _vq_quantmap__44u6__p9_0[] = { ++static const long _vq_quantmap__44u6__p9_0[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__44u6__p9_0 = { +- _vq_quantthresh__44u6__p9_0, +- _vq_quantmap__44u6__p9_0, ++static const encode_aux_threshmatch _vq_auxt__44u6__p9_0 = { ++ (float *)_vq_quantthresh__44u6__p9_0, ++ (long *)_vq_quantmap__44u6__p9_0, + 15, + 15 + }; + +-static static_codebook _44u6__p9_0 = { ++static const static_codebook _44u6__p9_0 = { + 2, 225, +- _vq_lengthlist__44u6__p9_0, ++ (long *)_vq_lengthlist__44u6__p9_0, + 1, -514071552, 1627381760, 4, 0, +- _vq_quantlist__44u6__p9_0, ++ (long *)_vq_quantlist__44u6__p9_0, + NULL, +- &_vq_auxt__44u6__p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u6__p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u6__p9_1[] = { ++static const long _vq_quantlist__44u6__p9_1[] = { + 7, + 6, + 8, +@@ -8066,7 +8066,7 @@ + 14, + }; + +-static long _vq_lengthlist__44u6__p9_1[] = { ++static const long _vq_lengthlist__44u6__p9_1[] = { + 1, 4, 4, 7, 7, 8, 9, 8, 8, 9, 8, 9, 8, 9, 9, 4, + 7, 6, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 4, 7, + 6, 9, 9,10,10, 9, 9,10,10,10,10,11,11, 7, 9, 8, +@@ -8084,35 +8084,35 @@ + 13, + }; + +-static float _vq_quantthresh__44u6__p9_1[] = { ++static const float _vq_quantthresh__44u6__p9_1[] = { + -110.5, -93.5, -76.5, -59.5, -42.5, -25.5, -8.5, 8.5, + 25.5, 42.5, 59.5, 76.5, 93.5, 110.5, + }; + +-static long _vq_quantmap__44u6__p9_1[] = { ++static const long _vq_quantmap__44u6__p9_1[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__44u6__p9_1 = { +- _vq_quantthresh__44u6__p9_1, +- _vq_quantmap__44u6__p9_1, ++static const encode_aux_threshmatch _vq_auxt__44u6__p9_1 = { ++ (float *)_vq_quantthresh__44u6__p9_1, ++ (long *)_vq_quantmap__44u6__p9_1, + 15, + 15 + }; + +-static static_codebook _44u6__p9_1 = { ++static const static_codebook _44u6__p9_1 = { + 2, 225, +- _vq_lengthlist__44u6__p9_1, ++ (long *)_vq_lengthlist__44u6__p9_1, + 1, -522338304, 1620115456, 4, 0, +- _vq_quantlist__44u6__p9_1, ++ (long *)_vq_quantlist__44u6__p9_1, + NULL, +- &_vq_auxt__44u6__p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u6__p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u6__p9_2[] = { ++static const long _vq_quantlist__44u6__p9_2[] = { + 8, + 7, + 9, +@@ -8132,7 +8132,7 @@ + 16, + }; + +-static long _vq_lengthlist__44u6__p9_2[] = { ++static const long _vq_lengthlist__44u6__p9_2[] = { + 3, 5, 5, 7, 7, 8, 8, 8, 8, 8, 8, 9, 8, 8, 9, 9, + 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, + 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, +@@ -8154,36 +8154,36 @@ + 10, + }; + +-static float _vq_quantthresh__44u6__p9_2[] = { ++static const float _vq_quantthresh__44u6__p9_2[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44u6__p9_2[] = { ++static const long _vq_quantmap__44u6__p9_2[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44u6__p9_2 = { +- _vq_quantthresh__44u6__p9_2, +- _vq_quantmap__44u6__p9_2, ++static const encode_aux_threshmatch _vq_auxt__44u6__p9_2 = { ++ (float *)_vq_quantthresh__44u6__p9_2, ++ (long *)_vq_quantmap__44u6__p9_2, + 17, + 17 + }; + +-static static_codebook _44u6__p9_2 = { ++static const static_codebook _44u6__p9_2 = { + 2, 289, +- _vq_lengthlist__44u6__p9_2, ++ (long *)_vq_lengthlist__44u6__p9_2, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44u6__p9_2, ++ (long *)_vq_quantlist__44u6__p9_2, + NULL, +- &_vq_auxt__44u6__p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44u6__p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44u6__short[] = { ++static const long _huff_lengthlist__44u6__short[] = { + 4,11,16,13,17,13,17,16,17,17, 4, 7, 9, 9,13,10, + 16,12,16,17, 7, 6, 5, 7, 8, 9,12,12,16,17, 6, 9, + 7, 9,10,10,15,15,17,17, 6, 7, 5, 7, 5, 7, 7,10, +@@ -8193,9 +8193,9 @@ + 7, 6, 9,16, + }; + +-static static_codebook _huff_book__44u6__short = { ++static const static_codebook _huff_book__44u6__short = { + 2, 100, +- _huff_lengthlist__44u6__short, ++ (long *)_huff_lengthlist__44u6__short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -8204,7 +8204,7 @@ + 0 + }; + +-static long _huff_lengthlist__44u7__long[] = { ++static const long _huff_lengthlist__44u7__long[] = { + 3, 9,14,13,15,14,16,13,13,14, 5, 5, 7, 7, 8, 9, + 11,10,12,15,10, 6, 5, 6, 6, 9,10,10,13,16,10, 6, + 6, 6, 6, 8, 9, 9,12,15,14, 7, 6, 6, 5, 6, 6, 8, +@@ -8214,9 +8214,9 @@ + 12, 8, 6, 7, + }; + +-static static_codebook _huff_book__44u7__long = { ++static const static_codebook _huff_book__44u7__long = { + 2, 100, +- _huff_lengthlist__44u7__long, ++ (long *)_huff_lengthlist__44u7__long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -8225,13 +8225,13 @@ + 0 + }; + +-static long _vq_quantlist__44u7__p1_0[] = { ++static const long _vq_quantlist__44u7__p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u7__p1_0[] = { ++static const long _vq_lengthlist__44u7__p1_0[] = { + 1, 4, 4, 4, 7, 7, 5, 7, 7, 5, 8, 8, 8,10,10, 7, + 10,10, 5, 8, 8, 7,10,10, 8,10,10, 5, 8, 8, 8,11, + 10, 8,10,10, 8,10,10,10,12,13,10,13,13, 7,10,10, +@@ -8240,39 +8240,39 @@ + 12, + }; + +-static float _vq_quantthresh__44u7__p1_0[] = { ++static const float _vq_quantthresh__44u7__p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u7__p1_0[] = { ++static const long _vq_quantmap__44u7__p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u7__p1_0 = { +- _vq_quantthresh__44u7__p1_0, +- _vq_quantmap__44u7__p1_0, ++static const encode_aux_threshmatch _vq_auxt__44u7__p1_0 = { ++ (float *)_vq_quantthresh__44u7__p1_0, ++ (long *)_vq_quantmap__44u7__p1_0, + 3, + 3 + }; + +-static static_codebook _44u7__p1_0 = { ++static const static_codebook _44u7__p1_0 = { + 4, 81, +- _vq_lengthlist__44u7__p1_0, ++ (long *)_vq_lengthlist__44u7__p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u7__p1_0, ++ (long *)_vq_quantlist__44u7__p1_0, + NULL, +- &_vq_auxt__44u7__p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u7__p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u7__p2_0[] = { ++static const long _vq_quantlist__44u7__p2_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u7__p2_0[] = { ++static const long _vq_lengthlist__44u7__p2_0[] = { + 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 8, 8, 6, + 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 8, 5, 6, 6, 6, 8, + 7, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 7, +@@ -8281,33 +8281,33 @@ + 9, + }; + +-static float _vq_quantthresh__44u7__p2_0[] = { ++static const float _vq_quantthresh__44u7__p2_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u7__p2_0[] = { ++static const long _vq_quantmap__44u7__p2_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u7__p2_0 = { +- _vq_quantthresh__44u7__p2_0, +- _vq_quantmap__44u7__p2_0, ++static const encode_aux_threshmatch _vq_auxt__44u7__p2_0 = { ++ (float *)_vq_quantthresh__44u7__p2_0, ++ (long *)_vq_quantmap__44u7__p2_0, + 3, + 3 + }; + +-static static_codebook _44u7__p2_0 = { ++static const static_codebook _44u7__p2_0 = { + 4, 81, +- _vq_lengthlist__44u7__p2_0, ++ (long *)_vq_lengthlist__44u7__p2_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u7__p2_0, ++ (long *)_vq_quantlist__44u7__p2_0, + NULL, +- &_vq_auxt__44u7__p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u7__p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u7__p3_0[] = { ++static const long _vq_quantlist__44u7__p3_0[] = { + 2, + 1, + 3, +@@ -8315,7 +8315,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u7__p3_0[] = { ++static const long _vq_lengthlist__44u7__p3_0[] = { + 2, 5, 4, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8, + 9, 9,13,12, 8, 9,10,12,13, 5, 7, 7,10, 9, 7, 9, + 9,11,11, 6, 8, 9,11,11,10,11,11,14,14, 9,10,11, +@@ -8358,33 +8358,33 @@ + 0, + }; + +-static float _vq_quantthresh__44u7__p3_0[] = { ++static const float _vq_quantthresh__44u7__p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u7__p3_0[] = { ++static const long _vq_quantmap__44u7__p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u7__p3_0 = { +- _vq_quantthresh__44u7__p3_0, +- _vq_quantmap__44u7__p3_0, ++static const encode_aux_threshmatch _vq_auxt__44u7__p3_0 = { ++ (float *)_vq_quantthresh__44u7__p3_0, ++ (long *)_vq_quantmap__44u7__p3_0, + 5, + 5 + }; + +-static static_codebook _44u7__p3_0 = { ++static const static_codebook _44u7__p3_0 = { + 4, 625, +- _vq_lengthlist__44u7__p3_0, ++ (long *)_vq_lengthlist__44u7__p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u7__p3_0, ++ (long *)_vq_quantlist__44u7__p3_0, + NULL, +- &_vq_auxt__44u7__p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u7__p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u7__p4_0[] = { ++static const long _vq_quantlist__44u7__p4_0[] = { + 2, + 1, + 3, +@@ -8392,7 +8392,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u7__p4_0[] = { ++static const long _vq_lengthlist__44u7__p4_0[] = { + 4, 5, 5, 8, 8, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 8, + 9, 9,11,11, 8, 9, 9,10,11, 6, 7, 7, 9, 9, 7, 8, + 8,10,10, 6, 7, 8, 9,10, 9,10,10,12,12, 9, 9,10, +@@ -8435,33 +8435,33 @@ + 14, + }; + +-static float _vq_quantthresh__44u7__p4_0[] = { ++static const float _vq_quantthresh__44u7__p4_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u7__p4_0[] = { ++static const long _vq_quantmap__44u7__p4_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u7__p4_0 = { +- _vq_quantthresh__44u7__p4_0, +- _vq_quantmap__44u7__p4_0, ++static const encode_aux_threshmatch _vq_auxt__44u7__p4_0 = { ++ (float *)_vq_quantthresh__44u7__p4_0, ++ (long *)_vq_quantmap__44u7__p4_0, + 5, + 5 + }; + +-static static_codebook _44u7__p4_0 = { ++static const static_codebook _44u7__p4_0 = { + 4, 625, +- _vq_lengthlist__44u7__p4_0, ++ (long *)_vq_lengthlist__44u7__p4_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u7__p4_0, ++ (long *)_vq_quantlist__44u7__p4_0, + NULL, +- &_vq_auxt__44u7__p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u7__p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u7__p5_0[] = { ++static const long _vq_quantlist__44u7__p5_0[] = { + 4, + 3, + 5, +@@ -8473,7 +8473,7 @@ + 8, + }; + +-static long _vq_lengthlist__44u7__p5_0[] = { ++static const long _vq_lengthlist__44u7__p5_0[] = { + 2, 3, 3, 6, 6, 7, 8,10,10, 4, 5, 5, 8, 7, 8, 8, + 11,11, 3, 5, 5, 7, 7, 8, 9,11,11, 6, 8, 7, 9, 9, + 10,10,12,12, 6, 7, 8, 9,10,10,10,12,12, 8, 8, 8, +@@ -8482,34 +8482,34 @@ + 14, + }; + +-static float _vq_quantthresh__44u7__p5_0[] = { ++static const float _vq_quantthresh__44u7__p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44u7__p5_0[] = { ++static const long _vq_quantmap__44u7__p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44u7__p5_0 = { +- _vq_quantthresh__44u7__p5_0, +- _vq_quantmap__44u7__p5_0, ++static const encode_aux_threshmatch _vq_auxt__44u7__p5_0 = { ++ (float *)_vq_quantthresh__44u7__p5_0, ++ (long *)_vq_quantmap__44u7__p5_0, + 9, + 9 + }; + +-static static_codebook _44u7__p5_0 = { ++static const static_codebook _44u7__p5_0 = { + 2, 81, +- _vq_lengthlist__44u7__p5_0, ++ (long *)_vq_lengthlist__44u7__p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44u7__p5_0, ++ (long *)_vq_quantlist__44u7__p5_0, + NULL, +- &_vq_auxt__44u7__p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u7__p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u7__p6_0[] = { ++static const long _vq_quantlist__44u7__p6_0[] = { + 4, + 3, + 5, +@@ -8521,7 +8521,7 @@ + 8, + }; + +-static long _vq_lengthlist__44u7__p6_0[] = { ++static const long _vq_lengthlist__44u7__p6_0[] = { + 3, 4, 4, 5, 5, 7, 7, 9, 9, 4, 5, 4, 6, 6, 8, 7, + 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 7, + 8, 8,10,10, 5, 6, 6, 7, 7, 8, 8,10,10, 7, 8, 7, +@@ -8530,40 +8530,40 @@ + 12, + }; + +-static float _vq_quantthresh__44u7__p6_0[] = { ++static const float _vq_quantthresh__44u7__p6_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44u7__p6_0[] = { ++static const long _vq_quantmap__44u7__p6_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44u7__p6_0 = { +- _vq_quantthresh__44u7__p6_0, +- _vq_quantmap__44u7__p6_0, ++static const encode_aux_threshmatch _vq_auxt__44u7__p6_0 = { ++ (float *)_vq_quantthresh__44u7__p6_0, ++ (long *)_vq_quantmap__44u7__p6_0, + 9, + 9 + }; + +-static static_codebook _44u7__p6_0 = { ++static const static_codebook _44u7__p6_0 = { + 2, 81, +- _vq_lengthlist__44u7__p6_0, ++ (long *)_vq_lengthlist__44u7__p6_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44u7__p6_0, ++ (long *)_vq_quantlist__44u7__p6_0, + NULL, +- &_vq_auxt__44u7__p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u7__p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u7__p7_0[] = { ++static const long _vq_quantlist__44u7__p7_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u7__p7_0[] = { ++static const long _vq_lengthlist__44u7__p7_0[] = { + 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 8, 8, 9, 9, 7, + 10,10, 5, 8, 9, 7, 9,10, 8, 9, 9, 4, 9, 9, 9,11, + 10, 8,10,10, 7,11,10,10,10,12,10,12,12, 7,10,10, +@@ -8572,33 +8572,33 @@ + 10, + }; + +-static float _vq_quantthresh__44u7__p7_0[] = { ++static const float _vq_quantthresh__44u7__p7_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44u7__p7_0[] = { ++static const long _vq_quantmap__44u7__p7_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u7__p7_0 = { +- _vq_quantthresh__44u7__p7_0, +- _vq_quantmap__44u7__p7_0, ++static const encode_aux_threshmatch _vq_auxt__44u7__p7_0 = { ++ (float *)_vq_quantthresh__44u7__p7_0, ++ (long *)_vq_quantmap__44u7__p7_0, + 3, + 3 + }; + +-static static_codebook _44u7__p7_0 = { ++static const static_codebook _44u7__p7_0 = { + 4, 81, +- _vq_lengthlist__44u7__p7_0, ++ (long *)_vq_lengthlist__44u7__p7_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44u7__p7_0, ++ (long *)_vq_quantlist__44u7__p7_0, + NULL, +- &_vq_auxt__44u7__p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u7__p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u7__p7_1[] = { ++static const long _vq_quantlist__44u7__p7_1[] = { + 5, + 4, + 6, +@@ -8612,7 +8612,7 @@ + 10, + }; + +-static long _vq_lengthlist__44u7__p7_1[] = { ++static const long _vq_lengthlist__44u7__p7_1[] = { + 3, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 5, 5, 6, 6, + 8, 7, 8, 8, 8, 8, 4, 5, 5, 6, 6, 7, 8, 8, 8, 8, + 8, 6, 7, 6, 7, 7, 8, 8, 9, 9, 9, 9, 6, 6, 7, 7, +@@ -8623,35 +8623,35 @@ + 8, 9, 9, 9, 9, 9,10,10,10, + }; + +-static float _vq_quantthresh__44u7__p7_1[] = { ++static const float _vq_quantthresh__44u7__p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44u7__p7_1[] = { ++static const long _vq_quantmap__44u7__p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44u7__p7_1 = { +- _vq_quantthresh__44u7__p7_1, +- _vq_quantmap__44u7__p7_1, ++static const encode_aux_threshmatch _vq_auxt__44u7__p7_1 = { ++ (float *)_vq_quantthresh__44u7__p7_1, ++ (long *)_vq_quantmap__44u7__p7_1, + 11, + 11 + }; + +-static static_codebook _44u7__p7_1 = { ++static const static_codebook _44u7__p7_1 = { + 2, 121, +- _vq_lengthlist__44u7__p7_1, ++ (long *)_vq_lengthlist__44u7__p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44u7__p7_1, ++ (long *)_vq_quantlist__44u7__p7_1, + NULL, +- &_vq_auxt__44u7__p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u7__p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u7__p8_0[] = { ++static const long _vq_quantlist__44u7__p8_0[] = { + 5, + 4, + 6, +@@ -8665,7 +8665,7 @@ + 10, + }; + +-static long _vq_lengthlist__44u7__p8_0[] = { ++static const long _vq_lengthlist__44u7__p8_0[] = { + 1, 4, 4, 6, 6, 8, 8,10,10,11,11, 4, 6, 6, 7, 7, + 9, 9,11,10,12,12, 5, 6, 5, 7, 7, 9, 9,10,11,12, + 12, 6, 7, 7, 8, 8,10,10,11,11,13,13, 6, 7, 7, 8, +@@ -8676,35 +8676,35 @@ + 12,13,13,14,14,15,15,15,16, + }; + +-static float _vq_quantthresh__44u7__p8_0[] = { ++static const float _vq_quantthresh__44u7__p8_0[] = { + -49.5, -38.5, -27.5, -16.5, -5.5, 5.5, 16.5, 27.5, + 38.5, 49.5, + }; + +-static long _vq_quantmap__44u7__p8_0[] = { ++static const long _vq_quantmap__44u7__p8_0[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44u7__p8_0 = { +- _vq_quantthresh__44u7__p8_0, +- _vq_quantmap__44u7__p8_0, ++static const encode_aux_threshmatch _vq_auxt__44u7__p8_0 = { ++ (float *)_vq_quantthresh__44u7__p8_0, ++ (long *)_vq_quantmap__44u7__p8_0, + 11, + 11 + }; + +-static static_codebook _44u7__p8_0 = { ++static const static_codebook _44u7__p8_0 = { + 2, 121, +- _vq_lengthlist__44u7__p8_0, ++ (long *)_vq_lengthlist__44u7__p8_0, + 1, -524582912, 1618345984, 4, 0, +- _vq_quantlist__44u7__p8_0, ++ (long *)_vq_quantlist__44u7__p8_0, + NULL, +- &_vq_auxt__44u7__p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u7__p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u7__p8_1[] = { ++static const long _vq_quantlist__44u7__p8_1[] = { + 5, + 4, + 6, +@@ -8718,7 +8718,7 @@ + 10, + }; + +-static long _vq_lengthlist__44u7__p8_1[] = { ++static const long _vq_lengthlist__44u7__p8_1[] = { + 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 6, 7, 7, + 7, 7, 7, 7, 7, 7, 5, 6, 6, 6, 7, 7, 7, 7, 7, 7, + 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 6, 7, 7, 7, +@@ -8729,35 +8729,35 @@ + 7, 8, 8, 8, 8, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__44u7__p8_1[] = { ++static const float _vq_quantthresh__44u7__p8_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44u7__p8_1[] = { ++static const long _vq_quantmap__44u7__p8_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44u7__p8_1 = { +- _vq_quantthresh__44u7__p8_1, +- _vq_quantmap__44u7__p8_1, ++static const encode_aux_threshmatch _vq_auxt__44u7__p8_1 = { ++ (float *)_vq_quantthresh__44u7__p8_1, ++ (long *)_vq_quantmap__44u7__p8_1, + 11, + 11 + }; + +-static static_codebook _44u7__p8_1 = { ++static const static_codebook _44u7__p8_1 = { + 2, 121, +- _vq_lengthlist__44u7__p8_1, ++ (long *)_vq_lengthlist__44u7__p8_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44u7__p8_1, ++ (long *)_vq_quantlist__44u7__p8_1, + NULL, +- &_vq_auxt__44u7__p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u7__p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u7__p9_0[] = { ++static const long _vq_quantlist__44u7__p9_0[] = { + 5, + 4, + 6, +@@ -8771,7 +8771,7 @@ + 10, + }; + +-static long _vq_lengthlist__44u7__p9_0[] = { ++static const long _vq_lengthlist__44u7__p9_0[] = { + 1, 3, 3,10,10,10,10,10,10,10,10, 4,10,10,10,10, + 10,10,10,10,10,10, 4,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, +@@ -8782,35 +8782,35 @@ + 9, 9, 9, 9, 9, 9, 9, 9, 9, + }; + +-static float _vq_quantthresh__44u7__p9_0[] = { ++static const float _vq_quantthresh__44u7__p9_0[] = { + -2866.5, -2229.5, -1592.5, -955.5, -318.5, 318.5, 955.5, 1592.5, + 2229.5, 2866.5, + }; + +-static long _vq_quantmap__44u7__p9_0[] = { ++static const long _vq_quantmap__44u7__p9_0[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44u7__p9_0 = { +- _vq_quantthresh__44u7__p9_0, +- _vq_quantmap__44u7__p9_0, ++static const encode_aux_threshmatch _vq_auxt__44u7__p9_0 = { ++ (float *)_vq_quantthresh__44u7__p9_0, ++ (long *)_vq_quantmap__44u7__p9_0, + 11, + 11 + }; + +-static static_codebook _44u7__p9_0 = { ++static const static_codebook _44u7__p9_0 = { + 2, 121, +- _vq_lengthlist__44u7__p9_0, ++ (long *)_vq_lengthlist__44u7__p9_0, + 1, -512171520, 1630791680, 4, 0, +- _vq_quantlist__44u7__p9_0, ++ (long *)_vq_quantlist__44u7__p9_0, + NULL, +- &_vq_auxt__44u7__p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u7__p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u7__p9_1[] = { ++static const long _vq_quantlist__44u7__p9_1[] = { + 6, + 5, + 7, +@@ -8826,7 +8826,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u7__p9_1[] = { ++static const long _vq_lengthlist__44u7__p9_1[] = { + 1, 4, 4, 6, 5, 8, 6, 9, 8,10, 9,11,10, 4, 6, 6, + 8, 8, 9, 9,11,10,11,11,11,11, 4, 6, 6, 8, 8,10, + 9,11,11,11,11,11,12, 6, 8, 8,10,10,11,11,12,12, +@@ -8840,35 +8840,35 @@ + 15,15,15,15,17,17,16,17,16, + }; + +-static float _vq_quantthresh__44u7__p9_1[] = { ++static const float _vq_quantthresh__44u7__p9_1[] = { + -269.5, -220.5, -171.5, -122.5, -73.5, -24.5, 24.5, 73.5, + 122.5, 171.5, 220.5, 269.5, + }; + +-static long _vq_quantmap__44u7__p9_1[] = { ++static const long _vq_quantmap__44u7__p9_1[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u7__p9_1 = { +- _vq_quantthresh__44u7__p9_1, +- _vq_quantmap__44u7__p9_1, ++static const encode_aux_threshmatch _vq_auxt__44u7__p9_1 = { ++ (float *)_vq_quantthresh__44u7__p9_1, ++ (long *)_vq_quantmap__44u7__p9_1, + 13, + 13 + }; + +-static static_codebook _44u7__p9_1 = { ++static const static_codebook _44u7__p9_1 = { + 2, 169, +- _vq_lengthlist__44u7__p9_1, ++ (long *)_vq_lengthlist__44u7__p9_1, + 1, -518889472, 1622704128, 4, 0, +- _vq_quantlist__44u7__p9_1, ++ (long *)_vq_quantlist__44u7__p9_1, + NULL, +- &_vq_auxt__44u7__p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u7__p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u7__p9_2[] = { ++static const long _vq_quantlist__44u7__p9_2[] = { + 24, + 23, + 25, +@@ -8920,14 +8920,14 @@ + 48, + }; + +-static long _vq_lengthlist__44u7__p9_2[] = { ++static const long _vq_lengthlist__44u7__p9_2[] = { + 2, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, + 8, + }; + +-static float _vq_quantthresh__44u7__p9_2[] = { ++static const float _vq_quantthresh__44u7__p9_2[] = { + -23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, + -15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, +@@ -8936,7 +8936,7 @@ + 16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, + }; + +-static long _vq_quantmap__44u7__p9_2[] = { ++static const long _vq_quantmap__44u7__p9_2[] = { + 47, 45, 43, 41, 39, 37, 35, 33, + 31, 29, 27, 25, 23, 21, 19, 17, + 15, 13, 11, 9, 7, 5, 3, 1, +@@ -8946,25 +8946,25 @@ + 48, + }; + +-static encode_aux_threshmatch _vq_auxt__44u7__p9_2 = { +- _vq_quantthresh__44u7__p9_2, +- _vq_quantmap__44u7__p9_2, ++static const encode_aux_threshmatch _vq_auxt__44u7__p9_2 = { ++ (float *)_vq_quantthresh__44u7__p9_2, ++ (long *)_vq_quantmap__44u7__p9_2, + 49, + 49 + }; + +-static static_codebook _44u7__p9_2 = { ++static const static_codebook _44u7__p9_2 = { + 1, 49, +- _vq_lengthlist__44u7__p9_2, ++ (long *)_vq_lengthlist__44u7__p9_2, + 1, -526909440, 1611661312, 6, 0, +- _vq_quantlist__44u7__p9_2, ++ (long *)_vq_quantlist__44u7__p9_2, + NULL, +- &_vq_auxt__44u7__p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44u7__p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44u7__short[] = { ++static const long _huff_lengthlist__44u7__short[] = { + 5,12,17,16,16,17,17,17,17,17, 4, 7,11,11,12, 9, + 17,10,17,17, 7, 7, 8, 9, 7, 9,11,10,15,17, 7, 9, + 10,11,10,12,14,12,16,17, 7, 8, 5, 7, 4, 7, 7, 8, +@@ -8974,9 +8974,9 @@ + 6, 8, 5, 9, + }; + +-static static_codebook _huff_book__44u7__short = { ++static const static_codebook _huff_book__44u7__short = { + 2, 100, +- _huff_lengthlist__44u7__short, ++ (long *)_huff_lengthlist__44u7__short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -8985,7 +8985,7 @@ + 0 + }; + +-static long _huff_lengthlist__44u8__long[] = { ++static const long _huff_lengthlist__44u8__long[] = { + 3, 9,13,14,14,15,14,14,15,15, 5, 4, 6, 8,10,12, + 12,14,15,15, 9, 5, 4, 5, 8,10,11,13,16,16,10, 7, + 4, 3, 5, 7, 9,11,13,13,10, 9, 7, 4, 4, 6, 8,10, +@@ -8995,9 +8995,9 @@ + 10, 8, 8, 9, + }; + +-static static_codebook _huff_book__44u8__long = { ++static const static_codebook _huff_book__44u8__long = { + 2, 100, +- _huff_lengthlist__44u8__long, ++ (long *)_huff_lengthlist__44u8__long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -9006,7 +9006,7 @@ + 0 + }; + +-static long _huff_lengthlist__44u8__short[] = { ++static const long _huff_lengthlist__44u8__short[] = { + 6,14,18,18,17,17,17,17,17,17, 4, 7, 9, 9,10,13, + 15,17,17,17, 6, 7, 5, 6, 8,11,16,17,16,17, 5, 7, + 5, 4, 6,10,14,17,17,17, 6, 6, 6, 5, 7,10,13,16, +@@ -9016,9 +9016,9 @@ + 10,10,15,17, + }; + +-static static_codebook _huff_book__44u8__short = { ++static const static_codebook _huff_book__44u8__short = { + 2, 100, +- _huff_lengthlist__44u8__short, ++ (long *)_huff_lengthlist__44u8__short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -9027,13 +9027,13 @@ + 0 + }; + +-static long _vq_quantlist__44u8_p1_0[] = { ++static const long _vq_quantlist__44u8_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u8_p1_0[] = { ++static const long _vq_lengthlist__44u8_p1_0[] = { + 1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 8, 9, 9, 7, + 9, 9, 5, 7, 7, 7, 9, 9, 8, 9, 9, 5, 7, 7, 7, 9, + 9, 7, 9, 9, 7, 9, 9, 9,10,11, 9,11,10, 7, 9, 9, +@@ -9042,33 +9042,33 @@ + 10, + }; + +-static float _vq_quantthresh__44u8_p1_0[] = { ++static const float _vq_quantthresh__44u8_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u8_p1_0[] = { ++static const long _vq_quantmap__44u8_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u8_p1_0 = { +- _vq_quantthresh__44u8_p1_0, +- _vq_quantmap__44u8_p1_0, ++static const encode_aux_threshmatch _vq_auxt__44u8_p1_0 = { ++ (float *)_vq_quantthresh__44u8_p1_0, ++ (long *)_vq_quantmap__44u8_p1_0, + 3, + 3 + }; + +-static static_codebook _44u8_p1_0 = { ++static const static_codebook _44u8_p1_0 = { + 4, 81, +- _vq_lengthlist__44u8_p1_0, ++ (long *)_vq_lengthlist__44u8_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u8_p1_0, ++ (long *)_vq_quantlist__44u8_p1_0, + NULL, +- &_vq_auxt__44u8_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u8_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u8_p2_0[] = { ++static const long _vq_quantlist__44u8_p2_0[] = { + 2, + 1, + 3, +@@ -9076,7 +9076,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u8_p2_0[] = { ++static const long _vq_lengthlist__44u8_p2_0[] = { + 4, 5, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8, + 9, 9,11,11, 8, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8, + 8,10,10, 7, 8, 8,10,10, 9,10,10,12,12, 9,10,10, +@@ -9119,33 +9119,33 @@ + 14, + }; + +-static float _vq_quantthresh__44u8_p2_0[] = { ++static const float _vq_quantthresh__44u8_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u8_p2_0[] = { ++static const long _vq_quantmap__44u8_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u8_p2_0 = { +- _vq_quantthresh__44u8_p2_0, +- _vq_quantmap__44u8_p2_0, ++static const encode_aux_threshmatch _vq_auxt__44u8_p2_0 = { ++ (float *)_vq_quantthresh__44u8_p2_0, ++ (long *)_vq_quantmap__44u8_p2_0, + 5, + 5 + }; + +-static static_codebook _44u8_p2_0 = { ++static const static_codebook _44u8_p2_0 = { + 4, 625, +- _vq_lengthlist__44u8_p2_0, ++ (long *)_vq_lengthlist__44u8_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u8_p2_0, ++ (long *)_vq_quantlist__44u8_p2_0, + NULL, +- &_vq_auxt__44u8_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u8_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u8_p3_0[] = { ++static const long _vq_quantlist__44u8_p3_0[] = { + 4, + 3, + 5, +@@ -9157,7 +9157,7 @@ + 8, + }; + +-static long _vq_lengthlist__44u8_p3_0[] = { ++static const long _vq_lengthlist__44u8_p3_0[] = { + 3, 4, 4, 5, 5, 7, 7, 9, 9, 4, 5, 4, 6, 6, 7, 7, + 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 7, + 8, 8,10,10, 6, 6, 6, 7, 7, 8, 8,10,10, 7, 7, 7, +@@ -9166,34 +9166,34 @@ + 12, + }; + +-static float _vq_quantthresh__44u8_p3_0[] = { ++static const float _vq_quantthresh__44u8_p3_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44u8_p3_0[] = { ++static const long _vq_quantmap__44u8_p3_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44u8_p3_0 = { +- _vq_quantthresh__44u8_p3_0, +- _vq_quantmap__44u8_p3_0, ++static const encode_aux_threshmatch _vq_auxt__44u8_p3_0 = { ++ (float *)_vq_quantthresh__44u8_p3_0, ++ (long *)_vq_quantmap__44u8_p3_0, + 9, + 9 + }; + +-static static_codebook _44u8_p3_0 = { ++static const static_codebook _44u8_p3_0 = { + 2, 81, +- _vq_lengthlist__44u8_p3_0, ++ (long *)_vq_lengthlist__44u8_p3_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44u8_p3_0, ++ (long *)_vq_quantlist__44u8_p3_0, + NULL, +- &_vq_auxt__44u8_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u8_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u8_p4_0[] = { ++static const long _vq_quantlist__44u8_p4_0[] = { + 8, + 7, + 9, +@@ -9213,7 +9213,7 @@ + 16, + }; + +-static long _vq_lengthlist__44u8_p4_0[] = { ++static const long _vq_lengthlist__44u8_p4_0[] = { + 4, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,10,10,11,11,11, + 11, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11, + 12,12, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11, +@@ -9235,42 +9235,42 @@ + 14, + }; + +-static float _vq_quantthresh__44u8_p4_0[] = { ++static const float _vq_quantthresh__44u8_p4_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44u8_p4_0[] = { ++static const long _vq_quantmap__44u8_p4_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44u8_p4_0 = { +- _vq_quantthresh__44u8_p4_0, +- _vq_quantmap__44u8_p4_0, ++static const encode_aux_threshmatch _vq_auxt__44u8_p4_0 = { ++ (float *)_vq_quantthresh__44u8_p4_0, ++ (long *)_vq_quantmap__44u8_p4_0, + 17, + 17 + }; + +-static static_codebook _44u8_p4_0 = { ++static const static_codebook _44u8_p4_0 = { + 2, 289, +- _vq_lengthlist__44u8_p4_0, ++ (long *)_vq_lengthlist__44u8_p4_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44u8_p4_0, ++ (long *)_vq_quantlist__44u8_p4_0, + NULL, +- &_vq_auxt__44u8_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u8_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u8_p5_0[] = { ++static const long _vq_quantlist__44u8_p5_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u8_p5_0[] = { ++static const long _vq_lengthlist__44u8_p5_0[] = { + 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 8, 9, 9, 7, + 9, 9, 5, 8, 8, 7, 9, 9, 8, 9, 9, 5, 8, 8, 8,10, + 10, 8,10,10, 7,10,10, 9,10,12, 9,12,11, 7,10,10, +@@ -9279,33 +9279,33 @@ + 10, + }; + +-static float _vq_quantthresh__44u8_p5_0[] = { ++static const float _vq_quantthresh__44u8_p5_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44u8_p5_0[] = { ++static const long _vq_quantmap__44u8_p5_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u8_p5_0 = { +- _vq_quantthresh__44u8_p5_0, +- _vq_quantmap__44u8_p5_0, ++static const encode_aux_threshmatch _vq_auxt__44u8_p5_0 = { ++ (float *)_vq_quantthresh__44u8_p5_0, ++ (long *)_vq_quantmap__44u8_p5_0, + 3, + 3 + }; + +-static static_codebook _44u8_p5_0 = { ++static const static_codebook _44u8_p5_0 = { + 4, 81, +- _vq_lengthlist__44u8_p5_0, ++ (long *)_vq_lengthlist__44u8_p5_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44u8_p5_0, ++ (long *)_vq_quantlist__44u8_p5_0, + NULL, +- &_vq_auxt__44u8_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u8_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u8_p5_1[] = { ++static const long _vq_quantlist__44u8_p5_1[] = { + 5, + 4, + 6, +@@ -9319,7 +9319,7 @@ + 10, + }; + +-static long _vq_lengthlist__44u8_p5_1[] = { ++static const long _vq_lengthlist__44u8_p5_1[] = { + 4, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 5, 5, 5, 6, 6, + 7, 7, 8, 8, 8, 8, 5, 5, 5, 6, 6, 7, 7, 7, 8, 8, + 8, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 6, 6, 6, 7, +@@ -9330,35 +9330,35 @@ + 8, 8, 8, 8, 8, 8, 8, 9, 9, + }; + +-static float _vq_quantthresh__44u8_p5_1[] = { ++static const float _vq_quantthresh__44u8_p5_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44u8_p5_1[] = { ++static const long _vq_quantmap__44u8_p5_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44u8_p5_1 = { +- _vq_quantthresh__44u8_p5_1, +- _vq_quantmap__44u8_p5_1, ++static const encode_aux_threshmatch _vq_auxt__44u8_p5_1 = { ++ (float *)_vq_quantthresh__44u8_p5_1, ++ (long *)_vq_quantmap__44u8_p5_1, + 11, + 11 + }; + +-static static_codebook _44u8_p5_1 = { ++static const static_codebook _44u8_p5_1 = { + 2, 121, +- _vq_lengthlist__44u8_p5_1, ++ (long *)_vq_lengthlist__44u8_p5_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44u8_p5_1, ++ (long *)_vq_quantlist__44u8_p5_1, + NULL, +- &_vq_auxt__44u8_p5_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u8_p5_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u8_p6_0[] = { ++static const long _vq_quantlist__44u8_p6_0[] = { + 6, + 5, + 7, +@@ -9374,7 +9374,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u8_p6_0[] = { ++static const long _vq_lengthlist__44u8_p6_0[] = { + 2, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 4, 6, 5, + 7, 7, 8, 8, 8, 8, 9, 9,10,10, 4, 6, 6, 7, 7, 8, + 8, 8, 8, 9, 9,10,10, 6, 7, 7, 7, 8, 8, 8, 8, 9, +@@ -9388,35 +9388,35 @@ + 11,11,11,11,11,12,11,12,12, + }; + +-static float _vq_quantthresh__44u8_p6_0[] = { ++static const float _vq_quantthresh__44u8_p6_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44u8_p6_0[] = { ++static const long _vq_quantmap__44u8_p6_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u8_p6_0 = { +- _vq_quantthresh__44u8_p6_0, +- _vq_quantmap__44u8_p6_0, ++static const encode_aux_threshmatch _vq_auxt__44u8_p6_0 = { ++ (float *)_vq_quantthresh__44u8_p6_0, ++ (long *)_vq_quantmap__44u8_p6_0, + 13, + 13 + }; + +-static static_codebook _44u8_p6_0 = { ++static const static_codebook _44u8_p6_0 = { + 2, 169, +- _vq_lengthlist__44u8_p6_0, ++ (long *)_vq_lengthlist__44u8_p6_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44u8_p6_0, ++ (long *)_vq_quantlist__44u8_p6_0, + NULL, +- &_vq_auxt__44u8_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u8_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u8_p6_1[] = { ++static const long _vq_quantlist__44u8_p6_1[] = { + 2, + 1, + 3, +@@ -9424,38 +9424,38 @@ + 4, + }; + +-static long _vq_lengthlist__44u8_p6_1[] = { ++static const long _vq_lengthlist__44u8_p6_1[] = { + 3, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, + }; + +-static float _vq_quantthresh__44u8_p6_1[] = { ++static const float _vq_quantthresh__44u8_p6_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u8_p6_1[] = { ++static const long _vq_quantmap__44u8_p6_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u8_p6_1 = { +- _vq_quantthresh__44u8_p6_1, +- _vq_quantmap__44u8_p6_1, ++static const encode_aux_threshmatch _vq_auxt__44u8_p6_1 = { ++ (float *)_vq_quantthresh__44u8_p6_1, ++ (long *)_vq_quantmap__44u8_p6_1, + 5, + 5 + }; + +-static static_codebook _44u8_p6_1 = { ++static const static_codebook _44u8_p6_1 = { + 2, 25, +- _vq_lengthlist__44u8_p6_1, ++ (long *)_vq_lengthlist__44u8_p6_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u8_p6_1, ++ (long *)_vq_quantlist__44u8_p6_1, + NULL, +- &_vq_auxt__44u8_p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u8_p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u8_p7_0[] = { ++static const long _vq_quantlist__44u8_p7_0[] = { + 6, + 5, + 7, +@@ -9471,7 +9471,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u8_p7_0[] = { ++static const long _vq_lengthlist__44u8_p7_0[] = { + 1, 4, 5, 6, 6, 7, 7, 8, 8,10,10,11,11, 5, 6, 6, + 7, 7, 8, 8, 9, 9,11,10,12,11, 5, 6, 6, 7, 7, 8, + 8, 9, 9,10,11,11,12, 6, 7, 7, 8, 8, 9, 9,10,10, +@@ -9485,35 +9485,35 @@ + 13,13,14,14,14,15,15,15,16, + }; + +-static float _vq_quantthresh__44u8_p7_0[] = { ++static const float _vq_quantthresh__44u8_p7_0[] = { + -60.5, -49.5, -38.5, -27.5, -16.5, -5.5, 5.5, 16.5, + 27.5, 38.5, 49.5, 60.5, + }; + +-static long _vq_quantmap__44u8_p7_0[] = { ++static const long _vq_quantmap__44u8_p7_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u8_p7_0 = { +- _vq_quantthresh__44u8_p7_0, +- _vq_quantmap__44u8_p7_0, ++static const encode_aux_threshmatch _vq_auxt__44u8_p7_0 = { ++ (float *)_vq_quantthresh__44u8_p7_0, ++ (long *)_vq_quantmap__44u8_p7_0, + 13, + 13 + }; + +-static static_codebook _44u8_p7_0 = { ++static const static_codebook _44u8_p7_0 = { + 2, 169, +- _vq_lengthlist__44u8_p7_0, ++ (long *)_vq_lengthlist__44u8_p7_0, + 1, -523206656, 1618345984, 4, 0, +- _vq_quantlist__44u8_p7_0, ++ (long *)_vq_quantlist__44u8_p7_0, + NULL, +- &_vq_auxt__44u8_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u8_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u8_p7_1[] = { ++static const long _vq_quantlist__44u8_p7_1[] = { + 5, + 4, + 6, +@@ -9527,7 +9527,7 @@ + 10, + }; + +-static long _vq_lengthlist__44u8_p7_1[] = { ++static const long _vq_lengthlist__44u8_p7_1[] = { + 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 6, 7, 7, + 7, 7, 7, 7, 7, 7, 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, + 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 6, 7, 7, 7, +@@ -9538,35 +9538,35 @@ + 7, 8, 8, 8, 8, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__44u8_p7_1[] = { ++static const float _vq_quantthresh__44u8_p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44u8_p7_1[] = { ++static const long _vq_quantmap__44u8_p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44u8_p7_1 = { +- _vq_quantthresh__44u8_p7_1, +- _vq_quantmap__44u8_p7_1, ++static const encode_aux_threshmatch _vq_auxt__44u8_p7_1 = { ++ (float *)_vq_quantthresh__44u8_p7_1, ++ (long *)_vq_quantmap__44u8_p7_1, + 11, + 11 + }; + +-static static_codebook _44u8_p7_1 = { ++static const static_codebook _44u8_p7_1 = { + 2, 121, +- _vq_lengthlist__44u8_p7_1, ++ (long *)_vq_lengthlist__44u8_p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44u8_p7_1, ++ (long *)_vq_quantlist__44u8_p7_1, + NULL, +- &_vq_auxt__44u8_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u8_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u8_p8_0[] = { ++static const long _vq_quantlist__44u8_p8_0[] = { + 7, + 6, + 8, +@@ -9584,7 +9584,7 @@ + 14, + }; + +-static long _vq_lengthlist__44u8_p8_0[] = { ++static const long _vq_lengthlist__44u8_p8_0[] = { + 1, 4, 4, 7, 7, 8, 8, 8, 7, 9, 8,10, 9,11,10, 4, + 6, 6, 8, 8,10, 9, 9, 9,10,10,11,10,12,10, 4, 6, + 6, 8, 8,10,10, 9, 9,10,10,11,11,11,12, 7, 8, 8, +@@ -9602,35 +9602,35 @@ + 17, + }; + +-static float _vq_quantthresh__44u8_p8_0[] = { ++static const float _vq_quantthresh__44u8_p8_0[] = { + -136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, + 31.5, 52.5, 73.5, 94.5, 115.5, 136.5, + }; + +-static long _vq_quantmap__44u8_p8_0[] = { ++static const long _vq_quantmap__44u8_p8_0[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__44u8_p8_0 = { +- _vq_quantthresh__44u8_p8_0, +- _vq_quantmap__44u8_p8_0, ++static const encode_aux_threshmatch _vq_auxt__44u8_p8_0 = { ++ (float *)_vq_quantthresh__44u8_p8_0, ++ (long *)_vq_quantmap__44u8_p8_0, + 15, + 15 + }; + +-static static_codebook _44u8_p8_0 = { ++static const static_codebook _44u8_p8_0 = { + 2, 225, +- _vq_lengthlist__44u8_p8_0, ++ (long *)_vq_lengthlist__44u8_p8_0, + 1, -520986624, 1620377600, 4, 0, +- _vq_quantlist__44u8_p8_0, ++ (long *)_vq_quantlist__44u8_p8_0, + NULL, +- &_vq_auxt__44u8_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u8_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u8_p8_1[] = { ++static const long _vq_quantlist__44u8_p8_1[] = { + 10, + 9, + 11, +@@ -9654,7 +9654,7 @@ + 20, + }; + +-static long _vq_lengthlist__44u8_p8_1[] = { ++static const long _vq_lengthlist__44u8_p8_1[] = { + 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 6, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, +@@ -9685,37 +9685,37 @@ + 10,10,10,10,10,10,10,10,10, + }; + +-static float _vq_quantthresh__44u8_p8_1[] = { ++static const float _vq_quantthresh__44u8_p8_1[] = { + -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, + -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, + 6.5, 7.5, 8.5, 9.5, + }; + +-static long _vq_quantmap__44u8_p8_1[] = { ++static const long _vq_quantmap__44u8_p8_1[] = { + 19, 17, 15, 13, 11, 9, 7, 5, + 3, 1, 0, 2, 4, 6, 8, 10, + 12, 14, 16, 18, 20, + }; + +-static encode_aux_threshmatch _vq_auxt__44u8_p8_1 = { +- _vq_quantthresh__44u8_p8_1, +- _vq_quantmap__44u8_p8_1, ++static const encode_aux_threshmatch _vq_auxt__44u8_p8_1 = { ++ (float *)_vq_quantthresh__44u8_p8_1, ++ (long *)_vq_quantmap__44u8_p8_1, + 21, + 21 + }; + +-static static_codebook _44u8_p8_1 = { ++static const static_codebook _44u8_p8_1 = { + 2, 441, +- _vq_lengthlist__44u8_p8_1, ++ (long *)_vq_lengthlist__44u8_p8_1, + 1, -529268736, 1611661312, 5, 0, +- _vq_quantlist__44u8_p8_1, ++ (long *)_vq_quantlist__44u8_p8_1, + NULL, +- &_vq_auxt__44u8_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u8_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u8_p9_0[] = { ++static const long _vq_quantlist__44u8_p9_0[] = { + 4, + 3, + 5, +@@ -9727,7 +9727,7 @@ + 8, + }; + +-static long _vq_lengthlist__44u8_p9_0[] = { ++static const long _vq_lengthlist__44u8_p9_0[] = { + 1, 3, 3, 9, 9, 9, 9, 9, 9, 4, 9, 9, 9, 9, 9, 9, + 9, 9, 5, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, +@@ -9736,34 +9736,34 @@ + 8, + }; + +-static float _vq_quantthresh__44u8_p9_0[] = { ++static const float _vq_quantthresh__44u8_p9_0[] = { + -3258.5, -2327.5, -1396.5, -465.5, 465.5, 1396.5, 2327.5, 3258.5, + }; + +-static long _vq_quantmap__44u8_p9_0[] = { ++static const long _vq_quantmap__44u8_p9_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44u8_p9_0 = { +- _vq_quantthresh__44u8_p9_0, +- _vq_quantmap__44u8_p9_0, ++static const encode_aux_threshmatch _vq_auxt__44u8_p9_0 = { ++ (float *)_vq_quantthresh__44u8_p9_0, ++ (long *)_vq_quantmap__44u8_p9_0, + 9, + 9 + }; + +-static static_codebook _44u8_p9_0 = { ++static const static_codebook _44u8_p9_0 = { + 2, 81, +- _vq_lengthlist__44u8_p9_0, ++ (long *)_vq_lengthlist__44u8_p9_0, + 1, -511895552, 1631393792, 4, 0, +- _vq_quantlist__44u8_p9_0, ++ (long *)_vq_quantlist__44u8_p9_0, + NULL, +- &_vq_auxt__44u8_p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u8_p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u8_p9_1[] = { ++static const long _vq_quantlist__44u8_p9_1[] = { + 9, + 8, + 10, +@@ -9785,7 +9785,7 @@ + 18, + }; + +-static long _vq_lengthlist__44u8_p9_1[] = { ++static const long _vq_lengthlist__44u8_p9_1[] = { + 1, 4, 4, 7, 7, 8, 7, 8, 6, 9, 7,10, 8,11,10,11, + 11,11,11, 4, 7, 6, 9, 9,10, 9, 9, 9,10,10,11,10, + 11,10,11,11,13,11, 4, 7, 7, 9, 9, 9, 9, 9, 9,10, +@@ -9811,37 +9811,37 @@ + 16,15,16,16,16,16,16,16,16, + }; + +-static float _vq_quantthresh__44u8_p9_1[] = { ++static const float _vq_quantthresh__44u8_p9_1[] = { + -416.5, -367.5, -318.5, -269.5, -220.5, -171.5, -122.5, -73.5, + -24.5, 24.5, 73.5, 122.5, 171.5, 220.5, 269.5, 318.5, + 367.5, 416.5, + }; + +-static long _vq_quantmap__44u8_p9_1[] = { ++static const long _vq_quantmap__44u8_p9_1[] = { + 17, 15, 13, 11, 9, 7, 5, 3, + 1, 0, 2, 4, 6, 8, 10, 12, + 14, 16, 18, + }; + +-static encode_aux_threshmatch _vq_auxt__44u8_p9_1 = { +- _vq_quantthresh__44u8_p9_1, +- _vq_quantmap__44u8_p9_1, ++static const encode_aux_threshmatch _vq_auxt__44u8_p9_1 = { ++ (float *)_vq_quantthresh__44u8_p9_1, ++ (long *)_vq_quantmap__44u8_p9_1, + 19, + 19 + }; + +-static static_codebook _44u8_p9_1 = { ++static const static_codebook _44u8_p9_1 = { + 2, 361, +- _vq_lengthlist__44u8_p9_1, ++ (long *)_vq_lengthlist__44u8_p9_1, + 1, -518287360, 1622704128, 5, 0, +- _vq_quantlist__44u8_p9_1, ++ (long *)_vq_quantlist__44u8_p9_1, + NULL, +- &_vq_auxt__44u8_p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u8_p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u8_p9_2[] = { ++static const long _vq_quantlist__44u8_p9_2[] = { + 24, + 23, + 25, +@@ -9893,14 +9893,14 @@ + 48, + }; + +-static long _vq_lengthlist__44u8_p9_2[] = { ++static const long _vq_lengthlist__44u8_p9_2[] = { + 2, 3, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, + }; + +-static float _vq_quantthresh__44u8_p9_2[] = { ++static const float _vq_quantthresh__44u8_p9_2[] = { + -23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, + -15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, +@@ -9909,7 +9909,7 @@ + 16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, + }; + +-static long _vq_quantmap__44u8_p9_2[] = { ++static const long _vq_quantmap__44u8_p9_2[] = { + 47, 45, 43, 41, 39, 37, 35, 33, + 31, 29, 27, 25, 23, 21, 19, 17, + 15, 13, 11, 9, 7, 5, 3, 1, +@@ -9919,25 +9919,25 @@ + 48, + }; + +-static encode_aux_threshmatch _vq_auxt__44u8_p9_2 = { +- _vq_quantthresh__44u8_p9_2, +- _vq_quantmap__44u8_p9_2, ++static const encode_aux_threshmatch _vq_auxt__44u8_p9_2 = { ++ (float *)_vq_quantthresh__44u8_p9_2, ++ (long *)_vq_quantmap__44u8_p9_2, + 49, + 49 + }; + +-static static_codebook _44u8_p9_2 = { ++static const static_codebook _44u8_p9_2 = { + 1, 49, +- _vq_lengthlist__44u8_p9_2, ++ (long *)_vq_lengthlist__44u8_p9_2, + 1, -526909440, 1611661312, 6, 0, +- _vq_quantlist__44u8_p9_2, ++ (long *)_vq_quantlist__44u8_p9_2, + NULL, +- &_vq_auxt__44u8_p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44u8_p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44u9__long[] = { ++static const long _huff_lengthlist__44u9__long[] = { + 3, 9,13,13,14,15,14,14,15,15, 5, 5, 9,10,12,12, + 13,14,16,15,10, 6, 6, 6, 8,11,12,13,16,15,11, 7, + 5, 3, 5, 8,10,12,15,15,10,10, 7, 4, 3, 5, 8,10, +@@ -9947,9 +9947,9 @@ + 10, 8, 8, 9, + }; + +-static static_codebook _huff_book__44u9__long = { ++static const static_codebook _huff_book__44u9__long = { + 2, 100, +- _huff_lengthlist__44u9__long, ++ (long *)_huff_lengthlist__44u9__long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -9958,7 +9958,7 @@ + 0 + }; + +-static long _huff_lengthlist__44u9__short[] = { ++static const long _huff_lengthlist__44u9__short[] = { + 9,16,18,18,17,17,17,17,17,17, 5, 8,11,12,11,12, + 17,17,16,16, 6, 6, 8, 8, 9,10,14,15,16,16, 6, 7, + 7, 4, 6, 9,13,16,16,16, 6, 6, 7, 4, 5, 8,11,15, +@@ -9968,9 +9968,9 @@ + 9, 9,12,15, + }; + +-static static_codebook _huff_book__44u9__short = { ++static const static_codebook _huff_book__44u9__short = { + 2, 100, +- _huff_lengthlist__44u9__short, ++ (long *)_huff_lengthlist__44u9__short, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -9979,13 +9979,13 @@ + 0 + }; + +-static long _vq_quantlist__44u9_p1_0[] = { ++static const long _vq_quantlist__44u9_p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u9_p1_0[] = { ++static const long _vq_lengthlist__44u9_p1_0[] = { + 1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 9, 9, 7, + 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 9, 5, 7, 7, 7, 9, + 9, 7, 9, 9, 8, 9, 9, 9,10,11, 9,11,11, 7, 9, 9, +@@ -9994,33 +9994,33 @@ + 10, + }; + +-static float _vq_quantthresh__44u9_p1_0[] = { ++static const float _vq_quantthresh__44u9_p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44u9_p1_0[] = { ++static const long _vq_quantmap__44u9_p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u9_p1_0 = { +- _vq_quantthresh__44u9_p1_0, +- _vq_quantmap__44u9_p1_0, ++static const encode_aux_threshmatch _vq_auxt__44u9_p1_0 = { ++ (float *)_vq_quantthresh__44u9_p1_0, ++ (long *)_vq_quantmap__44u9_p1_0, + 3, + 3 + }; + +-static static_codebook _44u9_p1_0 = { ++static const static_codebook _44u9_p1_0 = { + 4, 81, +- _vq_lengthlist__44u9_p1_0, ++ (long *)_vq_lengthlist__44u9_p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44u9_p1_0, ++ (long *)_vq_quantlist__44u9_p1_0, + NULL, +- &_vq_auxt__44u9_p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u9_p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u9_p2_0[] = { ++static const long _vq_quantlist__44u9_p2_0[] = { + 2, + 1, + 3, +@@ -10028,7 +10028,7 @@ + 4, + }; + +-static long _vq_lengthlist__44u9_p2_0[] = { ++static const long _vq_lengthlist__44u9_p2_0[] = { + 3, 5, 5, 8, 8, 5, 7, 7, 9, 9, 6, 7, 7, 9, 9, 8, + 9, 9,11,10, 8, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 8, + 8,10,10, 7, 8, 8, 9,10, 9,10,10,11,11, 9, 9,10, +@@ -10071,33 +10071,33 @@ + 14, + }; + +-static float _vq_quantthresh__44u9_p2_0[] = { ++static const float _vq_quantthresh__44u9_p2_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u9_p2_0[] = { ++static const long _vq_quantmap__44u9_p2_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u9_p2_0 = { +- _vq_quantthresh__44u9_p2_0, +- _vq_quantmap__44u9_p2_0, ++static const encode_aux_threshmatch _vq_auxt__44u9_p2_0 = { ++ (float *)_vq_quantthresh__44u9_p2_0, ++ (long *)_vq_quantmap__44u9_p2_0, + 5, + 5 + }; + +-static static_codebook _44u9_p2_0 = { ++static const static_codebook _44u9_p2_0 = { + 4, 625, +- _vq_lengthlist__44u9_p2_0, ++ (long *)_vq_lengthlist__44u9_p2_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u9_p2_0, ++ (long *)_vq_quantlist__44u9_p2_0, + NULL, +- &_vq_auxt__44u9_p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u9_p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u9_p3_0[] = { ++static const long _vq_quantlist__44u9_p3_0[] = { + 4, + 3, + 5, +@@ -10109,7 +10109,7 @@ + 8, + }; + +-static long _vq_lengthlist__44u9_p3_0[] = { ++static const long _vq_lengthlist__44u9_p3_0[] = { + 3, 4, 4, 5, 5, 7, 7, 8, 8, 4, 5, 5, 6, 6, 7, 7, + 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 7, + 8, 8, 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 9, 7, 7, 7, +@@ -10118,34 +10118,34 @@ + 11, + }; + +-static float _vq_quantthresh__44u9_p3_0[] = { ++static const float _vq_quantthresh__44u9_p3_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44u9_p3_0[] = { ++static const long _vq_quantmap__44u9_p3_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44u9_p3_0 = { +- _vq_quantthresh__44u9_p3_0, +- _vq_quantmap__44u9_p3_0, ++static const encode_aux_threshmatch _vq_auxt__44u9_p3_0 = { ++ (float *)_vq_quantthresh__44u9_p3_0, ++ (long *)_vq_quantmap__44u9_p3_0, + 9, + 9 + }; + +-static static_codebook _44u9_p3_0 = { ++static const static_codebook _44u9_p3_0 = { + 2, 81, +- _vq_lengthlist__44u9_p3_0, ++ (long *)_vq_lengthlist__44u9_p3_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44u9_p3_0, ++ (long *)_vq_quantlist__44u9_p3_0, + NULL, +- &_vq_auxt__44u9_p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u9_p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u9_p4_0[] = { ++static const long _vq_quantlist__44u9_p4_0[] = { + 8, + 7, + 9, +@@ -10165,7 +10165,7 @@ + 16, + }; + +-static long _vq_lengthlist__44u9_p4_0[] = { ++static const long _vq_lengthlist__44u9_p4_0[] = { + 4, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, + 11, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10, + 11,11, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10, +@@ -10187,42 +10187,42 @@ + 14, + }; + +-static float _vq_quantthresh__44u9_p4_0[] = { ++static const float _vq_quantthresh__44u9_p4_0[] = { + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, + 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, + }; + +-static long _vq_quantmap__44u9_p4_0[] = { ++static const long _vq_quantmap__44u9_p4_0[] = { + 15, 13, 11, 9, 7, 5, 3, 1, + 0, 2, 4, 6, 8, 10, 12, 14, + 16, + }; + +-static encode_aux_threshmatch _vq_auxt__44u9_p4_0 = { +- _vq_quantthresh__44u9_p4_0, +- _vq_quantmap__44u9_p4_0, ++static const encode_aux_threshmatch _vq_auxt__44u9_p4_0 = { ++ (float *)_vq_quantthresh__44u9_p4_0, ++ (long *)_vq_quantmap__44u9_p4_0, + 17, + 17 + }; + +-static static_codebook _44u9_p4_0 = { ++static const static_codebook _44u9_p4_0 = { + 2, 289, +- _vq_lengthlist__44u9_p4_0, ++ (long *)_vq_lengthlist__44u9_p4_0, + 1, -529530880, 1611661312, 5, 0, +- _vq_quantlist__44u9_p4_0, ++ (long *)_vq_quantlist__44u9_p4_0, + NULL, +- &_vq_auxt__44u9_p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u9_p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u9_p5_0[] = { ++static const long _vq_quantlist__44u9_p5_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44u9_p5_0[] = { ++static const long _vq_lengthlist__44u9_p5_0[] = { + 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 8, 9, 9, 7, + 9, 9, 5, 8, 8, 7, 9, 9, 8, 9, 9, 5, 8, 8, 8,10, + 10, 8,10,10, 7,10,10, 9,10,12, 9,11,11, 7,10,10, +@@ -10231,33 +10231,33 @@ + 10, + }; + +-static float _vq_quantthresh__44u9_p5_0[] = { ++static const float _vq_quantthresh__44u9_p5_0[] = { + -5.5, 5.5, + }; + +-static long _vq_quantmap__44u9_p5_0[] = { ++static const long _vq_quantmap__44u9_p5_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44u9_p5_0 = { +- _vq_quantthresh__44u9_p5_0, +- _vq_quantmap__44u9_p5_0, ++static const encode_aux_threshmatch _vq_auxt__44u9_p5_0 = { ++ (float *)_vq_quantthresh__44u9_p5_0, ++ (long *)_vq_quantmap__44u9_p5_0, + 3, + 3 + }; + +-static static_codebook _44u9_p5_0 = { ++static const static_codebook _44u9_p5_0 = { + 4, 81, +- _vq_lengthlist__44u9_p5_0, ++ (long *)_vq_lengthlist__44u9_p5_0, + 1, -529137664, 1618345984, 2, 0, +- _vq_quantlist__44u9_p5_0, ++ (long *)_vq_quantlist__44u9_p5_0, + NULL, +- &_vq_auxt__44u9_p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u9_p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u9_p5_1[] = { ++static const long _vq_quantlist__44u9_p5_1[] = { + 5, + 4, + 6, +@@ -10271,7 +10271,7 @@ + 10, + }; + +-static long _vq_lengthlist__44u9_p5_1[] = { ++static const long _vq_lengthlist__44u9_p5_1[] = { + 5, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 6, 6, 6, + 7, 7, 7, 7, 8, 7, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, + 7, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 6, 6, 6, 7, +@@ -10282,35 +10282,35 @@ + 8, 8, 8, 8, 8, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__44u9_p5_1[] = { ++static const float _vq_quantthresh__44u9_p5_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44u9_p5_1[] = { ++static const long _vq_quantmap__44u9_p5_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44u9_p5_1 = { +- _vq_quantthresh__44u9_p5_1, +- _vq_quantmap__44u9_p5_1, ++static const encode_aux_threshmatch _vq_auxt__44u9_p5_1 = { ++ (float *)_vq_quantthresh__44u9_p5_1, ++ (long *)_vq_quantmap__44u9_p5_1, + 11, + 11 + }; + +-static static_codebook _44u9_p5_1 = { ++static const static_codebook _44u9_p5_1 = { + 2, 121, +- _vq_lengthlist__44u9_p5_1, ++ (long *)_vq_lengthlist__44u9_p5_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44u9_p5_1, ++ (long *)_vq_quantlist__44u9_p5_1, + NULL, +- &_vq_auxt__44u9_p5_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u9_p5_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u9_p6_0[] = { ++static const long _vq_quantlist__44u9_p6_0[] = { + 6, + 5, + 7, +@@ -10326,7 +10326,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u9_p6_0[] = { ++static const long _vq_lengthlist__44u9_p6_0[] = { + 2, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 4, 6, 5, + 7, 7, 8, 8, 8, 8, 9, 9,10,10, 4, 5, 6, 7, 7, 8, + 8, 8, 8, 9, 9,10,10, 6, 7, 7, 8, 8, 8, 8, 9, 9, +@@ -10340,35 +10340,35 @@ + 10,11,11,11,11,12,11,12,12, + }; + +-static float _vq_quantthresh__44u9_p6_0[] = { ++static const float _vq_quantthresh__44u9_p6_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44u9_p6_0[] = { ++static const long _vq_quantmap__44u9_p6_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u9_p6_0 = { +- _vq_quantthresh__44u9_p6_0, +- _vq_quantmap__44u9_p6_0, ++static const encode_aux_threshmatch _vq_auxt__44u9_p6_0 = { ++ (float *)_vq_quantthresh__44u9_p6_0, ++ (long *)_vq_quantmap__44u9_p6_0, + 13, + 13 + }; + +-static static_codebook _44u9_p6_0 = { ++static const static_codebook _44u9_p6_0 = { + 2, 169, +- _vq_lengthlist__44u9_p6_0, ++ (long *)_vq_lengthlist__44u9_p6_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44u9_p6_0, ++ (long *)_vq_quantlist__44u9_p6_0, + NULL, +- &_vq_auxt__44u9_p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u9_p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u9_p6_1[] = { ++static const long _vq_quantlist__44u9_p6_1[] = { + 2, + 1, + 3, +@@ -10376,38 +10376,38 @@ + 4, + }; + +-static long _vq_lengthlist__44u9_p6_1[] = { ++static const long _vq_lengthlist__44u9_p6_1[] = { + 4, 4, 4, 5, 5, 4, 5, 4, 5, 5, 4, 4, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, + }; + +-static float _vq_quantthresh__44u9_p6_1[] = { ++static const float _vq_quantthresh__44u9_p6_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44u9_p6_1[] = { ++static const long _vq_quantmap__44u9_p6_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44u9_p6_1 = { +- _vq_quantthresh__44u9_p6_1, +- _vq_quantmap__44u9_p6_1, ++static const encode_aux_threshmatch _vq_auxt__44u9_p6_1 = { ++ (float *)_vq_quantthresh__44u9_p6_1, ++ (long *)_vq_quantmap__44u9_p6_1, + 5, + 5 + }; + +-static static_codebook _44u9_p6_1 = { ++static const static_codebook _44u9_p6_1 = { + 2, 25, +- _vq_lengthlist__44u9_p6_1, ++ (long *)_vq_lengthlist__44u9_p6_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44u9_p6_1, ++ (long *)_vq_quantlist__44u9_p6_1, + NULL, +- &_vq_auxt__44u9_p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u9_p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u9_p7_0[] = { ++static const long _vq_quantlist__44u9_p7_0[] = { + 6, + 5, + 7, +@@ -10423,7 +10423,7 @@ + 12, + }; + +-static long _vq_lengthlist__44u9_p7_0[] = { ++static const long _vq_lengthlist__44u9_p7_0[] = { + 1, 4, 5, 6, 6, 7, 7, 8, 9,10,10,11,11, 5, 6, 6, + 7, 7, 8, 8, 9, 9,10,10,11,11, 5, 6, 6, 7, 7, 8, + 8, 9, 9,10,10,11,11, 6, 7, 7, 8, 8, 9, 9,10,10, +@@ -10437,35 +10437,35 @@ + 12,13,13,14,14,14,15,15,15, + }; + +-static float _vq_quantthresh__44u9_p7_0[] = { ++static const float _vq_quantthresh__44u9_p7_0[] = { + -60.5, -49.5, -38.5, -27.5, -16.5, -5.5, 5.5, 16.5, + 27.5, 38.5, 49.5, 60.5, + }; + +-static long _vq_quantmap__44u9_p7_0[] = { ++static const long _vq_quantmap__44u9_p7_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44u9_p7_0 = { +- _vq_quantthresh__44u9_p7_0, +- _vq_quantmap__44u9_p7_0, ++static const encode_aux_threshmatch _vq_auxt__44u9_p7_0 = { ++ (float *)_vq_quantthresh__44u9_p7_0, ++ (long *)_vq_quantmap__44u9_p7_0, + 13, + 13 + }; + +-static static_codebook _44u9_p7_0 = { ++static const static_codebook _44u9_p7_0 = { + 2, 169, +- _vq_lengthlist__44u9_p7_0, ++ (long *)_vq_lengthlist__44u9_p7_0, + 1, -523206656, 1618345984, 4, 0, +- _vq_quantlist__44u9_p7_0, ++ (long *)_vq_quantlist__44u9_p7_0, + NULL, +- &_vq_auxt__44u9_p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u9_p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u9_p7_1[] = { ++static const long _vq_quantlist__44u9_p7_1[] = { + 5, + 4, + 6, +@@ -10479,7 +10479,7 @@ + 10, + }; + +-static long _vq_lengthlist__44u9_p7_1[] = { ++static const long _vq_lengthlist__44u9_p7_1[] = { + 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 7, 7, + 7, 7, 7, 7, 7, 7, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, +@@ -10490,35 +10490,35 @@ + 7, 7, 7, 7, 7, 8, 8, 8, 8, + }; + +-static float _vq_quantthresh__44u9_p7_1[] = { ++static const float _vq_quantthresh__44u9_p7_1[] = { + -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, + 3.5, 4.5, + }; + +-static long _vq_quantmap__44u9_p7_1[] = { ++static const long _vq_quantmap__44u9_p7_1[] = { + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, + }; + +-static encode_aux_threshmatch _vq_auxt__44u9_p7_1 = { +- _vq_quantthresh__44u9_p7_1, +- _vq_quantmap__44u9_p7_1, ++static const encode_aux_threshmatch _vq_auxt__44u9_p7_1 = { ++ (float *)_vq_quantthresh__44u9_p7_1, ++ (long *)_vq_quantmap__44u9_p7_1, + 11, + 11 + }; + +-static static_codebook _44u9_p7_1 = { ++static const static_codebook _44u9_p7_1 = { + 2, 121, +- _vq_lengthlist__44u9_p7_1, ++ (long *)_vq_lengthlist__44u9_p7_1, + 1, -531365888, 1611661312, 4, 0, +- _vq_quantlist__44u9_p7_1, ++ (long *)_vq_quantlist__44u9_p7_1, + NULL, +- &_vq_auxt__44u9_p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u9_p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u9_p8_0[] = { ++static const long _vq_quantlist__44u9_p8_0[] = { + 7, + 6, + 8, +@@ -10536,7 +10536,7 @@ + 14, + }; + +-static long _vq_lengthlist__44u9_p8_0[] = { ++static const long _vq_lengthlist__44u9_p8_0[] = { + 1, 4, 4, 7, 7, 8, 8, 8, 8, 9, 9,10, 9,11,10, 4, + 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,10,12,10, 4, 6, + 6, 8, 8, 9,10, 9, 9,10,10,11,11,12,12, 7, 8, 8, +@@ -10554,35 +10554,35 @@ + 15, + }; + +-static float _vq_quantthresh__44u9_p8_0[] = { ++static const float _vq_quantthresh__44u9_p8_0[] = { + -136.5, -115.5, -94.5, -73.5, -52.5, -31.5, -10.5, 10.5, + 31.5, 52.5, 73.5, 94.5, 115.5, 136.5, + }; + +-static long _vq_quantmap__44u9_p8_0[] = { ++static const long _vq_quantmap__44u9_p8_0[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__44u9_p8_0 = { +- _vq_quantthresh__44u9_p8_0, +- _vq_quantmap__44u9_p8_0, ++static const encode_aux_threshmatch _vq_auxt__44u9_p8_0 = { ++ (float *)_vq_quantthresh__44u9_p8_0, ++ (long *)_vq_quantmap__44u9_p8_0, + 15, + 15 + }; + +-static static_codebook _44u9_p8_0 = { ++static const static_codebook _44u9_p8_0 = { + 2, 225, +- _vq_lengthlist__44u9_p8_0, ++ (long *)_vq_lengthlist__44u9_p8_0, + 1, -520986624, 1620377600, 4, 0, +- _vq_quantlist__44u9_p8_0, ++ (long *)_vq_quantlist__44u9_p8_0, + NULL, +- &_vq_auxt__44u9_p8_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u9_p8_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u9_p8_1[] = { ++static const long _vq_quantlist__44u9_p8_1[] = { + 10, + 9, + 11, +@@ -10606,7 +10606,7 @@ + 20, + }; + +-static long _vq_lengthlist__44u9_p8_1[] = { ++static const long _vq_lengthlist__44u9_p8_1[] = { + 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 6, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 6, 6, 6, 7, 7, 8, +@@ -10637,37 +10637,37 @@ + 10,10,10,10,10,10,10,10,10, + }; + +-static float _vq_quantthresh__44u9_p8_1[] = { ++static const float _vq_quantthresh__44u9_p8_1[] = { + -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, + -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, + 6.5, 7.5, 8.5, 9.5, + }; + +-static long _vq_quantmap__44u9_p8_1[] = { ++static const long _vq_quantmap__44u9_p8_1[] = { + 19, 17, 15, 13, 11, 9, 7, 5, + 3, 1, 0, 2, 4, 6, 8, 10, + 12, 14, 16, 18, 20, + }; + +-static encode_aux_threshmatch _vq_auxt__44u9_p8_1 = { +- _vq_quantthresh__44u9_p8_1, +- _vq_quantmap__44u9_p8_1, ++static const encode_aux_threshmatch _vq_auxt__44u9_p8_1 = { ++ (float *)_vq_quantthresh__44u9_p8_1, ++ (long *)_vq_quantmap__44u9_p8_1, + 21, + 21 + }; + +-static static_codebook _44u9_p8_1 = { ++static const static_codebook _44u9_p8_1 = { + 2, 441, +- _vq_lengthlist__44u9_p8_1, ++ (long *)_vq_lengthlist__44u9_p8_1, + 1, -529268736, 1611661312, 5, 0, +- _vq_quantlist__44u9_p8_1, ++ (long *)_vq_quantlist__44u9_p8_1, + NULL, +- &_vq_auxt__44u9_p8_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u9_p8_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u9_p9_0[] = { ++static const long _vq_quantlist__44u9_p9_0[] = { + 7, + 6, + 8, +@@ -10685,7 +10685,7 @@ + 14, + }; + +-static long _vq_lengthlist__44u9_p9_0[] = { ++static const long _vq_lengthlist__44u9_p9_0[] = { + 1, 3, 3,11,11,11,11,11,11,11,11,11,11,11,11, 4, + 10,11,11,11,11,11,11,11,11,11,11,11,11,11, 4,10, + 10,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, +@@ -10703,35 +10703,35 @@ + 10, + }; + +-static float _vq_quantthresh__44u9_p9_0[] = { ++static const float _vq_quantthresh__44u9_p9_0[] = { + -6051.5, -5120.5, -4189.5, -3258.5, -2327.5, -1396.5, -465.5, 465.5, + 1396.5, 2327.5, 3258.5, 4189.5, 5120.5, 6051.5, + }; + +-static long _vq_quantmap__44u9_p9_0[] = { ++static const long _vq_quantmap__44u9_p9_0[] = { + 13, 11, 9, 7, 5, 3, 1, 0, + 2, 4, 6, 8, 10, 12, 14, + }; + +-static encode_aux_threshmatch _vq_auxt__44u9_p9_0 = { +- _vq_quantthresh__44u9_p9_0, +- _vq_quantmap__44u9_p9_0, ++static const encode_aux_threshmatch _vq_auxt__44u9_p9_0 = { ++ (float *)_vq_quantthresh__44u9_p9_0, ++ (long *)_vq_quantmap__44u9_p9_0, + 15, + 15 + }; + +-static static_codebook _44u9_p9_0 = { ++static const static_codebook _44u9_p9_0 = { + 2, 225, +- _vq_lengthlist__44u9_p9_0, ++ (long *)_vq_lengthlist__44u9_p9_0, + 1, -510036736, 1631393792, 4, 0, +- _vq_quantlist__44u9_p9_0, ++ (long *)_vq_quantlist__44u9_p9_0, + NULL, +- &_vq_auxt__44u9_p9_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44u9_p9_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44u9_p9_1[] = { ++static const long _vq_quantlist__44u9_p9_1[] = { + 9, + 8, + 10, +@@ -10753,7 +10753,7 @@ + 18, + }; + +-static long _vq_lengthlist__44u9_p9_1[] = { ++static const long _vq_lengthlist__44u9_p9_1[] = { + 1, 4, 4, 7, 7, 8, 7, 8, 7, 9, 8,10, 9,10,10,11, + 11,12,12, 4, 7, 6, 9, 9,10, 9, 9, 8,10,10,11,10, + 12,10,13,12,13,12, 4, 6, 6, 9, 9, 9, 9, 9, 9,10, +@@ -10779,37 +10779,37 @@ + 17,17,15,17,15,17,16,16,17, + }; + +-static float _vq_quantthresh__44u9_p9_1[] = { ++static const float _vq_quantthresh__44u9_p9_1[] = { + -416.5, -367.5, -318.5, -269.5, -220.5, -171.5, -122.5, -73.5, + -24.5, 24.5, 73.5, 122.5, 171.5, 220.5, 269.5, 318.5, + 367.5, 416.5, + }; + +-static long _vq_quantmap__44u9_p9_1[] = { ++static const long _vq_quantmap__44u9_p9_1[] = { + 17, 15, 13, 11, 9, 7, 5, 3, + 1, 0, 2, 4, 6, 8, 10, 12, + 14, 16, 18, + }; + +-static encode_aux_threshmatch _vq_auxt__44u9_p9_1 = { +- _vq_quantthresh__44u9_p9_1, +- _vq_quantmap__44u9_p9_1, ++static const encode_aux_threshmatch _vq_auxt__44u9_p9_1 = { ++ (float *)_vq_quantthresh__44u9_p9_1, ++ (long *)_vq_quantmap__44u9_p9_1, + 19, + 19 + }; + +-static static_codebook _44u9_p9_1 = { ++static const static_codebook _44u9_p9_1 = { + 2, 361, +- _vq_lengthlist__44u9_p9_1, ++ (long *)_vq_lengthlist__44u9_p9_1, + 1, -518287360, 1622704128, 5, 0, +- _vq_quantlist__44u9_p9_1, ++ (long *)_vq_quantlist__44u9_p9_1, + NULL, +- &_vq_auxt__44u9_p9_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44u9_p9_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44u9_p9_2[] = { ++static const long _vq_quantlist__44u9_p9_2[] = { + 24, + 23, + 25, +@@ -10861,14 +10861,14 @@ + 48, + }; + +-static long _vq_lengthlist__44u9_p9_2[] = { ++static const long _vq_lengthlist__44u9_p9_2[] = { + 2, 4, 4, 5, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 7, 6, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, + }; + +-static float _vq_quantthresh__44u9_p9_2[] = { ++static const float _vq_quantthresh__44u9_p9_2[] = { + -23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, + -15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, + -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, +@@ -10877,7 +10877,7 @@ + 16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, + }; + +-static long _vq_quantmap__44u9_p9_2[] = { ++static const long _vq_quantmap__44u9_p9_2[] = { + 47, 45, 43, 41, 39, 37, 35, 33, + 31, 29, 27, 25, 23, 21, 19, 17, + 15, 13, 11, 9, 7, 5, 3, 1, +@@ -10887,34 +10887,34 @@ + 48, + }; + +-static encode_aux_threshmatch _vq_auxt__44u9_p9_2 = { +- _vq_quantthresh__44u9_p9_2, +- _vq_quantmap__44u9_p9_2, ++static const encode_aux_threshmatch _vq_auxt__44u9_p9_2 = { ++ (float *)_vq_quantthresh__44u9_p9_2, ++ (long *)_vq_quantmap__44u9_p9_2, + 49, + 49 + }; + +-static static_codebook _44u9_p9_2 = { ++static const static_codebook _44u9_p9_2 = { + 1, 49, +- _vq_lengthlist__44u9_p9_2, ++ (long *)_vq_lengthlist__44u9_p9_2, + 1, -526909440, 1611661312, 6, 0, +- _vq_quantlist__44u9_p9_2, ++ (long *)_vq_quantlist__44u9_p9_2, + NULL, +- &_vq_auxt__44u9_p9_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44u9_p9_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44un1__long[] = { ++static const long _huff_lengthlist__44un1__long[] = { + 5, 6,12, 9,14, 9, 9,19, 6, 1, 5, 5, 8, 7, 9,19, + 12, 4, 4, 7, 7, 9,11,18, 9, 5, 6, 6, 8, 7, 8,17, + 14, 8, 7, 8, 8,10,12,18, 9, 6, 8, 6, 8, 6, 8,18, + 9, 8,11, 8,11, 7, 5,15,16,18,18,18,17,15,11,18, + }; + +-static static_codebook _huff_book__44un1__long = { ++static const static_codebook _huff_book__44un1__long = { + 2, 64, +- _huff_lengthlist__44un1__long, ++ (long *)_huff_lengthlist__44un1__long, + 0, 0, 0, 0, 0, + NULL, + NULL, +@@ -10923,13 +10923,13 @@ + 0 + }; + +-static long _vq_quantlist__44un1__p1_0[] = { ++static const long _vq_quantlist__44un1__p1_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44un1__p1_0[] = { ++static const long _vq_lengthlist__44un1__p1_0[] = { + 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,10,11, 8, + 10,11, 5, 8, 8, 8,11,10, 8,11,10, 4, 9, 9, 8,11, + 11, 8,11,11, 8,12,11,10,12,14,11,13,13, 7,11,11, +@@ -10938,39 +10938,39 @@ + 12, + }; + +-static float _vq_quantthresh__44un1__p1_0[] = { ++static const float _vq_quantthresh__44un1__p1_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44un1__p1_0[] = { ++static const long _vq_quantmap__44un1__p1_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44un1__p1_0 = { +- _vq_quantthresh__44un1__p1_0, +- _vq_quantmap__44un1__p1_0, ++static const encode_aux_threshmatch _vq_auxt__44un1__p1_0 = { ++ (float *)_vq_quantthresh__44un1__p1_0, ++ (long *)_vq_quantmap__44un1__p1_0, + 3, + 3 + }; + +-static static_codebook _44un1__p1_0 = { ++static const static_codebook _44un1__p1_0 = { + 4, 81, +- _vq_lengthlist__44un1__p1_0, ++ (long *)_vq_lengthlist__44un1__p1_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44un1__p1_0, ++ (long *)_vq_quantlist__44un1__p1_0, + NULL, +- &_vq_auxt__44un1__p1_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44un1__p1_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44un1__p2_0[] = { ++static const long _vq_quantlist__44un1__p2_0[] = { + 1, + 0, + 2, + }; + +-static long _vq_lengthlist__44un1__p2_0[] = { ++static const long _vq_lengthlist__44un1__p2_0[] = { + 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 8, 6, + 7, 9, 5, 7, 7, 6, 8, 7, 7, 9, 8, 4, 7, 7, 7, 9, + 8, 7, 8, 8, 7, 9, 8, 8, 8,10, 9,10,10, 6, 8, 8, +@@ -10979,33 +10979,33 @@ + 8, + }; + +-static float _vq_quantthresh__44un1__p2_0[] = { ++static const float _vq_quantthresh__44un1__p2_0[] = { + -0.5, 0.5, + }; + +-static long _vq_quantmap__44un1__p2_0[] = { ++static const long _vq_quantmap__44un1__p2_0[] = { + 1, 0, 2, + }; + +-static encode_aux_threshmatch _vq_auxt__44un1__p2_0 = { +- _vq_quantthresh__44un1__p2_0, +- _vq_quantmap__44un1__p2_0, ++static const encode_aux_threshmatch _vq_auxt__44un1__p2_0 = { ++ (float *)_vq_quantthresh__44un1__p2_0, ++ (long *)_vq_quantmap__44un1__p2_0, + 3, + 3 + }; + +-static static_codebook _44un1__p2_0 = { ++static const static_codebook _44un1__p2_0 = { + 4, 81, +- _vq_lengthlist__44un1__p2_0, ++ (long *)_vq_lengthlist__44un1__p2_0, + 1, -535822336, 1611661312, 2, 0, +- _vq_quantlist__44un1__p2_0, ++ (long *)_vq_quantlist__44un1__p2_0, + NULL, +- &_vq_auxt__44un1__p2_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44un1__p2_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44un1__p3_0[] = { ++static const long _vq_quantlist__44un1__p3_0[] = { + 2, + 1, + 3, +@@ -11013,7 +11013,7 @@ + 4, + }; + +-static long _vq_lengthlist__44un1__p3_0[] = { ++static const long _vq_lengthlist__44un1__p3_0[] = { + 1, 5, 5, 8, 8, 5, 8, 7, 9, 9, 5, 7, 8, 9, 9, 9, + 10, 9,12,12, 9, 9,10,11,12, 6, 8, 8,10,10, 8,10, + 10,11,11, 8, 9,10,11,11,10,11,11,13,13,10,11,11, +@@ -11056,33 +11056,33 @@ + 17, + }; + +-static float _vq_quantthresh__44un1__p3_0[] = { ++static const float _vq_quantthresh__44un1__p3_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44un1__p3_0[] = { ++static const long _vq_quantmap__44un1__p3_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44un1__p3_0 = { +- _vq_quantthresh__44un1__p3_0, +- _vq_quantmap__44un1__p3_0, ++static const encode_aux_threshmatch _vq_auxt__44un1__p3_0 = { ++ (float *)_vq_quantthresh__44un1__p3_0, ++ (long *)_vq_quantmap__44un1__p3_0, + 5, + 5 + }; + +-static static_codebook _44un1__p3_0 = { ++static const static_codebook _44un1__p3_0 = { + 4, 625, +- _vq_lengthlist__44un1__p3_0, ++ (long *)_vq_lengthlist__44un1__p3_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44un1__p3_0, ++ (long *)_vq_quantlist__44un1__p3_0, + NULL, +- &_vq_auxt__44un1__p3_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44un1__p3_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44un1__p4_0[] = { ++static const long _vq_quantlist__44un1__p4_0[] = { + 2, + 1, + 3, +@@ -11090,7 +11090,7 @@ + 4, + }; + +-static long _vq_lengthlist__44un1__p4_0[] = { ++static const long _vq_lengthlist__44un1__p4_0[] = { + 3, 5, 5, 9, 9, 5, 6, 6,10, 9, 5, 6, 6, 9,10,10, + 10,10,12,11, 9,10,10,12,12, 5, 7, 7,10,10, 7, 7, + 8,10,11, 7, 7, 8,10,11,10,10,11,11,13,10,10,11, +@@ -11133,33 +11133,33 @@ + 12, + }; + +-static float _vq_quantthresh__44un1__p4_0[] = { ++static const float _vq_quantthresh__44un1__p4_0[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44un1__p4_0[] = { ++static const long _vq_quantmap__44un1__p4_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44un1__p4_0 = { +- _vq_quantthresh__44un1__p4_0, +- _vq_quantmap__44un1__p4_0, ++static const encode_aux_threshmatch _vq_auxt__44un1__p4_0 = { ++ (float *)_vq_quantthresh__44un1__p4_0, ++ (long *)_vq_quantmap__44un1__p4_0, + 5, + 5 + }; + +-static static_codebook _44un1__p4_0 = { ++static const static_codebook _44un1__p4_0 = { + 4, 625, +- _vq_lengthlist__44un1__p4_0, ++ (long *)_vq_lengthlist__44un1__p4_0, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44un1__p4_0, ++ (long *)_vq_quantlist__44un1__p4_0, + NULL, +- &_vq_auxt__44un1__p4_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44un1__p4_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44un1__p5_0[] = { ++static const long _vq_quantlist__44un1__p5_0[] = { + 4, + 3, + 5, +@@ -11171,7 +11171,7 @@ + 8, + }; + +-static long _vq_lengthlist__44un1__p5_0[] = { ++static const long _vq_lengthlist__44un1__p5_0[] = { + 1, 4, 4, 7, 7, 8, 8, 9, 9, 4, 6, 5, 8, 7, 8, 8, + 10, 9, 4, 6, 6, 8, 8, 8, 8,10,10, 7, 8, 7, 9, 9, + 9, 9,11,10, 7, 8, 8, 9, 9, 9, 9,10,11, 8, 8, 8, +@@ -11180,34 +11180,34 @@ + 12, + }; + +-static float _vq_quantthresh__44un1__p5_0[] = { ++static const float _vq_quantthresh__44un1__p5_0[] = { + -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, + }; + +-static long _vq_quantmap__44un1__p5_0[] = { ++static const long _vq_quantmap__44un1__p5_0[] = { + 7, 5, 3, 1, 0, 2, 4, 6, + 8, + }; + +-static encode_aux_threshmatch _vq_auxt__44un1__p5_0 = { +- _vq_quantthresh__44un1__p5_0, +- _vq_quantmap__44un1__p5_0, ++static const encode_aux_threshmatch _vq_auxt__44un1__p5_0 = { ++ (float *)_vq_quantthresh__44un1__p5_0, ++ (long *)_vq_quantmap__44un1__p5_0, + 9, + 9 + }; + +-static static_codebook _44un1__p5_0 = { ++static const static_codebook _44un1__p5_0 = { + 2, 81, +- _vq_lengthlist__44un1__p5_0, ++ (long *)_vq_lengthlist__44un1__p5_0, + 1, -531628032, 1611661312, 4, 0, +- _vq_quantlist__44un1__p5_0, ++ (long *)_vq_quantlist__44un1__p5_0, + NULL, +- &_vq_auxt__44un1__p5_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44un1__p5_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44un1__p6_0[] = { ++static const long _vq_quantlist__44un1__p6_0[] = { + 6, + 5, + 7, +@@ -11223,7 +11223,7 @@ + 12, + }; + +-static long _vq_lengthlist__44un1__p6_0[] = { ++static const long _vq_lengthlist__44un1__p6_0[] = { + 1, 4, 4, 6, 6, 8, 8,10,10,11,11,15,15, 4, 5, 5, + 8, 8, 9, 9,11,11,12,12,16,16, 4, 5, 6, 8, 8, 9, + 9,11,11,12,12,14,14, 7, 8, 8, 9, 9,10,10,11,12, +@@ -11237,35 +11237,35 @@ + 16, 0,15,18,18, 0,16, 0, 0, + }; + +-static float _vq_quantthresh__44un1__p6_0[] = { ++static const float _vq_quantthresh__44un1__p6_0[] = { + -27.5, -22.5, -17.5, -12.5, -7.5, -2.5, 2.5, 7.5, + 12.5, 17.5, 22.5, 27.5, + }; + +-static long _vq_quantmap__44un1__p6_0[] = { ++static const long _vq_quantmap__44un1__p6_0[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44un1__p6_0 = { +- _vq_quantthresh__44un1__p6_0, +- _vq_quantmap__44un1__p6_0, ++static const encode_aux_threshmatch _vq_auxt__44un1__p6_0 = { ++ (float *)_vq_quantthresh__44un1__p6_0, ++ (long *)_vq_quantmap__44un1__p6_0, + 13, + 13 + }; + +-static static_codebook _44un1__p6_0 = { ++static const static_codebook _44un1__p6_0 = { + 2, 169, +- _vq_lengthlist__44un1__p6_0, ++ (long *)_vq_lengthlist__44un1__p6_0, + 1, -526516224, 1616117760, 4, 0, +- _vq_quantlist__44un1__p6_0, ++ (long *)_vq_quantlist__44un1__p6_0, + NULL, +- &_vq_auxt__44un1__p6_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44un1__p6_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44un1__p6_1[] = { ++static const long _vq_quantlist__44un1__p6_1[] = { + 2, + 1, + 3, +@@ -11273,38 +11273,38 @@ + 4, + }; + +-static long _vq_lengthlist__44un1__p6_1[] = { ++static const long _vq_lengthlist__44un1__p6_1[] = { + 2, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 6, 5, 5, + 6, 5, 6, 6, 5, 6, 6, 6, 6, + }; + +-static float _vq_quantthresh__44un1__p6_1[] = { ++static const float _vq_quantthresh__44un1__p6_1[] = { + -1.5, -0.5, 0.5, 1.5, + }; + +-static long _vq_quantmap__44un1__p6_1[] = { ++static const long _vq_quantmap__44un1__p6_1[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44un1__p6_1 = { +- _vq_quantthresh__44un1__p6_1, +- _vq_quantmap__44un1__p6_1, ++static const encode_aux_threshmatch _vq_auxt__44un1__p6_1 = { ++ (float *)_vq_quantthresh__44un1__p6_1, ++ (long *)_vq_quantmap__44un1__p6_1, + 5, + 5 + }; + +-static static_codebook _44un1__p6_1 = { ++static const static_codebook _44un1__p6_1 = { + 2, 25, +- _vq_lengthlist__44un1__p6_1, ++ (long *)_vq_lengthlist__44un1__p6_1, + 1, -533725184, 1611661312, 3, 0, +- _vq_quantlist__44un1__p6_1, ++ (long *)_vq_quantlist__44un1__p6_1, + NULL, +- &_vq_auxt__44un1__p6_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44un1__p6_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44un1__p7_0[] = { ++static const long _vq_quantlist__44un1__p7_0[] = { + 2, + 1, + 3, +@@ -11312,7 +11312,7 @@ + 4, + }; + +-static long _vq_lengthlist__44un1__p7_0[] = { ++static const long _vq_lengthlist__44un1__p7_0[] = { + 1, 5, 3,11,11,11,11,11,11,11, 8,11,11,11,11,11, + 11,11,11,11,11,11,11,11,11,10,11,11,11,11,11,11, + 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, +@@ -11355,33 +11355,33 @@ + 10, + }; + +-static float _vq_quantthresh__44un1__p7_0[] = { ++static const float _vq_quantthresh__44un1__p7_0[] = { + -253.5, -84.5, 84.5, 253.5, + }; + +-static long _vq_quantmap__44un1__p7_0[] = { ++static const long _vq_quantmap__44un1__p7_0[] = { + 3, 1, 0, 2, 4, + }; + +-static encode_aux_threshmatch _vq_auxt__44un1__p7_0 = { +- _vq_quantthresh__44un1__p7_0, +- _vq_quantmap__44un1__p7_0, ++static const encode_aux_threshmatch _vq_auxt__44un1__p7_0 = { ++ (float *)_vq_quantthresh__44un1__p7_0, ++ (long *)_vq_quantmap__44un1__p7_0, + 5, + 5 + }; + +-static static_codebook _44un1__p7_0 = { ++static const static_codebook _44un1__p7_0 = { + 4, 625, +- _vq_lengthlist__44un1__p7_0, ++ (long *)_vq_lengthlist__44un1__p7_0, + 1, -518709248, 1626677248, 3, 0, +- _vq_quantlist__44un1__p7_0, ++ (long *)_vq_quantlist__44un1__p7_0, + NULL, +- &_vq_auxt__44un1__p7_0, ++ (encode_aux_threshmatch *)&_vq_auxt__44un1__p7_0, + NULL, + 0 + }; + +-static long _vq_quantlist__44un1__p7_1[] = { ++static const long _vq_quantlist__44un1__p7_1[] = { + 6, + 5, + 7, +@@ -11397,7 +11397,7 @@ + 12, + }; + +-static long _vq_lengthlist__44un1__p7_1[] = { ++static const long _vq_lengthlist__44un1__p7_1[] = { + 1, 4, 4, 6, 6, 6, 6, 9, 8, 9, 8, 8, 8, 5, 7, 7, + 7, 7, 8, 8, 8,10, 8,10, 8, 9, 5, 7, 7, 8, 7, 7, + 8,10,10,11,10,12,11, 7, 8, 8, 9, 9, 9,10,11,11, +@@ -11411,35 +11411,35 @@ + 12,13,13,12,13,13,14,14,14, + }; + +-static float _vq_quantthresh__44un1__p7_1[] = { ++static const float _vq_quantthresh__44un1__p7_1[] = { + -71.5, -58.5, -45.5, -32.5, -19.5, -6.5, 6.5, 19.5, + 32.5, 45.5, 58.5, 71.5, + }; + +-static long _vq_quantmap__44un1__p7_1[] = { ++static const long _vq_quantmap__44un1__p7_1[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44un1__p7_1 = { +- _vq_quantthresh__44un1__p7_1, +- _vq_quantmap__44un1__p7_1, ++static const encode_aux_threshmatch _vq_auxt__44un1__p7_1 = { ++ (float *)_vq_quantthresh__44un1__p7_1, ++ (long *)_vq_quantmap__44un1__p7_1, + 13, + 13 + }; + +-static static_codebook _44un1__p7_1 = { ++static const static_codebook _44un1__p7_1 = { + 2, 169, +- _vq_lengthlist__44un1__p7_1, ++ (long *)_vq_lengthlist__44un1__p7_1, + 1, -523010048, 1618608128, 4, 0, +- _vq_quantlist__44un1__p7_1, ++ (long *)_vq_quantlist__44un1__p7_1, + NULL, +- &_vq_auxt__44un1__p7_1, ++ (encode_aux_threshmatch *)&_vq_auxt__44un1__p7_1, + NULL, + 0 + }; + +-static long _vq_quantlist__44un1__p7_2[] = { ++static const long _vq_quantlist__44un1__p7_2[] = { + 6, + 5, + 7, +@@ -11455,7 +11455,7 @@ + 12, + }; + +-static long _vq_lengthlist__44un1__p7_2[] = { ++static const long _vq_lengthlist__44un1__p7_2[] = { + 3, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9, 9, 8, 4, 5, 5, + 6, 6, 8, 8, 9, 8, 9, 9, 9, 9, 4, 5, 5, 7, 6, 8, + 8, 8, 8, 9, 8, 9, 8, 6, 7, 7, 7, 8, 8, 8, 9, 9, +@@ -11469,44 +11469,44 @@ + 9, 9, 9,10,10,10,10,10,10, + }; + +-static float _vq_quantthresh__44un1__p7_2[] = { ++static const float _vq_quantthresh__44un1__p7_2[] = { + -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, + 2.5, 3.5, 4.5, 5.5, + }; + +-static long _vq_quantmap__44un1__p7_2[] = { ++static const long _vq_quantmap__44un1__p7_2[] = { + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, + }; + +-static encode_aux_threshmatch _vq_auxt__44un1__p7_2 = { +- _vq_quantthresh__44un1__p7_2, +- _vq_quantmap__44un1__p7_2, ++static const encode_aux_threshmatch _vq_auxt__44un1__p7_2 = { ++ (float *)_vq_quantthresh__44un1__p7_2, ++ (long *)_vq_quantmap__44un1__p7_2, + 13, + 13 + }; + +-static static_codebook _44un1__p7_2 = { ++static const static_codebook _44un1__p7_2 = { + 2, 169, +- _vq_lengthlist__44un1__p7_2, ++ (long *)_vq_lengthlist__44un1__p7_2, + 1, -531103744, 1611661312, 4, 0, +- _vq_quantlist__44un1__p7_2, ++ (long *)_vq_quantlist__44un1__p7_2, + NULL, +- &_vq_auxt__44un1__p7_2, ++ (encode_aux_threshmatch *)&_vq_auxt__44un1__p7_2, + NULL, + 0 + }; + +-static long _huff_lengthlist__44un1__short[] = { ++static const long _huff_lengthlist__44un1__short[] = { + 12,12,14,12,14,14,14,14,12, 6, 6, 8, 9, 9,11,14, + 12, 4, 2, 6, 6, 7,11,14,13, 6, 5, 7, 8, 9,11,14, + 13, 8, 5, 8, 6, 8,12,14,12, 7, 7, 8, 8, 8,10,14, + 12, 6, 3, 4, 4, 4, 7,14,11, 7, 4, 6, 6, 6, 8,14, + }; + +-static static_codebook _huff_book__44un1__short = { ++static const static_codebook _huff_book__44un1__short = { + 2, 64, +- _huff_lengthlist__44un1__short, ++ (long *)_huff_lengthlist__44un1__short, + 0, 0, 0, 0, 0, + NULL, + NULL, +diff -ruN libvorbis-1.2.0/lib/codebook.c aotuv-b5.7_20090301/lib/codebook.c +--- libvorbis-1.2.0/lib/codebook.c 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/codebook.c 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: basic codebook pack/unpack/code/decode operations +- last mod: $Id: codebook.c 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: codebook.c 14604 2008-03-19 08:03:29Z xiphmont $ + + ********************************************************************/ + +@@ -159,6 +159,8 @@ + s->entries=oggpack_read(opb,24); + if(s->entries==-1)goto _eofout; + ++ if(_ilog(s->dim)+_ilog(s->entries)>24)goto _eofout; ++ + /* codeword ordering.... length ordered or unordered? */ + switch((int)oggpack_read(opb,1)){ + case 0: +@@ -225,7 +227,7 @@ + int quantvals=0; + switch(s->maptype){ + case 1: +- quantvals=_book_maptype1_quantvals(s); ++ quantvals=(s->dim==0?0:_book_maptype1_quantvals(s)); + break; + case 2: + quantvals=s->entries*s->dim; +diff -ruN libvorbis-1.2.0/lib/codec_internal.h aotuv-b5.7_20090301/lib/codec_internal.h +--- libvorbis-1.2.0/lib/codec_internal.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/codec_internal.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: libvorbis codec headers +- last mod: $Id: codec_internal.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: codec_internal.h 2008-09-04 aoyumi $ + + ********************************************************************/ + +@@ -82,6 +82,16 @@ + bitrate_manager_state bms; + + ogg_int64_t sample_count; ++ ++ /* encode only ++ added by aoyumi */ ++ float *lownoise_compand_level; ++ float *nblock; /* lW logmdct buffer */ ++ float *tblock; /* temporal masking buffer (impulse block) */ ++ int lW_blocktype; /* last window block type */ ++ int lW_modenumber; /* last window mode number (0=short, 1=long) */ ++ int lW_no; /* the number of continuous window blocks (last window) */ ++ int impadnum; /* padding block number (impulse-padding-impulse case) for M3 */ + } private_state; + + /* codec_setup_info contains all the setup information specific to the +@@ -128,10 +138,42 @@ + highly redundant structure, but + improves clarity of program flow. */ + int halfrate_flag; /* painless downsample for decode */ ++ int block_lowpassr[2]; + } codec_setup_info; + + extern vorbis_look_psy_global *_vp_global_look(vorbis_info *vi); + extern void _vp_global_free(vorbis_look_psy_global *look); + ++ ++ ++typedef struct { ++ int sorted_index[VIF_POSIT+2]; ++ int forward_index[VIF_POSIT+2]; ++ int reverse_index[VIF_POSIT+2]; ++ ++ int hineighbor[VIF_POSIT]; ++ int loneighbor[VIF_POSIT]; ++ int posts; ++ ++ int n; ++ int quant_q; ++ vorbis_info_floor1 *vi; ++ ++ long phrasebits; ++ long postbits; ++ long frames; ++} vorbis_look_floor1; ++ ++ ++ ++extern int *floor1_fit(vorbis_block *vb,vorbis_look_floor1 *look, ++ const float *logmdct, /* in */ ++ const float *logmask); ++extern int *floor1_interpolate_fit(vorbis_block *vb,vorbis_look_floor1 *look, ++ int *A,int *B, ++ int del); ++extern int floor1_encode(oggpack_buffer *opb,vorbis_block *vb, ++ vorbis_look_floor1 *look, ++ int *post,int *ilogmask); + #endif + +diff -ruN libvorbis-1.2.0/lib/envelope.c aotuv-b5.7_20090301/lib/envelope.c +--- libvorbis-1.2.0/lib/envelope.c 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/envelope.c 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: PCM data envelope analysis +- last mod: $Id: envelope.c 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: envelope.c 13577 2007-08-20 10:04:37Z erikd $ + + ********************************************************************/ + +@@ -91,8 +91,7 @@ + vorbis_info_psy_global *gi, + float *data, + envelope_band *bands, +- envelope_filter_state *filters, +- long pos){ ++ envelope_filter_state *filters){ + long n=ve->winlength; + int ret=0; + long i,j; +@@ -240,7 +239,7 @@ + + for(i=0;ich;i++){ + float *pcm=v->pcm[i]+ve->searchstep*(j); +- ret|=_ve_amp(ve,gi,pcm,ve->band,ve->filter+i*VE_BANDS,j); ++ ret|=_ve_amp(ve,gi,pcm,ve->band,ve->filter+i*VE_BANDS); + } + + ve->mark[j+VE_POST]=0; +diff -ruN libvorbis-1.2.0/lib/floor0.c aotuv-b5.7_20090301/lib/floor0.c +--- libvorbis-1.2.0/lib/floor0.c 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/floor0.c 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: floor backend 0 implementation +- last mod: $Id: floor0.c 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: floor0.c 15531 2008-11-24 23:50:06Z xiphmont $ + + ********************************************************************/ + +@@ -214,7 +214,7 @@ + } + + /* 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 + }; +diff -ruN libvorbis-1.2.0/lib/floor1.c aotuv-b5.7_20090301/lib/floor1.c +--- libvorbis-1.2.0/lib/floor1.c 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/floor1.c 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: floor backend 1 implementation +- last mod: $Id: floor1.c 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: floor1.c 2009-03-11 aoyumi $ + + ********************************************************************/ + +@@ -30,24 +30,6 @@ + + #define floor1_rangedB 140 /* floor 1 fixed at -140dB to 0dB range */ + +-typedef struct { +- int sorted_index[VIF_POSIT+2]; +- int forward_index[VIF_POSIT+2]; +- int reverse_index[VIF_POSIT+2]; +- +- int hineighbor[VIF_POSIT]; +- int loneighbor[VIF_POSIT]; +- int posts; +- +- int n; +- int quant_q; +- vorbis_info_floor1 *vi; +- +- long phrasebits; +- long postbits; +- long frames; +-} vorbis_look_floor1; +- + typedef struct lsfit_acc{ + long x0; + long x1; +@@ -183,7 +165,7 @@ + info->postlist[1]=1<reverse_index[look->forward_index[i]]=i; + /* we actually need the post values too */ + for(i=0;isorted_index[i]=info->postlist[look->forward_index[i]]; +- ++ + /* quantize values to multiplier spec */ + switch(info->mult){ + case 1: /* 1024 -> 256 */ +@@ -271,13 +253,13 @@ + static int render_point(int x0,int x1,int y0,int y1,int x){ + y0&=0x7fff; /* mask off flag */ + y1&=0x7fff; +- ++ + { + int dy=y1-y0; + int adx=x1-x0; + int ady=abs(dy); + int err=ady*(x-x0); +- ++ + int off=err/adx; + if(dy<0)return(y0-off); + return(y0+off); +@@ -291,7 +273,7 @@ + return i; + } + +-static float FLOOR1_fromdB_LOOKUP[256]={ ++static const float FLOOR1_fromdB_LOOKUP[256]={ + 1.0649863e-07F, 1.1341951e-07F, 1.2079015e-07F, 1.2863978e-07F, + 1.3699951e-07F, 1.4590251e-07F, 1.5538408e-07F, 1.6548181e-07F, + 1.7623575e-07F, 1.8768855e-07F, 1.9988561e-07F, 2.128753e-07F, +@@ -417,7 +399,6 @@ + int x0, int x1,lsfit_acc *a, + int n,vorbis_info_floor1 *info){ + long i; +- int quantized=vorbis_dBquant(flr+x0); + + long xa=0,ya=0,x2a=0,y2a=0,xya=0,na=0, xb=0,yb=0,x2b=0,y2b=0,xyb=0,nb=0; + +@@ -500,25 +481,27 @@ + xy+= *y1 * x1; + an++; + } +- ++ + if(an){ + /* need 64 bit multiplies, which C doesn't give portably as int */ + double fx=x; + double fy=y; + double fx2=x2; + double fxy=xy; +- double denom=1./(an*fx2-fx*fx); +- double a=(fy*fx2-fxy*fx)*denom; +- double b=(an*fxy-fx*fy)*denom; ++ double a, b, denom=an*fx2-fx*fx; ++ if(denom==0)denom=1.; ++ else denom=1./denom; ++ a=(fy*fx2-fxy*fx)*denom; ++ b=(an*fxy-fx*fy)*denom; + *y0=rint(a+b*x0); + *y1=rint(a+b*x1); +- ++ + /* limit to our range! */ + if(*y0>1023)*y0=1023; + if(*y1>1023)*y1=1023; + if(*y0<0)*y0=0; + if(*y1<0)*y1=0; +- ++ + }else{ + *y0=0; + *y1=0; +@@ -531,7 +514,7 @@ + + for(i=0;imaxover*info->maxover/n>info->maxerr)return(0); + if(info->maxunder*info->maxunder/n>info->maxerr)return(0); + if(mse/n>info->maxerr)return(1); +@@ -595,8 +578,6 @@ + return (A[pos]+B[pos])>>1; + } + +-static int seq=0; +- + int *floor1_fit(vorbis_block *vb,vorbis_look_floor1 *look, + const float *logmdct, /* in */ + const float *logmask){ +@@ -650,7 +631,7 @@ + int sortpos=look->reverse_index[i]; + int ln=loneighbor[sortpos]; + int hn=hineighbor[sortpos]; +- ++ + /* eliminate repeat searches of a particular range with a memo */ + if(memo[ln]!=hn){ + /* haven't performed this error search yet */ +@@ -664,7 +645,7 @@ + int hx=info->postlist[hn]; + int ly=post_Y(fit_valueA,fit_valueB,ln); + int hy=post_Y(fit_valueA,fit_valueB,hn); +- ++ + if(ly==-1 || hy==-1){ + exit(1); + } +@@ -677,7 +658,7 @@ + int hy1=-200; + fit_line(fits+lsortpos,sortpos-lsortpos,&ly0,&ly1); + fit_line(fits+sortpos,hsortpos-sortpos,&hy0,&hy1); +- ++ + /* store new edge values */ + fit_valueB[ln]=ly0; + if(ln==0)fit_valueA[ln]=ly0; +@@ -685,7 +666,7 @@ + fit_valueB[i]=hy0; + fit_valueA[hn]=hy1; + if(hn==1)fit_valueB[hn]=hy1; +- ++ + if(ly1>=0 || hy0>=0){ + /* store new neighbor values */ + for(j=sortpos-1;j>=0;j--) +@@ -698,22 +679,22 @@ + loneighbor[j]=i; + else + break; +- ++ + } + }else{ +- ++ + fit_valueA[i]=-200; + fit_valueB[i]=-200; + } + } + } + } +- ++ + output=_vorbis_block_alloc(vb,sizeof(*output)*posts); +- ++ + output[0]=post_Y(fit_valueA,fit_valueB,0); + output[1]=post_Y(fit_valueA,fit_valueB,1); +- ++ + /* fill in posts marked as not using a fit; we will zero + back out to 'unused' when encoding them so long as curve + interpolation doesn't force them into use */ +@@ -724,10 +705,10 @@ + int x1=info->postlist[hn]; + int y0=output[ln]; + int y1=output[hn]; +- ++ + int predicted=render_point(x0,x1,y0,y1,info->postlist[i]); + int vx=post_Y(fit_valueA,fit_valueB,i); +- ++ + if(vx>=0 && predicted!=vx){ + output[i]=vx; + }else{ +@@ -737,7 +718,7 @@ + } + + return(output); +- ++ + } + + int *floor1_interpolate_fit(vorbis_block *vb,vorbis_look_floor1 *look, +@@ -747,10 +728,10 @@ + long i; + long posts=look->posts; + int *output=NULL; +- ++ + if(A && B){ + output=_vorbis_block_alloc(vb,sizeof(*output)*posts); +- ++ + for(i=0;i>16; + if(A[i]&0x8000 && B[i]&0x8000)output[i]|=0x8000; +@@ -767,13 +748,11 @@ + + long i,j; + vorbis_info_floor1 *info=look->vi; +- long n=look->n; + long posts=look->posts; + codec_setup_info *ci=vb->vd->vi->codec_setup; + int out[VIF_POSIT+2]; + static_codebook **sbooks=ci->book_param; + codebook *books=ci->fullbooks; +- static long seq=0; + + /* quantize values to multiplier spec */ + if(post){ +@@ -807,9 +786,9 @@ + int x1=info->postlist[hn]; + int y0=post[ln]; + int y1=post[hn]; +- ++ + int predicted=render_point(x0,x1,y0,y1,info->postlist[i]); +- ++ + if((post[i]&0x8000) || (predicted==post[i])){ + post[i]=predicted|0x8000; /* in case there was roundoff jitter + in interpolation */ +@@ -842,18 +821,18 @@ + post[hn]&=0x7fff; + } + } +- ++ + /* we have everything we need. pack it out */ + /* mark nontrivial floor */ + oggpack_write(opb,1,1); +- ++ + /* beginning/end post */ + look->frames++; + look->postbits+=ilog(look->quant_q-1)*2; + oggpack_write(opb,out[0],ilog(look->quant_q-1)); + oggpack_write(opb,out[1],ilog(look->quant_q-1)); +- +- ++ ++ + /* partition by partition */ + for(i=0,j=2;ipartitions;i++){ + int class=info->partitionclass[i]; +@@ -914,7 +893,7 @@ + out[j+k],opb); + /*else + fprintf(stderr,"+!");*/ +- ++ + #ifdef TRAIN_FLOOR1 + { + FILE *of; +@@ -930,7 +909,7 @@ + } + j+=cdim; + } +- ++ + { + /* generate quantized floor equivalent to what we'd unpack in decode */ + /* render the lines */ +@@ -941,7 +920,7 @@ + int current=look->forward_index[j]; + int hy=post[current]&0x7fff; + if(hy==post[current]){ +- ++ + hy*=info->mult; + hx=info->postlist[current]; + +@@ -951,14 +930,12 @@ + ly=hy; + } + } +- for(j=hx;jpcmend/2;j++)ilogmask[j]=ly; /* be certain */ +- seq++; ++ for(j=hx;jpcmend/2;j++)ilogmask[j]=ly; /* be certain */ + return(1); + } + }else{ + oggpack_write(opb,0,1); + memset(ilogmask,0,vb->pcmend/2*sizeof(*ilogmask)); +- seq++; + return(0); + } + } +@@ -967,9 +944,9 @@ + vorbis_look_floor1 *look=(vorbis_look_floor1 *)in; + vorbis_info_floor1 *info=look->vi; + codec_setup_info *ci=vb->vd->vi->codec_setup; +- ++ + int i,j,k; +- codebook *books=ci->fullbooks; ++ codebook *books=ci->fullbooks; + + /* unpack wrapped/predicted values from stream */ + if(oggpack_read(&vb->opb,1)==1){ +@@ -1078,7 +1055,7 @@ + ly=hy; + } + } +- for(j=hx;j header packets +- last mod: $Id: info.c 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: info.c 2008-09-15 aoyumi $ + + ********************************************************************/ + +@@ -31,6 +31,9 @@ + #include "misc.h" + #include "os.h" + ++#define GENERAL_VENDOR_STRING "aoTuV Beta 5.7" ++#define ENCODE_VENDOR_STRING "AO; aoTuV b5d [20090301] (based on Xiph.Org's libVorbis)" ++ + /* helpers */ + static int ilog2(unsigned int v){ + int ret=0; +@@ -42,7 +45,7 @@ + return(ret); + } + +-static void _v_writestring(oggpack_buffer *o,char *s, int bytes){ ++static void _v_writestring(oggpack_buffer *o,const char *s, int bytes){ + + while(bytes--){ + oggpack_write(o,*s++,8); +@@ -59,7 +62,7 @@ + memset(vc,0,sizeof(*vc)); + } + +-void vorbis_comment_add(vorbis_comment *vc,char *comment){ ++void vorbis_comment_add(vorbis_comment *vc,const char *comment){ + vc->user_comments=_ogg_realloc(vc->user_comments, + (vc->comments+2)*sizeof(*vc->user_comments)); + vc->comment_lengths=_ogg_realloc(vc->comment_lengths, +@@ -71,7 +74,7 @@ + vc->user_comments[vc->comments]=NULL; + } + +-void vorbis_comment_add_tag(vorbis_comment *vc, char *tag, char *contents){ ++void vorbis_comment_add_tag(vorbis_comment *vc, const char *tag, const char *contents){ + char *comment=alloca(strlen(tag)+strlen(contents)+2); /* +2 for = and \0 */ + strcpy(comment, tag); + strcat(comment, "="); +@@ -91,7 +94,7 @@ + return 0; + } + +-char *vorbis_comment_query(vorbis_comment *vc, char *tag, int count){ ++char *vorbis_comment_query(vorbis_comment *vc, const char *tag, int count){ + long i; + int found = 0; + int taglen = strlen(tag)+1; /* +1 for the = we append */ +@@ -112,7 +115,7 @@ + return NULL; /* didn't find anything */ + } + +-int vorbis_comment_query_count(vorbis_comment *vc, char *tag){ ++int vorbis_comment_query_count(vorbis_comment *vc, const char *tag){ + int i,count=0; + int taglen = strlen(tag)+1; /* +1 for the = we append */ + char *fulltag = alloca(taglen+1); +@@ -130,10 +133,12 @@ + void vorbis_comment_clear(vorbis_comment *vc){ + if(vc){ + long i; +- for(i=0;icomments;i++) +- if(vc->user_comments[i])_ogg_free(vc->user_comments[i]); +- if(vc->user_comments)_ogg_free(vc->user_comments); +- if(vc->comment_lengths)_ogg_free(vc->comment_lengths); ++ if(vc->user_comments){ ++ for(i=0;icomments;i++) ++ if(vc->user_comments[i])_ogg_free(vc->user_comments[i]); ++ _ogg_free(vc->user_comments); ++ } ++ if(vc->comment_lengths)_ogg_free(vc->comment_lengths); + if(vc->vendor)_ogg_free(vc->vendor); + memset(vc,0,sizeof(*vc)); + } +@@ -236,17 +241,21 @@ + int i; + int vendorlen=oggpack_read(opb,32); + if(vendorlen<0)goto err_out; ++ if(vendorlen+8>opb->storage)goto err_out; + vc->vendor=_ogg_calloc(vendorlen+1,1); + _v_readstring(opb,vc->vendor,vendorlen); +- vc->comments=oggpack_read(opb,32); +- if(vc->comments<0)goto err_out; ++ i=oggpack_read(opb,32); ++ if(i<0)goto err_out; ++ if(4*i+oggpack_bytes(opb)>opb->storage)goto err_out; ++ vc->comments=i; + vc->user_comments=_ogg_calloc(vc->comments+1,sizeof(*vc->user_comments)); + vc->comment_lengths=_ogg_calloc(vc->comments+1, sizeof(*vc->comment_lengths)); + + for(i=0;icomments;i++){ + int len=oggpack_read(opb,32); + if(len<0)goto err_out; +- vc->comment_lengths[i]=len; ++ if(len+oggpack_bytes(opb)>opb->storage)goto err_out; ++ vc->comment_lengths[i]=len; + vc->user_comments[i]=_ogg_calloc(len+1,1); + _v_readstring(opb,vc->user_comments[i],len); + } +@@ -451,8 +460,7 @@ + } + + static int _vorbis_pack_comment(oggpack_buffer *opb,vorbis_comment *vc){ +- char temp[]="Xiph.Org libVorbis I 20070622"; +- int bytes = strlen(temp); ++ int bytes = strlen(ENCODE_VENDOR_STRING); + + /* preamble */ + oggpack_write(opb,0x03,8); +@@ -460,7 +468,7 @@ + + /* vendor */ + oggpack_write(opb,bytes,32); +- _v_writestring(opb,temp, bytes); ++ _v_writestring(opb,ENCODE_VENDOR_STRING, bytes); + + /* comments */ + +@@ -642,3 +650,7 @@ + return((double)granulepos/v->vi->rate); + return(-1); + } ++ ++const char *vorbis_version_string(void){ ++ return GENERAL_VENDOR_STRING; ++} +diff -ruN libvorbis-1.2.0/lib/lookup_data.h aotuv-b5.7_20090301/lib/lookup_data.h +--- libvorbis-1.2.0/lib/lookup_data.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/lookup_data.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: lookup data; generated by lookups.pl; edit there +- last mod: $Id: lookup_data.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: lookup_data.h 13631 2007-08-26 01:17:24Z erikd $ + + ********************************************************************/ + +@@ -98,6 +98,8 @@ + #define FROMdB_SHIFT 5 + #define FROMdB2_SHIFT 3 + #define FROMdB2_MASK 31 ++ ++#ifdef FLOAT_LOOKUP + static float FROMdB_LOOKUP[FROMdB_LOOKUP_SZ]={ + 1.f, 0.6309573445f, 0.3981071706f, 0.2511886432f, + 0.1584893192f, 0.1f, 0.06309573445f, 0.03981071706f, +@@ -120,6 +122,7 @@ + 0.7028699885f, 0.6928273125f, 0.6829281272f, 0.6731703824f, + 0.6635520573f, 0.6540711597f, 0.6447257262f, 0.6355138211f, + }; ++#endif + + #ifdef INT_LOOKUP + +diff -ruN libvorbis-1.2.0/lib/lpc.c aotuv-b5.7_20090301/lib/lpc.c +--- libvorbis-1.2.0/lib/lpc.c 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/lpc.c 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: LPC low level routines +- last mod: $Id: lpc.c 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: lpc.c 13657 2007-08-30 02:40:29Z xiphmont $ + + ********************************************************************/ + +@@ -62,6 +62,7 @@ + double *aut=alloca(sizeof(*aut)*(m+1)); + double *lpc=alloca(sizeof(*lpc)*(m)); + double error; ++ double epsilon; + int i,j; + + /* autocorrelation, p+1 lag coefficients */ +@@ -74,14 +75,16 @@ + + /* Generate lpc coefficients from autocorr values */ + +- error=aut[0]; +- ++ /* set our noise floor to about -100dB */ ++ error=aut[0] * (1. + 1e-10); ++ epsilon=1e-9*aut[0]+1e-10; ++ + for(i=0;ivd; +@@ -246,11 +236,14 @@ + codec_setup_info *ci=vi->codec_setup; + private_state *b=vb->vd->backend_state; + vorbis_block_internal *vbi=(vorbis_block_internal *)vb->internal; ++ vorbis_info_floor1 *vif=ci->floor_param[vb->W]; + int n=vb->pcmend; + int i,j,k; + + int *nonzero = alloca(sizeof(*nonzero)*vi->channels); + float **gmdct = _vorbis_block_alloc(vb,vi->channels*sizeof(*gmdct)); ++ float **gmdct_org = _vorbis_block_alloc(vb,vi->channels*sizeof(*gmdct_org)); ++ float **res_org = _vorbis_block_alloc(vb,vi->channels*sizeof(*res_org)); + int **ilogmaskch= _vorbis_block_alloc(vb,vi->channels*sizeof(*ilogmaskch)); + int ***floor_posts = _vorbis_block_alloc(vb,vi->channels*sizeof(*floor_posts)); + +@@ -259,11 +252,17 @@ + int blocktype=vbi->blocktype; + + int modenumber=vb->W; ++ int lowpass_residue; + vorbis_info_mapping0 *info=ci->map_param[modenumber]; + vorbis_look_psy *psy_look= + b->psy+blocktype+(vb->W?2:0); + + vb->mode=modenumber; ++ ++ if(modenumber)lowpass_residue=ci->block_lowpassr[1]; ++ else lowpass_residue=ci->block_lowpassr[0]; ++ if(lowpass_residue % psy_look->vi->normal_partition) ++ lowpass_residue=(lowpass_residue/psy_look->vi->normal_partition+1) * psy_look->vi->normal_partition; + + for(i=0;ichannels;i++){ + float scale=4.f/n; +@@ -273,6 +272,8 @@ + float *logfft =pcm; + + gmdct[i]=_vorbis_block_alloc(vb,n/2*sizeof(**gmdct)); ++ gmdct_org[i]=_vorbis_block_alloc(vb,n/2*sizeof(**gmdct_org)); ++ res_org[i]=_vorbis_block_alloc(vb,n/2*sizeof(**res_org)); + + scale_dB=todB(&scale) + .345; /* + .345 is a hack; the original + todB estimation used on IEEE 754 +@@ -290,27 +291,34 @@ + next major model upgrade. */ + + #if 0 +- if(vi->channels==2) ++ if(vi->channels==2){ + if(i==0) + _analysis_output("pcmL",seq,pcm,n,0,0,total-n/2); + else + _analysis_output("pcmR",seq,pcm,n,0,0,total-n/2); ++ }else{ ++ _analysis_output("pcm",seq,pcm,n,0,0,total-n/2); ++ } + #endif + + /* window the PCM data */ + _vorbis_apply_window(pcm,b->window,ci->blocksizes,vb->lW,vb->W,vb->nW); + + #if 0 +- if(vi->channels==2) ++ if(vi->channels==2){ + if(i==0) + _analysis_output("windowedL",seq,pcm,n,0,0,total-n/2); + else + _analysis_output("windowedR",seq,pcm,n,0,0,total-n/2); ++ }else{ ++ _analysis_output("windowed",seq,pcm,n,0,0,total-n/2); ++ } + #endif + + /* transform the PCM data */ + /* only MDCT right now.... */ + mdct_forward(b->transform[vb->W][0],pcm,gmdct[i]); ++ memcpy(gmdct_org[i], gmdct[i], n/2*sizeof(**gmdct_org)); + + /* FFT yields more accurate tonal estimation (not phase sensitive) */ + drft_forward(&b->fft_look[vb->W],pcm); +@@ -359,6 +367,8 @@ + }else{ + _analysis_output("fftR",seq,logfft,n/2,1,0,0); + } ++ }else{ ++ _analysis_output("fft",seq,logfft,n/2,1,0,0); + } + #endif + +@@ -380,6 +390,11 @@ + + float *logmdct =logfft+n/2; + float *logmask =logfft; ++ ++ float *lastmdct = b->nblock+i*256; ++ float *tempmdct = b->tblock+i*256; ++ ++ float *lowcomp = b->lownoise_compand_level+i; + + vb->mode=modenumber; + +@@ -419,7 +434,15 @@ + us a tonality estimate (the larger the value in the + 'noise_depth' vector, the more tonal that area is) */ + ++ *lowcomp= ++ lb_loudnoise_fix(psy_look, ++ *lowcomp, ++ logmdct, ++ b->lW_modenumber, ++ blocktype, modenumber); ++ + _vp_noisemask(psy_look, ++ *lowcomp, + logmdct, + noise); /* noise does not have by-frequency offset + bias applied yet */ +@@ -429,6 +452,8 @@ + _analysis_output("noiseL",seq,noise,n/2,1,0,0); + else + _analysis_output("noiseR",seq,noise,n/2,1,0,0); ++ }else{ ++ _analysis_output("noise",seq,noise,n/2,1,0,0); + } + #endif + +@@ -448,6 +473,8 @@ + _analysis_output("toneL",seq,tone,n/2,1,0,0); + else + _analysis_output("toneR",seq,tone,n/2,1,0,0); ++ }else{ ++ _analysis_output("tone",seq,tone,n/2,1,0,0); + } + #endif + +@@ -465,9 +492,16 @@ + noise, + tone, + 1, ++ vorbis_bitrate_managed(vb), + logmask, + mdct, +- logmdct); ++ logmdct, ++ lastmdct, tempmdct, ++ *lowcomp, ++ vif->n, ++ blocktype, modenumber, ++ vb->nW, ++ b->lW_blocktype, b->lW_modenumber, b->lW_no, b->impadnum); + + #if 0 + if(vi->channels==2){ +@@ -475,6 +509,8 @@ + _analysis_output("aotuvM1_L",seq,aotuv,psy_look->n,1,1,0); + else + _analysis_output("aotuvM1_R",seq,aotuv,psy_look->n,1,1,0); ++ }else{ ++ _analysis_output("aotuvM1",seq,aotuv,psy_look->n,1,1,0); + } + } + #endif +@@ -486,6 +522,8 @@ + _analysis_output("mask1L",seq,logmask,n/2,1,0,0); + else + _analysis_output("mask1R",seq,logmask,n/2,1,0,0); ++ }else{ ++ _analysis_output("mask1",seq,logmask,n/2,1,0,0); + } + #endif + +@@ -499,6 +537,7 @@ + logmdct, + logmask); + ++ + /* are we managing bitrate? If so, perform two more fits for + later rate tweaking (fits represent hi/lo) */ + if(vorbis_bitrate_managed(vb) && floor_posts[i][PACKETBLOBS/2]){ +@@ -508,9 +547,16 @@ + noise, + tone, + 2, ++ vorbis_bitrate_managed(vb), + logmask, + mdct, +- logmdct); ++ logmdct, ++ lastmdct, tempmdct, ++ *lowcomp, ++ vif->n, ++ blocktype, modenumber, ++ vb->nW, ++ b->lW_blocktype, b->lW_modenumber, b->lW_no, b->impadnum); + + #if 0 + if(vi->channels==2){ +@@ -518,6 +564,8 @@ + _analysis_output("mask2L",seq,logmask,n/2,1,0,0); + else + _analysis_output("mask2R",seq,logmask,n/2,1,0,0); ++ }else{ ++ _analysis_output("mask2",seq,logmask,n/2,1,0,0); + } + #endif + +@@ -531,16 +579,26 @@ + noise, + tone, + 0, ++ vorbis_bitrate_managed(vb), + logmask, + mdct, +- logmdct); ++ logmdct, ++ lastmdct, tempmdct, ++ *lowcomp, ++ vif->n, ++ blocktype, modenumber, ++ vb->nW, ++ b->lW_blocktype, b->lW_modenumber, b->lW_no, b->impadnum); + + #if 0 +- if(vi->channels==2) ++ if(vi->channels==2){ + if(i==0) + _analysis_output("mask0L",seq,logmask,n/2,1,0,0); + else + _analysis_output("mask0R",seq,logmask,n/2,1,0,0); ++ }else{ ++ _analysis_output("mask0",seq,logmask,n/2,1,0,0); ++ } + #endif + + floor_posts[i][0]= +@@ -586,25 +644,22 @@ + float **couple_bundle=alloca(sizeof(*couple_bundle)*vi->channels); + int *zerobundle=alloca(sizeof(*zerobundle)*vi->channels); + int **sortindex=alloca(sizeof(*sortindex)*vi->channels); +- float **mag_memo; +- int **mag_sort; ++ float **mag_memo=NULL; ++ int **mag_sort=NULL; + + if(info->coupling_steps){ + mag_memo=_vp_quantize_couple_memo(vb, + &ci->psy_g_param, + psy_look, + info, +- gmdct); ++ gmdct, ++ lowpass_residue); + + mag_sort=_vp_quantize_couple_sort(vb, + psy_look, + info, +- mag_memo); +- +- hf_reduction(&ci->psy_g_param, +- psy_look, +- info, +- mag_memo); ++ mag_memo, ++ lowpass_residue); + } + + memset(sortindex,0,sizeof(*sortindex)*vi->channels); +@@ -612,7 +667,7 @@ + for(i=0;ichannels;i++){ + float *mdct =gmdct[i]; + sortindex[i]=alloca(sizeof(**sortindex)*n/2); +- _vp_noise_normalize_sort(psy_look,mdct,sortindex[i]); ++ _vp_noise_normalize_sort(psy_look,mdct,sortindex[i],lowpass_residue); + } + } + +@@ -636,7 +691,9 @@ + for(i=0;ichannels;i++){ + int submap=info->chmuxlist[i]; + float *mdct =gmdct[i]; ++ float *mdct_org=gmdct_org[i]; + float *res =vb->pcm[i]; ++ float *resorgch=res_org[i]; + int *ilogmask=ilogmaskch[i]= + _vorbis_block_alloc(vb,n/2*sizeof(**gmdct)); + +@@ -659,7 +716,17 @@ + res, + ci->psy_g_param.sliding_lowpass[vb->W][k]); + +- _vp_noise_normalize(psy_look,res,res+n/2,sortindex[i]); ++ /* stereo threshold */ ++ _vp_remove_floor(psy_look, ++ mdct_org, ++ ilogmask, ++ resorgch, ++ ci->psy_g_param.sliding_lowpass[vb->W][k]); ++ ++ ++ _vp_noise_normalize(psy_look,res,res+n/2,sortindex[i], ++ blocktype, modenumber, ++ lowpass_residue); + + + #if 0 +@@ -691,7 +758,10 @@ + mag_sort, + ilogmaskch, + nonzero, +- ci->psy_g_param.sliding_lowpass[vb->W][k]); ++ ci->psy_g_param.sliding_lowpass[vb->W][k], ++ blocktype, modenumber, ++ gmdct, res_org, ++ lowpass_residue); + } + + /* classify and encode by submap */ +@@ -711,13 +781,37 @@ + + classifications=_residue_P[ci->residue_type[resnum]]-> + class(vb,b->residue[resnum],couple_bundle,zerobundle,ch_in_bundle); +- ++ ++ /* couple_bundle is destructively overwritten by ++ the class function if some but not all of the channels are ++ marked as silence; build a fresh copy */ ++ ch_in_bundle=0; ++ for(j=0;jchannels;j++) ++ if(info->chmuxlist[j]==i) ++ couple_bundle[ch_in_bundle++]=vb->pcm[j]+n/2; ++ + _residue_P[ci->residue_type[resnum]]-> + forward(opb,vb,b->residue[resnum], + couple_bundle,NULL,zerobundle,ch_in_bundle,classifications); + } + ++ /* set last-window type & number */ ++ // if (last window == impulse) && (present window == padding) impadnum=1 ++ if(!b->lW_modenumber && !b->lW_blocktype && !modenumber && blocktype) b->impadnum=1; ++ else if(b->impadnum) b->impadnum++; ++ if(modenumber) b->impadnum=0; // if (present window == (long or trans.) ) impadnum=0 [reset] ++ // if (current block type == last block type) lW_no++ ++ if((blocktype == b->lW_blocktype) && (modenumber == b->lW_modenumber)) b->lW_no++; ++ else b->lW_no = 1; ++ b->lW_blocktype = blocktype; ++ b->lW_modenumber = modenumber; + /* ok, done encoding. Next protopacket. */ ++ ++ // block type ++ /*if(modenumber && blocktype)printf("[L]\n"); ++ else if(modenumber && !blocktype)printf("[T]\n"); ++ else if(!modenumber && blocktype)printf("[P]\n"); ++ else if(!modenumber && !blocktype)printf("[I]\n");*/ + } + + } +@@ -735,7 +829,6 @@ + codec_setup_info *ci=vi->codec_setup; + private_state *b=vd->backend_state; + vorbis_info_mapping0 *info=(vorbis_info_mapping0 *)l; +- int hs=ci->halfrate_flag; + + int i,j; + long n=vb->pcmend=ci->blocksizes[vb->W]; +@@ -834,7 +927,7 @@ + } + + /* export hooks */ +-vorbis_func_mapping mapping0_exportbundle={ ++const vorbis_func_mapping mapping0_exportbundle={ + &mapping0_pack, + &mapping0_unpack, + &mapping0_free_info, +diff -ruN libvorbis-1.2.0/lib/masking.h aotuv-b5.7_20090301/lib/masking.h +--- libvorbis-1.2.0/lib/masking.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/masking.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: masking curve data for psychoacoustics +- last mod: $Id: masking.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: masking.h 2009-03-11 aoyumi $ + + ********************************************************************/ + +@@ -22,17 +22,30 @@ + overly for only a bin or two of savings. */ + + #define MAX_ATH 88 +-static 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, +- /*125*/ -75, -76, -77, -78, -80, -81, -82, -83, +- /*250*/ -84, -85, -86, -87, -88, -88, -89, -89, +- /*500*/ -90, -91, -91, -92, -93, -94, -95, -96, +- /*1k*/ -96, -97, -98, -98, -99, -99,-100,-100, +- /*2k*/ -101,-102,-103,-104,-106,-107,-107,-107, +- /*4k*/ -107,-105,-103,-102,-101, -99, -98, -96, +- /*8k*/ -95, -95, -96, -97, -96, -95, -93, -90, ++static const float ATH[]={ ++/* original 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, ++ /*125*/ // -75, -76, -77, -78, -80, -81, -82, -83, ++ /*250*/ //-84, -85, -86, -87, -88, -88, -89, -89, ++ /*500*/ //-90, -91, -91, -92, -93, -94, -95, -96, ++ /*1k*/ //-96, -97, -98, -98, -99, -99,-100,-100, ++ /*2k*/ //-101,-102,-103,-104,-106,-107,-107,-107, ++ /*4k*/ //-107,-105,-103,-102,-101, -99, -98, -96, ++ /*8k*/ //-95, -95, -96, -97, -96, -95, -93, -90, ++ /*16k*/ //-80, -70, -50, -40, -30, -30, -30, -30 ++/*Aoyumi's ATH (v6) */ ++ /*15*/ -31, -33, -35, -37, -39, -41, -43, -45, ++ /*31*/ -47, -49, -51, -53, -55, -57, -59, -61, ++ /*63*/ -63, -65, -67, -69, -71, -73, -75, -77, ++ /*125*/ -79, -81, -83, -84, -85, -86, -87, -88, ++ /*250*/ -89, -90, -91, -92, -93, -94, -95, -96, ++ /*500*/ -96, -97, -97, -97, -98, -98, -98, -99, ++ /*1k*/ -98, -97, -97, -98, -99,-100,-101,-101, ++ /*2k*/ -102,-103,-104,-105,-106,-106,-107,-107, ++ /*4k*/ -105,-104,-103,-102,-101, -99, -98, -97, ++ /*8k*/ -96, -95, -95, -96, -97, -97, -93, -89, + /*16k*/ -80, -70, -50, -40, -30, -30, -30, -30 + }; + +@@ -48,7 +61,7 @@ + /* (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, +diff -ruN libvorbis-1.2.0/lib/misc.h aotuv-b5.7_20090301/lib/misc.h +--- libvorbis-1.2.0/lib/misc.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/misc.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: miscellaneous prototypes +- last mod: $Id: misc.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: misc.h 14600 2008-03-18 17:41:06Z xiphmont $ + + ********************************************************************/ + +@@ -29,6 +29,7 @@ + #ifdef DEBUG_MALLOC + + #define _VDBG_GRAPHFILE "malloc.m" ++#undef _VDBG_GRAPHFILE + extern void *_VDBG_malloc(void *ptr,long bytes,char *file,long line); + extern void _VDBG_free(void *ptr,char *file,long line); + +diff -ruN libvorbis-1.2.0/lib/modes/floor_all.h aotuv-b5.7_20090301/lib/modes/floor_all.h +--- libvorbis-1.2.0/lib/modes/floor_all.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/modes/floor_all.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: key floor settings +- last mod: $Id: floor_all.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: floor_all.h 2009-03-11 aoyumi $ + + ********************************************************************/ + +@@ -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 @@ + &_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 @@ + &_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 @@ + &_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 @@ + &_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 @@ + &_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 @@ + &_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 @@ + &_huff_book_line_512x17_3sub3, + }; + +-static static_codebook **_floor_books[10]={ ++static const static_codebook *const *const _floor_books[13]={ + _floor_128x4_books, + _floor_256x4_books, + _floor_128x7_books, +@@ -156,9 +156,12 @@ + _floor_1024x27_books, + _floor_2048x27_books, + _floor_512x17_books, ++ _floor_1024x27_books, ++ _floor_2048x27_books, ++ _floor_256x4low_books, + }; + +-static vorbis_info_floor1 _floor[10]={ ++static const vorbis_info_floor1 _floor[13]={ + /* 128 x 4 */ + { + 1,{0},{4},{2},{0}, +@@ -243,6 +246,31 @@ + + 60,30,500, 1,18., -1 /* lowpass! */ + }, ++ /* 1024 x 27 (44.1/48kHz low bitrate) */ ++ { ++ 8,{0,1,2,2,3,3,4,4},{3,4,3,4,3},{0,1,1,2,2},{-1,0,1,2,3}, ++ {{4},{5,6},{7,8},{-1,9,10,11},{-1,12,13,14}}, ++ 2,{0,1024, 93,23,358, 6,46,186,750, 14,33,65, 130,260,485, ++ 3,10,18,28, 39,55,79,111, 158,220,306, 418,650,560}, ++ ++ 60,30,500, 3,18., -1 /* lowpass */ ++ }, ++ /* 2048 x 27 (44.1/48kHz) */ ++ { ++ 8,{0,1,2,2,3,3,4,4},{3,4,3,4,3},{0,1,1,2,2},{-1,0,1,2,3}, ++ {{4},{5,6},{7,8},{-1,9,10,11},{-1,12,13,14}}, ++ 2,{0,2048, 186,46,716, 12,92,372,1500, 28,66,130, 260,520,970, ++ 6,20,36,56, 78,110,158,222, 316,440,612, 836,1300,1120}, ++ ++ 60,30,500, 3,18., -1 /* lowpass */ ++ }, ++ /* 512 x 4 (256 x 4) */ ++ { ++ 1,{0},{4},{2},{0}, ++ {{1,2,3,4}}, ++ 4,{0,512, 132,32,64,280}, + ++ 60,30,500, 1.,18., -1 ++ }, + }; + +diff -ruN libvorbis-1.2.0/lib/modes/psych_11.h aotuv-b5.7_20090301/lib/modes/psych_11.h +--- libvorbis-1.2.0/lib/modes/psych_11.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/modes/psych_11.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,29 +11,27 @@ + ******************************************************************** + + function: 11kHz settings +- last mod: $Id: psych_11.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: psych_11.h 2009-03-11 aoyumi $ + + ********************************************************************/ + +-static double _psy_lowpass_11[3]={4.5,5.5,30.,}; +- +-static 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]={ ++/* tonal masking curve level adjustments *************************/ ++static const vp_adjblock _vp_tonemask_adj_11[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, 2, 0,99,99,99}}, /* 0 */ +- {{-20,-20,-20,-20,-20,-16,-10, 0, 0, 0, 0, 5, 0, 0,99,99,99}}, /* 1 */ +- {{-20,-20,-20,-20,-20,-16,-10, 0, 0, 0, 0, 0, 0, 0,99,99,99}}, /* 2 */ ++ {{-16,-16,-16,-16,-16,-16,-10,-8,-4, 0, 0, 0, 3, 3,99,99,99}}, /* -2 */ ++ {{-16,-16,-16,-16,-16,-16,-10,-8,-4, 0, 0, 0, 0, 0,99,99,99}}, /* -1 */ ++ {{-20,-20,-20,-20,-20,-16,-10,-8,-4,-2, 0, 0, 0, 0,99,99,99}}, /* 0 */ ++ {{-20,-20,-20,-20,-20,-16,-10,-8,-4,-2, 0, 0, 0, 0,99,99,99}}, /* 10 */ + }; + +- +-static noise3 _psy_noisebias_11[3]={ ++/* noise bias */ ++static const noise3 _psy_noisebias_11[4]={ + /* 63 125 250 500 1k 2k 4k 8k 16k*/ ++ {{{-10,-10,-10,-10, -5, -5, -4, 2, 4, 10, 10, 12, 12, 12, 99, 99, 99}, ++ {-12,-12,-12,-12, -7, -7, -2, 3, 3, 4, 4, 5, 6, 12, 99, 99, 99}, ++ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, 99, 99, 99}}}, ++ + {{{-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}, + {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, 99, 99, 99}}}, +@@ -47,5 +45,16 @@ + {-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 }; ++/* tone master attenuation by base quality mode and bitrate tweak */ ++static const att3 _psy_tone_masteratt_11[4]={ ++ {{ 31, 28, 13}, 0, 0}, /* -2 */ ++ {{ 30, 28, 12}, 0, 0}, /* -1 */ ++ {{ 30, 26, 12}, 0, 0}, /* 0 */ ++ {{ 20, 0, -14}, 0, 0}, /* 10 */ ++}; ++ ++/* lowpass by mode **************/ ++static const double _psy_lowpass_11[4]={4.1,4.5,5.5,30.,}; + ++/* noise normalization **********/ ++static const double _noise_thresh_11[3]={ .3,.3,.5 }; +diff -ruN libvorbis-1.2.0/lib/modes/psych_16.h aotuv-b5.7_20090301/lib/modes/psych_16.h +--- libvorbis-1.2.0/lib/modes/psych_16.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/modes/psych_16.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,57 +11,33 @@ + ******************************************************************** + + function: 16kHz settings +- last mod: $Id: psych_16.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: psych_16.h 2009-03-11 aoyumi $ + + ********************************************************************/ + +-/* stereo mode by base quality level */ +-static 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}, +- { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 4, 4}, +- { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, +- {{ 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}, +- { 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4}, +- { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, +- {{ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3}, +- { 5, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3}, +- { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4}, +- { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, +- {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, +- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, +- { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8}, +- { 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 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]={ ++/* tonal masking curve level adjustments *************************/ ++static const vp_adjblock _vp_tonemask_adj_16[5]={ + /* 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 */ +- {{-20,-20,-20,-20,-20,-16,-10, 0, 0, 0, 0,10, 0, 0, 0, 0, 0}}, /* 1 */ +- {{-20,-20,-20,-20,-20,-16,-10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, /* 2 */ +- {{-30,-30,-30,-30,-30,-26,-20,-10, -5, 0, 0, 0, 0, 0, 0, 0, 0}}, /* 2 */ ++ {{-16,-16,-16,-16,-16,-16,-10, -8, -6,-2, 0, 0, 0, 0, 0, 0, 0}}, /* -2 */ ++ {{-16,-16,-16,-16,-16,-16,-10, -8, -6,-2, 0, 0, 0, 0, 0, 0, 0}}, /* -1 */ ++ {{-16,-16,-16,-16,-16,-16,-10, -8, -6,-4, 0, 0, 0, 0, 0, 0, 0}}, /* 0.5 */ ++ {{-20,-20,-20,-20,-20,-16,-10,-10, -8,-6,-2,-2, 0, 0, 0, 0, 0}}, /* 5 */ ++ {{-30,-30,-30,-30,-30,-26,-20,-10, -8,-6,-2,-2, 0, 0, 0, 0, 0}}, /* 10 */ + }; + +- +-static noise3 _psy_noisebias_16_short[4]={ ++/* noise bias */ ++static const noise3 _psy_noisebias_16_short[5]={ + /* 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, 4, 10, 10, 10, 10, 12, 12, 14, 20}, ++ {-12,-12,-12,-12,-12, -7, -7, -2, 3, 3, 4, 5, 6, 7, 8, 8, 15}, ++ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -6, -6}}}, ++ ++ {{{-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}, + {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -6, -6}}}, + +- {{{-15,-15,-15,-15,-15,-10,-10,-5, 4, 6, 6, 6, 6, 8, 10, 12, 20}, ++ {{{-15,-15,-15,-15,-15,-10,-10, -5, 4, 6, 6, 6, 6, 8, 10, 12, 20}, + {-15,-15,-15,-15,-15,-15,-15,-10, -5, -5, -5, 4, 5, 6, 8, 8, 15}, + {-30,-30,-30,-30,-30,-24,-20,-14,-10,-10,-10,-10,-10,-10,-10,-10,-10}}}, + +@@ -74,13 +50,17 @@ + {-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[5]={ + /* 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, 4, 10, 10, 10, 10, 12, 12, 14, 20}, ++ {-12,-12,-12,-12,-12, -7, -7, -2, 3, 3, 4, 5, 6, 7, 8, 8, 15}, ++ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -6, -6}}}, ++ ++ {{{-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}, + {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -6, -6}}}, + +- {{{-15,-15,-15,-15,-15,-10,-10,-5, 4, 4, 4, 4, 5, 5, 6, 8, 15}, ++ {{{-15,-15,-15,-15,-15,-10,-10, -5, 4, 4, 4, 4, 5, 5, 6, 8, 15}, + {-15,-15,-15,-15,-15,-15,-15,-10, -5, -5, -5, 0, 0, 0, 0, 4, 10}, + {-30,-30,-30,-30,-30,-24,-20,-14,-10,-10,-10,-10,-10,-10,-10,-10,-10}}}, + +@@ -93,9 +73,13 @@ + {-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[5]={ + /* 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, 2, 2, 2, 4, 5, 6, 8, 8, 15}, ++ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -6, -6}}}, ++ ++ {{{-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}, + {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -6, -6}}}, + +@@ -112,25 +96,62 @@ + {-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 int _noise_start_16[3]={ 256,256,9999 }; +-static int _noise_part_16[4]={ 8,8,8,8 }; ++/* ath ****************/ ++static const int _psy_ath_floater_16[5]={ ++ -100,-100,-100,-100,-105, ++}; ++static const int _psy_ath_abs_16[5]={ ++ -130,-130,-130,-130,-140, ++}; + +-static int _psy_ath_floater_16[4]={ +- -100,-100,-100,-105, ++/* stereo mode by base quality level */ ++static const adj_stereo _psy_stereo_modes_16[5]={ ++ /* 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, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4}, ++ { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 4, 4}, ++ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, ++ {{ 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}, ++ { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 4, 4}, ++ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, ++ {{ 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}, ++ { 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4}, ++ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, ++ {{ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3}, ++ { 5, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3}, ++ { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4}, ++ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, ++ {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, ++ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, ++ { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8}, ++ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, + }; + +-static int _psy_ath_abs_16[4]={ +- -130,-130,-130,-140, ++/* tone master attenuation by base quality mode and bitrate tweak */ ++static const att3 _psy_tone_masteratt_16[5]={ ++ {{ 30, 28, 12}, 0, 0}, /* -2 */ ++ {{ 30, 28, 12}, 0, 0}, /* -1 */ ++ {{ 25, 23, 12}, 0, 0}, /* 0.5 */ ++ {{ 20, 12, 0}, 0, 0}, /* 5 */ ++ {{ 15, 0, -14}, 0, 0}, /* 10 */ + }; + ++/* lowpass by mode **************/ ++static const double _psy_lowpass_16[5]={6.,6.5,8,30.,99.}; ++ ++/* noise normalization **********/ ++static const int _noise_start_16[4]={ 256,256,256,9999 }; ++ ++static const int _noise_part_16[4]={ 8,8,8,8 }; + ++static const double _noise_thresh_16[4]={ .3,.3,.5,.5 }; + +diff -ruN libvorbis-1.2.0/lib/modes/psych_44.h aotuv-b5.7_20090301/lib/modes/psych_44.h +--- libvorbis-1.2.0/lib/modes/psych_44.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/modes/psych_44.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,17 +11,33 @@ + ******************************************************************** + + function: key psychoacoustic settings for 44.1/48kHz +- last mod: $Id: psych_44.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: psych_44.h 2009-03-11 aoyumi $ + + ********************************************************************/ + + + /* preecho trigger settings *****************************************/ + +-static vorbis_info_psy_global _psy_global_44[5]={ +- ++static const vorbis_info_psy_global _psy_global_44[6]={ ++/* ++ { lines per eighth octave, ++ { pre-echo thresh.}, ++ { post-echo thresh.}, stretch penalty, pre-echo minimum energy, ++ ampmax att 1/sec, ++ {coupling point(kHz)},{{coupling point limit0},{coupling point limit1}}, ++ {coupling pre-point amp},{coupling post-point amp},{{sliding lowpass0},{sliding lowpass1}} ++ }, ++*/ ++/* q-2 */ ++ {8, /* lines per eighth octave */ ++ {24.f,16.f,16.f,16.f,16.f,16.f,14.f}, ++ {-60.f,-30.f,-40.f,-40.f,-40.f,-40.f,-40.f}, 2,-75.f, ++ -6.f, ++ {99.},{{99.},{99.}},{0},{0},{{0.},{0.}} ++ }, + {8, /* lines per eighth octave */ +- {20.f,14.f,12.f,12.f,12.f,12.f,12.f}, ++// {20.f,14.f,12.f,12.f,12.f,12.f,12.f}, ++ {20.f,14.f,14.f,14.f,14.f,14.f,14.f}, + {-60.f,-30.f,-40.f,-40.f,-40.f,-40.f,-40.f}, 2,-75.f, + -6.f, + {99.},{{99.},{99.}},{0},{0},{{0.},{0.}} +@@ -39,43 +55,61 @@ + {99.},{{99.},{99.}},{0},{0},{{0.},{0.}} + }, + {8, /* lines per eighth octave */ +- {10.f,8.f,8.f,8.f,8.f,8.f,8.f}, ++// {10.f,8.f,8.f,8.f,8.f,8.f,8.f}, ++ {8.f,8.f,8.f,6.f,6.f,6.f,7.f}, + {-20.f,-15.f,-12.f,-12.f,-12.f,-12.f,-12.f}, 0,-80.f, + -6.f, + {99.},{{99.},{99.}},{0},{0},{{0.},{0.}} + }, + {8, /* lines per eighth octave */ +- {10.f,6.f,6.f,6.f,6.f,6.f,6.f}, +- {-15.f,-15.f,-12.f,-12.f,-12.f,-12.f,-12.f}, 0,-85.f, ++// {10.f,6.f,6.f,6.f,6.f,6.f,6.f}, ++ {6.f,6.f,6.f,6.f,6.f,6.f,6.f}, ++// {-15.f,-15.f,-12.f,-12.f,-12.f,-12.f,-12.f}, 0,-85.f, ++ {-15.f,-14.f,-10.f,-10.f,-10.f,-11.f,-12.f}, 0,-85.f, + -6.f, + {99.},{{99.},{99.}},{0},{0},{{0.},{0.}} + }, + }; + + /* 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 */ +- 8, 9,10,11,12,13,14, 15, /* 15dB */ +- 16,17,18,19,20,21,22, 23, /* 23dB */ +- 24,25,26,27,28,29,30, 31, /* 31dB */ +- 32,33,34,35,36,37,38, 39, /* 39dB */ ++// 0, 1, 2, 3, 4, 5, 6, 7, /* 7dB */ ++// 8, 9,10,11,12,13,14, 15, /* 15dB */ ++// 16,17,18,19,20,21,22, 23, /* 23dB */ ++// 24,25,26,27,28,29,30, 31, /* 31dB */ ++// 32,33,34,35,36,37,38, 39, /* 39dB */ ++ 0, 1, 2, 3, 4, 5, 6, 6, /* 7dB */ ++ 7, 7, 7, 8, 9, 9,10, 10, /* 15dB */ ++ 11,12,13,14,15,15,15, 15, /* 23dB */ ++ 16,16,17,17,17,18,18, 19, /* 31dB */ ++ 19,19,20,21,22,23,24, 25, /* 39dB */ + }}, + /* mode_Z nominal short */ + {{ ++// 0, 1, 2, 3, 4, 5, 6, 6, /* 7dB */ ++// 7, 7, 7, 7, 6, 6, 6, 7, /* 15dB */ ++// 7, 8, 9,10,11,12,13, 14, /* 23dB */ ++// 15,16,17,17,17,18,18, 19, /* 31dB */ ++// 19,19,20,21,22,23,24, 25, /* 39dB */ + 0, 1, 2, 3, 4, 5, 6, 6, /* 7dB */ +- 7, 7, 7, 7, 6, 6, 6, 7, /* 15dB */ ++ 7, 7, 7, 7, 7, 7, 7, 7, /* 15dB */ + 7, 8, 9,10,11,12,13, 14, /* 23dB */ + 15,16,17,17,17,18,18, 19, /* 31dB */ + 19,19,20,21,22,23,24, 25, /* 39dB */ + }}, + /* mode A short */ + {{ ++// 0, 1, 2, 3, 4, 5, 5, 5, /* 7dB */ ++// 6, 6, 6, 5, 4, 4, 4, 4, /* 15dB */ ++// 4, 4, 5, 5, 5, 6, 6, 6, /* 23dB */ ++// 7, 7, 7, 8, 8, 8, 9, 10, /* 31dB */ ++// 11,12,13,14,15,16,17, 18, /* 39dB */ + 0, 1, 2, 3, 4, 5, 5, 5, /* 7dB */ +- 6, 6, 6, 5, 4, 4, 4, 4, /* 15dB */ +- 4, 4, 5, 5, 5, 6, 6, 6, /* 23dB */ +- 7, 7, 7, 8, 8, 8, 9, 10, /* 31dB */ ++ 6, 6, 6, 6, 6, 6, 6, 6, /* 15dB */ ++ 6, 6, 6, 6, 6, 7, 7, 7, /* 23dB */ ++ 8, 8, 8, 9, 9, 9,10, 11, /* 31dB */ + 11,12,13,14,15,16,17, 18, /* 39dB */ + }}, + /* sub-mode Z long */ +@@ -96,172 +130,139 @@ + }}, + /* mode A long */ + {{ ++// 0, 1, 2, 3, 4, 5, 6, 7, /* 7dB */ ++// 8, 8, 7, 6, 5, 4, 4, 4, /* 15dB */ ++// 4, 4, 5, 5, 5, 6, 6, 6, /* 23dB */ ++// 7, 7, 7, 8, 8, 8, 9, 10, /* 31dB */ ++// 11,12,13,14,15,16,17, 18, /* 39dB */ + 0, 1, 2, 3, 4, 5, 6, 7, /* 7dB */ +- 8, 8, 7, 6, 5, 4, 4, 4, /* 15dB */ +- 4, 4, 5, 5, 5, 6, 6, 6, /* 23dB */ +- 7, 7, 7, 8, 8, 8, 9, 10, /* 31dB */ ++ 7, 7, 7, 6, 6, 6, 6, 6, /* 15dB */ ++ 6, 6, 6, 6, 6, 7, 7, 7, /* 23dB */ ++ 8, 8, 8, 9, 9, 9,10, 11, /* 31dB */ + 11,12,13,14,15,16,17, 18, /* 39dB */ + }} + }; + + /* tonal masking curve level adjustments *************************/ +- +-static vp_adjblock _vp_tonemask_adj_longblock[12]={ +- ++static const vp_adjblock _vp_tonemask_adj_longblock[13]={ + /* 63 125 250 500 1 2 4 8 16 */ +- +- {{ -3, -8,-13,-15,-10,-10,-10,-10,-10,-10,-10, 0, 0, 0, 0, 0, 0}}, /* -1 */ +- +-/* {{-15,-15,-15,-15,-10, -8, -4, -2, 0, 0, 0, 10, 0, 0, 0, 0, 0}}, 0 */ +- {{ -4,-10,-14,-16,-15,-14,-13,-12,-12,-12,-11, -1, -1, -1, -1, -1, 0}}, /* 0 */ +- +-/* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 5, 0, 0, 0, 0, 0}}, 1 */ +- {{ -6,-12,-14,-16,-15,-15,-14,-13,-13,-12,-12, -2, -2, -1, -1, -1, 0}}, /* 1 */ +- +-/* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, 2 */ +- {{-12,-13,-14,-16,-16,-16,-15,-14,-13,-12,-12, -6, -3, -1, -1, -1, 0}}, /* 2 */ +- +-/* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, 3 */ +- {{-15,-15,-15,-16,-16,-16,-16,-14,-13,-13,-13,-10, -4, -2, -1, -1, 0}}, /* 3 */ +- +-/* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, *//* 4 */ +- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-13,-11, -7 -3, -1, -1 , 0}}, /* 4 */ +- +-/* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, 5 */ +- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-13,-11, -7 -3, -1, -1 , 0}}, /* 5 */ +- +-/* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, 6 */ +- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -8, -4, -2, -2, 0}}, /* 6 */ +- +-/* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, 7 */ +- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 7 */ +- +-/* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, 8 */ +- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 8 */ +- +-/* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, 9 */ +- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 9 */ +- +-/* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, 10 */ +- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 10 */ ++ {{-16,-16,-16,-15,-15,-15,-15,-15,-14,-13,-12,-11,-11, -3, 1, 1, 6}}, /* -2(addition) */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-13,-13, -6, -2, -2, 3}}, /* -1 */ ++ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-13,-13, -7, -3, -3, 2}}, /* 0 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-13,-13, -9, -4, -4, 0}}, /* 1 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14, -9, -5, -4, 0}}, /* 2 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-10, -7, -6, 0}}, /* 3 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9, -9, 0}}, /* 4 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9, -9, 0}}, /* 5 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9,-10, 0}}, /* 6 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9,-10, 0}}, /* 7 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9,-10, 0}}, /* 8 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9,-10, 0}}, /* 9 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11,-10,-10, 0}}, /* 10 */ + }; +- +-static vp_adjblock _vp_tonemask_adj_otherblock[12]={ ++static const vp_adjblock _vp_tonemask_adj_otherblock[13]={ + /* 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 */ +- +-/* {{-20,-20,-20,-20,-14,-12,-10, -8, -4, 0, 0, 10, 0, 0, 0, 0, 0}}, 0 */ +- {{ -4,-10,-14,-16,-14,-13,-12,-12,-11,-11,-10, 0, 0, 0, 0, 0, 0}}, /* 0 */ +- +-/* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 5, 0, 0, 0, 0, 0}}, 1 */ +- {{ -6,-12,-14,-16,-15,-15,-14,-13,-13,-12,-12, -2, -2, -1, 0, 0, 0}}, /* 1 */ +- +-/* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 2 */ +- {{-12,-13,-14,-16,-16,-16,-15,-14,-13,-12,-12, -5, -2, -1, 0, 0, 0}}, /* 2 */ +- +-/* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 3 */ +- {{-15,-15,-15,-16,-16,-16,-16,-14,-13,-13,-13,-10, -4, -2, 0, 0, 0}}, /* 3 */ +- +-/* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 4 */ +- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-13,-11, -7 -3, -1, -1 , 0}}, /* 4 */ +- +-/* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 5 */ +- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-13,-11, -7 -3, -1, -1 , 0}}, /* 5 */ +- +-/* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 6 */ +- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -8, -4, -2, -2, 0}}, /* 6 */ +- +-/* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 7 */ +- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 7 */ +- +-/* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 8 */ +- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 8 */ +- +-/* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 9 */ +- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 9 */ +- +-/* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 10 */ +- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 10 */ ++ {{-16,-16,-16,-15,-15,-15,-15,-15,-14,-13,-12,-11,-11, -3, 1, 1, 6}}, /* -2(addition) */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-13,-13, -6, -2, -2, 3}}, /* -1 */ ++ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-13,-13, -7, -3, -3, 2}}, /* 0 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-13,-13, -9, -4, -4, 0}}, /* 1 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14, -9, -5, -4, 0}}, /* 2 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-10, -7, -6, 0}}, /* 3 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9, -9, 0}}, /* 4 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9, -9, 0}}, /* 5 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9,-10, 0}}, /* 6 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9,-10, 0}}, /* 7 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9,-10, 0}}, /* 8 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9,-10, 0}}, /* 9 */ ++ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11,-10,-10, 0}}, /* 10 */ + }; + + /* noise bias (transition block) */ +-static noise3 _psy_noisebias_trans[12]={ ++static const noise3 _psy_noisebias_trans[13]={ + /* 63 125 250 500 1k 2k 4k 8k 16k*/ +- /* -1 */ ++ /* -2(addition mode) */ + {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, ++ {-28,-28,-26,-26,-22,-18,-16, -8, -2, 2, 2, 2, 3, 5, 6, 7, 14}, ++ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}}, ++ /* -1 */ ++/*{{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, + {-30,-30,-30,-30,-26,-20,-16, -8, -6, -6, -2, 2, 2, 3, 6, 6, 15}, ++ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},*/ ++ {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, ++ {-30,-30,-28,-28,-24,-20,-18,-12, -4, 0, 0, 0, 1, 3, 4, 5, 12}, + {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}}, +- /* 0 +- {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 4, 4, 5, 5, 5, 8, 10}, ++ /* 0 */ ++/*{{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 4, 4, 5, 5, 5, 8, 10}, + {-30,-30,-30,-30,-26,-22,-20,-14, -8, -4, 0, 0, 0, 0, 2, 4, 10}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -4, -4, -4, -2}}},*/ +- {{{-15,-15,-15,-15,-15,-12, -6, -4, 0, 2, 4, 4, 5, 5, 5, 8, 10}, +- {-30,-30,-30,-30,-26,-22,-20,-14, -8, -4, 0, 0, 0, 0, 2, 3, 6}, +- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -4, -4, -4, -2}}}, +- /* 1 +- {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 4, 4, 5, 5, 5, 8, 10}, ++ {{{-15,-15,-15,-15,-15,-12, -6, -4, 0, 2, 4, 4, 5, 5, 5, 8, 10}, ++ {-30,-30,-30,-30,-26,-22,-20,-14, -6, 0, 0, 0, 1, 1, 2, 3, 8}, ++ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -4, -4, -4, -2}}}, ++ /* 1 */ ++/*{{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 4, 4, 5, 5, 5, 8, 10}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2, -2, -2, -2, 0, 2, 8}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -6, -6, -6, -4}}},*/ +- {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 4, 4, 5, 5, 5, 8, 10}, +- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2, -2, -2, -2, 0, 1, 4}, +- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -6, -6, -6, -4}}}, +- /* 2 +- {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10}, ++ {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 4, 4, 5, 5, 5, 8, 10}, ++ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2, -2, -2, -2, -1, 1, 4}, ++ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -6, -6, -6, -4}}}, ++ /* 2 */ ++/*{{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2, -2, -2, -2, 0, 2, 6}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}}, */ +- {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10}, +- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -2, -1, 0, 3}, ++ {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10}, ++ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -2, -2, -1, 1, 3}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -7, -4}}}, +- /* 3 +- {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 4, 5, 8}, ++ /* 3 */ ++/*{{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 4, 5, 8}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -1, 1, 6}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/ + {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 4, 5, 8}, +- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -2, 0, 2}, ++ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -2, 0, 3}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}}, +- /* 4 +- {{{-20,-20,-20,-20,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, ++ /* 4 */ ++/*{{{-20,-20,-20,-20,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -1, 1, 5}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/ + {{{-20,-20,-20,-20,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, +- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -2, -1, 1}, ++ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -2, 0, 1}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}}, +- /* 5 +- {{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, ++ /* 5 */ ++/*{{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, + {-32,-32,-32,-32,-28,-24,-22,-16,-12, -6, -4, -4, -4, -4, -2, -1, 2}, + {-34,-34,-34,-34,-30,-24,-24,-18,-14,-12,-12,-12,-12,-10,-10, -9, -5}}}, */ + {{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, + {-32,-32,-32,-32,-28,-24,-22,-16,-12, -6, -4, -4, -4, -4, -3, -1, 0}, + {-34,-34,-34,-34,-30,-24,-24,-18,-14,-12,-12,-12,-12,-10,-10, -9, -5}}}, +- /* 6 +- {{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, ++ /* 6 */ ++/*{{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, + {-32,-32,-32,-32,-28,-24,-24,-18,-14, -8, -6, -6, -6, -6, -4, -2, 1}, + {-34,-34,-34,-34,-30,-26,-24,-18,-17,-15,-15,-15,-15,-13,-13,-12, -8}}},*/ + {{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, +- {-32,-32,-32,-32,-28,-24,-24,-18,-14, -8, -6, -6, -6, -6, -5, -2, 0}, +- {-34,-34,-34,-34,-30,-26,-26,-24,-22,-19,-19,-19,-19,-18,-17,-16,-12}}}, +- /* 7 +- {{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, ++ {-34,-34,-34,-34,-30,-30,-24,-20,-14, -8, -6, -6, -6, -6, -4, -2, 0}, ++ {-34,-34,-34,-34,-30,-26,-24,-18,-17,-15,-15,-15,-15,-13,-13,-12, -8}}}, ++ /* 7 */ ++/*{{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, + {-32,-32,-32,-32,-28,-24,-24,-18,-14,-12,-10, -8, -8, -8, -6, -4, 0}, + {-34,-34,-34,-34,-30,-26,-26,-24,-22,-19,-19,-19,-19,-18,-17,-16,-12}}},*/ + {{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, +- {-32,-32,-32,-32,-28,-24,-24,-24,-18,-14,-12,-10,-10,-10, -8, -6, -2}, +- {-34,-34,-34,-34,-30,-26,-26,-26,-24,-24,-24,-24,-24,-24,-24,-20,-16}}}, +- /* 8 +- {{{-24,-24,-24,-24,-22,-20,-15,-10, -8, -2, 0, 0, 0, 1, 2, 3, 7}, ++ {-34,-34,-34,-34,-30,-30,-24,-20,-14,-12,-10, -8, -8, -8, -6, -4, 0}, ++ {-34,-34,-34,-34,-30,-26,-26,-24,-22,-19,-19,-19,-19,-18,-17,-16,-12}}}, ++ /* 8 */ ++/*{{{-24,-24,-24,-24,-22,-20,-15,-10, -8, -2, 0, 0, 0, 1, 2, 3, 7}, + {-36,-36,-36,-36,-30,-30,-30,-24,-18,-14,-12,-10,-10,-10, -8, -6, -2}, + {-36,-36,-36,-36,-34,-30,-28,-26,-24,-24,-24,-24,-24,-24,-24,-20,-16}}},*/ +- {{{-24,-24,-24,-24,-22,-20,-15,-10, -8, -2, 0, 0, 0, 1, 2, 3, 7}, +- {-36,-36,-36,-36,-30,-30,-30,-24,-20,-16,-16,-16,-16,-14,-12,-10, -7}, +- {-36,-36,-36,-36,-34,-30,-28,-26,-24,-30,-30,-30,-30,-30,-30,-24,-20}}}, +- /* 9 +- {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -4, -4, -4, -4, -4, -2, 2}, ++ {{{-24,-24,-24,-24,-22,-20,-15,-10, -8, -2, 0, 0, 0, 1, 2, 3, 7}, ++ {-34,-34,-34,-34,-30,-30,-30,-24,-18,-14,-12,-10,-10,-10, -8, -6, -2}, ++ {-36,-36,-36,-36,-34,-30,-28,-26,-24,-24,-24,-24,-24,-24,-24,-20,-16}}}, ++ /* 9 */ ++/*{{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -4, -4, -4, -4, -4, -2, 2}, + {-36,-36,-36,-36,-34,-32,-32,-28,-20,-16,-16,-16,-16,-14,-12,-10, -7}, + {-40,-40,-40,-40,-40,-40,-40,-32,-30,-30,-30,-30,-30,-30,-30,-24,-20}}},*/ + {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -4, -4, -4, -4, -4, -2, 2}, +- {-38,-38,-38,-38,-36,-34,-34,-30,-24,-20,-20,-20,-20,-18,-16,-12,-10}, +- {-40,-40,-40,-40,-40,-40,-40,-38,-35,-35,-35,-35,-35,-35,-35,-35,-30}}}, ++ {-36,-36,-36,-36,-32,-32,-32,-28,-20,-16,-16,-16,-16,-14,-12,-10, -7}, ++ {-40,-40,-40,-40,-40,-40,-40,-32,-30,-30,-30,-30,-30,-30,-30,-24,-20}}}, + /* 10 */ + {{{-30,-30,-30,-30,-30,-30,-30,-28,-20,-14,-14,-14,-14,-14,-14,-12,-10}, + {-40,-40,-40,-40,-40,-40,-40,-40,-35,-30,-30,-30,-30,-30,-30,-30,-20}, +@@ -269,65 +270,74 @@ + }; + + /* noise bias (long block) */ +-static noise3 _psy_noisebias_long[12]={ +- /*63 125 250 500 1k 2k 4k 8k 16k*/ ++static const noise3 _psy_noisebias_long[13]={ ++ /* 63 125 250 500 1k 2k 4k 8k 16k*/ ++ /* -2(addition mode) */ ++ {{{-10,-10,-10,-10,-10, -4, 0, 0, 2, 6, 6, 6, 6, 10, 10, 12, 20}, ++ {-20,-20,-20,-20,-20,-18,-12, -6, 0, 2, 2, 2, 3, 5, 6, 7, 14}, ++ {-20,-20,-20,-20,-20,-20,-20,-10, -6, -6, -6, -6, -6, -4, -4, -4, -2}}}, + /* -1 */ +- {{{-10,-10,-10,-10,-10, -4, 0, 0, 0, 6, 6, 6, 6, 10, 10, 12, 20}, +- {-20,-20,-20,-20,-20,-20,-10, -2, 0, 0, 0, 0, 0, 2, 4, 6, 15}, ++/*{{{-10,-10,-10,-10,-10, -4, 0, 0, 0, 6, 6, 6, 6, 10, 10, 12, 20}, ++ {-20,-20,-20,-20,-20,-20,-10, -2, 0, 0, 0, 0, 0, 2, 4, 6, 15}, ++ {-20,-20,-20,-20,-20,-20,-20,-10, -6, -6, -6, -6, -6, -4, -4, -4, -2}}},*/ ++ {{{-10,-10,-10,-10,-10, -4, 0, 0, 0, 6, 6, 6, 6, 10, 10, 12, 20}, ++ {-20,-20,-20,-20,-20,-18,-12, -8, -2, 0, 0, 0, 1, 3, 4, 5, 12}, + {-20,-20,-20,-20,-20,-20,-20,-10, -6, -6, -6, -6, -6, -4, -4, -4, -2}}}, +- + /* 0 */ +- /* {{{-10,-10,-10,-10,-10,-10, -8, 2, 2, 2, 4, 4, 5, 5, 5, 8, 10}, +- {-20,-20,-20,-20,-20,-20,-20,-14, -6, 0, 0, 0, 0, 0, 2, 4, 10}, +- {-20,-20,-20,-20,-20,-20,-20,-14, -8, -6, -6, -6, -6, -4, -4, -4, -2}}},*/ +- {{{-10,-10,-10,-10,-10,-10, -8, 2, 2, 2, 4, 4, 5, 5, 5, 8, 10}, +- {-20,-20,-20,-20,-20,-20,-20,-14, -6, 0, 0, 0, 0, 0, 2, 3, 6}, ++/*{{{-10,-10,-10,-10,-10,-10, -8, 2, 2, 2, 4, 4, 5, 5, 5, 8, 10}, ++ {-20,-20,-20,-20,-20,-20,-20,-14, -6, 0, 0, 0, 0, 0, 2, 4, 10}, ++ {-20,-20,-20,-20,-20,-20,-20,-14, -8, -6, -6, -6, -6, -4, -4, -4, -2}}},*/ ++ {{{-10,-10,-10,-10,-10,-10, -8, 2, 2, 2, 4, 4, 5, 5, 5, 8, 10}, ++ {-20,-20,-20,-20,-20,-20,-20,-14, -6, 0, 0, 0, 1, 1, 2, 3, 8}, + {-20,-20,-20,-20,-20,-20,-20,-14, -8, -6, -6, -6, -6, -4, -4, -4, -2}}}, + /* 1 */ +- /* {{{-10,-10,-10,-10,-10,-10, -8, -4, 0, 2, 4, 4, 5, 5, 5, 8, 10}, +- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -2, -2, -2, -2, 0, 2, 8}, +- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -8, -8, -8, -8, -6, -6, -6, -4}}},*/ +- {{{-10,-10,-10,-10,-10,-10, -8, -4, 0, 2, 4, 4, 5, 5, 5, 8, 10}, +- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -2, -2, -2, -2, 0, 1, 4}, ++/*{{{-10,-10,-10,-10,-10,-10, -8, -4, 0, 2, 4, 4, 5, 5, 5, 8, 10}, ++ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -2, -2, -2, -2, 0, 2, 8}, ++ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -8, -8, -8, -8, -6, -6, -6, -4}}},*/ ++ {{{-10,-10,-10,-10,-10,-10, -8, -4, 0, 2, 4, 4, 5, 5, 5, 8, 10}, ++ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -2, -2, -2, -2, -1, 1, 4}, + {-20,-20,-20,-20,-20,-20,-20,-14,-10, -8, -8, -8, -8, -6, -6, -6, -4}}}, + /* 2 */ +- /* {{{-10,-10,-10,-10,-10,-10,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10}, +- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -2, -2, -2, -2, 0, 2, 6}, +- {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/ +- {{{-10,-10,-10,-10,-10,-10,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10}, +- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -2, -1, 0, 3}, ++/*{{{-10,-10,-10,-10,-10,-10,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10}, ++ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -2, -2, -2, -2, 0, 2, 6}, ++ {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/ ++ {{{-10,-10,-10,-10,-10,-10,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10}, ++ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -2, -2, -1, 1, 3}, + {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}}, + /* 3 */ +- /* {{{-10,-10,-10,-10,-10,-10,-10, -8, 0, 2, 2, 2, 4, 4, 4, 5, 8}, +- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -1, 1, 6}, +- {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/ ++/*{{{-10,-10,-10,-10,-10,-10,-10, -8, 0, 2, 2, 2, 4, 4, 4, 5, 8}, ++ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -1, 1, 6}, ++ {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/ + {{{-10,-10,-10,-10,-10,-10,-10, -8, 0, 2, 2, 2, 4, 4, 4, 5, 8}, +- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -2, 0, 2}, ++ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -2, 0, 3}, + {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -5}}}, + /* 4 */ +- /* {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, +- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -1, 1, 5}, +- {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/ ++/*{{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, ++ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -1, 1, 5}, ++ {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/ + {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, +- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -2, -1, 1}, ++ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -2, 0, 1}, + {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -7}}}, + /* 5 */ +- /* {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, +- {-22,-22,-22,-22,-22,-22,-22,-16,-12, -6, -4, -4, -4, -4, -2, -1, 2}, +- {-24,-24,-24,-24,-24,-24,-24,-18,-14,-12,-12,-12,-12,-10,-10, -9, -5}}},*/ ++/*{{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, ++ {-22,-22,-22,-22,-22,-22,-22,-16,-12, -6, -4, -4, -4, -4, -2, -1, 2}, ++ {-24,-24,-24,-24,-24,-24,-24,-18,-14,-12,-12,-12,-12,-10,-10, -9, -5}}},*/ + {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, + {-22,-22,-22,-22,-22,-22,-22,-16,-12, -6, -4, -4, -4, -4, -3, -1, 0}, + {-24,-24,-24,-24,-24,-24,-24,-18,-14,-12,-12,-12,-12,-10,-10, -9, -8}}}, + /* 6 */ +- /* {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, +- {-24,-24,-24,-24,-24,-24,-24,-18,-14, -8, -6, -6, -6, -6, -4, -2, 1}, +- {-26,-26,-26,-26,-26,-26,-26,-18,-16,-15,-15,-15,-15,-13,-13,-12, -8}}},*/ ++/*{{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, ++ {-24,-24,-24,-24,-24,-24,-24,-18,-14, -8, -6, -6, -6, -6, -4, -2, 1}, ++ {-26,-26,-26,-26,-26,-26,-26,-18,-16,-15,-15,-15,-15,-13,-13,-12, -8}}},*/ + {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, +- {-24,-24,-24,-24,-24,-24,-24,-18,-14, -8, -6, -6, -6, -6, -5, -2, 0}, +- {-26,-26,-26,-26,-26,-26,-26,-18,-16,-15,-15,-15,-15,-13,-13,-12,-10}}}, ++ {-24,-24,-24,-24,-24,-24,-24,-18,-14, -8, -6, -6, -6, -6, -4, -2, 0}, ++ {-26,-26,-26,-26,-26,-26,-26,-18,-16,-15,-15,-15,-15,-13,-13,-12, -8}}}, + /* 7 */ ++// {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, ++// {-24,-24,-24,-24,-24,-24,-24,-18,-14,-10, -8, -8, -8, -8, -6, -4, 0}, ++// {-26,-26,-26,-26,-26,-26,-26,-22,-20,-19,-19,-19,-19,-18,-17,-16,-12}}}, + {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, +- {-24,-24,-24,-24,-24,-24,-24,-18,-14,-10, -8, -8, -8, -8, -6, -4, 0}, ++ {-24,-24,-24,-24,-24,-24,-24,-18,-14,-12,-10, -8, -8, -8, -6, -4, 0}, + {-26,-26,-26,-26,-26,-26,-26,-22,-20,-19,-19,-19,-19,-18,-17,-16,-12}}}, + /* 8 */ + {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 0, 0, 0, 0, 1, 2, 3, 7}, +@@ -344,67 +354,85 @@ + }; + + /* noise bias (impulse block) */ +-static noise3 _psy_noisebias_impulse[12]={ ++static const noise3 _psy_noisebias_impulse[13]={ + /* 63 125 250 500 1k 2k 4k 8k 16k*/ +- /* -1 */ ++ /* -2(addition mode) */ + {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, ++ {-28,-28,-26,-26,-22,-18,-16, -8, -2, 2, 2, 2, 3, 5, 6, 7, 14}, ++ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}}, ++ /* -1 */ ++/*{{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, + {-30,-30,-30,-30,-26,-20,-16, -8, -6, -6, -2, 2, 2, 3, 6, 6, 15}, ++ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},*/ ++ {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, ++ {-30,-30,-28,-28,-24,-20,-18,-12, -4, 0, 0, 0, 1, 3, 4, 5, 12}, + {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}}, +- + /* 0 */ +- /* {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 4, 8, 8, 8, 10, 12, 14, 20}, +- {-30,-30,-30,-30,-26,-22,-20,-14, -6, -2, 0, 0, 0, 0, 2, 4, 10}, +- {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},*/ ++/*{{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 4, 8, 8, 8, 10, 12, 14, 20}, ++ {-30,-30,-30,-30,-26,-22,-20,-14, -6, -2, 0, 0, 0, 0, 2, 4, 10}, ++ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},*/ + {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 4, 8, 8, 8, 10, 12, 14, 20}, +- {-30,-30,-30,-30,-26,-22,-20,-14, -6, -2, 0, 0, 0, 0, 2, 3, 6}, ++ {-30,-30,-30,-30,-26,-22,-20,-14, -6, 0, 0, 0, 1, 1, 2, 3, 8}, + {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}}, + /* 1 */ +- {{{-12,-12,-12,-12,-12, -8, -6, -4, 0, 4, 4, 4, 4, 10, 12, 14, 20}, ++/*{{{-12,-12,-12,-12,-12, -8, -6, -4, 0, 4, 4, 4, 4, 10, 12, 14, 20}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -4, -4, -2, -2, -2, -2, 2}, ++ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8,-10,-10, -8, -8, -8, -6, -4}}},*/ ++ {{{-12,-12,-12,-12,-12, -8, -6, -4, 0, 4, 4, 4, 4, 10, 12, 14, 20}, ++ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -4, -4, -2, -2, -1, 1, 4}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8,-10,-10, -8, -8, -8, -6, -4}}}, + /* 2 */ ++// {{{-14,-14,-14,-14,-14,-10, -8, -6, -2, 2, 2, 2, 2, 8, 10, 10, 16}, ++// {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -4, -2, 0}, ++// {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8, -4}}}, + {{{-14,-14,-14,-14,-14,-10, -8, -6, -2, 2, 2, 2, 2, 8, 10, 10, 16}, +- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -4, -2, 0}, ++ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -3, 0, 1}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8, -4}}}, + /* 3 */ ++// {{{-14,-14,-14,-14,-14,-10, -8, -6, -2, 2, 2, 2, 2, 6, 8, 8, 14}, ++// {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -4, -2, 0}, ++// {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8, -4}}}, + {{{-14,-14,-14,-14,-14,-10, -8, -6, -2, 2, 2, 2, 2, 6, 8, 8, 14}, +- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -4, -2, 0}, ++ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -3, 0, 1}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8, -4}}}, + /* 4 */ ++// {{{-16,-16,-16,-16,-16,-12,-10, -6, -2, 0, 0, 0, 0, 4, 6, 6, 12}, ++// {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -4, -2, 0}, ++// {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8, -4}}}, + {{{-16,-16,-16,-16,-16,-12,-10, -6, -2, 0, 0, 0, 0, 4, 6, 6, 12}, +- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -4, -2, 0}, ++ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -3, 0, 1}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8, -4}}}, + /* 5 */ +- {{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 4, 6, 11}, ++/*{{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 4, 6, 11}, + {-32,-32,-32,-32,-28,-24,-22,-16,-10, -6, -8, -8, -6, -6, -6, -4, -2}, +- {-34,-34,-34,-34,-30,-26,-24,-18,-14,-12,-12,-12,-12,-12,-10, -9, -5}}}, +- /* 6 ++ {-34,-34,-34,-34,-30,-26,-24,-18,-14,-12,-12,-12,-12,-12,-10, -9, -5}}},*/ + {{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 4, 6, 11}, +- {-34,-34,-34,-34,-30,-30,-24,-20,-12,-12,-14,-14,-10, -9, -8, -6, -4}, +- {-34,-34,-34,-34,-34,-30,-26,-20,-16,-15,-15,-15,-15,-15,-13,-12, -8}}},*/ ++ {-32,-32,-32,-32,-28,-24,-22,-16,-12, -8, -8, -8, -6, -6, -5, -4, -2}, ++ {-34,-34,-34,-34,-30,-26,-24,-18,-14,-12,-12,-12,-12,-12,-10, -9, -5}}}, ++ /* 6 */ ++/*{{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 4, 6, 11}, ++ {-34,-34,-34,-34,-30,-30,-24,-20,-12,-12,-14,-14,-10, -9, -8, -6, -4}, ++ {-34,-34,-34,-34,-34,-30,-26,-20,-16,-15,-15,-15,-15,-15,-13,-12, -8}}},*/ + {{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 4, 6, 11}, +- {-34,-34,-34,-34,-30,-30,-30,-24,-16,-16,-16,-16,-16,-16,-14,-14,-12}, +- {-36,-36,-36,-36,-36,-34,-28,-24,-20,-20,-20,-20,-20,-20,-20,-18,-16}}}, ++ {-34,-34,-34,-34,-30,-30,-24,-20,-14,-14,-14,-14,-10, -9, -8, -6, -4}, ++ {-34,-34,-34,-34,-34,-30,-26,-20,-16,-15,-15,-15,-15,-15,-13,-12, -8}}}, + /* 7 */ +- /* {{{-22,-22,-22,-22,-22,-20,-14,-10, -6, 0, 0, 0, 0, 4, 4, 6, 11}, +- {-34,-34,-34,-34,-30,-30,-24,-20,-14,-14,-16,-16,-14,-12,-10,-10,-10}, +- {-34,-34,-34,-34,-32,-32,-30,-24,-20,-19,-19,-19,-19,-19,-17,-16,-12}}},*/ ++/*{{{-22,-22,-22,-22,-22,-20,-14,-10, -6, 0, 0, 0, 0, 4, 4, 6, 11}, ++ {-34,-34,-34,-34,-30,-30,-24,-20,-14,-14,-16,-16,-14,-12,-10,-10,-10}, ++ {-34,-34,-34,-34,-32,-32,-30,-24,-20,-19,-19,-19,-19,-19,-17,-16,-12}}},*/ + {{{-22,-22,-22,-22,-22,-20,-14,-10, -6, 0, 0, 0, 0, 4, 4, 6, 11}, +- {-34,-34,-34,-34,-30,-30,-30,-30,-26,-26,-26,-26,-26,-26,-26,-24,-22}, +- {-40,-40,-40,-40,-40,-40,-40,-32,-30,-30,-30,-30,-30,-30,-30,-30,-24}}}, ++ {-34,-34,-34,-34,-30,-30,-24,-20,-16,-16,-16,-16,-14,-12,-10,-10, -8}, ++ {-34,-34,-34,-34,-32,-32,-30,-24,-20,-19,-19,-19,-19,-19,-17,-16,-12}}}, + /* 8 */ +- /* {{{-24,-24,-24,-24,-24,-22,-14,-10, -6, -1, -1, -1, -1, 3, 3, 5, 10}, +- {-34,-34,-34,-34,-30,-30,-30,-24,-20,-20,-20,-20,-20,-18,-16,-16,-14}, +- {-36,-36,-36,-36,-36,-34,-28,-24,-24,-24,-24,-24,-24,-24,-24,-20,-16}}},*/ + {{{-24,-24,-24,-24,-24,-22,-14,-10, -6, -1, -1, -1, -1, 3, 3, 5, 10}, +- {-34,-34,-34,-34,-34,-32,-32,-30,-26,-26,-26,-26,-26,-26,-26,-26,-24}, +- {-40,-40,-40,-40,-40,-40,-40,-32,-30,-30,-30,-30,-30,-30,-30,-30,-24}}}, ++ {-34,-34,-34,-34,-30,-30,-30,-24,-20,-20,-20,-20,-20,-18,-16,-16,-14}, ++ {-36,-36,-36,-36,-36,-34,-28,-24,-24,-24,-24,-24,-24,-24,-24,-20,-16}}}, + /* 9 */ +- /* {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -4, -4, -4, -4, -4, -2, 2}, +- {-36,-36,-36,-36,-34,-32,-32,-30,-26,-26,-26,-26,-26,-22,-20,-20,-18}, +- {-40,-40,-40,-40,-40,-40,-40,-32,-30,-30,-30,-30,-30,-30,-30,-24,-20}}},*/ ++// {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -4, -4, -4, -4, -4, -2, 2}, ++// {-36,-36,-36,-36,-34,-32,-32,-30,-26,-26,-26,-26,-26,-22,-20,-20,-18}, ++// {-40,-40,-40,-40,-40,-40,-40,-32,-30,-30,-30,-30,-30,-30,-30,-24,-20}}}, + {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -4, -4, -4, -4, -4, -2, 2}, +- {-36,-36,-36,-36,-34,-32,-32,-30,-26,-26,-26,-26,-26,-26,-26,-26,-26}, ++ {-36,-36,-36,-36,-32,-32,-32,-28,-24,-24,-24,-24,-24,-22,-20,-20,-18}, + {-40,-40,-40,-40,-40,-40,-40,-32,-30,-30,-30,-30,-30,-30,-30,-24,-20}}}, + /* 10 */ + {{{-30,-30,-30,-30,-30,-26,-24,-24,-24,-20,-16,-16,-16,-16,-16,-14,-12}, +@@ -413,36 +441,50 @@ + }; + + /* noise bias (padding block) */ +-static noise3 _psy_noisebias_padding[12]={ ++static const noise3 _psy_noisebias_padding[13]={ + /* 63 125 250 500 1k 2k 4k 8k 16k*/ +- +- /* -1 */ ++ /* -2(addition mode) */ + {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, +- {-30,-30,-30,-30,-26,-20,-16, -8, -6, -6, -2, 2, 2, 3, 6, 6, 15}, ++ {-28,-28,-26,-26,-22,-18,-16, -8, -2, 2, 2, 3, 4, 6, 7, 8, 14}, + {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}}, +- +- /* 0 */ ++ /* -1 */ ++/*{{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, ++ {-30,-30,-30,-30,-26,-20,-16, -8, -6, -6, -2, 2, 2, 3, 6, 6, 15}, ++ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},*/ + {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, ++ {-30,-30,-28,-28,-24,-20,-18,-12, -4, 0, 0, 1, 2, 4, 5, 6, 12}, ++ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -4, -4, -4, -4, -4, -2, 0, 2}}}, ++ /* 0 */ ++/*{{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2, 2, 3, 6, 6, 8, 10}, ++ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -4, -4, -4, -4, -2, 0, 2}}},*/ ++ {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, ++ {-30,-30,-30,-30,-26,-22,-20,-14, -6, 0, 0, 0, 1, 2, 3, 4, 8}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -4, -4, -4, -4, -2, 0, 2}}}, + /* 1 */ ++// {{{-12,-12,-12,-12,-12, -8, -6, -4, 0, 4, 4, 4, 4, 10, 12, 14, 20}, ++// {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, 0, 0, 0, 2, 2, 4, 8}, ++// {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -6, -4, -2, 0}}}, + {{{-12,-12,-12,-12,-12, -8, -6, -4, 0, 4, 4, 4, 4, 10, 12, 14, 20}, +- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, 0, 0, 0, 2, 2, 4, 8}, ++ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, 0, 0, 1, 1, 2, 4, 8}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -6, -4, -2, 0}}}, + /* 2 */ +- /* {{{-14,-14,-14,-14,-14,-10, -8, -6, -2, 2, 2, 2, 2, 8, 10, 10, 16}, +- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, 0, 0, 0, 2, 2, 4, 8}, +- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -8, -6, -4, -2}}},*/ ++// {{{-14,-14,-14,-14,-14,-10, -8, -6, -2, 2, 2, 2, 2, 8, 10, 10, 16}, ++// {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, 0, 0, 0, 2, 2, 4, 8}, ++// {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -8, -6, -4, -2}}}, + {{{-14,-14,-14,-14,-14,-10, -8, -6, -2, 2, 2, 2, 2, 8, 10, 10, 16}, +- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -1, -1, -1, 0, 0, 2, 6}, ++ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, 0, 0, 0, 0, 2, 4, 8}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -8, -6, -4, -2}}}, + /* 3 */ + {{{-14,-14,-14,-14,-14,-10, -8, -6, -2, 2, 2, 2, 2, 6, 8, 8, 14}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -1, -1, -1, 0, 0, 2, 6}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -8, -6, -4, -2}}}, + /* 4 */ ++// {{{-16,-16,-16,-16,-16,-12,-10, -6, -2, 0, 0, 0, 0, 4, 6, 6, 12}, ++// {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -1, -1, -1, -1, 0, 2, 6}, ++// {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -8, -6, -4, -2}}}, + {{{-16,-16,-16,-16,-16,-12,-10, -6, -2, 0, 0, 0, 0, 4, 6, 6, 12}, +- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -1, -1, -1, -1, 0, 2, 6}, ++ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -1, -1, -1, -1, 0, 0, 6}, + {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -8, -6, -4, -2}}}, + /* 5 */ + {{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 6, 6, 12}, +@@ -453,16 +495,22 @@ + {-34,-34,-34,-34,-30,-30,-24,-20,-14, -8, -4, -4, -4, -4, -3, -1, 4}, + {-34,-34,-34,-34,-34,-30,-26,-20,-16,-13,-13,-13,-13,-13,-11, -8, -6}}}, + /* 7 */ +- {{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 6, 6, 12}, ++/*{{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 6, 6, 12}, + {-34,-34,-34,-34,-30,-30,-30,-24,-16,-10, -8, -6, -6, -6, -5, -3, 1}, ++ {-34,-34,-34,-34,-32,-32,-28,-22,-18,-16,-16,-16,-16,-16,-14,-12,-10}}},*/ ++ {{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 6, 6, 12}, ++ {-34,-34,-34,-34,-30,-30,-24,-20,-14,-10, -8, -6, -6, -6, -5, -3, 1}, + {-34,-34,-34,-34,-32,-32,-28,-22,-18,-16,-16,-16,-16,-16,-14,-12,-10}}}, + /* 8 */ + {{{-22,-22,-22,-22,-22,-20,-14,-10, -4, 0, 0, 0, 0, 3, 5, 5, 11}, + {-34,-34,-34,-34,-30,-30,-30,-24,-16,-12,-10, -8, -8, -8, -7, -5, -2}, + {-36,-36,-36,-36,-36,-34,-28,-22,-20,-20,-20,-20,-20,-20,-20,-16,-14}}}, + /* 9 */ ++// {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -2, -2, -2, -2, 0, 2, 6}, ++// {-36,-36,-36,-36,-34,-32,-32,-24,-16,-12,-12,-12,-12,-12,-10, -8, -5}, ++// {-40,-40,-40,-40,-40,-40,-40,-32,-26,-24,-24,-24,-24,-24,-24,-20,-18}}}, + {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -2, -2, -2, -2, 0, 2, 6}, +- {-36,-36,-36,-36,-34,-32,-32,-24,-16,-12,-12,-12,-12,-12,-10, -8, -5}, ++ {-36,-36,-36,-36,-32,-32,-32,-26,-18,-14,-12,-12,-12,-12,-10, -8, -5}, + {-40,-40,-40,-40,-40,-40,-40,-32,-26,-24,-24,-24,-24,-24,-24,-20,-18}}}, + /* 10 */ + {{{-30,-30,-30,-30,-30,-26,-24,-24,-24,-20,-12,-12,-12,-12,-12,-10, -8}, +@@ -471,24 +519,27 @@ + }; + + +-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]={ +- -20,-20,-20,-20,-20,-24,-30,-40,-40,-45,-45,-45, ++static const int _psy_tone_suppress[13]={ ++/* -20,-20,-20,-20,-20,-24,-30,-40,-40,-45,-45,-45, */ ++ -20,-20,-20,-20,-20,-20,-24,-30,-40,-40,-42,-45,-45, + }; +-static int _psy_tone_0dB[12]={ +- 90,90,95,95,95,95,105,105,105,105,105,105, ++static const int _psy_tone_0dB[13]={ ++/* 90,90,95,95,95,95,105,105,105,105,105,105, */ ++ 90,90,90,95,95,95,95,105,105,105,105,105,105, + }; +-static int _psy_noise_suppress[12]={ +- -20,-20,-24,-24,-24,-24,-30,-40,-40,-45,-45,-45, ++static const int _psy_noise_suppress[13]={ ++/* -20,-20,-24,-24,-24,-24,-30,-40,-40,-45,-45,-45, */ ++ -20,-20,-20,-24,-24,-24,-24,-30,-40,-40,-42,-45,-45, + }; + +-static vorbis_info_psy _psy_info_template={ ++static const vorbis_info_psy _psy_info_template={ + /* blockflag */ + -1, + /* ath_adjatt, ath_maxatt */ +@@ -498,19 +549,21 @@ + + /*noisemaskp,supp, low/high window, low/hi guard, minimum */ + 1, -0.f, .5f, .5f, 0,0,0, +- /* noiseoffset*3, noisecompand, max_curve_dB */ +- {{-1},{-1},{-1}},{-1},105.f, ++ /* noiseoffset*3, noisecompand, noisecompand-high, flacint, max_curve_dB */ ++ {{-1},{-1},{-1}},{-1},{-1},0., 105.f, + /* noise normalization - channel_p, point_p, start, partition, thresh. */ + 0,0,-1,-1,0., + }; + + /* ath ****************/ + +-static int _psy_ath_floater[12]={ +- -100,-100,-100,-100,-100,-100,-105,-105,-105,-105,-110,-120, +-}; +-static int _psy_ath_abs[12]={ +- -130,-130,-130,-130,-140,-140,-140,-140,-140,-140,-140,-150, ++static const int _psy_ath_floater[13]={ ++/* -100,-100,-100,-100,-100,-100,-105,-105,-105,-105,-110,-120, */ ++ -100,-100,-100,-100,-100,-100,-100,-105,-105,-105,-105,-110,-120, ++}; ++static const int _psy_ath_abs[13]={ ++/* -130,-130,-130,-130,-140,-140,-140,-140,-140,-140,-140,-150, */ ++ -130,-130,-130,-130,-130,-135,-140,-140,-140,-140,-140,-140,-150, + }; + + /* stereo setup. These don't map directly to quality level, there's +@@ -522,14 +575,22 @@ + /* various stereo possibilities */ + + /* stereo mode by base quality level */ +-static 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}, ++static const adj_stereo _psy_stereo_modes_44[13]={ ++ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 -2(addition mode) */ ++ {{ 4, 4, 4, 4, 4, 4, 4, 4, 3, 2, 1, 0, 0, 0, 0}, ++ { 8, 8, 8, 8, 8, 8, 7, 7, 6, 6, 6, 6, 5, 4, 3}, ++ { 1, 2, 2, 2, 2, 3, 3, 4, 4, 4, 5, 6, 7, 8, 8}, ++ { 10,10.5, 11,11.5, 12,12.5, 13, 99, 99, 99, 99, 99, 99, 99, 99}}, ++ /* 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}, + { 1, 2, 3, 4, 4, 4, 4, 4, 4, 5, 6, 7, 8, 8, 8}, ++ { 12,12.5, 13,13.5, 14,14.5, 15, 99, 99, 99, 99, 99, 99, 99, 99}},*/ ++ {{ 4, 4, 4, 4, 4, 4, 4, 3, 2, 2, 1, 0, 0, 0, 0}, ++ { 8, 8, 8, 8, 8, 7, 7, 6, 6, 6, 6, 6, 5, 4, 3}, ++ { 1, 2, 3, 4, 4, 4, 4, 4, 4, 5, 6, 7, 8, 8, 8}, + { 12,12.5, 13,13.5, 14,14.5, 15, 99, 99, 99, 99, 99, 99, 99, 99}}, +- +-/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 0 */ ++ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 0 */ + /*{{ 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}, + { 1, 2, 3, 4, 5, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8}, +@@ -538,76 +599,76 @@ + { 8, 8, 8, 8, 6, 6, 5, 5, 5, 5, 5, 5, 5, 4, 3}, + { 1, 2, 3, 4, 4, 5, 6, 6, 6, 6, 6, 8, 8, 8, 8}, + { 12,12.5, 13,13.5, 14,14.5, 15, 99, 99, 99, 99, 99, 99, 99, 99}}, +- +- +- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 */ +- {{ 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, 0, 0, 0, 0}, ++ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 */ ++/*{{ 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, 0, 0, 0, 0}, + { 8, 8, 8, 8, 6, 6, 5, 5, 5, 5, 5, 5, 5, 4, 3}, + { 1, 2, 3, 4, 4, 5, 6, 6, 6, 6, 6, 8, 8, 8, 8}, ++ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},*/ ++ {{ 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, 0, 0, 0, 0}, ++ { 8, 8, 8, 8, 6, 6, 5, 4, 4, 4, 4, 4, 4, 3, 3}, ++ { 1, 2, 3, 4, 4, 5, 6, 6, 6, 6, 6, 8, 8, 8, 8}, + { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, +- +- +- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 2 */ +- /* {{ 3, 3, 3, 3, 3, 3, 2, 2, 2, 1, 0, 0, 0, 0, 0}, +- { 8, 8, 8, 6, 5, 5, 5, 5, 5, 5, 5, 4, 3, 2, 1}, +- { 3, 4, 4, 4, 5, 6, 6, 6, 6, 6, 6, 8, 8, 8, 8}, +- { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, */ ++ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 2 */ ++/*{{ 3, 3, 3, 3, 3, 3, 2, 2, 2, 1, 0, 0, 0, 0, 0}, ++ { 8, 8, 8, 6, 5, 5, 5, 5, 5, 5, 5, 4, 3, 2, 1}, ++ { 3, 4, 4, 4, 5, 6, 6, 6, 6, 6, 6, 8, 8, 8, 8}, ++ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, */ + {{ 3, 3, 3, 3, 3, 3, 3, 2, 1, 1, 0, 0, 0, 0, 0}, + { 8, 8, 6, 6, 5, 5, 4, 4, 4, 4, 4, 4, 3, 2, 1}, + { 3, 4, 4, 5, 5, 6, 6, 6, 6, 6, 6, 8, 8, 8, 8}, + { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, +- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 3 */ ++ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 3 */ + {{ 2, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0}, + { 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 2, 1}, + { 4, 4, 5, 6, 6, 6, 6, 6, 8, 8, 10, 10, 10, 10, 10}, + { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, +- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 4 */ ++ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 4 */ + {{ 2, 2, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 2, 1, 0}, + { 6, 6, 6, 8, 8, 8, 8, 8, 8, 8, 10, 10, 10, 10, 10}, + { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, +- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 5 */ +- /* {{ 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, +- { 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0}, +- { 6, 6, 8, 8, 8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10}, +- { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},*/ +- {{ 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, ++ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 5 */ ++/*{{ 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0}, ++ { 6, 6, 8, 8, 8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10}, ++ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},*/ ++ {{ 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, ++ { 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 0, 0, 0, 0}, + { 6, 7, 8, 8, 8, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12}, + { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, +- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 6 */ +- /* {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, +- { 3, 3, 3, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0}, +- { 8, 8, 8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, +- { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, */ ++ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 6 */ ++/*{{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, ++ { 3, 3, 3, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0}, ++ { 8, 8, 8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, ++ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, */ + {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 3, 3, 3, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 8, 8, 8, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12}, + { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, +- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 7 */ +- /* {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, +- { 3, 3, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, +- { 8, 8, 8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, +- { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},*/ ++ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 7 */ ++/*{{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, ++ { 3, 3, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, ++ { 8, 8, 8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, ++ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},*/ + {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 3, 3, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 8, 8, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12}, + { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, +- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 8 */ +- /* {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, +- { 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, +- { 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, +- { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},*/ ++ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 8 */ ++/*{{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, ++ { 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, ++ { 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, ++ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},*/ + {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 8, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12}, + { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, +- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 9 */ ++ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 9 */ + {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4}, + { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, +- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 10 */ ++ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 10 */ + {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4}, +@@ -615,14 +676,16 @@ + }; + + /* tone master attenuation by base quality mode and bitrate tweak */ +-static 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 */ +- {{ 25, 12, 2}, 0, 0}, /* 1 */ +- /* {{ 20, 10, -2}, 0, 0}, *//* 2 */ +- {{ 20, 9, -3}, 0, 0}, /* 2 */ +- {{ 20, 9, -4}, 0, 0}, /* 3 */ ++static const att3 _psy_tone_masteratt_44[13]={ ++ {{ 40, 31, 16}, 0, 0}, /* -2 */ ++// {{ 35, 21, 9}, 0, 0}, /* -1 */ ++ {{ 36, 25, 10}, 0, 0}, /* -1 */ ++// {{ 30, 20, 8}, -2, 1.25}, /* 0 */ ++ {{ 32, 20, 8}, 0, 0}, /* 0 */ ++ {{ 25, 14, 4}, 0, 0}, /* 1 */ ++ {{ 20, 10, -2}, 0, 0}, /* 2 */ ++// {{ 20, 9, -4}, 0, 0}, /* 3 */ ++ {{ 20, 10, -3}, 0, 0}, /* 3 */ + {{ 20, 9, -4}, 0, 0}, /* 4 */ + {{ 20, 6, -6}, 0, 0}, /* 5 */ + {{ 20, 3, -10}, 0, 0}, /* 6 */ +@@ -633,34 +696,51 @@ + }; + + /* lowpass by mode **************/ +-static double _psy_lowpass_44[12]={ ++static const double _psy_lowpass_44[13]={ + /* 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. ++// 13.9,15.1,15.8,16.5,17.2,18.9,20.1,48.,999.,999.,999.,999. ++ 12.9,14.3,15.1,15.8,16.5,17.2,18.3,20.1,48.,999.,999.,999.,999. + }; + + /* noise normalization **********/ + +-static int _noise_start_short_44[11]={ ++static const int _noise_start_short_44[12]={ + /* 16,16,16,16,32,32,9999,9999,9999,9999 */ +- 32,16,16,16,32,9999,9999,9999,9999,9999,9999 ++// 32,16,16,16,32,9999,9999,9999,9999,9999,9999 ++ 32,32,16,16,16,64,9999,9999,9999,9999,9999,9999 + }; +-static int _noise_start_long_44[11]={ ++static const int _noise_start_long_44[12]={ + /* 128,128,128,256,512,512,9999,9999,9999,9999 */ +- 256,128,128,256,512,9999,9999,9999,9999,9999,9999 ++// 256,128,128,256,512,9999,9999,9999,9999,9999,9999 ++ 256,256,128,128,128,512,9999,9999,9999,9999,9999,9999 + }; + +-static int _noise_part_short_44[11]={ +- 8,8,8,8,8,8,8,8,8,8,8 ++static const int _noise_part_short_44[12]={ ++/* 8,8,8,8,8,8,8,8,8,8,8 */ ++ 8,8,8,8,8,8,8,8,8,8,8,8 + }; +-static int _noise_part_long_44[11]={ +- 32,32,32,32,32,32,32,32,32,32,32 ++static const int _noise_part_long_44[12]={ ++/* 32,32,32,32,32,32,32,32,32,32,32 */ ++ 32,32,32,32,32,32,32,32,32,32,32,32 + }; + +-static double _noise_thresh_44[11]={ ++static const double _noise_thresh_44[12]={ + /* .2,.2,.3,.4,.5,.5,9999.,9999.,9999.,9999., */ +- .2,.2,.2,.4,.6,9999.,9999.,9999.,9999.,9999.,9999., ++// .2,.2,.2,.4,.6,9999.,9999.,9999.,9999.,9999.,9999., ++ .17,.2,.2,.2,.35,.6,9999.,9999.,9999.,9999.,9999.,9999., + }; + +-static double _noise_thresh_5only[2]={ +- .5,.5, ++/* 0~8kHz */ ++static const double _noise_thresh_5only[3]={ ++ .5,.5,.5 ++}; ++ ++/* 32kHz only */ ++static const int _noise_start_short_32[12]={ ++// 40,40,20,20,40,80,9999,9999,9999,9999,9999,9999 ++ 48,48,24,24,40,80,9999,9999,9999,9999,9999,9999 ++}; ++static const int _noise_start_long_32[12]={ ++// 320,320,160,160,320,640,9999,9999,9999,9999,9999,9999 ++ 320,320,160,160,320,640,9999,9999,9999,9999,9999,9999 + }; +diff -ruN libvorbis-1.2.0/lib/modes/psych_8.h aotuv-b5.7_20090301/lib/modes/psych_8.h +--- libvorbis-1.2.0/lib/modes/psych_8.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/modes/psych_8.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,27 +11,52 @@ + ******************************************************************** + + function: 8kHz psychoacoustic settings +- last mod: $Id: psych_8.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: psych_8.h 2009-03-11 aoyumi $ + + ********************************************************************/ + +-static att3 _psy_tone_masteratt_8[3]={ +- {{ 32, 25, 12}, 0, 0}, /* 0 */ +- {{ 30, 25, 12}, 0, 0}, /* 0 */ +- {{ 20, 0, -14}, 0, 0}, /* 0 */ ++/* noise compander lookups */ ++static const compandblock _psy_compand_8[3]={ ++ {{ ++ 0, 1, 2, 3, 4, 5, 6, 7, /* 7dB */ ++ 8, 8, 9, 9,10,10,11, 11, /* 15dB */ ++ 12,12,13,13,14,14,15, 16, /* 23dB */ ++ 17,18,19,20,21,22,23, 24, /* 31dB */ ++ 25,26,27,28,29,30,31, 32, /* 39dB */ ++ }}, ++ {{ ++ 0, 1, 2, 3, 4, 5, 6, 7, /* 7dB */ ++ 8, 8, 9, 9,10,10,11, 11, /* 15dB */ ++ 12,12,13,13,14,14,15, 15, /* 23dB */ ++ 16,16,17,17,17,18,18, 19, /* 31dB */ ++ 19,19,20,21,22,23,24, 25, /* 39dB */ ++ }}, ++ {{ ++ 0, 1, 2, 3, 4, 5, 6, 6, /* 7dB */ ++ 7, 7, 6, 6, 5, 5, 4, 4, /* 15dB */ ++ 3, 3, 3, 4, 5, 6, 7, 8, /* 23dB */ ++ 9,10,11,12,13,14,15, 16, /* 31dB */ ++ 17,18,19,20,21,22,23, 24, /* 39dB */ ++ }}, + }; + +-static vp_adjblock _vp_tonemask_adj_8[3]={ ++/* tonal masking curve level adjustments *************************/ ++static const vp_adjblock _vp_tonemask_adj_8[4]={ + /* 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 */ +- {{-15,-15,-15,-15,-10,-10, -6, 0, 0, 0, 0,10, 0, 0,99,99,99}}, /* 1 */ +- {{-15,-15,-15,-15,-10,-10, -6, 0, 0, 0, 0, 0, 0, 0,99,99,99}}, /* 1 */ ++ {{-15,-15,-15,-15,-10,-10, -6,-2, 0, 0, 0, 0, 3, 3,99,99,99}}, /* -2 */ ++ {{-15,-15,-15,-15,-10,-10, -6,-2, 0, 0, 0, 0, 0, 0,99,99,99}}, /* -1 */ ++ {{-15,-15,-15,-15,-10,-10, -6,-2, 0, 0, 0, 0, 0, 0,99,99,99}}, /* 0 */ ++ {{-15,-15,-15,-15,-10,-10, -6,-2, 0, 0, 0, 0, 0, 0,99,99,99}}, /* 10 */ + }; + +- +-static noise3 _psy_noisebias_8[3]={ ++/* noise bias */ ++static const noise3 _psy_noisebias_8[4]={ + /* 63 125 250 500 1k 2k 4k 8k 16k*/ ++ {{{-10,-10,-10,-10, -5, -5, -5, 3, 4, 8, 8, 8, 10, 10, 99, 99, 99}, ++ {-10,-10,-10,-10, -5, -2, -2, 3, 3, 4, 4, 5, 6, 8, 99, 99, 99}, ++ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, 99, 99, 99}}}, ++ + {{{-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}, + {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, 99, 99, 99}}}, +@@ -45,10 +70,29 @@ + {-30,-30,-30,-30,-26,-26,-26,-26,-26,-26,-26,-26,-26,-24, 99, 99, 99}}}, + }; + ++static const noiseguard _psy_noiseguards_8[3]={ ++ {10,10,-1}, ++ {10,10,-1}, ++ {10,10,-1}, ++}; ++ ++ ++/* ath ****************/ ++static const int _psy_ath_floater_8[4]={ ++ -100,-100,-100,-105, ++}; ++static const int _psy_ath_abs_8[4]={ ++ -130,-130,-130,-140, ++}; ++ + /* stereo mode by base quality level */ +-static adj_stereo _psy_stereo_modes_8[3]={ ++static const adj_stereo _psy_stereo_modes_8[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, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4}, ++ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, ++ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, ++ {{ 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}, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, + { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, +@@ -62,41 +106,21 @@ + { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, + }; + +-static noiseguard _psy_noiseguards_8[2]={ +- {10,10,-1}, +- {10,10,-1}, ++/* tone master attenuation by base quality mode and bitrate tweak */ ++static const att3 _psy_tone_masteratt_8[4]={ ++ {{ 33, 28, 13}, 0, 0}, /* -2 */ ++ {{ 32, 28, 12}, 0, 0}, /* -1 */ ++ {{ 30, 26, 12}, 0, 0}, /* 0 */ ++ {{ 20, 0, -14}, 0, 0}, /* 10 */ ++}; ++ ++/* lowpass by mode **************/ ++static const double _psy_lowpass_8[4]={2.6,3.,4.,4.}; ++ ++/* noise normalization **********/ ++static const int _noise_start_8[3]={ ++ 64,64,64, + }; +- +-static compandblock _psy_compand_8[2]={ +- {{ +- 0, 1, 2, 3, 4, 5, 6, 7, /* 7dB */ +- 8, 8, 9, 9,10,10,11, 11, /* 15dB */ +- 12,12,13,13,14,14,15, 15, /* 23dB */ +- 16,16,17,17,17,18,18, 19, /* 31dB */ +- 19,19,20,21,22,23,24, 25, /* 39dB */ +- }}, +- {{ +- 0, 1, 2, 3, 4, 5, 6, 6, /* 7dB */ +- 7, 7, 6, 6, 5, 5, 4, 4, /* 15dB */ +- 3, 3, 3, 4, 5, 6, 7, 8, /* 23dB */ +- 9,10,11,12,13,14,15, 16, /* 31dB */ +- 17,18,19,20,21,22,23, 24, /* 39dB */ +- }}, +-}; +- +-static double _psy_lowpass_8[3]={3.,4.,4.}; +-static int _noise_start_8[2]={ +- 64,64, +-}; +-static int _noise_part_8[2]={ +- 8,8, +-}; +- +-static int _psy_ath_floater_8[3]={ +- -100,-100,-105, ++static const int _noise_part_8[3]={ ++ 8,8,8, + }; +- +-static int _psy_ath_abs_8[3]={ +- -130,-130,-140, +-}; +- +diff -ruN libvorbis-1.2.0/lib/modes/residue_16.h aotuv-b5.7_20090301/lib/modes/residue_16.h +--- libvorbis-1.2.0/lib/modes/residue_16.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/modes/residue_16.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,13 +11,13 @@ + ******************************************************************** + + function: toplevel residue templates 16/22kHz +- last mod: $Id: residue_16.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: residue_16.h 2009-03-11 aoyumi $ + + ********************************************************************/ + + /***** 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 @@ + {&_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 @@ + {&_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 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 @@ + &_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,14 @@ + &_resbook_16s_2,&_resbook_16s_2} + }; + +-static vorbis_mapping_template _mapres_template_16_stereo[3]={ ++static const vorbis_mapping_template _mapres_template_16_stereo[4]={ ++ { _map_nominal, _res_16s_0 }, /* -1 */ + { _map_nominal, _res_16s_0 }, /* 0 */ + { _map_nominal, _res_16s_1 }, /* 1 */ + { _map_nominal, _res_16s_2 }, /* 2 */ + }; + +-static static_bookblock _resbook_16u_0={ ++static const static_bookblock _resbook_16u_0={ + { + {0}, + {0,0,&_16u0__p1_0}, +@@ -102,7 +103,7 @@ + {&_16u0__p7_0,&_16u0__p7_1,&_16u0__p7_2} + } + }; +-static static_bookblock _resbook_16u_1={ ++static const static_bookblock _resbook_16u_1={ + { + {0}, + {0,0,&_16u1__p1_0}, +@@ -116,7 +117,7 @@ + {&_16u1__p9_0,&_16u1__p9_1,&_16u1__p9_2} + } + }; +-static static_bookblock _resbook_16u_2={ ++static const static_bookblock _resbook_16u_2={ + { + {0}, + {0,0,&_16u2_p1_0}, +@@ -131,12 +132,12 @@ + } + }; + +-static vorbis_residue_template _res_16u_0[]={ ++static const vorbis_residue_template _res_16u_0[]={ + {1,0, &_residue_44_low_un, + &_huff_book__16u0__single,&_huff_book__16u0__single, + &_resbook_16u_0,&_resbook_16u_0}, + }; +-static vorbis_residue_template _res_16u_1[]={ ++static const vorbis_residue_template _res_16u_1[]={ + {1,0, &_residue_44_mid_un, + &_huff_book__16u1__short,&_huff_book__16u1__short, + &_resbook_16u_1,&_resbook_16u_1}, +@@ -145,7 +146,7 @@ + &_huff_book__16u1__long,&_huff_book__16u1__long, + &_resbook_16u_1,&_resbook_16u_1} + }; +-static vorbis_residue_template _res_16u_2[]={ ++static const vorbis_residue_template _res_16u_2[]={ + {1,0, &_residue_44_hi_un, + &_huff_book__16u2__short,&_huff_book__16u2__short, + &_resbook_16u_2,&_resbook_16u_2}, +@@ -156,7 +157,8 @@ + }; + + +-static vorbis_mapping_template _mapres_template_16_uncoupled[3]={ ++static const vorbis_mapping_template _mapres_template_16_uncoupled[4]={ ++ { _map_nominal_u, _res_16u_0 }, /* -1 */ + { _map_nominal_u, _res_16u_0 }, /* 0 */ + { _map_nominal_u, _res_16u_1 }, /* 1 */ + { _map_nominal_u, _res_16u_2 }, /* 2 */ +diff -ruN libvorbis-1.2.0/lib/modes/residue_44.h aotuv-b5.7_20090301/lib/modes/residue_44.h +--- libvorbis-1.2.0/lib/modes/residue_44.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/modes/residue_44.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: toplevel residue templates for 32/44.1/48kHz +- last mod: $Id: residue_44.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: residue_44.h 2009-03-11 aoyumi $ + + ********************************************************************/ + +@@ -21,7 +21,7 @@ + + /***** residue backends *********************************************/ + +-static vorbis_info_residue0 _residue_44_low={ ++static const vorbis_info_residue0 _residue_44_low={ + 0,-1, -1, 9,-1, + /* 0 1 2 3 4 5 6 7 */ + {0}, +@@ -30,7 +30,7 @@ + { .5, .5, .5, 999., 4.5, 8.5, 16.5, 32.5}, + }; + +-static vorbis_info_residue0 _residue_44_mid={ ++static const vorbis_info_residue0 _residue_44_mid={ + 0,-1, -1, 10,-1, + /* 0 1 2 3 4 5 6 7 8 */ + {0}, +@@ -39,7 +39,7 @@ + { .5, .5, 999., .5, 999., 4.5, 8.5, 16.5, 32.5}, + }; + +-static vorbis_info_residue0 _residue_44_high={ ++static const vorbis_info_residue0 _residue_44_high={ + 0,-1, -1, 10,-1, + /* 0 1 2 3 4 5 6 7 8 */ + {0}, +@@ -48,7 +48,7 @@ + { .5, 1.5, 2.5, 3.5, 4.5, 8.5, 16.5, 71.5,157.5}, + }; + +-static static_bookblock _resbook_44s_n1={ ++static const static_bookblock _resbook_44s_n1={ + { + {0},{0,0,&_44cn1_s_p1_0},{0,0,&_44cn1_s_p2_0}, + {0,0,&_44cn1_s_p3_0},{0,0,&_44cn1_s_p4_0},{0,0,&_44cn1_s_p5_0}, +@@ -56,7 +56,7 @@ + {&_44cn1_s_p8_0,&_44cn1_s_p8_1,&_44cn1_s_p8_2} + } + }; +-static static_bookblock _resbook_44sm_n1={ ++static const static_bookblock _resbook_44sm_n1={ + { + {0},{0,0,&_44cn1_sm_p1_0},{0,0,&_44cn1_sm_p2_0}, + {0,0,&_44cn1_sm_p3_0},{0,0,&_44cn1_sm_p4_0},{0,0,&_44cn1_sm_p5_0}, +@@ -65,7 +65,7 @@ + } + }; + +-static static_bookblock _resbook_44s_0={ ++static const static_bookblock _resbook_44s_0={ + { + {0},{0,0,&_44c0_s_p1_0},{0,0,&_44c0_s_p2_0}, + {0,0,&_44c0_s_p3_0},{0,0,&_44c0_s_p4_0},{0,0,&_44c0_s_p5_0}, +@@ -73,7 +73,7 @@ + {&_44c0_s_p8_0,&_44c0_s_p8_1,&_44c0_s_p8_2} + } + }; +-static static_bookblock _resbook_44sm_0={ ++static const static_bookblock _resbook_44sm_0={ + { + {0},{0,0,&_44c0_sm_p1_0},{0,0,&_44c0_sm_p2_0}, + {0,0,&_44c0_sm_p3_0},{0,0,&_44c0_sm_p4_0},{0,0,&_44c0_sm_p5_0}, +@@ -82,7 +82,7 @@ + } + }; + +-static static_bookblock _resbook_44s_1={ ++static const static_bookblock _resbook_44s_1={ + { + {0},{0,0,&_44c1_s_p1_0},{0,0,&_44c1_s_p2_0}, + {0,0,&_44c1_s_p3_0},{0,0,&_44c1_s_p4_0},{0,0,&_44c1_s_p5_0}, +@@ -90,7 +90,7 @@ + {&_44c1_s_p8_0,&_44c1_s_p8_1,&_44c1_s_p8_2} + } + }; +-static static_bookblock _resbook_44sm_1={ ++static const static_bookblock _resbook_44sm_1={ + { + {0},{0,0,&_44c1_sm_p1_0},{0,0,&_44c1_sm_p2_0}, + {0,0,&_44c1_sm_p3_0},{0,0,&_44c1_sm_p4_0},{0,0,&_44c1_sm_p5_0}, +@@ -99,7 +99,7 @@ + } + }; + +-static static_bookblock _resbook_44s_2={ ++static const static_bookblock _resbook_44s_2={ + { + {0},{0,0,&_44c2_s_p1_0},{0,0,&_44c2_s_p2_0},{0,0,&_44c2_s_p3_0}, + {0,0,&_44c2_s_p4_0},{0,0,&_44c2_s_p5_0},{0,0,&_44c2_s_p6_0}, +@@ -107,7 +107,7 @@ + {&_44c2_s_p9_0,&_44c2_s_p9_1,&_44c2_s_p9_2} + } + }; +-static static_bookblock _resbook_44s_3={ ++static const static_bookblock _resbook_44s_3={ + { + {0},{0,0,&_44c3_s_p1_0},{0,0,&_44c3_s_p2_0},{0,0,&_44c3_s_p3_0}, + {0,0,&_44c3_s_p4_0},{0,0,&_44c3_s_p5_0},{0,0,&_44c3_s_p6_0}, +@@ -115,7 +115,7 @@ + {&_44c3_s_p9_0,&_44c3_s_p9_1,&_44c3_s_p9_2} + } + }; +-static static_bookblock _resbook_44s_4={ ++static const static_bookblock _resbook_44s_4={ + { + {0},{0,0,&_44c4_s_p1_0},{0,0,&_44c4_s_p2_0},{0,0,&_44c4_s_p3_0}, + {0,0,&_44c4_s_p4_0},{0,0,&_44c4_s_p5_0},{0,0,&_44c4_s_p6_0}, +@@ -123,7 +123,7 @@ + {&_44c4_s_p9_0,&_44c4_s_p9_1,&_44c4_s_p9_2} + } + }; +-static static_bookblock _resbook_44s_5={ ++static const static_bookblock _resbook_44s_5={ + { + {0},{0,0,&_44c5_s_p1_0},{0,0,&_44c5_s_p2_0},{0,0,&_44c5_s_p3_0}, + {0,0,&_44c5_s_p4_0},{0,0,&_44c5_s_p5_0},{0,0,&_44c5_s_p6_0}, +@@ -131,7 +131,7 @@ + {&_44c5_s_p9_0,&_44c5_s_p9_1,&_44c5_s_p9_2} + } + }; +-static static_bookblock _resbook_44s_6={ ++static const static_bookblock _resbook_44s_6={ + { + {0},{0,0,&_44c6_s_p1_0},{0,0,&_44c6_s_p2_0},{0,0,&_44c6_s_p3_0}, + {0,0,&_44c6_s_p4_0}, +@@ -142,7 +142,7 @@ + {&_44c6_s_p9_0,&_44c6_s_p9_1,&_44c6_s_p9_2} + } + }; +-static static_bookblock _resbook_44s_7={ ++static const static_bookblock _resbook_44s_7={ + { + {0},{0,0,&_44c7_s_p1_0},{0,0,&_44c7_s_p2_0},{0,0,&_44c7_s_p3_0}, + {0,0,&_44c7_s_p4_0}, +@@ -153,7 +153,7 @@ + {&_44c7_s_p9_0,&_44c7_s_p9_1,&_44c7_s_p9_2} + } + }; +-static static_bookblock _resbook_44s_8={ ++static const static_bookblock _resbook_44s_8={ + { + {0},{0,0,&_44c8_s_p1_0},{0,0,&_44c8_s_p2_0},{0,0,&_44c8_s_p3_0}, + {0,0,&_44c8_s_p4_0}, +@@ -164,7 +164,7 @@ + {&_44c8_s_p9_0,&_44c8_s_p9_1,&_44c8_s_p9_2} + } + }; +-static static_bookblock _resbook_44s_9={ ++static const static_bookblock _resbook_44s_9={ + { + {0},{0,0,&_44c9_s_p1_0},{0,0,&_44c9_s_p2_0},{0,0,&_44c9_s_p3_0}, + {0,0,&_44c9_s_p4_0}, +@@ -176,7 +176,7 @@ + } + }; + +-static vorbis_residue_template _res_44s_n1[]={ ++static const vorbis_residue_template _res_44s_n1[]={ + {2,0, &_residue_44_low, + &_huff_book__44cn1_s_short,&_huff_book__44cn1_sm_short, + &_resbook_44s_n1,&_resbook_44sm_n1}, +@@ -185,7 +185,7 @@ + &_huff_book__44cn1_s_long,&_huff_book__44cn1_sm_long, + &_resbook_44s_n1,&_resbook_44sm_n1} + }; +-static vorbis_residue_template _res_44s_0[]={ ++static const vorbis_residue_template _res_44s_0[]={ + {2,0, &_residue_44_low, + &_huff_book__44c0_s_short,&_huff_book__44c0_sm_short, + &_resbook_44s_0,&_resbook_44sm_0}, +@@ -194,7 +194,7 @@ + &_huff_book__44c0_s_long,&_huff_book__44c0_sm_long, + &_resbook_44s_0,&_resbook_44sm_0} + }; +-static vorbis_residue_template _res_44s_1[]={ ++static const vorbis_residue_template _res_44s_1[]={ + {2,0, &_residue_44_low, + &_huff_book__44c1_s_short,&_huff_book__44c1_sm_short, + &_resbook_44s_1,&_resbook_44sm_1}, +@@ -204,7 +204,7 @@ + &_resbook_44s_1,&_resbook_44sm_1} + }; + +-static vorbis_residue_template _res_44s_2[]={ ++static const vorbis_residue_template _res_44s_2[]={ + {2,0, &_residue_44_mid, + &_huff_book__44c2_s_short,&_huff_book__44c2_s_short, + &_resbook_44s_2,&_resbook_44s_2}, +@@ -213,7 +213,7 @@ + &_huff_book__44c2_s_long,&_huff_book__44c2_s_long, + &_resbook_44s_2,&_resbook_44s_2} + }; +-static vorbis_residue_template _res_44s_3[]={ ++static const vorbis_residue_template _res_44s_3[]={ + {2,0, &_residue_44_mid, + &_huff_book__44c3_s_short,&_huff_book__44c3_s_short, + &_resbook_44s_3,&_resbook_44s_3}, +@@ -222,7 +222,7 @@ + &_huff_book__44c3_s_long,&_huff_book__44c3_s_long, + &_resbook_44s_3,&_resbook_44s_3} + }; +-static vorbis_residue_template _res_44s_4[]={ ++static const vorbis_residue_template _res_44s_4[]={ + {2,0, &_residue_44_mid, + &_huff_book__44c4_s_short,&_huff_book__44c4_s_short, + &_resbook_44s_4,&_resbook_44s_4}, +@@ -231,7 +231,7 @@ + &_huff_book__44c4_s_long,&_huff_book__44c4_s_long, + &_resbook_44s_4,&_resbook_44s_4} + }; +-static vorbis_residue_template _res_44s_5[]={ ++static const vorbis_residue_template _res_44s_5[]={ + {2,0, &_residue_44_mid, + &_huff_book__44c5_s_short,&_huff_book__44c5_s_short, + &_resbook_44s_5,&_resbook_44s_5}, +@@ -240,7 +240,7 @@ + &_huff_book__44c5_s_long,&_huff_book__44c5_s_long, + &_resbook_44s_5,&_resbook_44s_5} + }; +-static vorbis_residue_template _res_44s_6[]={ ++static const vorbis_residue_template _res_44s_6[]={ + {2,0, &_residue_44_high, + &_huff_book__44c6_s_short,&_huff_book__44c6_s_short, + &_resbook_44s_6,&_resbook_44s_6}, +@@ -249,7 +249,7 @@ + &_huff_book__44c6_s_long,&_huff_book__44c6_s_long, + &_resbook_44s_6,&_resbook_44s_6} + }; +-static vorbis_residue_template _res_44s_7[]={ ++static const vorbis_residue_template _res_44s_7[]={ + {2,0, &_residue_44_high, + &_huff_book__44c7_s_short,&_huff_book__44c7_s_short, + &_resbook_44s_7,&_resbook_44s_7}, +@@ -258,7 +258,7 @@ + &_huff_book__44c7_s_long,&_huff_book__44c7_s_long, + &_resbook_44s_7,&_resbook_44s_7} + }; +-static vorbis_residue_template _res_44s_8[]={ ++static const vorbis_residue_template _res_44s_8[]={ + {2,0, &_residue_44_high, + &_huff_book__44c8_s_short,&_huff_book__44c8_s_short, + &_resbook_44s_8,&_resbook_44s_8}, +@@ -267,7 +267,7 @@ + &_huff_book__44c8_s_long,&_huff_book__44c8_s_long, + &_resbook_44s_8,&_resbook_44s_8} + }; +-static vorbis_residue_template _res_44s_9[]={ ++static const vorbis_residue_template _res_44s_9[]={ + {2,0, &_residue_44_high, + &_huff_book__44c9_s_short,&_huff_book__44c9_s_short, + &_resbook_44s_9,&_resbook_44s_9}, +@@ -277,7 +277,8 @@ + &_resbook_44s_9,&_resbook_44s_9} + }; + +-static vorbis_mapping_template _mapres_template_44_stereo[]={ ++static const vorbis_mapping_template _mapres_template_44_stereo[]={ ++ { _map_nominal, _res_44s_n1 }, /* -2 */ + { _map_nominal, _res_44s_n1 }, /* -1 */ + { _map_nominal, _res_44s_0 }, /* 0 */ + { _map_nominal, _res_44s_1 }, /* 1 */ +diff -ruN libvorbis-1.2.0/lib/modes/residue_44u.h aotuv-b5.7_20090301/lib/modes/residue_44u.h +--- libvorbis-1.2.0/lib/modes/residue_44u.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/modes/residue_44u.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: toplevel residue templates for 32/44.1/48kHz uncoupled +- last mod: $Id: residue_44u.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: residue_44u.h 2009-03-11 aoyumi $ + + ********************************************************************/ + +@@ -22,7 +22,7 @@ + /***** residue backends *********************************************/ + + +-static vorbis_info_residue0 _residue_44_low_un={ ++static const vorbis_info_residue0 _residue_44_low_un={ + 0,-1, -1, 8,-1, + {0}, + {-1}, +@@ -30,7 +30,7 @@ + { -1, 25, -1, 45, -1, -1, -1} + }; + +-static vorbis_info_residue0 _residue_44_mid_un={ ++static const vorbis_info_residue0 _residue_44_mid_un={ + 0,-1, -1, 10,-1, + /* 0 1 2 3 4 5 6 7 8 9 */ + {0}, +@@ -39,7 +39,7 @@ + { -1, 30, -1, 50, -1, 80, -1, -1, -1} + }; + +-static vorbis_info_residue0 _residue_44_hi_un={ ++static const vorbis_info_residue0 _residue_44_hi_un={ + 0,-1, -1, 10,-1, + /* 0 1 2 3 4 5 6 7 8 9 */ + {0}, +@@ -51,12 +51,12 @@ + /* mapping conventions: + only one submap (this would change for efficient 5.1 support for example)*/ + /* Four psychoacoustic profiles are used, one for each blocktype */ +-static vorbis_info_mapping0 _map_nominal_u[2]={ ++static const vorbis_info_mapping0 _map_nominal_u[2]={ + {1, {0,0}, {0}, {0}, 0,{0},{0}}, + {1, {0,0}, {1}, {1}, 0,{0},{0}} + }; + +-static static_bookblock _resbook_44u_n1={ ++static const static_bookblock _resbook_44u_n1={ + { + {0}, + {0,0,&_44un1__p1_0}, +@@ -68,7 +68,7 @@ + {&_44un1__p7_0,&_44un1__p7_1,&_44un1__p7_2} + } + }; +-static static_bookblock _resbook_44u_0={ ++static const static_bookblock _resbook_44u_0={ + { + {0}, + {0,0,&_44u0__p1_0}, +@@ -80,7 +80,7 @@ + {&_44u0__p7_0,&_44u0__p7_1,&_44u0__p7_2} + } + }; +-static static_bookblock _resbook_44u_1={ ++static const static_bookblock _resbook_44u_1={ + { + {0}, + {0,0,&_44u1__p1_0}, +@@ -92,7 +92,7 @@ + {&_44u1__p7_0,&_44u1__p7_1,&_44u1__p7_2} + } + }; +-static static_bookblock _resbook_44u_2={ ++static const static_bookblock _resbook_44u_2={ + { + {0}, + {0,0,&_44u2__p1_0}, +@@ -104,7 +104,7 @@ + {&_44u2__p7_0,&_44u2__p7_1,&_44u2__p7_2} + } + }; +-static static_bookblock _resbook_44u_3={ ++static const static_bookblock _resbook_44u_3={ + { + {0}, + {0,0,&_44u3__p1_0}, +@@ -116,7 +116,7 @@ + {&_44u3__p7_0,&_44u3__p7_1,&_44u3__p7_2} + } + }; +-static static_bookblock _resbook_44u_4={ ++static const static_bookblock _resbook_44u_4={ + { + {0}, + {0,0,&_44u4__p1_0}, +@@ -128,7 +128,7 @@ + {&_44u4__p7_0,&_44u4__p7_1,&_44u4__p7_2} + } + }; +-static static_bookblock _resbook_44u_5={ ++static const static_bookblock _resbook_44u_5={ + { + {0}, + {0,0,&_44u5__p1_0}, +@@ -142,7 +142,7 @@ + {&_44u5__p9_0,&_44u5__p9_1,&_44u5__p9_2} + } + }; +-static static_bookblock _resbook_44u_6={ ++static const static_bookblock _resbook_44u_6={ + { + {0}, + {0,0,&_44u6__p1_0}, +@@ -156,7 +156,7 @@ + {&_44u6__p9_0,&_44u6__p9_1,&_44u6__p9_2} + } + }; +-static static_bookblock _resbook_44u_7={ ++static const static_bookblock _resbook_44u_7={ + { + {0}, + {0,0,&_44u7__p1_0}, +@@ -170,7 +170,7 @@ + {&_44u7__p9_0,&_44u7__p9_1,&_44u7__p9_2} + } + }; +-static static_bookblock _resbook_44u_8={ ++static const static_bookblock _resbook_44u_8={ + { + {0}, + {0,0,&_44u8_p1_0}, +@@ -184,7 +184,7 @@ + {&_44u8_p9_0,&_44u8_p9_1,&_44u8_p9_2} + } + }; +-static static_bookblock _resbook_44u_9={ ++static const static_bookblock _resbook_44u_9={ + { + {0}, + {0,0,&_44u9_p1_0}, +@@ -199,7 +199,7 @@ + } + }; + +-static vorbis_residue_template _res_44u_n1[]={ ++static const vorbis_residue_template _res_44u_n1[]={ + {1,0, &_residue_44_low_un, + &_huff_book__44un1__short,&_huff_book__44un1__short, + &_resbook_44u_n1,&_resbook_44u_n1}, +@@ -208,7 +208,7 @@ + &_huff_book__44un1__long,&_huff_book__44un1__long, + &_resbook_44u_n1,&_resbook_44u_n1} + }; +-static vorbis_residue_template _res_44u_0[]={ ++static const vorbis_residue_template _res_44u_0[]={ + {1,0, &_residue_44_low_un, + &_huff_book__44u0__short,&_huff_book__44u0__short, + &_resbook_44u_0,&_resbook_44u_0}, +@@ -217,7 +217,7 @@ + &_huff_book__44u0__long,&_huff_book__44u0__long, + &_resbook_44u_0,&_resbook_44u_0} + }; +-static vorbis_residue_template _res_44u_1[]={ ++static const vorbis_residue_template _res_44u_1[]={ + {1,0, &_residue_44_low_un, + &_huff_book__44u1__short,&_huff_book__44u1__short, + &_resbook_44u_1,&_resbook_44u_1}, +@@ -226,7 +226,7 @@ + &_huff_book__44u1__long,&_huff_book__44u1__long, + &_resbook_44u_1,&_resbook_44u_1} + }; +-static vorbis_residue_template _res_44u_2[]={ ++static const vorbis_residue_template _res_44u_2[]={ + {1,0, &_residue_44_low_un, + &_huff_book__44u2__short,&_huff_book__44u2__short, + &_resbook_44u_2,&_resbook_44u_2}, +@@ -235,7 +235,7 @@ + &_huff_book__44u2__long,&_huff_book__44u2__long, + &_resbook_44u_2,&_resbook_44u_2} + }; +-static vorbis_residue_template _res_44u_3[]={ ++static const vorbis_residue_template _res_44u_3[]={ + {1,0, &_residue_44_low_un, + &_huff_book__44u3__short,&_huff_book__44u3__short, + &_resbook_44u_3,&_resbook_44u_3}, +@@ -244,7 +244,7 @@ + &_huff_book__44u3__long,&_huff_book__44u3__long, + &_resbook_44u_3,&_resbook_44u_3} + }; +-static vorbis_residue_template _res_44u_4[]={ ++static const vorbis_residue_template _res_44u_4[]={ + {1,0, &_residue_44_low_un, + &_huff_book__44u4__short,&_huff_book__44u4__short, + &_resbook_44u_4,&_resbook_44u_4}, +@@ -254,7 +254,7 @@ + &_resbook_44u_4,&_resbook_44u_4} + }; + +-static vorbis_residue_template _res_44u_5[]={ ++static const vorbis_residue_template _res_44u_5[]={ + {1,0, &_residue_44_mid_un, + &_huff_book__44u5__short,&_huff_book__44u5__short, + &_resbook_44u_5,&_resbook_44u_5}, +@@ -264,7 +264,7 @@ + &_resbook_44u_5,&_resbook_44u_5} + }; + +-static vorbis_residue_template _res_44u_6[]={ ++static const vorbis_residue_template _res_44u_6[]={ + {1,0, &_residue_44_mid_un, + &_huff_book__44u6__short,&_huff_book__44u6__short, + &_resbook_44u_6,&_resbook_44u_6}, +@@ -274,7 +274,7 @@ + &_resbook_44u_6,&_resbook_44u_6} + }; + +-static vorbis_residue_template _res_44u_7[]={ ++static const vorbis_residue_template _res_44u_7[]={ + {1,0, &_residue_44_mid_un, + &_huff_book__44u7__short,&_huff_book__44u7__short, + &_resbook_44u_7,&_resbook_44u_7}, +@@ -284,7 +284,7 @@ + &_resbook_44u_7,&_resbook_44u_7} + }; + +-static vorbis_residue_template _res_44u_8[]={ ++static const vorbis_residue_template _res_44u_8[]={ + {1,0, &_residue_44_hi_un, + &_huff_book__44u8__short,&_huff_book__44u8__short, + &_resbook_44u_8,&_resbook_44u_8}, +@@ -293,7 +293,7 @@ + &_huff_book__44u8__long,&_huff_book__44u8__long, + &_resbook_44u_8,&_resbook_44u_8} + }; +-static vorbis_residue_template _res_44u_9[]={ ++static const vorbis_residue_template _res_44u_9[]={ + {1,0, &_residue_44_hi_un, + &_huff_book__44u9__short,&_huff_book__44u9__short, + &_resbook_44u_9,&_resbook_44u_9}, +@@ -303,7 +303,8 @@ + &_resbook_44u_9,&_resbook_44u_9} + }; + +-static vorbis_mapping_template _mapres_template_44_uncoupled[]={ ++static const vorbis_mapping_template _mapres_template_44_uncoupled[]={ ++ { _map_nominal_u, _res_44u_n1 }, /* -2 */ + { _map_nominal_u, _res_44u_n1 }, /* -1 */ + { _map_nominal_u, _res_44u_0 }, /* 0 */ + { _map_nominal_u, _res_44u_1 }, /* 1 */ +diff -ruN libvorbis-1.2.0/lib/modes/residue_8.h aotuv-b5.7_20090301/lib/modes/residue_8.h +--- libvorbis-1.2.0/lib/modes/residue_8.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/modes/residue_8.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: toplevel residue templates 8/11kHz +- last mod: $Id: residue_8.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: residue_8.h 2009-03-11 aoyumi $ + + ********************************************************************/ + +@@ -20,7 +20,7 @@ + + /***** residue backends *********************************************/ + +-static static_bookblock _resbook_8s_0={ ++static const static_bookblock _resbook_8s_0={ + { + {0}, + {0,0,&_8c0_s_p1_0}, +@@ -34,7 +34,7 @@ + {&_8c0_s_p9_0,&_8c0_s_p9_1,&_8c0_s_p9_2} + } + }; +-static static_bookblock _resbook_8s_1={ ++static const static_bookblock _resbook_8s_1={ + { + {0}, + {0,0,&_8c1_s_p1_0}, +@@ -49,23 +49,24 @@ + } + }; + +-static vorbis_residue_template _res_8s_0[]={ ++static const vorbis_residue_template _res_8s_0[]={ + {2,0, &_residue_44_mid, + &_huff_book__8c0_s_single,&_huff_book__8c0_s_single, + &_resbook_8s_0,&_resbook_8s_0}, + }; +-static vorbis_residue_template _res_8s_1[]={ ++static const vorbis_residue_template _res_8s_1[]={ + {2,0, &_residue_44_mid, + &_huff_book__8c1_s_single,&_huff_book__8c1_s_single, + &_resbook_8s_1,&_resbook_8s_1}, + }; + +-static vorbis_mapping_template _mapres_template_8_stereo[2]={ ++static const vorbis_mapping_template _mapres_template_8_stereo[3]={ ++ { _map_nominal, _res_8s_0 }, /* -1 */ + { _map_nominal, _res_8s_0 }, /* 0 */ + { _map_nominal, _res_8s_1 }, /* 1 */ + }; + +-static static_bookblock _resbook_8u_0={ ++static const static_bookblock _resbook_8u_0={ + { + {0}, + {0,0,&_8u0__p1_0}, +@@ -77,7 +78,7 @@ + {&_8u0__p7_0,&_8u0__p7_1,&_8u0__p7_2} + } + }; +-static static_bookblock _resbook_8u_1={ ++static const static_bookblock _resbook_8u_1={ + { + {0}, + {0,0,&_8u1__p1_0}, +@@ -92,18 +93,19 @@ + } + }; + +-static vorbis_residue_template _res_8u_0[]={ ++static const vorbis_residue_template _res_8u_0[]={ + {1,0, &_residue_44_low_un, + &_huff_book__8u0__single,&_huff_book__8u0__single, + &_resbook_8u_0,&_resbook_8u_0}, + }; +-static vorbis_residue_template _res_8u_1[]={ ++static const vorbis_residue_template _res_8u_1[]={ + {1,0, &_residue_44_mid_un, + &_huff_book__8u1__single,&_huff_book__8u1__single, + &_resbook_8u_1,&_resbook_8u_1}, + }; + +-static vorbis_mapping_template _mapres_template_8_uncoupled[2]={ ++static const vorbis_mapping_template _mapres_template_8_uncoupled[3]={ ++ { _map_nominal_u, _res_8u_0 }, /* -1 */ + { _map_nominal_u, _res_8u_0 }, /* 0 */ + { _map_nominal_u, _res_8u_1 }, /* 1 */ + }; +diff -ruN libvorbis-1.2.0/lib/modes/setup_11.h aotuv-b5.7_20090301/lib/modes/setup_11.h +--- libvorbis-1.2.0/lib/modes/setup_11.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/modes/setup_11.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,36 +11,45 @@ + ******************************************************************** + + function: 11kHz settings +- last mod: $Id: setup_11.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: setup_11.h 2009-03-11 aoyumi $ + + ********************************************************************/ + + #include "psych_11.h" + +-static int blocksize_11[2]={ +- 512,512 ++ ++static const float preamp_11[4]={ ++0.882, 0.882, 0.965, 1.f + }; + +-static int _floor_mapping_11[2]={ +- 6,6, ++static const int blocksize_11[3]={ ++ 512,512,512 + }; + +-static double rate_mapping_11[3]={ +- 8000.,13000.,44000., ++static const int _floor_mapping_11[3]={ ++ 6,6,6 + }; + +-static double rate_mapping_11_uncoupled[3]={ +- 12000.,20000.,50000., ++static const double rate_mapping_11[4]={ ++// 8000.,13000.,44000., ++ 8000.,10000.,13000.,44000., + }; + +-static double quality_mapping_11[3]={ +- -.1,.0,1. ++static const double rate_mapping_11_uncoupled[4]={ ++// 12000.,20000.,50000., ++ 14000.,16000.,20000.,50000., + }; + +-ve_setup_data_template ve_setup_11_stereo={ +- 2, ++static const double quality_mapping_11[4]={ ++ -.2,-.1,.0,1. ++}; ++ ++static const ve_setup_data_template ve_setup_11_stereo={ ++// 2, ++ 3, + rate_mapping_11, + quality_mapping_11, ++ preamp_11, + 2, + 9000, + 15000, +@@ -88,10 +97,12 @@ + _mapres_template_8_stereo + }; + +-ve_setup_data_template ve_setup_11_uncoupled={ +- 2, ++static const ve_setup_data_template ve_setup_11_uncoupled={ ++// 2, ++ 3, + rate_mapping_11_uncoupled, + quality_mapping_11, ++ preamp_11, + -1, + 9000, + 15000, +diff -ruN libvorbis-1.2.0/lib/modes/setup_16.h aotuv-b5.7_20090301/lib/modes/setup_16.h +--- libvorbis-1.2.0/lib/modes/setup_16.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/modes/setup_16.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,45 +11,54 @@ + ******************************************************************** + + function: 16kHz settings +- last mod: $Id: setup_16.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: setup_16.h 2009-03-11 aoyumi $ + + ********************************************************************/ + + #include "psych_16.h" + #include "residue_16.h" + +-static int blocksize_16_short[3]={ +- 1024,512,512 ++static const float preamp_16[5]={ ++0.848, 0.855, 0.905, 0.963, 0.998 + }; +-static int blocksize_16_long[3]={ +- 1024,1024,1024 ++ ++static const int blocksize_16_short[4]={ ++ 1024,1024,512,512 ++}; ++static const int blocksize_16_long[4]={ ++ 1024,1024,1024,1024 + }; + +-static int _floor_mapping_16_short[3]={ +- 9,3,3 ++static const int _floor_mapping_16_short[4]={ ++ 9,9,3,3 + }; +-static int _floor_mapping_16[3]={ +- 9,9,9 ++static const int _floor_mapping_16[4]={ ++ 9,9,9,9 + }; + +-static double rate_mapping_16[4]={ +- 12000.,20000.,44000.,86000. ++static const double rate_mapping_16[5]={ ++// 12000.,20000.,44000.,86000. ++ 10000.,12000.,20000.,44000.,86000. + }; + +-static double rate_mapping_16_uncoupled[4]={ +- 16000.,28000.,64000.,100000. ++static const double rate_mapping_16_uncoupled[5]={ ++// 16000.,28000.,64000.,100000. ++ 16000.,18000.,28000.,64000.,100000. + }; + +-static double _global_mapping_16[4]={ 1., 2., 3., 4. }; ++static const double _global_mapping_16[5]={ 2., 2., 3., 4., 5. }; + +-static double quality_mapping_16[4]={ -.1,.05,.5,1. }; ++static const double quality_mapping_16[5]={ -.2,-.1,.05,.5,1. }; + +-static double _psy_compand_16_mapping[4]={ 0., .8, 1., 1.}; ++//static const double _psy_compand_16_mapping[5]={ 0., 0., .8, 1., 1.}; ++static const double _psy_compand_16_mapping[5]={ 0., 1., 1.8, 2., 2.}; + +-ve_setup_data_template ve_setup_16_stereo={ +- 3, ++static const ve_setup_data_template ve_setup_16_stereo={ ++// 3, ++ 4, + rate_mapping_16, + quality_mapping_16, ++ preamp_16, + 2, + 15000, + 19000, +@@ -97,10 +106,12 @@ + _mapres_template_16_stereo + }; + +-ve_setup_data_template ve_setup_16_uncoupled={ +- 3, ++static const ve_setup_data_template ve_setup_16_uncoupled={ ++// 3, ++ 4, + rate_mapping_16_uncoupled, + quality_mapping_16, ++ preamp_16, + -1, + 15000, + 19000, +@@ -116,7 +127,7 @@ + _vp_tonemask_adj_16, + _vp_tonemask_adj_16, + +- _psy_noiseguards_8, ++ _psy_noiseguards_16, + _psy_noisebias_16_impulse, + _psy_noisebias_16_short, + _psy_noisebias_16_short, +diff -ruN libvorbis-1.2.0/lib/modes/setup_22.h aotuv-b5.7_20090301/lib/modes/setup_22.h +--- libvorbis-1.2.0/lib/modes/setup_22.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/modes/setup_22.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,24 +11,32 @@ + ******************************************************************** + + function: 22kHz settings +- last mod: $Id: setup_22.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: setup_22.h 2009-03-11 aoyumi $ + + ********************************************************************/ + +-static double rate_mapping_22[4]={ +- 15000.,20000.,44000.,86000. ++static const float preamp_22[5]={ ++0.848, 0.850, 0.910, 0.963, 0.995 + }; + +-static double rate_mapping_22_uncoupled[4]={ +- 16000.,28000.,50000.,90000. ++static const double rate_mapping_22[5]={ ++// 15000.,20000.,44000.,86000. ++ 14000.,16000.,20000.,44000.,86000. + }; + +-static double _psy_lowpass_22[4]={9.5,11.,30.,99.}; ++static const double rate_mapping_22_uncoupled[5]={ ++// 16000.,28000.,50000.,90000. ++ 22000.,24000.,28000.,50000.,90000. ++}; ++ ++static const double _psy_lowpass_22[5]={8.5,9.5,11.,30.,99.}; + +-ve_setup_data_template ve_setup_22_stereo={ +- 3, ++static const ve_setup_data_template ve_setup_22_stereo={ ++// 3, ++ 4, + rate_mapping_22, + quality_mapping_16, ++ preamp_22, + 2, + 19000, + 26000, +@@ -76,10 +84,12 @@ + _mapres_template_16_stereo + }; + +-ve_setup_data_template ve_setup_22_uncoupled={ +- 3, ++static const ve_setup_data_template ve_setup_22_uncoupled={ ++// 3, ++ 4, + rate_mapping_22_uncoupled, + quality_mapping_16, ++ preamp_22, + -1, + 19000, + 26000, +@@ -95,7 +105,7 @@ + _vp_tonemask_adj_16, + _vp_tonemask_adj_16, + +- _psy_noiseguards_8, ++ _psy_noiseguards_16, + _psy_noisebias_16_impulse, + _psy_noisebias_16_short, + _psy_noisebias_16_short, +diff -ruN libvorbis-1.2.0/lib/modes/setup_32.h aotuv-b5.7_20090301/lib/modes/setup_32.h +--- libvorbis-1.2.0/lib/modes/setup_32.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/modes/setup_32.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,28 +11,45 @@ + ******************************************************************** + + function: toplevel settings for 32kHz +- last mod: $Id: setup_32.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: setup_32.h 2009-03-11 aoyumi $ + + ********************************************************************/ + +-static double rate_mapping_32[12]={ +- 18000.,28000.,35000.,45000.,56000.,60000., ++static const float preamp_32[13]={ ++0.990, 0.990, ++0.996, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f ++}; ++ ++static const double rate_mapping_32[13]={ ++// 18000.,28000.,35000.,45000.,56000.,60000., ++ 14000.,21000.,28000.,35000.,45000.,56000.,60000., + 75000.,90000.,100000.,115000.,150000.,190000., + }; + +-static double rate_mapping_32_un[12]={ +- 30000.,42000.,52000.,64000.,72000.,78000., ++static const double rate_mapping_32_un[13]={ ++// 30000.,42000.,52000.,64000.,72000.,78000., ++ 26000.,32000.,42000.,52000.,64000.,72000.,78000., + 86000.,92000.,110000.,120000.,140000.,190000., + }; + +-static double _psy_lowpass_32[12]={ +- 12.3,13.,13.,14.,15.,99.,99.,99.,99.,99.,99.,99. ++static const double _psy_lowpass_32[13]={ ++// 12.3,13.,13.,14.,15.,99.,99.,99.,99.,99.,99.,99. ++ 12.1,12.6,13.,13.,14.,15.,99.,99.,99.,99.,99.,99.,99. ++}; ++ ++static const int _floor_short_mapping_32[12]={ ++ 1,1,0,0,2,2,4,5,5,5,5,5 ++}; ++static const int _floor_long_mapping_32[12]={ ++ 8,8,7,7,7,7,7,7,7,7,7,7 + }; + +-ve_setup_data_template ve_setup_32_stereo={ +- 11, ++static const ve_setup_data_template ve_setup_32_stereo={ ++// 11, ++ 12, + rate_mapping_32, + quality_mapping_44, ++ preamp_32, + 2, + 26000, + 40000, +@@ -59,7 +76,7 @@ + _psy_compand_short_mapping, + _psy_compand_long_mapping, + +- {_noise_start_short_44,_noise_start_long_44}, ++ {_noise_start_short_32,_noise_start_long_32}, + {_noise_part_short_44,_noise_part_long_44}, + _noise_thresh_44, + +@@ -74,16 +91,18 @@ + + _floor_books, + _floor, +- _floor_short_mapping_44, +- _floor_long_mapping_44, ++ _floor_short_mapping_32, ++ _floor_long_mapping_32, + + _mapres_template_44_stereo + }; + +-ve_setup_data_template ve_setup_32_uncoupled={ +- 11, ++static const ve_setup_data_template ve_setup_32_uncoupled={ ++// 11, ++ 12, + rate_mapping_32_un, + quality_mapping_44, ++ preamp_32, + -1, + 26000, + 40000, +@@ -110,7 +129,7 @@ + _psy_compand_short_mapping, + _psy_compand_long_mapping, + +- {_noise_start_short_44,_noise_start_long_44}, ++ {_noise_start_short_32,_noise_start_long_32}, + {_noise_part_short_44,_noise_part_long_44}, + _noise_thresh_44, + +@@ -125,8 +144,8 @@ + + _floor_books, + _floor, +- _floor_short_mapping_44, +- _floor_long_mapping_44, ++ _floor_short_mapping_32, ++ _floor_long_mapping_32, + + _mapres_template_44_uncoupled + }; +diff -ruN libvorbis-1.2.0/lib/modes/setup_44.h aotuv-b5.7_20090301/lib/modes/setup_44.h +--- libvorbis-1.2.0/lib/modes/setup_44.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/modes/setup_44.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: toplevel settings for 44.1/48kHz +- last mod: $Id: setup_44.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: setup_44.h 2009-03-11 aoyumi $ + + ********************************************************************/ + +@@ -19,48 +19,62 @@ + #include "modes/residue_44.h" + #include "modes/psych_44.h" + +-static double rate_mapping_44_stereo[12]={ +- 22500.,32000.,40000.,48000.,56000.,64000., ++static const float preamp_44[13]={ ++0.993, 0.993, ++0.997, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f ++}; ++static const float preamp_48[13]={ ++1.f, 1.f, ++1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f ++}; ++ ++static const double rate_mapping_44_stereo[13]={ ++// 22500.,32000.,40000.,48000.,56000.,64000., ++ 16000.,24000.,32000.,40000.,48000.,56000.,64000., + 80000.,96000.,112000.,128000.,160000.,250001. + }; + +-static double quality_mapping_44[12]={ +- -.1,.0,.1,.2,.3,.4,.5,.6,.7,.8,.9,1.0 ++static const double quality_mapping_44[13]={ ++ -.2,-.1,.0,.1,.2,.3,.4,.5,.6,.7,.8,.9,1.0 + }; + +-static int blocksize_short_44[11]={ +- 512,256,256,256,256,256,256,256,256,256,256 ++static const int blocksize_short_44[12]={ ++ 512,512,256,256,256,256,256,256,256,256,256,256 + }; +-static int blocksize_long_44[11]={ +- 4096,2048,2048,2048,2048,2048,2048,2048,2048,2048,2048 ++static const int blocksize_long_44[12]={ ++ 4096,4096,2048,2048,2048,2048,2048,2048,2048,2048,2048,2048 + }; + +-static double _psy_compand_short_mapping[12]={ +- 0.5, 1., 1., 1.3, 1.6, 2., 2., 2., 2., 2., 2., 2. ++static const double _psy_compand_short_mapping[13]={ ++ 0., 0., 1., 1., 1.3, 1.6, 2., 2., 2., 2., 2., 2., 2. + }; +-static double _psy_compand_long_mapping[12]={ +- 3.5, 4., 4., 4.3, 4.6, 5., 5., 5., 5., 5., 5., 5. ++static const double _psy_compand_long_mapping[13]={ ++ 4., 4., 4., 4., 4.3, 4.6, 5., 5., 5., 5., 5., 5., 5. + }; + +-static double _global_mapping_44[12]={ ++static const double _global_mapping_44[13]={ + /* 1., 1., 1.5, 2., 2., 2.5, 2.7, 3.0, 3.5, 4., 4. */ +- 0., 1., 1., 1.5, 2., 2., 2.5, 2.7, 3.0, 3.7, 4., 4. ++// 0., 1., 1., 1.5, 2., 2., 2.5, 2.7, 3.0, 3.7, 4., 4. ++ 0., 1., 2., 2., 2.5, 3., 3., 3.5, 3.7, 4., 4., 5., 5. // low ++// 0., 1., 2., 2., 2.5, 3., 3.2, 4.0, 4.0, 4.0, 4.5, 5., 5. // high + }; + +-static int _floor_short_mapping_44[11]={ +- 1,0,0,2,2,4,5,5,5,5,5 ++static const int _floor_short_mapping_44[12]={ ++ 1,1,0,0,2,2,4,5,5,5,5,5 + }; +-static int _floor_long_mapping_44[11]={ +- 8,7,7,7,7,7,7,7,7,7,7 ++static const int _floor_long_mapping_44[12]={ ++ 11,11,10,10,10,7,7,7,7,7,7,7 + }; + +-ve_setup_data_template ve_setup_44_stereo={ +- 11, ++static const ve_setup_data_template ve_setup_44_stereo={ ++// 11, ++ 12, + rate_mapping_44_stereo, + quality_mapping_44, ++ preamp_44, + 2, + 40000, +- 50000, ++ 45000, + + blocksize_short_44, + blocksize_long_44, +@@ -69,7 +83,7 @@ + _psy_tone_0dB, + _psy_tone_suppress, + +- _vp_tonemask_adj_otherblock, ++ _vp_tonemask_adj_otherblock, // impulse + _vp_tonemask_adj_longblock, + _vp_tonemask_adj_otherblock, + +@@ -105,3 +119,55 @@ + _mapres_template_44_stereo + }; + ++static const ve_setup_data_template ve_setup_48_stereo={ ++// 11, ++ 12, ++ rate_mapping_44_stereo, ++ quality_mapping_44, ++ preamp_48, ++ 2, ++ 45000, ++ 50000, ++ ++ blocksize_short_44, ++ blocksize_long_44, ++ ++ _psy_tone_masteratt_44, ++ _psy_tone_0dB, ++ _psy_tone_suppress, ++ ++ _vp_tonemask_adj_otherblock, // impulse ++ _vp_tonemask_adj_longblock, ++ _vp_tonemask_adj_otherblock, ++ ++ _psy_noiseguards_44, ++ _psy_noisebias_impulse, ++ _psy_noisebias_padding, ++ _psy_noisebias_trans, ++ _psy_noisebias_long, ++ _psy_noise_suppress, ++ ++ _psy_compand_44, ++ _psy_compand_short_mapping, ++ _psy_compand_long_mapping, ++ ++ {_noise_start_short_44,_noise_start_long_44}, ++ {_noise_part_short_44,_noise_part_long_44}, ++ _noise_thresh_44, ++ ++ _psy_ath_floater, ++ _psy_ath_abs, ++ ++ _psy_lowpass_44, ++ ++ _psy_global_44, ++ _global_mapping_44, ++ _psy_stereo_modes_44, ++ ++ _floor_books, ++ _floor, ++ _floor_short_mapping_44, ++ _floor_long_mapping_44, ++ ++ _mapres_template_44_stereo ++}; +diff -ruN libvorbis-1.2.0/lib/modes/setup_44u.h aotuv-b5.7_20090301/lib/modes/setup_44u.h +--- libvorbis-1.2.0/lib/modes/setup_44u.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/modes/setup_44u.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,23 +11,79 @@ + ******************************************************************** + + function: toplevel settings for 44.1/48kHz uncoupled modes +- last mod: $Id: setup_44u.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: setup_44u.h 2009-03-11 aoyumi $ + + ********************************************************************/ + + #include "modes/residue_44u.h" + +-static double rate_mapping_44_un[12]={ +- 32000.,48000.,60000.,70000.,80000.,86000., ++static const double rate_mapping_44_un[13]={ ++// 32000.,48000.,60000.,70000.,80000.,86000., ++ 28000.,40000.,48000.,60000.,70000.,80000.,86000., + 96000.,110000.,120000.,140000.,160000.,240001. + }; + +-ve_setup_data_template ve_setup_44_uncoupled={ +- 11, ++static const ve_setup_data_template ve_setup_44_uncoupled={ ++// 11, ++ 12, + rate_mapping_44_un, + quality_mapping_44, ++ preamp_44, + -1, + 40000, ++ 45000, ++ ++ blocksize_short_44, ++ blocksize_long_44, ++ ++ _psy_tone_masteratt_44, ++ _psy_tone_0dB, ++ _psy_tone_suppress, ++ ++ _vp_tonemask_adj_otherblock, ++ _vp_tonemask_adj_longblock, ++ _vp_tonemask_adj_otherblock, ++ ++ _psy_noiseguards_44, ++ _psy_noisebias_impulse, ++ _psy_noisebias_padding, ++ _psy_noisebias_trans, ++ _psy_noisebias_long, ++ _psy_noise_suppress, ++ ++ _psy_compand_44, ++ _psy_compand_short_mapping, ++ _psy_compand_long_mapping, ++ ++ {_noise_start_short_44,_noise_start_long_44}, ++ {_noise_part_short_44,_noise_part_long_44}, ++ _noise_thresh_44, ++ ++ _psy_ath_floater, ++ _psy_ath_abs, ++ ++ _psy_lowpass_44, ++ ++ _psy_global_44, ++ _global_mapping_44, ++ NULL, ++ ++ _floor_books, ++ _floor, ++ _floor_short_mapping_44, ++ _floor_long_mapping_44, ++ ++ _mapres_template_44_uncoupled ++}; ++ ++static const ve_setup_data_template ve_setup_48_uncoupled={ ++// 11, ++ 12, ++ rate_mapping_44_un, ++ quality_mapping_44, ++ preamp_48, ++ -1, ++ 45000, + 50000, + + blocksize_short_44, +diff -ruN libvorbis-1.2.0/lib/modes/setup_8.h aotuv-b5.7_20090301/lib/modes/setup_8.h +--- libvorbis-1.2.0/lib/modes/setup_8.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/modes/setup_8.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,41 +11,51 @@ + ******************************************************************** + + function: 8kHz settings +- last mod: $Id: setup_8.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: setup_8.h 2009-03-11 aoyumi $ + + ********************************************************************/ + + #include "psych_8.h" + #include "residue_8.h" + +-static int blocksize_8[2]={ +- 512,512 ++static const float preamp_8[4]={ ++0.965, 0.965, 0.965, 1.f + }; + +-static int _floor_mapping_8[2]={ +- 6,6, ++static const int blocksize_8[3]={ ++ 512,512,512 + }; + +-static double rate_mapping_8[3]={ +- 6000.,9000.,32000., ++static const int _floor_mapping_8[3]={ ++ 6,6,6 + }; + +-static double rate_mapping_8_uncoupled[3]={ +- 8000.,14000.,42000., ++static const double rate_mapping_8[4]={ ++// 6000.,9000.,32000., ++ 5000.,6000.,9000.,32000., + }; + +-static double quality_mapping_8[3]={ +- -.1,.0,1. ++static const double rate_mapping_8_uncoupled[4]={ ++// 8000.,14000.,42000., ++ 8000.,10000.,14000.,42000., + }; + +-static double _psy_compand_8_mapping[3]={ 0., 1., 1.}; ++static const double quality_mapping_8[4]={ ++ -.2,-.1,.0,1. ++}; + +-static double _global_mapping_8[3]={ 1., 2., 3. }; ++//static const double _psy_compand_8_mapping[3]={ 0., 1., 1.}; ++static const double _psy_compand_8_mapping[4]={ 0., 1., 2., 2.}; + +-ve_setup_data_template ve_setup_8_stereo={ +- 2, ++//static const double _global_mapping_8[3]={ 1., 2., 3. }; ++static const double _global_mapping_8[4]={ 2., 2., 3., 4. }; ++ ++static const ve_setup_data_template ve_setup_8_stereo={ ++// 2, ++ 3, + rate_mapping_8, + quality_mapping_8, ++ preamp_8, + 2, + 8000, + 9000, +@@ -93,10 +103,12 @@ + _mapres_template_8_stereo + }; + +-ve_setup_data_template ve_setup_8_uncoupled={ +- 2, ++static const ve_setup_data_template ve_setup_8_uncoupled={ ++// 2, ++ 3, + rate_mapping_8_uncoupled, + quality_mapping_8, ++ preamp_8, + -1, + 8000, + 9000, +diff -ruN libvorbis-1.2.0/lib/modes/setup_X.h aotuv-b5.7_20090301/lib/modes/setup_X.h +--- libvorbis-1.2.0/lib/modes/setup_X.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/modes/setup_X.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,19 +11,21 @@ + ******************************************************************** + + function: catch-all toplevel settings for q modes only +- last mod: $Id: setup_X.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: setup_X.h 2009-03-11 aoyumi $ + + ********************************************************************/ + +-static double rate_mapping_X[12]={ +- -1.,-1.,-1.,-1.,-1.,-1., ++static const double rate_mapping_X[13]={ ++ -1.,-1.,-1.,-1.,-1.,-1.,-1. + -1.,-1.,-1.,-1.,-1.,-1. + }; + +-ve_setup_data_template ve_setup_X_stereo={ +- 11, ++static const ve_setup_data_template ve_setup_X_stereo={ ++// 11, ++ 12, + rate_mapping_X, + quality_mapping_44, ++ preamp_48, + 2, + 50000, + 200000, +@@ -71,10 +73,12 @@ + _mapres_template_44_stereo + }; + +-ve_setup_data_template ve_setup_X_uncoupled={ +- 11, ++static const ve_setup_data_template ve_setup_X_uncoupled={ ++// 11, ++ 12, + rate_mapping_X, + quality_mapping_44, ++ preamp_48, + -1, + 50000, + 200000, +@@ -122,10 +126,12 @@ + _mapres_template_44_uncoupled + }; + +-ve_setup_data_template ve_setup_XX_stereo={ +- 2, ++static const ve_setup_data_template ve_setup_XX_stereo={ ++// 2, ++ 3, + rate_mapping_X, + quality_mapping_8, ++ preamp_8, + 2, + 0, + 8000, +@@ -173,10 +179,12 @@ + _mapres_template_8_stereo + }; + +-ve_setup_data_template ve_setup_XX_uncoupled={ +- 2, ++static const ve_setup_data_template ve_setup_XX_uncoupled={ ++// 2, ++ 3, + rate_mapping_X, + quality_mapping_8, ++ preamp_8, + -1, + 0, + 8000, +diff -ruN libvorbis-1.2.0/lib/os.h aotuv-b5.7_20090301/lib/os.h +--- libvorbis-1.2.0/lib/os.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/os.h 2009-03-02 21:24:44.000000000 +0100 +@@ -13,7 +13,7 @@ + ******************************************************************** + + function: #ifdef jail to whip a few platforms into the UNIX ideal. +- last mod: $Id: os.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: os.h 15350 2008-09-29 10:10:40Z erikd $ + + ********************************************************************/ + +@@ -79,6 +79,8 @@ + # define max(x,y) ((x)<(y)?(y):(x)) + #endif + ++ ++/* Special i386 GCC implementation */ + #if defined(__i386__) && defined(__GNUC__) && !defined(__BEOS__) + # define VORBIS_FPU_CONTROL + /* both GCC and MSVC are kinda stupid about rounding/casting to int. +@@ -113,10 +115,12 @@ + __asm__("fistl %0": "=m"(i) : "t"(f)); + return(i); + } +-#endif ++#endif /* Special i386 GCC implementation */ + + +-#if defined(_WIN32) && !defined(__GNUC__) && !defined(__BORLANDC__) ++/* MSVC inline assembly. 32 bit only; inline ASM isn't implemented in the ++ * 64 bit compiler */ ++#if defined(_MSC_VER) && !defined(_WIN64) + # define VORBIS_FPU_CONTROL + + typedef ogg_int16_t vorbis_fpu_control; +@@ -136,21 +140,47 @@ + static __inline void vorbis_fpu_restore(vorbis_fpu_control fpu){ + } + +-#endif ++#endif /* Special MSVC 32 bit implementation */ ++ ++ ++/* Optimized code path for x86_64 builds. Uses SSE2 intrinsics. This can be ++ done safely because all x86_64 CPUs supports SSE2. */ ++#if (defined(_MSC_VER) && defined(_WIN64)) || (defined(__GNUC__) && defined (__x86_64__)) ++# define VORBIS_FPU_CONTROL ++ ++typedef ogg_int16_t vorbis_fpu_control; + ++#include ++static __inline int vorbis_ftoi(double f){ ++ return _mm_cvtsd_si32(_mm_load_sd(&f)); ++} + ++static __inline void vorbis_fpu_setround(vorbis_fpu_control *fpu){ ++} ++ ++static __inline void vorbis_fpu_restore(vorbis_fpu_control fpu){ ++} ++ ++#endif /* Special MSVC x64 implementation */ ++ ++ ++/* If no special implementation was found for the current compiler / platform, ++ use the default implementation here: */ + #ifndef VORBIS_FPU_CONTROL + + typedef int vorbis_fpu_control; + + static int vorbis_ftoi(double f){ +- return (int)(f+.5); ++ /* Note: MSVC and GCC (at least on some systems) round towards zero, thus, ++ the floor() call is required to ensure correct roudning of ++ negative numbers */ ++ return (int)floor(f+.5); + } + + /* We don't have special code for this compiler/arch, so do it the slow way */ + # define vorbis_fpu_setround(vorbis_fpu_control) {} + # define vorbis_fpu_restore(vorbis_fpu_control) {} + +-#endif ++#endif /* default implementation */ + + #endif /* _OS_H */ +diff -ruN libvorbis-1.2.0/lib/psy.c aotuv-b5.7_20090301/lib/psy.c +--- libvorbis-1.2.0/lib/psy.c 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/psy.c 2009-03-04 12:33:32.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: psychoacoustics not including preecho +- last mod: $Id: psy.c 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: psy.c 2008-12-15 aoyumi $ + + ********************************************************************/ + +@@ -23,6 +23,7 @@ + + #include "masking.h" + #include "psy.h" ++#include "psy_table.h" + #include "os.h" + #include "lpc.h" + #include "smallft.h" +@@ -30,8 +31,58 @@ + #include "misc.h" + + #define NEGINF -9999.f +-static double stereo_threshholds[]={0.0, .5, 1.0, 1.5, 2.5, 4.5, 8.5, 16.5, 9e10}; +-static double stereo_threshholds_limited[]={0.0, .5, 1.0, 1.5, 2.0, 2.5, 4.5, 8.5, 9e10}; ++ ++/* ++ rephase = reverse phase limit (postpoint) ++ 0 1 2 3 4 5 6 7 8 */ ++static const double stereo_threshholds[]= {0.0, 0.5, 1.0, 1.5, 2.5, 4.5, 8.5,16.5, 9e10}; ++static const double stereo_threshholds_rephase[]= {0.0, 0.5, 0.5, 1.0, 1.5, 1.5, 2.5, 2.5, 9e10}; ++ ++static const double stereo_threshholds_low[]= {0.0, 0.5, 0.5, 1.0, 1.0, 0.0, 0.0, 0.0, 0.0}; ++static const double stereo_threshholds_high[]= {0.0, 0.5, 0.5, 0.5, 1.0, 3.0, 5.5, 8.5, 0.0}; ++ ++ ++static const int m3n32[] = {21,13,10,4}; ++static const int m3n44[] = {15,9,7,3}; ++static const int m3n48[] = {14,8,6,3}; ++static const int m3n32x2[] = {42,26,20,8}; ++static const int m3n44x2[] = {30,18,14,6}; ++static const int m3n48x2[] = {28,16,12,6}; ++ ++static const int freq_bfn128[128] = { ++ 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, ++ 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, ++ 8, 8, 8, 8, 9, 9, 9, 9,10,10,10,10,11,11,11,11, ++12,12,12,12,13,13,13,13,14,14,14,14,15,15,15,15, ++ ++16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19, ++20,20,20,20,21,21,21,21,22,22,22,22,23,23,23,23, ++24,24,24,24,25,25,25,24,23,22,21,20,19,18,17,16, ++15,14,13,12,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 1, ++}; ++static const int freq_bfn256[256] = { ++ 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, ++ 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, ++ 8, 8, 8, 8, 9, 9, 9, 9,10,10,10,10,11,11,11,11, ++12,12,12,12,13,13,13,13,14,14,14,14,15,15,15,15, ++16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19, ++20,20,20,20,21,21,21,21,22,22,22,22,23,23,23,23, ++24,24,24,24,25,25,25,25,26,26,26,26,27,27,27,27, ++28,28,28,28,29,29,29,29,30,30,30,30,31,31,31,31, ++ ++32,32,32,32,33,33,33,33,34,34,34,34,35,35,35,35, ++36,36,36,36,37,37,37,37,38,38,38,38,39,39,39,39, ++40,40,40,40,41,41,41,41,42,42,42,42,43,43,43,43, ++44,44,44,44,45,45,45,45,46,46,46,46,47,47,47,47, ++48,48,48,48,49,49,49,49,50,50,50,50,51,50,49,48, ++47,46,45,44,43,42,41,40,39,38,37,36,35,34,33,32, ++31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16, ++15,14,13,12,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 1, ++}; ++ ++static const float nnmid_th=0.3; ++ ++ + + vorbis_look_psy_global *_vp_global_look(vorbis_info *vi){ + codec_setup_info *ci=vi->codec_setup; +@@ -284,15 +335,78 @@ + p->n=n; + p->rate=rate; + +- /* AoTuV HF weighting */ +- p->m_val = 1.; +- if(rate < 26000) p->m_val = 0; +- else if(rate < 38000) p->m_val = .94; /* 32kHz */ +- else if(rate > 46000) p->m_val = 1.275; /* 48kHz */ +- ++ /* AoTuV HF weighting etc. */ ++ p->n25p=n/4; ++ p->n33p=n/3; ++ p->n75p=n*3/4; ++ p->nn25pt=vi->normal_partition/4; ++ p->nn50pt=p->nn25pt*2; ++ p->nn75pt=p->nn25pt*3; ++ if(rate < 26000){ ++ /* below 26kHz */ ++ p->m_val = 0; ++ for(i=0; i<4; i++) p->m3n[i] = 0; ++ p->tonecomp_endp=0; // dummy ++ p->tonecomp_thres=.25; ++ p->st_freqlimit=n; ++ p->min_nn_lp=0; p->nn_mec_s= 0; p->nn_mec_m= 0; ++ }else if(rate < 38000){ ++ /* 32kHz */ ++ p->m_val = .93; ++ if(n==128) { p->tonecomp_endp= 124; p->tonecomp_thres=.7; ++ p->st_freqlimit=n; p->min_nn_lp=120; ++ p->nn_mec_s = .48; p->nn_mec_m =.24; ++ for(i=0; i<4; i++) p->m3n[i] = m3n32[i];} ++ else if(n==256) { p->tonecomp_endp= 248; p->tonecomp_thres=.7; ++ p->st_freqlimit=n; p->min_nn_lp=240; ++ p->nn_mec_s = .48; p->nn_mec_m =.24; ++ for(i=0; i<4; i++) p->m3n[i] = m3n32x2[i];} ++ else if(n==1024){ p->tonecomp_endp= 992; p->tonecomp_thres=.7; ++ p->st_freqlimit=n; p->min_nn_lp=960; ++ p->nn_mec_s =.24; p->nn_mec_m =.12;} ++ else if(n==2048){ p->tonecomp_endp=1984; p->tonecomp_thres=.7; ++ p->st_freqlimit=n; p->min_nn_lp=1920; ++ p->nn_mec_s =.24; p->nn_mec_m =.12;} ++ }else if(rate > 46000){ ++ /* 48kHz */ ++ p->m_val = 1.205; ++ if(n==128) { p->tonecomp_endp= 83; p->tonecomp_thres=.7; ++ p->st_freqlimit= 88; p->min_nn_lp= 80; ++ p->nn_mec_s = .48; p->nn_mec_m =.24; ++ for(i=0; i<4; i++) p->m3n[i] = m3n48[i];} ++ else if(n==256) { p->tonecomp_endp= 166; p->tonecomp_thres=.7; ++ p->st_freqlimit= 176; p->min_nn_lp= 160; ++ p->nn_mec_s = .48; p->nn_mec_m =.24; ++ for(i=0; i<4; i++) p->m3n[i] = m3n48x2[i];} ++ else if(n==1024){ p->tonecomp_endp= 664; p->tonecomp_thres=.7; ++ p->st_freqlimit= 704; p->min_nn_lp= 640; ++ p->nn_mec_s =.24; p->nn_mec_m =.12;} ++ else if(n==2048){ p->tonecomp_endp=1328; p->tonecomp_thres=.7; ++ p->st_freqlimit=1408; p->min_nn_lp=1280; ++ p->nn_mec_s =.24; p->nn_mec_m =.12;} ++ }else{ ++ /* 44.1kHz */ ++ p->m_val = 1.; ++ if(n==128) { p->tonecomp_endp= 90; p->tonecomp_thres=.7; //15503.90625 ++ p->st_freqlimit= 96; p->min_nn_lp= 87; //16537.5 , 14987.109375 ++ p->nn_mec_s = .48; p->nn_mec_m =.24; ++ for(i=0; i<4; i++) p->m3n[i] = m3n44[i];} ++ else if(n==256) { p->tonecomp_endp= 180; p->tonecomp_thres=.7; ++ p->st_freqlimit= 192; p->min_nn_lp= 174; ++ p->nn_mec_s = .48; p->nn_mec_m =.24; ++ for(i=0; i<4; i++) p->m3n[i] = m3n44x2[i];} ++ else if(n==1024){ p->tonecomp_endp= 720; p->tonecomp_thres=.7; ++ p->st_freqlimit= 768; p->min_nn_lp= 696; ++ p->nn_mec_s =.24; p->nn_mec_m =.12;} ++ else if(n==2048){ p->tonecomp_endp=1440; p->tonecomp_thres=.7; ++ p->st_freqlimit=1536; p->min_nn_lp=1392; ++ p->nn_mec_s =.24; p->nn_mec_m =.12;} ++ } ++ + /* set up the lookups for a given blocksize and sample rate */ + +- for(i=0,j=0;iath[i]=p->ath[j-1]; ++ } + + for(i=0;ivi->noisecompand_high[NOISE_COMPAND_LEVELS-1] > 1) && (noise_compand_level > 0)){ ++ int thter = p->n33p; ++ for(;i=NOISE_COMPAND_LEVELS)dB=NOISE_COMPAND_LEVELS-1; ++ if(dB<0)dB=0; ++ logmask[i]= work[i]+p->vi->noisecompand[dB]- ++ ((p->vi->noisecompand[dB]-p->vi->noisecompand_high[dB])*noise_compand_level); ++ } ++ } ++ for(;i=NOISE_COMPAND_LEVELS)dB=NOISE_COMPAND_LEVELS-1; + if(dB<0)dB=0; +@@ -851,24 +981,268 @@ + + } + ++static void set_m3p(local_mod3_psy *mp, int lW_no, int impadnum, int n, float cx, float toneatt, ++ float *logmdct, float *lastmdct, float *tempmdct, ++ int modenumber, int blocktype, int lW_modenumber, int lW_blocktype, ++ int bit_managed, int offset_select){ ++ ++ int i,j, count; ++ float freqbuf, cell; ++ ++ /* lower sampling rate */ ++ if(cx < 0.5){ ++ mp->sw = 0; ++ mp->mdctbuf_flag=0; ++ return; ++ } ++ ++ /* set flag for lastmdct & tempmdct */ ++ if( !bit_managed || (offset_select==0) ) mp->mdctbuf_flag=1; ++ else mp->mdctbuf_flag=0; ++ ++ /** M3 PRE **/ ++ if((n == 128) && !modenumber && !blocktype){ ++ if(toneatt < 3) count = 2; // q6~ ++ else count = 3; ++ ++ if(!lW_blocktype && !lW_modenumber){ /* last window "short" - type "impulse" */ ++ if(lW_no < 8){ ++ /* impulse - @impulse case1 */ ++ mp->noise_rate = 0.7-(float)(lW_no-1)/17; ++ mp->noise_center = (float)(lW_no*count); ++ mp->tone_rate = 8-lW_no; ++ }else{ ++ /* impulse - @impulse case2 */ ++ mp->noise_rate = 0.3; ++ mp->noise_center = 25; ++ mp->tone_rate = 0; ++ if((lW_no*count) < 24) mp->noise_center = lW_no*count; ++ } ++ if(mp->mdctbuf_flag == 1){ ++ for(i=0; inoise_rate = 0.7; ++ mp->noise_center = 0; ++ mp->tone_rate = 8.; ++ if(mp->mdctbuf_flag == 1){ ++ for(i=0; inoise_rate_low = 0; ++ mp->sw = 1; ++ if(impadnum)mp->noise_rate*=.8; ++ for(i=0;imdctbuf_flag == 1)) ++ tempmdct[i+j] += (5./(float)freq_bfn128[i+j]); ++ } ++ } ++ }else if((n == 256) && !modenumber && !blocktype){ ++ // for q-1/-2 44.1kHz/48kHz ++ if(!lW_blocktype && !lW_modenumber){ /* last window "short" - type "impulse" */ ++ count = 6; ++ if(lW_no < 4){ ++ /* impulse - @impulse case1 */ ++ mp->noise_rate = 0.4-(float)(lW_no-1)/11; ++ mp->noise_center = (float)(lW_no*count+12); ++ mp->tone_rate = 8-lW_no*2; ++ }else{ ++ /* impulse - @impulse case2 */ ++ mp->noise_rate = 0.2; ++ mp->noise_center = 30; ++ mp->tone_rate = 0; ++ } ++ if(mp->mdctbuf_flag == 1){ ++ for(i=0; inoise_rate = 0.6; ++ mp->noise_center = 12; ++ mp->tone_rate = 8.; ++ if(mp->mdctbuf_flag == 1){ ++ for(i=0; inoise_rate_low = 0; ++ mp->sw = 1; ++ if(impadnum)mp->noise_rate*=.5; ++ for(i=0;imdctbuf_flag == 1)) ++ tempmdct[i+j] += (10./(float)freq_bfn256[i+j]); ++ } ++ } ++ }else mp->sw = 0; ++ ++ /* higher noise curve (lower rate) && managed mode */ ++ if(bit_managed && (offset_select==0)) mp->noise_rate*=0.2; ++ ++} ++ ++ + void _vp_offset_and_mix(vorbis_look_psy *p, + float *noise, + float *tone, + int offset_select, ++ int bit_managed, + float *logmask, + float *mdct, +- float *logmdct){ +- int i,n=p->n; +- float de, coeffi, cx;/* AoTuV */ ++ float *logmdct, ++ float *lastmdct, float *tempmdct, ++ float low_compand, ++ int end_block, ++ int blocktype, int modenumber, ++ int nW_modenumber, ++ int lW_blocktype, int lW_modenumber, int lW_no, int impadnum){ ++ ++ int i,j,n=p->n; ++ int m2_sw=0; /* aoTuV for M2 */ ++ float m1_de, m1_coeffi; /* aoTuV for M1 */ + float toneatt=p->vi->tone_masteratt[offset_select]; + +- cx = p->m_val; ++ local_mod3_psy mp3; ++ local_mod4_psy mp4; ++ ++ /* Init for aoTuV M3 */ ++ memset(&mp3,0,sizeof(mp3)); ++ ++ /* Init for aoTuV M4 */ ++ mp4.start=p->vi->normal_start; ++ mp4.end = p->tonecomp_endp; ++ mp4.thres = p->tonecomp_thres; ++ mp4.lp_pos=9999; ++ mp4.end_block=end_block; ++ ++ /* Collapse of low(mid) frequency is prevented. (for 32/44/48kHz q-2) */ ++ if(low_compand<0 || toneatt<25.)low_compand=0; ++ else low_compand*=(toneatt-25.); ++ ++ /** @ M2 PRE **/ ++ if(p->vi->normal_thresh<.48){ ++ if((p->m_val > 0.5) && !modenumber && blocktype && (n==128)){ ++ if(p->vi->normal_thresh>.35) m2_sw = 10+(int)(p->vi->flacint*100); ++ else m2_sw = 10; ++ } ++ } ++ ++ /** @ M3 PRE **/ ++ set_m3p(&mp3, lW_no, impadnum, n, p->m_val, toneatt, logmdct, lastmdct, tempmdct, ++ modenumber, blocktype, lW_modenumber, lW_blocktype, ++ bit_managed, offset_select); ++ ++ /** @ M4 PRE **/ ++ mp4.end_block+=p->vi->normal_partition; ++ if(mp4.end_block>n)mp4.end_block=n; ++ if(p->m_val < 0.5){ ++ mp4.end=mp4.end_block; /* for M4 */ ++ }else{ ++ if(p->vi->normal_thresh>1.){ ++ mp4.start = 9999; ++ }else{ ++ if(mp4.end>mp4.end_block)mp4.lp_pos=mp4.end; ++ else mp4.lp_pos=mp4.end_block; ++ } ++ } + + for(i=0;inoiseoffset[offset_select][i]; ++ float tval= tone[i]+toneatt; ++ if(i<=mp4.start)tval-=low_compand; + if(val>p->vi->noisemaxsupp)val=p->vi->noisemaxsupp; +- logmask[i]=max(val,tone[i]+toneatt); +- ++ ++ /* AoTuV */ ++ /** @ M2 MAIN ** ++ floor is pulled below suitably. (padding block only) (#2) ++ by Aoyumi @ 2006/06/14 ++ */ ++ if(m2_sw){ ++ // the conspicuous low level pre-echo of the padding block origin is reduced. ++ if((logmdct[i]-lastmdct[i]) > 20){ ++ if(i > p->m3n[3]) val -= (logmdct[i]-lastmdct[i]-20)/m2_sw; ++ else val -= (logmdct[i]-lastmdct[i]-20)/(m2_sw+m2_sw); ++ } ++ } ++ ++ /* AoTuV */ ++ /** @ M3 MAIN ** ++ Dynamic impulse block noise control. (#7) ++ 48/44.1/32kHz only. ++ by Aoyumi @ 2008/12/01 ++ */ ++ if(mp3.sw){ ++ if(val>tval){ ++ if( (val>lastmdct[i]) && (logmdct[i]>(tempmdct[i]+mp3.noise_center)) ){ ++ int toneac=0; ++ float valmask=0; ++ ++ if(mp3.mdctbuf_flag == 1)tempmdct[i] = logmdct[i]; // reset ++ if(logmdct[i]>lastmdct[i]){ ++ mp3.rate_mod = mp3.noise_rate; ++ }else{ ++ mp3.rate_mod = mp3.noise_rate_low; ++ } ++ // edit tone masking ++ if( !impadnum && (i < p->tonecomp_endp) && ((val-lastmdct[i])>20) ){ ++ float dBsub=(logmdct[i]-lastmdct[i]); ++ if(dBsub>25){ ++ toneac=1; ++ if(tval>-100){ ++ float tr_cur=mp3.tone_rate; ++ if(dBsub<35) tr_cur*=((35-dBsub)*0.1); ++ tval-=tr_cur; ++ if(tval<-100)tval=-100; // lower limit = -100 ++ } ++ } ++ } ++ // main work ++ if(i > p->m3n[1]){ ++ if((val-tval)>30) valmask=((val-tval-30)/10+30)*mp3.rate_mod; ++ else valmask=(val-tval)*mp3.rate_mod; ++ }else if(i > p->m3n[2]){ ++ if((val-tval)>20) valmask=((val-tval-20)/10+20)*mp3.rate_mod; ++ else valmask=(val-tval)*mp3.rate_mod; ++ }else if(i > p->m3n[3]){ ++ if((val-tval)>10) valmask=((val-tval-10)/10+10)*mp3.rate_mod*0.5; ++ else valmask=(val-tval)*mp3.rate_mod*0.5; ++ }else{ ++ if((val-tval)>10) valmask=((val-tval-10)/10+10)*mp3.rate_mod*0.3; ++ else valmask=(val-tval)*mp3.rate_mod*0.3; ++ } ++ if((val-valmask)>lastmdct[i])val-=valmask; ++ else val=lastmdct[i]; ++ ++ if( toneac && ((val-lastmdct[i])>20) ){ ++ val-=(val-lastmdct[i]-20)*.2; ++ } ++ } ++ } ++ } ++ ++ /* AoTuV */ ++ /** @ M4 MAIN ** ++ The purpose of this portion is working Noise Normalization more correctly. ++ (There is this in order to prevent extreme boost of floor) ++ mp4.start = start point ++ mp4.end = end point ++ mp4.thres = threshold ++ by Aoyumi @ 2006/03/20 ++ */ ++ //logmask[i]=max(val,tval); ++ if(val>tval){ ++ logmask[i]=val; ++ }else if((i>mp4.start) && (i-140)){ // -140dB(test OK) ++ if(logmdct[i]>val){ ++ if(logmdct[i] coeffi){ ++ if(val > m1_coeffi){ + /* mdct value is > -17.2 dB below floor */ + +- de = 1.0-((val-coeffi)*0.005*cx); ++ m1_de = 1.0-((val-m1_coeffi)*0.005*p->m_val); + /* pro-rated attenuation: + -0.00 dB boost if mdct value is -17.2dB (relative to floor) + -0.77 dB boost if mdct value is 0dB (relative to floor) + -1.64 dB boost if mdct value is +17.2dB (relative to floor) + etc... */ + +- if(de < 0) de = 0.0001; ++ if(m1_de < 0) m1_de = 0.0001; + }else + /* mdct value is <= -17.2 dB below floor */ + +- de = 1.0-((val-coeffi)*0.0003*cx); ++ m1_de = 1.0-((val-m1_coeffi)*0.0003*p->m_val); + /* pro-rated attenuation: + +0.00 dB atten if mdct value is -17.2dB (relative to floor) + +0.45 dB atten if mdct value is -34.4dB (relative to floor) + etc... */ + +- mdct[i] *= de; ++ mdct[i] *= m1_de; + + } + } ++ ++ /** @ M3 SET lastmdct **/ ++ if(mp3.mdctbuf_flag==1){ ++ if(!modenumber){ // n==128 or 256 only ++ for(i=0; i logmdct[i*8+j]){ ++ lastmdct[i] = logmdct[i*8+j]; ++ } ++ } ++ } ++ } ++ } ++ } ++ /* This affects calculation of a floor curve. (only first) */ ++ if(offset_select==1){ ++ for(i=mp4.lp_pos; ifloorB)-1; + int offset=31-abs(floorA-floorB); +- float floormag=hypot_lookup[((offset<0)-1)&offset]+1.f; ++ float floormag=hypot_lookup[((offset<0)-1)&offset]+1.f; // floormag = 0.990065 ~ 0.707107 + + floormag*=FLOOR1_fromdB_INV_LOOKUP[(floorB&test)|(floorA&(~test))]; + +@@ -992,44 +1392,190 @@ + if(-a>b)return -sqrt(a*a+b*b); + return sqrt(b*b+a*a); + } ++/* modified hypot by aoyumi ++ better method should be found. */ ++static float min_indemnity_dipole_hypot(float a, float b){ ++ float thnor=0.92; ++ float threv=0.84; ++ float a2 = a*a; ++ float b2 = b*b; ++ if(a>0.){ ++ if(b>0.)return sqrt(a2+b2*thnor); ++ if(a>-b)return sqrt(a2-b2+b2*threv); ++ return -sqrt(b2-a2+a2*threv); ++ } ++ if(b<0.)return -sqrt(a2+b2*thnor); ++ if(-a>b)return -sqrt(a2-b2+b2*threv); ++ return sqrt(b2-a2+a2*threv); ++} + + /* revert to round hypot for now */ + float **_vp_quantize_couple_memo(vorbis_block *vb, + vorbis_info_psy_global *g, + vorbis_look_psy *p, + vorbis_info_mapping0 *vi, +- float **mdct){ ++ float **mdct, ++ int lowpass_residue){ + + int i,j,n=p->n; + float **ret=_vorbis_block_alloc(vb,vi->coupling_steps*sizeof(*ret)); +- int limit=g->coupling_pointlimit[p->vi->blockflag][PACKETBLOBS/2]; ++ //int limit=g->coupling_pointlimit[p->vi->blockflag][PACKETBLOBS/2]; + ++ // set new hypot + for(i=0;icoupling_steps;i++){ +- float *mdctM=mdct[vi->coupling_mag[i]]; +- float *mdctA=mdct[vi->coupling_ang[i]]; +- ret[i]=_vorbis_block_alloc(vb,n*sizeof(**ret)); +- for(j=0;jcoupling_mag[i]]; ++ float *mdctA=mdct[vi->coupling_ang[i]]; ++ ++ ret[i]=_vorbis_block_alloc(vb,n*sizeof(**ret)); ++ for(j=0;jcoupling_steps;i++){ ++ float *mdctM=mdct[vi->coupling_mag[i]]; ++ float *mdctA=mdct[vi->coupling_ang[i]]; ++ ++ ret[i]=_vorbis_block_alloc(vb,n*sizeof(**ret)); ++ for(j=0;j=fabs(data[o+b])) ++#define O(o,a,b,c,d)\ ++ {n[o]=o+a;n[o+1]=o+b;n[o+2]=o+c;n[o+3]=o+d;} ++#define SORT4(o)\ ++ if(C(o,2,3))if(C(o,0,1))if(C(o,0,2))if(C(o,1,2))O(o,0,1,2,3)\ ++ else if(C(o,1,3))O(o,0,2,1,3)\ ++ else O(o,0,2,3,1)\ ++ else if(C(o,0,3))if(C(o,1,3))O(o,2,0,1,3)\ ++ else O(o,2,0,3,1)\ ++ else O(o,2,3,0,1)\ ++ else if(C(o,1,2))if(C(o,0,2))O(o,1,0,2,3)\ ++ else if(C(o,0,3))O(o,1,2,0,3)\ ++ else O(o,1,2,3,0)\ ++ else if(C(o,1,3))if(C(o,0,3))O(o,2,1,0,3)\ ++ else O(o,2,1,3,0)\ ++ else O(o,2,3,1,0)\ ++ else if(C(o,0,1))if(C(o,0,3))if(C(o,1,3))O(o,0,1,3,2)\ ++ else if(C(o,1,2))O(o,0,3,1,2)\ ++ else O(o,0,3,2,1)\ ++ else if(C(o,0,2))if(C(o,1,2))O(o,3,0,1,2)\ ++ else O(o,3,0,2,1)\ ++ else O(o,3,2,0,1)\ ++ else if(C(o,1,3))if(C(o,0,3))O(o,1,0,3,2)\ ++ else if(C(o,0,2))O(o,1,3,0,2)\ ++ else O(o,1,3,2,0)\ ++ else if(C(o,1,2))if(C(o,0,2))O(o,3,1,0,2)\ ++ else O(o,3,1,2,0)\ ++ else O(o,3,2,1,0) ++ ++static void sortindex_fix8(int *index, ++ float *data, ++ int offset){ ++ int i,j,k,n[8]; ++ index+=offset; ++ data+=offset; ++ SORT4(0) ++ SORT4(4) ++ j=0;k=4; ++ for(i=0;i<8;i++) ++ index[i]=n[(k>=8)||((j<4)&&C(0,n[j],n[k]))?j++:k++]+offset; ++} ++ ++static void sortindex_fix32(int *index, ++ float *data, ++ int offset){ ++ int i,j,k,n[32]; ++ for(i=0;i<32;i+=8) ++ sortindex_fix8(index,data,offset+i); ++ index+=offset; ++ for(i=j=0,k=8;i<16;i++) ++ n[i]=index[(k>=16)||((j<8)&&C(0,index[j],index[k]))?j++:k++]; ++ for(i=j=16,k=24;i<32;i++) ++ n[i]=index[(k>=32)||((j<24)&&C(0,index[j],index[k]))?j++:k++]; ++ for(i=j=0,k=16;i<32;i++) ++ index[i]=n[(k>=32)||((j<16)&&C(0,n[j],n[k]))?j++:k++]; ++} ++ ++static void sortindex_shellsort(int *index, ++ float *data, ++ int offset, ++ int count){ ++ int gap,pos,left,i,j; ++ index+=offset; ++ for(i=0;i=4)gap/=3; ++ while(gap>0){ ++ for(pos=gap;pos=0;left-=gap){ ++ i=index[left];j=index[left+gap]; ++ if(!C(0,i,j)){ ++ index[left]=j; ++ index[left+gap]=i; ++ }else break; ++ } ++ } ++ gap/=3; ++ } ++} ++ ++static void sortindex(int *index, ++ float *data, ++ int offset, ++ int count){ ++ if(count==8)sortindex_fix8(index,data,offset); ++ else if(count==32)sortindex_fix32(index,data,offset); ++ else sortindex_shellsort(index,data,offset,count); ++} ++ ++#undef C ++#undef O ++#undef SORT4 ++/*** OPT_SORT End ***/ ++ ++#else + /* this is for per-channel noise normalization */ + static int apsort(const void *a, const void *b){ + float f1=fabs(**(float**)a); + float f2=fabs(**(float**)b); + return (f1f2); + } ++#endif ++ + + int **_vp_quantize_couple_sort(vorbis_block *vb, + vorbis_look_psy *p, + vorbis_info_mapping0 *vi, +- float **mags){ +- ++ float **mags, ++ int lowpass_residue){ + ++#ifdef OPT_SORT ++ if(p->vi->normal_point_p){ ++ int i,j,n=p->n; ++ int **ret=_vorbis_block_alloc(vb,vi->coupling_steps*sizeof(*ret)); ++ int partition=p->vi->normal_partition; ++ ++ for(i=0;icoupling_steps;i++){ ++ ret[i]=_vorbis_block_alloc(vb,n*sizeof(**ret)); ++ ++ for(j=0;jvi->normal_point_p){ + int i,j,k,n=p->n; + int **ret=_vorbis_block_alloc(vb,vi->coupling_steps*sizeof(*ret)); +@@ -1048,10 +1594,23 @@ + return(ret); + } + return(NULL); ++#endif + } + + void _vp_noise_normalize_sort(vorbis_look_psy *p, +- float *magnitudes,int *sortedindex){ ++ float *magnitudes,int *sortedindex, ++ int lowpass_residue){ ++#ifdef OPT_SORT ++ int j,n=lowpass_residue; ++ vorbis_info_psy *vi=p->vi; ++ int partition=vi->normal_partition; ++ int start=vi->normal_start; ++ ++ for(j=start;jn)partition=n-j; ++ sortindex(sortedindex-start,magnitudes,j,partition); ++ } ++#else + int i,j,n=p->n; + vorbis_info_psy *vi=p->vi; + int partition=vi->normal_partition; +@@ -1066,11 +1625,14 @@ + sortedindex[i+j-start]=work[i]-magnitudes; + } + } ++#endif + } + + void _vp_noise_normalize(vorbis_look_psy *p, +- float *in,float *out,int *sortedindex){ +- int flag=0,i,j=0,n=p->n; ++ float *in,float *out,int *sortedindex, ++ int blocktype, int modenumber, ++ int lowpass_residue){ ++ int i,j=0,n=lowpass_residue; + vorbis_info_psy *vi=p->vi; + int partition=vi->normal_partition; + int start=vi->normal_start; +@@ -1084,27 +1646,66 @@ + for(;j+partition<=n;j+=partition){ + float acc=0.; + int k; ++ int energy_loss=0; ++ int nn_count=0; ++ int div_low=j+p->nn25pt; ++ int div_high=j+p->nn75pt; ++ int low_flag=0; ++ int high_flag=0; + +- for(i=j;inn50pt){ ++ if(acc>=vi->normal_thresh && fabs(in[k])>nnmid_th){ ++ out[k]=unitnorm(in[k]); ++ acc-=1.; ++ nn_count++; ++ if(k==div_low)low_flag=k; ++ else high_flag=k; ++ } ++ } ++ } ++ /* NN main */ + for(i=0;i=.25f){ +- out[k]=rint(in[k]); +- acc-=in[k]*in[k]; +- flag=1; +- }else{ +- if(accnormal_thresh)break; +- out[k]=unitnorm(in[k]); +- acc-=1.; +- } ++ k=sortedindex[i+j-start]; ++ if(in[k]*in[k]>=.25f){ // or rint(in[k])!=0.f ++ out[k]=rint(in[k]); ++ //acc-=in[k]*in[k]; ++ }else{ ++ if(accnormal_thresh)break; ++ if(low_flag==k || high_flag==k)continue; ++ out[k]=unitnorm(in[k]); ++ acc-=1.; ++ nn_count++; ++ } + } + ++ /* The minimum energy complement */ ++ if(modenumber && (energy_loss==partition) && (j<=p->min_nn_lp) && (nn_count)){ ++ k=sortedindex[i+j-start]; ++ if(fabs(in[k])>=p->nn_mec_m){ ++ out[k]=unitnorm(in[k]); ++ i++; ++ } ++ } ++ ++ // The last process + for(;in; + +@@ -1147,39 +1751,207 @@ + + float *rM=res[vi->coupling_mag[i]]; + float *rA=res[vi->coupling_ang[i]]; ++ float *rMo=res_org[vi->coupling_mag[i]]; ++ float *rAo=res_org[vi->coupling_ang[i]]; + float *qM=rM+n; + float *qA=rA+n; ++ float *mdctM=mdct[vi->coupling_mag[i]]; ++ float *mdctA=mdct[vi->coupling_ang[i]]; + int *floorM=ifloor[vi->coupling_mag[i]]; + int *floorA=ifloor[vi->coupling_ang[i]]; + float prepoint=stereo_threshholds[g->coupling_prepointamp[blobno]]; + float postpoint=stereo_threshholds[g->coupling_postpointamp[blobno]]; +- int partition=(p->vi->normal_point_p?p->vi->normal_partition:p->n); +- int limit=g->coupling_pointlimit[p->vi->blockflag][blobno]; +- int pointlimit=limit; +- ++ float sth_low=stereo_threshholds_low[g->coupling_prepointamp[blobno]]; ++ float sth_high=stereo_threshholds_high[g->coupling_postpointamp[blobno]]; ++ float postpoint_backup; ++ float st_thresh; ++ int partition=(p->vi->normal_point_p?p->vi->normal_partition:lowpass_residue); ++ int pointlimit=g->coupling_pointlimit[p->vi->blockflag][blobno]; ++ int freqlimit=p->st_freqlimit; ++ unsigned char Mc_treshp[2048]; ++ unsigned char Ac_treshp[2048]; ++ int lof_st; ++ int hif_st; ++ int hif_stcopy; ++ int old_lof_st=0; ++ int old_hif_st=0; ++ int Afreq_num=0; ++ int Mfreq_num=0; ++ int stcont_start=0; // M6 start point ++ + nonzero[vi->coupling_mag[i]]=1; + nonzero[vi->coupling_ang[i]]=1; +- +- /* The threshold of a stereo is changed with the size of n */ +- if(n > 1000) +- postpoint=stereo_threshholds_limited[g->coupling_postpointamp[blobno]]; +- +- for(j=0;jn;j+=partition){ ++ ++ postpoint_backup=postpoint; ++ ++ /** @ M6 PRE **/ ++ // lossless only? ++ if(!stereo_threshholds[g->coupling_postpointamp[blobno]])stcont_start=n; ++ else{ ++ // exception handling ++ if((postpoint-sth_high)noiseoffset[1][j]>=-2)break; ++ } ++ // start point correction & threshold setup ++ st_thresh=.1; ++ if(p->m_val<.5){ ++ // low frequency limit ++ if(stcont_startvi->normal_thresh>1.)st_thresh=.25; ++ for(j=0;j=stcont_start){ ++ int m; ++ int lof_num; ++ int hif_num; ++ ++ lof_st=LOF_TABLE[l]; ++ hif_st=HIF_TABLE[l]; ++ /*** original calc. ++ float magicnum=.175; // 0.16`0.19 ++ lof_st=l-(l/2)*(magicnum*.5); ++ hif_st=l+l*magicnum; ++ ****/ ++ ++ hif_stcopy=hif_st; ++ ++ // limit setting ++ if(hif_st>=freqlimit)hif_st=freqlimit-1; ++ ++ if(old_lof_st || old_hif_st){ ++ if(hif_st>l){ ++ // hif_st, lof_st ...absolute value ++ // lof_num, hif_num ...relative value ++ ++ // low freq.(lower) ++ lof_num=lof_st-old_lof_st; ++ switch(lof_num){ ++ case 0: ++ Afreq_num+=Ac_treshp[l-1]; ++ Mfreq_num+=Mc_treshp[l-1]; ++ break; ++ case 1: ++ Afreq_num+=Ac_treshp[l-1]; ++ Mfreq_num+=Mc_treshp[l-1]; ++ Afreq_num-=Ac_treshp[old_lof_st]; ++ Mfreq_num-=Mc_treshp[old_lof_st]; ++ break; ++ default:/* puts("err. low") */;break; ++ } ++ ++ // high freq.(higher) ++ hif_num=hif_st-old_hif_st; ++ switch(hif_num){ ++ case 0: ++ Afreq_num-=Ac_treshp[l]; ++ Mfreq_num-=Mc_treshp[l]; ++ break; ++ case 1: ++ Afreq_num-=Ac_treshp[l]; ++ Mfreq_num-=Mc_treshp[l]; ++ Afreq_num+=Ac_treshp[hif_st]; ++ Mfreq_num+=Mc_treshp[hif_st]; ++ break; ++ case 2: ++ Afreq_num-=Ac_treshp[l]; ++ Mfreq_num-=Mc_treshp[l]; ++ Afreq_num+=Ac_treshp[hif_st]; ++ Mfreq_num+=Mc_treshp[hif_st]; ++ Afreq_num+=Ac_treshp[hif_st-1]; ++ Mfreq_num+=Mc_treshp[hif_st-1]; ++ break; ++ default:/* puts("err. high") */;break; ++ } ++ } ++ }else{ ++ for(m=lof_st; m<=hif_st; m++){ ++ if(m==l)continue; ++ if(Ac_treshp[m]) Afreq_num++; ++ if(Mc_treshp[m]) Mfreq_num++; ++ } ++ } ++ if(l>=pointlimit){ ++ shigh=sth_high/(hif_stcopy-lof_st); ++ shighA=shigh*Afreq_num; ++ shighM=shigh*Mfreq_num; ++ if((shighA+rAs)>(shighM+rMs))shigh=shighA; ++ else shigh=shighM; ++ }else{ ++ slow=sth_low/(hif_stcopy-lof_st); ++ slowA=slow*Afreq_num; ++ slowM=slow*Mfreq_num; ++ if(p->noiseoffset[1][l]<-1){ ++ slowA*=(p->noiseoffset[1][l]+2); ++ slowM*=(p->noiseoffset[1][l]+2); ++ } ++ } ++ old_lof_st=lof_st; ++ old_hif_st=hif_st; ++ } + ++ if(l>=pointlimit){ ++ postpoint-=shigh; ++ /* The following prevents an extreme reduction of residue. (2ch stereo only) */ ++ if( ((a>0.) && (b<0.)) || ((b>0.) && (a<0.)) ){ ++ hypot_reserve = fabs(fabs(a)-fabs(b)); ++ if(hypot_reserve < 0.001){ // 0~0.000999- ++ dummypoint = stereo_threshholds_rephase[g->coupling_postpointamp[blobno]]; ++ dummypoint = dummypoint+((postpoint-dummypoint)*(hypot_reserve*1000)); ++ if(postpoint > dummypoint) postpoint = dummypoint; ++ } ++ } ++ } ++ + if(l=limit && fabs(rM[l])=pointlimit && rMs=pointlimit)acc+=qM[l]*qM[l]; ++ } + }else{ + couple_lossless(rM[l],rA[l],qM+l,qA+l); + } +@@ -1188,40 +1960,104 @@ + qA[l]=0.; + } + } +- +- if(p->vi->normal_point_p){ ++ ++ /* Expansion of Noise Normalization(for point stereo). by Aoyumi */ ++ if(p->vi->normal_point_p && p->vi->normal_start!=9999){ ++ int div_low=j+p->nn25pt; ++ int div_high=j+p->nn75pt; ++ int low_flag=0; ++ int high_flag=0; ++ int nn_count=0; ++ int l; // k=parttion counter. l=mdct counter. j=partition block counter ++ ++ /* partition is 8 or 32 */ ++ if(partition==8){ div_low--; div_high--; } ++ rpacc=acc; ++ ++ /* When the energy loss of a partition is large, ++ NN is performed in the middle of partition. (without impulse block) */ ++ if((energy_loss==partition) && !(!modenumber && !blocktype)){ ++ for(l=div_low; l<=div_high ;l+=p->nn50pt){ ++ if(l>=pointlimit && acc>=p->vi->normal_thresh && ++ fabs(qM[l])>nnmid_th && l0.) && (mdctA[l]<0.)) || ((mdctA[l]>0.) && (mdctM[l]<0.)) ){ ++ acc-=1.f; rpacc-=1.25; ++ }else{ ++ acc-=1.f; rpacc-=1.f; ++ } ++ qM[l]=unitnorm(qM[l]); ++ nn_count++; ++ if(l==div_low)low_flag=l; ++ else high_flag=l; ++ } ++ } ++ } ++ /* NN main (point stereo) */ + for(k=0;k=p->vi->normal_thresh;k++){ +- int l=mag_sort[i][j+k]; ++ l=mag_sort[i][j+k]; + if(l=pointlimit && rint(qM[l])==0.f){ ++ if(low_flag==l || high_flag==l)continue; ++ if( ((mdctM[l]>0.) && (mdctA[l]<0.)) || ((mdctA[l]>0.) && (mdctM[l]<0.)) ){ ++ if(rpaccvi->normal_thresh)continue; ++ acc-=1.f; rpacc-=1.25; ++ }else{ ++ acc-=1.f; rpacc-=1.f; ++ } + qM[l]=unitnorm(qM[l]); +- acc-=1.f; ++ nn_count++; + } +- } ++ } ++ /* The minimum energy complement. (long & trans. block) */ ++ if(modenumber && (energy_loss==partition) && (j<=p->min_nn_lp) && (nn_count)){ ++ for(;k=pointlimit) && (rint(qM[l])==0.f) && (fabs(rM[l]+rA[l])>=p->nn_mec_s)){ ++ qM[l]=unitnorm(qM[l]); ++ break; ++ } ++ } ++ } + } + } + } + } + } + +-/* AoTuV */ +-/** @ M2 ** +- The boost problem by the combination of noise normalization and point stereo is eased. +- However, this is a temporary patch. +- by Aoyumi @ 2004/04/18 ++/* aoTuV M5 ++ noise_compand_level of low frequency is determined from the level of high frequency. ++ by Aoyumi @ 2005/09/14 ++ ++ return value ++ [normal compander] 0 <> 1.0 [high compander] ++ negative value are disable + */ ++float lb_loudnoise_fix(vorbis_look_psy *p, ++ float noise_compand_level, ++ float *logmdct, ++ int lW_modenumber, ++ int blocktype, int modenumber){ + +-void hf_reduction(vorbis_info_psy_global *g, +- vorbis_look_psy *p, +- vorbis_info_mapping0 *vi, +- float **mdct){ +- +- int i,j,n=p->n, de=0.3*p->m_val; +- int limit=g->coupling_pointlimit[p->vi->blockflag][PACKETBLOBS/2]; +- int start=p->vi->normal_start; +- +- for(i=0; icoupling_steps; i++){ +- /* for(j=start; jn, nq1=p->n25p, nq3=p->n75p; ++ double hi_th=0; ++ ++ if(p->m_val < 0.5)return(-1); /* 48/44.1/32kHz only */ ++ if(p->vi->normal_thresh>.45)return(-1); /* under q3 */ ++ ++ /* select trans. block(short>>long case). */ ++ if(!modenumber)return(-1); ++ if(blocktype || lW_modenumber)return(noise_compand_level); ++ ++ /* calculation of a threshold. */ ++ for(i=nq1; i-130)hi_th += logmdct[i]; ++ else hi_th += -130; ++ } ++ hi_th /= n; ++ ++ /* calculation of a high_compand_level */ ++ if(hi_th > -40.) noise_compand_level=-1; ++ else if(hi_th < -50.) noise_compand_level=1.; ++ else noise_compand_level=1.-((hi_th+50)/10); ++ ++ return(noise_compand_level); + } +diff -ruN libvorbis-1.2.0/lib/psy.h aotuv-b5.7_20090301/lib/psy.h +--- libvorbis-1.2.0/lib/psy.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/psy.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,10 +11,12 @@ + ******************************************************************** + + function: random psychoacoustics (not including preecho) +- last mod: $Id: psy.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: psy.h 2008-12-01 aoyumi $ + + ********************************************************************/ + ++#define OPT_SORT ++ + #ifndef _V_PSY_H_ + #define _V_PSY_H_ + #include "smallft.h" +@@ -54,6 +56,9 @@ + int noisewindowfixed; + float noiseoff[P_NOISECURVES][P_BANDS]; + float noisecompand[NOISE_COMPAND_LEVELS]; ++ float noisecompand_high[NOISE_COMPAND_LEVELS]; /* for aoTuV M5 */ ++ ++ float flacint; /* for aoTuV M2 */ + + float max_curve_dB; + +@@ -110,10 +115,42 @@ + int total_octave_lines; + long rate; /* cache it */ + +- float m_val; /* Masking compensation value */ ++ int m3n[4]; /* number for M3 */ ++ int tonecomp_endp; /* for M3 & M4 */ ++ int min_nn_lp; /* for M6 */ ++ float tonecomp_thres; /* for M4 */ ++ float nn_mec_s; /* minimum energy complement for noise normalization [stereo] */ ++ float nn_mec_m; /* minimum energy complement for noise normalization [mono] */ ++ float m_val; /* masking compensation value */ ++ ++ int st_freqlimit; /* for M6 */ ++ int n25p; /* mdct n(25%) */ ++ int n33p; /* mdct n(33%) */ ++ int n75p; /* mdct n(75%) */ ++ int nn75pt; /* 75 % partition for noise normalization */ ++ int nn50pt; /* half partition for noise normalization */ ++ int nn25pt; /* quarter partition for noise normalization */ + + } vorbis_look_psy; + ++typedef struct { ++ int sw; ++ int mdctbuf_flag; ++ float noise_rate; ++ float noise_rate_low; ++ float noise_center; ++ float tone_rate; ++ float rate_mod; ++} local_mod3_psy; ++ ++typedef struct { ++ int start; ++ int end; ++ int lp_pos; ++ int end_block; ++ float thres; ++} local_mod4_psy; ++ + extern void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi, + vorbis_info_psy_global *gi,int n,long rate); + extern void _vp_psy_clear(vorbis_look_psy *p); +@@ -129,6 +166,7 @@ + int sliding_lowpass); + + extern void _vp_noisemask(vorbis_look_psy *p, ++ float noise_compand_level, + float *logmdct, + float *logmask); + +@@ -142,9 +180,16 @@ + float *noise, + float *tone, + int offset_select, ++ int bit_managed, + float *logmask, + float *mdct, +- float *logmdct); ++ float *logmdct, ++ float *lastmdct, float *tempmdct, ++ float low_compand, ++ int end_block, ++ int blocktype, int modenumber, ++ int nW_modenumber, ++ int lW_blocktype, int lW_modenumber, int lW_no, int impadnum); + + extern float _vp_ampmax_decay(float amp,vorbis_dsp_state *vd); + +@@ -152,7 +197,8 @@ + vorbis_info_psy_global *g, + vorbis_look_psy *p, + vorbis_info_mapping0 *vi, +- float **mdct); ++ float **mdct, ++ int lowpass_residue); + + extern void _vp_couple(int blobno, + vorbis_info_psy_global *g, +@@ -163,23 +209,31 @@ + int **mag_sort, + int **ifloor, + int *nonzero, +- int sliding_lowpass); ++ int sliding_lowpass, ++ int blocktype, int modenumber, ++ float **mdct, float **res_org, ++ int lowpass_residue); + + extern void _vp_noise_normalize(vorbis_look_psy *p, +- float *in,float *out,int *sortedindex); ++ float *in,float *out,int *sortedindex, ++ int blocktype, int modenumber, ++ int lowpass_residue); + + extern void _vp_noise_normalize_sort(vorbis_look_psy *p, +- float *magnitudes,int *sortedindex); ++ float *magnitudes,int *sortedindex, ++ int lowpass_residue); + + extern int **_vp_quantize_couple_sort(vorbis_block *vb, + vorbis_look_psy *p, + vorbis_info_mapping0 *vi, +- float **mags); ++ float **mags, ++ int lowpass_residue); + +-extern void hf_reduction(vorbis_info_psy_global *g, +- vorbis_look_psy *p, +- vorbis_info_mapping0 *vi, +- float **mdct); ++extern float lb_loudnoise_fix(vorbis_look_psy *p, ++ float noise_compand_level, ++ float *logmdct, ++ int lW_modenumber, ++ int blocktype, int modenumber); + + + #endif +diff -ruN libvorbis-1.2.0/lib/psy_table.h aotuv-b5.7_20090301/lib/psy_table.h +--- libvorbis-1.2.0/lib/psy_table.h 1970-01-01 01:00:00.000000000 +0100 ++++ aotuv-b5.7_20090301/lib/psy_table.h 2009-03-02 21:24:44.000000000 +0100 +@@ -0,0 +1,521 @@ ++/* aoTuV */ ++ ++/* M6 table */ ++static const short LOF_TABLE[4096]={ ++ 0, 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, ++ 15, 16, 17, 18, 19, 20, 21, 22, 22, 23, 24, 25, 26, 27, 28, 29, ++ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 43, 44, ++ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, ++ 61, 62, 63, 64, 65, 66, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ++ 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 87, 88, 89, 90, ++ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, ++ 107, 108, 109, 110, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, ++ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 131, 132, 133, 134, 135, 136, ++ 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, ++ 153, 154, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, ++ 168, 169, 170, 171, 172, 173, 174, 175, 175, 176, 177, 178, 179, 180, 181, 182, ++ 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 196, 197, ++ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, ++ 214, 215, 216, 217, 218, 219, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, ++ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 240, 241, 242, 243, ++ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, ++ 260, 261, 262, 263, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, ++ 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 284, 285, 286, 287, 288, 289, ++ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, ++ 306, 307, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, ++ 321, 322, 323, 324, 325, 326, 327, 328, 328, 329, 330, 331, 332, 333, 334, 335, ++ 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 349, 350, ++ 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, ++ 367, 368, 369, 370, 371, 372, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, ++ 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 393, 394, 395, 396, ++ 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, ++ 413, 414, 415, 416, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, ++ 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 437, 438, 439, 440, 441, 442, ++ 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, ++ 459, 460, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, ++ 474, 475, 476, 477, 478, 479, 480, 481, 481, 482, 483, 484, 485, 486, 487, 488, ++ 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 502, 503, ++ 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, ++ 520, 521, 522, 523, 524, 525, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, ++ 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 546, 547, 548, 549, ++ 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, ++ 566, 567, 568, 569, 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, ++ 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 590, 591, 592, 593, 594, 595, ++ 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, ++ 612, 613, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, 624, 625, 626, ++ 627, 628, 629, 630, 631, 632, 633, 634, 634, 635, 636, 637, 638, 639, 640, 641, ++ 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 655, 656, ++ 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, 672, ++ 673, 674, 675, 676, 677, 678, 678, 679, 680, 681, 682, 683, 684, 685, 686, 687, ++ 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 699, 700, 701, 702, ++ 703, 704, 705, 706, 707, 708, 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, ++ 719, 720, 721, 722, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, ++ 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, 743, 744, 745, 746, 747, 748, ++ 749, 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, ++ 765, 766, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, ++ 780, 781, 782, 783, 784, 785, 786, 787, 787, 788, 789, 790, 791, 792, 793, 794, ++ 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, 806, 807, 808, 808, 809, ++ 810, 811, 812, 813, 814, 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, ++ 826, 827, 828, 829, 830, 831, 831, 832, 833, 834, 835, 836, 837, 838, 839, 840, ++ 841, 842, 843, 844, 845, 846, 847, 848, 849, 850, 851, 852, 852, 853, 854, 855, ++ 856, 857, 858, 859, 860, 861, 862, 863, 864, 865, 866, 867, 868, 869, 870, 871, ++ 872, 873, 874, 875, 875, 876, 877, 878, 879, 880, 881, 882, 883, 884, 885, 886, ++ 887, 888, 889, 890, 891, 892, 893, 894, 895, 896, 896, 897, 898, 899, 900, 901, ++ 902, 903, 904, 905, 906, 907, 908, 909, 910, 911, 912, 913, 914, 915, 916, 917, ++ 918, 919, 919, 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, 932, ++ 933, 934, 935, 936, 937, 938, 939, 940, 940, 941, 942, 943, 944, 945, 946, 947, ++ 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, 961, 962, ++ 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, 975, 976, 977, 978, ++ 979, 980, 981, 982, 983, 984, 984, 985, 986, 987, 988, 989, 990, 991, 992, 993, ++ 994, 995, 996, 997, 998, 999,1000,1001,1002,1003,1004,1005,1005,1006,1007,1008, ++1009,1010,1011,1012,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024, ++1025,1026,1027,1028,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039, ++1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1049,1050,1051,1052,1053,1054, ++1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070, ++1071,1072,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085, ++1086,1087,1088,1089,1090,1091,1092,1093,1093,1094,1095,1096,1097,1098,1099,1100, ++1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1114,1115, ++1116,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,1127,1128,1129,1130,1131, ++1132,1133,1134,1135,1136,1137,1137,1138,1139,1140,1141,1142,1143,1144,1145,1146, ++1147,1148,1149,1150,1151,1152,1153,1154,1155,1156,1157,1158,1158,1159,1160,1161, ++1162,1163,1164,1165,1166,1167,1168,1169,1170,1171,1172,1173,1174,1175,1176,1177, ++1178,1179,1180,1181,1181,1182,1183,1184,1185,1186,1187,1188,1189,1190,1191,1192, ++1193,1194,1195,1196,1197,1198,1199,1200,1201,1202,1202,1203,1204,1205,1206,1207, ++1208,1209,1210,1211,1212,1213,1214,1215,1216,1217,1218,1219,1220,1221,1222,1223, ++1224,1225,1225,1226,1227,1228,1229,1230,1231,1232,1233,1234,1235,1236,1237,1238, ++1239,1240,1241,1242,1243,1244,1245,1246,1246,1247,1248,1249,1250,1251,1252,1253, ++1254,1255,1256,1257,1258,1259,1260,1261,1262,1263,1264,1265,1266,1267,1267,1268, ++1269,1270,1271,1272,1273,1274,1275,1276,1277,1278,1279,1280,1281,1282,1283,1284, ++1285,1286,1287,1288,1289,1290,1290,1291,1292,1293,1294,1295,1296,1297,1298,1299, ++1300,1301,1302,1303,1304,1305,1306,1307,1308,1309,1310,1311,1311,1312,1313,1314, ++1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330, ++1331,1332,1333,1334,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345, ++1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1355,1356,1357,1358,1359,1360, ++1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376, ++1377,1378,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391, ++1392,1393,1394,1395,1396,1397,1398,1399,1399,1400,1401,1402,1403,1404,1405,1406, ++1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1420,1421, ++1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437, ++1438,1439,1440,1441,1442,1443,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452, ++1453,1454,1455,1456,1457,1458,1459,1460,1461,1462,1463,1464,1464,1465,1466,1467, ++1468,1469,1470,1471,1472,1473,1474,1475,1476,1477,1478,1479,1480,1481,1482,1483, ++1484,1485,1486,1487,1487,1488,1489,1490,1491,1492,1493,1494,1495,1496,1497,1498, ++1499,1500,1501,1502,1503,1504,1505,1506,1507,1508,1508,1509,1510,1511,1512,1513, ++1514,1515,1516,1517,1518,1519,1520,1521,1522,1523,1524,1525,1526,1527,1528,1529, ++1530,1531,1531,1532,1533,1534,1535,1536,1537,1538,1539,1540,1541,1542,1543,1544, ++1545,1546,1547,1548,1549,1550,1551,1552,1552,1553,1554,1555,1556,1557,1558,1559, ++1560,1561,1562,1563,1564,1565,1566,1567,1568,1569,1570,1571,1572,1573,1573,1574, ++1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586,1587,1588,1589,1590, ++1591,1592,1593,1594,1595,1596,1596,1597,1598,1599,1600,1601,1602,1603,1604,1605, ++1606,1607,1608,1609,1610,1611,1612,1613,1614,1615,1616,1617,1617,1618,1619,1620, ++1621,1622,1623,1624,1625,1626,1627,1628,1629,1630,1631,1632,1633,1634,1635,1636, ++1637,1638,1639,1640,1640,1641,1642,1643,1644,1645,1646,1647,1648,1649,1650,1651, ++1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1661,1662,1663,1664,1665,1666, ++1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1681,1682, ++1683,1684,1684,1685,1686,1687,1688,1689,1690,1691,1692,1693,1694,1695,1696,1697, ++1698,1699,1700,1701,1702,1703,1704,1705,1705,1706,1707,1708,1709,1710,1711,1712, ++1713,1714,1715,1716,1717,1718,1719,1720,1721,1722,1723,1724,1725,1726,1726,1727, ++1728,1729,1730,1731,1732,1733,1734,1735,1736,1737,1738,1739,1740,1741,1742,1743, ++1744,1745,1746,1747,1748,1749,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758, ++1759,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1770,1771,1772,1773, ++1774,1775,1776,1777,1778,1779,1780,1781,1782,1783,1784,1785,1786,1787,1788,1789, ++1790,1791,1792,1793,1793,1794,1795,1796,1797,1798,1799,1800,1801,1802,1803,1804, ++1805,1806,1807,1808,1809,1810,1811,1812,1813,1814,1814,1815,1816,1817,1818,1819, ++1820,1821,1822,1823,1824,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835, ++1836,1837,1837,1838,1839,1840,1841,1842,1843,1844,1845,1846,1847,1848,1849,1850, ++1851,1852,1853,1854,1855,1856,1857,1858,1858,1859,1860,1861,1862,1863,1864,1865, ++1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1878,1879,1879,1880, ++1881,1882,1883,1884,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896, ++1897,1898,1899,1900,1901,1902,1902,1903,1904,1905,1906,1907,1908,1909,1910,1911, ++1912,1913,1914,1915,1916,1917,1918,1919,1920,1921,1922,1923,1923,1924,1925,1926, ++1927,1928,1929,1930,1931,1932,1933,1934,1935,1936,1937,1938,1939,1940,1941,1942, ++1943,1944,1945,1946,1946,1947,1948,1949,1950,1951,1952,1953,1954,1955,1956,1957, ++1958,1959,1960,1961,1962,1963,1964,1965,1966,1967,1967,1968,1969,1970,1971,1972, ++1973,1974,1975,1976,1977,1978,1979,1980,1981,1982,1983,1984,1985,1986,1987,1988, ++1989,1990,1990,1991,1992,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002,2003, ++2004,2005,2006,2007,2008,2009,2010,2011,2011,2012,2013,2014,2015,2016,2017,2018, ++2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2032,2033, ++2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049, ++2050,2051,2052,2053,2054,2055,2055,2056,2057,2058,2059,2060,2061,2062,2063,2064, ++2065,2066,2067,2068,2069,2070,2071,2072,2073,2074,2075,2076,2076,2077,2078,2079, ++2080,2081,2082,2083,2084,2085,2086,2087,2088,2089,2090,2091,2092,2093,2094,2095, ++2096,2097,2098,2099,2099,2100,2101,2102,2103,2104,2105,2106,2107,2108,2109,2110, ++2111,2112,2113,2114,2115,2116,2117,2118,2119,2120,2120,2121,2122,2123,2124,2125, ++2126,2127,2128,2129,2130,2131,2132,2133,2134,2135,2136,2137,2138,2139,2140,2141, ++2142,2143,2143,2144,2145,2146,2147,2148,2149,2150,2151,2152,2153,2154,2155,2156, ++2157,2158,2159,2160,2161,2162,2163,2164,2164,2165,2166,2167,2168,2169,2170,2171, ++2172,2173,2174,2175,2176,2177,2178,2179,2180,2181,2182,2183,2184,2185,2185,2186, ++2187,2188,2189,2190,2191,2192,2193,2194,2195,2196,2197,2198,2199,2200,2201,2202, ++2203,2204,2205,2206,2207,2208,2208,2209,2210,2211,2212,2213,2214,2215,2216,2217, ++2218,2219,2220,2221,2222,2223,2224,2225,2226,2227,2228,2229,2229,2230,2231,2232, ++2233,2234,2235,2236,2237,2238,2239,2240,2241,2242,2243,2244,2245,2246,2247,2248, ++2249,2250,2251,2252,2252,2253,2254,2255,2256,2257,2258,2259,2260,2261,2262,2263, ++2264,2265,2266,2267,2268,2269,2270,2271,2272,2273,2273,2274,2275,2276,2277,2278, ++2279,2280,2281,2282,2283,2284,2285,2286,2287,2288,2289,2290,2291,2292,2293,2294, ++2295,2296,2296,2297,2298,2299,2300,2301,2302,2303,2304,2305,2306,2307,2308,2309, ++2310,2311,2312,2313,2314,2315,2316,2317,2317,2318,2319,2320,2321,2322,2323,2324, ++2325,2326,2327,2328,2329,2330,2331,2332,2333,2334,2335,2336,2337,2338,2338,2339, ++2340,2341,2342,2343,2344,2345,2346,2347,2348,2349,2350,2351,2352,2353,2354,2355, ++2356,2357,2358,2359,2360,2361,2361,2362,2363,2364,2365,2366,2367,2368,2369,2370, ++2371,2372,2373,2374,2375,2376,2377,2378,2379,2380,2381,2382,2382,2383,2384,2385, ++2386,2387,2388,2389,2390,2391,2392,2393,2394,2395,2396,2397,2398,2399,2400,2401, ++2402,2403,2404,2405,2405,2406,2407,2408,2409,2410,2411,2412,2413,2414,2415,2416, ++2417,2418,2419,2420,2421,2422,2423,2424,2425,2426,2426,2427,2428,2429,2430,2431, ++2432,2433,2434,2435,2436,2437,2438,2439,2440,2441,2442,2443,2444,2445,2446,2447, ++2448,2449,2449,2450,2451,2452,2453,2454,2455,2456,2457,2458,2459,2460,2461,2462, ++2463,2464,2465,2466,2467,2468,2469,2470,2470,2471,2472,2473,2474,2475,2476,2477, ++2478,2479,2480,2481,2482,2483,2484,2485,2486,2487,2488,2489,2490,2491,2491,2492, ++2493,2494,2495,2496,2497,2498,2499,2500,2501,2502,2503,2504,2505,2506,2507,2508, ++2509,2510,2511,2512,2513,2514,2514,2515,2516,2517,2518,2519,2520,2521,2522,2523, ++2524,2525,2526,2527,2528,2529,2530,2531,2532,2533,2534,2535,2535,2536,2537,2538, ++2539,2540,2541,2542,2543,2544,2545,2546,2547,2548,2549,2550,2551,2552,2553,2554, ++2555,2556,2557,2558,2558,2559,2560,2561,2562,2563,2564,2565,2566,2567,2568,2569, ++2570,2571,2572,2573,2574,2575,2576,2577,2578,2579,2579,2580,2581,2582,2583,2584, ++2585,2586,2587,2588,2589,2590,2591,2592,2593,2594,2595,2596,2597,2598,2599,2600, ++2601,2602,2602,2603,2604,2605,2606,2607,2608,2609,2610,2611,2612,2613,2614,2615, ++2616,2617,2618,2619,2620,2621,2622,2623,2623,2624,2625,2626,2627,2628,2629,2630, ++2631,2632,2633,2634,2635,2636,2637,2638,2639,2640,2641,2642,2643,2644,2644,2645, ++2646,2647,2648,2649,2650,2651,2652,2653,2654,2655,2656,2657,2658,2659,2660,2661, ++2662,2663,2664,2665,2666,2667,2667,2668,2669,2670,2671,2672,2673,2674,2675,2676, ++2677,2678,2679,2680,2681,2682,2683,2684,2685,2686,2687,2688,2688,2689,2690,2691, ++2692,2693,2694,2695,2696,2697,2698,2699,2700,2701,2702,2703,2704,2705,2706,2707, ++2708,2709,2710,2711,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722, ++2723,2724,2725,2726,2727,2728,2729,2730,2731,2732,2732,2733,2734,2735,2736,2737, ++2738,2739,2740,2741,2742,2743,2744,2745,2746,2747,2748,2749,2750,2751,2752,2753, ++2754,2755,2755,2756,2757,2758,2759,2760,2761,2762,2763,2764,2765,2766,2767,2768, ++2769,2770,2771,2772,2773,2774,2775,2776,2776,2777,2778,2779,2780,2781,2782,2783, ++2784,2785,2786,2787,2788,2789,2790,2791,2792,2793,2794,2795,2796,2797,2797,2798, ++2799,2800,2801,2802,2803,2804,2805,2806,2807,2808,2809,2810,2811,2812,2813,2814, ++2815,2816,2817,2818,2819,2820,2820,2821,2822,2823,2824,2825,2826,2827,2828,2829, ++2830,2831,2832,2833,2834,2835,2836,2837,2838,2839,2840,2841,2841,2842,2843,2844, ++2845,2846,2847,2848,2849,2850,2851,2852,2853,2854,2855,2856,2857,2858,2859,2860, ++2861,2862,2863,2864,2864,2865,2866,2867,2868,2869,2870,2871,2872,2873,2874,2875, ++2876,2877,2878,2879,2880,2881,2882,2883,2884,2885,2885,2886,2887,2888,2889,2890, ++2891,2892,2893,2894,2895,2896,2897,2898,2899,2900,2901,2902,2903,2904,2905,2906, ++2907,2908,2908,2909,2910,2911,2912,2913,2914,2915,2916,2917,2918,2919,2920,2921, ++2922,2923,2924,2925,2926,2927,2928,2929,2929,2930,2931,2932,2933,2934,2935,2936, ++2937,2938,2939,2940,2941,2942,2943,2944,2945,2946,2947,2948,2949,2950,2950,2951, ++2952,2953,2954,2955,2956,2957,2958,2959,2960,2961,2962,2963,2964,2965,2966,2967, ++2968,2969,2970,2971,2972,2973,2973,2974,2975,2976,2977,2978,2979,2980,2981,2982, ++2983,2984,2985,2986,2987,2988,2989,2990,2991,2992,2993,2994,2994,2995,2996,2997, ++2998,2999,3000,3001,3002,3003,3004,3005,3006,3007,3008,3009,3010,3011,3012,3013, ++3014,3015,3016,3017,3017,3018,3019,3020,3021,3022,3023,3024,3025,3026,3027,3028, ++3029,3030,3031,3032,3033,3034,3035,3036,3037,3038,3038,3039,3040,3041,3042,3043, ++3044,3045,3046,3047,3048,3049,3050,3051,3052,3053,3054,3055,3056,3057,3058,3059, ++3060,3061,3061,3062,3063,3064,3065,3066,3067,3068,3069,3070,3071,3072,3073,3074, ++3075,3076,3077,3078,3079,3080,3081,3082,3082,3083,3084,3085,3086,3087,3088,3089, ++3090,3091,3092,3093,3094,3095,3096,3097,3098,3099,3100,3101,3102,3103,3103,3104, ++3105,3106,3107,3108,3109,3110,3111,3112,3113,3114,3115,3116,3117,3118,3119,3120, ++3121,3122,3123,3124,3125,3126,3126,3127,3128,3129,3130,3131,3132,3133,3134,3135, ++3136,3137,3138,3139,3140,3141,3142,3143,3144,3145,3146,3147,3147,3148,3149,3150, ++3151,3152,3153,3154,3155,3156,3157,3158,3159,3160,3161,3162,3163,3164,3165,3166, ++3167,3168,3169,3170,3170,3171,3172,3173,3174,3175,3176,3177,3178,3179,3180,3181, ++3182,3183,3184,3185,3186,3187,3188,3189,3190,3191,3191,3192,3193,3194,3195,3196, ++3197,3198,3199,3200,3201,3202,3203,3204,3205,3206,3207,3208,3209,3210,3211,3212, ++3213,3214,3214,3215,3216,3217,3218,3219,3220,3221,3222,3223,3224,3225,3226,3227, ++3228,3229,3230,3231,3232,3233,3234,3235,3235,3236,3237,3238,3239,3240,3241,3242, ++3243,3244,3245,3246,3247,3248,3249,3250,3251,3252,3253,3254,3255,3256,3256,3257, ++3258,3259,3260,3261,3262,3263,3264,3265,3266,3267,3268,3269,3270,3271,3272,3273, ++3274,3275,3276,3277,3278,3279,3279,3280,3281,3282,3283,3284,3285,3286,3287,3288, ++3289,3290,3291,3292,3293,3294,3295,3296,3297,3298,3299,3300,3300,3301,3302,3303, ++3304,3305,3306,3307,3308,3309,3310,3311,3312,3313,3314,3315,3316,3317,3318,3319, ++3320,3321,3322,3323,3323,3324,3325,3326,3327,3328,3329,3330,3331,3332,3333,3334, ++3335,3336,3337,3338,3339,3340,3341,3342,3343,3344,3344,3345,3346,3347,3348,3349, ++3350,3351,3352,3353,3354,3355,3356,3357,3358,3359,3360,3361,3362,3363,3364,3365, ++3366,3367,3367,3368,3369,3370,3371,3372,3373,3374,3375,3376,3377,3378,3379,3380, ++3381,3382,3383,3384,3385,3386,3387,3388,3388,3389,3390,3391,3392,3393,3394,3395, ++3396,3397,3398,3399,3400,3401,3402,3403,3404,3405,3406,3407,3408,3409,3409,3410, ++3411,3412,3413,3414,3415,3416,3417,3418,3419,3420,3421,3422,3423,3424,3425,3426, ++3427,3428,3429,3430,3431,3432,3432,3433,3434,3435,3436,3437,3438,3439,3440,3441, ++3442,3443,3444,3445,3446,3447,3448,3449,3450,3451,3452,3453,3453,3454,3455,3456, ++3457,3458,3459,3460,3461,3462,3463,3464,3465,3466,3467,3468,3469,3470,3471,3472, ++3473,3474,3475,3476,3476,3477,3478,3479,3480,3481,3482,3483,3484,3485,3486,3487, ++3488,3489,3490,3491,3492,3493,3494,3495,3496,3497,3497,3498,3499,3500,3501,3502, ++3503,3504,3505,3506,3507,3508,3509,3510,3511,3512,3513,3514,3515,3516,3517,3518, ++3519,3520,3520,3521,3522,3523,3524,3525,3526,3527,3528,3529,3530,3531,3532,3533, ++3534,3535,3536,3537,3538,3539,3540,3541,3541,3542,3543,3544,3545,3546,3547,3548, ++3549,3550,3551,3552,3553,3554,3555,3556,3557,3558,3559,3560,3561,3562,3562,3563, ++3564,3565,3566,3567,3568,3569,3570,3571,3572,3573,3574,3575,3576,3577,3578,3579, ++3580,3581,3582,3583,3584,3585,3585,3586,3587,3588,3589,3590,3591,3592,3593,3594, ++3595,3596,3597,3598,3599,3600,3601,3602,3603,3604,3605,3606,3606,3607,3608,3609, ++3610,3611,3612,3613,3614,3615,3616,3617,3618,3619,3620,3621,3622,3623,3624,3625, ++3626,3627,3628,3629,3629,3630,3631,3632,3633,3634,3635,3636,3637,3638,3639,3640, ++3641,3642,3643,3644,3645,3646,3647,3648,3649,3650,3650,3651,3652,3653,3654,3655, ++3656,3657,3658,3659,3660,3661,3662,3663,3664,3665,3666,3667,3668,3669,3670,3671, ++3672,3673,3673,3674,3675,3676,3677,3678,3679,3680,3681,3682,3683,3684,3685,3686, ++3687,3688,3689,3690,3691,3692,3693,3694,3694,3695,3696,3697,3698,3699,3700,3701, ++3702,3703,3704,3705,3706,3707,3708,3709,3710,3711,3712,3713,3714,3715,3715,3716, ++3717,3718,3719,3720,3721,3722,3723,3724,3725,3726,3727,3728,3729,3730,3731,3732, ++3733,3734,3735,3736,3737,3738,3738,3739,3740,3741,3742,3743,3744,3745,3746,3747, ++3748,3749,3750,3751,3752,3753,3754,3755,3756,3757,3758,3759,3759,3760,3761,3762, ++3763,3764,3765,3766,3767,3768,3769,3770,3771,3772,3773,3774,3775,3776,3777,3778, ++3779,3780,3781,3782,3782,3783,3784,3785,3786,3787,3788,3789,3790,3791,3792,3793, ++3794,3795,3796,3797,3798,3799,3800,3801,3802,3803,3803,3804,3805,3806,3807,3808, ++3809,3810,3811,3812,3813,3814,3815,3816,3817,3818,3819,3820,3821,3822,3823,3824, ++3825,3826,3826,3827,3828,3829,3830,3831,3832,3833,3834,3835,3836,3837,3838,3839, ++3840,3841,3842,3843,3844,3845,3846,3847,3847,3848,3849,3850,3851,3852,3853,3854, ++3855,3856,3857,3858,3859,3860,3861,3862,3863,3864,3865,3866,3867,3868,3868,3869, ++3870,3871,3872,3873,3874,3875,3876,3877,3878,3879,3880,3881,3882,3883,3884,3885, ++3886,3887,3888,3889,3890,3891,3891,3892,3893,3894,3895,3896,3897,3898,3899,3900, ++3901,3902,3903,3904,3905,3906,3907,3908,3909,3910,3911,3912,3912,3913,3914,3915 ++}; ++ ++ ++static short HIF_TABLE[4096]={ ++ 0, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 12, 14, 15, 16, 17, ++ 18, 19, 21, 22, 23, 24, 25, 27, 28, 29, 30, 31, 32, 34, 35, 36, ++ 37, 38, 39, 41, 42, 43, 44, 45, 46, 48, 49, 50, 51, 52, 54, 55, ++ 56, 57, 58, 59, 61, 62, 63, 64, 65, 66, 68, 69, 70, 71, 72, 74, ++ 75, 76, 77, 78, 79, 81, 82, 83, 84, 85, 86, 88, 89, 90, 91, 92, ++ 93, 95, 96, 97, 98, 99, 101, 102, 103, 104, 105, 106, 108, 109, 110, 111, ++ 112, 113, 115, 116, 117, 118, 119, 121, 122, 123, 124, 125, 126, 128, 129, 130, ++ 131, 132, 133, 135, 136, 137, 138, 139, 140, 142, 143, 144, 145, 146, 148, 149, ++ 150, 151, 152, 153, 155, 156, 157, 158, 159, 160, 162, 163, 164, 165, 166, 168, ++ 169, 170, 171, 172, 173, 175, 176, 177, 178, 179, 180, 182, 183, 184, 185, 186, ++ 187, 189, 190, 191, 192, 193, 195, 196, 197, 198, 199, 200, 202, 203, 204, 205, ++ 206, 207, 209, 210, 211, 212, 213, 215, 216, 217, 218, 219, 220, 222, 223, 224, ++ 225, 226, 227, 229, 230, 231, 232, 233, 234, 236, 237, 238, 239, 240, 242, 243, ++ 244, 245, 246, 247, 249, 250, 251, 252, 253, 254, 256, 257, 258, 259, 260, 262, ++ 263, 264, 265, 266, 267, 269, 270, 271, 272, 273, 274, 276, 277, 278, 279, 280, ++ 281, 283, 284, 285, 286, 287, 289, 290, 291, 292, 293, 294, 296, 297, 298, 299, ++ 300, 301, 303, 304, 305, 306, 307, 309, 310, 311, 312, 313, 314, 316, 317, 318, ++ 319, 320, 321, 323, 324, 325, 326, 327, 328, 330, 331, 332, 333, 334, 336, 337, ++ 338, 339, 340, 341, 343, 344, 345, 346, 347, 348, 350, 351, 352, 353, 354, 356, ++ 357, 358, 359, 360, 361, 363, 364, 365, 366, 367, 368, 370, 371, 372, 373, 374, ++ 375, 377, 378, 379, 380, 381, 383, 384, 385, 386, 387, 388, 390, 391, 392, 393, ++ 394, 395, 397, 398, 399, 400, 401, 403, 404, 405, 406, 407, 408, 410, 411, 412, ++ 413, 414, 415, 417, 418, 419, 420, 421, 422, 424, 425, 426, 427, 428, 430, 431, ++ 432, 433, 434, 435, 437, 438, 439, 440, 441, 442, 444, 445, 446, 447, 448, 450, ++ 451, 452, 453, 454, 455, 457, 458, 459, 460, 461, 462, 464, 465, 466, 467, 468, ++ 469, 471, 472, 473, 474, 475, 477, 478, 479, 480, 481, 482, 484, 485, 486, 487, ++ 488, 489, 491, 492, 493, 494, 495, 497, 498, 499, 500, 501, 502, 504, 505, 506, ++ 507, 508, 509, 511, 512, 513, 514, 515, 516, 518, 519, 520, 521, 522, 524, 525, ++ 526, 527, 528, 529, 531, 532, 533, 534, 535, 536, 538, 539, 540, 541, 542, 544, ++ 545, 546, 547, 548, 549, 551, 552, 553, 554, 555, 556, 558, 559, 560, 561, 562, ++ 563, 565, 566, 567, 568, 569, 571, 572, 573, 574, 575, 576, 578, 579, 580, 581, ++ 582, 583, 585, 586, 587, 588, 589, 591, 592, 593, 594, 595, 596, 598, 599, 600, ++ 601, 602, 603, 605, 606, 607, 608, 609, 610, 612, 613, 614, 615, 616, 618, 619, ++ 620, 621, 622, 623, 625, 626, 627, 628, 629, 630, 632, 633, 634, 635, 636, 638, ++ 639, 640, 641, 642, 643, 645, 646, 647, 648, 649, 650, 652, 653, 654, 655, 656, ++ 657, 659, 660, 661, 662, 663, 665, 666, 667, 668, 669, 670, 672, 673, 674, 675, ++ 676, 677, 679, 680, 681, 682, 683, 685, 686, 687, 688, 689, 690, 692, 693, 694, ++ 695, 696, 697, 699, 700, 701, 702, 703, 704, 706, 707, 708, 709, 710, 712, 713, ++ 714, 715, 716, 717, 719, 720, 721, 722, 723, 724, 726, 727, 728, 729, 730, 732, ++ 733, 734, 735, 736, 737, 739, 740, 741, 742, 743, 744, 746, 747, 748, 749, 750, ++ 751, 753, 754, 755, 756, 757, 759, 760, 761, 762, 763, 764, 766, 767, 768, 769, ++ 770, 771, 773, 774, 775, 776, 777, 779, 780, 781, 782, 783, 784, 786, 787, 788, ++ 789, 790, 791, 793, 794, 795, 796, 797, 798, 800, 801, 802, 803, 804, 806, 807, ++ 808, 809, 810, 811, 813, 814, 815, 816, 817, 818, 820, 821, 822, 823, 824, 826, ++ 827, 828, 829, 830, 831, 833, 834, 835, 836, 837, 838, 840, 841, 842, 843, 844, ++ 845, 847, 848, 849, 850, 851, 853, 854, 855, 856, 857, 858, 860, 861, 862, 863, ++ 864, 865, 867, 868, 869, 870, 871, 873, 874, 875, 876, 877, 878, 880, 881, 882, ++ 883, 884, 885, 887, 888, 889, 890, 891, 892, 894, 895, 896, 897, 898, 900, 901, ++ 902, 903, 904, 905, 907, 908, 909, 910, 911, 912, 914, 915, 916, 917, 918, 920, ++ 921, 922, 923, 924, 925, 927, 928, 929, 930, 931, 932, 934, 935, 936, 937, 938, ++ 939, 941, 942, 943, 944, 945, 947, 948, 949, 950, 951, 952, 954, 955, 956, 957, ++ 958, 959, 961, 962, 963, 964, 965, 967, 968, 969, 970, 971, 972, 974, 975, 976, ++ 977, 978, 979, 981, 982, 983, 984, 985, 986, 988, 989, 990, 991, 992, 994, 995, ++ 996, 997, 998, 999,1001,1002,1003,1004,1005,1006,1008,1009,1010,1011,1012,1014, ++1015,1016,1017,1018,1019,1021,1022,1023,1024,1025,1026,1028,1029,1030,1031,1032, ++1033,1035,1036,1037,1038,1039,1041,1042,1043,1044,1045,1046,1048,1049,1050,1051, ++1052,1053,1055,1056,1057,1058,1059,1061,1062,1063,1064,1065,1066,1068,1069,1070, ++1071,1072,1073,1075,1076,1077,1078,1079,1080,1082,1083,1084,1085,1086,1088,1089, ++1090,1091,1092,1093,1095,1096,1097,1098,1099,1100,1102,1103,1104,1105,1106,1108, ++1109,1110,1111,1112,1113,1115,1116,1117,1118,1119,1120,1122,1123,1124,1125,1126, ++1127,1129,1130,1131,1132,1133,1135,1136,1137,1138,1139,1140,1142,1143,1144,1145, ++1146,1147,1149,1150,1151,1152,1153,1155,1156,1157,1158,1159,1160,1162,1163,1164, ++1165,1166,1167,1169,1170,1171,1172,1173,1174,1176,1177,1178,1179,1180,1182,1183, ++1184,1185,1186,1187,1189,1190,1191,1192,1193,1194,1196,1197,1198,1199,1200,1202, ++1203,1204,1205,1206,1207,1209,1210,1211,1212,1213,1214,1216,1217,1218,1219,1220, ++1221,1223,1224,1225,1226,1227,1229,1230,1231,1232,1233,1234,1236,1237,1238,1239, ++1240,1241,1243,1244,1245,1246,1247,1249,1250,1251,1252,1253,1254,1256,1257,1258, ++1259,1260,1261,1263,1264,1265,1266,1267,1268,1270,1271,1272,1273,1274,1276,1277, ++1278,1279,1280,1281,1283,1284,1285,1286,1287,1288,1290,1291,1292,1293,1294,1296, ++1297,1298,1299,1300,1301,1303,1304,1305,1306,1307,1308,1310,1311,1312,1313,1314, ++1315,1317,1318,1319,1320,1321,1323,1324,1325,1326,1327,1328,1330,1331,1332,1333, ++1334,1335,1337,1338,1339,1340,1341,1343,1344,1345,1346,1347,1348,1350,1351,1352, ++1353,1354,1355,1357,1358,1359,1360,1361,1362,1364,1365,1366,1367,1368,1370,1371, ++1372,1373,1374,1375,1377,1378,1379,1380,1381,1382,1384,1385,1386,1387,1388,1390, ++1391,1392,1393,1394,1395,1397,1398,1399,1400,1401,1402,1404,1405,1406,1407,1408, ++1409,1411,1412,1413,1414,1415,1417,1418,1419,1420,1421,1422,1424,1425,1426,1427, ++1428,1429,1431,1432,1433,1434,1435,1437,1438,1439,1440,1441,1442,1444,1445,1446, ++1447,1448,1449,1451,1452,1453,1454,1455,1456,1458,1459,1460,1461,1462,1464,1465, ++1466,1467,1468,1469,1471,1472,1473,1474,1475,1476,1478,1479,1480,1481,1482,1484, ++1485,1486,1487,1488,1489,1491,1492,1493,1494,1495,1496,1498,1499,1500,1501,1502, ++1503,1505,1506,1507,1508,1509,1511,1512,1513,1514,1515,1516,1518,1519,1520,1521, ++1522,1523,1525,1526,1527,1528,1529,1531,1532,1533,1534,1535,1536,1538,1539,1540, ++1541,1542,1543,1545,1546,1547,1548,1549,1550,1552,1553,1554,1555,1556,1558,1559, ++1560,1561,1562,1563,1565,1566,1567,1568,1569,1570,1572,1573,1574,1575,1576,1578, ++1579,1580,1581,1582,1583,1585,1586,1587,1588,1589,1590,1592,1593,1594,1595,1596, ++1597,1599,1600,1601,1602,1603,1605,1606,1607,1608,1609,1610,1612,1613,1614,1615, ++1616,1617,1619,1620,1621,1622,1623,1625,1626,1627,1628,1629,1630,1632,1633,1634, ++1635,1636,1637,1639,1640,1641,1642,1643,1644,1646,1647,1648,1649,1650,1652,1653, ++1654,1655,1656,1657,1659,1660,1661,1662,1663,1664,1666,1667,1668,1669,1670,1672, ++1673,1674,1675,1676,1677,1679,1680,1681,1682,1683,1684,1686,1687,1688,1689,1690, ++1691,1693,1694,1695,1696,1697,1699,1700,1701,1702,1703,1704,1706,1707,1708,1709, ++1710,1711,1713,1714,1715,1716,1717,1719,1720,1721,1722,1723,1724,1726,1727,1728, ++1729,1730,1731,1733,1734,1735,1736,1737,1738,1740,1741,1742,1743,1744,1746,1747, ++1748,1749,1750,1751,1753,1754,1755,1756,1757,1758,1760,1761,1762,1763,1764,1766, ++1767,1768,1769,1770,1771,1773,1774,1775,1776,1777,1778,1780,1781,1782,1783,1784, ++1785,1787,1788,1789,1790,1791,1793,1794,1795,1796,1797,1798,1800,1801,1802,1803, ++1804,1805,1807,1808,1809,1810,1811,1813,1814,1815,1816,1817,1818,1820,1821,1822, ++1823,1824,1825,1827,1828,1829,1830,1831,1832,1834,1835,1836,1837,1838,1840,1841, ++1842,1843,1844,1845,1847,1848,1849,1850,1851,1852,1854,1855,1856,1857,1858,1860, ++1861,1862,1863,1864,1865,1867,1868,1869,1870,1871,1872,1874,1875,1876,1877,1878, ++1879,1881,1882,1883,1884,1885,1887,1888,1889,1890,1891,1892,1894,1895,1896,1897, ++1898,1899,1901,1902,1903,1904,1905,1907,1908,1909,1910,1911,1912,1914,1915,1916, ++1917,1918,1919,1921,1922,1923,1924,1925,1926,1928,1929,1930,1931,1932,1934,1935, ++1936,1937,1938,1939,1941,1942,1943,1944,1945,1946,1948,1949,1950,1951,1952,1954, ++1955,1956,1957,1958,1959,1961,1962,1963,1964,1965,1966,1968,1969,1970,1971,1972, ++1973,1975,1976,1977,1978,1979,1981,1982,1983,1984,1985,1986,1988,1989,1990,1991, ++1992,1993,1995,1996,1997,1998,1999,2001,2002,2003,2004,2005,2006,2008,2009,2010, ++2011,2012,2013,2015,2016,2017,2018,2019,2020,2022,2023,2024,2025,2026,2028,2029, ++2030,2031,2032,2033,2035,2036,2037,2038,2039,2040,2042,2043,2044,2045,2046,2048, ++2049,2050,2051,2052,2053,2055,2056,2057,2058,2059,2060,2062,2063,2064,2065,2066, ++2067,2069,2070,2071,2072,2073,2075,2076,2077,2078,2079,2080,2082,2083,2084,2085, ++2086,2087,2089,2090,2091,2092,2093,2095,2096,2097,2098,2099,2100,2102,2103,2104, ++2105,2106,2107,2109,2110,2111,2112,2113,2114,2116,2117,2118,2119,2120,2122,2123, ++2124,2125,2126,2127,2129,2130,2131,2132,2133,2134,2136,2137,2138,2139,2140,2142, ++2143,2144,2145,2146,2147,2149,2150,2151,2152,2153,2154,2156,2157,2158,2159,2160, ++2161,2163,2164,2165,2166,2167,2169,2170,2171,2172,2173,2174,2176,2177,2178,2179, ++2180,2181,2183,2184,2185,2186,2187,2189,2190,2191,2192,2193,2194,2196,2197,2198, ++2199,2200,2201,2203,2204,2205,2206,2207,2208,2210,2211,2212,2213,2214,2216,2217, ++2218,2219,2220,2221,2223,2224,2225,2226,2227,2228,2230,2231,2232,2233,2234,2236, ++2237,2238,2239,2240,2241,2243,2244,2245,2246,2247,2248,2250,2251,2252,2253,2254, ++2255,2257,2258,2259,2260,2261,2263,2264,2265,2266,2267,2268,2270,2271,2272,2273, ++2274,2275,2277,2278,2279,2280,2281,2283,2284,2285,2286,2287,2288,2290,2291,2292, ++2293,2294,2295,2297,2298,2299,2300,2301,2302,2304,2305,2306,2307,2308,2310,2311, ++2312,2313,2314,2315,2317,2318,2319,2320,2321,2322,2324,2325,2326,2327,2328,2330, ++2331,2332,2333,2334,2335,2337,2338,2339,2340,2341,2342,2344,2345,2346,2347,2348, ++2349,2351,2352,2353,2354,2355,2357,2358,2359,2360,2361,2362,2364,2365,2366,2367, ++2368,2369,2371,2372,2373,2374,2375,2377,2378,2379,2380,2381,2382,2384,2385,2386, ++2387,2388,2389,2391,2392,2393,2394,2395,2396,2398,2399,2400,2401,2402,2404,2405, ++2406,2407,2408,2409,2411,2412,2413,2414,2415,2416,2418,2419,2420,2421,2422,2424, ++2425,2426,2427,2428,2429,2431,2432,2433,2434,2435,2436,2438,2439,2440,2441,2442, ++2443,2445,2446,2447,2448,2449,2451,2452,2453,2454,2455,2456,2458,2459,2460,2461, ++2462,2463,2465,2466,2467,2468,2469,2471,2472,2473,2474,2475,2476,2478,2479,2480, ++2481,2482,2483,2485,2486,2487,2488,2489,2490,2492,2493,2494,2495,2496,2498,2499, ++2500,2501,2502,2503,2505,2506,2507,2508,2509,2510,2512,2513,2514,2515,2516,2518, ++2519,2520,2521,2522,2523,2525,2526,2527,2528,2529,2530,2532,2533,2534,2535,2536, ++2537,2539,2540,2541,2542,2543,2545,2546,2547,2548,2549,2550,2552,2553,2554,2555, ++2556,2557,2559,2560,2561,2562,2563,2565,2566,2567,2568,2569,2570,2572,2573,2574, ++2575,2576,2577,2579,2580,2581,2582,2583,2584,2586,2587,2588,2589,2590,2592,2593, ++2594,2595,2596,2597,2599,2600,2601,2602,2603,2604,2606,2607,2608,2609,2610,2612, ++2613,2614,2615,2616,2617,2619,2620,2621,2622,2623,2624,2626,2627,2628,2629,2630, ++2631,2633,2634,2635,2636,2637,2639,2640,2641,2642,2643,2644,2646,2647,2648,2649, ++2650,2651,2653,2654,2655,2656,2657,2659,2660,2661,2662,2663,2664,2666,2667,2668, ++2669,2670,2671,2673,2674,2675,2676,2677,2678,2680,2681,2682,2683,2684,2686,2687, ++2688,2689,2690,2691,2693,2694,2695,2696,2697,2698,2700,2701,2702,2703,2704,2706, ++2707,2708,2709,2710,2711,2713,2714,2715,2716,2717,2718,2720,2721,2722,2723,2724, ++2725,2727,2728,2729,2730,2731,2733,2734,2735,2736,2737,2738,2740,2741,2742,2743, ++2744,2745,2747,2748,2749,2750,2751,2753,2754,2755,2756,2757,2758,2760,2761,2762, ++2763,2764,2765,2767,2768,2769,2770,2771,2772,2774,2775,2776,2777,2778,2780,2781, ++2782,2783,2784,2785,2787,2788,2789,2790,2791,2792,2794,2795,2796,2797,2798,2800, ++2801,2802,2803,2804,2805,2807,2808,2809,2810,2811,2812,2814,2815,2816,2817,2818, ++2819,2821,2822,2823,2824,2825,2827,2828,2829,2830,2831,2832,2834,2835,2836,2837, ++2838,2839,2841,2842,2843,2844,2845,2847,2848,2849,2850,2851,2852,2854,2855,2856, ++2857,2858,2859,2861,2862,2863,2864,2865,2866,2868,2869,2870,2871,2872,2874,2875, ++2876,2877,2878,2879,2881,2882,2883,2884,2885,2886,2888,2889,2890,2891,2892,2894, ++2895,2896,2897,2898,2899,2901,2902,2903,2904,2905,2906,2908,2909,2910,2911,2912, ++2913,2915,2916,2917,2918,2919,2921,2922,2923,2924,2925,2926,2928,2929,2930,2931, ++2932,2933,2935,2936,2937,2938,2939,2941,2942,2943,2944,2945,2946,2948,2949,2950, ++2951,2952,2953,2955,2956,2957,2958,2959,2960,2962,2963,2964,2965,2966,2968,2969, ++2970,2971,2972,2973,2975,2976,2977,2978,2979,2980,2982,2983,2984,2985,2986,2988, ++2989,2990,2991,2992,2993,2995,2996,2997,2998,2999,3000,3002,3003,3004,3005,3006, ++3007,3009,3010,3011,3012,3013,3015,3016,3017,3018,3019,3020,3022,3023,3024,3025, ++3026,3027,3029,3030,3031,3032,3033,3035,3036,3037,3038,3039,3040,3042,3043,3044, ++3045,3046,3047,3049,3050,3051,3052,3053,3054,3056,3057,3058,3059,3060,3062,3063, ++3064,3065,3066,3067,3069,3070,3071,3072,3073,3074,3076,3077,3078,3079,3080,3082, ++3083,3084,3085,3086,3087,3089,3090,3091,3092,3093,3094,3096,3097,3098,3099,3100, ++3101,3103,3104,3105,3106,3107,3109,3110,3111,3112,3113,3114,3116,3117,3118,3119, ++3120,3121,3123,3124,3125,3126,3127,3129,3130,3131,3132,3133,3134,3136,3137,3138, ++3139,3140,3141,3143,3144,3145,3146,3147,3148,3150,3151,3152,3153,3154,3156,3157, ++3158,3159,3160,3161,3163,3164,3165,3166,3167,3168,3170,3171,3172,3173,3174,3176, ++3177,3178,3179,3180,3181,3183,3184,3185,3186,3187,3188,3190,3191,3192,3193,3194, ++3195,3197,3198,3199,3200,3201,3203,3204,3205,3206,3207,3208,3210,3211,3212,3213, ++3214,3215,3217,3218,3219,3220,3221,3223,3224,3225,3226,3227,3228,3230,3231,3232, ++3233,3234,3235,3237,3238,3239,3240,3241,3242,3244,3245,3246,3247,3248,3250,3251, ++3252,3253,3254,3255,3257,3258,3259,3260,3261,3262,3264,3265,3266,3267,3268,3270, ++3271,3272,3273,3274,3275,3277,3278,3279,3280,3281,3282,3284,3285,3286,3287,3288, ++3289,3291,3292,3293,3294,3295,3297,3298,3299,3300,3301,3302,3304,3305,3306,3307, ++3308,3309,3311,3312,3313,3314,3315,3317,3318,3319,3320,3321,3322,3324,3325,3326, ++3327,3328,3329,3331,3332,3333,3334,3335,3336,3338,3339,3340,3341,3342,3344,3345, ++3346,3347,3348,3349,3351,3352,3353,3354,3355,3356,3358,3359,3360,3361,3362,3364, ++3365,3366,3367,3368,3369,3371,3372,3373,3374,3375,3376,3378,3379,3380,3381,3382, ++3383,3385,3386,3387,3388,3389,3391,3392,3393,3394,3395,3396,3398,3399,3400,3401, ++3402,3403,3405,3406,3407,3408,3409,3411,3412,3413,3414,3415,3416,3418,3419,3420, ++3421,3422,3423,3425,3426,3427,3428,3429,3430,3432,3433,3434,3435,3436,3438,3439, ++3440,3441,3442,3443,3445,3446,3447,3448,3449,3450,3452,3453,3454,3455,3456,3458, ++3459,3460,3461,3462,3463,3465,3466,3467,3468,3469,3470,3472,3473,3474,3475,3476, ++3477,3479,3480,3481,3482,3483,3485,3486,3487,3488,3489,3490,3492,3493,3494,3495, ++3496,3497,3499,3500,3501,3502,3503,3505,3506,3507,3508,3509,3510,3512,3513,3514, ++3515,3516,3517,3519,3520,3521,3522,3523,3524,3526,3527,3528,3529,3530,3532,3533, ++3534,3535,3536,3537,3539,3540,3541,3542,3543,3544,3546,3547,3548,3549,3550,3552, ++3553,3554,3555,3556,3557,3559,3560,3561,3562,3563,3564,3566,3567,3568,3569,3570, ++3571,3573,3574,3575,3576,3577,3579,3580,3581,3582,3583,3584,3586,3587,3588,3589, ++3590,3591,3593,3594,3595,3596,3597,3599,3600,3601,3602,3603,3604,3606,3607,3608, ++3609,3610,3611,3613,3614,3615,3616,3617,3618,3620,3621,3622,3623,3624,3626,3627, ++3628,3629,3630,3631,3633,3634,3635,3636,3637,3638,3640,3641,3642,3643,3644,3646, ++3647,3648,3649,3650,3651,3653,3654,3655,3656,3657,3658,3660,3661,3662,3663,3664, ++3665,3667,3668,3669,3670,3671,3673,3674,3675,3676,3677,3678,3680,3681,3682,3683, ++3684,3685,3687,3688,3689,3690,3691,3693,3694,3695,3696,3697,3698,3700,3701,3702, ++3703,3704,3705,3707,3708,3709,3710,3711,3712,3714,3715,3716,3717,3718,3720,3721, ++3722,3723,3724,3725,3727,3728,3729,3730,3731,3732,3734,3735,3736,3737,3738,3740, ++3741,3742,3743,3744,3745,3747,3748,3749,3750,3751,3752,3754,3755,3756,3757,3758, ++3759,3761,3762,3763,3764,3765,3767,3768,3769,3770,3771,3772,3774,3775,3776,3777, ++3778,3779,3781,3782,3783,3784,3785,3787,3788,3789,3790,3791,3792,3794,3795,3796, ++3797,3798,3799,3801,3802,3803,3804,3805,3806,3808,3809,3810,3811,3812,3814,3815, ++3816,3817,3818,3819,3821,3822,3823,3824,3825,3826,3828,3829,3830,3831,3832,3834, ++3835,3836,3837,3838,3839,3841,3842,3843,3844,3845,3846,3848,3849,3850,3851,3852, ++3853,3855,3856,3857,3858,3859,3861,3862,3863,3864,3865,3866,3868,3869,3870,3871, ++3872,3873,3875,3876,3877,3878,3879,3881,3882,3883,3884,3885,3886,3888,3889,3890, ++3891,3892,3893,3895,3896,3897,3898,3899,3900,3902,3903,3904,3905,3906,3908,3909, ++3910,3911,3912,3913,3915,3916,3917,3918,3919,3920,3922,3923,3924,3925,3926,3928, ++3929,3930,3931,3932,3933,3935,3936,3937,3938,3939,3940,3942,3943,3944,3945,3946, ++3947,3949,3950,3951,3952,3953,3955,3956,3957,3958,3959,3960,3962,3963,3964,3965, ++3966,3967,3969,3970,3971,3972,3973,3975,3976,3977,3978,3979,3980,3982,3983,3984, ++3985,3986,3987,3989,3990,3991,3992,3993,3994,3996,3997,3998,3999,4000,4002,4003, ++4004,4005,4006,4007,4009,4010,4011,4012,4013,4014,4016,4017,4018,4019,4020,4022, ++4023,4024,4025,4026,4027,4029,4030,4031,4032,4033,4034,4036,4037,4038,4039,4040, ++4041,4043,4044,4045,4046,4047,4049,4050,4051,4052,4053,4054,4056,4057,4058,4059, ++4060,4061,4063,4064,4065,4066,4067,4069,4070,4071,4072,4073,4074,4076,4077,4078, ++4079,4080,4081,4083,4084,4085,4086,4087,4088,4090,4091,4092,4093,4094,4096,4097, ++4098,4099,4100,4101,4103,4104,4105,4106,4107,4108,4110,4111,4112,4113,4114,4116, ++4117,4118,4119,4120,4121,4123,4124,4125,4126,4127,4128,4130,4131,4132,4133,4134, ++4135,4137,4138,4139,4140,4141,4143,4144,4145,4146,4147,4148,4150,4151,4152,4153, ++4154,4155,4157,4158,4159,4160,4161,4163,4164,4165,4166,4167,4168,4170,4171,4172, ++4173,4174,4175,4177,4178,4179,4180,4181,4182,4184,4185,4186,4187,4188,4190,4191, ++4192,4193,4194,4195,4197,4198,4199,4200,4201,4202,4204,4205,4206,4207,4208,4210, ++4211,4212,4213,4214,4215,4217,4218,4219,4220,4221,4222,4224,4225,4226,4227,4228, ++4229,4231,4232,4233,4234,4235,4237,4238,4239,4240,4241,4242,4244,4245,4246,4247, ++4248,4249,4251,4252,4253,4254,4255,4257,4258,4259,4260,4261,4262,4264,4265,4266, ++4267,4268,4269,4271,4272,4273,4274,4275,4276,4278,4279,4280,4281,4282,4284,4285, ++4286,4287,4288,4289,4291,4292,4293,4294,4295,4296,4298,4299,4300,4301,4302,4304, ++4305,4306,4307,4308,4309,4311,4312,4313,4314,4315,4316,4318,4319,4320,4321,4322, ++4323,4325,4326,4327,4328,4329,4331,4332,4333,4334,4335,4336,4338,4339,4340,4341, ++4342,4343,4345,4346,4347,4348,4349,4351,4352,4353,4354,4355,4356,4358,4359,4360, ++4361,4362,4363,4365,4366,4367,4368,4369,4370,4372,4373,4374,4375,4376,4378,4379, ++4380,4381,4382,4383,4385,4386,4387,4388,4389,4390,4392,4393,4394,4395,4396,4398, ++4399,4400,4401,4402,4403,4405,4406,4407,4408,4409,4410,4412,4413,4414,4415,4416, ++4417,4419,4420,4421,4422,4423,4425,4426,4427,4428,4429,4430,4432,4433,4434,4435, ++4436,4437,4439,4440,4441,4442,4443,4445,4446,4447,4448,4449,4450,4452,4453,4454, ++4455,4456,4457,4459,4460,4461,4462,4463,4464,4466,4467,4468,4469,4470,4472,4473, ++4474,4475,4476,4477,4479,4480,4481,4482,4483,4484,4486,4487,4488,4489,4490,4492, ++4493,4494,4495,4496,4497,4499,4500,4501,4502,4503,4504,4506,4507,4508,4509,4510, ++4511,4513,4514,4515,4516,4517,4519,4520,4521,4522,4523,4524,4526,4527,4528,4529, ++4530,4531,4533,4534,4535,4536,4537,4539,4540,4541,4542,4543,4544,4546,4547,4548, ++4549,4550,4551,4553,4554,4555,4556,4557,4558,4560,4561,4562,4563,4564,4566,4567, ++4568,4569,4570,4571,4573,4574,4575,4576,4577,4578,4580,4581,4582,4583,4584,4586, ++4587,4588,4589,4590,4591,4593,4594,4595,4596,4597,4598,4600,4601,4602,4603,4604, ++4605,4607,4608,4609,4610,4611,4613,4614,4615,4616,4617,4618,4620,4621,4622,4623, ++4624,4625,4627,4628,4629,4630,4631,4633,4634,4635,4636,4637,4638,4640,4641,4642, ++4643,4644,4645,4647,4648,4649,4650,4651,4652,4654,4655,4656,4657,4658,4660,4661, ++4662,4663,4664,4665,4667,4668,4669,4670,4671,4672,4674,4675,4676,4677,4678,4680, ++4681,4682,4683,4684,4685,4687,4688,4689,4690,4691,4692,4694,4695,4696,4697,4698, ++4699,4701,4702,4703,4704,4705,4707,4708,4709,4710,4711,4712,4714,4715,4716,4717, ++4718,4719,4721,4722,4723,4724,4725,4727,4728,4729,4730,4731,4732,4734,4735,4736, ++4737,4738,4739,4741,4742,4743,4744,4745,4746,4748,4749,4750,4751,4752,4754,4755, ++4756,4757,4758,4759,4761,4762,4763,4764,4765,4766,4768,4769,4770,4771,4772,4774, ++4775,4776,4777,4778,4779,4781,4782,4783,4784,4785,4786,4788,4789,4790,4791,4792, ++4793,4795,4796,4797,4798,4799,4801,4802,4803,4804,4805,4806,4808,4809,4810,4811 ++}; +diff -ruN libvorbis-1.2.0/lib/registry.c aotuv-b5.7_20090301/lib/registry.c +--- libvorbis-1.2.0/lib/registry.c 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/registry.c 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: registry for time, floor, res backends and channel mappings +- last mod: $Id: registry.c 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: registry.c 15531 2008-11-24 23:50:06Z xiphmont $ + + ********************************************************************/ + +@@ -22,25 +22,25 @@ + /* seems like major overkill now; the backend numbers will grow into + the infrastructure soon enough */ + +-extern vorbis_func_floor floor0_exportbundle; +-extern vorbis_func_floor floor1_exportbundle; +-extern vorbis_func_residue residue0_exportbundle; +-extern vorbis_func_residue residue1_exportbundle; +-extern vorbis_func_residue residue2_exportbundle; +-extern vorbis_func_mapping mapping0_exportbundle; ++extern const vorbis_func_floor floor0_exportbundle; ++extern const vorbis_func_floor floor1_exportbundle; ++extern const vorbis_func_residue residue0_exportbundle; ++extern const vorbis_func_residue residue1_exportbundle; ++extern const vorbis_func_residue residue2_exportbundle; ++extern const vorbis_func_mapping mapping0_exportbundle; + +-vorbis_func_floor *_floor_P[]={ ++const vorbis_func_floor *const _floor_P[]={ + &floor0_exportbundle, + &floor1_exportbundle, + }; + +-vorbis_func_residue *_residue_P[]={ ++const vorbis_func_residue *const _residue_P[]={ + &residue0_exportbundle, + &residue1_exportbundle, + &residue2_exportbundle, + }; + +-vorbis_func_mapping *_mapping_P[]={ ++const vorbis_func_mapping *const _mapping_P[]={ + &mapping0_exportbundle, + }; + +diff -ruN libvorbis-1.2.0/lib/registry.h aotuv-b5.7_20090301/lib/registry.h +--- libvorbis-1.2.0/lib/registry.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/registry.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: registry for time, floor, res backends and channel mappings +- last mod: $Id: registry.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: registry.h 15531 2008-11-24 23:50:06Z xiphmont $ + + ********************************************************************/ + +@@ -25,8 +25,8 @@ + #define VI_RESB 3 + #define VI_MAPB 1 + +-extern vorbis_func_floor *_floor_P[]; +-extern vorbis_func_residue *_residue_P[]; +-extern vorbis_func_mapping *_mapping_P[]; ++extern const vorbis_func_floor *const _floor_P[]; ++extern const vorbis_func_residue *const _residue_P[]; ++extern const vorbis_func_mapping *const _mapping_P[]; + + #endif +diff -ruN libvorbis-1.2.0/lib/res0.c aotuv-b5.7_20090301/lib/res0.c +--- libvorbis-1.2.0/lib/res0.c 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/res0.c 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: residue backend 0, 1 and 2 implementation +- last mod: $Id: res0.c 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: res0.c 15533 2008-11-25 17:27:58Z xiphmont $ + + ********************************************************************/ + +@@ -223,6 +223,19 @@ + for(j=0;jbooklist[j]>=ci->books)goto errout; + ++ /* verify the phrasebook is not specifying an impossible or ++ inconsistent partitioning scheme. */ ++ { ++ int entries = ci->book_param[info->groupbook]->entries; ++ int dim = ci->book_param[info->groupbook]->dim; ++ int partvals = 1; ++ while(dim>0){ ++ partvals *= info->partitions; ++ if(partvals > entries) goto errout; ++ dim--; ++ } ++ } ++ + return(info); + errout: + res0_free_info(info); +@@ -263,7 +276,10 @@ + } + } + +- look->partvals=rint(pow((float)look->parts,(float)dim)); ++ look->partvals=1; ++ for(j=0;jpartvals*=look->parts; ++ + look->stages=maxstage; + look->decodemap=_ogg_malloc(look->partvals*sizeof(*look->decodemap)); + for(j=0;jpartvals;j++){ +@@ -371,8 +387,6 @@ + long i,j,k; + vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl; + vorbis_info_residue0 *info=look->info; +- vorbis_info *vi=vb->vd->vi; +- codec_setup_info *ci=vi->codec_setup; + + /* move all this setup out later */ + int samples_per_partition=info->grouping; +@@ -500,8 +514,6 @@ + vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl; + vorbis_info_residue0 *info=look->info; + +- vorbis_dsp_state *vd=vb->vd; +- + /* move all this setup out later */ + int samples_per_partition=info->grouping; + int possible_partitions=info->partitions; +@@ -884,7 +896,7 @@ + } + + +-vorbis_func_residue residue0_exportbundle={ ++const vorbis_func_residue residue0_exportbundle={ + NULL, + &res0_unpack, + &res0_look, +@@ -895,7 +907,7 @@ + &res0_inverse + }; + +-vorbis_func_residue residue1_exportbundle={ ++const vorbis_func_residue residue1_exportbundle={ + &res0_pack, + &res0_unpack, + &res0_look, +@@ -906,7 +918,7 @@ + &res1_inverse + }; + +-vorbis_func_residue residue2_exportbundle={ ++const vorbis_func_residue residue2_exportbundle={ + &res0_pack, + &res0_unpack, + &res0_look, +diff -ruN libvorbis-1.2.0/lib/scales.h aotuv-b5.7_20090301/lib/scales.h +--- libvorbis-1.2.0/lib/scales.h 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/scales.h 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: linear scale -> dB, Bark and Mel scales +- last mod: $Id: scales.h 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: scales.h 13629 2007-08-26 00:24:57Z erikd $ + + ********************************************************************/ + +@@ -21,11 +21,16 @@ + #include + #include "os.h" + ++#ifdef _MSC_VER ++/* MS Visual Studio doesn't have C99 inline keyword. */ ++#define inline __inline ++#endif ++ + /* 20log10(x) */ + #define VORBIS_IEEE_FLOAT32 1 + #ifdef VORBIS_IEEE_FLOAT32 + +-static float unitnorm(float x){ ++static inline float unitnorm(float x){ + union { + ogg_uint32_t i; + float f; +@@ -36,7 +41,7 @@ + } + + /* Segher was off (too high) by ~ .3 decibel. Center the conversion correctly. */ +-static float todB(const float *x){ ++static inline float todB(const float *x){ + union { + ogg_uint32_t i; + float f; +diff -ruN libvorbis-1.2.0/lib/sharedbook.c aotuv-b5.7_20090301/lib/sharedbook.c +--- libvorbis-1.2.0/lib/sharedbook.c 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/sharedbook.c 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: basic shared codebook operations +- last mod: $Id: sharedbook.c 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: sharedbook.c 14811 2008-04-28 21:42:52Z xiphmont $ + + ********************************************************************/ + +@@ -124,7 +124,14 @@ + }else + if(sparsecount==0)count++; + } +- ++ ++ /* sanity check the huffman tree; an underpopulated tree must be rejected. */ ++ for(i=1;i<33;i++) ++ if(marker[i] & (0xffffffffUL>>(32-i))){ ++ _ogg_free(r); ++ return(NULL); ++ } ++ + /* bitreverse the words because our bitwise packer/unpacker is LSb + endian */ + for(i=0,count=0;i 12 partition types, or a different division of iteration, + this needs to be updated. */ + typedef struct { +- static_codebook *books[12][3]; ++ const static_codebook *books[12][3]; + } static_bookblock; + + typedef struct { + int res_type; + int limit_type; /* 0 lowpass limited, 1 point stereo limited */ +- vorbis_info_residue0 *res; +- static_codebook *book_aux; +- static_codebook *book_aux_managed; +- static_bookblock *books_base; +- static_bookblock *books_base_managed; ++ const vorbis_info_residue0 *res; ++ const static_codebook *book_aux; ++ const static_codebook *book_aux_managed; ++ const static_bookblock *books_base; ++ const static_bookblock *books_base_managed; + } vorbis_residue_template; + + typedef struct { +- vorbis_info_mapping0 *map; +- vorbis_residue_template *res; ++ const vorbis_info_mapping0 *map; ++ const vorbis_residue_template *res; + } vorbis_mapping_template; + + typedef struct vp_adjblock{ +@@ -90,63 +90,64 @@ + + typedef struct { + int mappings; +- double *rate_mapping; +- double *quality_mapping; ++ const double *rate_mapping; ++ const double *quality_mapping; ++ const float *pre_amp; + int coupling_restriction; + long samplerate_min_restriction; + long samplerate_max_restriction; + + +- int *blocksize_short; +- int *blocksize_long; ++ const int *blocksize_short; ++ const int *blocksize_long; + +- att3 *psy_tone_masteratt; +- int *psy_tone_0dB; +- int *psy_tone_dBsuppress; +- +- vp_adjblock *psy_tone_adj_impulse; +- vp_adjblock *psy_tone_adj_long; +- vp_adjblock *psy_tone_adj_other; +- +- noiseguard *psy_noiseguards; +- noise3 *psy_noise_bias_impulse; +- noise3 *psy_noise_bias_padding; +- noise3 *psy_noise_bias_trans; +- noise3 *psy_noise_bias_long; +- int *psy_noise_dBsuppress; +- +- compandblock *psy_noise_compand; +- double *psy_noise_compand_short_mapping; +- double *psy_noise_compand_long_mapping; +- +- int *psy_noise_normal_start[2]; +- int *psy_noise_normal_partition[2]; +- double *psy_noise_normal_thresh; +- +- int *psy_ath_float; +- int *psy_ath_abs; +- +- double *psy_lowpass; +- +- vorbis_info_psy_global *global_params; +- double *global_mapping; +- adj_stereo *stereo_modes; +- +- static_codebook ***floor_books; +- vorbis_info_floor1 *floor_params; +- int *floor_short_mapping; +- int *floor_long_mapping; ++ const att3 *psy_tone_masteratt; ++ const int *psy_tone_0dB; ++ const int *psy_tone_dBsuppress; ++ ++ const vp_adjblock *psy_tone_adj_impulse; ++ const vp_adjblock *psy_tone_adj_long; ++ const vp_adjblock *psy_tone_adj_other; ++ ++ const noiseguard *psy_noiseguards; ++ const noise3 *psy_noise_bias_impulse; ++ const noise3 *psy_noise_bias_padding; ++ const noise3 *psy_noise_bias_trans; ++ const noise3 *psy_noise_bias_long; ++ const int *psy_noise_dBsuppress; ++ ++ const compandblock *psy_noise_compand; ++ const double *psy_noise_compand_short_mapping; ++ const double *psy_noise_compand_long_mapping; ++ ++ const int *psy_noise_normal_start[2]; ++ const int *psy_noise_normal_partition[2]; ++ const double *psy_noise_normal_thresh; ++ ++ const int *psy_ath_float; ++ const int *psy_ath_abs; ++ ++ const double *psy_lowpass; ++ ++ const vorbis_info_psy_global *global_params; ++ const double *global_mapping; ++ const adj_stereo *stereo_modes; ++ ++ const static_codebook *const *const *const floor_books; ++ const vorbis_info_floor1 *floor_params; ++ const int *floor_short_mapping; ++ const int *floor_long_mapping; + +- vorbis_mapping_template *maps; ++ const vorbis_mapping_template *maps; + } ve_setup_data_template; + + /* a few static coder conventions */ +-static vorbis_info_mode _mode_template[2]={ ++static const vorbis_info_mode _mode_template[2]={ + {0,0,0,0}, + {1,0,0,1} + }; + +-static vorbis_info_mapping0 _map_nominal[2]={ ++static const vorbis_info_mapping0 _map_nominal[2]={ + {1, {0,0}, {0}, {0}, 1,{0},{1}}, + {1, {0,0}, {1}, {1}, 1,{0},{1}} + }; +@@ -160,7 +161,10 @@ + #include "modes/setup_22.h" + #include "modes/setup_X.h" + +-static ve_setup_data_template *setup_list[]={ ++static const ve_setup_data_template *const setup_list[]={ ++ &ve_setup_48_stereo, ++ &ve_setup_48_uncoupled, ++ + &ve_setup_44_stereo, + &ve_setup_44_uncoupled, + +@@ -197,9 +201,9 @@ + } + + static void vorbis_encode_floor_setup(vorbis_info *vi,double s,int block, +- static_codebook ***books, +- vorbis_info_floor1 *in, +- int *x){ ++ const static_codebook *const *const *const books, ++ const vorbis_info_floor1 *in, ++ const int *x){ + int i,k,is=s; + vorbis_info_floor1 *f=_ogg_calloc(1,sizeof(*f)); + codec_setup_info *ci=vi->codec_setup; +@@ -225,7 +229,7 @@ + } + + for(i=0;i<=maxbook;i++) +- ci->book_param[ci->books++]=books[x[is]][i]; ++ ci->book_param[ci->books++]=(static_codebook *)books[x[is]][i]; + } + + /* for now, we're only using floor 1 */ +@@ -237,8 +241,8 @@ + } + + static void vorbis_encode_global_psych_setup(vorbis_info *vi,double s, +- vorbis_info_psy_global *in, +- double *x){ ++ const vorbis_info_psy_global *in, ++ const double *x){ + int i,is=s; + double ds=s-is; + codec_setup_info *ci=vi->codec_setup; +@@ -264,8 +268,8 @@ + } + + static void vorbis_encode_global_stereo(vorbis_info *vi, +- highlevel_encode_setup *hi, +- adj_stereo *p){ ++ const highlevel_encode_setup *const hi, ++ const adj_stereo *p){ + float s=hi->stereo_point_setting; + int i,is=s; + double ds=s-is; +@@ -313,10 +317,10 @@ + } + + static void vorbis_encode_psyset_setup(vorbis_info *vi,double s, +- int *nn_start, +- int *nn_partition, +- double *nn_thresh, +- int block){ ++ const int *nn_start, ++ const int *nn_partition, ++ const double *nn_thresh, ++ int block){ + codec_setup_info *ci=vi->codec_setup; + vorbis_info_psy *p=ci->psy_param[block]; + highlevel_encode_setup *hi=&ci->hi; +@@ -344,9 +348,9 @@ + } + + static void vorbis_encode_tonemask_setup(vorbis_info *vi,double s,int block, +- att3 *att, +- int *max, +- vp_adjblock *in){ ++ const att3 *att, ++ const int *max, ++ const vp_adjblock *in){ + int i,is=s; + double ds=s-is; + codec_setup_info *ci=vi->codec_setup; +@@ -369,12 +373,18 @@ + + + static void vorbis_encode_compand_setup(vorbis_info *vi,double s,int block, +- compandblock *in, double *x){ +- int i,is=s; +- double ds=s-is; ++ const compandblock *in, ++ const double *x){ ++ int i,is=s, ishcm, hcm_stop=5; // high compander limit ++ double ds=s-is, dshcm; ++ + codec_setup_info *ci=vi->codec_setup; + vorbis_info_psy *p=ci->psy_param[block]; ++ ++ /* the place was borrowed... */ ++ p->flacint=ds; + ++ /* interpolate the compander mapping */ + ds=x[is]*(1.-ds)+x[is+1]*ds; + is=(int)ds; + ds-=is; +@@ -383,14 +393,37 @@ + ds=1.; + } + ++ /* high compander setup */ ++ ishcm = is; ++ dshcm = ds+.3; ++ if(dshcm > 1.0){ ++ ishcm++; ++ dshcm=dshcm-1; ++ } ++ if(x[hcm_stop] < ((float)ishcm+dshcm)){ ++ ishcm = x[hcm_stop]; ++ dshcm = x[hcm_stop]-ishcm; ++ } ++ if(dshcm==0 && ishcm>0){ // the same ++ ishcm--; ++ dshcm=1.; ++ } ++ + /* interpolate the compander settings */ + for(i=0;inoisecompand[i]=in[is].data[i]*(1.-ds)+in[is+1].data[i]*ds; ++ /* interpolate the high compander settings */ ++ if(s < (float)hcm_stop){ ++ for(i=0;inoisecompand_high[i]=in[ishcm].data[i]*(1.-dshcm)+in[ishcm+1].data[i]*dshcm; ++ }else{ // disable high compander ++ for(i=0;inoisecompand_high[i]=0; ++ } + return; + } + + static void vorbis_encode_peak_setup(vorbis_info *vi,double s,int block, +- int *suppress){ ++ const int *suppress){ + int is=s; + double ds=s-is; + codec_setup_info *ci=vi->codec_setup; +@@ -402,9 +435,9 @@ + } + + static void vorbis_encode_noisebias_setup(vorbis_info *vi,double s,int block, +- int *suppress, +- noise3 *in, +- noiseguard *guard, ++ const int *suppress, ++ const noise3 *in, ++ const noiseguard *guard, + double userbias){ + int i,is=s,j; + double ds=s-is; +@@ -443,7 +476,7 @@ + } + + +-static int book_dup_or_new(codec_setup_info *ci,static_codebook *book){ ++static int book_dup_or_new(codec_setup_info *ci,const static_codebook *book){ + int i; + for(i=0;ibooks;i++) + if(ci->book_param[i]==book)return(i); +@@ -452,7 +485,7 @@ + } + + static void vorbis_encode_blocksize_setup(vorbis_info *vi,double s, +- int *shortb,int *longb){ ++ const int *shortb,const int *longb){ + + codec_setup_info *ci=vi->codec_setup; + int is=s; +@@ -465,8 +498,8 @@ + } + + static void vorbis_encode_residue_setup(vorbis_info *vi, +- int number, int block, +- vorbis_residue_template *res){ ++ int number, int block, ++ const vorbis_residue_template *res){ + + codec_setup_info *ci=vi->codec_setup; + int i,n; +@@ -503,14 +536,14 @@ + r->secondstages[i]|=(1<groupbook=book_dup_or_new(ci,res->book_aux_managed); +- ci->book_param[r->groupbook]=res->book_aux_managed; ++ ci->book_param[r->groupbook]=(static_codebook *)res->book_aux_managed; + + for(i=0;ipartitions;i++){ + for(k=0;k<3;k++){ + if(res->books_base_managed->books[i][k]){ + int bookid=book_dup_or_new(ci,res->books_base_managed->books[i][k]); + r->booklist[booklist++]=bookid; +- ci->book_param[bookid]=res->books_base_managed->books[i][k]; ++ ci->book_param[bookid]=(static_codebook *)res->books_base_managed->books[i][k]; + } + } + } +@@ -523,14 +556,14 @@ + r->secondstages[i]|=(1<groupbook=book_dup_or_new(ci,res->book_aux); +- ci->book_param[r->groupbook]=res->book_aux; ++ ci->book_param[r->groupbook]=(static_codebook *)res->book_aux; + + for(i=0;ipartitions;i++){ + for(k=0;k<3;k++){ + if(res->books_base->books[i][k]){ + int bookid=book_dup_or_new(ci,res->books_base->books[i][k]); + r->booklist[booklist++]=bookid; +- ci->book_param[bookid]=res->books_base->books[i][k]; ++ ci->book_param[bookid]=(static_codebook *)res->books_base->books[i][k]; + } + } + } +@@ -565,24 +598,27 @@ + boundaries. We still lowpass 'wherever', but we have to round up + here to next boundary, or the vorbis spec will round it *down* to + previous boundary in encode/decode */ +- if(ci->residue_type[block]==2) ++ if(ci->residue_type[block]==2){ + r->end=(int)((freq/nyq*blocksize*2)/r->grouping+.9)* /* round up only if we're well past */ + r->grouping; +- else ++ ci->block_lowpassr[block]=r->end/2; /* lowpass (residue) */ ++ }else{ + r->end=(int)((freq/nyq*blocksize)/r->grouping+.9)* /* round up only if we're well past */ + r->grouping; ++ ci->block_lowpassr[block]=r->end; /* lowpass (residue) */ ++ } + } +-} ++} + + /* we assume two maps in this encoder */ + static void vorbis_encode_map_n_res_setup(vorbis_info *vi,double s, +- vorbis_mapping_template *maps){ ++ const vorbis_mapping_template *maps){ + + codec_setup_info *ci=vi->codec_setup; + int i,j,is=s,modes=2; +- vorbis_info_mapping0 *map=maps[is].map; +- vorbis_info_mode *mode=_mode_template; +- vorbis_residue_template *res=maps[is].res; ++ const vorbis_info_mapping0 *map=maps[is].map; ++ const vorbis_info_mode *mode=_mode_template; ++ const vorbis_residue_template *res=maps[is].res; + + if(ci->blocksizes[0]==ci->blocksizes[1])modes=1; + +@@ -611,7 +647,7 @@ + int is=hi->base_setting; + double ds=hi->base_setting-is; + int ch=vi->channels; +- double *r=setup->rate_mapping; ++ const double *r=setup->rate_mapping; + + if(r==NULL) + return(-1); +@@ -633,7 +669,7 @@ + if(srate>=setup_list[i]->samplerate_min_restriction && + srate<=setup_list[i]->samplerate_max_restriction){ + int mappings=setup_list[i]->mappings; +- double *map=(q_or_bitrate? ++ const double *map=(q_or_bitrate? + setup_list[i]->rate_mapping: + setup_list[i]->quality_mapping); + +@@ -860,7 +896,7 @@ + int ret=0,i,is; + codec_setup_info *ci=vi->codec_setup; + highlevel_encode_setup *hi=&ci->hi; +- ve_setup_data_template *setup=hi->setup; ++ const ve_setup_data_template *setup=hi->setup; + double ds; + + ret=vorbis_encode_toplevel_setup(vi,channels,rate); +@@ -881,6 +917,10 @@ + hi->lowpass_kHz= + setup->psy_lowpass[is]*(1.-ds)+setup->psy_lowpass[is+1]*ds; + ++ /* preamp */ ++ hi->pre_amplitude= ++ setup->pre_amp[is]*(1.-ds)+setup->pre_amp[is+1]*ds; ++ + hi->ath_floating_dB=setup->psy_ath_float[is]*(1.-ds)+ + setup->psy_ath_float[is+1]*ds; + hi->ath_absolute_dB=setup->psy_ath_abs[is]*(1.-ds)+ +diff -ruN libvorbis-1.2.0/lib/vorbisfile.c aotuv-b5.7_20090301/lib/vorbisfile.c +--- libvorbis-1.2.0/lib/vorbisfile.c 2007-07-24 03:08:23.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/vorbisfile.c 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: stdio-based convenience library for opening/seeking/decoding +- last mod: $Id: vorbisfile.c 13294 2007-07-24 01:08:23Z xiphmont $ ++ last mod: $Id: vorbisfile.c 14771 2008-04-17 18:21:55Z xiphmont $ + + ********************************************************************/ + +@@ -1721,6 +1721,11 @@ + index within the physical bitstream. Note that the accessor + functions above are aware of this dichotomy). + ++ ov_read_filter is exactly the same as ov_read except that it processes ++ the decoded audio data through a filter before packing it into the ++ requested format. This gives greater accuracy than applying a filter ++ after the audio has been converted into integral PCM. ++ + input values: buffer) a buffer to hold packed PCM data for return + length) the byte length requested to be placed into buffer + bigendianp) should the data be packed LSB first (0) or +@@ -1737,8 +1742,9 @@ + + *section) set to the logical bitstream number */ + +-long ov_read(OggVorbis_File *vf,char *buffer,int length, +- int bigendianp,int word,int sgned,int *bitstream){ ++long ov_read_filter(OggVorbis_File *vf,char *buffer,int length, ++ int bigendianp,int word,int sgned,int *bitstream, ++ void (*filter)(float **pcm,long channels,long samples,void *filter_param),void *filter_param){ + int i,j; + int host_endian = host_is_big_endian(); + +@@ -1776,6 +1782,10 @@ + if(samples <= 0) + return OV_EINVAL; + ++ /* Here. */ ++ if(filter) ++ filter(pcm,channels,samples,filter_param); ++ + /* a tight loop to pack each size */ + { + int val; +@@ -1868,6 +1878,11 @@ + } + } + ++long ov_read(OggVorbis_File *vf,char *buffer,int length, ++ int bigendianp,int word,int sgned,int *bitstream){ ++ return ov_read_filter(vf, buffer, length, bigendianp, word, sgned, bitstream, NULL, NULL); ++} ++ + /* input values: pcm_channels) a float vector per channel of output + length) the sample length being read by the app + +diff -ruN libvorbis-1.2.0/lib/window.c aotuv-b5.7_20090301/lib/window.c +--- libvorbis-1.2.0/lib/window.c 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/lib/window.c 2009-03-02 21:24:44.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: window functions +- last mod: $Id: window.c 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: window.c 15531 2008-11-24 23:50:06Z xiphmont $ + + ********************************************************************/ + +@@ -20,7 +20,7 @@ + #include "os.h" + #include "misc.h" + +-static float vwin64[32] = { ++static const float vwin64[32] = { + 0.0009460463F, 0.0085006468F, 0.0235352254F, 0.0458950567F, + 0.0753351908F, 0.1115073077F, 0.1539457973F, 0.2020557475F, + 0.2551056759F, 0.3122276645F, 0.3724270287F, 0.4346027792F, +@@ -31,7 +31,7 @@ + 0.9989462667F, 0.9997230082F, 0.9999638688F, 0.9999995525F, + }; + +-static float vwin128[64] = { ++static const float vwin128[64] = { + 0.0002365472F, 0.0021280687F, 0.0059065254F, 0.0115626550F, + 0.0190823442F, 0.0284463735F, 0.0396300935F, 0.0526030430F, + 0.0673285281F, 0.0837631763F, 0.1018564887F, 0.1215504095F, +@@ -50,7 +50,7 @@ + 0.9999331503F, 0.9999825563F, 0.9999977357F, 0.9999999720F, + }; + +-static float vwin256[128] = { ++static const float vwin256[128] = { + 0.0000591390F, 0.0005321979F, 0.0014780301F, 0.0028960636F, + 0.0047854363F, 0.0071449926F, 0.0099732775F, 0.0132685298F, + 0.0170286741F, 0.0212513119F, 0.0259337111F, 0.0310727950F, +@@ -85,7 +85,7 @@ + 0.9999958064F, 0.9999989077F, 0.9999998584F, 0.9999999983F, + }; + +-static float vwin512[256] = { ++static const float vwin512[256] = { + 0.0000147849F, 0.0001330607F, 0.0003695946F, 0.0007243509F, + 0.0011972759F, 0.0017882983F, 0.0024973285F, 0.0033242588F, + 0.0042689632F, 0.0053312973F, 0.0065110982F, 0.0078081841F, +@@ -152,7 +152,7 @@ + 0.9999997377F, 0.9999999317F, 0.9999999911F, 0.9999999999F, + }; + +-static float vwin1024[512] = { ++static const float vwin1024[512] = { + 0.0000036962F, 0.0000332659F, 0.0000924041F, 0.0001811086F, + 0.0002993761F, 0.0004472021F, 0.0006245811F, 0.0008315063F, + 0.0010679699F, 0.0013339631F, 0.0016294757F, 0.0019544965F, +@@ -283,7 +283,7 @@ + 0.9999999836F, 0.9999999957F, 0.9999999994F, 1.0000000000F, + }; + +-static float vwin2048[1024] = { ++static const float vwin2048[1024] = { + 0.0000009241F, 0.0000083165F, 0.0000231014F, 0.0000452785F, + 0.0000748476F, 0.0001118085F, 0.0001561608F, 0.0002079041F, + 0.0002670379F, 0.0003335617F, 0.0004074748F, 0.0004887765F, +@@ -542,7 +542,7 @@ + 0.9999999990F, 0.9999999997F, 1.0000000000F, 1.0000000000F, + }; + +-static float vwin4096[2048] = { ++static const float vwin4096[2048] = { + 0.0000002310F, 0.0000020791F, 0.0000057754F, 0.0000113197F, + 0.0000187121F, 0.0000279526F, 0.0000390412F, 0.0000519777F, + 0.0000667623F, 0.0000833949F, 0.0001018753F, 0.0001222036F, +@@ -1057,7 +1057,7 @@ + 0.9999999999F, 1.0000000000F, 1.0000000000F, 1.0000000000F, + }; + +-static float vwin8192[4096] = { ++static const float vwin8192[4096] = { + 0.0000000578F, 0.0000005198F, 0.0000014438F, 0.0000028299F, + 0.0000046780F, 0.0000069882F, 0.0000097604F, 0.0000129945F, + 0.0000166908F, 0.0000208490F, 0.0000254692F, 0.0000305515F, +@@ -2084,7 +2084,7 @@ + 1.0000000000F, 1.0000000000F, 1.0000000000F, 1.0000000000F, + }; + +-static float *vwin[8] = { ++static const float *const vwin[8] = { + vwin64, + vwin128, + vwin256, +@@ -2095,7 +2095,7 @@ + vwin8192, + }; + +-float *_vorbis_window_get(int n){ ++const float *_vorbis_window_get(int n){ + return vwin[n]; + } + +@@ -2105,8 +2105,8 @@ + nW=(W?nW:0); + + { +- float *windowLW=vwin[winno[lW]]; +- float *windowNW=vwin[winno[nW]]; ++ const float *windowLW=vwin[winno[lW]]; ++ const float *windowNW=vwin[winno[nW]]; + + long n=blocksizes[W]; + long ln=blocksizes[lW]; +diff -ruN libvorbis-1.2.0/libvorbis.spec aotuv-b5.7_20090301/libvorbis.spec +--- libvorbis-1.2.0/libvorbis.spec 2007-07-25 18:46:46.000000000 +0200 ++++ aotuv-b5.7_20090301/libvorbis.spec 2009-03-02 21:25:38.000000000 +0100 +@@ -1,5 +1,5 @@ + Name: libvorbis +-Version: 1.2.0 ++Version: 1.2.1RC2 + Release: 0.xiph.1 + Summary: The Vorbis General Audio Compression Codec. + +@@ -7,7 +7,7 @@ + License: BSD + URL: http://www.xiph.org/ + Vendor: Xiph.org Foundation +-Source: http://www.vorbis.com/files/1.0.1/unix/%{name}-%{version}.tar.gz ++Source: http://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.gz + BuildRoot: %{_tmppath}/%{name}-%{version}-root + + # We're forced to use an epoch since both Red Hat and Ximian use it in their +@@ -91,6 +91,9 @@ + %{_libdir}/pkgconfig/vorbisenc.pc + + %changelog ++* Sat May 3 2008 Ralph Giles ++- updated source location ++ + * Thu Jun 10 2004 Thomas Vander Stichele + - autogenerate from configure + - fix download location +diff -ruN libvorbis-1.2.0/libvorbis.spec.in aotuv-b5.7_20090301/libvorbis.spec.in +--- libvorbis-1.2.0/libvorbis.spec.in 2004-07-26 15:33:43.000000000 +0200 ++++ aotuv-b5.7_20090301/libvorbis.spec.in 2009-03-02 21:24:48.000000000 +0100 +@@ -7,7 +7,7 @@ + License: BSD + URL: http://www.xiph.org/ + Vendor: Xiph.org Foundation +-Source: http://www.vorbis.com/files/1.0.1/unix/%{name}-%{version}.tar.gz ++Source: http://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.gz + BuildRoot: %{_tmppath}/%{name}-%{version}-root + + # We're forced to use an epoch since both Red Hat and Ximian use it in their +@@ -91,6 +91,9 @@ + %{_libdir}/pkgconfig/vorbisenc.pc + + %changelog ++* Sat May 3 2008 Ralph Giles ++- updated source location ++ + * Thu Jun 10 2004 Thomas Vander Stichele + - autogenerate from configure + - fix download location +diff -ruN libvorbis-1.2.0/test/Makefile.am aotuv-b5.7_20090301/test/Makefile.am +--- libvorbis-1.2.0/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ aotuv-b5.7_20090301/test/Makefile.am 2009-03-02 21:24:44.000000000 +0100 +@@ -0,0 +1,19 @@ ++## Process this file with automake to produce Makefile.in ++ ++AUTOMAKE_OPTIONS = foreign ++ ++INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@ ++ ++noinst_PROGRAMS = test ++ ++check: $(noinst_PROGRAMS) ++ ./test$(EXEEXT) ++ ++test_SOURCES = util.c util.h write_read.c write_read.h test.c ++test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@ ++ ++debug: ++ $(MAKE) all CFLAGS="@DEBUG@" ++ ++profile: ++ $(MAKE) all CFLAGS="@PROFILE@" +diff -ruN libvorbis-1.2.0/test/test.c aotuv-b5.7_20090301/test/test.c +--- libvorbis-1.2.0/test/test.c 1970-01-01 01:00:00.000000000 +0100 ++++ aotuv-b5.7_20090301/test/test.c 2009-03-02 21:24:44.000000000 +0100 +@@ -0,0 +1,92 @@ ++/******************************************************************** ++ * * ++ * 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. * ++ * * ++ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007 * ++ * by the Xiph.Org Foundation http://www.xiph.org/ * ++ * * ++ ******************************************************************** ++ ++ function: vorbis coded test suite using vorbisfile ++ last mod: $Id: test.c 13293 2007-07-24 00:09:47Z erikd $ ++ ++ ********************************************************************/ ++ ++#include ++#include ++#include ++ ++#include "util.h" ++#include "write_read.h" ++ ++#define DATA_LEN 2048 ++ ++#define MAX(a,b) ((a) > (b) ? (a) : (b)) ++ ++ ++static int check_output (const float * data_in, unsigned len); ++ ++int ++main(void){ ++ static float data_out [DATA_LEN] ; ++ static float data_in [DATA_LEN] ; ++ ++ /* Do safest and most used sample rates first. */ ++ int sample_rates [] = { 44100, 48000, 32000, 22050, 16000, 96000 } ; ++ unsigned k ; ++ int errors = 0 ; ++ ++ gen_windowed_sine (data_out, ARRAY_LEN (data_out), 0.95); ++ ++ for (k = 0 ; k < ARRAY_LEN (sample_rates); k ++) { ++ char filename [64] ; ++ snprintf (filename, sizeof (filename), "vorbis_%u.ogg", sample_rates [k]); ++ ++ printf (" %-20s : ", filename); ++ fflush (stdout); ++ ++ /* Set to know value. */ ++ set_data_in (data_in, ARRAY_LEN (data_in), 3.141); ++ ++ write_vorbis_data_or_die (filename, sample_rates [k], data_out, ARRAY_LEN (data_out)); ++ read_vorbis_data_or_die (filename, sample_rates [k], data_in, ARRAY_LEN (data_in)); ++ ++ if (check_output (data_in, ARRAY_LEN (data_in)) != 0) ++ errors ++ ; ++ else { ++ puts ("ok"); ++ remove (filename); ++ } ++ } ++ ++ if (errors) ++ exit (1); ++ ++ return 0; ++} ++ ++static int ++check_output (const float * data_in, unsigned len) ++{ ++ float max_abs = 0.0 ; ++ unsigned k ; ++ ++ for (k = 0 ; k < len ; k++) { ++ float temp = fabs (data_in [k]); ++ max_abs = MAX (max_abs, temp); ++ } ++ ++ if (max_abs < 0.9) { ++ printf ("Error : max_abs (%f) too small.\n", max_abs); ++ return 1 ; ++ } else if (max_abs > 1.0) { ++ printf ("Error : max_abs (%f) too big.\n", max_abs); ++ return 1 ; ++ } ++ ++ return 0 ; ++} ++ +diff -ruN libvorbis-1.2.0/test/util.c aotuv-b5.7_20090301/test/util.c +--- libvorbis-1.2.0/test/util.c 1970-01-01 01:00:00.000000000 +0100 ++++ aotuv-b5.7_20090301/test/util.c 2009-03-02 21:24:44.000000000 +0100 +@@ -0,0 +1,53 @@ ++/******************************************************************** ++ * * ++ * 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. * ++ * * ++ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007 * ++ * by the Xiph.Org Foundation http://www.xiph.org/ * ++ * * ++ ******************************************************************** ++ ++ function: utility functions for vorbis codec test suite. ++ last mod: $Id: util.c 13293 2007-07-24 00:09:47Z erikd $ ++ ++ ********************************************************************/ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++#include "util.h" ++ ++void ++gen_windowed_sine (float *data, int len, float maximum) ++{ int k ; ++ ++ memset (data, 0, len * sizeof (float)) ; ++ ++ len /= 2 ; ++ ++ for (k = 0 ; k < len ; k++) ++ { data [k] = sin (2.0 * k * M_PI * 1.0 / 32.0 + 0.4) ; ++ ++ /* Apply Hanning Window. */ ++ data [k] *= maximum * (0.5 - 0.5 * cos (2.0 * M_PI * k / ((len) - 1))) ; ++ } ++ ++ return ; ++} ++ ++void ++set_data_in (float * data, unsigned len, float value) ++{ unsigned k ; ++ ++ for (k = 0 ; k < len ; k++) ++ data [k] = value ; ++} +diff -ruN libvorbis-1.2.0/test/util.h aotuv-b5.7_20090301/test/util.h +--- libvorbis-1.2.0/test/util.h 1970-01-01 01:00:00.000000000 +0100 ++++ aotuv-b5.7_20090301/test/util.h 2009-03-02 21:24:44.000000000 +0100 +@@ -0,0 +1,24 @@ ++/******************************************************************** ++ * * ++ * 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. * ++ * * ++ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007 * ++ * by the Xiph.Org Foundation http://www.xiph.org/ * ++ * * ++ ******************************************************************** ++ ++ function: utility functions for vorbis codec test suite. ++ last mod: $Id: util.c 13293 2007-07-24 00:09:47Z erikd $ ++ ++ ********************************************************************/ ++ ++#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0])) ++ ++/* Create simple test data consisting of a windowed sine wave. */ ++void gen_windowed_sine (float *data, int len, float maximum) ; ++ ++/* Set len values of data array to given value. */ ++void set_data_in (float * data, unsigned len, float value) ; +diff -ruN libvorbis-1.2.0/test/write_read.c aotuv-b5.7_20090301/test/write_read.c +--- libvorbis-1.2.0/test/write_read.c 1970-01-01 01:00:00.000000000 +0100 ++++ aotuv-b5.7_20090301/test/write_read.c 2009-03-02 21:24:44.000000000 +0100 +@@ -0,0 +1,299 @@ ++/******************************************************************** ++ * * ++ * 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. * ++ * * ++ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007 * ++ * by the Xiph.Org Foundation http://www.xiph.org/ * ++ * * ++ ******************************************************************** ++ ++ function: utility functions for vorbis codec test suite. ++ last mod: $Id: util.c 13293 2007-07-24 00:09:47Z erikd $ ++ ++ ********************************************************************/ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++#include "write_read.h" ++ ++/* The following function is basically a hacked version of the code in ++ * examples/encoder_example.c */ ++void ++write_vorbis_data_or_die (const char *filename, int srate, const float * data, int count) ++{ ++ FILE * file ; ++ ogg_stream_state os; ++ ogg_page og; ++ ogg_packet op; ++ vorbis_info vi; ++ vorbis_comment vc; ++ vorbis_dsp_state vd; ++ vorbis_block vb; ++ ++ int eos = 0, ret; ++ ++ if ((file = fopen (filename, "wb")) == NULL) { ++ printf("\n\nError : fopen failed : %s\n", strerror (errno)) ; ++ exit (1) ; ++ } ++ ++ /********** Encode setup ************/ ++ ++ vorbis_info_init (&vi); ++ ++ ret = vorbis_encode_init_vbr (&vi,1,srate,0.8); ++ if (ret) { ++ printf ("vorbis_encode_init_vbr return %d\n", ret) ; ++ exit (1) ; ++ } ++ ++ vorbis_comment_init (&vc); ++ vorbis_comment_add_tag (&vc,"ENCODER","test/util.c"); ++ vorbis_analysis_init (&vd,&vi); ++ vorbis_block_init (&vd,&vb); ++ ++ ogg_stream_init (&os,12345678); ++ ++ { ++ ogg_packet header; ++ ogg_packet header_comm; ++ ogg_packet header_code; ++ ++ vorbis_analysis_headerout (&vd,&vc,&header,&header_comm,&header_code); ++ ogg_stream_packetin (&os,&header); ++ ogg_stream_packetin (&os,&header_comm); ++ ogg_stream_packetin (&os,&header_code); ++ ++ /* Ensures the audio data will start on a new page. */ ++ while (!eos){ ++ int result = ogg_stream_flush (&os,&og); ++ if (result == 0) ++ break; ++ fwrite (og.header,1,og.header_len,file); ++ fwrite (og.body,1,og.body_len,file); ++ } ++ ++ } ++ ++ { ++ /* expose the buffer to submit data */ ++ float **buffer = vorbis_analysis_buffer (&vd,count); ++ ++ memcpy (buffer [0], data, count * sizeof (float)) ; ++ ++ /* tell the library how much we actually submitted */ ++ vorbis_analysis_wrote (&vd,count); ++ vorbis_analysis_wrote (&vd,0); ++ } ++ ++ while (vorbis_analysis_blockout (&vd,&vb) == 1) { ++ vorbis_analysis (&vb,NULL); ++ vorbis_bitrate_addblock (&vb); ++ ++ while (vorbis_bitrate_flushpacket (&vd,&op)) { ++ ogg_stream_packetin (&os,&op); ++ ++ while (!eos) { ++ int result = ogg_stream_pageout (&os,&og); ++ if (result == 0) ++ break; ++ fwrite (og.header,1,og.header_len,file); ++ fwrite (og.body,1,og.body_len,file); ++ ++ if (ogg_page_eos (&og)) ++ eos = 1; ++ } ++ } ++ } ++ ++ ogg_stream_clear (&os); ++ vorbis_block_clear (&vb); ++ vorbis_dsp_clear (&vd); ++ vorbis_comment_clear (&vc); ++ vorbis_info_clear (&vi); ++ ++ fclose (file) ; ++} ++ ++/* The following function is basically a hacked version of the code in ++ * examples/decoder_example.c */ ++void ++read_vorbis_data_or_die (const char *filename, int srate, float * data, int count) ++{ ++ ogg_sync_state oy; ++ ogg_stream_state os; ++ ogg_page og; ++ ogg_packet op; ++ ++ vorbis_info vi; ++ vorbis_comment vc; ++ vorbis_dsp_state vd; ++ vorbis_block vb; ++ ++ FILE *file; ++ char *buffer; ++ int bytes; ++ int eos = 0; ++ int i; ++ int read_total = 0 ; ++ ++ if ((file = fopen (filename, "rb")) == NULL) { ++ printf("\n\nError : fopen failed : %s\n", strerror (errno)) ; ++ exit (1) ; ++ } ++ ++ ogg_sync_init (&oy); ++ ++ { ++ buffer = ogg_sync_buffer (&oy,4096); ++ bytes = fread (buffer,1,4096,file); ++ ogg_sync_wrote (&oy,bytes); ++ ++ if(ogg_sync_pageout (&oy,&og) != 1) { ++ if(bytes < 4096) { ++ printf ("Out of data.\n") ; ++ goto done_decode ; ++ } ++ ++ fprintf (stderr,"Input does not appear to be an Ogg bitstream.\n"); ++ exit (1); ++ } ++ ++ ogg_stream_init (&os,ogg_page_serialno(&og)); ++ ++ vorbis_info_init (&vi); ++ vorbis_comment_init (&vc); ++ if (ogg_stream_pagein (&os,&og) < 0) { ++ fprintf (stderr,"Error reading first page of Ogg bitstream data.\n"); ++ exit (1); ++ } ++ ++ if (ogg_stream_packetout(&os,&op) != 1) { ++ fprintf (stderr,"Error reading initial header packet.\n"); ++ exit (1); ++ } ++ ++ if (vorbis_synthesis_headerin (&vi,&vc,&op) < 0) { ++ fprintf (stderr,"This Ogg bitstream does not contain Vorbis " ++ "audio data.\n"); ++ exit (1); ++ } ++ ++ i = 0; ++ while ( i < 2) { ++ while (i < 2) { ++ int result = ogg_sync_pageout (&oy,&og); ++ if(result == 0) ++ break; ++ if(result==1) { ++ ogg_stream_pagein(&os,&og); ++ ++ while (i < 2) { ++ result = ogg_stream_packetout (&os,&op); ++ if (result == 0) ++ goto done_decode; ++ if (result < 0) { ++ fprintf (stderr,"Corrupt secondary header. Exiting.\n"); ++ exit(1); ++ } ++ vorbis_synthesis_headerin (&vi,&vc,&op); ++ i++; ++ } ++ } ++ } ++ ++ buffer = ogg_sync_buffer (&oy,4096); ++ bytes = fread (buffer,1,4096,file); ++ if (bytes == 0 && i < 2) { ++ fprintf (stderr,"End of file before finding all Vorbis headers!\n"); ++ exit (1); ++ } ++ ++ ogg_sync_wrote (&oy,bytes); ++ } ++ ++ if (vi.rate != srate) { ++ printf ("\n\nError : File '%s' has sample rate of %ld when it should be %d.\n\n", filename, vi.rate, srate); ++ exit (1) ; ++ } ++ if (vi.channels != 1) { ++ printf ("\n\nError : File '%s' has %d channels, but should be mono.\n\n", filename, vi.channels); ++ exit (1) ; ++ } ++ ++ vorbis_synthesis_init (&vd,&vi); ++ vorbis_block_init (&vd,&vb); ++ ++ while(!eos) { ++ while (!eos) { ++ int result = ogg_sync_pageout (&oy,&og); ++ if (result == 0) ++ break; ++ if (result < 0) { ++ fprintf (stderr,"Corrupt or missing data in bitstream; " ++ "continuing...\n"); ++ } else { ++ ogg_stream_pagein (&os,&og); ++ while (1) { ++ result = ogg_stream_packetout (&os,&op); ++ ++ if (result == 0) ++ break; ++ if (result < 0) { ++ /* no reason to complain; already complained above */ ++ } else { ++ float **pcm; ++ int samples; ++ ++ if (vorbis_synthesis (&vb,&op) == 0) ++ vorbis_synthesis_blockin(&vd,&vb); ++ while ((samples = vorbis_synthesis_pcmout (&vd,&pcm)) > 0 && read_total < count) { ++ int bout = samples < count ? samples : count; ++ bout = read_total + bout > count ? count - read_total : bout; ++ ++ memcpy (data + read_total, pcm[0], bout * sizeof (float)) ; ++ ++ vorbis_synthesis_read (&vd,bout); ++ read_total += bout ; ++ } ++ } ++ } ++ ++ if (ogg_page_eos (&og)) eos = 1; ++ } ++ } ++ ++ if (!eos) { ++ buffer = ogg_sync_buffer (&oy,4096); ++ bytes = fread (buffer,1,4096,file); ++ ogg_sync_wrote (&oy,bytes); ++ if (bytes == 0) eos = 1; ++ } ++ } ++ ++ ogg_stream_clear (&os); ++ ++ vorbis_block_clear (&vb); ++ vorbis_dsp_clear (&vd); ++ vorbis_comment_clear (&vc); ++ vorbis_info_clear (&vi); ++ ++ } ++done_decode: ++ ++ /* OK, clean up the framer */ ++ ogg_sync_clear (&oy); ++ ++ fclose (file) ; ++} ++ +diff -ruN libvorbis-1.2.0/test/write_read.h aotuv-b5.7_20090301/test/write_read.h +--- libvorbis-1.2.0/test/write_read.h 1970-01-01 01:00:00.000000000 +0100 ++++ aotuv-b5.7_20090301/test/write_read.h 2009-03-02 21:24:44.000000000 +0100 +@@ -0,0 +1,28 @@ ++/******************************************************************** ++ * * ++ * 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. * ++ * * ++ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007 * ++ * by the Xiph.Org Foundation http://www.xiph.org/ * ++ * * ++ ******************************************************************** ++ ++ function: utility functions for vorbis codec test suite. ++ last mod: $Id: util.c 13293 2007-07-24 00:09:47Z erikd $ ++ ++ ********************************************************************/ ++ ++/* Write supplied data to an Ogg/Vorbis file with specified filename at ++ * specified sample rate. Assumes a single channel of audio. */ ++void write_vorbis_data_or_die (const char *filename, int srate, ++ const float * data, int count) ; ++ ++/* Read given Ogg/Vorbis file into data specified data array. This ++ * function is basically the inverse of the one above. Again, assumes ++ * a single channel of audio. */ ++void read_vorbis_data_or_die (const char *filename, int srate, ++ float * data, int count) ; ++ +diff -ruN libvorbis-1.2.0/vq/bookutil.c aotuv-b5.7_20090301/vq/bookutil.c +--- libvorbis-1.2.0/vq/bookutil.c 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/vq/bookutil.c 2009-03-02 21:24:46.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: utility functions for loading .vqh and .vqd files +- last mod: $Id: bookutil.c 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: bookutil.c 15531 2008-11-24 23:50:06Z xiphmont $ + + ********************************************************************/ + +@@ -191,7 +191,7 @@ + } + + /* find the codebook struct */ +- find_seek_to(in,"static static_codebook "); ++ find_seek_to(in,"static const static_codebook "); + + /* get the major important values */ + line=get_line(in); +@@ -210,7 +210,7 @@ + } + + /* find the auxiliary encode struct[s] (if any) */ +- if(find_seek_to(in,"static encode_aux_nearestmatch _vq_aux")){ ++ if(find_seek_to(in,"static const encode_aux_nearestmatch _vq_aux")){ + /* how big? */ + c->nearest_tree=a=_ogg_calloc(1,sizeof(encode_aux_nearestmatch)); + line=get_line(in); +@@ -224,7 +224,7 @@ + } + + /* load ptr0 */ +- find_seek_to(in,"static long _vq_ptr0"); ++ find_seek_to(in,"static const long _vq_ptr0"); + reset_next_value(); + a->ptr0=_ogg_malloc(sizeof(long)*a->aux); + for(i=0;iaux;i++) +@@ -234,7 +234,7 @@ + } + + /* load ptr1 */ +- find_seek_to(in,"static long _vq_ptr1"); ++ find_seek_to(in,"static const long _vq_ptr1"); + reset_next_value(); + a->ptr1=_ogg_malloc(sizeof(long)*a->aux); + for(i=0;iaux;i++) +@@ -245,7 +245,7 @@ + + + /* load p */ +- find_seek_to(in,"static long _vq_p_"); ++ find_seek_to(in,"static const long _vq_p_"); + reset_next_value(); + a->p=_ogg_malloc(sizeof(long)*a->aux); + for(i=0;iaux;i++) +@@ -255,7 +255,7 @@ + } + + /* load q */ +- find_seek_to(in,"static long _vq_q_"); ++ find_seek_to(in,"static const long _vq_q_"); + reset_next_value(); + a->q=_ogg_malloc(sizeof(long)*a->aux); + for(i=0;iaux;i++) +@@ -265,7 +265,7 @@ + } + } + +- if(find_seek_to(in,"static encode_aux_threshmatch _vq_aux")){ ++ if(find_seek_to(in,"static const encode_aux_threshmatch _vq_aux")){ + /* how big? */ + c->thresh_tree=t=_ogg_calloc(1,sizeof(encode_aux_threshmatch)); + line=get_line(in); +@@ -281,7 +281,7 @@ + exit(1); + } + /* load quantthresh */ +- find_seek_to(in,"static float _vq_quantthresh_"); ++ find_seek_to(in,"static const float _vq_quantthresh_"); + reset_next_value(); + t->quantthresh=_ogg_malloc(sizeof(float)*t->threshvals); + for(i=0;ithreshvals-1;i++) +@@ -290,7 +290,7 @@ + exit(1); + } + /* load quantmap */ +- find_seek_to(in,"static long _vq_quantmap_"); ++ find_seek_to(in,"static const long _vq_quantmap_"); + reset_next_value(); + t->quantmap=_ogg_malloc(sizeof(long)*t->threshvals); + for(i=0;ithreshvals;i++) +@@ -300,7 +300,7 @@ + } + } + +- if(find_seek_to(in,"static encode_aux_pigeonhole _vq_aux")){ ++ if(find_seek_to(in,"static const encode_aux_pigeonhole _vq_aux")){ + int pigeons=1,i; + /* how big? */ + c->pigeon_tree=p=_ogg_calloc(1,sizeof(encode_aux_pigeonhole)); +@@ -317,7 +317,7 @@ + exit(1); + } + /* load pigeonmap */ +- find_seek_to(in,"static long _vq_pigeonmap_"); ++ find_seek_to(in,"static const long _vq_pigeonmap_"); + reset_next_value(); + p->pigeonmap=_ogg_malloc(sizeof(long)*p->mapentries); + for(i=0;imapentries;i++) +@@ -326,7 +326,7 @@ + exit(1); + } + /* load fitlist */ +- find_seek_to(in,"static long _vq_fitlist_"); ++ find_seek_to(in,"static const long _vq_fitlist_"); + reset_next_value(); + p->fitlist=_ogg_malloc(sizeof(long)*p->fittotal); + for(i=0;ifittotal;i++) +@@ -335,7 +335,7 @@ + exit(1); + } + /* load fitmap */ +- find_seek_to(in,"static long _vq_fitmap_"); ++ find_seek_to(in,"static const long _vq_fitmap_"); + reset_next_value(); + for(i=0;idim;i++)pigeons*=p->quantvals; + p->fitmap=_ogg_malloc(sizeof(long)*pigeons); +@@ -346,7 +346,7 @@ + } + + /* load fitlength */ +- find_seek_to(in,"static long _vq_fitlength_"); ++ find_seek_to(in,"static const long _vq_fitlength_"); + reset_next_value(); + p->fitlength=_ogg_malloc(sizeof(long)*pigeons); + for(i=0;iquantlist=_ogg_malloc(sizeof(long)*quant_to_read); + for(i=0;iquantlist){ + long vals=(c->maptype==1?_book_maptype1_quantvals(c):c->entries*c->dim); +- fprintf(out,"static long _vq_quantlist_%s[] = {\n",name); ++ fprintf(out,"static const long _vq_quantlist_%s[] = {\n",name); + for(j=0;jquantlist[j]); + } +@@ -547,7 +547,7 @@ + } + + /* lengthlist */ +- fprintf(out,"static long _vq_lengthlist_%s[] = {\n",name); ++ fprintf(out,"static const long _vq_lengthlist_%s[] = {\n",name); + for(j=0;jentries;){ + fprintf(out,"\t"); + for(k=0;k<16 && jentries;k++,j++) +@@ -558,7 +558,7 @@ + + if(t){ + /* quantthresh */ +- fprintf(out,"static float _vq_quantthresh_%s[] = {\n",name); ++ fprintf(out,"static const float _vq_quantthresh_%s[] = {\n",name); + for(j=0;jthreshvals-1;){ + fprintf(out,"\t"); + for(k=0;k<8 && jthreshvals-1;k++,j++) +@@ -568,7 +568,7 @@ + fprintf(out,"};\n\n"); + + /* quantmap */ +- fprintf(out,"static long _vq_quantmap_%s[] = {\n",name); ++ fprintf(out,"static const long _vq_quantmap_%s[] = {\n",name); + for(j=0;jthreshvals;){ + fprintf(out,"\t"); + for(k=0;k<8 && jthreshvals;k++,j++) +@@ -577,9 +577,9 @@ + } + fprintf(out,"};\n\n"); + +- fprintf(out,"static encode_aux_threshmatch _vq_auxt_%s = {\n",name); +- fprintf(out,"\t_vq_quantthresh_%s,\n",name); +- fprintf(out,"\t_vq_quantmap_%s,\n",name); ++ fprintf(out,"static const encode_aux_threshmatch _vq_auxt_%s = {\n",name); ++ fprintf(out,"\t(float *)_vq_quantthresh_%s,\n",name); ++ fprintf(out,"\t(long *)_vq_quantmap_%s,\n",name); + fprintf(out,"\t%d,\n",t->quantvals); + fprintf(out,"\t%d\n};\n\n",t->threshvals); + } +@@ -589,7 +589,7 @@ + for(i=0;idim;i++)pigeons*=p->quantvals; + + /* pigeonmap */ +- fprintf(out,"static long _vq_pigeonmap_%s[] = {\n",name); ++ fprintf(out,"static const long _vq_pigeonmap_%s[] = {\n",name); + for(j=0;jmapentries;){ + fprintf(out,"\t"); + for(k=0;k<8 && jmapentries;k++,j++) +@@ -598,7 +598,7 @@ + } + fprintf(out,"};\n\n"); + /* fitlist */ +- fprintf(out,"static long _vq_fitlist_%s[] = {\n",name); ++ fprintf(out,"static const long _vq_fitlist_%s[] = {\n",name); + for(j=0;jfittotal;){ + fprintf(out,"\t"); + for(k=0;k<8 && jfittotal;k++,j++) +@@ -607,7 +607,7 @@ + } + fprintf(out,"};\n\n"); + /* fitmap */ +- fprintf(out,"static long _vq_fitmap_%s[] = {\n",name); ++ fprintf(out,"static const long _vq_fitmap_%s[] = {\n",name); + for(j=0;jmin,p->del,p->mapentries,p->quantvals); + + fprintf(out,"\t_vq_pigeonmap_%s,\n",name); + + fprintf(out,"\t%ld,\n",p->fittotal); +- fprintf(out,"\t_vq_fitlist_%s,\n",name); +- fprintf(out,"\t_vq_fitmap_%s,\n",name); +- fprintf(out,"\t_vq_fitlength_%s\n};\n\n",name); ++ fprintf(out,"\t(long *)_vq_fitlist_%s,\n",name); ++ fprintf(out,"\t(long *)_vq_fitmap_%s,\n",name); ++ fprintf(out,"\t(long *)_vq_fitlength_%s\n};\n\n",name); + } + + if(n){ + + /* ptr0 */ +- fprintf(out,"static long _vq_ptr0_%s[] = {\n",name); ++ fprintf(out,"static const long _vq_ptr0_%s[] = {\n",name); + for(j=0;jaux;){ + fprintf(out,"\t"); + for(k=0;k<8 && jaux;k++,j++) +@@ -650,7 +650,7 @@ + fprintf(out,"};\n\n"); + + /* ptr1 */ +- fprintf(out,"static long _vq_ptr1_%s[] = {\n",name); ++ fprintf(out,"static const long _vq_ptr1_%s[] = {\n",name); + for(j=0;jaux;){ + fprintf(out,"\t"); + for(k=0;k<8 && jaux;k++,j++) +@@ -660,7 +660,7 @@ + fprintf(out,"};\n\n"); + + /* p */ +- fprintf(out,"static long _vq_p_%s[] = {\n",name); ++ fprintf(out,"static const long _vq_p_%s[] = {\n",name); + for(j=0;jaux;){ + fprintf(out,"\t"); + for(k=0;k<8 && jaux;k++,j++) +@@ -670,7 +670,7 @@ + fprintf(out,"};\n\n"); + + /* q */ +- fprintf(out,"static long _vq_q_%s[] = {\n",name); ++ fprintf(out,"static const long _vq_q_%s[] = {\n",name); + for(j=0;jaux;){ + fprintf(out,"\t"); + for(k=0;k<8 && jaux;k++,j++) +@@ -679,37 +679,37 @@ + } + fprintf(out,"};\n\n"); + +- fprintf(out,"static encode_aux_nearestmatch _vq_auxn_%s = {\n",name); +- fprintf(out,"\t_vq_ptr0_%s,\n",name); +- fprintf(out,"\t_vq_ptr1_%s,\n",name); +- fprintf(out,"\t_vq_p_%s,\n",name); +- fprintf(out,"\t_vq_q_%s,\n",name); ++ fprintf(out,"static const encode_aux_nearestmatch _vq_auxn_%s = {\n",name); ++ fprintf(out,"\t(long *)_vq_ptr0_%s,\n",name); ++ fprintf(out,"\t(long *)_vq_ptr1_%s,\n",name); ++ fprintf(out,"\t(long *)_vq_p_%s,\n",name); ++ fprintf(out,"\t(long *)_vq_q_%s,\n",name); + fprintf(out,"\t%ld, %ld\n};\n\n",n->aux,n->aux); + } + + /* tie it all together */ + +- fprintf(out,"static static_codebook %s = {\n",name); ++ fprintf(out,"static const static_codebook %s = {\n",name); + + fprintf(out,"\t%ld, %ld,\n",c->dim,c->entries); +- fprintf(out,"\t_vq_lengthlist_%s,\n",name); ++ fprintf(out,"\t(long *)_vq_lengthlist_%s,\n",name); + fprintf(out,"\t%d, %ld, %ld, %d, %d,\n", + c->maptype,c->q_min,c->q_delta,c->q_quant,c->q_sequencep); + if(c->quantlist) +- fprintf(out,"\t_vq_quantlist_%s,\n",name); ++ fprintf(out,"\t(long *)_vq_quantlist_%s,\n",name); + else + fprintf(out,"\tNULL,\n"); + + if(n) +- fprintf(out,"\t&_vq_auxn_%s,\n",name); ++ fprintf(out,"\t(encode_aux_nearestmatch *)&_vq_auxn_%s,\n",name); + else + fprintf(out,"\tNULL,\n"); + if(t) +- fprintf(out,"\t&_vq_auxt_%s,\n",name); ++ fprintf(out,"\t(encode_aux_threshmatch *)&_vq_auxt_%s,\n",name); + else + fprintf(out,"\tNULL,\n"); + if(p) +- fprintf(out,"\t&_vq_auxp_%s,\n",name); ++ fprintf(out,"\t(encode_aux_pigeonhole *)&_vq_auxp_%s,\n",name); + else + fprintf(out,"\tNULL,\n"); + +diff -ruN libvorbis-1.2.0/vq/huffbuild.c aotuv-b5.7_20090301/vq/huffbuild.c +--- libvorbis-1.2.0/vq/huffbuild.c 2007-07-24 02:09:47.000000000 +0200 ++++ aotuv-b5.7_20090301/vq/huffbuild.c 2009-03-02 21:24:46.000000000 +0100 +@@ -11,7 +11,7 @@ + ******************************************************************** + + function: hufftree builder +- last mod: $Id: huffbuild.c 13293 2007-07-24 00:09:47Z xiphmont $ ++ last mod: $Id: huffbuild.c 15531 2008-11-24 23:50:06Z xiphmont $ + + ********************************************************************/ + +@@ -162,7 +162,7 @@ + + /* first, the static vectors, then the book structure to tie it together. */ + /* lengthlist */ +- fprintf(file,"static long _huff_lengthlist_%s[] = {\n",base); ++ fprintf(file,"static const long _huff_lengthlist_%s[] = {\n",base); + for(j=0;j -+ -+Copyright (c) 2002-2005 Xiph.Org Foundation -+Copyright (c) 2003-2006 Aoyumi -+ -+ -+AUTHOR : aoyumi ---- aoTuV_technical.txt -+++ aoTuV_technical.txt -@@ -0,0 +1,144 @@ -+aoTuV beta5 technical information -+ -+ -+The differences from the aoTuV beta 4.51... -+ -+ 1. In order to work noise normalization correctly, the value of tone -+ masking is compressed under certain conditions. A floor curve approaches -+ the original audio spectrum line as a result. [New M4] -+ -+ 2. In order to cut down the bitrate, a part of M2 code of beta4 was -+ deleted. -+ -+@3. The ATH curve was changed slightly. -+ -+ 4. Pre-echo decreased slightly. This is based on change of M3 code. -+ -+ 5. In order to decrease artifact by collapse of audio energy, noise -+ normalization processing of point stereo was extended. [32/44.1/48kHz only] -+ -+ 6. The threshold of channel coupling (lossless <=> point) is changed dynamically. This is a method based on a certain idea. [M6] -+ -+...and I tune up many parameters. -+ -+ -+2006/10/24 -+Aoyumi -+ -+---------------------------------------------------------------------------- -+ -+aoTuV beta4.51 technical information -+ -+ -+The differences from the aoTuV beta 4.5... -+ -+ 1. The changed part of "scale.h" of Xiph.Org SVN was reflected in aoTuV. -+ This will solve the problem of the compile by gcc4. -+ -+ 2. A part of portion added by beta4.5 had caused memory access violation. -+ Depending on environment, a problem arises in qualiy-1/-2. This problem was -+ corrected. -+ -+ -+2005/11/17 -+Aoyumi -+ -+---------------------------------------------------------------------------- -+ -+aoTuV beta4.5 technical information -+ -+ -+The differences from the aoTuV beta 4... -+ -+ 1. M4 code of beta3 was deleted. M5 is added as what is replaced with it. -+ The advantage of this method is that the result stabilized more is obtained. -+ Instead, the change width of the bit rate becomes large rather than before. -+ [32/44.1/48kHz only] -+ -+ 2. New M4 was added. There is this for the same purpose as M1. However, -+ it is tuned up only in the low bit rate region according to work and -+ individual parameters. [32/44.1/48kHz only] -+ -+ 3. M2 code was extended. This decreases a specific noise problem. -+ [32/44.1/48kHz only] -+ -+...and I mainly tune up tone/noise masking and noise normalization parameters. -+ -+The above change is applied below quality3. -+ -+ -+2005/11/05 -+Aoyumi -+ -+---------------------------------------------------------------------------- -+ -+aoTuV beta4 technical information -+ -+ -+The differences from the aoTuV beta 3... -+ -+ 1. Adoption of new hypot (point stereo). This works in general better than -+ dipole/round hypot. And when residue is likely to decrease greatly at the -+ time of a reverse phase, added code is made to increase the ratio of lossless. -+ -+ 2. Change of ATH curve. This is not a big change. -+ -+ 3. Residue used for threshold calculation of channel coupling is changed. -+ This one seems to be good selection. -+ -+ 4. HF reduction code of beta3 was deleted. Now, this is not required. -+ -+ 5. The energy deficit of M4 code of beta3 -- correction of a bug Now. -+ -+ 6. The code for pulling downward floor of the frequency range which can -+ be easy to be heard was added (New M2). This works by the low bit rate and -+ has a comparatively good trade-off. -+ -+ 7. Change of threshold calculation of noise normalization. Moreover, it -+ takes phase information into consideration. -+ -+ -+...and I mainly tune up tone/noise masking and noise compander parameters. -+ -+ -+2005/06/18 -+Aoyumi -+ -+---------------------------------------------------------------------------- -+ -+aoTuV beta3 technical information -+ -+ -+The differences from the aoTuV beta 2 and Vorbis 1.1... -+ -+ 1. Dynamic impulse block noise control(q0-10). [32/44.1/48kHz only] -+ Conspicuous pre-echo is reduced. -+ -+ 2. New ATH curve. -+ -+ 3. In order to cancel that a small sound becomes unstable, the noise level -+ of low frequency is lowered under specific conditions. (Only below q3) -+ There is a greatest effect on a piano etc. [32/44.1/48kHz only] -+ -+ 4. The rate of lossless stereo is increased in specific conditions. This -+ improves many of conspicuous problems which a point stereo causes. (e.g -+ drumus's hiss/voice, guitar and brass's distortion) [32/44.1/48kHz only] -+ -+ 5. The action of the noise normalization of point stereo is corrected. It -+ was set to one of the causes of distortion in a long tone (e.g -+ strings/oboe/high tone voice). -+ -+ 6. The HF reduction code was not working normally. This is corrected and -+ it retuned up according to the present condition. [32/44.1/48kHz only] -+ -+ 7. The q-2 mode was added in all sampling frequencies. And nominal bitrate -+ of q-1 are changed into a more nearly average value. Although nominal -+ bitrate is more large at a low sampling frequency, average bitrate hardly -+ differs from the former version. -+ -+ -+...and I mainly tune up tone/noise masking parameters. -+ -+ -+2004/11/21 -+Aoyumi ---- lib/block.c -+++ lib/block.c -@@ -106,7 +106,7 @@ - oggpack_writeinit(vbi->packetblob[i]); - } - } -- -+ - return(0); - } - -@@ -287,6 +287,11 @@ - b=v->backend_state; - b->psy_g_look=_vp_global_look(vi); - -+ /* added by aoyumi */ -+ b->nblock = _ogg_calloc((128*vi->channels), sizeof(*b->nblock)); -+ b->tblock = _ogg_calloc((128*vi->channels), sizeof(*b->tblock)); -+ b->lownoise_compand_level = _ogg_calloc(vi->channels, sizeof(*b->lownoise_compand_level)); -+ - /* Initialize the envelope state storage */ - b->ve=_ogg_calloc(1,sizeof(*b->ve)); - _ve_envelope_init(b->ve,vi); -@@ -351,6 +356,11 @@ - - drft_clear(&b->fft_look[0]); - drft_clear(&b->fft_look[1]); -+ -+ /* added by aoyumi */ -+ if(b->nblock) _ogg_free(b->nblock); -+ if(b->tblock) _ogg_free(b->tblock); -+ if(b->lownoise_compand_level) _ogg_free(b->lownoise_compand_level); - - } - ---- lib/codec_internal.h -+++ lib/codec_internal.h -@@ -82,6 +82,15 @@ - bitrate_manager_state bms; - - ogg_int64_t sample_count; -+ -+ /* encode only -+ added by aoyumi */ -+ float *lownoise_compand_level; -+ float *nblock; /* lW logmdct buffer */ -+ float *tblock; /* temporal masking buffer (impulse block) */ -+ int lW_blocktype; /* last window block type */ -+ int lW_modenumber; /* last window mode number (0=short, 1=long) */ -+ int lW_no; /* the number of continuous window blocks (last window) */ - } private_state; - - /* codec_setup_info contains all the setup information specific to the ---- lib/info.c -+++ lib/info.c -@@ -451,7 +451,7 @@ - } - - static int _vorbis_pack_comment(oggpack_buffer *opb,vorbis_comment *vc){ -- char temp[]="Xiph.Org libVorbis I 20070622"; -+ char temp[]="AO; aoTuV b5 [20061024] (based on Xiph.Org's I 20070622)"; - int bytes = strlen(temp); - - /* preamble */ ---- lib/mapping0.c -+++ lib/mapping0.c -@@ -246,11 +246,14 @@ - codec_setup_info *ci=vi->codec_setup; - private_state *b=vb->vd->backend_state; - vorbis_block_internal *vbi=(vorbis_block_internal *)vb->internal; -+ vorbis_info_floor1 *vif=ci->floor_param[vb->W]; - int n=vb->pcmend; - int i,j,k; - - int *nonzero = alloca(sizeof(*nonzero)*vi->channels); - float **gmdct = _vorbis_block_alloc(vb,vi->channels*sizeof(*gmdct)); -+ float **gmdct_org = _vorbis_block_alloc(vb,vi->channels*sizeof(*gmdct_org)); -+ float **res_org = _vorbis_block_alloc(vb,vi->channels*sizeof(*res_org)); - int **ilogmaskch= _vorbis_block_alloc(vb,vi->channels*sizeof(*ilogmaskch)); - int ***floor_posts = _vorbis_block_alloc(vb,vi->channels*sizeof(*floor_posts)); - -@@ -273,6 +276,8 @@ - float *logfft =pcm; - - gmdct[i]=_vorbis_block_alloc(vb,n/2*sizeof(**gmdct)); -+ gmdct_org[i]=_vorbis_block_alloc(vb,n/2*sizeof(**gmdct_org)); -+ res_org[i]=_vorbis_block_alloc(vb,n/2*sizeof(**res_org)); - - scale_dB=todB(&scale) + .345; /* + .345 is a hack; the original - todB estimation used on IEEE 754 -@@ -311,6 +316,7 @@ - /* transform the PCM data */ - /* only MDCT right now.... */ - mdct_forward(b->transform[vb->W][0],pcm,gmdct[i]); -+ memcpy(gmdct_org[i], gmdct[i], n/2*sizeof(**gmdct_org)); - - /* FFT yields more accurate tonal estimation (not phase sensitive) */ - drft_forward(&b->fft_look[vb->W],pcm); -@@ -380,6 +386,11 @@ - - float *logmdct =logfft+n/2; - float *logmask =logfft; -+ -+ float *lastmdct = b->nblock+i*128; -+ float *tempmdct = b->tblock+i*128; -+ -+ float *lowcomp = b->lownoise_compand_level+i; - - vb->mode=modenumber; - -@@ -419,7 +430,15 @@ - us a tonality estimate (the larger the value in the - 'noise_depth' vector, the more tonal that area is) */ - -+ *lowcomp= -+ lb_loudnoise_fix(psy_look, -+ *lowcomp, -+ logmdct, -+ b->lW_modenumber, -+ blocktype, modenumber); -+ - _vp_noisemask(psy_look, -+ *lowcomp, - logmdct, - noise); /* noise does not have by-frequency offset - bias applied yet */ -@@ -467,7 +486,13 @@ - 1, - logmask, - mdct, -- logmdct); -+ logmdct, -+ lastmdct, tempmdct, -+ *lowcomp, -+ vif->n, -+ blocktype, modenumber, -+ vb->nW, -+ b->lW_blocktype, b->lW_modenumber, b->lW_no); - - #if 0 - if(vi->channels==2){ -@@ -510,7 +535,13 @@ - 2, - logmask, - mdct, -- logmdct); -+ logmdct, -+ lastmdct, tempmdct, -+ *lowcomp, -+ vif->n, -+ blocktype, modenumber, -+ vb->nW, -+ b->lW_blocktype, b->lW_modenumber, b->lW_no); - - #if 0 - if(vi->channels==2){ -@@ -533,7 +564,13 @@ - 0, - logmask, - mdct, -- logmdct); -+ logmdct, -+ lastmdct, tempmdct, -+ *lowcomp, -+ vif->n, -+ blocktype, modenumber, -+ vb->nW, -+ b->lW_blocktype, b->lW_modenumber, b->lW_no); - - #if 0 - if(vi->channels==2) -@@ -600,11 +637,6 @@ - psy_look, - info, - mag_memo); -- -- hf_reduction(&ci->psy_g_param, -- psy_look, -- info, -- mag_memo); - } - - memset(sortindex,0,sizeof(*sortindex)*vi->channels); -@@ -636,7 +668,9 @@ - for(i=0;ichannels;i++){ - int submap=info->chmuxlist[i]; - float *mdct =gmdct[i]; -+ float *mdct_org=gmdct_org[i]; - float *res =vb->pcm[i]; -+ float *resorgch=res_org[i]; - int *ilogmask=ilogmaskch[i]= - _vorbis_block_alloc(vb,n/2*sizeof(**gmdct)); - -@@ -659,6 +693,14 @@ - res, - ci->psy_g_param.sliding_lowpass[vb->W][k]); - -+ /* stereo threshold */ -+ _vp_remove_floor(psy_look, -+ mdct_org, -+ ilogmask, -+ resorgch, -+ ci->psy_g_param.sliding_lowpass[vb->W][k]); -+ -+ - _vp_noise_normalize(psy_look,res,res+n/2,sortindex[i]); - - -@@ -691,7 +733,8 @@ - mag_sort, - ilogmaskch, - nonzero, -- ci->psy_g_param.sliding_lowpass[vb->W][k]); -+ ci->psy_g_param.sliding_lowpass[vb->W][k], -+ gmdct, res_org); - } - - /* classify and encode by submap */ -@@ -717,6 +760,11 @@ - couple_bundle,NULL,zerobundle,ch_in_bundle,classifications); - } - -+ /* set last-window type & number */ -+ if((blocktype == b->lW_blocktype) && (modenumber == b->lW_modenumber)) b->lW_no++; -+ else b->lW_no = 1; -+ b->lW_blocktype = blocktype; -+ b->lW_modenumber = modenumber; - /* ok, done encoding. Next protopacket. */ - } - ---- lib/masking.h -+++ lib/masking.h -@@ -23,16 +23,29 @@ - - #define MAX_ATH 88 - static 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, -- /*125*/ -75, -76, -77, -78, -80, -81, -82, -83, -- /*250*/ -84, -85, -86, -87, -88, -88, -89, -89, -- /*500*/ -90, -91, -91, -92, -93, -94, -95, -96, -- /*1k*/ -96, -97, -98, -98, -99, -99,-100,-100, -- /*2k*/ -101,-102,-103,-104,-106,-107,-107,-107, -- /*4k*/ -107,-105,-103,-102,-101, -99, -98, -96, -- /*8k*/ -95, -95, -96, -97, -96, -95, -93, -90, -+/* original 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, -+ /*125*/ // -75, -76, -77, -78, -80, -81, -82, -83, -+ /*250*/ //-84, -85, -86, -87, -88, -88, -89, -89, -+ /*500*/ //-90, -91, -91, -92, -93, -94, -95, -96, -+ /*1k*/ //-96, -97, -98, -98, -99, -99,-100,-100, -+ /*2k*/ //-101,-102,-103,-104,-106,-107,-107,-107, -+ /*4k*/ //-107,-105,-103,-102,-101, -99, -98, -96, -+ /*8k*/ //-95, -95, -96, -97, -96, -95, -93, -90, -+ /*16k*/ //-80, -70, -50, -40, -30, -30, -30, -30 -+/*Aoyumi's ATH (v6) */ -+ /*15*/ -31, -33, -35, -37, -39, -41, -43, -45, -+ /*31*/ -47, -49, -51, -53, -55, -57, -59, -61, -+ /*63*/ -63, -65, -67, -69, -71, -73, -75, -77, -+ /*125*/ -79, -81, -83, -84, -85, -86, -87, -88, -+ /*250*/ -89, -90, -91, -92, -93, -94, -95, -96, -+ /*500*/ -96, -97, -97, -97, -98, -98, -98, -99, -+ /*1k*/ -98, -97, -97, -98, -99,-100,-101,-101, -+ /*2k*/ -102,-103,-104,-105,-106,-106,-107,-107, -+ /*4k*/ -105,-104,-103,-102,-101, -99, -98, -97, -+ /*8k*/ -96, -95, -95, -96, -97, -97, -93, -89, - /*16k*/ -80, -70, -50, -40, -30, -30, -30, -30 - }; - ---- lib/modes/psych_11.h -+++ lib/modes/psych_11.h -@@ -15,25 +15,31 @@ - - ********************************************************************/ - --static double _psy_lowpass_11[3]={4.5,5.5,30.,}; -+static double _psy_lowpass_11[4]={4.1,4.5,5.5,30.,}; - --static 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 att3 _psy_tone_masteratt_11[4]={ -+ {{ 31, 28, 13}, 0, 0}, /* -2 */ -+ {{ 30, 28, 12}, 0, 0}, /* -1 */ -+ {{ 30, 26, 12}, 0, 0}, /* 0 */ -+ {{ 20, 0, -14}, 0, 0}, /* 10 */ - }; - --static vp_adjblock _vp_tonemask_adj_11[3]={ -+static vp_adjblock _vp_tonemask_adj_11[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, 2, 0,99,99,99}}, /* 0 */ -- {{-20,-20,-20,-20,-20,-16,-10, 0, 0, 0, 0, 5, 0, 0,99,99,99}}, /* 1 */ -- {{-20,-20,-20,-20,-20,-16,-10, 0, 0, 0, 0, 0, 0, 0,99,99,99}}, /* 2 */ -+ {{-16,-16,-16,-16,-16,-16,-10,-8,-4, 0, 0, 0, 3, 3,99,99,99}}, /* -2 */ -+ {{-16,-16,-16,-16,-16,-16,-10,-8,-4, 0, 0, 0, 0, 0,99,99,99}}, /* -1 */ -+ {{-20,-20,-20,-20,-20,-16,-10,-8,-4,-2, 0, 0, 0, 0,99,99,99}}, /* 0 */ -+ {{-20,-20,-20,-20,-20,-16,-10,-8,-4,-2, 0, 0, 0, 0,99,99,99}}, /* 10 */ - }; - - --static noise3 _psy_noisebias_11[3]={ -+static noise3 _psy_noisebias_11[4]={ - /* 63 125 250 500 1k 2k 4k 8k 16k*/ -+ {{{-10,-10,-10,-10, -5, -5, -4, 2, 4, 10, 10, 12, 12, 12, 99, 99, 99}, -+ {-12,-12,-12,-12, -7, -7, -2, 3, 3, 4, 4, 5, 6, 12, 99, 99, 99}, -+ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, 99, 99, 99}}}, -+ - {{{-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}, - {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, 99, 99, 99}}}, -@@ -47,5 +53,5 @@ - {-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 double _noise_thresh_11[4]={ .3,.3,.5,.5 }; - ---- lib/modes/psych_16.h -+++ lib/modes/psych_16.h -@@ -16,9 +16,13 @@ - ********************************************************************/ - - /* stereo mode by base quality level */ --static adj_stereo _psy_stereo_modes_16[4]={ -+static adj_stereo _psy_stereo_modes_16[5]={ - /* 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, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4}, -+ { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 4, 4}, -+ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, -+ {{ 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}, - { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 4, 4}, - { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, -@@ -36,32 +40,38 @@ - { 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 double _psy_lowpass_16[5]={6.,6.5,8,30.,99.}; - --static 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 att3 _psy_tone_masteratt_16[5]={ -+ {{ 30, 28, 12}, 0, 0}, /* -2 */ -+ {{ 30, 28, 12}, 0, 0}, /* -1 */ -+ {{ 25, 23, 12}, 0, 0}, /* 0.5 */ -+ {{ 20, 12, 0}, 0, 0}, /* 5 */ -+ {{ 15, 0, -14}, 0, 0}, /* 10 */ - }; - --static vp_adjblock _vp_tonemask_adj_16[4]={ -+static vp_adjblock _vp_tonemask_adj_16[5]={ - /* 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 */ -- {{-20,-20,-20,-20,-20,-16,-10, 0, 0, 0, 0,10, 0, 0, 0, 0, 0}}, /* 1 */ -- {{-20,-20,-20,-20,-20,-16,-10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, /* 2 */ -- {{-30,-30,-30,-30,-30,-26,-20,-10, -5, 0, 0, 0, 0, 0, 0, 0, 0}}, /* 2 */ -+ {{-16,-16,-16,-16,-16,-16,-10, -8, -6,-2, 0, 0, 0, 0, 0, 0, 0}}, /* -2 */ -+ {{-16,-16,-16,-16,-16,-16,-10, -8, -6,-2, 0, 0, 0, 0, 0, 0, 0}}, /* -1 */ -+ {{-16,-16,-16,-16,-16,-16,-10, -8, -6,-4, 0, 0, 0, 0, 0, 0, 0}}, /* 0.5 */ -+ {{-20,-20,-20,-20,-20,-16,-10,-10, -8,-6,-2,-2, 0, 0, 0, 0, 0}}, /* 5 */ -+ {{-30,-30,-30,-30,-30,-26,-20,-10, -8,-6,-2,-2, 0, 0, 0, 0, 0}}, /* 10 */ - }; - - --static noise3 _psy_noisebias_16_short[4]={ -+static noise3 _psy_noisebias_16_short[5]={ - /* 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, 4, 10, 10, 10, 10, 12, 12, 14, 20}, -+ {-12,-12,-12,-12,-12, -7, -7, -2, 3, 3, 4, 5, 6, 7, 8, 8, 15}, -+ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -6, -6}}}, -+ -+ {{{-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}, - {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -6, -6}}}, - -- {{{-15,-15,-15,-15,-15,-10,-10,-5, 4, 6, 6, 6, 6, 8, 10, 12, 20}, -+ {{{-15,-15,-15,-15,-15,-10,-10, -5, 4, 6, 6, 6, 6, 8, 10, 12, 20}, - {-15,-15,-15,-15,-15,-15,-15,-10, -5, -5, -5, 4, 5, 6, 8, 8, 15}, - {-30,-30,-30,-30,-30,-24,-20,-14,-10,-10,-10,-10,-10,-10,-10,-10,-10}}}, - -@@ -74,13 +84,17 @@ - {-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 noise3 _psy_noisebias_16_impulse[5]={ - /* 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, 4, 10, 10, 10, 10, 12, 12, 14, 20}, -+ {-12,-12,-12,-12,-12, -7, -7, -2, 3, 3, 4, 5, 6, 7, 8, 8, 15}, -+ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -6, -6}}}, -+ -+ {{{-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}, - {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -6, -6}}}, - -- {{{-15,-15,-15,-15,-15,-10,-10,-5, 4, 4, 4, 4, 5, 5, 6, 8, 15}, -+ {{{-15,-15,-15,-15,-15,-10,-10, -5, 4, 4, 4, 4, 5, 5, 6, 8, 15}, - {-15,-15,-15,-15,-15,-15,-15,-10, -5, -5, -5, 0, 0, 0, 0, 4, 10}, - {-30,-30,-30,-30,-30,-24,-20,-14,-10,-10,-10,-10,-10,-10,-10,-10,-10}}}, - -@@ -93,9 +107,13 @@ - {-30,-30,-30,-30,-26,-26,-26,-26,-26,-26,-26,-26,-26,-24,-20,-20,-20}}}, - }; - --static noise3 _psy_noisebias_16[4]={ -+static noise3 _psy_noisebias_16[5]={ - /* 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, 2, 2, 2, 4, 5, 6, 8, 8, 15}, -+ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -6, -6}}}, -+ -+ {{{-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}, - {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -6, -6}}}, - -@@ -119,17 +137,17 @@ - {20,20,-1}, - }; - --static double _noise_thresh_16[4]={ .3,.5,.5,.5 }; -+static double _noise_thresh_16[5]={ .3,.3,.5,.5,.5 }; - --static int _noise_start_16[3]={ 256,256,9999 }; --static int _noise_part_16[4]={ 8,8,8,8 }; -+static int _noise_start_16[4]={ 256,256,256,9999 }; -+static int _noise_part_16[5]={ 8,8,8,8,8 }; - --static int _psy_ath_floater_16[4]={ -- -100,-100,-100,-105, -+static int _psy_ath_floater_16[5]={ -+ -100,-100,-100,-100,-105, - }; - --static int _psy_ath_abs_16[4]={ -- -130,-130,-130,-140, -+static int _psy_ath_abs_16[5]={ -+ -130,-130,-130,-130,-140, - }; - - ---- lib/modes/psych_44.h -+++ lib/modes/psych_44.h -@@ -18,10 +18,26 @@ - - /* preecho trigger settings *****************************************/ - --static vorbis_info_psy_global _psy_global_44[5]={ -- -+static vorbis_info_psy_global _psy_global_44[6]={ -+/* -+ { lines per eighth octave, -+ { pre-echo thresh.}, -+ { post-echo thresh.}, stretch penalty, pre-echo minimum energy, -+ ampmax att 1/sec, -+ {coupling point(kHz)},{{coupling point limit0},{coupling point limit1}}, -+ {coupling pre-point amp},{coupling post-point amp},{{sliding lowpass0},{sliding lowpass1}} -+ }, -+*/ -+/* q-2 */ -+ {8, /* lines per eighth octave */ -+ {24.f,16.f,16.f,16.f,16.f,16.f,14.f}, -+ {-60.f,-30.f,-40.f,-40.f,-40.f,-40.f,-40.f}, 2,-75.f, -+ -6.f, -+ {99.},{{99.},{99.}},{0},{0},{{0.},{0.}} -+ }, - {8, /* lines per eighth octave */ -- {20.f,14.f,12.f,12.f,12.f,12.f,12.f}, -+// {20.f,14.f,12.f,12.f,12.f,12.f,12.f}, -+ {20.f,14.f,14.f,14.f,14.f,14.f,14.f}, - {-60.f,-30.f,-40.f,-40.f,-40.f,-40.f,-40.f}, 2,-75.f, - -6.f, - {99.},{{99.},{99.}},{0},{0},{{0.},{0.}} -@@ -39,14 +55,17 @@ - {99.},{{99.},{99.}},{0},{0},{{0.},{0.}} - }, - {8, /* lines per eighth octave */ -- {10.f,8.f,8.f,8.f,8.f,8.f,8.f}, -+// {10.f,8.f,8.f,8.f,8.f,8.f,8.f}, -+ {8.f,8.f,8.f,6.f,6.f,6.f,7.f}, - {-20.f,-15.f,-12.f,-12.f,-12.f,-12.f,-12.f}, 0,-80.f, - -6.f, - {99.},{{99.},{99.}},{0},{0},{{0.},{0.}} - }, - {8, /* lines per eighth octave */ -- {10.f,6.f,6.f,6.f,6.f,6.f,6.f}, -- {-15.f,-15.f,-12.f,-12.f,-12.f,-12.f,-12.f}, 0,-85.f, -+// {10.f,6.f,6.f,6.f,6.f,6.f,6.f}, -+ {6.f,6.f,6.f,6.f,6.f,6.f,6.f}, -+// {-15.f,-15.f,-12.f,-12.f,-12.f,-12.f,-12.f}, 0,-85.f, -+ {-15.f,-14.f,-10.f,-10.f,-10.f,-11.f,-12.f}, 0,-85.f, - -6.f, - {99.},{{99.},{99.}},{0},{0},{{0.},{0.}} - }, -@@ -56,26 +75,41 @@ - static compandblock _psy_compand_44[6]={ - /* sub-mode Z short */ - {{ -- 0, 1, 2, 3, 4, 5, 6, 7, /* 7dB */ -- 8, 9,10,11,12,13,14, 15, /* 15dB */ -- 16,17,18,19,20,21,22, 23, /* 23dB */ -- 24,25,26,27,28,29,30, 31, /* 31dB */ -- 32,33,34,35,36,37,38, 39, /* 39dB */ -+// 0, 1, 2, 3, 4, 5, 6, 7, /* 7dB */ -+// 8, 9,10,11,12,13,14, 15, /* 15dB */ -+// 16,17,18,19,20,21,22, 23, /* 23dB */ -+// 24,25,26,27,28,29,30, 31, /* 31dB */ -+// 32,33,34,35,36,37,38, 39, /* 39dB */ -+ 0, 1, 2, 3, 4, 5, 6, 6, /* 7dB */ -+ 7, 7, 7, 8, 9,10, 11, 11, /* 15dB */ -+ 12,12,13,13,14,14,15, 15, /* 23dB */ -+ 16,16,17,17,17,18,18, 19, /* 31dB */ -+ 19,19,20,21,22,23,24, 25, /* 39dB */ - }}, - /* mode_Z nominal short */ - {{ -+// 0, 1, 2, 3, 4, 5, 6, 6, /* 7dB */ -+// 7, 7, 7, 7, 6, 6, 6, 7, /* 15dB */ -+// 7, 8, 9,10,11,12,13, 14, /* 23dB */ -+// 15,16,17,17,17,18,18, 19, /* 31dB */ -+// 19,19,20,21,22,23,24, 25, /* 39dB */ - 0, 1, 2, 3, 4, 5, 6, 6, /* 7dB */ -- 7, 7, 7, 7, 6, 6, 6, 7, /* 15dB */ -+ 7, 7, 7, 7, 7, 7, 7, 7, /* 15dB */ - 7, 8, 9,10,11,12,13, 14, /* 23dB */ - 15,16,17,17,17,18,18, 19, /* 31dB */ - 19,19,20,21,22,23,24, 25, /* 39dB */ - }}, - /* mode A short */ - {{ -+// 0, 1, 2, 3, 4, 5, 5, 5, /* 7dB */ -+// 6, 6, 6, 5, 4, 4, 4, 4, /* 15dB */ -+// 4, 4, 5, 5, 5, 6, 6, 6, /* 23dB */ -+// 7, 7, 7, 8, 8, 8, 9, 10, /* 31dB */ -+// 11,12,13,14,15,16,17, 18, /* 39dB */ - 0, 1, 2, 3, 4, 5, 5, 5, /* 7dB */ -- 6, 6, 6, 5, 4, 4, 4, 4, /* 15dB */ -- 4, 4, 5, 5, 5, 6, 6, 6, /* 23dB */ -- 7, 7, 7, 8, 8, 8, 9, 10, /* 31dB */ -+ 6, 6, 6, 6, 6, 6, 6, 6, /* 15dB */ -+ 6, 6, 6, 6, 6, 7, 7, 7, /* 23dB */ -+ 8, 8, 8, 9, 9, 9,10, 11, /* 31dB */ - 11,12,13,14,15,16,17, 18, /* 39dB */ - }}, - /* sub-mode Z long */ -@@ -96,172 +130,189 @@ - }}, - /* mode A long */ - {{ -+// 0, 1, 2, 3, 4, 5, 6, 7, /* 7dB */ -+// 8, 8, 7, 6, 5, 4, 4, 4, /* 15dB */ -+// 4, 4, 5, 5, 5, 6, 6, 6, /* 23dB */ -+// 7, 7, 7, 8, 8, 8, 9, 10, /* 31dB */ -+// 11,12,13,14,15,16,17, 18, /* 39dB */ - 0, 1, 2, 3, 4, 5, 6, 7, /* 7dB */ -- 8, 8, 7, 6, 5, 4, 4, 4, /* 15dB */ -- 4, 4, 5, 5, 5, 6, 6, 6, /* 23dB */ -- 7, 7, 7, 8, 8, 8, 9, 10, /* 31dB */ -+ 7, 7, 7, 6, 6, 6, 6, 6, /* 15dB */ -+ 6, 6, 6, 6, 6, 7, 7, 7, /* 23dB */ -+ 8, 8, 8, 9, 9, 9,10, 11, /* 31dB */ - 11,12,13,14,15,16,17, 18, /* 39dB */ - }} - }; - - /* tonal masking curve level adjustments *************************/ - --static vp_adjblock _vp_tonemask_adj_longblock[12]={ -- -+static vp_adjblock _vp_tonemask_adj_longblock[13]={ - /* 63 125 250 500 1 2 4 8 16 */ -+// {{ -3, -9,-12,-12,-10,-10,-10,-10,-10,-10,-10, -1, 0, 0, 1, 1, 1}}, /* -2(addition) */ -+ {{-16,-16,-16,-15,-15,-15,-14,-14,-13,-13,-12,-12,-11, -5, 0, 0, 5}}, - -- {{ -3, -8,-13,-15,-10,-10,-10,-10,-10,-10,-10, 0, 0, 0, 0, 0, 0}}, /* -1 */ -- -+// {{ -3, -9,-12,-12,-11,-11,-11,-11,-11,-11,-10, -1, -1, 0, 0, 0, 0}}, /* -1 */ -+ {{-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-13,-13,-12, -7, -2, -2, 3}}, -+ - /* {{-15,-15,-15,-15,-10, -8, -4, -2, 0, 0, 0, 10, 0, 0, 0, 0, 0}}, 0 */ -- {{ -4,-10,-14,-16,-15,-14,-13,-12,-12,-12,-11, -1, -1, -1, -1, -1, 0}}, /* 0 */ -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-13, -8, -3, -3, 1}}, /* 0 */ - - /* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 5, 0, 0, 0, 0, 0}}, 1 */ -- {{ -6,-12,-14,-16,-15,-15,-14,-13,-13,-12,-12, -2, -2, -1, -1, -1, 0}}, /* 1 */ -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-13,-10, -4, -4, 0}}, /* 1 */ - - /* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, 2 */ -- {{-12,-13,-14,-16,-16,-16,-15,-14,-13,-12,-12, -6, -3, -1, -1, -1, 0}}, /* 2 */ -- -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -5, -5, 0}}, /* 2 */ -+ - /* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, 3 */ -- {{-15,-15,-15,-16,-16,-16,-16,-14,-13,-13,-13,-10, -4, -2, -1, -1, 0}}, /* 3 */ -- --/* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, *//* 4 */ -- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-13,-11, -7 -3, -1, -1 , 0}}, /* 4 */ -- -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -8, -7, 0}}, /* 3 */ -+ -+/* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, 4 */ -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9, -9, 0}}, /* 4 */ -+ - /* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, 5 */ -- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-13,-11, -7 -3, -1, -1 , 0}}, /* 5 */ -- -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9, -9, 0}}, /* 5 */ -+ - /* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, 6 */ -- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -8, -4, -2, -2, 0}}, /* 6 */ -- -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9, -9, 0}}, /* 6 */ -+ - /* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, 7 */ -- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 7 */ -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9, -9, 0}}, /* 7 */ - - /* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, 8 */ -- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 8 */ -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9, -9, 0}}, /* 8 */ - - /* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, 9 */ -- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 9 */ -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11,-10,-10, 0}}, /* 9 */ - - /* {{-15,-15,-15,-15,-15,-12,-10, -8, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, 10 */ -- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 10 */ -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11,-10,-10, 0}}, /* 10 */ - }; -- --static vp_adjblock _vp_tonemask_adj_otherblock[12]={ -+static vp_adjblock _vp_tonemask_adj_otherblock[13]={ - /* 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 */ -+// {{ -3, -9,-12,-12,-10,-10,-10,-10,-10,-10,-10, -1, 0, 0, 1, 1, 1}}, /* -2(addition) */ -+ {{-16,-16,-16,-15,-15,-15,-14,-14,-13,-13,-12,-12,-11, -5, 0, 0, 5}}, - -+// {{ -3, -9,-12,-12,-11,-11,-11,-11,-11,-11,-10, -1, -1, 0, 0, 0, 0}}, /* -1 */ -+ {{-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-13,-13,-12, -7, -2, -2, 3}}, -+ - /* {{-20,-20,-20,-20,-14,-12,-10, -8, -4, 0, 0, 10, 0, 0, 0, 0, 0}}, 0 */ -- {{ -4,-10,-14,-16,-14,-13,-12,-12,-11,-11,-10, 0, 0, 0, 0, 0, 0}}, /* 0 */ -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14, -8, -3, -3, 0}}, /* 0 */ - - /* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 5, 0, 0, 0, 0, 0}}, 1 */ -- {{ -6,-12,-14,-16,-15,-15,-14,-13,-13,-12,-12, -2, -2, -1, 0, 0, 0}}, /* 1 */ -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-10, -4, -4, 0}}, /* 1 */ - - /* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 2 */ -- {{-12,-13,-14,-16,-16,-16,-15,-14,-13,-12,-12, -5, -2, -1, 0, 0, 0}}, /* 2 */ -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -6, -5, 0}}, /* 2 */ - - /* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 3 */ -- {{-15,-15,-15,-16,-16,-16,-16,-14,-13,-13,-13,-10, -4, -2, 0, 0, 0}}, /* 3 */ -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9, -7, 0}}, /* 3 */ - - /* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 4 */ -- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-13,-11, -7 -3, -1, -1 , 0}}, /* 4 */ -- -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9, -9, 0}}, /* 4 */ -+ - /* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 5 */ -- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-13,-11, -7 -3, -1, -1 , 0}}, /* 5 */ -- -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9, -9, 0}}, /* 5 */ -+ - /* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 6 */ -- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -8, -4, -2, -2, 0}}, /* 6 */ -- -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9, -9, 0}}, /* 6 */ -+ - /* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 7 */ -- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 7 */ -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9, -9, 0}}, /* 7 */ - - /* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 8 */ -- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 8 */ -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11, -9, -9, 0}}, /* 8 */ - - /* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 9 */ -- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 9 */ -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11,-10,-10, 0}}, /* 9 */ - - /* {{-20,-20,-20,-20,-20,-18,-16,-14,-10, 0, 0, 0, 0, 0, 0, 0, 0}}, 10 */ -- {{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 10 */ -+ {{-16,-16,-16,-16,-16,-16,-16,-16,-15,-15,-14,-14,-14,-11,-10,-10, 0}}, /* 10 */ - }; - - /* noise bias (transition block) */ --static noise3 _psy_noisebias_trans[12]={ -+static noise3 _psy_noisebias_trans[13]={ - /* 63 125 250 500 1k 2k 4k 8k 16k*/ -- /* -1 */ -+ /* -2(addition mode) */ - {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, -+ {-28,-28,-26,-26,-22,-18,-16, -8, -2, 2, 2, 2, 2, 5, 6, 7, 15}, -+ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}}, -+ /* -1 */ -+/*{{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, - {-30,-30,-30,-30,-26,-20,-16, -8, -6, -6, -2, 2, 2, 3, 6, 6, 15}, -+ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},*/ -+ {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, -+ {-30,-30,-28,-28,-24,-20,-18,-10, -4, 0, 0, 0, 0, 2, 3, 4, 14}, - {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}}, -- /* 0 -- {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 4, 4, 5, 5, 5, 8, 10}, -+ /* 0 */ -+/*{{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 4, 4, 5, 5, 5, 8, 10}, - {-30,-30,-30,-30,-26,-22,-20,-14, -8, -4, 0, 0, 0, 0, 2, 4, 10}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -4, -4, -4, -2}}},*/ -- {{{-15,-15,-15,-15,-15,-12, -6, -4, 0, 2, 4, 4, 5, 5, 5, 8, 10}, -- {-30,-30,-30,-30,-26,-22,-20,-14, -8, -4, 0, 0, 0, 0, 2, 3, 6}, -- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -4, -4, -4, -2}}}, -- /* 1 -- {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 4, 4, 5, 5, 5, 8, 10}, -+ {{{-15,-15,-15,-15,-15,-12, -6, -4, 0, 2, 4, 4, 5, 5, 5, 8, 10}, -+ {-30,-30,-30,-30,-26,-22,-20,-14, -6, 0, 0, 0, 0, 1, 2, 3, 8}, -+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -4, -4, -4, -2}}}, -+ /* 1 */ -+/*{{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 4, 4, 5, 5, 5, 8, 10}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2, -2, -2, -2, 0, 2, 8}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -6, -6, -6, -4}}},*/ -- {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 4, 4, 5, 5, 5, 8, 10}, -- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2, -2, -2, -2, 0, 1, 4}, -- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -6, -6, -6, -4}}}, -- /* 2 -- {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10}, -+ {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 4, 4, 5, 5, 5, 8, 10}, -+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2, -2, -2, -2, -1, 1, 4}, -+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -6, -6, -6, -4}}}, -+ /* 2 */ -+/*{{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2, -2, -2, -2, 0, 2, 6}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}}, */ -- {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10}, -- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -2, -1, 0, 3}, -+ {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10}, -+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -2, -2, -1, 1, 3}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -7, -4}}}, -- /* 3 -- {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 4, 5, 8}, -+ /* 3 */ -+/*{{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 4, 5, 8}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -1, 1, 6}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/ - {{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 4, 5, 8}, -- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -2, 0, 2}, -+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -2, 0, 3}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}}, -- /* 4 -- {{{-20,-20,-20,-20,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, -+ /* 4 */ -+/*{{{-20,-20,-20,-20,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -1, 1, 5}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/ - {{{-20,-20,-20,-20,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, -- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -2, -1, 1}, -+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -2, 0, 1}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}}, -- /* 5 -- {{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, -+ /* 5 */ -+/*{{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, - {-32,-32,-32,-32,-28,-24,-22,-16,-12, -6, -4, -4, -4, -4, -2, -1, 2}, - {-34,-34,-34,-34,-30,-24,-24,-18,-14,-12,-12,-12,-12,-10,-10, -9, -5}}}, */ - {{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, - {-32,-32,-32,-32,-28,-24,-22,-16,-12, -6, -4, -4, -4, -4, -3, -1, 0}, - {-34,-34,-34,-34,-30,-24,-24,-18,-14,-12,-12,-12,-12,-10,-10, -9, -5}}}, -- /* 6 -- {{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, -+ /* 6 */ -+/*{{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, - {-32,-32,-32,-32,-28,-24,-24,-18,-14, -8, -6, -6, -6, -6, -4, -2, 1}, - {-34,-34,-34,-34,-30,-26,-24,-18,-17,-15,-15,-15,-15,-13,-13,-12, -8}}},*/ - {{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, -- {-32,-32,-32,-32,-28,-24,-24,-18,-14, -8, -6, -6, -6, -6, -5, -2, 0}, -- {-34,-34,-34,-34,-30,-26,-26,-24,-22,-19,-19,-19,-19,-18,-17,-16,-12}}}, -- /* 7 -- {{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, -+ {-34,-34,-34,-34,-30,-30,-24,-20,-14, -8, -6, -6, -6, -6, -4, -2, 0}, -+ {-34,-34,-34,-34,-30,-26,-24,-18,-17,-15,-15,-15,-15,-13,-13,-12, -8}}}, -+ /* 7 */ -+/*{{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, - {-32,-32,-32,-32,-28,-24,-24,-18,-14,-12,-10, -8, -8, -8, -6, -4, 0}, - {-34,-34,-34,-34,-30,-26,-26,-24,-22,-19,-19,-19,-19,-18,-17,-16,-12}}},*/ - {{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7}, -- {-32,-32,-32,-32,-28,-24,-24,-24,-18,-14,-12,-10,-10,-10, -8, -6, -2}, -- {-34,-34,-34,-34,-30,-26,-26,-26,-24,-24,-24,-24,-24,-24,-24,-20,-16}}}, -- /* 8 -- {{{-24,-24,-24,-24,-22,-20,-15,-10, -8, -2, 0, 0, 0, 1, 2, 3, 7}, -+ {-34,-34,-34,-34,-30,-30,-24,-20,-14,-12,-10, -8, -8, -8, -6, -4, 0}, -+ {-34,-34,-34,-34,-30,-26,-26,-24,-22,-19,-19,-19,-19,-18,-17,-16,-12}}}, -+ /* 8 */ -+/*{{{-24,-24,-24,-24,-22,-20,-15,-10, -8, -2, 0, 0, 0, 1, 2, 3, 7}, - {-36,-36,-36,-36,-30,-30,-30,-24,-18,-14,-12,-10,-10,-10, -8, -6, -2}, - {-36,-36,-36,-36,-34,-30,-28,-26,-24,-24,-24,-24,-24,-24,-24,-20,-16}}},*/ -- {{{-24,-24,-24,-24,-22,-20,-15,-10, -8, -2, 0, 0, 0, 1, 2, 3, 7}, -- {-36,-36,-36,-36,-30,-30,-30,-24,-20,-16,-16,-16,-16,-14,-12,-10, -7}, -- {-36,-36,-36,-36,-34,-30,-28,-26,-24,-30,-30,-30,-30,-30,-30,-24,-20}}}, -- /* 9 -- {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -4, -4, -4, -4, -4, -2, 2}, -+ {{{-24,-24,-24,-24,-22,-20,-15,-10, -8, -2, 0, 0, 0, 1, 2, 3, 7}, -+ {-34,-34,-34,-34,-30,-30,-30,-24,-18,-14,-12,-10,-10,-10, -8, -6, -2}, -+ {-36,-36,-36,-36,-34,-30,-28,-26,-24,-24,-24,-24,-24,-24,-24,-20,-16}}}, -+ /* 9 */ -+/*{{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -4, -4, -4, -4, -4, -2, 2}, - {-36,-36,-36,-36,-34,-32,-32,-28,-20,-16,-16,-16,-16,-14,-12,-10, -7}, - {-40,-40,-40,-40,-40,-40,-40,-32,-30,-30,-30,-30,-30,-30,-30,-24,-20}}},*/ - {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -4, -4, -4, -4, -4, -2, 2}, -- {-38,-38,-38,-38,-36,-34,-34,-30,-24,-20,-20,-20,-20,-18,-16,-12,-10}, -- {-40,-40,-40,-40,-40,-40,-40,-38,-35,-35,-35,-35,-35,-35,-35,-35,-30}}}, -+ {-36,-36,-36,-36,-32,-32,-32,-28,-20,-16,-16,-16,-16,-14,-12,-10, -7}, -+ {-40,-40,-40,-40,-40,-40,-40,-32,-30,-30,-30,-30,-30,-30,-30,-24,-20}}}, - /* 10 */ - {{{-30,-30,-30,-30,-30,-30,-30,-28,-20,-14,-14,-14,-14,-14,-14,-12,-10}, - {-40,-40,-40,-40,-40,-40,-40,-40,-35,-30,-30,-30,-30,-30,-30,-30,-20}, -@@ -269,65 +320,74 @@ - }; - - /* noise bias (long block) */ --static noise3 _psy_noisebias_long[12]={ -- /*63 125 250 500 1k 2k 4k 8k 16k*/ -+static noise3 _psy_noisebias_long[13]={ -+ /* 63 125 250 500 1k 2k 4k 8k 16k*/ -+ /* -2(addition mode) */ -+ {{{-10,-10,-10,-10,-10, -4, 0, 0, 2, 6, 6, 6, 6, 10, 10, 12, 20}, -+ {-20,-20,-20,-20,-20,-18,-12, -6, 0, 2, 2, 2, 2, 5, 6, 7, 15}, -+ {-20,-20,-20,-20,-20,-20,-20,-10, -6, -6, -6, -6, -6, -4, -4, -4, -2}}}, - /* -1 */ -- {{{-10,-10,-10,-10,-10, -4, 0, 0, 0, 6, 6, 6, 6, 10, 10, 12, 20}, -- {-20,-20,-20,-20,-20,-20,-10, -2, 0, 0, 0, 0, 0, 2, 4, 6, 15}, -+/*{{{-10,-10,-10,-10,-10, -4, 0, 0, 0, 6, 6, 6, 6, 10, 10, 12, 20}, -+ {-20,-20,-20,-20,-20,-20,-10, -2, 0, 0, 0, 0, 0, 2, 4, 6, 15}, -+ {-20,-20,-20,-20,-20,-20,-20,-10, -6, -6, -6, -6, -6, -4, -4, -4, -2}}},*/ -+ {{{-10,-10,-10,-10,-10, -4, 0, 0, 0, 6, 6, 6, 6, 10, 10, 12, 20}, -+ {-20,-20,-20,-20,-20,-18,-12, -8, -2, 0, 0, 0, 0, 2, 3, 4, 14}, - {-20,-20,-20,-20,-20,-20,-20,-10, -6, -6, -6, -6, -6, -4, -4, -4, -2}}}, -- - /* 0 */ -- /* {{{-10,-10,-10,-10,-10,-10, -8, 2, 2, 2, 4, 4, 5, 5, 5, 8, 10}, -- {-20,-20,-20,-20,-20,-20,-20,-14, -6, 0, 0, 0, 0, 0, 2, 4, 10}, -- {-20,-20,-20,-20,-20,-20,-20,-14, -8, -6, -6, -6, -6, -4, -4, -4, -2}}},*/ -- {{{-10,-10,-10,-10,-10,-10, -8, 2, 2, 2, 4, 4, 5, 5, 5, 8, 10}, -- {-20,-20,-20,-20,-20,-20,-20,-14, -6, 0, 0, 0, 0, 0, 2, 3, 6}, -+/*{{{-10,-10,-10,-10,-10,-10, -8, 2, 2, 2, 4, 4, 5, 5, 5, 8, 10}, -+ {-20,-20,-20,-20,-20,-20,-20,-14, -6, 0, 0, 0, 0, 0, 2, 4, 10}, -+ {-20,-20,-20,-20,-20,-20,-20,-14, -8, -6, -6, -6, -6, -4, -4, -4, -2}}},*/ -+ {{{-10,-10,-10,-10,-10,-10, -8, 2, 2, 2, 4, 4, 5, 5, 5, 8, 10}, -+ {-20,-20,-20,-20,-20,-20,-20,-14, -6, 0, 0, 0, 0, 1, 2, 3, 7}, - {-20,-20,-20,-20,-20,-20,-20,-14, -8, -6, -6, -6, -6, -4, -4, -4, -2}}}, - /* 1 */ -- /* {{{-10,-10,-10,-10,-10,-10, -8, -4, 0, 2, 4, 4, 5, 5, 5, 8, 10}, -- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -2, -2, -2, -2, 0, 2, 8}, -- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -8, -8, -8, -8, -6, -6, -6, -4}}},*/ -- {{{-10,-10,-10,-10,-10,-10, -8, -4, 0, 2, 4, 4, 5, 5, 5, 8, 10}, -- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -2, -2, -2, -2, 0, 1, 4}, -+/*{{{-10,-10,-10,-10,-10,-10, -8, -4, 0, 2, 4, 4, 5, 5, 5, 8, 10}, -+ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -2, -2, -2, -2, 0, 2, 8}, -+ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -8, -8, -8, -8, -6, -6, -6, -4}}},*/ -+ {{{-10,-10,-10,-10,-10,-10, -8, -4, 0, 2, 4, 4, 5, 5, 5, 8, 10}, -+ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -2, -2, -2, -2, -1, 1, 4}, - {-20,-20,-20,-20,-20,-20,-20,-14,-10, -8, -8, -8, -8, -6, -6, -6, -4}}}, - /* 2 */ -- /* {{{-10,-10,-10,-10,-10,-10,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10}, -- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -2, -2, -2, -2, 0, 2, 6}, -- {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/ -- {{{-10,-10,-10,-10,-10,-10,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10}, -- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -2, -1, 0, 3}, -+/*{{{-10,-10,-10,-10,-10,-10,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10}, -+ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -2, -2, -2, -2, 0, 2, 6}, -+ {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/ -+ {{{-10,-10,-10,-10,-10,-10,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10}, -+ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -2, -2, -1, 1, 3}, - {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}}, - /* 3 */ -- /* {{{-10,-10,-10,-10,-10,-10,-10, -8, 0, 2, 2, 2, 4, 4, 4, 5, 8}, -- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -1, 1, 6}, -- {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/ -+/*{{{-10,-10,-10,-10,-10,-10,-10, -8, 0, 2, 2, 2, 4, 4, 4, 5, 8}, -+ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -1, 1, 6}, -+ {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/ - {{{-10,-10,-10,-10,-10,-10,-10, -8, 0, 2, 2, 2, 4, 4, 4, 5, 8}, -- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -2, 0, 2}, -+ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -2, 0, 3}, - {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -5}}}, - /* 4 */ -- /* {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, -- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -1, 1, 5}, -- {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/ -+/*{{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, -+ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -1, 1, 5}, -+ {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/ - {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, -- {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -2, -1, 1}, -+ {-20,-20,-20,-20,-20,-20,-20,-14,-10, -4, -3, -3, -3, -3, -2, 0, 1}, - {-20,-20,-20,-20,-20,-20,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -7}}}, - /* 5 */ -- /* {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, -- {-22,-22,-22,-22,-22,-22,-22,-16,-12, -6, -4, -4, -4, -4, -2, -1, 2}, -- {-24,-24,-24,-24,-24,-24,-24,-18,-14,-12,-12,-12,-12,-10,-10, -9, -5}}},*/ -+/*{{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, -+ {-22,-22,-22,-22,-22,-22,-22,-16,-12, -6, -4, -4, -4, -4, -2, -1, 2}, -+ {-24,-24,-24,-24,-24,-24,-24,-18,-14,-12,-12,-12,-12,-10,-10, -9, -5}}},*/ - {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, - {-22,-22,-22,-22,-22,-22,-22,-16,-12, -6, -4, -4, -4, -4, -3, -1, 0}, - {-24,-24,-24,-24,-24,-24,-24,-18,-14,-12,-12,-12,-12,-10,-10, -9, -8}}}, - /* 6 */ -- /* {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, -- {-24,-24,-24,-24,-24,-24,-24,-18,-14, -8, -6, -6, -6, -6, -4, -2, 1}, -- {-26,-26,-26,-26,-26,-26,-26,-18,-16,-15,-15,-15,-15,-13,-13,-12, -8}}},*/ -+/*{{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, -+ {-24,-24,-24,-24,-24,-24,-24,-18,-14, -8, -6, -6, -6, -6, -4, -2, 1}, -+ {-26,-26,-26,-26,-26,-26,-26,-18,-16,-15,-15,-15,-15,-13,-13,-12, -8}}},*/ - {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, -- {-24,-24,-24,-24,-24,-24,-24,-18,-14, -8, -6, -6, -6, -6, -5, -2, 0}, -- {-26,-26,-26,-26,-26,-26,-26,-18,-16,-15,-15,-15,-15,-13,-13,-12,-10}}}, -+ {-24,-24,-24,-24,-24,-24,-24,-18,-14, -8, -6, -6, -6, -6, -4, -2, 0}, -+ {-26,-26,-26,-26,-26,-26,-26,-18,-16,-15,-15,-15,-15,-13,-13,-12, -8}}}, - /* 7 */ -+// {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, -+// {-24,-24,-24,-24,-24,-24,-24,-18,-14,-10, -8, -8, -8, -8, -6, -4, 0}, -+// {-26,-26,-26,-26,-26,-26,-26,-22,-20,-19,-19,-19,-19,-18,-17,-16,-12}}}, - {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 1, 1, 1, 2, 3, 3, 4, 7}, -- {-24,-24,-24,-24,-24,-24,-24,-18,-14,-10, -8, -8, -8, -8, -6, -4, 0}, -+ {-24,-24,-24,-24,-24,-24,-24,-18,-14,-12,-10, -8, -8, -8, -6, -4, 0}, - {-26,-26,-26,-26,-26,-26,-26,-22,-20,-19,-19,-19,-19,-18,-17,-16,-12}}}, - /* 8 */ - {{{-15,-15,-15,-15,-15,-15,-15,-10, -4, 0, 0, 0, 0, 1, 2, 3, 7}, -@@ -344,67 +404,85 @@ - }; - - /* noise bias (impulse block) */ --static noise3 _psy_noisebias_impulse[12]={ -+static noise3 _psy_noisebias_impulse[13]={ - /* 63 125 250 500 1k 2k 4k 8k 16k*/ -- /* -1 */ -+ /* -2(addition mode) */ - {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, -+ {-28,-28,-26,-26,-22,-18,-16, -8, -2, 2, 2, 2, 3, 6, 7, 8, 15}, -+ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}}, -+ /* -1 */ -+/*{{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, - {-30,-30,-30,-30,-26,-20,-16, -8, -6, -6, -2, 2, 2, 3, 6, 6, 15}, -+ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},*/ -+ {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, -+ {-30,-30,-28,-28,-24,-20,-18,-10, -4, 0, 0, 0, 1, 4, 5, 6, 14}, - {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}}, -- - /* 0 */ -- /* {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 4, 8, 8, 8, 10, 12, 14, 20}, -- {-30,-30,-30,-30,-26,-22,-20,-14, -6, -2, 0, 0, 0, 0, 2, 4, 10}, -- {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},*/ -+/*{{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 4, 8, 8, 8, 10, 12, 14, 20}, -+ {-30,-30,-30,-30,-26,-22,-20,-14, -6, -2, 0, 0, 0, 0, 2, 4, 10}, -+ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},*/ - {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 4, 8, 8, 8, 10, 12, 14, 20}, -- {-30,-30,-30,-30,-26,-22,-20,-14, -6, -2, 0, 0, 0, 0, 2, 3, 6}, -+ {-30,-30,-30,-30,-26,-22,-20,-14, -6, 0, 0, 0, 0, 1, 2, 3, 7}, - {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}}, - /* 1 */ -- {{{-12,-12,-12,-12,-12, -8, -6, -4, 0, 4, 4, 4, 4, 10, 12, 14, 20}, -+/*{{{-12,-12,-12,-12,-12, -8, -6, -4, 0, 4, 4, 4, 4, 10, 12, 14, 20}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -4, -4, -2, -2, -2, -2, 2}, -+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8,-10,-10, -8, -8, -8, -6, -4}}},*/ -+ {{{-12,-12,-12,-12,-12, -8, -6, -4, 0, 4, 4, 4, 4, 10, 12, 14, 20}, -+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -4, -4, -2, -2, -2, -1, 3}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8,-10,-10, -8, -8, -8, -6, -4}}}, - /* 2 */ -+// {{{-14,-14,-14,-14,-14,-10, -8, -6, -2, 2, 2, 2, 2, 8, 10, 10, 16}, -+// {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -4, -2, 0}, -+// {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8, -4}}}, - {{{-14,-14,-14,-14,-14,-10, -8, -6, -2, 2, 2, 2, 2, 8, 10, 10, 16}, -- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -4, -2, 0}, -+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -3, -2, 1}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8, -4}}}, - /* 3 */ -+// {{{-14,-14,-14,-14,-14,-10, -8, -6, -2, 2, 2, 2, 2, 6, 8, 8, 14}, -+// {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -4, -2, 0}, -+// {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8, -4}}}, - {{{-14,-14,-14,-14,-14,-10, -8, -6, -2, 2, 2, 2, 2, 6, 8, 8, 14}, -- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -4, -2, 0}, -+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -3, -2, 1}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8, -4}}}, - /* 4 */ -+// {{{-16,-16,-16,-16,-16,-12,-10, -6, -2, 0, 0, 0, 0, 4, 6, 6, 12}, -+// {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -4, -2, 0}, -+// {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8, -4}}}, - {{{-16,-16,-16,-16,-16,-12,-10, -6, -2, 0, 0, 0, 0, 4, 6, 6, 12}, -- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -4, -2, 0}, -+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -3, -2, 1}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8, -4}}}, - /* 5 */ -- {{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 4, 6, 11}, -+/*{{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 4, 6, 11}, - {-32,-32,-32,-32,-28,-24,-22,-16,-10, -6, -8, -8, -6, -6, -6, -4, -2}, -- {-34,-34,-34,-34,-30,-26,-24,-18,-14,-12,-12,-12,-12,-12,-10, -9, -5}}}, -- /* 6 -+ {-34,-34,-34,-34,-30,-26,-24,-18,-14,-12,-12,-12,-12,-12,-10, -9, -5}}},*/ - {{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 4, 6, 11}, -- {-34,-34,-34,-34,-30,-30,-24,-20,-12,-12,-14,-14,-10, -9, -8, -6, -4}, -- {-34,-34,-34,-34,-34,-30,-26,-20,-16,-15,-15,-15,-15,-15,-13,-12, -8}}},*/ -+ {-32,-32,-32,-32,-28,-24,-22,-16,-12, -8, -8, -8, -6, -6, -5, -4, -2}, -+ {-34,-34,-34,-34,-30,-26,-24,-18,-14,-12,-12,-12,-12,-12,-10, -9, -5}}}, -+ /* 6 */ -+/*{{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 4, 6, 11}, -+ {-34,-34,-34,-34,-30,-30,-24,-20,-12,-12,-14,-14,-10, -9, -8, -6, -4}, -+ {-34,-34,-34,-34,-34,-30,-26,-20,-16,-15,-15,-15,-15,-15,-13,-12, -8}}},*/ - {{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 4, 6, 11}, -- {-34,-34,-34,-34,-30,-30,-30,-24,-16,-16,-16,-16,-16,-16,-14,-14,-12}, -- {-36,-36,-36,-36,-36,-34,-28,-24,-20,-20,-20,-20,-20,-20,-20,-18,-16}}}, -+ {-34,-34,-34,-34,-30,-30,-24,-20,-14,-14,-14,-14,-10, -9, -8, -6, -4}, -+ {-34,-34,-34,-34,-34,-30,-26,-20,-16,-15,-15,-15,-15,-15,-13,-12, -8}}}, - /* 7 */ -- /* {{{-22,-22,-22,-22,-22,-20,-14,-10, -6, 0, 0, 0, 0, 4, 4, 6, 11}, -- {-34,-34,-34,-34,-30,-30,-24,-20,-14,-14,-16,-16,-14,-12,-10,-10,-10}, -- {-34,-34,-34,-34,-32,-32,-30,-24,-20,-19,-19,-19,-19,-19,-17,-16,-12}}},*/ -+/*{{{-22,-22,-22,-22,-22,-20,-14,-10, -6, 0, 0, 0, 0, 4, 4, 6, 11}, -+ {-34,-34,-34,-34,-30,-30,-24,-20,-14,-14,-16,-16,-14,-12,-10,-10,-10}, -+ {-34,-34,-34,-34,-32,-32,-30,-24,-20,-19,-19,-19,-19,-19,-17,-16,-12}}},*/ - {{{-22,-22,-22,-22,-22,-20,-14,-10, -6, 0, 0, 0, 0, 4, 4, 6, 11}, -- {-34,-34,-34,-34,-30,-30,-30,-30,-26,-26,-26,-26,-26,-26,-26,-24,-22}, -- {-40,-40,-40,-40,-40,-40,-40,-32,-30,-30,-30,-30,-30,-30,-30,-30,-24}}}, -+ {-34,-34,-34,-34,-30,-30,-24,-20,-16,-16,-16,-16,-14,-12,-10,-10, -8}, -+ {-34,-34,-34,-34,-32,-32,-30,-24,-20,-19,-19,-19,-19,-19,-17,-16,-12}}}, - /* 8 */ -- /* {{{-24,-24,-24,-24,-24,-22,-14,-10, -6, -1, -1, -1, -1, 3, 3, 5, 10}, -- {-34,-34,-34,-34,-30,-30,-30,-24,-20,-20,-20,-20,-20,-18,-16,-16,-14}, -- {-36,-36,-36,-36,-36,-34,-28,-24,-24,-24,-24,-24,-24,-24,-24,-20,-16}}},*/ - {{{-24,-24,-24,-24,-24,-22,-14,-10, -6, -1, -1, -1, -1, 3, 3, 5, 10}, -- {-34,-34,-34,-34,-34,-32,-32,-30,-26,-26,-26,-26,-26,-26,-26,-26,-24}, -- {-40,-40,-40,-40,-40,-40,-40,-32,-30,-30,-30,-30,-30,-30,-30,-30,-24}}}, -+ {-34,-34,-34,-34,-30,-30,-30,-24,-20,-20,-20,-20,-20,-18,-16,-16,-14}, -+ {-36,-36,-36,-36,-36,-34,-28,-24,-24,-24,-24,-24,-24,-24,-24,-20,-16}}}, - /* 9 */ -- /* {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -4, -4, -4, -4, -4, -2, 2}, -- {-36,-36,-36,-36,-34,-32,-32,-30,-26,-26,-26,-26,-26,-22,-20,-20,-18}, -- {-40,-40,-40,-40,-40,-40,-40,-32,-30,-30,-30,-30,-30,-30,-30,-24,-20}}},*/ -+// {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -4, -4, -4, -4, -4, -2, 2}, -+// {-36,-36,-36,-36,-34,-32,-32,-30,-26,-26,-26,-26,-26,-22,-20,-20,-18}, -+// {-40,-40,-40,-40,-40,-40,-40,-32,-30,-30,-30,-30,-30,-30,-30,-24,-20}}}, - {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -4, -4, -4, -4, -4, -2, 2}, -- {-36,-36,-36,-36,-34,-32,-32,-30,-26,-26,-26,-26,-26,-26,-26,-26,-26}, -+ {-36,-36,-36,-36,-32,-32,-32,-28,-24,-24,-24,-24,-24,-22,-20,-20,-18}, - {-40,-40,-40,-40,-40,-40,-40,-32,-30,-30,-30,-30,-30,-30,-30,-24,-20}}}, - /* 10 */ - {{{-30,-30,-30,-30,-30,-26,-24,-24,-24,-20,-16,-16,-16,-16,-16,-14,-12}, -@@ -413,28 +491,36 @@ - }; - - /* noise bias (padding block) */ --static noise3 _psy_noisebias_padding[12]={ -+static noise3 _psy_noisebias_padding[13]={ - /* 63 125 250 500 1k 2k 4k 8k 16k*/ -- -- /* -1 */ -+ /* -2(addition mode) */ - {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, -- {-30,-30,-30,-30,-26,-20,-16, -8, -6, -6, -2, 2, 2, 3, 6, 6, 15}, -+ {-28,-28,-26,-26,-22,-18,-16, -8, -2, 2, 2, 2, 3, 6, 7, 8, 15}, - {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}}, -- -- /* 0 */ -+ /* -1 */ -+/*{{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, -+ {-30,-30,-30,-30,-26,-20,-16, -8, -6, -6, -2, 2, 2, 3, 6, 6, 15}, -+ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},*/ - {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, -+ {-30,-30,-28,-28,-24,-20,-18,-10, -4, 0, 0, 0, 1, 4, 5, 6, 14}, -+ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -4, -4, -4, -4, -4, -2, 0, 2}}}, -+ /* 0 */ -+/*{{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2, 2, 3, 6, 6, 8, 10}, -+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -4, -4, -4, -4, -2, 0, 2}}},*/ -+ {{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20}, -+ {-30,-30,-30,-30,-26,-22,-20,-14, -6, 0, 0, 0, 0, 3, 3, 5, 8}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -4, -4, -4, -4, -2, 0, 2}}}, - /* 1 */ - {{{-12,-12,-12,-12,-12, -8, -6, -4, 0, 4, 4, 4, 4, 10, 12, 14, 20}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, 0, 0, 0, 2, 2, 4, 8}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -6, -4, -2, 0}}}, - /* 2 */ -- /* {{{-14,-14,-14,-14,-14,-10, -8, -6, -2, 2, 2, 2, 2, 8, 10, 10, 16}, -- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, 0, 0, 0, 2, 2, 4, 8}, -- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -8, -6, -4, -2}}},*/ -+// {{{-14,-14,-14,-14,-14,-10, -8, -6, -2, 2, 2, 2, 2, 8, 10, 10, 16}, -+// {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, 0, 0, 0, 2, 2, 4, 8}, -+// {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -8, -6, -4, -2}}}, - {{{-14,-14,-14,-14,-14,-10, -8, -6, -2, 2, 2, 2, 2, 8, 10, 10, 16}, -- {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -1, -1, -1, 0, 0, 2, 6}, -+ {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, 0, 0, 0, 0, 2, 4, 8}, - {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -8, -6, -4, -2}}}, - /* 3 */ - {{{-14,-14,-14,-14,-14,-10, -8, -6, -2, 2, 2, 2, 2, 6, 8, 8, 14}, -@@ -453,16 +539,22 @@ - {-34,-34,-34,-34,-30,-30,-24,-20,-14, -8, -4, -4, -4, -4, -3, -1, 4}, - {-34,-34,-34,-34,-34,-30,-26,-20,-16,-13,-13,-13,-13,-13,-11, -8, -6}}}, - /* 7 */ -- {{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 6, 6, 12}, -+/*{{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 6, 6, 12}, - {-34,-34,-34,-34,-30,-30,-30,-24,-16,-10, -8, -6, -6, -6, -5, -3, 1}, -+ {-34,-34,-34,-34,-32,-32,-28,-22,-18,-16,-16,-16,-16,-16,-14,-12,-10}}},*/ -+ {{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 6, 6, 12}, -+ {-34,-34,-34,-34,-30,-30,-24,-20,-14,-10, -8, -6, -6, -6, -5, -3, 1}, - {-34,-34,-34,-34,-32,-32,-28,-22,-18,-16,-16,-16,-16,-16,-14,-12,-10}}}, - /* 8 */ - {{{-22,-22,-22,-22,-22,-20,-14,-10, -4, 0, 0, 0, 0, 3, 5, 5, 11}, - {-34,-34,-34,-34,-30,-30,-30,-24,-16,-12,-10, -8, -8, -8, -7, -5, -2}, - {-36,-36,-36,-36,-36,-34,-28,-22,-20,-20,-20,-20,-20,-20,-20,-16,-14}}}, - /* 9 */ -+// {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -2, -2, -2, -2, 0, 2, 6}, -+// {-36,-36,-36,-36,-34,-32,-32,-24,-16,-12,-12,-12,-12,-12,-10, -8, -5}, -+// {-40,-40,-40,-40,-40,-40,-40,-32,-26,-24,-24,-24,-24,-24,-24,-20,-18}}}, - {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -2, -2, -2, -2, 0, 2, 6}, -- {-36,-36,-36,-36,-34,-32,-32,-24,-16,-12,-12,-12,-12,-12,-10, -8, -5}, -+ {-36,-36,-36,-36,-32,-32,-32,-26,-18,-14,-12,-12,-12,-12,-10, -8, -5}, - {-40,-40,-40,-40,-40,-40,-40,-32,-26,-24,-24,-24,-24,-24,-24,-20,-18}}}, - /* 10 */ - {{{-30,-30,-30,-30,-30,-26,-24,-24,-24,-20,-12,-12,-12,-12,-12,-10, -8}, -@@ -478,14 +570,17 @@ - {10,10,100}, - }; - --static int _psy_tone_suppress[12]={ -- -20,-20,-20,-20,-20,-24,-30,-40,-40,-45,-45,-45, --}; --static int _psy_tone_0dB[12]={ -- 90,90,95,95,95,95,105,105,105,105,105,105, --}; --static int _psy_noise_suppress[12]={ -- -20,-20,-24,-24,-24,-24,-30,-40,-40,-45,-45,-45, -+static int _psy_tone_suppress[13]={ -+/* -20,-20,-20,-20,-20,-24,-30,-40,-40,-45,-45,-45, */ -+ -20,-20,-20,-20,-20,-20,-24,-30,-40,-40,-42,-45,-45, -+}; -+static int _psy_tone_0dB[13]={ -+/* 90,90,95,95,95,95,105,105,105,105,105,105, */ -+ 90,90,90,95,95,95,95,105,105,105,105,105,105, -+}; -+static int _psy_noise_suppress[13]={ -+/* -20,-20,-24,-24,-24,-24,-30,-40,-40,-45,-45,-45, */ -+ -20,-20,-20,-24,-24,-24,-24,-30,-40,-40,-42,-45,-45, - }; - - static vorbis_info_psy _psy_info_template={ -@@ -506,11 +601,13 @@ - - /* ath ****************/ - --static int _psy_ath_floater[12]={ -- -100,-100,-100,-100,-100,-100,-105,-105,-105,-105,-110,-120, --}; --static int _psy_ath_abs[12]={ -- -130,-130,-130,-130,-140,-140,-140,-140,-140,-140,-140,-150, -+static int _psy_ath_floater[13]={ -+/* -100,-100,-100,-100,-100,-100,-105,-105,-105,-105,-110,-120, */ -+ -100,-100,-100,-100,-100,-100,-100,-105,-105,-105,-105,-110,-120, -+}; -+static int _psy_ath_abs[13]={ -+/* -130,-130,-130,-130,-140,-140,-140,-140,-140,-140,-140,-150, */ -+ -130,-130,-130,-130,-130,-135,-140,-140,-140,-140,-140,-140,-150, - }; - - /* stereo setup. These don't map directly to quality level, there's -@@ -522,14 +619,22 @@ - /* various stereo possibilities */ - - /* stereo mode by base quality level */ --static 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}, -+static adj_stereo _psy_stereo_modes_44[13]={ -+ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 -2(addition mode) */ -+ {{ 4, 4, 4, 4, 4, 4, 4, 4, 3, 2, 1, 0, 0, 0, 0}, -+ { 8, 8, 8, 8, 8, 8, 7, 7, 6, 6, 6, 6, 5, 4, 3}, -+ { 1, 2, 2, 2, 2, 3, 3, 4, 4, 4, 5, 6, 7, 8, 8}, -+ { 10,10.5, 11,11.5, 12,12.5, 13, 99, 99, 99, 99, 99, 99, 99, 99}}, -+ /* 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}, - { 1, 2, 3, 4, 4, 4, 4, 4, 4, 5, 6, 7, 8, 8, 8}, -+ { 12,12.5, 13,13.5, 14,14.5, 15, 99, 99, 99, 99, 99, 99, 99, 99}},*/ -+ {{ 4, 4, 4, 4, 4, 4, 4, 3, 2, 2, 1, 0, 0, 0, 0}, -+ { 8, 8, 8, 8, 8, 7, 7, 6, 6, 6, 6, 6, 5, 4, 3}, -+ { 1, 2, 3, 4, 4, 4, 4, 4, 4, 5, 6, 7, 8, 8, 8}, - { 12,12.5, 13,13.5, 14,14.5, 15, 99, 99, 99, 99, 99, 99, 99, 99}}, -- --/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 0 */ -+ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 0 */ - /*{{ 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}, - { 1, 2, 3, 4, 5, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8}, -@@ -538,76 +643,76 @@ - { 8, 8, 8, 8, 6, 6, 5, 5, 5, 5, 5, 5, 5, 4, 3}, - { 1, 2, 3, 4, 4, 5, 6, 6, 6, 6, 6, 8, 8, 8, 8}, - { 12,12.5, 13,13.5, 14,14.5, 15, 99, 99, 99, 99, 99, 99, 99, 99}}, -- -- -- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 */ -- {{ 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, 0, 0, 0, 0}, -+ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 */ -+/*{{ 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, 0, 0, 0, 0}, - { 8, 8, 8, 8, 6, 6, 5, 5, 5, 5, 5, 5, 5, 4, 3}, - { 1, 2, 3, 4, 4, 5, 6, 6, 6, 6, 6, 8, 8, 8, 8}, -+ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},*/ -+ {{ 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, 0, 0, 0, 0}, -+ { 8, 8, 8, 8, 6, 6, 5, 4, 4, 4, 4, 4, 4, 3, 3}, -+ { 1, 2, 3, 4, 4, 5, 6, 6, 6, 6, 6, 8, 8, 8, 8}, - { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, -- -- -- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 2 */ -- /* {{ 3, 3, 3, 3, 3, 3, 2, 2, 2, 1, 0, 0, 0, 0, 0}, -- { 8, 8, 8, 6, 5, 5, 5, 5, 5, 5, 5, 4, 3, 2, 1}, -- { 3, 4, 4, 4, 5, 6, 6, 6, 6, 6, 6, 8, 8, 8, 8}, -- { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, */ -+ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 2 */ -+/*{{ 3, 3, 3, 3, 3, 3, 2, 2, 2, 1, 0, 0, 0, 0, 0}, -+ { 8, 8, 8, 6, 5, 5, 5, 5, 5, 5, 5, 4, 3, 2, 1}, -+ { 3, 4, 4, 4, 5, 6, 6, 6, 6, 6, 6, 8, 8, 8, 8}, -+ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, */ - {{ 3, 3, 3, 3, 3, 3, 3, 2, 1, 1, 0, 0, 0, 0, 0}, - { 8, 8, 6, 6, 5, 5, 4, 4, 4, 4, 4, 4, 3, 2, 1}, - { 3, 4, 4, 5, 5, 6, 6, 6, 6, 6, 6, 8, 8, 8, 8}, - { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, -- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 3 */ -+ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 3 */ - {{ 2, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0}, - { 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 2, 1}, - { 4, 4, 5, 6, 6, 6, 6, 6, 8, 8, 10, 10, 10, 10, 10}, - { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, -- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 4 */ -+ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 4 */ - {{ 2, 2, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 2, 1, 0}, - { 6, 6, 6, 8, 8, 8, 8, 8, 8, 8, 10, 10, 10, 10, 10}, - { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, -- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 5 */ -- /* {{ 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, -- { 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0}, -- { 6, 6, 8, 8, 8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10}, -- { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},*/ -- {{ 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, -+ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 5 */ -+/*{{ 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - { 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0}, -+ { 6, 6, 8, 8, 8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10}, -+ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},*/ -+ {{ 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, -+ { 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 0, 0, 0, 0}, - { 6, 7, 8, 8, 8, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12}, - { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, -- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 6 */ -- /* {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, -- { 3, 3, 3, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0}, -- { 8, 8, 8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, -- { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, */ -+ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 6 */ -+/*{{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, -+ { 3, 3, 3, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0}, -+ { 8, 8, 8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, -+ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, */ - {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - { 3, 3, 3, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - { 8, 8, 8, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12}, - { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, -- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 7 */ -- /* {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, -- { 3, 3, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, -- { 8, 8, 8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, -- { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},*/ -+ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 7 */ -+/*{{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, -+ { 3, 3, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, -+ { 8, 8, 8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, -+ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},*/ - {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - { 3, 3, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - { 8, 8, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12}, - { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, -- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 8 */ -- /* {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, -- { 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, -- { 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, -- { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},*/ -+ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 8 */ -+/*{{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, -+ { 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, -+ { 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, -+ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},*/ - {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - { 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - { 8, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12}, - { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, -- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 9 */ -+ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 9 */ - {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4}, - { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, -- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 10 */ -+ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 10 */ - {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4}, -@@ -615,14 +720,16 @@ - }; - - /* tone master attenuation by base quality mode and bitrate tweak */ --static 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 */ -- {{ 25, 12, 2}, 0, 0}, /* 1 */ -- /* {{ 20, 10, -2}, 0, 0}, *//* 2 */ -- {{ 20, 9, -3}, 0, 0}, /* 2 */ -- {{ 20, 9, -4}, 0, 0}, /* 3 */ -+static att3 _psy_tone_masteratt_44[13]={ -+ {{ 40, 32, 16}, 0, 0}, /* -2 */ -+// {{ 35, 21, 9}, 0, 0}, /* -1 */ -+ {{ 36, 25, 10}, 0, 0}, /* -1 */ -+// {{ 30, 20, 8}, -2, 1.25}, /* 0 */ -+ {{ 32, 20, 8}, 0, 0}, /* 0 */ -+ {{ 25, 14, 4}, 0, 0}, /* 1 */ -+ {{ 20, 10, -2}, 0, 0}, /* 2 */ -+// {{ 20, 9, -4}, 0, 0}, /* 3 */ -+ {{ 20, 10, -3}, 0, 0}, /* 3 */ - {{ 20, 9, -4}, 0, 0}, /* 4 */ - {{ 20, 6, -6}, 0, 0}, /* 5 */ - {{ 20, 3, -10}, 0, 0}, /* 6 */ -@@ -633,34 +740,50 @@ - }; - - /* lowpass by mode **************/ --static double _psy_lowpass_44[12]={ -+static double _psy_lowpass_44[13]={ - /* 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. -+// 13.9,15.1,15.8,16.5,17.2,18.9,20.1,48.,999.,999.,999.,999. -+ 13.1,14.8,15.1,15.8,16.5,17.2,18.3,20.1,48.,999.,999.,999.,999. - }; - - /* noise normalization **********/ - --static int _noise_start_short_44[11]={ -+static int _noise_start_short_44[12]={ - /* 16,16,16,16,32,32,9999,9999,9999,9999 */ -- 32,16,16,16,32,9999,9999,9999,9999,9999,9999 -+// 32,16,16,16,32,9999,9999,9999,9999,9999,9999 -+ 32,32,16,16,32,64,9999,9999,9999,9999,9999,9999 - }; --static int _noise_start_long_44[11]={ -+static int _noise_start_long_44[12]={ - /* 128,128,128,256,512,512,9999,9999,9999,9999 */ -- 256,128,128,256,512,9999,9999,9999,9999,9999,9999 -+// 256,128,128,256,512,9999,9999,9999,9999,9999,9999 -+ 256,256,128,128,256,512,9999,9999,9999,9999,9999,9999 - }; - --static int _noise_part_short_44[11]={ -- 8,8,8,8,8,8,8,8,8,8,8 -+static int _noise_part_short_44[12]={ -+/* 8,8,8,8,8,8,8,8,8,8,8 */ -+ 8,8,8,8,8,8,8,8,8,8,8,8 - }; --static int _noise_part_long_44[11]={ -- 32,32,32,32,32,32,32,32,32,32,32 -+static int _noise_part_long_44[12]={ -+/* 32,32,32,32,32,32,32,32,32,32,32 */ -+ 32,32,32,32,32,32,32,32,32,32,32,32 - }; - --static double _noise_thresh_44[11]={ -+static double _noise_thresh_44[12]={ - /* .2,.2,.3,.4,.5,.5,9999.,9999.,9999.,9999., */ -- .2,.2,.2,.4,.6,9999.,9999.,9999.,9999.,9999.,9999., -+// .2,.2,.2,.4,.6,9999.,9999.,9999.,9999.,9999.,9999., -+ .16,.19,.19,.2,.35,.8,9999.,9999.,9999.,9999.,9999.,9999., - }; - - static double _noise_thresh_5only[2]={ - .5,.5, - }; -+ -+/* 32kHz only */ -+static int _noise_start_short_32[12]={ -+// 40,40,20,20,40,80,9999,9999,9999,9999,9999,9999 -+ 48,48,24,24,40,80,9999,9999,9999,9999,9999,9999 -+}; -+static int _noise_start_long_32[12]={ -+// 320,320,160,160,320,640,9999,9999,9999,9999,9999,9999 -+ 320,320,160,160,320,640,9999,9999,9999,9999,9999,9999 -+}; ---- lib/modes/psych_8.h -+++ lib/modes/psych_8.h -@@ -15,23 +15,29 @@ - - ********************************************************************/ - --static 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 att3 _psy_tone_masteratt_8[4]={ -+ {{ 33, 28, 13}, 0, 0}, /* -2 */ -+ {{ 32, 28, 12}, 0, 0}, /* -1 */ -+ {{ 30, 26, 12}, 0, 0}, /* 0 */ -+ {{ 20, 0, -14}, 0, 0}, /* 10 */ - }; - --static vp_adjblock _vp_tonemask_adj_8[3]={ -+static vp_adjblock _vp_tonemask_adj_8[4]={ - /* 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 */ -- {{-15,-15,-15,-15,-10,-10, -6, 0, 0, 0, 0,10, 0, 0,99,99,99}}, /* 1 */ -- {{-15,-15,-15,-15,-10,-10, -6, 0, 0, 0, 0, 0, 0, 0,99,99,99}}, /* 1 */ -+ {{-15,-15,-15,-15,-10,-10, -6,-2, 0, 0, 0, 0, 3, 3,99,99,99}}, /* -2 */ -+ {{-15,-15,-15,-15,-10,-10, -6,-2, 0, 0, 0, 0, 0, 0,99,99,99}}, /* -1 */ -+ {{-15,-15,-15,-15,-10,-10, -6,-2, 0, 0, 0, 0, 0, 0,99,99,99}}, /* 0 */ -+ {{-15,-15,-15,-15,-10,-10, -6,-2, 0, 0, 0, 0, 0, 0,99,99,99}}, /* 10 */ - }; - - --static noise3 _psy_noisebias_8[3]={ -+static noise3 _psy_noisebias_8[4]={ - /* 63 125 250 500 1k 2k 4k 8k 16k*/ -+ {{{-10,-10,-10,-10, -5, -5, -5, 3, 4, 8, 8, 8, 10, 10, 99, 99, 99}, -+ {-10,-10,-10,-10, -5, -2, -2, 3, 3, 4, 4, 5, 6, 8, 99, 99, 99}, -+ {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, 99, 99, 99}}}, -+ - {{{-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}, - {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, 99, 99, 99}}}, -@@ -46,9 +52,13 @@ - }; - - /* stereo mode by base quality level */ --static adj_stereo _psy_stereo_modes_8[3]={ -+static adj_stereo _psy_stereo_modes_8[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, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4}, -+ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, -+ { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, -+ {{ 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}, - { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, - { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, -@@ -62,12 +72,20 @@ - { 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, - }; - --static noiseguard _psy_noiseguards_8[2]={ -+static noiseguard _psy_noiseguards_8[3]={ -+ {10,10,-1}, - {10,10,-1}, - {10,10,-1}, - }; - --static compandblock _psy_compand_8[2]={ -+static compandblock _psy_compand_8[3]={ -+ {{ -+ 0, 1, 2, 3, 4, 5, 6, 7, /* 7dB */ -+ 8, 8, 9, 9,10,10,11, 11, /* 15dB */ -+ 12,12,13,13,14,14,15, 16, /* 23dB */ -+ 17,18,19,20,21,22,23, 24, /* 31dB */ -+ 25,26,27,28,29,30,31, 32, /* 39dB */ -+ }}, - {{ - 0, 1, 2, 3, 4, 5, 6, 7, /* 7dB */ - 8, 8, 9, 9,10,10,11, 11, /* 15dB */ -@@ -84,19 +102,19 @@ - }}, - }; - --static double _psy_lowpass_8[3]={3.,4.,4.}; --static int _noise_start_8[2]={ -- 64,64, -+static double _psy_lowpass_8[4]={2.6,3.,4.,4.}; -+static int _noise_start_8[3]={ -+ 64,64,64, - }; --static int _noise_part_8[2]={ -- 8,8, -+static int _noise_part_8[3]={ -+ 8,8,8, - }; - --static int _psy_ath_floater_8[3]={ -- -100,-100,-105, -+static int _psy_ath_floater_8[4]={ -+ -100,-100,-100,-105, - }; - --static int _psy_ath_abs_8[3]={ -- -130,-130,-140, -+static int _psy_ath_abs_8[4]={ -+ -130,-130,-130,-140, - }; - ---- lib/modes/residue_16.h -+++ lib/modes/residue_16.h -@@ -84,7 +84,8 @@ - &_resbook_16s_2,&_resbook_16s_2} - }; - --static vorbis_mapping_template _mapres_template_16_stereo[3]={ -+static vorbis_mapping_template _mapres_template_16_stereo[4]={ -+ { _map_nominal, _res_16s_0 }, /* -1 */ - { _map_nominal, _res_16s_0 }, /* 0 */ - { _map_nominal, _res_16s_1 }, /* 1 */ - { _map_nominal, _res_16s_2 }, /* 2 */ -@@ -156,7 +157,8 @@ - }; - - --static vorbis_mapping_template _mapres_template_16_uncoupled[3]={ -+static vorbis_mapping_template _mapres_template_16_uncoupled[4]={ -+ { _map_nominal_u, _res_16u_0 }, /* -1 */ - { _map_nominal_u, _res_16u_0 }, /* 0 */ - { _map_nominal_u, _res_16u_1 }, /* 1 */ - { _map_nominal_u, _res_16u_2 }, /* 2 */ ---- lib/modes/residue_44.h -+++ lib/modes/residue_44.h -@@ -278,6 +278,7 @@ - }; - - static vorbis_mapping_template _mapres_template_44_stereo[]={ -+ { _map_nominal, _res_44s_n1 }, /* -2 */ - { _map_nominal, _res_44s_n1 }, /* -1 */ - { _map_nominal, _res_44s_0 }, /* 0 */ - { _map_nominal, _res_44s_1 }, /* 1 */ ---- lib/modes/residue_44u.h -+++ lib/modes/residue_44u.h -@@ -304,6 +304,7 @@ - }; - - static vorbis_mapping_template _mapres_template_44_uncoupled[]={ -+ { _map_nominal_u, _res_44u_n1 }, /* -2 */ - { _map_nominal_u, _res_44u_n1 }, /* -1 */ - { _map_nominal_u, _res_44u_0 }, /* 0 */ - { _map_nominal_u, _res_44u_1 }, /* 1 */ ---- lib/modes/residue_8.h -+++ lib/modes/residue_8.h -@@ -60,7 +60,8 @@ - &_resbook_8s_1,&_resbook_8s_1}, - }; - --static vorbis_mapping_template _mapres_template_8_stereo[2]={ -+static vorbis_mapping_template _mapres_template_8_stereo[3]={ -+ { _map_nominal, _res_8s_0 }, /* -1 */ - { _map_nominal, _res_8s_0 }, /* 0 */ - { _map_nominal, _res_8s_1 }, /* 1 */ - }; -@@ -103,7 +104,8 @@ - &_resbook_8u_1,&_resbook_8u_1}, - }; - --static vorbis_mapping_template _mapres_template_8_uncoupled[2]={ -+static vorbis_mapping_template _mapres_template_8_uncoupled[3]={ -+ { _map_nominal_u, _res_8u_0 }, /* -1 */ - { _map_nominal_u, _res_8u_0 }, /* 0 */ - { _map_nominal_u, _res_8u_1 }, /* 1 */ - }; ---- lib/modes/setup_11.h -+++ lib/modes/setup_11.h -@@ -17,28 +17,31 @@ - - #include "psych_11.h" - --static int blocksize_11[2]={ -- 512,512 -+static int blocksize_11[3]={ -+ 512,512,512 - }; - --static int _floor_mapping_11[2]={ -- 6,6, -+static int _floor_mapping_11[3]={ -+ 6,6,6 - }; - --static double rate_mapping_11[3]={ -- 8000.,13000.,44000., -+static double rate_mapping_11[4]={ -+// 8000.,13000.,44000., -+ 8000.,10000.,13000.,44000., - }; - --static double rate_mapping_11_uncoupled[3]={ -- 12000.,20000.,50000., -+static double rate_mapping_11_uncoupled[4]={ -+// 12000.,20000.,50000., -+ 14000.,16000.,20000.,50000., - }; - --static double quality_mapping_11[3]={ -- -.1,.0,1. -+static double quality_mapping_11[4]={ -+ -.2,-.1,.0,1. - }; - - ve_setup_data_template ve_setup_11_stereo={ -- 2, -+// 2, -+ 3, - rate_mapping_11, - quality_mapping_11, - 2, -@@ -89,7 +92,8 @@ - }; - - ve_setup_data_template ve_setup_11_uncoupled={ -- 2, -+// 2, -+ 3, - rate_mapping_11_uncoupled, - quality_mapping_11, - -1, ---- lib/modes/setup_16.h -+++ lib/modes/setup_16.h -@@ -18,36 +18,40 @@ - #include "psych_16.h" - #include "residue_16.h" - --static int blocksize_16_short[3]={ -- 1024,512,512 -+static int blocksize_16_short[4]={ -+ 1024,1024,512,512 - }; --static int blocksize_16_long[3]={ -- 1024,1024,1024 -+static int blocksize_16_long[4]={ -+ 1024,1024,1024,1024 - }; - --static int _floor_mapping_16_short[3]={ -- 9,3,3 -+static int _floor_mapping_16_short[4]={ -+ 9,9,3,3 - }; --static int _floor_mapping_16[3]={ -- 9,9,9 -+static int _floor_mapping_16[4]={ -+ 9,9,9,9 - }; - --static double rate_mapping_16[4]={ -- 12000.,20000.,44000.,86000. -+static double rate_mapping_16[5]={ -+// 12000.,20000.,44000.,86000. -+ 10000.,12000.,20000.,44000.,86000. - }; - --static double rate_mapping_16_uncoupled[4]={ -- 16000.,28000.,64000.,100000. -+static double rate_mapping_16_uncoupled[5]={ -+// 16000.,28000.,64000.,100000. -+ 16000.,18000.,28000.,64000.,100000. - }; - --static double _global_mapping_16[4]={ 1., 2., 3., 4. }; -+static double _global_mapping_16[5]={ 2., 2., 3., 4., 5. }; - --static double quality_mapping_16[4]={ -.1,.05,.5,1. }; -+static double quality_mapping_16[5]={ -.2,-.1,.05,.5,1. }; - --static double _psy_compand_16_mapping[4]={ 0., .8, 1., 1.}; -+//static double _psy_compand_16_mapping[5]={ 0., 0., .8, 1., 1.}; -+static double _psy_compand_16_mapping[5]={ 0., 1., 1.8, 2., 2.}; - - ve_setup_data_template ve_setup_16_stereo={ -- 3, -+// 3, -+ 4, - rate_mapping_16, - quality_mapping_16, - 2, -@@ -98,7 +102,8 @@ - }; - - ve_setup_data_template ve_setup_16_uncoupled={ -- 3, -+// 3, -+ 4, - rate_mapping_16_uncoupled, - quality_mapping_16, - -1, ---- lib/modes/setup_22.h -+++ lib/modes/setup_22.h -@@ -15,18 +15,21 @@ - - ********************************************************************/ - --static double rate_mapping_22[4]={ -- 15000.,20000.,44000.,86000. -+static double rate_mapping_22[5]={ -+// 15000.,20000.,44000.,86000. -+ 14000.,16000.,20000.,44000.,86000. - }; - --static double rate_mapping_22_uncoupled[4]={ -- 16000.,28000.,50000.,90000. -+static double rate_mapping_22_uncoupled[5]={ -+// 16000.,28000.,50000.,90000. -+ 22000.,24000.,28000.,50000.,90000. - }; - --static double _psy_lowpass_22[4]={9.5,11.,30.,99.}; -+static double _psy_lowpass_22[5]={8.5,9.5,11.,30.,99.}; - - ve_setup_data_template ve_setup_22_stereo={ -- 3, -+// 3, -+ 4, - rate_mapping_22, - quality_mapping_16, - 2, -@@ -77,7 +80,8 @@ - }; - - ve_setup_data_template ve_setup_22_uncoupled={ -- 3, -+// 3, -+ 4, - rate_mapping_22_uncoupled, - quality_mapping_16, - -1, ---- lib/modes/setup_32.h -+++ lib/modes/setup_32.h -@@ -15,22 +15,26 @@ - - ********************************************************************/ - --static double rate_mapping_32[12]={ -- 18000.,28000.,35000.,45000.,56000.,60000., -+static double rate_mapping_32[13]={ -+// 18000.,28000.,35000.,45000.,56000.,60000., -+ 14000.,21000.,28000.,35000.,45000.,56000.,60000., - 75000.,90000.,100000.,115000.,150000.,190000., - }; - --static double rate_mapping_32_un[12]={ -- 30000.,42000.,52000.,64000.,72000.,78000., -+static double rate_mapping_32_un[13]={ -+// 30000.,42000.,52000.,64000.,72000.,78000., -+ 26000.,32000.,42000.,52000.,64000.,72000.,78000., - 86000.,92000.,110000.,120000.,140000.,190000., - }; - --static double _psy_lowpass_32[12]={ -- 12.3,13.,13.,14.,15.,99.,99.,99.,99.,99.,99.,99. -+static double _psy_lowpass_32[13]={ -+// 12.3,13.,13.,14.,15.,99.,99.,99.,99.,99.,99.,99. -+ 12.1,12.6,13.,13.,14.,15.,99.,99.,99.,99.,99.,99.,99. - }; - - ve_setup_data_template ve_setup_32_stereo={ -- 11, -+// 11, -+ 12, - rate_mapping_32, - quality_mapping_44, - 2, -@@ -59,7 +63,7 @@ - _psy_compand_short_mapping, - _psy_compand_long_mapping, - -- {_noise_start_short_44,_noise_start_long_44}, -+ {_noise_start_short_32,_noise_start_long_32}, - {_noise_part_short_44,_noise_part_long_44}, - _noise_thresh_44, - -@@ -81,7 +85,8 @@ - }; - - ve_setup_data_template ve_setup_32_uncoupled={ -- 11, -+// 11, -+ 12, - rate_mapping_32_un, - quality_mapping_44, - -1, -@@ -110,7 +115,7 @@ - _psy_compand_short_mapping, - _psy_compand_long_mapping, - -- {_noise_start_short_44,_noise_start_long_44}, -+ {_noise_start_short_32,_noise_start_long_32}, - {_noise_part_short_44,_noise_part_long_44}, - _noise_thresh_44, - ---- lib/modes/setup_44.h -+++ lib/modes/setup_44.h -@@ -19,43 +19,47 @@ - #include "modes/residue_44.h" - #include "modes/psych_44.h" - --static double rate_mapping_44_stereo[12]={ -- 22500.,32000.,40000.,48000.,56000.,64000., -+static double rate_mapping_44_stereo[13]={ -+// 22500.,32000.,40000.,48000.,56000.,64000., -+ 16000.,24000.,32000.,40000.,48000.,56000.,64000., - 80000.,96000.,112000.,128000.,160000.,250001. - }; - --static double quality_mapping_44[12]={ -- -.1,.0,.1,.2,.3,.4,.5,.6,.7,.8,.9,1.0 -+static double quality_mapping_44[13]={ -+ -.2,-.1,.0,.1,.2,.3,.4,.5,.6,.7,.8,.9,1.0 - }; - --static int blocksize_short_44[11]={ -- 512,256,256,256,256,256,256,256,256,256,256 -+static int blocksize_short_44[12]={ -+ 512,512,256,256,256,256,256,256,256,256,256,256 - }; --static int blocksize_long_44[11]={ -- 4096,2048,2048,2048,2048,2048,2048,2048,2048,2048,2048 -+static int blocksize_long_44[12]={ -+ 4096,4096,2048,2048,2048,2048,2048,2048,2048,2048,2048,2048 - }; - --static double _psy_compand_short_mapping[12]={ -- 0.5, 1., 1., 1.3, 1.6, 2., 2., 2., 2., 2., 2., 2. -+static double _psy_compand_short_mapping[13]={ -+ 1., 1., 1., 1., 1.3, 1.6, 2., 2., 2., 2., 2., 2., 2. - }; --static double _psy_compand_long_mapping[12]={ -- 3.5, 4., 4., 4.3, 4.6, 5., 5., 5., 5., 5., 5., 5. -+static double _psy_compand_long_mapping[13]={ -+ 4., 4., 4., 4., 4.3, 4.6, 5., 5., 5., 5., 5., 5., 5. - }; - --static double _global_mapping_44[12]={ -+static double _global_mapping_44[13]={ - /* 1., 1., 1.5, 2., 2., 2.5, 2.7, 3.0, 3.5, 4., 4. */ -- 0., 1., 1., 1.5, 2., 2., 2.5, 2.7, 3.0, 3.7, 4., 4. -+// 0., 1., 1., 1.5, 2., 2., 2.5, 2.7, 3.0, 3.7, 4., 4. -+ 0., 1., 2., 2., 2.5, 3., 3., 3.5, 3.7, 4., 4., 5., 5. // low -+// 0., 1., 2., 2., 2.5, 3., 3.2, 4.0, 4.0, 4.0, 4.5, 5., 5. // high - }; - --static int _floor_short_mapping_44[11]={ -- 1,0,0,2,2,4,5,5,5,5,5 -+static int _floor_short_mapping_44[12]={ -+ 1,1,0,0,2,2,4,5,5,5,5,5 - }; --static int _floor_long_mapping_44[11]={ -- 8,7,7,7,7,7,7,7,7,7,7 -+static int _floor_long_mapping_44[12]={ -+ 8,8,7,7,7,7,7,7,7,7,7,7 - }; - - ve_setup_data_template ve_setup_44_stereo={ -- 11, -+// 11, -+ 12, - rate_mapping_44_stereo, - quality_mapping_44, - 2, ---- lib/modes/setup_44u.h -+++ lib/modes/setup_44u.h -@@ -17,13 +17,15 @@ - - #include "modes/residue_44u.h" - --static double rate_mapping_44_un[12]={ -- 32000.,48000.,60000.,70000.,80000.,86000., -+static double rate_mapping_44_un[13]={ -+// 32000.,48000.,60000.,70000.,80000.,86000., -+ 28000.,40000.,48000.,60000.,70000.,80000.,86000., - 96000.,110000.,120000.,140000.,160000.,240001. - }; - - ve_setup_data_template ve_setup_44_uncoupled={ -- 11, -+// 11, -+ 12, - rate_mapping_44_un, - quality_mapping_44, - -1, ---- lib/modes/setup_8.h -+++ lib/modes/setup_8.h -@@ -18,32 +18,37 @@ - #include "psych_8.h" - #include "residue_8.h" - --static int blocksize_8[2]={ -- 512,512 -+static int blocksize_8[3]={ -+ 512,512,512 - }; - --static int _floor_mapping_8[2]={ -- 6,6, -+static int _floor_mapping_8[3]={ -+ 6,6,6 - }; - --static double rate_mapping_8[3]={ -- 6000.,9000.,32000., -+static double rate_mapping_8[4]={ -+// 6000.,9000.,32000., -+ 5000.,6000.,9000.,32000., - }; - --static double rate_mapping_8_uncoupled[3]={ -- 8000.,14000.,42000., -+static double rate_mapping_8_uncoupled[4]={ -+// 8000.,14000.,42000., -+ 8000.,10000.,14000.,42000., - }; - --static double quality_mapping_8[3]={ -- -.1,.0,1. -+static double quality_mapping_8[4]={ -+ -.2,-.1,.0,1. - }; - --static double _psy_compand_8_mapping[3]={ 0., 1., 1.}; -+//static double _psy_compand_8_mapping[3]={ 0., 1., 1.}; -+static double _psy_compand_8_mapping[4]={ 0., 1., 2., 2.}; - --static double _global_mapping_8[3]={ 1., 2., 3. }; -+//static double _global_mapping_8[3]={ 1., 2., 3. }; -+static double _global_mapping_8[4]={ 2., 2., 3., 4. }; - - ve_setup_data_template ve_setup_8_stereo={ -- 2, -+// 2, -+ 3, - rate_mapping_8, - quality_mapping_8, - 2, -@@ -94,7 +99,8 @@ - }; - - ve_setup_data_template ve_setup_8_uncoupled={ -- 2, -+// 2, -+ 3, - rate_mapping_8_uncoupled, - quality_mapping_8, - -1, ---- lib/modes/setup_X.h -+++ lib/modes/setup_X.h -@@ -15,13 +15,14 @@ - - ********************************************************************/ - --static double rate_mapping_X[12]={ -- -1.,-1.,-1.,-1.,-1.,-1., -+static double rate_mapping_X[13]={ -+ -1.,-1.,-1.,-1.,-1.,-1.,-1. - -1.,-1.,-1.,-1.,-1.,-1. - }; - - ve_setup_data_template ve_setup_X_stereo={ -- 11, -+// 11, -+ 12, - rate_mapping_X, - quality_mapping_44, - 2, -@@ -72,7 +73,8 @@ - }; - - ve_setup_data_template ve_setup_X_uncoupled={ -- 11, -+// 11, -+ 12, - rate_mapping_X, - quality_mapping_44, - -1, -@@ -123,7 +125,8 @@ - }; - - ve_setup_data_template ve_setup_XX_stereo={ -- 2, -+// 2, -+ 3, - rate_mapping_X, - quality_mapping_8, - 2, -@@ -174,7 +177,8 @@ - }; - - ve_setup_data_template ve_setup_XX_uncoupled={ -- 2, -+// 2, -+ 3, - rate_mapping_X, - quality_mapping_8, - -1, ---- lib/psy.c -+++ lib/psy.c -@@ -30,8 +30,34 @@ - #include "misc.h" - - #define NEGINF -9999.f --static double stereo_threshholds[]={0.0, .5, 1.0, 1.5, 2.5, 4.5, 8.5, 16.5, 9e10}; --static double stereo_threshholds_limited[]={0.0, .5, 1.0, 1.5, 2.0, 2.5, 4.5, 8.5, 9e10}; -+ -+/* -+ rephase = reverse phase limit (postpoint) -+ 0 1 2 3 4 5 6 7 8 */ -+static double stereo_threshholds[]= {0.0, 0.5, 1.0, 1.5, 2.5, 4.5, 8.5,16.5, 9e10}; -+static double stereo_threshholds_rephase[]= {0.0, 0.5, 0.5, 1.0, 1.5, 1.5, 2.5, 2.5, 9e10}; -+ -+static double stereo_threshholds_low[]= {0.0, 0.5, 0.5, 1.0, 1.0, 0.0, 0.0, 0.0, 0.0}; -+static double stereo_threshholds_high[]= {0.0, 0.5, 0.5, 0.5, 1.0, 3.0, 5.5, 8.5, 0.0}; -+ -+ -+static int m3n32[] = {21,13,10,4}; -+static int m3n44[] = {15,9,7,3}; -+static int m3n48[] = {14,8,6,3}; -+ -+static int temp_bfn[128] = { -+ 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, -+ 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, -+ 8, 8, 8, 8, 9, 9, 9, 9,10,10,10,10,11,11,11,11, -+12,12,12,12,13,13,13,13,14,14,14,14,15,15,15,15, -+16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19, -+20,20,20,20,21,21,21,21,22,22,22,22,23,23,23,23, -+24,24,24,24,25,25,25,24,23,22,21,20,19,18,17,16, -+15,14,13,12,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, -+}; -+ -+static float nnmid_th=0.2; -+ - - vorbis_look_psy_global *_vp_global_look(vorbis_info *vi){ - codec_setup_info *ci=vi->codec_setup; -@@ -284,12 +310,56 @@ - p->n=n; - p->rate=rate; - -- /* AoTuV HF weighting */ -- p->m_val = 1.; -- if(rate < 26000) p->m_val = 0; -- else if(rate < 38000) p->m_val = .94; /* 32kHz */ -- else if(rate > 46000) p->m_val = 1.275; /* 48kHz */ -- -+ /* AoTuV HF weighting etc. */ -+ p->n25p=n/4; -+ p->n33p=n/3; -+ p->n75p=n*3/4; -+ if(rate < 26000){ -+ /* below 26kHz */ -+ p->m_val = 0; -+ for(i=0; i<4; i++) p->m3n[i] = 0; -+ p->tonecomp_endp=0; // dummy -+ p->tonecomp_thres=.25; -+ p->st_freqlimit=n; -+ p->min_nn_lp=0; -+ }else if(rate < 38000){ -+ /* 32kHz */ -+ p->m_val = .93; -+ for(i=0; i<4; i++) p->m3n[i] = m3n32[i]; -+ if(n==128) { p->tonecomp_endp= 124; p->tonecomp_thres=.5; -+ p->st_freqlimit=n; p->min_nn_lp= 0;} -+ else if(n==256) { p->tonecomp_endp= 248; p->tonecomp_thres=.7; -+ p->st_freqlimit=n; p->min_nn_lp= 0;} -+ else if(n==1024){ p->tonecomp_endp= 992; p->tonecomp_thres=.5; -+ p->st_freqlimit=n; p->min_nn_lp= 832;} -+ else if(n==2048){ p->tonecomp_endp=1984; p->tonecomp_thres=.7; -+ p->st_freqlimit=n; p->min_nn_lp=1664;} -+ }else if(rate > 46000){ -+ /* 48kHz */ -+ p->m_val = 1.205; -+ for(i=0; i<4; i++) p->m3n[i] = m3n48[i]; -+ if(n==128) { p->tonecomp_endp= 83; p->tonecomp_thres=.5; -+ p->st_freqlimit= 89; p->min_nn_lp= 0;} -+ else if(n==256) { p->tonecomp_endp= 166; p->tonecomp_thres=.7; -+ p->st_freqlimit= 178; p->min_nn_lp= 0;} -+ else if(n==1024){ p->tonecomp_endp= 664; p->tonecomp_thres=.5; -+ p->st_freqlimit= 712; p->min_nn_lp= 576;} -+ else if(n==2048){ p->tonecomp_endp=1328; p->tonecomp_thres=.7; -+ p->st_freqlimit=1424; p->min_nn_lp=1152;} -+ }else{ -+ /* 44.1kHz */ -+ p->m_val = 1.; -+ for(i=0; i<4; i++) p->m3n[i] = m3n44[i]; -+ if(n==128) { p->tonecomp_endp= 90; p->tonecomp_thres=.5; -+ p->st_freqlimit= 96; p->min_nn_lp= 0;} -+ else if(n==256) { p->tonecomp_endp= 180; p->tonecomp_thres=.7; -+ p->st_freqlimit= 192; p->min_nn_lp= 0;} -+ else if(n==1024){ p->tonecomp_endp= 720; p->tonecomp_thres=.5; -+ p->st_freqlimit= 768; p->min_nn_lp= 608;} -+ else if(n==2048){ p->tonecomp_endp=1440; p->tonecomp_thres=.7; -+ p->st_freqlimit=1536; p->min_nn_lp=1216;} -+ } -+ - /* set up the lookups for a given blocksize and sample rate */ - - for(i=0,j=0;ivi->noisecompand_high[NOISE_COMPAND_LEVELS-1] > 1) && (noise_compand_level > 0)){ -+ int thter = p->n33p; -+ for(;i=NOISE_COMPAND_LEVELS)dB=NOISE_COMPAND_LEVELS-1; -+ if(dB<0)dB=0; -+ logmask[i]= work[i]+p->vi->noisecompand[dB]- -+ ((p->vi->noisecompand[dB]-p->vi->noisecompand_high[dB])*noise_compand_level); -+ } -+ } -+ for(;i=NOISE_COMPAND_LEVELS)dB=NOISE_COMPAND_LEVELS-1; - if(dB<0)dB=0; -@@ -857,18 +940,172 @@ - int offset_select, - float *logmask, - float *mdct, -- float *logmdct){ -- int i,n=p->n; -- float de, coeffi, cx;/* AoTuV */ -+ float *logmdct, -+ float *lastmdct, float *tempmdct, -+ float low_compand, -+ int end_block, -+ int blocktype, int modenumber, -+ int nW_modenumber, -+ int lW_blocktype, int lW_modenumber, int lW_no){ -+ -+ int i,j,n=p->n; -+ int m2_sw=0, padth; /* aoTuV for M2 */ -+ int it_sw, *m3n, m3_count; /* aoTuV for M3 */ -+ int m4_end, lp_pos, m4_start; /* aoTuV for M4 */ -+ float de, coeffi, cx; /* aoTuV for M1 */ -+ float toneth; /* aoTuV for M2 */ -+ float noise_rate, noise_rate_low, noise_center, rate_mod; /* aoTuV for M3 */ -+ float m4_thres; /* aoTuV for M4 */ - float toneatt=p->vi->tone_masteratt[offset_select]; - - cx = p->m_val; -+ m3n = p->m3n; -+ m4_start=p->vi->normal_start; -+ m4_end = p->tonecomp_endp; -+ m4_thres = p->tonecomp_thres; -+ lp_pos=9999; -+ -+ end_block+=p->vi->normal_partition; -+ if(end_block>n)end_block=n; -+ -+ /* Collapse of low(mid) frequency is prevented. (for 32/44/48kHz q-2) */ -+ if(low_compand<0 || toneatt<25.)low_compand=0; -+ else low_compand*=(toneatt-25.); -+ -+ /** @ M2 PRE **/ -+ if(p->vi->normal_thresh<.48){ -+ if((cx > 0.5) && !modenumber && blocktype && (n==128)){ -+ if(p->vi->normal_thresh>.35) padth = 10+(int)(p->vi->flacint*100); -+ else padth = 10; -+ m2_sw=1; -+ } -+ } -+ -+ /** @ M3 PRE **/ -+ m3_count = 3; -+ if(toneatt < 3) m3_count = 2; // q6~ -+ if((n == 128) && !modenumber && !blocktype){ -+ if(!lW_blocktype && !lW_modenumber){ /* last window "short" - type "impulse" */ -+ if(lW_no < 8){ -+ /* impulse - @impulse case1 */ -+ noise_rate = 0.7-(float)(lW_no-1)/17; -+ noise_center = (float)(lW_no*m3_count); -+ }else{ -+ /* impulse - @impulse case2 */ -+ noise_rate = 0.3; -+ noise_center = 25; -+ if((lW_no*m3_count) < 24) noise_center = lW_no*m3_count; -+ } -+ if(offset_select == 1){ -+ for(i=0; i<128; i++) tempmdct[i] -= 5; -+ } -+ }else{ /* non_impulse - @Short(impulse) case */ -+ noise_rate = 0.7; -+ noise_center = 0; -+ if(offset_select == 1){ -+ for(i=0; i<128; i++) tempmdct[i] = lastmdct[i] - 5; -+ } -+ } -+ noise_rate_low = 0; -+ it_sw = 1; -+ }else{ -+ it_sw = 0; -+ } - -+ /** @ M3&M4 PRE **/ -+ if(cx < 0.5){ -+ it_sw = 0; /* for M3 */ -+ m4_end=end_block; /* for M4 */ -+ }else if(p->vi->normal_thresh>1.){ -+ m4_start = 9999; -+ }else{ -+ if(m4_end>end_block)lp_pos=m4_end; -+ else lp_pos=end_block; -+ } -+ - for(i=0;inoiseoffset[offset_select][i]; -+ float tval= tone[i]+toneatt; -+ if(i<=m4_start)tval-=low_compand; - if(val>p->vi->noisemaxsupp)val=p->vi->noisemaxsupp; -- logmask[i]=max(val,tone[i]+toneatt); -- -+ -+ /* AoTuV */ -+ /** @ M2 MAIN ** -+ floor is pulled below suitably. (padding block only) (#2) -+ by Aoyumi @ 2006/06/14 -+ */ -+ if(m2_sw){ -+ // the conspicuous low level pre-echo of the padding block origin is reduced. -+ if((logmdct[i]-lastmdct[i]) > 20){ -+ if(i > m3n[3]) val -= (logmdct[i]-lastmdct[i]-20)/padth; -+ else val -= (logmdct[i]-lastmdct[i]-20)/(padth+padth); -+ } -+ } -+ -+ /* AoTuV */ -+ /** @ M3 MAIN ** -+ Dynamic impulse block noise control. (#4) -+ 48/44.1/32kHz only. -+ by Aoyumi @ 2006/02/02 -+ */ -+ if(it_sw){ -+ for(j=1; j<=temp_bfn[i]; j++){ -+ float tempbuf = logmdct[i]-(75/temp_bfn[i]*j)-5; -+ if( (tempmdct[i+j] < tempbuf) && (tempmdct[i+j] < (logmdct[i+j]-5)) ) -+ tempmdct[i+j] = logmdct[i+j] - 5; -+ } -+ if(val > tval){ -+ if( (val>lastmdct[i]) && (logmdct[i]>(tempmdct[i]+noise_center)) ){ -+ float valmask=0; -+ tempmdct[i] = logmdct[i]; -+ -+ if(logmdct[i]>lastmdct[i]){ -+ rate_mod = noise_rate; -+ }else{ -+ rate_mod = noise_rate_low; -+ } -+ if(i > m3n[1]){ -+ if((val-tval)>30) valmask=((val-tval-30)/10+30)*rate_mod; -+ else valmask=(val-tval)*rate_mod; -+ }else if(i > m3n[2]){ -+ if((val-tval)>20) valmask=((val-tval-20)/10+20)*rate_mod; -+ else valmask=(val-tval)*rate_mod; -+ }else if(i > m3n[3]){ -+ if((val-tval)>10) valmask=((val-tval-10)/10+10)*rate_mod*0.5; -+ else valmask=(val-tval)*rate_mod*0.5; -+ }else{ -+ if((val-tval)>10) valmask=((val-tval-10)/10+10)*rate_mod*0.3; -+ else valmask=(val-tval)*rate_mod*0.3; -+ } -+ if((val-valmask)>lastmdct[i])val-=valmask; -+ else val=lastmdct[i]; -+ } -+ } -+ } -+ -+ /* This affects calculation of a floor curve. */ -+ if(i>=lp_pos)logmdct[i]=-160; -+ -+ /* AoTuV */ -+ /** @ M4 MAIN ** -+ The purpose of this portion is working Noise Normalization more correctly. -+ (There is this in order to prevent extreme boost of floor) -+ m4_start = start point -+ m4_end = end point -+ m4_thres = threshold -+ by Aoyumi @ 2006/03/20 -+ */ -+ //logmask[i]=max(val,tval); -+ if(val>tval){ -+ logmask[i]=val; -+ }else if((i>m4_start) && (i-140)){ -+ if(logmdct[i]>val){ -+ if(logmdct[i] logmdct[i*8+j]){ -+ lastmdct[i] = logmdct[i*8+j]; -+ } -+ } -+ } -+ } -+ }else if(n == 128){ -+ for(i=0; i<128; i++) lastmdct[i] = logmdct[i]; -+ } -+ } - } - - float _vp_ampmax_decay(float amp,vorbis_dsp_state *vd){ -@@ -958,7 +1213,7 @@ - - int test=(floorA>floorB)-1; - int offset=31-abs(floorA-floorB); -- float floormag=hypot_lookup[((offset<0)-1)&offset]+1.f; -+ float floormag=hypot_lookup[((offset<0)-1)&offset]+1.f; // floormag = 0.990065 ~ 0.707107 - - floormag*=FLOOR1_fromdB_INV_LOOKUP[(floorB&test)|(floorA&(~test))]; - -@@ -992,6 +1247,22 @@ - if(-a>b)return -sqrt(a*a+b*b); - return sqrt(b*b+a*a); - } -+/* modified hypot by aoyumi -+ better method should be found. */ -+static float min_indemnity_dipole_hypot(float a, float b){ -+ float thnor=0.92; -+ float threv=0.84; -+ float a2 = a*a; -+ float b2 = b*b; -+ if(a>0.){ -+ if(b>0.)return sqrt(a2+b2*thnor); -+ if(a>-b)return sqrt(a2-b2+b2*threv); -+ return -sqrt(b2-a2+a2*threv); -+ } -+ if(b<0.)return -sqrt(a2+b2*thnor); -+ if(-a>b)return -sqrt(a2-b2+b2*threv); -+ return sqrt(b2-a2+a2*threv); -+} - - /* revert to round hypot for now */ - float **_vp_quantize_couple_memo(vorbis_block *vb, -@@ -1004,16 +1275,27 @@ - float **ret=_vorbis_block_alloc(vb,vi->coupling_steps*sizeof(*ret)); - int limit=g->coupling_pointlimit[p->vi->blockflag][PACKETBLOBS/2]; - -- for(i=0;icoupling_steps;i++){ -- float *mdctM=mdct[vi->coupling_mag[i]]; -- float *mdctA=mdct[vi->coupling_ang[i]]; -- ret[i]=_vorbis_block_alloc(vb,n*sizeof(**ret)); -- for(j=0;jcoupling_steps;i++){ -+ float *mdctM=mdct[vi->coupling_mag[i]]; -+ float *mdctA=mdct[vi->coupling_ang[i]]; -+ -+ ret[i]=_vorbis_block_alloc(vb,n*sizeof(**ret)); -+ for(j=0;jcoupling_steps;i++){ -+ float *mdctM=mdct[vi->coupling_mag[i]]; -+ float *mdctA=mdct[vi->coupling_ang[i]]; -+ -+ ret[i]=_vorbis_block_alloc(vb,n*sizeof(**ret)); -+ for(j=0;jf2); - } - -+/*** optimization of sort (for 8 or 32 element) ***/ -+#ifdef OPT_SORT -+#define C(o,a,b)\ -+ (fabs(data[o+a])>=fabs(data[o+b])) -+#define O(o,a,b,c,d)\ -+ {n[o]=o+a;n[o+1]=o+b;n[o+2]=o+c;n[o+3]=o+d;} -+#define SORT4(o)\ -+ if(C(o,2,3))if(C(o,0,1))if(C(o,0,2))if(C(o,1,2))O(o,0,1,2,3)\ -+ else if(C(o,1,3))O(o,0,2,1,3)\ -+ else O(o,0,2,3,1)\ -+ else if(C(o,0,3))if(C(o,1,3))O(o,2,0,1,3)\ -+ else O(o,2,0,3,1)\ -+ else O(o,2,3,0,1)\ -+ else if(C(o,1,2))if(C(o,0,2))O(o,1,0,2,3)\ -+ else if(C(o,0,3))O(o,1,2,0,3)\ -+ else O(o,1,2,3,0)\ -+ else if(C(o,1,3))if(C(o,0,3))O(o,2,1,0,3)\ -+ else O(o,2,1,3,0)\ -+ else O(o,2,3,1,0)\ -+ else if(C(o,0,1))if(C(o,0,3))if(C(o,1,3))O(o,0,1,3,2)\ -+ else if(C(o,1,2))O(o,0,3,1,2)\ -+ else O(o,0,3,2,1)\ -+ else if(C(o,0,2))if(C(o,1,2))O(o,3,0,1,2)\ -+ else O(o,3,0,2,1)\ -+ else O(o,3,2,0,1)\ -+ else if(C(o,1,3))if(C(o,0,3))O(o,1,0,3,2)\ -+ else if(C(o,0,2))O(o,1,3,0,2)\ -+ else O(o,1,3,2,0)\ -+ else if(C(o,1,2))if(C(o,0,2))O(o,3,1,0,2)\ -+ else O(o,3,1,2,0)\ -+ else O(o,3,2,1,0) -+ -+static void sortindex_fix8(int *index, -+ float *data, -+ int offset){ -+ int i,j,k,n[8]; -+ index+=offset; -+ data+=offset; -+ SORT4(0) -+ SORT4(4) -+ j=0;k=4; -+ for(i=0;i<8;i++) -+ index[i]=n[(k>=8)||(j<4)&&C(0,n[j],n[k])?j++:k++]+offset; -+} -+ -+static void sortindex_fix32(int *index, -+ float *data, -+ int offset){ -+ int i,j,k,n[32]; -+ for(i=0;i<32;i+=8) -+ sortindex_fix8(index,data,offset+i); -+ index+=offset; -+ for(i=j=0,k=8;i<16;i++) -+ n[i]=index[(k>=16)||(j<8)&&C(0,index[j],index[k])?j++:k++]; -+ for(i=j=16,k=24;i<32;i++) -+ n[i]=index[(k>=32)||(j<24)&&C(0,index[j],index[k])?j++:k++]; -+ for(i=j=0,k=16;i<32;i++) -+ index[i]=n[(k>=32)||(j<16)&&C(0,n[j],n[k])?j++:k++]; -+} -+ -+static void sortindex_shellsort(int *index, -+ float *data, -+ int offset, -+ int count){ -+ int gap,pos,left,right,i,j; -+ index+=offset; -+ for(i=0;i=4)gap/=3; -+ while(gap>0){ -+ for(pos=gap;pos=0;left-=gap){ -+ i=index[left];j=index[left+gap]; -+ if(!C(0,i,j)){ -+ index[left]=j; -+ index[left+gap]=i; -+ }else break; -+ } -+ } -+ gap/=3; -+ } -+} -+ -+static void sortindex(int *index, -+ float *data, -+ int offset, -+ int count){ -+ if(count==8)sortindex_fix8(index,data,offset); -+ else if(count==32)sortindex_fix32(index,data,offset); -+ else sortindex_shellsort(index,data,offset,count); -+} -+ -+#undef C -+#undef O -+#undef SORT4 -+ -+#endif -+/*** OPT_SORT End ***/ -+ -+ - int **_vp_quantize_couple_sort(vorbis_block *vb, - vorbis_look_psy *p, - vorbis_info_mapping0 *vi, - float **mags){ - -- -+#ifdef OPT_SORT -+ if(p->vi->normal_point_p){ -+ int i,j,n=p->n; -+ int **ret=_vorbis_block_alloc(vb,vi->coupling_steps*sizeof(*ret)); -+ int partition=p->vi->normal_partition; -+ -+ for(i=0;icoupling_steps;i++){ -+ ret[i]=_vorbis_block_alloc(vb,n*sizeof(**ret)); -+ -+ for(j=0;jvi->normal_point_p){ - int i,j,k,n=p->n; - int **ret=_vorbis_block_alloc(vb,vi->coupling_steps*sizeof(*ret)); -@@ -1048,10 +1448,22 @@ - return(ret); - } - return(NULL); -+#endif - } - - void _vp_noise_normalize_sort(vorbis_look_psy *p, - float *magnitudes,int *sortedindex){ -+#ifdef OPT_SORT -+ int j,n=p->n; -+ vorbis_info_psy *vi=p->vi; -+ int partition=vi->normal_partition; -+ int start=vi->normal_start; -+ -+ for(j=start;jn)partition=n-j; -+ sortindex(sortedindex-start,magnitudes,j,partition); -+ } -+#else - int i,j,n=p->n; - vorbis_info_psy *vi=p->vi; - int partition=vi->normal_partition; -@@ -1066,11 +1478,12 @@ - sortedindex[i+j-start]=work[i]-magnitudes; - } - } -+#endif - } - - void _vp_noise_normalize(vorbis_look_psy *p, - float *in,float *out,int *sortedindex){ -- int flag=0,i,j=0,n=p->n; -+ int i,j=0,n=p->n,min_energy; - vorbis_info_psy *vi=p->vi; - int partition=vi->normal_partition; - int start=vi->normal_start; -@@ -1084,27 +1497,64 @@ - for(;j+partition<=n;j+=partition){ - float acc=0.; - int k; -+ int energy_loss=0; -+ int nn_num=0; -+ int freqband_mid=j+16; -+ int freqband_flag=0; - -- for(i=j;innmid_th){ -+ if(in[freqband_mid]*in[freqband_mid]<.25f){ -+ i=0; -+ if(acc>=vi->normal_thresh){ -+ out[freqband_mid]=unitnorm(in[freqband_mid]); -+ acc-=1.; -+ freqband_flag=1; -+ nn_num++; -+ } -+ } -+ }*/ - -+ /* NN main */ - for(i=0;i=.25f){ -- out[k]=rint(in[k]); -- acc-=in[k]*in[k]; -- flag=1; -- }else{ -- if(accnormal_thresh)break; -- out[k]=unitnorm(in[k]); -- acc-=1.; -- } -+ k=sortedindex[i+j-start]; -+ if(in[k]*in[k]>=.25f){ // or rint(in[k])!=0.f -+ out[k]=rint(in[k]); -+ //acc-=in[k]*in[k]; -+ }else{ -+ if(accnormal_thresh)break; -+ if(freqband_flag && freqband_mid==k)continue; -+ out[k]=unitnorm(in[k]); -+ acc-=1.; -+ nn_num++; -+ } - } - -+ /* The minimum energy complement */ -+ /*min_energy=32-energy_loss+nn_num; -+ if(min_energy<2 || (j<=p->min_nn_lp && min_energy==2)){ -+ k=sortedindex[i+j-start]; -+ if(freqband_flag && freqband_mid==k){ -+ i++; -+ k=sortedindex[i+j-start]; -+ } -+ if(!(fabs(in[k])<0.3)){ -+ out[k]=unitnorm(in[k]); -+ i++; -+ } -+ }*/ -+ -+ // The last process - for(;in; - -@@ -1147,39 +1598,196 @@ - - float *rM=res[vi->coupling_mag[i]]; - float *rA=res[vi->coupling_ang[i]]; -+ float *rMo=res_org[vi->coupling_mag[i]]; -+ float *rAo=res_org[vi->coupling_ang[i]]; - float *qM=rM+n; - float *qA=rA+n; -+ float *mdctM=mdct[vi->coupling_mag[i]]; -+ float *mdctA=mdct[vi->coupling_ang[i]]; - int *floorM=ifloor[vi->coupling_mag[i]]; - int *floorA=ifloor[vi->coupling_ang[i]]; - float prepoint=stereo_threshholds[g->coupling_prepointamp[blobno]]; - float postpoint=stereo_threshholds[g->coupling_postpointamp[blobno]]; -+ float sth_low=stereo_threshholds_low[g->coupling_prepointamp[blobno]]; -+ float sth_high=stereo_threshholds_high[g->coupling_postpointamp[blobno]]; -+ float postpoint_backup; -+ float st_thresh; - int partition=(p->vi->normal_point_p?p->vi->normal_partition:p->n); - int limit=g->coupling_pointlimit[p->vi->blockflag][blobno]; - int pointlimit=limit; -- -+ int freqlimit=p->st_freqlimit; -+ unsigned char Mc_treshp[2048]; -+ unsigned char Ac_treshp[2048]; -+ int lof_st; -+ int hif_st; -+ int hif_stcopy; -+ int old_lof_st=0; -+ int old_hif_st=0; -+ int Afreq_num=0; -+ int Mfreq_num=0; -+ int stcont_start=0; // M6 start point -+ - nonzero[vi->coupling_mag[i]]=1; - nonzero[vi->coupling_ang[i]]=1; -- -- /* The threshold of a stereo is changed with the size of n */ -- if(n > 1000) -- postpoint=stereo_threshholds_limited[g->coupling_postpointamp[blobno]]; -- -- for(j=0;jn;j+=partition){ -+ -+ postpoint_backup=postpoint; -+ -+ /** @ M6 PRE **/ -+ // lossless only? -+ if(!stereo_threshholds[g->coupling_postpointamp[blobno]])stcont_start=n; -+ else{ -+ // exception handling -+ if((postpoint-sth_high)noiseoffset[1][j]>=-2)break; -+ } -+ // start point correction & threshold setup -+ st_thresh=.1; -+ if(p->m_val<.5){ -+ // low frequency limit -+ if(stcont_startvi->normal_thresh>1.)st_thresh=.5; -+ for(j=0;j<=freqlimit;j++){ // or j=stcont_start){ -+ int m; -+ int lof_num; -+ int hif_num; -+ -+ // (It may be better to calculate this in advance) -+ lof_st=l-(l/2)*.167; -+ hif_st=l+l*.167; -+ -+ hif_stcopy=hif_st; -+ -+ // limit setting -+ if(hif_st>freqlimit)hif_st=freqlimit; -+ -+ if(old_lof_st || old_hif_st){ -+ if(hif_st>l){ -+ // hif_st, lof_st ...absolute value -+ // lof_num, hif_num ...relative value -+ -+ // low freq.(lower) -+ lof_num=lof_st-old_lof_st; -+ if(lof_num==0){ -+ Afreq_num+=Ac_treshp[l-1]; -+ Mfreq_num+=Mc_treshp[l-1]; -+ }else if(lof_num==1){ -+ Afreq_num+=Ac_treshp[l-1]; -+ Mfreq_num+=Mc_treshp[l-1]; -+ Afreq_num-=Ac_treshp[old_lof_st]; -+ Mfreq_num-=Mc_treshp[old_lof_st]; -+ }//else puts("err. low"); -+ -+ // high freq.(higher) -+ hif_num=hif_st-old_hif_st; -+ if(hif_num==0){ -+ Afreq_num-=Ac_treshp[l]; -+ Mfreq_num-=Mc_treshp[l]; -+ }else if(hif_num==1){ -+ Afreq_num-=Ac_treshp[l]; -+ Mfreq_num-=Mc_treshp[l]; -+ Afreq_num+=Ac_treshp[hif_st]; -+ Mfreq_num+=Mc_treshp[hif_st]; -+ }else if(hif_num==2){ -+ Afreq_num-=Ac_treshp[l]; -+ Mfreq_num-=Mc_treshp[l]; -+ Afreq_num+=Ac_treshp[hif_st]; -+ Mfreq_num+=Mc_treshp[hif_st]; -+ Afreq_num+=Ac_treshp[hif_st-1]; -+ Mfreq_num+=Mc_treshp[hif_st-1]; -+ }//else puts("err. high"); -+ } -+ }else{ -+ for(m=lof_st; m<=hif_st; m++){ -+ if(m==l)continue; -+ if(Ac_treshp[m]) Afreq_num++; -+ if(Mc_treshp[m]) Mfreq_num++; -+ } -+ } -+ if(l>=limit){ -+ shigh=sth_high/(hif_stcopy-lof_st); -+ shighA=shigh*Afreq_num; -+ shighM=shigh*Mfreq_num; -+ if((shighA+rAs)>(shighM+rMs))shigh=shighA; -+ else shigh=shighM; -+ }else{ -+ slow=sth_low/(hif_stcopy-lof_st); -+ slowA=slow*Afreq_num; -+ slowM=slow*Mfreq_num; -+ if(p->noiseoffset[1][l]<-1){ -+ slowA*=(p->noiseoffset[1][l]+2); -+ slowM*=(p->noiseoffset[1][l]+2); -+ } -+ } -+ old_lof_st=lof_st; -+ old_hif_st=hif_st; -+ } - -+ if(l>=limit){ -+ postpoint-=shigh; -+ /* The following prevents an extreme reduction of residue. (2ch stereo only) */ -+ if( ((a>0.) && (b<0.)) || ((b>0.) && (a<0.)) ){ -+ hypot_reserve = fabs(fabs(a)-fabs(b)); -+ if(hypot_reserve < 0.001){ // 0~0.000999- -+ dummypoint = stereo_threshholds_rephase[g->coupling_postpointamp[blobno]]; -+ dummypoint = dummypoint+((postpoint-dummypoint)*(hypot_reserve*1000)); -+ if(postpoint > dummypoint) postpoint = dummypoint; -+ } -+ } -+ } -+ - if(l=limit && fabs(rM[l])=limit && rMs=limit)acc+=qM[l]*qM[l]; -+ } - }else{ - couple_lossless(rM[l],rA[l],qM+l,qA+l); - } -@@ -1188,40 +1796,106 @@ - qA[l]=0.; - } - } -- -+ - if(p->vi->normal_point_p){ -+ int freqband_mid=j+16; -+ int freqband_flag=0; -+ int min_energy; -+ -+ rpacc=acc; -+ /* When the energy loss of a partition is large, NN is performed in the middle of partition. -+ for 48/44.1/32kHz */ -+ if(energy_loss==32 && fabs(qM[freqband_mid])>nnmid_th && acc>=p->vi->normal_thresh -+ && freqband_mid=pointlimit && rint(qM[freqband_mid])==0.f){ -+ if( ((mdctM[freqband_mid]>0.) && (mdctA[freqband_mid]<0.)) || -+ ((mdctA[freqband_mid]>0.) && (mdctM[freqband_mid]<0.)) ){ -+ acc-=1.f; -+ rpacc-=1.32; -+ }else{ -+ acc-=1.f; -+ rpacc-=1.f; -+ } -+ qM[freqband_mid]=unitnorm(qM[freqband_mid]); -+ freqband_flag=1; -+ nn_num++; -+ } -+ /* NN main (point stereo) */ - for(k=0;k=p->vi->normal_thresh;k++){ -- int l=mag_sort[i][j+k]; -+ int l; -+ l=mag_sort[i][j+k]; -+ if(freqband_mid==l && freqband_flag)continue; - if(l=pointlimit && rint(qM[l])==0.f){ -+ if( ((mdctM[l]>0.) && (mdctA[l]<0.)) || ((mdctA[l]>0.) && (mdctM[l]<0.)) ){ -+ if(rpaccvi->normal_thresh)continue; -+ acc-=1.f; -+ rpacc-=1.32; -+ }else{ -+ acc-=1.f; -+ rpacc-=1.f; -+ } - qM[l]=unitnorm(qM[l]); -- acc-=1.f; -+ nn_num++; - } -- } -+ } -+ /* The minimum energy complement. -+ for 48/44.1/32kHz */ -+ min_energy=32-energy_loss+nn_num; -+ if(min_energy<2 || (j<=p->min_nn_lp && min_energy==2)){ -+ int l; -+ float ab; -+ for(;k0.) && (mdctA[l]<0.)) || ((mdctA[l]>0.) && (mdctM[l]<0.)) -+ && ab<0.11)break; // 0.11 -+ if(rint(qM[l])==0.f && l>=pointlimit){ -+ qM[l]=unitnorm(qM[l]); -+ break; -+ } -+ } -+ } - } - } - } - } - } - --/* AoTuV */ --/** @ M2 ** -- The boost problem by the combination of noise normalization and point stereo is eased. -- However, this is a temporary patch. -- by Aoyumi @ 2004/04/18 -+/* aoTuV M5 -+ noise_compand_level of low frequency is determined from the level of high frequency. -+ by Aoyumi @ 2005/09/14 -+ -+ return value -+ [normal compander] 0 <> 1.0 [high compander] -+ -1 @ disable - */ -+float lb_loudnoise_fix(vorbis_look_psy *p, -+ float noise_compand_level, -+ float *logmdct, -+ int lW_modenumber, -+ int blocktype, int modenumber){ - --void hf_reduction(vorbis_info_psy_global *g, -- vorbis_look_psy *p, -- vorbis_info_mapping0 *vi, -- float **mdct){ -- -- int i,j,n=p->n, de=0.3*p->m_val; -- int limit=g->coupling_pointlimit[p->vi->blockflag][PACKETBLOBS/2]; -- int start=p->vi->normal_start; -- -- for(i=0; icoupling_steps; i++){ -- /* for(j=start; jn, nq1=p->n25p, nq3=p->n75p; -+ double hi_th=0; -+ -+ if(p->m_val < 0.5)return(-1); /* 48/44.1/32kHz only */ -+ if(p->vi->normal_thresh>.45)return(-1); /* under q3 */ -+ -+ /* select trans. block(short>>long case). */ -+ if(!modenumber)return(-1); -+ if(blocktype || lW_modenumber)return(noise_compand_level); -+ -+ /* calculation of a threshold. */ -+ for(i=nq1; i-130)hi_th += logmdct[i]; -+ else hi_th += -130; -+ } -+ hi_th /= n; -+ -+ /* calculation of a high_compand_level */ -+ if(hi_th > -40.) noise_compand_level=-1; -+ else if(hi_th < -50.) noise_compand_level=1.; -+ else noise_compand_level=1.-((hi_th+50)/10); -+ -+ return(noise_compand_level); - } ---- lib/psy.h -+++ lib/psy.h -@@ -15,6 +15,8 @@ - - ********************************************************************/ - -+#define OPT_SORT -+ - #ifndef _V_PSY_H_ - #define _V_PSY_H_ - #include "smallft.h" -@@ -54,6 +56,9 @@ - int noisewindowfixed; - float noiseoff[P_NOISECURVES][P_BANDS]; - float noisecompand[NOISE_COMPAND_LEVELS]; -+ float noisecompand_high[NOISE_COMPAND_LEVELS]; -+ -+ float flacint; - - float max_curve_dB; - -@@ -110,7 +115,16 @@ - int total_octave_lines; - long rate; /* cache it */ - -- float m_val; /* Masking compensation value */ -+ int m3n[4]; /* number for M3 */ -+ int tonecomp_endp; /* for M4 */ -+ int min_nn_lp; /* for M6 */ -+ float tonecomp_thres; /* for M4 */ -+ float m_val; /* masking compensation value */ -+ -+ int st_freqlimit; /* for M6 */ -+ int n25p; -+ int n33p; -+ int n75p; - - } vorbis_look_psy; - -@@ -129,6 +143,7 @@ - int sliding_lowpass); - - extern void _vp_noisemask(vorbis_look_psy *p, -+ float noise_compand_level, - float *logmdct, - float *logmask); - -@@ -144,7 +159,13 @@ - int offset_select, - float *logmask, - float *mdct, -- float *logmdct); -+ float *logmdct, -+ float *lastmdct, float *tempmdct, -+ float low_compand, -+ int end_block, -+ int blocktype, int modenumber, -+ int nW_modenumber, -+ int lW_blocktype, int lW_modenumber, int lW_no); - - extern float _vp_ampmax_decay(float amp,vorbis_dsp_state *vd); - -@@ -163,7 +184,8 @@ - int **mag_sort, - int **ifloor, - int *nonzero, -- int sliding_lowpass); -+ int sliding_lowpass, -+ float **mdct, float **res_org); - - extern void _vp_noise_normalize(vorbis_look_psy *p, - float *in,float *out,int *sortedindex); -@@ -176,10 +198,11 @@ - vorbis_info_mapping0 *vi, - float **mags); - --extern void hf_reduction(vorbis_info_psy_global *g, -- vorbis_look_psy *p, -- vorbis_info_mapping0 *vi, -- float **mdct); -+extern float lb_loudnoise_fix(vorbis_look_psy *p, -+ float noise_compand_level, -+ float *logmdct, -+ int lW_modenumber, -+ int blocktype, int modenumber); - - - #endif ---- lib/vorbisenc.c -+++ lib/vorbisenc.c -@@ -370,11 +370,16 @@ - - static void vorbis_encode_compand_setup(vorbis_info *vi,double s,int block, - compandblock *in, double *x){ -- int i,is=s; -- double ds=s-is; -+ int i,is=s, ishcm, hcm_stop=5; // high compander limit -+ double ds=s-is, dshcm; -+ - codec_setup_info *ci=vi->codec_setup; - vorbis_info_psy *p=ci->psy_param[block]; -+ -+ /* the place was borrowed... */ -+ p->flacint=ds; - -+ /* interpolate the compander mapping */ - ds=x[is]*(1.-ds)+x[is+1]*ds; - is=(int)ds; - ds-=is; -@@ -383,9 +388,32 @@ - ds=1.; - } - -+ /* high compander setup */ -+ ishcm = is; -+ dshcm = ds+.3; -+ if(dshcm > 1.0){ -+ ishcm++; -+ dshcm=dshcm-1; -+ } -+ if(x[hcm_stop] < ((float)ishcm+dshcm)){ -+ ishcm = x[hcm_stop]; -+ dshcm = x[hcm_stop]-ishcm; -+ } -+ if(dshcm==0 && ishcm>0){ // the same -+ ishcm--; -+ dshcm=1.; -+ } -+ - /* interpolate the compander settings */ - for(i=0;inoisecompand[i]=in[is].data[i]*(1.-ds)+in[is+1].data[i]*ds; -+ /* interpolate the high compander settings */ -+ if(s < (float)hcm_stop){ -+ for(i=0;inoisecompand_high[i]=in[ishcm].data[i]*(1.-dshcm)+in[ishcm+1].data[i]*dshcm; -+ }else{ // disable high compander -+ for(i=0;inoisecompand_high[i]=0; -+ } - return; - } - diff --git a/libvorbis.changes b/libvorbis.changes index c528a68..39e67e3 100644 --- a/libvorbis.changes +++ b/libvorbis.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Jul 23 15:28:13 CEST 2009 - tiwai@suse.de + +- updated to aoTuV patch version beta5.7: + * including security fixes + * improved encoding speed of low bitrate mode + * reduced distrotion by clipping at low sampling frequency + * fixed noise control part of impulse block + * tuning of each part was redone + * expanded noise control of the impulse block + * fixed pre-echo reduction code + * noise normalization reviewed + * detailed tuning done again + ------------------------------------------------------------------- Mon Jun 22 09:47:22 CEST 2009 - coolo@novell.com diff --git a/libvorbis.spec b/libvorbis.spec index f486951..3acb9b6 100644 --- a/libvorbis.spec +++ b/libvorbis.spec @@ -22,7 +22,7 @@ Name: libvorbis BuildRequires: libogg-devel pkgconfig Summary: The Vorbis General Audio Compression Codec Version: 1.2.0 -Release: 81 +Release: 82 Group: System/Libraries License: BSD 3-clause (or similar) Url: http://www.vorbis.com/ @@ -34,14 +34,17 @@ Obsoletes: libvorbis-64bit Source: %{name}-%{version}.tar.bz2 Patch1: libvorbis-lib64.dif Patch2: libvorbis-m4.dif -Patch5: libvorbis-%{version}-aotuv-b5.diff -Patch6: libvorbis-%{version}-warning-fixes.diff +# URL http://www.geocities.jp/aoyoume/aotuv/ +Patch5: libvorbis-%{version}-aotuv-b5.7.diff +# included in aotuv-b5.7.diff +# Patch6: libvorbis-%{version}-warning-fixes.diff Patch7: libvorbis-cflags.diff Patch9: libvorbis-doc-fixes.diff Patch10: libvorbis-pkgconfig.patch -Patch11: libvorbis-r14598-r14600-CVE-2008-1420.diff -Patch12: libvorbis-r14602-CVE-2008-1419.diff -Patch13: libvorbis-r14604-CVE-2008-1423.diff +# These security fixes are already included aotuv-b5.7 patch +# Patch11: libvorbis-r14598-r14600-CVE-2008-1420.diff +# Patch12: libvorbis-r14602-CVE-2008-1419.diff +# Patch13: libvorbis-r14604-CVE-2008-1423.diff Patch14: libvorbis-am111.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -102,14 +105,14 @@ Authors: %prep %setup -q %patch2 -%patch5 -%patch6 +%patch5 -p1 +# %patch6 %patch7 %patch9 %patch10 -%patch11 -p3 -%patch12 -p3 -%patch13 -p3 +# %patch11 -p3 +# %patch12 -p3 +# %patch13 -p3 %patch14 -p1 if [ "%_lib" == "lib64" ]; then %patch1