[xiph-commits] r12025 - in branches/vorbis-aotuv: . debian doc doc/vorbisenc doc/vorbisfile doc/xml examples include include/vorbis lib lib/books lib/books/coupled lib/books/floor lib/books/uncoupled lib/modes macos macos/compat macos/compat/sys macosx/English.lproj macosx/vorbis.pbproj symbian vq win32

j at svn.xiph.org j at svn.xiph.org
Sun Nov 5 06:45:34 PST 2006


Author: j
Date: 2006-11-05 06:40:48 -0800 (Sun, 05 Nov 2006)
New Revision: 12025

Added:
   branches/vorbis-aotuv/CHANGES
   branches/vorbis-aotuv/doc/draft-kerr-avt-vorbis-rtp-03.txt
   branches/vorbis-aotuv/doc/vorbisenc/changes.html
   branches/vorbis-aotuv/doc/vorbisenc/examples.html
   branches/vorbis-aotuv/doc/vorbisenc/ov_ectl_ratemanage2_arg.html
   branches/vorbis-aotuv/doc/vorbisenc/ov_ectl_ratemanage_arg.html
   branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_setup_init.html
   branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_setup_managed.html
   branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_setup_vbr.html
   branches/vorbis-aotuv/libvorbis.spec.in
   branches/vorbis-aotuv/symbian/
   branches/vorbis-aotuv/symbian/bld.inf
   branches/vorbis-aotuv/symbian/config.h
   branches/vorbis-aotuv/symbian/vorbis.mmp
   branches/vorbis-aotuv/vorbis-uninstalled.pc.in
   branches/vorbis-aotuv/vorbisenc-uninstalled.pc.in
   branches/vorbis-aotuv/vorbisfile-uninstalled.pc.in
   branches/vorbis-aotuv/vq/44c-1.vqs
   branches/vorbis-aotuv/vq/floor_11.vqs
   branches/vorbis-aotuv/vq/floor_22.vqs
   branches/vorbis-aotuv/vq/floor_44.vqs
   branches/vorbis-aotuv/vq/localcodebook.h
   branches/vorbis-aotuv/vq/make_floor_books.pl
Removed:
   branches/vorbis-aotuv/HACKING
   branches/vorbis-aotuv/aoTuV_README.txt
   branches/vorbis-aotuv/doc/draft-kerr-avt-vorbis-rtp-02.txt
   branches/vorbis-aotuv/examples/encoder_example_modified.c
   branches/vorbis-aotuv/examples/encoder_example_org.c
   branches/vorbis-aotuv/libvorbis.spec
   branches/vorbis-aotuv/symbian/bld.inf
   branches/vorbis-aotuv/symbian/config.h
   branches/vorbis-aotuv/symbian/vorbis.mmp
Modified:
   branches/vorbis-aotuv/
   branches/vorbis-aotuv/.cvsignore
   branches/vorbis-aotuv/AUTHORS
   branches/vorbis-aotuv/COPYING
   branches/vorbis-aotuv/Makefile.am
   branches/vorbis-aotuv/README
   branches/vorbis-aotuv/acinclude.m4
   branches/vorbis-aotuv/autogen.sh
   branches/vorbis-aotuv/configure.in
   branches/vorbis-aotuv/debian/
   branches/vorbis-aotuv/debian/.cvsignore
   branches/vorbis-aotuv/debian/Makefile.am
   branches/vorbis-aotuv/debian/changelog
   branches/vorbis-aotuv/debian/control
   branches/vorbis-aotuv/debian/copyright
   branches/vorbis-aotuv/debian/libvorbis-dev.docs
   branches/vorbis-aotuv/debian/libvorbis-dev.examples
   branches/vorbis-aotuv/debian/libvorbis-dev.install
   branches/vorbis-aotuv/debian/libvorbis0a.install
   branches/vorbis-aotuv/debian/libvorbisenc2.install
   branches/vorbis-aotuv/debian/libvorbisfile3.install
   branches/vorbis-aotuv/debian/rules
   branches/vorbis-aotuv/doc/.cvsignore
   branches/vorbis-aotuv/doc/Makefile.am
   branches/vorbis-aotuv/doc/components.png
   branches/vorbis-aotuv/doc/eightphase.png
   branches/vorbis-aotuv/doc/evenlsp.png
   branches/vorbis-aotuv/doc/floor1-1.png
   branches/vorbis-aotuv/doc/floor1-2.png
   branches/vorbis-aotuv/doc/floor1-3.png
   branches/vorbis-aotuv/doc/floor1-4.png
   branches/vorbis-aotuv/doc/floor1_inverse_dB_table.html
   branches/vorbis-aotuv/doc/floorval.png
   branches/vorbis-aotuv/doc/fourphase.png
   branches/vorbis-aotuv/doc/framing.html
   branches/vorbis-aotuv/doc/helper.html
   branches/vorbis-aotuv/doc/hufftree-under.png
   branches/vorbis-aotuv/doc/hufftree.png
   branches/vorbis-aotuv/doc/index.html
   branches/vorbis-aotuv/doc/lspmap.png
   branches/vorbis-aotuv/doc/oddlsp.png
   branches/vorbis-aotuv/doc/oggstream.html
   branches/vorbis-aotuv/doc/programming.html
   branches/vorbis-aotuv/doc/residue-pack.png
   branches/vorbis-aotuv/doc/residue2.png
   branches/vorbis-aotuv/doc/squarepolar.png
   branches/vorbis-aotuv/doc/stereo.html
   branches/vorbis-aotuv/doc/stream.png
   branches/vorbis-aotuv/doc/v-comment.html
   branches/vorbis-aotuv/doc/vorbis-clip.txt
   branches/vorbis-aotuv/doc/vorbis-errors.txt
   branches/vorbis-aotuv/doc/vorbis-fidelity.html
   branches/vorbis-aotuv/doc/vorbis.html
   branches/vorbis-aotuv/doc/vorbisenc/
   branches/vorbis-aotuv/doc/vorbisenc/.cvsignore
   branches/vorbis-aotuv/doc/vorbisenc/Makefile.am
   branches/vorbis-aotuv/doc/vorbisenc/index.html
   branches/vorbis-aotuv/doc/vorbisenc/overview.html
   branches/vorbis-aotuv/doc/vorbisenc/reference.html
   branches/vorbis-aotuv/doc/vorbisenc/style.css
   branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_ctl.html
   branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_init.html
   branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_init_vbr.html
   branches/vorbis-aotuv/doc/vorbisenc/vorbis_info.html
   branches/vorbis-aotuv/doc/vorbisfile/
   branches/vorbis-aotuv/doc/vorbisfile/.cvsignore
   branches/vorbis-aotuv/doc/vorbisfile/Makefile.am
   branches/vorbis-aotuv/doc/vorbisfile/OggVorbis_File.html
   branches/vorbis-aotuv/doc/vorbisfile/callbacks.html
   branches/vorbis-aotuv/doc/vorbisfile/chaining_example_c.html
   branches/vorbis-aotuv/doc/vorbisfile/chainingexample.html
   branches/vorbis-aotuv/doc/vorbisfile/crosslap.html
   branches/vorbis-aotuv/doc/vorbisfile/datastructures.html
   branches/vorbis-aotuv/doc/vorbisfile/decoding.html
   branches/vorbis-aotuv/doc/vorbisfile/example.html
   branches/vorbis-aotuv/doc/vorbisfile/exampleindex.html
   branches/vorbis-aotuv/doc/vorbisfile/fileinfo.html
   branches/vorbis-aotuv/doc/vorbisfile/index.html
   branches/vorbis-aotuv/doc/vorbisfile/initialization.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_bitrate.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_bitrate_instant.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_callbacks.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_clear.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_comment.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_crosslap.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_info.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_open.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_open_callbacks.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_pcm_seek.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_pcm_seek_lap.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_pcm_seek_page.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_pcm_seek_page_lap.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_pcm_tell.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_pcm_total.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_raw_seek.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_raw_seek_lap.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_raw_tell.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_raw_total.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_read.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_read_float.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_seekable.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_serialnumber.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_streams.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_test.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_test_callbacks.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_test_open.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_time_seek.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_time_seek_lap.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_time_seek_page.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_time_seek_page_lap.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_time_tell.html
   branches/vorbis-aotuv/doc/vorbisfile/ov_time_total.html
   branches/vorbis-aotuv/doc/vorbisfile/overview.html
   branches/vorbis-aotuv/doc/vorbisfile/reference.html
   branches/vorbis-aotuv/doc/vorbisfile/return.html
   branches/vorbis-aotuv/doc/vorbisfile/seekexample.html
   branches/vorbis-aotuv/doc/vorbisfile/seeking.html
   branches/vorbis-aotuv/doc/vorbisfile/seeking_example_c.html
   branches/vorbis-aotuv/doc/vorbisfile/seeking_test_c.html
   branches/vorbis-aotuv/doc/vorbisfile/seekingexample.html
   branches/vorbis-aotuv/doc/vorbisfile/style.css
   branches/vorbis-aotuv/doc/vorbisfile/threads.html
   branches/vorbis-aotuv/doc/vorbisfile/vorbis_comment.html
   branches/vorbis-aotuv/doc/vorbisfile/vorbis_info.html
   branches/vorbis-aotuv/doc/vorbisfile/vorbisfile_example_c.html
   branches/vorbis-aotuv/doc/vorbisword2.png
   branches/vorbis-aotuv/doc/wait.png
   branches/vorbis-aotuv/doc/white-ogg.png
   branches/vorbis-aotuv/doc/white-xifish.png
   branches/vorbis-aotuv/doc/window1.png
   branches/vorbis-aotuv/doc/window2.png
   branches/vorbis-aotuv/doc/xifish.pdf
   branches/vorbis-aotuv/doc/xml/01-introduction.xml
   branches/vorbis-aotuv/doc/xml/02-bitpacking.xml
   branches/vorbis-aotuv/doc/xml/03-codebook.xml
   branches/vorbis-aotuv/doc/xml/04-codec.xml
   branches/vorbis-aotuv/doc/xml/05-comment.xml
   branches/vorbis-aotuv/doc/xml/06-floor0.xml
   branches/vorbis-aotuv/doc/xml/07-floor1.xml
   branches/vorbis-aotuv/doc/xml/08-residue.xml
   branches/vorbis-aotuv/doc/xml/09-helper.xml
   branches/vorbis-aotuv/doc/xml/10-tables.xml
   branches/vorbis-aotuv/doc/xml/TODO
   branches/vorbis-aotuv/doc/xml/Vorbis_I_spec.xml
   branches/vorbis-aotuv/doc/xml/a1-encapsulation_ogg.xml
   branches/vorbis-aotuv/doc/xml/a2-encapsulation_rtp.xml
   branches/vorbis-aotuv/doc/xml/footer.xml
   branches/vorbis-aotuv/doc/xml/spec-common.xsl
   branches/vorbis-aotuv/doc/xml/spec-fo.xsl
   branches/vorbis-aotuv/doc/xml/spec-html.xsl
   branches/vorbis-aotuv/examples/
   branches/vorbis-aotuv/examples/.cvsignore
   branches/vorbis-aotuv/examples/Makefile.am
   branches/vorbis-aotuv/examples/chaining_example.c
   branches/vorbis-aotuv/examples/decoder_example.c
   branches/vorbis-aotuv/examples/encoder_example.c
   branches/vorbis-aotuv/examples/frameview.pl
   branches/vorbis-aotuv/examples/seeking_example.c
   branches/vorbis-aotuv/examples/vorbisfile_example.c
   branches/vorbis-aotuv/include/
   branches/vorbis-aotuv/include/.cvsignore
   branches/vorbis-aotuv/include/Makefile.am
   branches/vorbis-aotuv/include/vorbis/
   branches/vorbis-aotuv/include/vorbis/.cvsignore
   branches/vorbis-aotuv/include/vorbis/Makefile.am
   branches/vorbis-aotuv/include/vorbis/codec.h
   branches/vorbis-aotuv/include/vorbis/vorbisenc.h
   branches/vorbis-aotuv/include/vorbis/vorbisfile.h
   branches/vorbis-aotuv/lib/
   branches/vorbis-aotuv/lib/.cvsignore
   branches/vorbis-aotuv/lib/Makefile.am
   branches/vorbis-aotuv/lib/analysis.c
   branches/vorbis-aotuv/lib/backends.h
   branches/vorbis-aotuv/lib/barkmel.c
   branches/vorbis-aotuv/lib/bitrate.c
   branches/vorbis-aotuv/lib/bitrate.h
   branches/vorbis-aotuv/lib/block.c
   branches/vorbis-aotuv/lib/books/
   branches/vorbis-aotuv/lib/books/.cvsignore
   branches/vorbis-aotuv/lib/books/Makefile.am
   branches/vorbis-aotuv/lib/books/coupled/
   branches/vorbis-aotuv/lib/books/coupled/.cvsignore
   branches/vorbis-aotuv/lib/books/coupled/Makefile.am
   branches/vorbis-aotuv/lib/books/coupled/res_books_stereo.h
   branches/vorbis-aotuv/lib/books/floor/
   branches/vorbis-aotuv/lib/books/floor/.cvsignore
   branches/vorbis-aotuv/lib/books/floor/Makefile.am
   branches/vorbis-aotuv/lib/books/floor/floor_books.h
   branches/vorbis-aotuv/lib/books/uncoupled/
   branches/vorbis-aotuv/lib/books/uncoupled/.cvsignore
   branches/vorbis-aotuv/lib/books/uncoupled/Makefile.am
   branches/vorbis-aotuv/lib/books/uncoupled/res_books_uncoupled.h
   branches/vorbis-aotuv/lib/codebook.c
   branches/vorbis-aotuv/lib/codebook.h
   branches/vorbis-aotuv/lib/codec_internal.h
   branches/vorbis-aotuv/lib/envelope.c
   branches/vorbis-aotuv/lib/envelope.h
   branches/vorbis-aotuv/lib/floor0.c
   branches/vorbis-aotuv/lib/floor1.c
   branches/vorbis-aotuv/lib/highlevel.h
   branches/vorbis-aotuv/lib/info.c
   branches/vorbis-aotuv/lib/lookup.c
   branches/vorbis-aotuv/lib/lookup.h
   branches/vorbis-aotuv/lib/lookup_data.h
   branches/vorbis-aotuv/lib/lookups.pl
   branches/vorbis-aotuv/lib/lpc.c
   branches/vorbis-aotuv/lib/lpc.h
   branches/vorbis-aotuv/lib/lsp.c
   branches/vorbis-aotuv/lib/lsp.h
   branches/vorbis-aotuv/lib/mapping0.c
   branches/vorbis-aotuv/lib/masking.h
   branches/vorbis-aotuv/lib/mdct.c
   branches/vorbis-aotuv/lib/mdct.h
   branches/vorbis-aotuv/lib/misc.c
   branches/vorbis-aotuv/lib/misc.h
   branches/vorbis-aotuv/lib/modes/
   branches/vorbis-aotuv/lib/modes/.cvsignore
   branches/vorbis-aotuv/lib/modes/Makefile.am
   branches/vorbis-aotuv/lib/modes/floor_all.h
   branches/vorbis-aotuv/lib/modes/psych_11.h
   branches/vorbis-aotuv/lib/modes/psych_16.h
   branches/vorbis-aotuv/lib/modes/psych_44.h
   branches/vorbis-aotuv/lib/modes/psych_8.h
   branches/vorbis-aotuv/lib/modes/residue_16.h
   branches/vorbis-aotuv/lib/modes/residue_44.h
   branches/vorbis-aotuv/lib/modes/residue_44u.h
   branches/vorbis-aotuv/lib/modes/residue_8.h
   branches/vorbis-aotuv/lib/modes/setup_11.h
   branches/vorbis-aotuv/lib/modes/setup_16.h
   branches/vorbis-aotuv/lib/modes/setup_22.h
   branches/vorbis-aotuv/lib/modes/setup_32.h
   branches/vorbis-aotuv/lib/modes/setup_44.h
   branches/vorbis-aotuv/lib/modes/setup_44u.h
   branches/vorbis-aotuv/lib/modes/setup_8.h
   branches/vorbis-aotuv/lib/modes/setup_X.h
   branches/vorbis-aotuv/lib/os.h
   branches/vorbis-aotuv/lib/psy.c
   branches/vorbis-aotuv/lib/psy.h
   branches/vorbis-aotuv/lib/psytune.c
   branches/vorbis-aotuv/lib/registry.c
   branches/vorbis-aotuv/lib/registry.h
   branches/vorbis-aotuv/lib/res0.c
   branches/vorbis-aotuv/lib/scales.h
   branches/vorbis-aotuv/lib/sharedbook.c
   branches/vorbis-aotuv/lib/smallft.c
   branches/vorbis-aotuv/lib/smallft.h
   branches/vorbis-aotuv/lib/synthesis.c
   branches/vorbis-aotuv/lib/tone.c
   branches/vorbis-aotuv/lib/vorbisenc.c
   branches/vorbis-aotuv/lib/vorbisfile.c
   branches/vorbis-aotuv/lib/window.c
   branches/vorbis-aotuv/lib/window.h
   branches/vorbis-aotuv/macos/compat/strdup.c
   branches/vorbis-aotuv/macos/compat/sys/types.h
   branches/vorbis-aotuv/macos/decoder_example.mcp
   branches/vorbis-aotuv/macos/encoder_example.mcp
   branches/vorbis-aotuv/macos/libvorbis.mcp
   branches/vorbis-aotuv/macos/libvorbis.mcp.exp
   branches/vorbis-aotuv/macos/libvorbisenc.mcp
   branches/vorbis-aotuv/macos/libvorbisenc.mcp.exp
   branches/vorbis-aotuv/macos/libvorbisfile.mcp
   branches/vorbis-aotuv/macos/libvorbisfile.mcp.exp
   branches/vorbis-aotuv/macos/vorbis.mcp
   branches/vorbis-aotuv/macosx/English.lproj/InfoPlist.strings
   branches/vorbis-aotuv/macosx/vorbis.pbproj/project.pbxproj
   branches/vorbis-aotuv/todo.txt
   branches/vorbis-aotuv/vorbis.m4
   branches/vorbis-aotuv/vorbis.pc.in
   branches/vorbis-aotuv/vorbisenc.pc.in
   branches/vorbis-aotuv/vorbisfile.pc.in
   branches/vorbis-aotuv/vq/
   branches/vorbis-aotuv/vq/.cvsignore
   branches/vorbis-aotuv/vq/16.vqs
   branches/vorbis-aotuv/vq/16u.vqs
   branches/vorbis-aotuv/vq/44c0.vqs
   branches/vorbis-aotuv/vq/44c1.vqs
   branches/vorbis-aotuv/vq/44c2.vqs
   branches/vorbis-aotuv/vq/44c3.vqs
   branches/vorbis-aotuv/vq/44c4.vqs
   branches/vorbis-aotuv/vq/44c5.vqs
   branches/vorbis-aotuv/vq/44c6.vqs
   branches/vorbis-aotuv/vq/44c7.vqs
   branches/vorbis-aotuv/vq/44c8.vqs
   branches/vorbis-aotuv/vq/44c9.vqs
   branches/vorbis-aotuv/vq/44u0.vqs
   branches/vorbis-aotuv/vq/44u1.vqs
   branches/vorbis-aotuv/vq/44u2.vqs
   branches/vorbis-aotuv/vq/44u3.vqs
   branches/vorbis-aotuv/vq/44u4.vqs
   branches/vorbis-aotuv/vq/44u5.vqs
   branches/vorbis-aotuv/vq/44u6.vqs
   branches/vorbis-aotuv/vq/44u7.vqs
   branches/vorbis-aotuv/vq/44u8.vqs
   branches/vorbis-aotuv/vq/44u9.vqs
   branches/vorbis-aotuv/vq/8.vqs
   branches/vorbis-aotuv/vq/8u.vqs
   branches/vorbis-aotuv/vq/Makefile.am
   branches/vorbis-aotuv/vq/auxpartition.pl
   branches/vorbis-aotuv/vq/bookutil.c
   branches/vorbis-aotuv/vq/bookutil.h
   branches/vorbis-aotuv/vq/build.c
   branches/vorbis-aotuv/vq/cascade.c
   branches/vorbis-aotuv/vq/distribution.c
   branches/vorbis-aotuv/vq/genericdata.c
   branches/vorbis-aotuv/vq/huffbuild.c
   branches/vorbis-aotuv/vq/latticebuild.c
   branches/vorbis-aotuv/vq/latticehint.c
   branches/vorbis-aotuv/vq/latticepare.c
   branches/vorbis-aotuv/vq/latticetune.c
   branches/vorbis-aotuv/vq/lspdata.c
   branches/vorbis-aotuv/vq/make_residue_books.pl
   branches/vorbis-aotuv/vq/metrics.c
   branches/vorbis-aotuv/vq/residue_entropy
   branches/vorbis-aotuv/vq/residuedata.c
   branches/vorbis-aotuv/vq/residuesplit.c
   branches/vorbis-aotuv/vq/run.c
   branches/vorbis-aotuv/vq/train.c
   branches/vorbis-aotuv/vq/vqext.h
   branches/vorbis-aotuv/vq/vqgen.c
   branches/vorbis-aotuv/vq/vqgen.h
   branches/vorbis-aotuv/vq/vqsplit.c
   branches/vorbis-aotuv/vq/vqsplit.h
   branches/vorbis-aotuv/win32/
   branches/vorbis-aotuv/win32/.cvsignore
   branches/vorbis-aotuv/win32/Makefile.am
   branches/vorbis-aotuv/win32/build_vorbis_dynamic.bat
   branches/vorbis-aotuv/win32/build_vorbis_dynamic_debug.bat
   branches/vorbis-aotuv/win32/build_vorbis_static.bat
   branches/vorbis-aotuv/win32/build_vorbis_static_debug.bat
   branches/vorbis-aotuv/win32/build_vorbisenc_dynamic.bat
   branches/vorbis-aotuv/win32/build_vorbisenc_dynamic_debug.bat
   branches/vorbis-aotuv/win32/build_vorbisenc_static.bat
   branches/vorbis-aotuv/win32/build_vorbisenc_static_debug.bat
   branches/vorbis-aotuv/win32/build_vorbisfile_dynamic.bat
   branches/vorbis-aotuv/win32/build_vorbisfile_dynamic_debug.bat
   branches/vorbis-aotuv/win32/build_vorbisfile_static.bat
   branches/vorbis-aotuv/win32/build_vorbisfile_static_debug.bat
   branches/vorbis-aotuv/win32/vorbis.def
   branches/vorbis-aotuv/win32/vorbis.dsw
   branches/vorbis-aotuv/win32/vorbis_dynamic.dsp
   branches/vorbis-aotuv/win32/vorbis_static.dsp
   branches/vorbis-aotuv/win32/vorbisenc.def
   branches/vorbis-aotuv/win32/vorbisenc_dynamic.dsp
   branches/vorbis-aotuv/win32/vorbisenc_static.dsp
   branches/vorbis-aotuv/win32/vorbisfile.def
   branches/vorbis-aotuv/win32/vorbisfile_dynamic.dsp
   branches/vorbis-aotuv/win32/vorbisfile_static.dsp
Log:
merge changes from /tags/vorbis/libvorbis-1.1.0/


Property changes on: branches/vorbis-aotuv
___________________________________________________________________
Name: svn:ignore
   + aclocal.m4
autom4te.cache
configure
config.guess
config.h
config.h.in
config.log
config.status
config.sub
depcomp
install-sh
libtool
libvorbis.spec
ltmain.sh
missing
Makefile
Makefile.in
stamp-h1
*.pc



Property changes on: branches/vorbis-aotuv/.cvsignore
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/AUTHORS
___________________________________________________________________
Name: svn:keywords
   + Id

Copied: branches/vorbis-aotuv/CHANGES (from rev 12024, tags/vorbis/libvorbis-1.1.0/CHANGES)

Modified: branches/vorbis-aotuv/COPYING
===================================================================
--- branches/vorbis-aotuv/COPYING	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/COPYING	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,4 +1,4 @@
-Copyright (c) 2002, Xiph.org Foundation
+Copyright (c) 2002-2004 Xiph.org Foundation
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions


Property changes on: branches/vorbis-aotuv/COPYING
___________________________________________________________________
Name: svn:keywords
   + Id

Deleted: branches/vorbis-aotuv/HACKING
===================================================================
--- branches/vorbis-aotuv/HACKING	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/HACKING	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,48 +0,0 @@
-Note that these instructions are *not* necessary for distribution
-tarballs; they have separate configure/build instructions.  
-
-Building this package from CVS is mainly intended for developers.
-General users should obtain official distribution packages; both
-source and binary distributions are available at
-http://www.vorbis.com/.
-
------
-
-These are *brief* instructions on how to build this package from CVS.
-Yes, there are details left out.
-
-There are generally four steps necessary when building from CVS (i.e.,
-a developer's copy):
-
-1. cvs checkout of the sources, or cvs update.  RTFM from your
-   favorite flavor of CVS documentation; information on the xiph.org
-   CVS repository can be found at http://www.xiph.org/cvs.html.
-
-2. [re-]generate files such as "configure" and "Makefile.in" with the
-   GNU autoconf/automake tools.  Run the "autogen.sh" script to
-   perform this step.  
-
-   *** IF YOU ARE NOT BUILDING WITH GNU MAKE *AND* GCC: you must set
-   the AUTOMAKE_FLAGS environment variable to "--include-deps"
-   before running autogen.sh.  For example:
-
-   csh% setenv AUTOMAKE_FLAGS --include-deps
-   csh% ./autogen.sh
-     or
-   sh% AUTOMAKE_FLAGS=--include-deps ./autogen.sh
-
-3. Run configure.  There are several options available; see
-   "./configure --help" for more information.
-
-4. Run "make" to build the source.  
-
-In general, steps 2 and 3 need to be re-run every time any of the
-following files are modified (either manually or by a cvs update):
-
-	  configure.in
-	  acinclude.m4
-
-Running "make clean" after running steps 2 and 3 is generally also
-advisable before running step 4.  It isn't *always* necessary, but
-unless you understand the workings of autoconf/automake, it's safest
-to just do it.

Modified: branches/vorbis-aotuv/Makefile.am
===================================================================
--- branches/vorbis-aotuv/Makefile.am	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/Makefile.am	2006-11-05 14:40:48 UTC (rev 12025)
@@ -10,12 +10,20 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = vorbis.pc vorbisenc.pc vorbisfile.pc
 
-EXTRA_DIST = HACKING todo.txt macos macosx autogen.sh libvorbis.spec \
-	vorbis.m4 vorbis.pc.in vorbisenc.pc.in vorbisfile.pc.in
+EXTRA_DIST = todo.txt macos macosx autogen.sh \
+	libvorbis.spec libvorbis.spec.in \
+	vorbis.m4 vorbis.pc.in vorbisenc.pc.in vorbisfile.pc.in \
+       vorbis-uninstalled.pc.in \
+       vorbisenc-uninstalled.pc.in \
+       vorbisfile-uninstalled.pc.in
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-docs
+
 dist-hook:
 	rm -rf `find $(distdir)/macos -name CVS`
+	rm -rf `find $(distdir)/macos -name .svn`
 	rm -rf `find $(distdir)/macosx -name CVS`
+	rm -rf `find $(distdir)/macosx -name .svn`
 
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"


Property changes on: branches/vorbis-aotuv/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/README
===================================================================
--- branches/vorbis-aotuv/README	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/README	2006-11-05 14:40:48 UTC (rev 12025)
@@ -5,37 +5,45 @@
 * 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-2002             *
+* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2004             *
 * by the Xiph.org Foundation, http://www.xiph.org/                 *
 *                                                                  *
 ********************************************************************
 
-NEW AND IMPORTANT:
+Vorbis is a general purpose audio and music encoding format
+contemporary to MPEG-4's AAC and TwinVQ, the next generation beyond
+MPEG audio layer 3. Unlike the MPEG sponsored formats (and other
+proprietary formats such as RealAudio G2 and Windows' flavor of the
+month), the Vorbis CODEC specification belongs to the public domain.
+All the technical details are published and documented, and any
+software entity may make full use of the format without license 
+fee, royalty or patent concerns.
 
-If you're used to the source distribution from the first two beta
-releases, things are now rearranged a bit.  Specifically, the
-'vorbis' CVS module contains only the libvorbis, libvorbisfile, and
-libvorbisenc libraries.  Because Ogg bitstreams are to be used by other 
-Ogg codecs, Ogg framing and streaming functionality is now in libogg 
-(the 'ogg' CVS module).  Vorbis utilities are in 'vorbis-tools' and various
-player plugins are in 'vorbis-plugins'.  For now, you'll need to check
-out these other modules seperately. (Note: the xmms plugin is in the xmms
-CVS tree in xmms/Input/vorbis.)
+This package contains:
 
-Secondly, the Ogg/Vorbis build systems now use automake.  Instead of
-'./configure; make', the proper build sequence (in each module) is
-'./autogen.sh; make'.
+* libvorbis, a BSD-style license software implementation of
+  the Vorbis specification by the Xiph.Org Foundation 
+  (http://www.xiph.org/) 
 
-You will also need the newest versions of autoconf, automake, and libtool
-in order to compile vorbis from CVS.  configure scripts are provided for you
-in tarball distributions.
+* libvorbisfile, a BSD-style license convenience library
+  built on Vorbis designed to simplify common uses
 
+* libvorbisenc, a BSD-style license library that provides a simple,
+  programmatic encoding setup interface 
+
+* example code making use of libogg, libvorbis, libvorbisfile and
+  libvorbisenc
+
 WHAT'S HERE:
 
 This source distribution includes libvorbis and an example
-encoder/player to demonstrate use of libvorbis and documentation on
-the Ogg Vorbis audio coding format.
+encoder/player to demonstrate use of libvorbis as well as
+documentation on the Ogg Vorbis audio coding format.
 
+You'll need libogg (distributed separately) to compile this library.
+A more comprehensive set of utilities is available in the vorbis-tools
+package.
+
 Directory:
 
 ./lib  		The source for the libraries, a BSD-license implementation
@@ -59,32 +67,6 @@
 ./vq 		Internal utilities for training/building new LSP/residue 
 		and auxiliary codebooks.
 
-WHAT IS VORBIS:
-
-Vorbis is a general purpose audio and music encoding format
-contemporary to MPEG-4's AAC and TwinVQ, the next generation beyond
-MPEG audio layer 3. Unlike the MPEG sponsored formats (and other
-proprietary formats such as RealAudio G2 and Windows' flavor of the
-month), the Vorbis CODEC specification belongs to the public domain.
-All the technical details are published and documented, and any
-software entity may make full use of the format without royalty or
-patent concerns.
-
-This package contains:
-
-.) libvorbis, a BSD-style license software implementation of
-the Vorbis specification by the Xiph.Org Foundation (http://www.xiph.org/) 
-
-.) libvorbisfile, a BSD-style license convenience library
-built on Vorbis designed to simplify common uses and a number of GPL
-example programs
-
-.) libvorbisenc, a BSD-style license library that provides a simple,
-programmatic encoding setup interface 
-
-.) example code making use of libogg, libvorbis, libvorbisfile and
-libvorbisenc
-
 CONTACT:
 
 The Ogg homepage is located at 'http://www.xiph.org/ogg/'.
@@ -92,14 +74,21 @@
 Up to date technical documents, contact information, source code and
 pre-built utilities may be found there.
 
-BUILDING FROM CVS:
+BUILDING FROM TRUNK:
 
-./autogen.sh
-make 
+Development source is under subversion revision control at 
+http://svn.xiph.org/trunk/vorbis/. You will also need the 
+newest versions of autoconf, automake, and libtool in order
+to compile vorbis from development source. A configure script
+is provided for you in the source tarball distributions.
 
+  [update or checkout latest source]
+  ./autogen.sh
+  make 
+
 and as root if desired:
 
-make install
+  make install
 
 This will install the vorbis libraries (static and shared) into
 /usr/local/lib, includes into /usr/local/include and API manpages
@@ -107,23 +96,23 @@
 
 BUILDING FROM TARBALL DISTRIBUTIONS:
 
-./configure
-make
+  ./configure
+  make
 
 and optionally (as root):
-make install
+  make install
 
 BUILDING RPMS:
 
 after normal configuring:
 
-make dist
-rpm -ta libvorbis-<version>.tar.gz
+  make dist
+  rpm -ta libvorbis-<version>.tar.gz
 
 BUILDING ON MACOS 9:
 
-Vorbis on MacOS 9 is built using CodeWarrior 5.3.  To build it, first
-verify that the Ogg libraries are already built following the
+Vorbis on MacOS 9 is built using Metroworks CodeWarrior.  To build it, 
+first verify that the Ogg libraries are already built following the
 instructions in the Ogg module README.  Open vorbis/mac/libvorbis.mcp,
 switch to the "Targets" pane, select everything, and make the project.
 Do the same thing to build libvorbisenc.mcp, and libvorbisfile.mcp (in
@@ -138,3 +127,4 @@
 simply add the shared libraries you need to your project (OggLib and
 VorbisLib at least) and #include "ogg/ogg.h" and "vorbis/codec.h"
 wherever you need to access Ogg and Vorbis functionality.
+


Property changes on: branches/vorbis-aotuv/README
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/acinclude.m4
===================================================================
--- branches/vorbis-aotuv/acinclude.m4	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/acinclude.m4	2006-11-05 14:40:48 UTC (rev 12025)
@@ -8,7 +8,7 @@
 dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
 dnl
-AC_DEFUN(XIPH_PATH_OGG,
+AC_DEFUN([XIPH_PATH_OGG],
 [dnl 
 dnl Get the cflags and libraries
 dnl


Property changes on: branches/vorbis-aotuv/acinclude.m4
___________________________________________________________________
Name: svn:keywords
   + Id

Deleted: branches/vorbis-aotuv/aoTuV_README.txt
===================================================================
--- branches/vorbis-aotuv/aoTuV_README.txt	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/aoTuV_README.txt	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,20 +0,0 @@
-aoTuV beta2 release note
-
-"aoTuV" tunes up libvorbis 1.0.1 uniquely. 
-A license is taken as "BSD-style license" as well as original libvorbis. 
-
-
-# NOTICE #
-
- On the frequency of 26kHz or more, q-2(nominal 40kbps/44.1-48kHz) can be used.  A part of Nominal bitrate has changed. 
- Use of bitrate management mode is not recommended. (In the future, psy.c and mapping0.c will need to be improved. )  Please specify this, when you compile this code and you distribute a binary. If you want to improve this portion, I welcome. iFor the moment, there is no schedule for which I improve this problem. )
-
-
-
-aoTuV based on <Xiph.Org libvorbis 1.0.1>
-
-Copyright (c) 2002,2003 Xiph.Org Foundation
-Copyright (c) 2003,2004 Aoyumi
-
-
-AUTHOR : aoyumi <aoyumi at inter7.jp>
\ No newline at end of file

Modified: branches/vorbis-aotuv/autogen.sh
===================================================================
--- branches/vorbis-aotuv/autogen.sh	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/autogen.sh	2006-11-05 14:40:48 UTC (rev 12025)
@@ -61,15 +61,15 @@
 echo "Generating configuration files for $package, please wait...."
 
 echo "  aclocal $ACLOCAL_FLAGS"
-aclocal $ACLOCAL_FLAGS
-#echo "  autoheader"
-#autoheader
+aclocal $ACLOCAL_FLAGS || exit 1
+echo "  autoheader"
+autoheader || exit 1
 echo "  $LIBTOOLIZE --automake"
-$LIBTOOLIZE --automake
+$LIBTOOLIZE --automake || exit 1
 echo "  automake --add-missing $AUTOMAKE_FLAGS"
-automake --add-missing $AUTOMAKE_FLAGS 
+automake --add-missing $AUTOMAKE_FLAGS || exit 1
 echo "  autoconf"
-autoconf
+autoconf || exit 1
 
 cd $olddir
 $srcdir/configure "$@" && echo


Property changes on: branches/vorbis-aotuv/autogen.sh
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/configure.in
===================================================================
--- branches/vorbis-aotuv/configure.in	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/configure.in	2006-11-05 14:40:48 UTC (rev 12025)
@@ -5,7 +5,13 @@
 dnl ------------------------------------------------
 
 AC_INIT(lib/mdct.c)
-AM_INIT_AUTOMAKE(libvorbis,1.0.1)
+
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
+AM_CONFIG_HEADER([config.h])
+
+AM_INIT_AUTOMAKE(libvorbis,1.1.0)
 AM_MAINTAINER_MODE
 
 dnl Library versioning
@@ -44,7 +50,7 @@
 
 dnl docbook xml transform and processing tools
 AC_ARG_ENABLE(docs,
-  [  --enable-docs          build the documentation],
+  [  --enable-docs           build the documentation],
   [case "${enableval}" in
     yes) build_docs=true;;
     no)  build_docs=false;;
@@ -57,7 +63,7 @@
   AC_CHECK_PROGS([PDFXMLTEX], pdfxmltex, [/bin/false])
   if test "x$XSLTPROC" = "x/bin/false" || test "x$PDFXMLTEX" = "x/bin/false"; then
     build_docs=false
-    AC_MSG_WARN([Documentation will not be built])
+    AC_MSG_WARN([Documentation will not be built!])
   fi
 fi
 
@@ -67,8 +73,6 @@
 dnl Set build flags based on environment
 dnl --------------------------------------------------
 
-AC_CANONICAL_HOST
-
 dnl Set some target options
 
 cflags_save="$CFLAGS"
@@ -182,12 +186,26 @@
 dnl Check for libraries
 dnl --------------------------------------------------
 
-AC_CHECK_LIB(m, cos, LIBS="-lm", LIBS="")
+AC_CHECK_LIB(m, cos, VORBIS_LIBS="-lm", VORBIS_LIBS="")
 AC_CHECK_LIB(pthread, pthread_create, pthread_lib="-lpthread", :)
 
-XIPH_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
-LIBS="$LIBS $OGG_LIBS"
-AC_CHECK_FUNC(oggpack_writealign, , AC_MSG_ERROR(Ogg >= 1.0 required !))
+HAVE_OGG=no
+dnl first check through pkg-config
+dnl check for pkg-config itself so we don't try the m4 macro without pkg-config
+AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes)
+if test "x$HAVE_PKG_CONFIG" = "xyes"
+then
+  PKG_CHECK_MODULES(OGG, ogg >= 1.0, HAVE_OGG=yes, HAVE_OGG=no)
+fi
+if test "x$HAVE_OGG" = "xno"
+then
+  dnl fall back to the old school test
+  XIPH_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
+  libs_save=$LIBS
+  LIBS="$OGG_LIBS $VORBIS_LIBS"
+  AC_CHECK_FUNC(oggpack_writealign, , AC_MSG_ERROR(Ogg >= 1.0 required !))
+  LIBS=$libs_save
+fi
 
 dnl --------------------------------------------------
 dnl Check for library functions
@@ -200,9 +218,30 @@
 dnl Do substitutions
 dnl --------------------------------------------------
 
-AC_SUBST(LIBS)
+AC_SUBST(VORBIS_LIBS)
 AC_SUBST(DEBUG)
 AC_SUBST(PROFILE)
 AC_SUBST(pthread_lib)
 
-AC_OUTPUT(Makefile lib/Makefile lib/modes/Makefile lib/books/Makefile lib/books/coupled/Makefile lib/books/uncoupled/Makefile lib/books/floor/Makefile doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile include/Makefile include/vorbis/Makefile examples/Makefile win32/Makefile debian/Makefile vq/Makefile vorbis.pc vorbisenc.pc vorbisfile.pc)
+AC_OUTPUT([
+Makefile
+lib/Makefile
+lib/modes/Makefile
+lib/books/Makefile
+lib/books/coupled/Makefile
+lib/books/uncoupled/Makefile
+lib/books/floor/Makefile
+doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile
+include/Makefile include/vorbis/Makefile
+examples/Makefile
+win32/Makefile
+debian/Makefile
+vq/Makefile
+libvorbis.spec
+vorbis.pc
+vorbisenc.pc
+vorbisfile.pc
+vorbis-uninstalled.pc
+vorbisenc-uninstalled.pc
+vorbisfile-uninstalled.pc
+])


Property changes on: branches/vorbis-aotuv/configure.in
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/debian
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/vorbis-aotuv/debian/.cvsignore
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/debian/Makefile.am
===================================================================
--- branches/vorbis-aotuv/debian/Makefile.am	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/debian/Makefile.am	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 EXTRA_DIST = changelog control copyright libvorbis-dev.docs \
 	libvorbis-dev.examples libvorbis-dev.install libvorbis0a.install \
 	libvorbisenc2.install libvorbisfile3.install rules


Property changes on: branches/vorbis-aotuv/debian/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/debian/changelog
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/debian/control
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/debian/copyright
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/debian/libvorbis-dev.docs
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/debian/libvorbis-dev.examples
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/debian/libvorbis-dev.install
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/debian/libvorbis0a.install
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/debian/libvorbisenc2.install
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/debian/libvorbisfile3.install
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/debian/rules
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/.cvsignore
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/Makefile.am
===================================================================
--- branches/vorbis-aotuv/doc/Makefile.am	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/Makefile.am	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,33 +1,24 @@
 ## Process this with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 SUBDIRS = vorbisfile vorbisenc
 
 docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 
-static_docs = components.png \
-	draft-kerr-avt-vorbis-rtp-02.txt \
+### all of the static docs, commited to SVN and included as is
+static_docs = \
+	draft-kerr-avt-vorbis-rtp-03.txt \
 	eightphase.png \
 	evenlsp.png \
-	floor1-1.png \
-	floor1-2.png \
-	floor1-3.png \
-	floor1-4.png \
 	floor1_inverse_dB_table.html \
 	floorval.png \
 	fourphase.png \
 	framing.html \
 	helper.html \
-	hufftree-under.png \
-	hufftree.png \
 	index.html \
 	lspmap.png \
 	oddlsp.png \
 	oggstream.html \
 	programming.html \
-	residue-pack.png \
-	residue2.png \
 	squarepolar.png \
 	stereo.html \
 	stream.png \
@@ -39,20 +30,38 @@
 	vorbisword2.png \
 	wait.png \
 	white-ogg.png \
+	white-xifish.png
+
+### FIXME: bits needed by the spec which lives in xml
+SPEC_PNG = \
+	components.png \
+	floor1-1.png \
+	floor1-2.png \
+	floor1-3.png \
+	floor1-4.png \
+	hufftree.png \
+	hufftree-under.png \
+	residue-pack.png \
+	residue2.png \
 	white-xifish.png \
 	window1.png \
 	window2.png
+SPEC_PDF = xifish.pdf
 
+# FIXME: also needed here
+#	white-xifish.png 
+
 built_docs = Vorbis_I_spec.html Vorbis_I_spec.pdf
 
 # conditionally make the generated documentation
 if BUILD_DOCS
-doc_DATA = $(static_docs) $(built_docs)
+doc_DATA = $(static_docs) $(SPEC_PNG) $(built_docs)
 else
-doc_DATA = $(static_docs)
+doc_DATA = $(static_docs) $(SPEC_PNG)
 endif
 
-EXTRA_DIST = $(static_docs) $(built_docs)
+EXTRA_DIST = $(static_docs) $(doc_sources) \
+	$(SPEC_PNG) $(SPEC_PDF) $(built_docs)
 
 doc_sources = xml/Vorbis_I_spec.xml \
 	xml/01-introduction.xml \
@@ -72,23 +81,53 @@
 	xml/spec-fo.xsl \
 	xml/spec-html.xsl
 
-nobase_EXTRA_DIST = $(doc_sources)
-
 # these are expensive; only remove if we have to
-MAINTAINERCLEANFILES = $(built_docs)
+DISTCLEANFILES = $(built_docs)
 CLEANFILES = Vorbis_I_spec.fo spec.aux spec.log spec.out
 
+# rules for temporary build dir for spec
+BUILDDIR = build
+# how to copy images to build dir
+SPEC_PNG_BUILD = $(foreach file, $(SPEC_PNG), $(BUILDDIR)/$(file))
+SPEC_PDF_BUILD = $(foreach file, $(SPEC_PDF), $(BUILDDIR)/$(file))
+$(BUILDDIR)/%: $(srcdir)/%
+	@echo "Copying $< to $@"
+	@mkdir -p $(BUILDDIR)
+	@cp $< $@
+
+# how to copy the xml to build dir; cheat by only targeting the main one
+$(BUILDDIR)/Vorbis_I_spec.xml: $(doc_sources)
+	@mkdir -p $(BUILDDIR)
+	@for file in $(doc_sources); do cp $(srcdir)/$$file $(BUILDDIR); done
+# translate the draft rtp.txt to .xml in the BUILDDIR
+$(BUILDDIR)/draft-rtp.xml: draft-kerr-avt-vorbis-rtp-03.txt
+	cat $< | sed 's///g' > $@
+# cat $< | sed 's///g' | sed 's/</\&lt;/g' | sed 's/>/\&gt;/g' > $@
+
 # explicit rules for generating docs
-Vorbis_I_spec.html:
-	xsltproc --xinclude --output $@ $(srcdir)/xml/spec-html.xsl $(srcdir)/xml/Vorbis_I_spec.xml
+if BUILD_DOCS
+Vorbis_I_spec.html: $(SPEC_PNG_BUILD) $(BUILDDIR)/Vorbis_I_spec.xml
+	cd build; xsltproc --xinclude --output Vorbis_I_spec.html spec-html.xsl Vorbis_I_spec.xml && mv $@ ..
 
-Vorbis_I_spec.fo:
-	xsltproc --xinclude --output $@ $(srcdir)/xml/spec-fo.xsl $(srcdir)/xml/Vorbis_I_spec.xml
+Vorbis_I_spec.fo: $(BUILDDIR)/Vorbis_I_spec.xml
+	cd build; xsltproc --xinclude --output $@ spec-fo.xsl Vorbis_I_spec.xml && mv $@ ..
 
-Vorbis_I_spec.pdf: Vorbis_I_spec.fo
-	cp $< spec.fo # work around a passivetex bug
-	pdfxmltex --interaction nonstopmode spec.fo
-	pdfxmltex --interaction nonstopmode spec.fo
-	rm spec.fo
-	mv spec.pdf $@
+Vorbis_I_spec.pdf: Vorbis_I_spec.fo $(SPEC_PNG_BUILD) $(SPEC_PDF_BUILD)
+	cp $< build/spec.fo # work around a passivetex bug
+	cd build; pdfxmltex --interaction nonstopmode spec.fo
+	cd build; pdfxmltex --interaction nonstopmode spec.fo
+	rm build/spec.fo
+	mv build/spec.pdf $@
+else
+Vorbis_I_spec.html: NO_DOCS_ERROR
+Vorbis_I_spec.pdf: NO_DOCS_ERROR
+NO_DOCS_ERROR:
+	@echo
+	@echo "*** Documentation has not been built! ***"
+	@echo "Try re-running after passing --enable-docs to configure."
+	@echo
+endif
 
+# clean up build dir
+clean-local:
+	-$(RM) -r $(BUILDDIR)


Property changes on: branches/vorbis-aotuv/doc/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/components.png
___________________________________________________________________
Name: svn:keywords
   + Id

Deleted: branches/vorbis-aotuv/doc/draft-kerr-avt-vorbis-rtp-02.txt
===================================================================
--- branches/vorbis-aotuv/doc/draft-kerr-avt-vorbis-rtp-02.txt	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/draft-kerr-avt-vorbis-rtp-02.txt	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,1022 +0,0 @@
-
-
-Network Working Group				               Phil Kerr
-Internet-Draft		 			    Ogg Vorbis Community
-June 10, 2003                                                  OpenDrama
-Expires: December 10, 2003      
-
-
-  	      RTP Payload Format for Vorbis Encoded Audio
-
-		   <draft-kerr-avt-vorbis-rtp-02.txt>
-
-Status of this Memo
-
-   This document is an Internet-Draft and is in full conformance
-   with all provisions of Section 10 of RFC2026.
-
-   Internet-Drafts are working documents of the Internet Engineering
-   Task Force (IETF), its areas, and its working groups.  Note that
-   other groups may also distribute working documents as
-   Internet-Drafts.
-
-   Internet-Drafts are draft documents valid for a maximum of six
-   months and may be updated, replaced, or obsoleted by other
-   documents at any time.  It is inappropriate to use Internet-
-   Drafts as reference material or to cite them other than as
-   "work in progress".
-
-   The list of current Internet-Drafts can be accessed at 
-   http://www.ietf.org/ietf/1id-abstracts.txt
-
-   The list of Internet-Draft Shadow Directories can be accessed at
-   http://www.ietf.org/shadow.html.
-
-Copyright Notice
-
-   Copyright (C) The Internet Society (2003).  All Rights Reserved.
-
-Abstract
-	
-   This document describes a RTP payload format for transporting 
-   Vorbis encoded audio.  It details the RTP encapsulation mechanism 
-   for raw Vorbis data and details the delivery mechanisms for the 
-   decoder probability model, referred to as a codebook, metadata 
-   and other setup information.
-
-
-
-
-
-
-
-
-
-
-
-
-Kerr                     Expires December 10, 2003              [Page 1]
-
-Internet Draft      draft-kerr-avt-vorbis-rtp-02.txt       June 10, 2003
-
-
-Table of Contents
-
-   1.         Introduction ........................................    2
-   1.1        Terminology .........................................    3
-   2.         Payload Format ......................................    3
-   2.1        RTP Header ..........................................    3
-   2.2        Payload Header ......................................    4
-   2.3        Payload Data ........................................    5
-   2.4        Example RTP Packet ..................................    5
-   3.         Frame Packetizing ...................................    6
-   3.1        Example Fragmented Vorbis Packet ....................    6
-   3.2        Packet Loss .........................................    8
-   4.         Configuration Headers ...............................    8
-   4.1        RTCP Based Config Header Transmission ...............    9
-   4.2        Codebook Caching ....................................   11
-   5.         Session Description .................................   11
-   5.1        SDP Based Config Header Transmission ................   12
-   6.         IANA Considerations .................................   13
-   7.         Congestion Control ..................................   13
-   8.         Security Considerations .............................   14
-   9.         Acknowledgements ....................................   14
-   10.        Normative References ................................   14
-   10.1       Informative References ................................ 14
-   11.        Full Copyright Statement ............................   15
-   12.        Authors Address .....................................   15
-
-
-1 Introduction
-
-   The Xiph.org Foundation creates and defines codecs for use in 
-   multimedia that are not encumbered by patents and thus may be freely 
-   implemented by any individual or organization.
-
-   Vorbis is a general purpose perceptual audio codec intended to allow 
-   maximum encoder flexibility, thus allowing it to scale competitively 
-   over an exceptionally wide range of bitrates.   At the high 
-   quality/bitrate end of the scale (CD or DAT rate stereo, 
-   16/24 bits), it is in the same league as MPEG-2 and MPC. Similarly, 
-   the 1.0 encoder can encode high-quality CD and DAT rate stereo at 
-   below 48k bits/sec without resampling to a lower rate.   Vorbis is 
-   also intended for lower and higher sample rates (from 8kHz 
-   telephony to 192kHz digital masters) and a range of channel 
-   representations (monaural, polyphonic, stereo, quadraphonic, 5.1, 
-   ambisonic, or up to 255 discrete channels).
-
-   Vorbis encoded audio is generally encapsulated within an Ogg format 
-   bitstream [1], which provides framing and synchronization.  For the 
-   purposes of RTP transport, this layer is unnecessary, and so raw 
-   Vorbis packets are used in the payload.
-
-
-
-
-
-Kerr                     Expires December 10, 2003              [Page 2]
-
-Internet Draft      draft-kerr-avt-vorbis-rtp-02.txt       June 10, 2003
-
-
-1.1 Terminology
-
-   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
-   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
-   document are to be interpreted as described in RFC 2119 [2].
-
-2 Payload Format
-
-   For RTP based transportation of Vorbis encoded audio the standard 
-   RTP header is followed by an 8 bit payload header, then the payload 
-   data.
-
-
-2.1 RTP Header
-
-     0                   1                   2                   3
-   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |V=2|P|X|  CC   |M|     PT      |       sequence number         |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                           timestamp                           |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |           synchronization source (SSRC) identifier            |
-   +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-   |            contributing source (CSRC) identifiers             |
-   |                              ...                              |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-   The RTP header begins with an octet of fields (V, P, X, and CC) to   
-   support specialized RTP uses (see [4] and [5] for details). For 
-   Vorbis RTP, the following values are used.
-
-   Version (V): 2 bits
-      This field identifies the version of RTP. The version
-      used by this specification is two (2).
-
-   Padding (P): 1 bit
-      If the padding bit is set, the packet contains one or more
-      additional padding octets at the end which are not part of
-      the payload.  P is set if the total packet size is less than 
-      the MTU.  
-
-   Extension (X): 1 bit
-      If the extension, X,  bit is set, the fixed header MUST be 
-      followed by exactly one header extension, with a format defined 
-      in Section 5.3.1. of [4], 
-
-   CSRC count (CC): 4 bits
-      The CSRC count contains the number of CSRC identifiers.
-
-
-
-Kerr                     Expires December 10, 2003              [Page 3]
-
-Internet Draft      draft-kerr-avt-vorbis-rtp-02.txt       June 10, 2003
-
-
-   Marker (M): 1 bit
-      Set to zero.  Audio silence suppression not used.  This conforms
-      to section 4.1 of [6].
-
-   Payload Type (PT): 7 bits
-      An RTP profile for a class of applications is expected to assign 
-      a payload type for this format, or a dynamically allocated 
-      payload type SHOULD be chosen which designates the payload as 
-      Vorbis.
-
-   Sequence number: 16 bits
-      The sequence number increments by one for each RTP data packet
-      sent, and may be used by the receiver to detect packet loss and
-      to restore packet sequence. This field is detailed further in
-      [3].
-
-   Timestamp: 32 bits
-      A timestamp representing the sampling time of the first sample of
-      the first Vorbis packet in the RTP packet.  The clock frequency 
-      MUST be set to the sample rate of the encoded audio data and is 
-      conveyed out-of-band.
-
-   SSRC/CSRC identifiers: 
-      These two fields, 32 bits each with one SSRC field and a maximum 
-      of 16 CSRC fields, are as defined in [3].  
-
-
-2.2 Payload Header
-
-   After the RTP Header section the next octet is the Payload Header.  
-   This octet is split into a number of bitfields detailing the format
-   of the following Payload Data packets.
-
-     0   1   2   3   4   5   6   7
-   +---+---+---+---+---+---+---+---+
-   | C | F | R |  # of packets     |
-   +---+---+---+---+---+---+---+---+
-
-   Continuation (C): 1 bit
-      Set to one if this is a continuation of a fragmented packet.
-
-   Fragmented (F): 1 bit
-      Set to one if the payload contains complete packets or if it
-      contains the last fragment of a fragmented packet. 
-
-   Reserved (R): 1 bit
-      Reserved, MUST be set to zero by senders, and ignored by 
-      receivers.
-
-   The last 5 bits are the number of complete packets in this payload.  
-   This provides for a maximum number of 32 Vorbis packets in the 
-   payload.  If C is set to one, this number SHOULD be 0.
-
-Kerr                     Expires December 10, 2003              [Page 4]
-
-Internet Draft      draft-kerr-avt-vorbis-rtp-02.txt       June 10, 2003
-
-
-2.3 Payload Data
-
-   Vorbis packets are unbounded in length currently.  At some future
-   point there will likely be a practical limit placed on packet
-   length.  
-
-   Typical Vorbis packet sizes are from very small (2-3 bytes) to 
-   quite large (8-12 kilobytes).  The reference implementation [9] 
-   typically produces packets less than ~800 bytes, except for the
-   header packets which are ~4-12 kilobytes.
-
-   Within a RTP context the maximum Vorbis packet SHOULD be kept below
-   the MTU size, typically 1500 octets, including the RTP and payload 
-   headers, to avoid fragmentation.  For the delivery of Vorbis audio 
-   using RTP the maximum size of the header block is limited to 64K.
-
-   If the payload contains a single Vorbis packet or a Vorbis packet
-   fragment, the Vorbis packet data follows the payload header.
-
-   For payloads which consist of multiple Vorbis packets, payload data 
-   consists of one octet representing the packet length followed by 
-   the packet data for each of the Vorbis packets in the payload.
-
-   The Vorbis packet length octet is the length of the data block 
-   minus one.   
-
-   The payload packing of the Vorbis data packets SHOULD follow the
-   guidelines set-out in section 4.4 of [5] where the oldest packet
-   occurs immediately after the RTP packet header.
-
-   Channel mapping of the audio is in accordance with BS. 775-1 
-   ITU-R.
-
-
-2.4 Example RTP Packet
-
-   Here is an example RTP packet containing two Vorbis packets.
-
-   RTP Packet Header:
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   | 2 |0|0|  0    |0|      PT     |       sequence number         |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                 timestamp (in sample rate units)              |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |          synchronisation source (SSRC) identifier             |
-   +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-   |            contributing source (CSRC) identifiers             |
-   |                              ...                              |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-Kerr                     Expires December 10, 2003              [Page 5]
-
-Internet Draft      draft-kerr-avt-vorbis-rtp-02.txt       June 10, 2003
-
-
-   Payload Data:
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |0|1|0| # pks: 2|      len      |         vorbis data ...       |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                      ...vorbis data...                        |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |      ...      |      len      |   next vorbis packet data...  |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-3 Frame Packetizing
-
-   Each RTP packet contains either one complete Vorbis packet, one 
-   Vorbis packet fragment, or an integer number of complete Vorbis 
-   packets (up to a max of 32 packets, since the number of packets 
-   is defined by a 5 bit value).
-
-   Any Vorbis packet that is larger than 256 octets and less than the
-   path-MTU MUST be placed in a RTP packet by itself.
-
-   Any Vorbis packet that is 256 bytes or less SHOULD be bundled in the
-   RTP packet with as many Vorbis packets as will fit, up to a maximum
-   of 32.
-
-   If a Vorbis packet will not fit within the network MTU, it SHOULD be
-   fragmented.  A fragmented packet has a zero in the last five bits 
-   of the payload header.  Each fragment after the first will also set 
-   the Continued (C) bit to one in the payload header.  The RTP packet 
-   containing the last fragment of the Vorbis packet will have the 
-   Final Fragment (F) bit set to one.  To maintain the correct sequence
-   for fragmented packet reception the timestamp field of fragmented 
-   packets MUST be the same as the first packet sent, with the sequence 
-   number incremented as normal for the subsequent RTP packets. 
-
-
-
-
-3.1 Example Fragmented Vorbis Packet
-
-   Here is an example fragmented Vorbis packet split over three RTP
-   packets.  
-
-
-
-
-
-
-
-
-
-Kerr                     Expires December 10, 2003              [Page 6]
-
-Internet Draft      draft-kerr-avt-vorbis-rtp-02.txt       June 10, 2003
-
-
-   Packet 1:
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |V=2|P|X|  CC   |M|     PT      |           1000                |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                             xxxxx                             |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |           synchronization source (SSRC) identifier            |
-   +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-   |            contributing source (CSRC) identifiers             |
-   |                              ...                              |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |0|0|0|        0|      len      |         vorbis data ..        |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                       ..vorbis data..                         |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-   In this packet the initial sequence number is 1000 and the 
-   timestamp is xxxxx.  The number of packets field is set to 0.
-
-
-   Packet 2:
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |V=2|P|X|  CC   |M|     PT      |           1001                |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                             xxxxx                             |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |           synchronization source (SSRC) identifier            |
-   +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-   |            contributing source (CSRC) identifiers             |
-   |                              ...                              |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |1|0|0|        0|      len      |         vorbis data ...       |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                       ..vorbis data..                         |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-   The C bit is set to 1 and the number of packets field is set to 0.
-   For large Vorbis fragments there can be several of these type of
-   payload packets.  The maximum packet size SHOULD be no greater
-   than the MTU of 1500 octets, including all RTP and payload headers.
-   The sequence number has been incremented by one but the timestamp 
-   field remains the same as the initial packet.
-
-
-
-
-
-Kerr                     Expires December 10, 2003              [Page 7]
-
-Internet Draft      draft-kerr-avt-vorbis-rtp-02.txt       June 10, 2003
-
-
-   Packet 3:
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |V=2|P|X|  CC   |M|     PT      |           1002                |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                             xxxxx                             |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |           synchronization source (SSRC) identifier            |
-   +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-   |            contributing source (CSRC) identifiers             |
-   |                              ...                              |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |1|1|0|        0|      len      |         vorbis data ..        |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                       ..vorbis data..                         |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-   This is the last Vorbis fragment packet.  The C and F bits are 
-   set and the packet count remains set to 0.  As in the previous 
-   packets the timestamp remains set to the first packet in the 
-   sequence and the sequence number has been incremented.
-
-
-3.2 Packet Loss
-
-   As there is no error correction within the Vorbis stream, packet 
-   loss will result in a loss of signal.  Packet loss is more of an 
-   issue for fragmented Vorbis packets as the client will have to 
-   cope with the handling of the C and F flags.  If we use the 
-   fragmented Vorbis packet example above and the first packet is
-   lost the client SHOULD detect that the next packet has the packet
-   count field set to 0 and the C bit is set and MUST drop it.  The
-   next packet, which is the final fragmented packet, MUST be dropped
-   in the same manner.  Feedback reports on lost and dropped packets
-   MUST be sent back via RTCP.
-
-
-4 Configuration Headers
-
-   To decode a Vorbis stream three configuration header blocks are
-   needed.  The first header indicates the sample and bitrates, the 
-   number of channels and the version of the Vorbis encoder used.  
-   The second header contains the decoders probability model, or 
-   codebooks and the third header details stream metadata.
-
-
-
-
-
-
-Kerr                     Expires December 10, 2003              [Page 8]
-
-Internet Draft      draft-kerr-avt-vorbis-rtp-02.txt       June 10, 2003
-
-
-   As the RTP stream may change certain configuration data mid-session
-   there are two different methods for delivering this configuration
-   data to a client, RTCP which is detailed below and SDP which is 
-   detailed in section 5.  SDP delivery is used to set-up an initial
-   state for the client application and RTCP is used to change state
-   during the session.  The changes may be due to different metadata
-   or codebooks as well as different bitrates of the stream.
-
-   Unlike other mainstream audio codecs Vorbis has no statically 
-   configured probability model, instead it packs all entropy decoding
-   configuration, VQ and Huffman models into a self-contained codebook.
-   This codebook block also requires additional identification 
-   information detailing the number of audio channels, bit rates and
-   other information used to initialise the Vorbis stream.
-
-
-4.1 RTCP Based Header Transmission
-
-   The three header data blocks are sent out-of-band as an APP defined 
-   RTCP message with the 4 octet name field set to VORB. 
-
-   VORB RTCP packets MUST set the padding (P) flag and add the
-   appropriate padding octets needed to conform with section 6.6 
-   of [3].  Synchronizing the configuration headers to the RTP stream 
-   is  critical.  A 32 bit timestamp field is used to indicate the
-   timepoint when a VORB header MUST be applied to the RTP stream. 
-   VORB RTCP packets MUST be sent just ahead of the change in the RTP
-   stream.  As the reception loss of the RTCP header will mean the 
-   RTP stream will fail to decode properly the freqency of their 
-   periodic retransmission MUST be high enough to minimize the    
-   stream disturbance whilst remaining under the RTCP bandwidth
-   allocation.
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |V=2|P| subtype |   PT=APP=204  |             Length            |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                           SSRC/CSRC                           |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                             VORB                              |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                 Timestamp (in sample rate units)              |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                        Vorbis Version                         |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                       Audio Sample Rate                       |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                        Bitrate Maximum                        |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                        Bitrate Nominal                        |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-Kerr                     Expires December 10, 2003              [Page 9]
-
-Internet Draft      draft-kerr-avt-vorbis-rtp-02.txt       June 10, 2003
-
-
-    0                   1                   2                   3
-    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                        Bitrate Minimum                        |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   | bsz 0 | bsz 1 |       Num Audio Channels      |c|m|o|x|x|x|x|x|
-   +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-   |     Codebook length           |      Codebook checksum        |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   ..                          Codebook                            |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   ..                          URI string                          |
-   +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-   |                      Vendor string length                     |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                         Vendor string                        ..
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                    User comments list length                  |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   ..               User comment length / User comment             |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-   The first Vorbis config header defines the Vorbis stream 
-   attributes.  The Vorbis version MUST be set to zero to comply with
-   this document.  The fields Sample Rate, Bitrate Maximum/Nominal/
-   Minimum and Num Audio Channels are set in accordance with [6] with 
-   the bsz fields above referring to the blocksize parameters.  The 
-   framing bit is not used for RTP transportation and so applications 
-   constructing Vorbis files MUST take care to set this if required.
-
-   The next 8 bits are used to indicate the presence of the two 
-   other Vorbis stream config headers and the size overflow header.
-
-   The c flag indicates the presence of a codebook header block, the
-   m flag indicates the presence of a comment metadata block.  The o
-   flag indicates if the size of either of the c and m headers would
-   make the VORB packet greater than that allowed for a RTCP message.
-
-   The remaining five bits, indicated with an x, are reserved/unused
-   and MUST be set to 0 for this version of the document.
-
-   If the c flag is set then the next header block will contain the 
-   codebook configuration data.  
-
-   This setup information MUST be completely intact, as a client can 
-   not decode a stream with an incomplete or corrupted codebook set.
-
-   A 16 bit codebook length field and a 16 bit 1's complement checksum
-   of the codebook precedes the codebook datablock.  The length field 
-   allows for codebooks to be up to 64K in size. The checksum is used 
-   to detect a corrupted codebook.  
-
-Kerr                     Expires December 10, 2003             [Page 10]
-
-Internet Draft      draft-kerr-avt-vorbis-rtp-02.txt       June 10, 2003
-
-
-   If a checksum failure is detected then a new config header file
-   SHOULD be obtained from SDP, if the codebook has not changed since
-   the session has started.  If no SDP value is set and no other method
-   for obtaining the config headers exists then this is considered to 
-   be a failure and SHOULD be reported to the client application.
-
-   If the m flag is set then the next header block will contain the 
-   comment metadata, such as artist name, track title and so on.  These
-   metadata messages are not intended to be fully descriptive but to 
-   offer basic track/song information.  This message MUST be sent at 
-   the start of the stream, together with the setup and codebook 
-   headers, even if it contains no information.  During a session the
-   metadata associated with the stream may change from that specified 
-   at the start, e.g. a live concert broadcast changing acts/scenes, so
-   clients MUST have the ability to receive m header blocks.  Details
-   on the format of the comments can be found in the Vorbis 
-   documentation [7].
-
-   The format for the data takes the form of a 32 bit codec vendors
-   name length field followed by the name encoded in UTF-8.  The next
-   field denotes the number of user comments and then the user comments
-   length and text field pairs, up to the number indicated by the user 
-   comment list length.   
-
-   If the o, overflow, bit is set then the URI of a whole header block
-   is specified in an overflow URI field, which is a null terminated 
-   UTF-8 string.  The header file specified at the URI MUST NOT have 
-   the overflow flag set, otherwise a loop condition will occur. 
-
-
-4.2 Codebook Caching
-
-   Codebook caching allows clients that have previously connected to a 
-   stream to re-use the codebooks and thus begin the playback of the 
-   session faster.  When a client receives a codebook it may store
-   it, together with the MD5 key, locally and can compare the MD5 key
-   of locally cached codebooks with the key it receives via SDP, which
-   is detailed in section 5.1.   
-   
-
-5 Session Description for Vorbis RTP Streams
-
-   Session description information concerning the Vorbis stream 
-   SHOULD be provided if possible and MUST be in accordance with [8].  
-   The SDP information is split into two sections, a mandatory 
-   section detailing the RTP stream and an optional section used to 
-   convey information needed for codebook caching.
-
-
-
-
-
-
-Kerr                     Expires December 10, 2003             [Page 11]
-
-Internet Draft      draft-kerr-avt-vorbis-rtp-02.txt       June 10, 2003
-
-
-   Below is an outline of the mandatory SDP attributes.
-
-   u=<URI of Vorbis header file>
-   m=audio <port> RTP/AVP 98
-   c=IN IP4/6 <URI of Vorbis stream>
-   a=rtpmap:98 vorbis/<sample rate>
-
-   The contents of the Vorbis Header file referred to in the 
-   u attribute MUST contain all three of the config header blocks 
-   as specified in section 4.  The overflow bit of the header packet
-   MUST not be set.
-
-   The port value is specified by the server application bound to 
-   the URI specified in the c attribute.  The bitrate value specified 
-   in the a attribute MUST match the Vorbis sample rate value.
-
-5.1 SDP Based Config Header Transmission
-
-   The optional SDP attributes are used to convey details of the 
-   Vorbis stream which are required for codebook caching.  If the 
-   following attributes are set they take precedent over values 
-   specified in the u attribute detailed above.  The maximum size
-   of the mandatory and optional SDP attributes MUST be less than
-   1K in size to conform to section 4.1 of [8].
-
-   a=md5key:<MD5 key of codebook>
-   a=bitrate_min:<Bitrate Minimum>
-   a=bitrate_norm:<Bitrate Normal>
-   a=bitrate_max:<Bitrate Maximum>
-   a=bsz0:<Block Size 0>
-   a=bsz1:<Block Size 1>
-   a=channels:<Num Audio Channels>
-   a=meta_vendor:<Vendor Name>
-
-   If the codebook MD5 attribute, md5key, is set the key is compared 
-   to a locally held cache and if found the associated local codebook 
-   is used, if not the client MUST use the configuration headers
-   specified in the u attribute.  
-
-   The md5key requires other attributes which detail bitrates, channels
-   and metadata associated with the RTP stream.  The attributes
-   following the md5key example above MUST all be present.
-
-   The metadata attribute, meta_vendor, provides the bare minimum 
-   information required for decoding but does not convey any 
-   meaningfull stream metadata information.  As outlined in the Vorbis 
-   comment field and header specification documentation, [7], a number 
-   of predefined field names are available which SHOULD be used.  An 
-   example would be:
-
-
-
-
-Kerr                     Expires December 10, 2003             [Page 12]
-
-Internet Draft      draft-kerr-avt-vorbis-rtp-02.txt       June 10, 2003
-
-
-   a=meta_vendor:Xiph.Org libVorbis I 20020717
-   a=meta_artist:Honest Bob and the Factory-to-Dealer-Incentives
-   a=meta_title:I'm Still Around
-   a=meta_tracknumber:5
-
-
-6 IANA Considerations
-
-   MIME media type name: audio
-
-   MIME subtype: vorbis
-
-   Required Parameters: none
-
-   Optional Parameters: none
-
-   Encoding considerations:
-         This type is only defined for transfer via RTP as specified in
-         a Work in Progress.
-
-   Security Considerations:
-         See Section 6 of RFC 3047.
-
-   Interoperability considerations: none
-
-   Published specification:
-         See the Vorbis documentation [2] for details.
-
-   Applications which use this media type:
-         Audio streaming and conferencing tools
-
-   Additional information: none
-
-   Person & email address to contact for further information:
-         Phil Kerr
-         philkerr at elec.gla.ac.uk
-
-   Intended usage: COMMON
-
-   Author/Change controller:
-         Author: Phil Kerr
-         Change controller: Phil Kerr
-
-
-7 Congestion Control    
-
-   Vorbis clients SHOULD send regular receiver reports detailing 
-   congestion.  A mechanism for dynamically downgrading the stream, 
-   known as bitrate peeling, will allow for a graceful backing off
-   of the stream bitrate.  This feature is not available at present
-   so an alternative would be to redirect the client to a lower 
-   bitrate stream if one is available.  
- 
-Kerr                     Expires December 10, 2003             [Page 13]
-
-Internet Draft      draft-kerr-avt-vorbis-rtp-02.txt       June 10, 2003
-
-
-8 Security Considerations
-
-   RTP packets using this payload format are subject to the security 
-   considerations discussed in the RTP specification [3].  This implies 
-   that the confidentiality of the media stream is achieved by using
-   encryption.  Because the data compression used with this payload
-   format is applied end-to-end, encryption may be performed on the 
-   compressed data.  Where the size of a data block is set care MUST 
-   be taken to prevent buffer overflows in the client applications.
-
-
-9 Acknowledgments
-
-   This document is a continuation of draft-moffitt-vorbis-rtp-00.txt.
-   The MIME type section is a continuation of draft-short-avt-rtp-
-   vorbis-mime-00.txt
-
-   Thanks to the AVT, Ogg Vorbis Communities / Xiph.org including 
-   Steve Casner, Ramon Garcia, Pascal Hennequin, Ralph Jiles, 
-   Tor-Einar Jarnbjo, Colin Law, John Lazzaro, Jack Moffitt, 
-   Colin Perkins, Barry Short, Mike Smith.
-
-
-10 Normative References
-
-   1. The Ogg Encapsulation Format Version 0 (RFC 3533), S. Pfeiffer.
-
-   2. Key words for use in RFCs to Indicate Requirement Levels 
-      (RFC 2119), S. Bradner.
-
-   3. RTP: A Transport Protocol for Real-Time Applications (RFC 1889),
-      Schulzrinne, et al.
-  
-   4. RTP: A transport protocol for real-time applications. Work   
-      in progress, draft-ietf-avt-rtp-new-11.txt.
-
-   5. RTP Profile for Audio and Video Conferences with Minimal Control. 
-      Work in progress, draft-ietf-avt-profile-new-12.txt.
-
-   6. Ogg Vorbis I spec:  Codec setup and packet decode.
-      http://www.xiph.org/ogg/vorbis/doc/vorbis-spec-ref.html
-
-   7. Ogg Vorbis I spec:  Comment field and header specification. 
-      http://www.xiph.org/ogg/vorbis/doc/v-comment.html
-
-   8. SDP: Session Description Protocol (RFC 2327), Handley, M. and 
-      V. Jacobson.
-
-
-10.1 Informative References
-
-   9. libvorbis: Available from the Xiph website, http://www.xiph.org  
-
-Kerr                     Expires December 10, 2003             [Page 14]
-
-Internet Draft      draft-kerr-avt-vorbis-rtp-02.txt       June 10, 2003
-
-11 Full Copyright Statement
-
-   Copyright (C) The Internet Society (2003). All Rights Reserved.
-
-   This document and translations of it may be copied and furnished to
-   others, and derivative works that comment on or otherwise explain it
-   or assist in its implementation may be prepared, copied, published
-   and distributed, in whole or in part, without restriction of any
-   kind, provided that the above copyright notice and this paragraph are
-   included on all such copies and derivative works. However, this
-   document itself may not be modified in any way, such as by removing
-   the copyright notice or references to the Internet Society or other
-   Internet organizations, except as needed for the purpose of
-   developing Internet standards in which case the procedures for
-   copyrights defined in the Internet Standards process must be
-   followed, or as required to translate it into languages other than
-   English.
-
-   The limited permissions granted above are perpetual and will not be
-   revoked by the Internet Society or its successors or assigns.
-
-   This document and the information contained herein is provided on an
-   "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
-   TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
-   BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
-   HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
-   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-
-12 Authors Address
-
-   Phil Kerr
-   Centre for Music Technology
-   University of Glasgow
-   Glasgow, Scotland
-   UK, G12 8LT
-   Phone: +44 141 330 5740
-   Email: philkerr at elec.gla.ac.uk
-          phil at plus24.com
-
-   WWW: http://www.xiph.org/
-
-
-
-
-
-
-
-
-
-Kerr                     Expires December 10, 2003             [Page 15]
-
-
-
-From: Colin Perkins <csp at csperkins.org>
-Date: Tue May 6, 2003  23:29:25 Europe/London
-To: philkerr at elec.gla.ac.uk
-Cc: avt at ietf.org
-Subject: [AVT] Re: Status of draft-kerr-avt-vorbis-rtp-01
-
-Hi Phil,
-
---> philkerr at elec.gla.ac.uk writes:
-I'm checking on the status of draft-kerr-avt-vorbis-rtp-01 and how things can be
-moved forward with it.  The update was submitted just before the cutoff for the
-last AVT meeting and there seems to have been no action on it since.
-
-I took the liberty of cc'ing the AVT mailing list, to encourage feedback.
-
-There are a few small changes I may wish to make to the draft, which will be
-discussed at a Vorbis meeting tomorrow, but I wanted to check with you first on
-if the 01 draft is good enough to move forward.
-
-I think it's in good shape, although I have a couple of issues:
-
- - Section 2.1 notes that the P, X and CC fields of the RTP header are set
-   to 0. I'm not sure it's appropriate for a payload format to specify this: 
-   I can imagine valid scenarios where each of these can be used with Vorbis. *
-
- - The discussion in section 3 can make use of normative language to be
-   clear on how frames are packetized. I suggest the following changes:
-
-       Any Vorbis packet that is larger than 256 octets and less than the
-       path-MTU should be placed in a RTP packet by itself.
-                ^^^^^^ MUST
-*
-       Any Vorbis packet that is 256 bytes or less should be bundled in the
-                                                   ^^^^^^ SHOULD
-       RTP packet with as many Vorbis packets as will fit, up to a maximum
-       of 32.
-*
-       If a Vorbis packet will not fit into the RTP packet, it must be 
-                within the network MTU ^^^^^^^^^^^^^^^^^^^     ^^^^ SHOULD
-       fragmented.  A fragmented packet has a zero in the last five bits 
-       of the payload header.  Each fragment after the first will also set 
-       the Continued (C) bit to one in the payload header.  The RTP packet 
-       containing the last fragment of the Vorbis packet will have the 
-       Marker (F) bit set to one.
-       ^^^^^^ Final Fragment 
-                  (to avoid confusion with the RTP Marker bit)
-*
-
- - The IANA considerations section needs to be expanded. Section 4 of RFC
-   3047 is a good example, to illustrate the format. *
-
- - Regarding the configuration headers, is there a need to send updates
-   during a session? If not, it might be appropriate to define some SDP
-   parameters to convey the configuration data at session initiation time,
-   rather than relying on RTCP. If RTCP is to be used, it's necessary to
-   discuss reliability, and how a receiver reacts if the information is
-   lost.
-
-I also have a few editorial comments:
-
- - The interpretation of key words and reference to RFC 2119 should be
-   moved into the Introduction rather than being in the Status of this
-   Memo section. *
-
- - I suggest moving the last three paragraphs of the Introduction into
-   section 2.3, where the packing of the payload data is discussed. It
-   may also be appropriate to include a slightly longer description of
-   the Vorbis codec and when it might be useful in the Introduction. *
-
- - In section 3.1, it might be useful to include the RTP packet header 
-   details, to show how the RTP sequence number and timestamp are used
-   (sequence number increases by one for each packet, timestamp stays 
-   the same for each fragment). *
-
- - Section 7 might reference the discussion of congestion control in 
-   the RTP spec and/or profile
-
- - References should be split into Normative and Informative sections. *
-
-
-Cheers,
-Colin
-_______________________________________________
-Audio/Video Transport Working Group
-avt at ietf.org
-https://www1.ietf.org/mailman/listinfo/avt
-
-
-
-
-
-Hi All,
-
-Please find below an updated Vorbis-RTP Internet Draft document for review and discussion at the Xiph IRC meeting on Saturday.
-
-The changes in this version have been:
-
-Codebook caching mechanism
-Expanded SDP parameters
-Expanded MIME section
-Expanded introduction
-Packet loss section
-Minor tweaks and clarity changes to text
-
-There are probably some minor tweaks to the formatting needed which will be done before the final submission.
-
-Open issues concern:
-
-Bitrate peeling for congestion control needs to be firmed up
-A clearer definition of the path MTU is probably needed
-
-Feedback and comments welcomed of course.
-
-All being well I will submit this to the IETF early next week with a request to move the document to AVT WG status (a step closer to RFC).
-
-Regards
-
-Phil
-
-
-Annexe) some comments on  draft-kerr-avt-vorbis-rtp-01 :
-    - Section 3, p5.  "path-MTU" is not a clear concept in IP multicast.
-      (path-mtu discover algorithm not operationnal here)
-      Open issue : optimal value for a "RTP-MTU" with vorbis ?
-          (IP fragmentation/reassembling vs RTP framentation/reassembling ?) 
-          (size and frequency of "big" vorbis packet ?)
-          (optimistic MTU=1500, pessimistic MTU=500, Neutral MTU=1000 ?) *?
-
-    - Section 5, p.9 last paragraph. "the URI value set there" is in SDP *
-      information or in VORB RTCP overflow field ? 
- 
-    - Section 5 sentence "The framing bit is not used for RTP ..." appears *
-      2 times.
-
-    - Section 6, c=IN IP4 .. ; no reason to restrict to IPv4 *
-
-    - Section 6, needs clarification for "all three of the config header *
-      blocks". starting of the first block ?
-
-    - Section 2.2,  figure, numbering from 0 to 7 is better *
-
-    - Need rules for reassembling process (Section 3.2 ?).
-       Normal process
-       misordering ?
-       process with loss of fragment ? temporisation ?? *
-
-    - More generally what is the consequence of vorbis packet loss,
-      and vorbis packet misordeing ?
-    -  ...
-
-
-

Copied: branches/vorbis-aotuv/doc/draft-kerr-avt-vorbis-rtp-03.txt (from rev 12024, tags/vorbis/libvorbis-1.1.0/doc/draft-kerr-avt-vorbis-rtp-03.txt)


Property changes on: branches/vorbis-aotuv/doc/eightphase.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/evenlsp.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/floor1-1.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/floor1-2.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/floor1-3.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/floor1-4.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/floor1_inverse_dB_table.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/floorval.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/fourphase.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/framing.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/helper.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/hufftree-under.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/hufftree.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/index.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/lspmap.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/oddlsp.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/oggstream.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/programming.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/residue-pack.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/residue2.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/squarepolar.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/stereo.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/stream.png
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/v-comment.html
===================================================================
--- branches/vorbis-aotuv/doc/v-comment.html	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/v-comment.html	2006-11-05 14:40:48 UTC (rev 12025)
@@ -87,7 +87,7 @@
 
 <h3>Field names</h3>
 
-Below is a proposed, minimal list of standard filed names with a
+Below is a proposed, minimal list of standard field names with a
 description of intended use.  No single or group of field names is
 mandatory; a comment header may contain one, all or none of the names
 in this list.<p>


Property changes on: branches/vorbis-aotuv/doc/v-comment.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbis-clip.txt
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbis-errors.txt
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbis-fidelity.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbis.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisenc
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/vorbis-aotuv/doc/vorbisenc/.cvsignore
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/vorbisenc/Makefile.am
===================================================================
--- branches/vorbis-aotuv/doc/vorbisenc/Makefile.am	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/vorbisenc/Makefile.am	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc
 
 doc_DATA = index.html overview.html reference.html style.css\


Property changes on: branches/vorbis-aotuv/doc/vorbisenc/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id

Copied: branches/vorbis-aotuv/doc/vorbisenc/changes.html (from rev 12024, tags/vorbis/libvorbis-1.1.0/doc/vorbisenc/changes.html)

Copied: branches/vorbis-aotuv/doc/vorbisenc/examples.html (from rev 12024, tags/vorbis/libvorbis-1.1.0/doc/vorbisenc/examples.html)

Modified: branches/vorbis-aotuv/doc/vorbisenc/index.html
===================================================================
--- branches/vorbis-aotuv/doc/vorbisenc/index.html	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/vorbisenc/index.html	2006-11-05 14:40:48 UTC (rev 12025)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libvorbisenc documentation</p></td>
-<td align=right><p class=tiny>libvorbisenc version 1.1.2.2 - 20001104</p></td>
+<td align=right><p class=tiny>libvorbisenc release 1.1 - 20040709</p></td>
 </tr>
 </table>
 
@@ -20,16 +20,18 @@
 <p>
 <a href="overview.html">libvorbisenc api overview</a><br>
 <a href="reference.html">libvorbisenc api reference</a><br>
+<a href="changes.html">libvorbisenc api changes from 1.0 and 1.0.1</a><br>
+<a href="examples.html">libvorbisenc encode setup examples</a><br>
 
 <br><br>
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2000 vorbis team</p></td>
+<td><p class=tiny>copyright &copy; 2000-2004 vorbis team</p></td>
 <td align=right><p class=tiny><a href="http://www.xiph.org/ogg/vorbis/">Ogg Vorbis</a><br><a href="mailto:team at vorbis.org">team at vorbis.org</a></p></td>
 </tr><tr>
-<td><p class=tiny>vorbisfile documentation</p></td>
-<td align=right><p class=tiny>vorbisfile version 1.25 - 20000615</p></td>
+<td><p class=tiny>libvorbisenc documentation</p></td>
+<td align=right><p class=tiny>libvorbisenc release 1.1 - 20040709</p></td>
 </tr>
 </table>
 


Property changes on: branches/vorbis-aotuv/doc/vorbisenc/index.html
___________________________________________________________________
Name: svn:keywords
   + Id

Copied: branches/vorbis-aotuv/doc/vorbisenc/ov_ectl_ratemanage2_arg.html (from rev 12024, tags/vorbis/libvorbis-1.1.0/doc/vorbisenc/ov_ectl_ratemanage2_arg.html)

Copied: branches/vorbis-aotuv/doc/vorbisenc/ov_ectl_ratemanage_arg.html (from rev 12024, tags/vorbis/libvorbis-1.1.0/doc/vorbisenc/ov_ectl_ratemanage_arg.html)

Modified: branches/vorbis-aotuv/doc/vorbisenc/overview.html
===================================================================
--- branches/vorbis-aotuv/doc/vorbisenc/overview.html	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/vorbisenc/overview.html	2006-11-05 14:40:48 UTC (rev 12025)
@@ -9,50 +9,374 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libvorbisenc documentation</p></td>
-<td align=right><p class=tiny>libvorbisenc version 1.1.2.2 - 20001104</p></td>
+<td align=right><p class=tiny>libvorbisenc release 1.1 - 20040709</p></td>
 </tr>
 </table>
 
 <h1>Libvorbisenc API Overview</h1>
 
-<p>The current version of libvorbisenc is very simple.  It contains an initialization function to set up the encoding engine properly.
-It also contains a control function to be used in the future to tweak encoder settings.
-<p>
+<p>Libvorbisenc is an encoding convenience library intended to
+encapsulate the elaborate setup that libvorbis requires for encoding.
+Libvorbisenc gives easy access to all high-level adjustments an
+application may require when encoding and also exposes some low-level
+tuning parameters to allow applications to make detailed adjustments
+to the encoding process. <p>
+
 All the <b>libvorbisenc</b> routines are declared in "vorbis/vorbisenc.h".
 
+<em>Note: libvorbis and libvorbisenc always
+encode in a single pass. Thus, all possible encoding setups will work
+properly with live input and produce streams that decode properly when
+streamed.  See the subsection titled <a href="#BBR">"managed bitrate
+modes"</a> for details on setting limits on bitrate usage when Vorbis
+streams are used in a limited-bandwidth environment.</em>
+
+<h2>workflow</h2>
+
+<p>Libvorbisenc is used only during encoder setup; its function
+is to automate initialization of a multitude of settings in a
+<tt>vorbis_info</tt> structure which libvorbis then uses as a reference
+during the encoding process.  Libvorbisenc plays no part in the
+encoding process after setup.
+
+<p>Encode setup using libvorbisenc consists of three steps: 
+
+<ol>
+<li>high-level initialization of a <tt>vorbis_info</tt> structure by
+calling one of <a
+href="vorbis_encode_setup_vbr.html">vorbis_encode_setup_vbr()</a> or <a
+href="vorbis_encode_setup_managed.html">vorbis_encode_setup_managed()</a>
+with the basic input audio parameters (rate and channels) and the
+basic desired encoded audio output parameters (VBR quality or ABR/CBR
+bitrate)<p>
+
+<li>optional adjustment of the basic setup defaults using <a
+href="vorbis_encode_ctl.html">vorbis_encode_ctl()</a><p>
+
+<li>calling <a
+href="vorbis_encode_setup_init.html">vorbis_encode_setup_init()</a> to
+finalize the high-level setup into the detailed low-level reference
+values needed by libvorbis to encode audio. The <tt>vorbis_info</tt>
+structure is then ready to use for encoding by libvorbis.<p>
+
+</ol>
+
+These three steps can be collapsed into a single call by using <a
+href="vorbis_encode_init_vbr.html">vorbis_encode_init_vbr</a> to set up a
+quality-based VBR stream or <a
+href="vorbis_encode_init.html">vorbis_encode_init</a> to set up a managed
+bitrate (ABR or CBR) stream.<p>
+
+<h2>adjustable encoding parameters</h2>
+
+<h3>input audio parameters</h3>
+
 <p>
 <table border=1 color=black width=50% cellspacing=0 cellpadding=7>
 <tr bgcolor=#cccccc>
-	<td><b>function</b></td>
-	<td><b>purpose</b></td>
+	<td><b>parameter</b></td>
+	<td><b>description</b></td>
 </tr>
 <tr valign=top>
-	<td><a href="vorbis_encode_init.html">vorbis_encode_init</a></td>
-	<td>This function takes a <a href="vorbis_info.html">vorbis_info</a> struct and encoding parameters and sets up a proper encoding environment.</tt></a>.</td>
+<td>sampling rate</td>
+<td>
+The sampling rate (in samples per second) of the input audio.  Common examples are 8000 for telephony, 44100 for CD audio and 48000 for DAT.  Note that a mono sample (one center value) and a stereo sample (one left value and one right value) both are a single sample.
+
+</td>
 </tr>
 <tr valign=top>
-<td><a href="vorbis_encode_init_vbr.html">vorbis_encode_init_vbr</a></td>
-<td>This function takes a <a href="vorbis_info.html">vorbis_info</a> struct
-and encoding parameters for VBR encoding.</td>
+<td>channels</td>
+<td>
+
+The number of channels encoded in each input sample.  By default,
+stereo input modes (two channels) are 'coupled' by Vorbis 1.1 such
+that the stereo relationship between the samples is taken into account
+when encoding.  Stereo coupling my be disabled by using <a
+href="vorbis_encode_ctl.html">vorbis_encode_ctl()</a> with <a
+href="vorbis_encode_ctl.html#OV_ECTL_COUPLE_SET">OV_ECTL_COUPLE_SET</a>.
+
+</td>
 </tr>
+</table>
+
+<h3>quality and VBR modes</h3>
+
+Vorbis is natively a VBR codec; a user requests a given constant
+<em>quality</em> and the encoder keeps the encoding quality constant
+while allowing the bitrate to vary.  'Quality' modes (Variable BitRate)
+will always produce the most consistent encoding results as well as
+the highest quality for the amount of bits used.
+
+<p>
+<table border=1 color=black width=50% cellspacing=0 cellpadding=7>
+<tr bgcolor=#cccccc>
+	<td><b>parameter</b></td>
+	<td><b>description</b></td>
+</tr>
 <tr valign=top>
-	<td><a href="vorbis_encode_ctl.html">vorbis_encode_ctl</a></td>
-	<td>Function in progress, to be used in future versions of this API.</td>
+<td>quality</td>
+<td>
+A decimal float value requesting a desired quality.  Libvorbisenc 1.1 allows quality requests in the range of -0.1 (lowest quality, smallest files) through +1.0 (highest-quality, largest files). Quality -0.1 is intended as an ultra-low setting in which low bitrate is much more important than quality consistency.  Quality settings 0.0 and above are intended to produce consistent results at all times.  
+
+</td>
 </tr>
 </table>
 
+<a name="BBR">
+<h3>managed bitrate modes</h3>
+
+Although the Vorbis codec is natively VBR, libvorbis includes
+infrastructure for 'managing' the bitrate of streams by setting
+minimum and maximum usage constraints, as well as functionality for
+nudging a stream toward a desired average value.  These features
+should <em>only</em> be used when there is a requirement to limit
+bitrate in some way.  Although the difference is usually slight,
+managed bitrate modes will always produce output inferior to VBR
+(given equal bitrate usage). Setting overly or impossibly tight
+bitrate management requirements can affect output quality dramatically
+for the worse.<p>
+
+Beginning in libvorbis 1.1, bitrate management is implemented using a
+<em>bit-reservoir</em> algorithm. The encoder has a fixed-size
+reservoir used as a 'savings account' in encoding.  When a frame is
+smaller than the target rate, the unused bits go into the reservoir so
+that they may be used by future frames.  When a frame is larger than
+target bitrate, it draws 'banked' bits out of the reservoir.  Encoding
+is managed so that the reservoir never goes negative (when a maximum
+bitrate is specified) or fills beyond a fixed limit (when a minimum
+bitrate is specified).  An 'average bitrate' request is used as the
+set-point in a long-range bitrate tracker which adjusts the encoder's
+aggressiveness up or down depending on whether or not frames are coming
+in larger or smaller than the requested average point.
+
+<p>
+<table border=1 color=black width=50% cellspacing=0 cellpadding=7>
+<tr bgcolor=#cccccc>
+	<td><b>parameter</b></td>
+	<td><b>description</b></td>
+</tr>
+<tr valign=top>
+<td>maximum bitrate</td> <td> The maximum allowed bitrate, set in bits
+per second.  If the bitrate would otherwise rise such that oversized
+frames would underflow the bit-reservoir by consuming banked bits,
+bitrate management will force the encoder to use fewer bits per frame
+by encoding with a more aggressive psychoacoustic model.<p> This
+setting is a hard limit; the bitstream will never be allowed, under
+any circumstances, to increase above the specified bitrate over the
+average period set by the reservoir; it may momentarily rise over if
+inspected on a granularity much finer than the average period across
+the reservoir.  Normally, the encoder will conserve bits gracefully by
+using more aggressive psychoacoustics to shrink a frame when forced
+to.  However, if the encoder runs out of means of gracefully shrinking
+a frame, it will simply take the smallest frame it can otherwise
+generate and truncate it to the maximum allowed length.  Note that
+this is not an error and although it will obviously adversely affect
+audio quality, a Vorbis decoder will be able to decode a truncated
+frame into audio.
+
+</td>
+</tr>
+
+<tr valign=top>
+<td>average bitrate</td> 
+
+<td>
+
+The average desired bitrate of a stream, set
+in bits per second.  Average bitrate is tracked via a reservoir like
+minimum and maximum bitrate, however the averaging reservior does not
+impose a hard limit; it is used to nudge the bitrate toward the
+desired average by slowly adjusting the psychoacoustic aggressiveness.
+As such, the reservoir size does not affect the average bitrate
+behavior.  Because this setting alone is not used to impose hard
+bitrate limits, the bitrate of a stream produced using only the
+<tt>average bitrate</tt> constraint will track the average over time
+but not necessarily adhere strictly to that average for any given
+period.  Should a strict localized average be required, <tt>average
+bitrate</tt> should be used along with <tt>minimum bitrate</tt> and
+<tt>maximum bitrate</tt>.
+</td>
+
+</tr>
+
+<tr valign=top>
+<td>minimum bitrate</td>
+<td> 
+ The minimum allowed bitrate, set in bits per second.  If
+the bitrate would otherwise fall such that undersized frames would
+overflow the bit-reservoir with unused bits, bitrate management will
+force the encoder to use more bits per frame by encoding with a less
+aggressive psychoacoustic model.<p> This setting is a hard limit; the
+bitstream will never be allowed, under any circumstances, to drop
+below the specified bitrate over the average period set by the
+reservoir; it may momentarily fall under if inspected on a granularity
+much finer than the average period across the reservoir.  Normally,
+the encoder will fill out undersided frames with additional useful
+coding information by increasing the perceived quality of the stream.
+If the encoder runs out of useful ways to consume more bits, it will
+pad frames out with zeroes.
+</td>
+</tr>
+
+<tr valign=top>
+<td>reservoir size</td> <td> The size of the minimum/maximum bitrate
+tracking reservoir, set in bits.  The reservoir is used as a 'bit
+bank' to average out localized surges and dips in bitrate while
+providing predictable, guaranteed buffering behavior for streams to be
+used in situations with constrained transport bandwidth.  The default
+setting is two seconds of average bitrate.<p>
+
+When a single frame is larger than the maximum allowed overall
+bitrate, the bits are 'borrowed' from the bitrate reservoir; if the
+reservoir contains insufficient bits to cover the defecit, the encoder
+must find some way to reduce the frame size. <p>
+
+When a frame is under the minimum limit, the surplus bits are placed
+into the reservoir, banking them for future use.  If the reservoir is
+already full of banked bits, the encoder is forced to find some way to
+make the frame larger.<p>
+
+If the frame size is between the minimum and maximum rates (thus
+implying the minimum and maximum allowed rates are different), the
+reservoir gravitates toward a fill point configured by the
+<tt>reservoir bias</tt> setting described next.  If the reservoir is
+fuller than the fill point (a 'surplus of surplus'), the encoder will
+consume a number bits from the reservoir equal to the number of the
+bits by which the frame exceeds minimum size.  If the reservoir is
+emptier than the fillpoint (a 'surplus of defecit'), bits are returned
+to the reservoir equaling the current frame's number of bits under the
+maximum frame size.  The idea of the fill point is to buffer against
+both underruns and overruns, by trying to hold the reservoir to a
+middle course.
+</td>
+</tr>
+
+<tr valign=top>
+<td>reservoir bias</td>
+
+<td>
+
+Reservoir bias is a setting between 0.0 and 1.0 that biases bitrate
+management toward smoothing bitrate spikes (0.0) or bitrate peaks
+(1.0); the default setting is 0.1.<p>
+
+Using settings toward 0.0 causes the bitrate manager to hoard bits in
+the bit reservoir such that there is a large pool of banked surplus to
+draw upon during short spikes in bitrate.  As a result, the encoder
+will react less aggressively and less drastically to curtail framesize
+during brief surges in bitrate.<p>
+
+Using settings toward 1.0 causes the bitrate manager to empty the bit
+reservoir such that there is a large buffer available to store surplus
+bits during sudden drops in bitrate.  As a result, the encoder will
+react less aggressively and less drastically to support minimum frame
+sizes during drops in bitrate and will tend not to store any extra
+bits in the reservoir for future bitrate spikes.<p>
+
+</td>
+</tr>
+
+<tr valign=top>
+<td>average track damping</td>
+<td> 
+
+A decimal value, in seconds, that controls how quickly the average
+bitrate tracker is allowed to slew from enforcing minimum frame sizes
+to maximum framesizes and vice versa.  Default value is 1.5
+seconds.<p>
+
+When the 'average bitrate' setting is in use, the average bitrate
+tracker uses an unbounded reservoir to track overall bitrate-to-date
+in the stream.  When bitrates are too low, the tracker will try to
+nudge bitrates up and when the bitrate is too high, nudge it down.
+The damping value regulates the maximum strength of the nudge; it
+describes, in seconds, how quickly the tracker may transition from an
+extreme nudge in one direction to an extreme nudge in the other.<p>
+
+</td>
+</tr>
+
+</table>
+
+<h3>encoding model adjustments</h3>
+
+The <a href="vorbis_encode_ctl.html">vorbis_encode_ctl()</a> call provides
+a generalized interface for making encoding setup adjustments to the
+basic high-level setup provided by <a
+href="vorbis_encode_setup_vbr.html">vorbis_encode_setup_vbr()</a> or <a
+href="vorbis_encode_setup_managed.html">vorbis_encode_setup_managed()</a>.
+In reality, these two calls use <a
+href="vorbis_encode_ctl.html">vorbis_encode_ctl()</a> internally, and <a
+href="vorbis_encode_ctl.html">vorbis_encode_ctl()</a> can be used to adjust
+most of the parameters set by other calls.<p>
+
+In Vorbis 1.1, <a href="vorbis_encode_ctl.html">vorbis_encode_ctl()</a> can
+adjust the following additional parameters not described elsewhere:
+
+<p>
+<table border=1 color=black width=50% cellspacing=0 cellpadding=7>
+<tr bgcolor=#cccccc>
+	<td><b>parameter</b></td>
+	<td><b>description</b></td>
+</tr>
+<tr valign=top>
+<td>management mode</td> <td> Configures whether or not bitrate
+management is in use or not.  Normally, this value is set implicitly
+during encoding setup; however, the supported means of selecting a
+quality mode by bitrate (that is, requesting a true VBR stream, but
+doing so by asking for an approximate bitrate) is to use <a
+href="vorbis_encode_setup_managed.html">vorbis_encode_setup_managed()</a>
+and then to explicitly turn off bitrate management by calling <a
+href="vorbis_encode_ctl.html">vorbis_encode_ctl()</a> with <a
+href="vorbis_encode_ctl.html#OV_ECTL_RATEMANAGE2_SET">OV_ECTL_RATEMANAGE2_SET</a>
+</td>
+</tr>
+
+<tr valign=top>
+<td>coupling</td> <td> Stereo encoding (and in the future, surround
+encodings) are normally encoded assuming the channels form a stereo
+image and that lossy-stereo modelling is appropriate; this is called
+'coupling'.  Stereo coupling may be explicitly enabled or disabled.
+</td>
+</tr>
+<tr valign=top>
+<td>lowpass</td> <td> Sets the hard lowpass of a given encoding mode;
+this may be used to conserve a few bits in high-rate audio that has
+limited bandwidth, or in testing of the encoder's acoustic model.  The
+encoder is generally already configured with ideal lowpasses (if any
+at all) for given modes; use of this parameter is strongly discouraged
+if the point is to try to 'improve' a given encoding mode for general
+encoding.
+</td>
+</tr>
+
+<tr valign=top>
+<td>impulse coding aggressiveness</td> <td>By default, libvorbis
+attempts to compromise between preventing wide bitrate swings and
+high-resolution impulse coding (which is required for the crispest
+possible attacks, but also requires a relatively large momentary
+bitrate increase).  This parameter allows an application to tune the
+compromise or eliminate it; A value of 0.0 indicates normal behavior
+while a value of -15.0 requests maximum possible impulse
+resolution.</td>
+</tr>
+
+</table>
+
+
 <br><br>
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2000 vorbis team</p></td>
+<td><p class=tiny>copyright &copy; 2004 Vorbis team</p></td>
 <td align=right><p class=tiny><a href="http://www.xiph.org/ogg/vorbis/index.html">Ogg Vorbis</a><br><a href="mailto:team at vorbis.org">team at vorbis.org</a></p></td>
 </tr><tr>
-<td><p class=tiny>vorbisfile documentation</p></td>
-<td align=right><p class=tiny>vorbisfile version 1.25 - 20000615</p></td>
+<td><p class=tiny>libvorbisenc documentation</p></td>
+<td align=right><p class=tiny>libvorbisenc release 1.1 - 20040709</p></td>
 </tr>
 </table>
 
 </body>
 
 </html>
+


Property changes on: branches/vorbis-aotuv/doc/vorbisenc/overview.html
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/vorbisenc/reference.html
===================================================================
--- branches/vorbis-aotuv/doc/vorbisenc/reference.html	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/vorbisenc/reference.html	2006-11-05 14:40:48 UTC (rev 12025)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>vorbisenc documentation</p></td>
-<td align=right><p class=tiny>vorbisfile version 1.0</p></td>
+<td align=right><p class=tiny>libvorbisenc release 1.1 - 20040709</p></td>
 </tr>
 </table>
 
@@ -18,21 +18,28 @@
 <p>
 <b>Data Structures</b><br>
 <a href="vorbis_info.html">vorbis_info</a><br>
+<a href="ov_ectl_ratemanage_arg.html">ov_ectl_ratemanage_arg</a><br>
+<a href="ov_ectl_ratemanage2_arg.html">ov_ectl_ratemanage2_arg</a><br>
+
 <br>
 <b>Encoder Setup</b><br>
+<a href="vorbis_encode_ctl.html">vorbis_encode_ctl()</a><br>
 <a href="vorbis_encode_init.html">vorbis_encode_init()</a><br>
 <a href="vorbis_encode_init_vbr.html">vorbis_encode_init_vbr()</a><br>
-<a href="vorbis_encode_ctl.html">vorbis_encode_ctl()</a><br>
+<a href="vorbis_encode_setup_init.html">vorbis_encode_setup_init()</a><br>
+<a href="vorbis_encode_setup_managed.html">vorbis_encode_setup_managed()</a><br>
+<a href="vorbis_encode_setup_vbr.html">vorbis_encode_setup_vbr()</a><br>
+
 <br>
 <br>
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2003 vorbis team</p></td>
+<td><p class=tiny>copyright &copy; 2004 vorbis team</p></td>
 <td align=right><p class=tiny><a href="http://www.xiph.org/ogg/vorbis/index.html">Ogg Vorbis</a><br><a href="mailto:team at vorbis.org">team at vorbis.org</a></p></td>
 </tr><tr>
-<td><p class=tiny>vorbisenc documentation</p></td>
-<td align=right><p class=tiny>vorbisenc version 1.0</p></td>
+<td><p class=tiny>libvorbisenc release 1.1 - 20040709</p></td>
+<td align=right><p class=tiny>vorbisenc version 1.1</p></td>
 </tr>
 </table>
 


Property changes on: branches/vorbis-aotuv/doc/vorbisenc/reference.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisenc/style.css
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_ctl.html
===================================================================
--- branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_ctl.html	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_ctl.html	2006-11-05 14:40:48 UTC (rev 12025)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libvorbisenc documentation</p></td>
-<td align=right><p class=tiny>libvorbisenc version 1.1.2.2 - 20001104</p></td>
+<td align=right><p class=tiny>libvorbisenc release 1.1 - 20040709</p></td>
 </tr>
 </table>
 
@@ -17,15 +17,26 @@
 
 <p><i>declared in "vorbis/libvorbisenc.h";</i></p>
 
-<p>This function is part of the libvorbisenc API, but has not yet been implemented.
-<p>However, the API call is set and will not change.
+<p>This function implements a generic interface to miscellaneous
+encoder settings similar to the clasasic UNIX 'ioctl()' system call.
+Applications may use vorbis_encode_ctl() to query or set bitrate
+management or quality mode details by using one of several
+<i>request</i> arguments detailed below.  Vorbis_encode_ctl() must be
+called after one of <a
+href="vorbis_encode_setup_managed.html">vorbis_encode_setup_managed()</a>
+or <a
+href="vorbis_encode_setup_vbr.html">vorbis_encode_setup_vbr()</a>.
+When used to modify settings, vorbis_encode_ctl() must be called
+before <a
+href="vorbis_encode_setup_init.html">vorbis_encode_setup_init()</a>.
+
 <p>
 <br><br>
 <table border=0 color=black cellspacing=0 cellpadding=7>
 <tr bgcolor=#cccccc>
 	<td>
 <pre><b>
-extern int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg);
+extern int vorbis_encode_ctl(vorbis_info *vi,int request,void *arg);
 
 </b></pre>
 	</td>
@@ -35,29 +46,120 @@
 <h3>Parameters</h3>
 <dl>
 <dt><i>vi</i></dt>
-<dd>File pointer to an initialized <a href="vorbis_info.html">vorbis_info</a> struct.</dd>
-<dt><i>number</i></dt>
-<dd>Not yet implemented.</dd>
+<dd>File pointer to an initialized <a href="vorbis_info.html">vorbis_info</a> struct.</dd><p>
+<dt><i>request</i></dt>
+<dd>Specifies the desired action; possible request fields are detailed below.</dd><p>
 <dt><i>arg</i></dt>
-<dd>Not yet implemented.</dd>
+<dd>void * pointing to a data structure matching the request argument.</dd><p>
+</dl><p>
 
+<h3>Requests</h3>
+<dl>
 
-<h3>Return Values</h3>
-<blockquote>
-<li>
-<li>OV_EIMPL is always returned, as this function has not yet been implemented.</li>
-</blockquote>
+<dt><i>OV_ECTL_RATEMANAGE2_GET</i></dt>
+
+<dd><b>Argument: <a href="ovectl_ratemanage2_arg.html">struct
+ovectl_ratemanage2_arg *</a></b><br> Used to query the current
+encoder bitrate management setting.  Also used to initialize fields of
+an ovectl_ratemanage2_arg structure for use with
+OV_ECTL_RATEMANAGE2_SET.</dd><p>
+
+<dt><i>OV_ECTL_RATEMANAGE2_SET</i></dt>
+<dd><b>Argument: <a href="ovectl_ratemanage2_arg.html">struct
+ovectl_ratemanage2_arg *</a></b><br> Used to set the current
+encoder bitrate management settings to the values listed in the
+ovectl_ratemanage2_arg.  Passing a NULL pointer will disable bitrate
+management.
+</dd><p>
+
+<dt><i>OV_ECTL_LOWPASS_GET</i></dt>
+<dd><b>Argument: double *</b><br> Returns the current encoder hard-lowpass
+setting (kHz) in the double pointed to by arg.
+</dd><p>
+
+<dt><i>OV_ECTL_LOWPASS_SET</i></dt>
+<dd><b>Argument: double *</b><br> Sets the encoder hard-lowpass to the value
+(kHz) pointed to by arg. Valid lowpass settings range from 2 to 99.
+</dd><p>
+
+<dt><i>OV_ECTL_IBLOCK_GET</i></dt>
+<dd><b>Argument: double *</b><br> Returns the current encoder impulse
+block setting in the double pointed to by arg.</dd><p>
+
+<dt><i>OV_ECTL_IBLOCK_SET</i></dt> <dd><b>Argument: double *</b><br> Sets
+the impulse block bias to the the value pointed to by arg; valid range
+is -15.0 to 0.0 [default].  A negative impulse block bias will direct
+to encoder to use more bits when incoding short blocks that contain
+strong impulses, thus improving the accuracy of impulse encoding.</dd><p>
+
+<dt><i>OV_ECTL_RATEMANAGE_GET [deprecated]</i></dt>
+<dd>
+
+<b>Argument: <a href="ovectl_ratemanage_arg.html">struct
+ovectl_ratemanage_arg *</a></b><br> Old interface to querying bitrate
+management settings; deprecated after move to bit-reservoir style
+management in 1.1 rendered this interface partially obsolete.  Please
+use OV_ECTL_RATEMANGE2_GET instead.
+
+</dd><p>
+
+<dt><i>OV_ECTL_RATEMANAGE_SET [deprecated]</i></dt>
+<dd>
+<b>Argument: <a href="ovectl_ratemanage_arg.html">struct
+ovectl_ratemanage_arg *</a></b><br> Old interface to modifying bitrate
+management settings; deprecated after move to bit-reservoir style
+management in 1.1 rendered this interface partially obsolete.  Please
+use OV_ECTL_RATEMANGE2_SET instead.
+</dd><p>
+
+<dt><i>OV_ECTL_RATEMANAGE_AVG [deprecated]</i></dt>
+<dd>
+<b>Argument: <a href="ovectl_ratemanage_arg.html">struct
+ovectl_ratemanage_arg *</a></b><br> Old interface to setting
+average-bitrate encoding mode; deprecated after move to bit-reservoir
+style management in 1.1 rendered this interface partially obsolete.
+Please use OV_ECTL_RATEMANGE2_SET instead.  
+</dd><p>
+
+<dt><i>OV_ECTL_RATEMANAGE_HARD [deprecated]</i></dt>
+<dd>
+<b>Argument: <a href="ovectl_ratemanage_arg.html">struct
+ovectl_ratemanage_arg *</a></b><br> Old interface to setting
+bounded-bitrate encoding modes; deprecated after move to bit-reservoir
+style management in 1.1 rendered this interface partially obsolete.
+Please use OV_ECTL_RATEMANGE2_SET instead.  
+</dd><p>
+
+
+</dl>
+
+
+<h3>Return Values</h3> vorbis_encode_ctl() returns zero on success,
+placing any further return information (such as the result of a query)
+into the storage pointed to by <i>*arg</i>.  On error,
+vorbis_encode_ctl() may return one of the following error codes:
+
+<dl>
+
+<dt>OV_EINVAL</dt><dd>Invalid argument, or an attempt to modify a
+setting after calling <a
+href="vorbis_encode_setup_init.html">vorbis_encode_setup_init()</a>.</dd><p>
+
+<dt>OV_EIMPL</dt><dd>Unimplemented or unknown request</dd><p>
+
+</dl>
+
 <p>
 
 <br><br>
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2000 xiph.org</p></td>
+<td><p class=tiny>copyright &copy; 2004 xiph.org</p></td>
 <td align=right><p class=tiny><a href="http://www.xiph.org/ogg/vorbis/index.html">Ogg Vorbis</a><br><a href="mailto:team at vorbis.org">team at vorbis.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libvorbisenc documentation</p></td>
-<td align=right><p class=tiny>libvorbisenc version 1.1.2.2 - 20001106</p></td>
+<td align=right><p class=tiny>libvorbisenc release 1.1 - 20040709</p></td>
 </tr>
 </table>
 


Property changes on: branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_ctl.html
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_init.html
===================================================================
--- branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_init.html	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_init.html	2006-11-05 14:40:48 UTC (rev 12025)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libvorbisenc documentation</p></td>
-<td align=right><p class=tiny>libvorbisenc version 1.1.2.2 - 20001104</p></td>
+<td align=right><p class=tiny>libvorbisenc release 1.1 - 20040709</p></td>
 </tr>
 </table>
 
@@ -17,7 +17,7 @@
 
 <p><i>declared in "vorbis/libvorbisenc.h";</i></p>
 
-<p>This is the primary function within libvorbisenc.  This is used to properly set up an encoding environment using libvorbisenc.
+<p>This is the primary function within libvorbisenc for setting up managed bitrate modes.
 <p>Before this function is called, the <a href="vorbis_info.html">vorbis_info</a> struct should be initialized by using vorbis_info_init() from the libvorbis API.  After encoding, vorbis_info_clear should be called.
 <p>The max_bitrate, nominal_bitrate, and min_bitrate settings are used to set constraints for the encoded file.  This function uses these settings to select the appropriate encoding mode and set it up.
 <p>
@@ -48,11 +48,11 @@
 <dt><i>rate</i></dt>
 <dd>The sampling rate of the source audio.</dd>
 <dt><i>max_bitrate</i></dt>
-<dd>Desired maximum bitrate (limit).</dd>
+<dd>Desired maximum bitrate (limit). -1 indicates unset.</dd>
 <dt><i>nominal_bitrate</i></dt>
-<dd>Desired average, or central, bitrate.</dd>
+<dd>Desired average, or central, bitrate. -1 indicates unset.</dd>
 <dt><i>min_bitrate</i></dt>
-<dd>Desired minimum bitrate.</dd>
+<dd>Desired minimum bitrate. -1 indicates unset.</dd>
 </dl>
 
 
@@ -64,6 +64,8 @@
 <li>less than zero for failure:</li>
 <ul>
 <li>OV_EFAULT - Internal logic fault; indicates a bug or heap/stack corruption.</li>
+<li>OV_EINVAL - Invalid setup request, eg, out of range argument. </li>
+<li>OV_EIMPL  - Unimplemented mode; unable to comply with bitrate request.</li>
 </ul>
 </blockquote>
 <p>
@@ -72,11 +74,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2000 xiph.org</p></td>
+<td><p class=tiny>copyright &copy; 2004 xiph.org</p></td>
 <td align=right><p class=tiny><a href="http://www.xiph.org/ogg/vorbis/index.html">Ogg Vorbis</a><br><a href="mailto:team at vorbis.org">team at vorbis.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libvorbisenc documentation</p></td>
-<td align=right><p class=tiny>libvorbisenc version 1.1.2.2 - 20001106</p></td>
+<td align=right><p class=tiny>libvorbisenc release 1.1 - 20040709</p></td>
 </tr>
 </table>
 


Property changes on: branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_init.html
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_init_vbr.html
===================================================================
--- branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_init_vbr.html	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_init_vbr.html	2006-11-05 14:40:48 UTC (rev 12025)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libvorbisenc documentation</p></td>
-<td align=right><p class=tiny>libvorbisenc - 20011218</p></td>
+<td align=right><p class=tiny>libvorbisenc release 1.1 - 20040709</p></td>
 </tr>
 </table>
 
@@ -17,9 +17,8 @@
 
 <p><i>declared in "vorbis/libvorbisenc.h";</i></p>
 
-<p>This is the primary function within libvorbisenc.  This is used to properly set up an encoding environment using libvorbisenc.
+<p>This is the primary function within libvorbisenc for setting up variable bitrate ("quality" based) modes.
 <p>Before this function is called, the <a href="vorbis_info.html">vorbis_info</a> struct should be initialized by using vorbis_info_init() from the libvorbis API.  After encoding, vorbis_info_clear should be called.
-<p>The max_bitrate, nominal_bitrate, and min_bitrate settings are used to set constraints for the encoded file.  This function uses these settings to select the appropriate encoding mode and set it up.
 <p>
 <br><br>
 <table border=0 color=black cellspacing=0 cellpadding=7>
@@ -30,7 +29,7 @@
 			      long channels,
 			      long rate,
 			      
-			      float base_quality /* from 0. (lo) to 1. (hi) */);
+			      float base_quality);
 
 </b></pre>
 	</td>
@@ -46,7 +45,7 @@
 <dt><i>rate</i></dt>
 <dd>The sampling rate of the source audio.</dd>
 <dt><i>base_quality</i></dt>
-<dd>Desired quality level from 0.0 to 1.0 (lo to hi).</dd>
+<dd>Desired quality level, currently from -0.1 to 1.0 (lo to hi).</dd>
 </dl>
 
 
@@ -58,6 +57,8 @@
 <li>less than zero for failure:</li>
 <ul>
 <li>OV_EFAULT - Internal logic fault; indicates a bug or heap/stack corruption.</li>
+<li>OV_EINVAL - Invalid setup request, eg, out of range argument. </li>
+<li>OV_EIMPL  - Unimplemented mode; unable to comply with quality level request.</li>
 </ul>
 </blockquote>
 <p>
@@ -66,11 +67,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2000 xiph.org</p></td>
+<td><p class=tiny>copyright &copy; 2004 xiph.org</p></td>
 <td align=right><p class=tiny><a href="http://www.xiph.org/ogg/vorbis/index.html">Ogg Vorbis</a><br><a href="mailto:team at vorbis.org">team at vorbis.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libvorbisenc documentation</p></td>
-<td align=right><p class=tiny>libvorbisenc version 1.1.2.2 - 20001106</p></td>
+<td align=right><p class=tiny>libvorbisenc release 1.1 - 20040709</p></td>
 </tr>
 </table>
 


Property changes on: branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_init_vbr.html
___________________________________________________________________
Name: svn:keywords
   + Id

Copied: branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_setup_init.html (from rev 12024, tags/vorbis/libvorbis-1.1.0/doc/vorbisenc/vorbis_encode_setup_init.html)

Copied: branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_setup_managed.html (from rev 12024, tags/vorbis/libvorbis-1.1.0/doc/vorbisenc/vorbis_encode_setup_managed.html)

Copied: branches/vorbis-aotuv/doc/vorbisenc/vorbis_encode_setup_vbr.html (from rev 12024, tags/vorbis/libvorbis-1.1.0/doc/vorbisenc/vorbis_encode_setup_vbr.html)

Modified: branches/vorbis-aotuv/doc/vorbisenc/vorbis_info.html
===================================================================
--- branches/vorbis-aotuv/doc/vorbisenc/vorbis_info.html	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/vorbisenc/vorbis_info.html	2006-11-05 14:40:48 UTC (rev 12025)
@@ -8,8 +8,8 @@
 <body bgcolor=white text=black link="#5555ff" alink="#5555ff" vlink="#5555ff">
 <table border=0 width=100%>
 <tr>
-<td><p class=tiny>vorbisfile documentation</p></td>
-<td align=right><p class=tiny>vorbisfile version 1.25 - 20000615</p></td>
+<td><p class=tiny>libvorbisenc documentation</p></td>
+<td align=right><p class=tiny>libvorbisenc release 1.1 - 20040709</p></td>
 </tr>
 </table>
 
@@ -18,7 +18,7 @@
 <p><i>declared in "vorbis/codec.h"</i></p>
 
 <p>
-The vorbis_info structure contains information about a vorbis bitstream.  Most of the information in this struct is more complex and in-depth than we need when using basic API calls.
+The vorbis_info structure contains information about a vorbis bitstream.
 
 <p>
 
@@ -33,34 +33,10 @@
   long bitrate_upper;
   long bitrate_nominal;
   long bitrate_lower;
+  long bitrate_window;
 
-  long blocksizes[2];
+  void *codec_setup;
 
-  int        modes;
-  int        maps;
-  int        times;
-  int        floors;
-  int        residues;
-  int        books;
-  int        psys;     /* encode only */
-
-  vorbis_info_mode    *mode_param[64];
-  int                  map_type[64];
-  vorbis_info_mapping *map_param[64];
-  int                  time_type[64];
-  vorbis_info_time    *time_param[64];
-  int                  floor_type[64];
-  vorbis_info_floor   *floor_param[64];
-  int                  residue_type[64];
-  vorbis_info_residue *residue_param[64];
-  static_codebook     *book_param[256];
-  vorbis_info_psy     *psy_param[64]; /* encode only */
-  
-  /* for block long/sort tuning; encode only */
-  int        envelopesa;
-  double     preecho_thresh;
-  double     preecho_clamp;
-
 } vorbis_info;</b></pre>
 	</td>
 </tr>
@@ -80,8 +56,11 @@
 <dd>Specifies the average bitrate for a VBR bitstream.  May be unset.  If the bitrate_upper and bitrate_lower parameters match, the stream is fixed bitrate.</dd>
 <dt><i>bitrate_lower</i></dt>
 <dd>Specifies the lower limit in a VBR bitstream.  If the value matches the bitrate_nominal and bitrate_upper parameters, the stream is fixed bitrate.  May be unset if no limit exists.</dd>
-<dt><i>blocksizes[2]</i></dt>
-<dd>Contains the sizes of the long and short blocks for this particular bitstream.  These are variable and can be set by the encoder.  Vorbis only supports two sizes, long and short.</dd>
+<dt><i>bitrate_window</i></dt>
+<dd>Specifies the size of the bit reservoir in seconds relative to the nominal bitrate.  May be unset.</dd>
+<dt><i>codec_setup</i></dt>
+<dd>Pointer to private encoder setup state.</dd>
+
 </dl>
 
 
@@ -89,11 +68,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2000 vorbis team</p></td>
+<td><p class=tiny>copyright &copy; 2004 vorbis team</p></td>
 <td align=right><p class=tiny><a href="http://www.xiph.org/ogg/vorbis/index.html">Ogg Vorbis</a><br><a href="mailto:team at vorbis.org">team at vorbis.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>vorbisfile documentation</p></td>
-<td align=right><p class=tiny>vorbisfile version 1.25 - 20000615</p></td>
+<td align=right><p class=tiny>libvorbisenc release 1.1 - 20040709</p></td>
 </tr>
 </table>
 


Property changes on: branches/vorbis-aotuv/doc/vorbisenc/vorbis_info.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/vorbis-aotuv/doc/vorbisfile/.cvsignore
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/vorbisfile/Makefile.am
===================================================================
--- branches/vorbis-aotuv/doc/vorbisfile/Makefile.am	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/vorbisfile/Makefile.am	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile
 
 doc_DATA = OggVorbis_File.html callbacks.html chaining_example_c.html\


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/OggVorbis_File.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/callbacks.html
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/vorbisfile/chaining_example_c.html
===================================================================
--- branches/vorbis-aotuv/doc/vorbisfile/chaining_example_c.html	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/vorbisfile/chaining_example_c.html	2006-11-05 14:40:48 UTC (rev 12025)
@@ -22,45 +22,45 @@
 <table border=0 width=100% color=black cellspacing=0 cellpadding=7>
 <tr bgcolor=#cccccc>
 	<td>
-<pre><b>
+<pre width="80"><b>
 
-#include <vorbis/codec.h>
-#include <vorbis/vorbisfile.h>
+<font color="#A020F0">#include &lt;vorbis/codec.h&gt;</font>
+<font color="#A020F0">#include &lt;vorbis/vorbisfile.h&gt;</font>
 
-int main(){
+<strong><font color="#4169E1"><a name="main"></a>int main()</font></strong>{
   OggVorbis_File ov;
   int i;
 
-  /* open the file/pipe on stdin */
-  if(ov_open(stdin,&ov,NULL,-1)<0){
-    printf("Could not open input as an OggVorbis file.\n\n");
+  <font color="#B22222">/* open the file/pipe on stdin */</font>
+  <font color="#4169E1">if</font>(ov_open(stdin,&amp;ov,NULL,-1)&lt;0){
+    printf(<font color="#666666">"Could not open input as an OggVorbis file.\n\n"</font>);
     exit(1);
   }
   
-  /* print details about each logical bitstream in the input */
-  if(ov_seekable(&ov)){
-    printf("Input bitstream contained %ld logical bitstream section(s).\n",
-	   ov_streams(&ov));
-    printf("Total bitstream playing time: %ld seconds\n\n",
-	   (long)ov_time_total(&ov,-1));
+  <font color="#B22222">/* print details about each logical bitstream in the input */</font>
+  <font color="#4169E1">if</font>(ov_seekable(&amp;ov)){
+    printf(<font color="#666666">"Input bitstream contained %ld logical bitstream section(s).\n"</font>,
+           ov_streams(&amp;ov));
+    printf(<font color="#666666">"Total bitstream playing time: %ld seconds\n\n"</font>,
+           (long)ov_time_total(&amp;ov,-1));
 
-  }else{
-    printf("Standard input was not seekable.\n"
-	   "First logical bitstream information:\n\n");
+  }<font color="#4169E1">else</font>{
+    printf(<font color="#666666">"Standard input was not seekable.\n"</font>
+           <font color="#666666">"First logical bitstream information:\n\n"</font>);
   }
 
-  for(i=0;i<ov_streams(&ov);i++){
-    vorbis_info *vi=ov_info(&ov,i);
-    printf("\tlogical bitstream section %d information:\n",i+1);
-    printf("\t\t%ldHz %d channels bitrate %ldkbps serial number=%ld\n",
-	   vi->rate,vi->channels,ov_bitrate(&ov,i)/1000,
-	   ov_serialnumber(&ov,i));
-    printf("\t\tcompressed length: %ld bytes ",(long)(ov_raw_total(&ov,i)));
-    printf(" play time: %lds\n",(long)ov_time_total(&ov,i));
+  <font color="#4169E1">for</font>(i=0;i&lt;ov_streams(&amp;ov);i++){
+    vorbis_info *vi=ov_info(&amp;ov,i);
+    printf(<font color="#666666">"\tlogical bitstream section %d information:\n"</font>,i+1);
+    printf(<font color="#666666">"\t\t%ldHz %d channels bitrate %ldkbps serial number=%ld\n"</font>,
+           vi-&gt;rate,vi-&gt;channels,ov_bitrate(&amp;ov,i)/1000,
+           ov_serialnumber(&amp;ov,i));
+    printf(<font color="#666666">"\t\tcompressed length: %ld bytes "</font>,(long)(ov_raw_total(&amp;ov,i)));
+    printf(<font color="#666666">" play time: %lds\n"</font>,(long)ov_time_total(&amp;ov,i));
   }
 
-  ov_clear(&ov);
-  return 0;
+  ov_clear(&amp;ov);
+  <font color="#4169E1">return</font> 0;
 }
 
 </b></pre>
@@ -73,7 +73,7 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2003 Xiph.org</p></td>
+<td><p class=tiny>copyright &copy; 2004 Xiph.org</p></td>
 <td align=right><p class=tiny><a href="http://www.xiph.org/ogg/vorbis/index.html">Ogg Vorbis</a><br><a href="mailto:team at vorbis.org">team at vorbis.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>Vorbisfile documentation</p></td>


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/chaining_example_c.html
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/vorbisfile/chainingexample.html
===================================================================
--- branches/vorbis-aotuv/doc/vorbisfile/chainingexample.html	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/vorbisfile/chainingexample.html	2006-11-05 14:40:48 UTC (rev 12025)
@@ -59,7 +59,7 @@
 <tr bgcolor=#cccccc>
         <td>
 <pre><b>
-  if(ov_open(stdin,&ov,NULL,-1)<0){
+  if(ov_open(stdin,&amp;ov,NULL,-1)&gt;0){
     printf("Could not open input as an OggVorbis file.\n\n");
     exit(1);
   }
@@ -81,11 +81,11 @@
 <tr bgcolor=#cccccc>
         <td>
 <pre><b>
-  if(ov_seekable(&ov)){
+  if(ov_seekable(&amp;ov)){
     printf("Input bitstream contained %ld logical bitstream section(s).\n",
-	   ov_streams(&ov));
+	   ov_streams(&amp;ov));
     printf("Total bitstream playing time: %ld seconds\n\n",
-	   (long)ov_time_total(&ov,-1));
+	   (long)ov_time_total(&amp;ov,-1));
 
   }else{
     printf("Standard input was not seekable.\n"
@@ -108,14 +108,14 @@
 <tr bgcolor=#cccccc>
         <td>
 <pre><b>
-  for(i=0;i<ov_streams(&ov);i++){
-    vorbis_info *vi=ov_info(&ov,i);
+  for(i=0;i&lt;ov_streams(&amp;ov);i++){
+    vorbis_info *vi=ov_info(&amp;ov,i);
     printf("\tlogical bitstream section %d information:\n",i+1);
     printf("\t\t%ldHz %d channels bitrate %ldkbps serial number=%ld\n",
-	   vi->rate,vi->channels,ov_bitrate(&ov,i)/1000,
-	   ov_serialnumber(&ov,i));
-    printf("\t\tcompressed length: %ld bytes ",(long)(ov_raw_total(&ov,i)));
-    printf(" play time: %lds\n",(long)ov_time_total(&ov,i));
+	   vi-&gt;rate,vi-&gt;channels,ov_bitrate(&amp;ov,i)/1000,
+	   ov_serialnumber(&amp;ov,i));
+    printf("\t\tcompressed length: %ld bytes ",(long)(ov_raw_total(&amp;ov,i)));
+    printf(" play time: %lds\n",(long)ov_time_total(&amp;ov,i));
   } 
 </b></pre>
         </td>
@@ -129,7 +129,7 @@
 <tr bgcolor=#cccccc>
         <td>
 <pre><b>
-  ov_clear(&ov);
+  ov_clear(&amp;ov);
   return 0;
 }
 </b></pre>
@@ -145,7 +145,7 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2003 Xiph.org</p></td>
+<td><p class=tiny>copyright &copy; 2004 Xiph.org</p></td>
 <td align=right><p class=tiny><a href="http://www.xiph.org/ogg/vorbis/">Ogg Vorbis</a><br><a href="mailto:team at vorbis.org">team at vorbis.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>Vorbisfile documentation</p></td>


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/chainingexample.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/crosslap.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/datastructures.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/decoding.html
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/vorbisfile/example.html
===================================================================
--- branches/vorbis-aotuv/doc/vorbisfile/example.html	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/vorbisfile/example.html	2006-11-05 14:40:48 UTC (rev 12025)
@@ -143,7 +143,7 @@
 <pre><b>
 
   while(!eof){
-    long ret=ov_read(&vf,pcmout,sizeof(pcmout),&current_section);
+    long ret=ov_read(&vf,pcmout,sizeof(pcmout),0,2,1,&current_section);
     if (ret == 0) {
       /* EOF */
       eof=1;


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/example.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/exampleindex.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/fileinfo.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/index.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/initialization.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_bitrate.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_bitrate_instant.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_callbacks.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_clear.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_comment.html
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/vorbisfile/ov_crosslap.html
===================================================================
--- branches/vorbis-aotuv/doc/vorbisfile/ov_crosslap.html	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/vorbisfile/ov_crosslap.html	2006-11-05 14:40:48 UTC (rev 12025)
@@ -18,7 +18,7 @@
 <p><i>declared in "vorbis/vorbisfile.h";</i></p>
 
 <p>ov_crosslap overlaps and blends the boundary at a transition
-between two seperate streams represented by seperate <a
+between two separate streams represented by separate <a
 href="OggVorbis_File.html">OggVorbis_File</a> structures.  For lapping
 transitions due to seeking within a single stream represented by a
 single <a href="OggVorbis_File.html">OggVorbis_File</a> structure,
@@ -75,7 +75,7 @@
 <dt>OV_EREAD</dt>
   <dd> A read from media returned an error.</dd>
 <dt>OV_EOF</dt>
-  <dd>indicates stream <tt>vf2</tt> is at end of file, or that <tt>vf1</tt> is at end of file immediately after a seek (making crosslap impossible as there's no preceeding decode state to crosslap).</dd>
+  <dd>indicates stream <tt>vf2</tt> is at end of file, or that <tt>vf1</tt> is at end of file immediately after a seek (making crosslap impossible as there's no preceding decode state to crosslap).</dd>
 <dt><i>0</i></dt>
   <dd>success.</dd>
 </dl>


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_crosslap.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_info.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_open.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_open_callbacks.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_pcm_seek.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_pcm_seek_lap.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_pcm_seek_page.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_pcm_seek_page_lap.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_pcm_tell.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_pcm_total.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_raw_seek.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_raw_seek_lap.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_raw_tell.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_raw_total.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_read.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_read_float.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_seekable.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_serialnumber.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_streams.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_test.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_test_callbacks.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_test_open.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_time_seek.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_time_seek_lap.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_time_seek_page.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_time_seek_page_lap.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_time_tell.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/ov_time_total.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/overview.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/reference.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/return.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/seekexample.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/seeking.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/seeking_example_c.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/seeking_test_c.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/seekingexample.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/style.css
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/threads.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/vorbis_comment.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/vorbis_info.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisfile/vorbisfile_example_c.html
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/vorbisword2.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/wait.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/white-ogg.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/white-xifish.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/window1.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/window2.png
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/xifish.pdf
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/xml/01-introduction.xml
===================================================================
--- branches/vorbis-aotuv/doc/xml/01-introduction.xml	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/xml/01-introduction.xml	2006-11-05 14:40:48 UTC (rev 12025)
@@ -7,8 +7,7 @@
 <section id="vorbis-spec-intro">
 <sectioninfo>
 <releaseinfo>
- $Id: 01-introduction.xml,v 1.8 2002/12/19 06:10:12 xiphmont Exp $
-<emphasis>Last update to this document: July 18, 2002</emphasis>
+ $Id$
 </releaseinfo>
 </sectioninfo>
 <title>Introduction and Description</title>
@@ -131,7 +130,7 @@
 recommended (and Xiph.Org's Vorbis encoder follows this suggestion).</para>
 
 <para>
-Our own design work indicates the the primary liability of the
+Our own design work indicates the primary liability of the
 required header is in mindshare; it is an unusual design and thus
 causes some amount of complaint among engineers as this runs against
 current design trends (and also points out limitations in some


Property changes on: branches/vorbis-aotuv/doc/xml/01-introduction.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/xml/02-bitpacking.xml
===================================================================
--- branches/vorbis-aotuv/doc/xml/02-bitpacking.xml	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/xml/02-bitpacking.xml	2006-11-05 14:40:48 UTC (rev 12025)
@@ -7,8 +7,7 @@
 <section id="vorbis-spec-bitpacking">
 <sectioninfo>
 <releaseinfo>
- $Id: 02-bitpacking.xml,v 1.6 2002/10/27 16:20:47 giles Exp $
- <emphasis>Last update to this document: July 14, 2002</emphasis>
+ $Id$
 </releaseinfo>
 </sectioninfo>
 <title>Bitpacking Convention</title>


Property changes on: branches/vorbis-aotuv/doc/xml/02-bitpacking.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/xml/03-codebook.xml
===================================================================
--- branches/vorbis-aotuv/doc/xml/03-codebook.xml	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/xml/03-codebook.xml	2006-11-05 14:40:48 UTC (rev 12025)
@@ -7,8 +7,7 @@
 <section id="vorbis-spec-codebook">
 <sectioninfo>
 <releaseinfo>
- $Id: 03-codebook.xml,v 1.5 2002/10/27 16:20:47 giles Exp $
- <emphasis>Last update to this document: August 8, 2002</emphasis>
+ $Id$
 </releaseinfo>
 </sectioninfo>
 <title>Probability Model and Codebooks</title>


Property changes on: branches/vorbis-aotuv/doc/xml/03-codebook.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/xml/04-codec.xml
===================================================================
--- branches/vorbis-aotuv/doc/xml/04-codec.xml	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/xml/04-codec.xml	2006-11-05 14:40:48 UTC (rev 12025)
@@ -7,8 +7,7 @@
 <section id="vorbis-spec-codec">
 <sectioninfo>
 <releaseinfo>
- $Id: 04-codec.xml,v 1.8 2003/03/11 11:02:17 xiphmont Exp $
- <emphasis>Last update to this document: March 11, 2003</emphasis>
+ $Id$
 </releaseinfo>
 </sectioninfo>
 <title>Codec Setup and Packet Decode</title>
@@ -393,7 +392,7 @@
 <varname>[left_window_end]</varname>-1, window(<varname>[i]</varname>) = sin(.5 * &pi; * sin^2( (<varname>[i]</varname>-<varname>[left_window_start]</varname>+.5) / <varname>[left_n]</varname> * .5 * &pi;) )</simpara></listitem>
  <listitem><simpara> window from range <varname>[left_window_end]</varname> ... <varname>[right_window_start]</varname>-1
 inclusive is one</simpara></listitem><listitem><simpara> for <varname>[i]</varname> in range <varname>[right_window_start]</varname> ... <varname>[right_window_end]</varname>-1, window(<varname>[i]</varname>) = sin(.5 * &pi; * sin^2( (<varname>[i]</varname>-<varname>[right_window_start]</varname>+.5) / <varname>[right_n]</varname> * .5 * &pi; + .5 * &pi;) )</simpara></listitem>
-<listitem><simpara> window from range <varname>[rigth_window_start]</varname> ... <varname>[n]</varname>-1 is
+<listitem><simpara> window from range <varname>[right_window_start]</varname> ... <varname>[n]</varname>-1 is
 zero</simpara></listitem>
 </orderedlist>
 
@@ -461,11 +460,12 @@
 
 <orderedlist>
  <listitem><simpara>if either <varname>[no_residue]</varname> entry for channel
-(<varname>[vorbis_mapping_magnitude]</varname> element <varname>[i]</varname>) or (channel
-<varname>[vorbis_mapping_angle]</varname> element <varname>[i]</varname>) are set to false, then both
-must be set to false.  Note that an 'unused' floor has no decoded floor
-information; it is important that this is remembered at floor curve
-synthesis time.</simpara></listitem>
+(<varname>[vorbis_mapping_magnitude]</varname> element <varname>[i]</varname>)
+or channel
+(<varname>[vorbis_mapping_angle]</varname> element <varname>[i]</varname>)
+are set to false, then both must be set to false.  Note that an 'unused' 
+floor has no decoded floor information; it is important that this is 
+remembered at floor curve synthesis time.</simpara></listitem>
 </orderedlist>
 </para>
 


Property changes on: branches/vorbis-aotuv/doc/xml/04-codec.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/xml/05-comment.xml
===================================================================
--- branches/vorbis-aotuv/doc/xml/05-comment.xml	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/xml/05-comment.xml	2006-11-05 14:40:48 UTC (rev 12025)
@@ -8,8 +8,7 @@
 <section id="vorbis-spec-comment">
 <sectioninfo>
  <releaseinfo>
- $Id: 05-comment.xml,v 1.5 2002/10/31 19:37:57 giles Exp $
- <emphasis>Last update to this document: July 16, 2002</emphasis>
+ $Id$
 </releaseinfo>
 </sectioninfo>
 <title>comment field and header specification</title>
@@ -100,7 +99,7 @@
 
 <section><title>Field names</title>
 
-<para>Below is a proposed, minimal list of standard filed names with a
+<para>Below is a proposed, minimal list of standard field names with a
 description of intended use.  No single or group of field names is
 mandatory; a comment header may contain one, all or none of the names
 in this list.</para>


Property changes on: branches/vorbis-aotuv/doc/xml/05-comment.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/xml/06-floor0.xml
===================================================================
--- branches/vorbis-aotuv/doc/xml/06-floor0.xml	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/xml/06-floor0.xml	2006-11-05 14:40:48 UTC (rev 12025)
@@ -7,8 +7,7 @@
 <section id="vorbis-spec-floor0">
 <sectioninfo>
 <releaseinfo>
-  $Id: 06-floor0.xml,v 1.7 2002/10/27 16:20:47 giles Exp $
-  <emphasis>Last update to this document: July 19, 2002</emphasis>
+  $Id$
 </releaseinfo>
 </sectioninfo>  
 <title>Floor type 0 setup and decode</title>
@@ -83,7 +82,7 @@
 
        4) [booknumber] = read an unsigned integer of <link linkend="vorbis-spec-ilog">ilog</link>( [floor0_number_of_books] ) bits
        5) if ( [booknumber] is greater than the highest number decode codebook ) then packet is undecodable
-       6) [lastval] = zero;
+       6) [last] = zero;
        7) vector [temp_vector] = read vector from bitstream using codebook number [booknumber] in VQ context.
        8) add the scalar value [last] to each scalar in vector [temp_vector]
        9) [last] = the value of the last scalar in vector [temp_vector]
@@ -246,7 +245,7 @@
  <listitem><simpara><varname>[iteration_condition]</varname> = map element <varname>[i]</varname></simpara></listitem>
  <listitem><simpara><varname>[output]</varname> element <varname>[i]</varname> = <varname>[linear_floor_value]</varname></simpara></listitem>
  <listitem><simpara>increment <varname>[i]</varname></simpara></listitem>
- <listitem><simpara>if ( map element <varname>[i]</varname> is equal to <varname>[iteration_condition]</varname> ) continue at step 7</simpara></listitem>
+ <listitem><simpara>if ( map element <varname>[i]</varname> is equal to <varname>[iteration_condition]</varname> ) continue at step 5</simpara></listitem>
  <listitem><simpara>if ( <varname>[i]</varname> is less than <varname>[n]</varname> ) continue at step 2</simpara></listitem>
  <listitem><simpara>done</simpara></listitem>
 </orderedlist>


Property changes on: branches/vorbis-aotuv/doc/xml/06-floor0.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/xml/07-floor1.xml
===================================================================
--- branches/vorbis-aotuv/doc/xml/07-floor1.xml	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/xml/07-floor1.xml	2006-11-05 14:40:48 UTC (rev 12025)
@@ -7,8 +7,7 @@
 <section id="vorbis-spec-floor1">
 <sectioninfo>
 <releaseinfo>
- $Id: 07-floor1.xml,v 1.5 2003/03/11 11:02:17 xiphmont Exp $
- <emphasis>Last update to this document: March 11, 2003</emphasis>
+ $Id$
 </releaseinfo>
 </sectioninfo>
 <title>Floor type 1 setup and decode</title>
@@ -338,13 +337,13 @@
             19) vector [floor1_step2_flag] element [i] = set
             20) if ( [val] is greater than or equal to [room] ) {
  
-                  21) if ( [hiroom] is greater than [lowroom] ) {
+                  21) if ( [highroom] is greater than [lowroom] ) {
 
                         22) vector [floor1_final_Y] element [i] = [val] - [lowroom] + [predicted]
 		     
-		      } else [hiroom] is not greater than [lowroom] {
+		      } else [highroom] is not greater than [lowroom] {
               
-                        23) vector [floor1_final_Y] element [i] = [predicted] - [val] + [hiroom] - 1
+                        23) vector [floor1_final_Y] element [i] = [predicted] - [val] + [highroom] - 1
                    
                       }
                


Property changes on: branches/vorbis-aotuv/doc/xml/07-floor1.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/xml/08-residue.xml
===================================================================
--- branches/vorbis-aotuv/doc/xml/08-residue.xml	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/xml/08-residue.xml	2006-11-05 14:40:48 UTC (rev 12025)
@@ -7,8 +7,7 @@
 <section id="vorbis-spec-residue">
 <sectioninfo>
  <releaseinfo>
-  $Id: 08-residue.xml,v 1.5 2003/03/11 11:02:17 xiphmont Exp $
-  <emphasis>Last update to this document: March 11, 2003</emphasis>
+  $Id$
  </releaseinfo>
 </sectioninfo>
 <title>Residue setup and decode</title>
@@ -38,13 +37,13 @@
 <title>Residue format</title>
 
 <para>
-Reside format partitions each vector in the vector bundle into chunks,
+Residue format partitions each vector in the vector bundle into chunks,
 classifies each chunk, encodes the chunk classifications and finally
 encodes the chunks themselves using the the specific VQ arrangement
-defined for each selected selected classification.  The exact
-interleaving and partitioning vary by residue encoding number, however
-the high-level process used to classify and encode the residue vector
-is the same in all three variants.</para>
+defined for each selected classification.
+The exact interleaving and partitioning vary by residue encoding number,
+however the high-level process used to classify and encode the residue 
+vector is the same in all three variants.</para>
 
 <para>
 A set of coded residue vectors are all of the same length.  High level
@@ -406,15 +405,15 @@
  2) vector [entry_temp] = read vector from packet using current codebook in VQ context
  3) iterate [j] over the range 0 ... [codebook_dimensions]-1 {
 
-      5) vector [v] element ([offset]+[i]) =
+      4) vector [v] element ([offset]+[i]) =
 	  vector [v] element ([offset]+[i]) +
           vector [entry_temp] element [j]
-      6) increment [i]
+      5) increment [i]
 
     }
  
-  4) if ( [i] is less than [n] ) continue at step 2
-  5) done
+  6) if ( [i] is less than [n] ) continue at step 2
+  7) done
 </programlisting>
 
 </section>
@@ -422,7 +421,7 @@
 <section><title>format 2 specifics</title>
  
 <para>
-Format 2 is reducible to format 1.  It may be implemented as an additional stepprior to and an additional post-decode step after a normal format 1 decode.
+Format 2 is reducible to format 1.  It may be implemented as an additional step prior to and an additional post-decode step after a normal format 1 decode.
 </para>
 
 <para>


Property changes on: branches/vorbis-aotuv/doc/xml/08-residue.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/xml/09-helper.xml
===================================================================
--- branches/vorbis-aotuv/doc/xml/09-helper.xml	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/xml/09-helper.xml	2006-11-05 14:40:48 UTC (rev 12025)
@@ -7,8 +7,7 @@
 <section id="vorbis-spec-helper">
 <sectioninfo>
 <releaseinfo>
- $Id: 09-helper.xml,v 1.5 2002/10/27 16:20:47 giles Exp $
- <emphasis>Last update to this document: October 15, 2002</emphasis>
+ $Id$
 </releaseinfo>
 </sectioninfo>
 <title>Helper equations</title>
@@ -189,16 +188,16 @@
        14) [err] = [err] + [ady];
        15) if ( [err] >= [adx] ) {
 
-             15) [err] = [err] - [adx]
-             16)   [y] = [y] + [sy]
+             16) [err] = [err] - [adx]
+             17)   [y] = [y] + [sy]
 
            } else {
 
-             17) [y] = [y] + [base]
+             18) [y] = [y] + [base]
    
            }
 
-       18) vector [v] element [x] = [y]
+       19) vector [v] element [x] = [y]
 
      }
 </programlisting>


Property changes on: branches/vorbis-aotuv/doc/xml/09-helper.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/xml/10-tables.xml
===================================================================
--- branches/vorbis-aotuv/doc/xml/10-tables.xml	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/xml/10-tables.xml	2006-11-05 14:40:48 UTC (rev 12025)
@@ -7,8 +7,7 @@
 <section id="vorbis-spec-tables">
 <sectioninfo>
  <releaseinfo>
-  $Id: 10-tables.xml,v 1.2 2002/10/27 14:55:31 giles Exp $
-  <emphasis>Last update to this document: July 18, 2002</emphasis>
+  $Id$
  </releaseinfo>
 </sectioninfo>
 <title>Tables</title>


Property changes on: branches/vorbis-aotuv/doc/xml/10-tables.xml
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/xml/TODO
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/xml/Vorbis_I_spec.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/xml/a1-encapsulation_ogg.xml
===================================================================
--- branches/vorbis-aotuv/doc/xml/a1-encapsulation_ogg.xml	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/xml/a1-encapsulation_ogg.xml	2006-11-05 14:40:48 UTC (rev 12025)
@@ -7,8 +7,7 @@
 <appendix id="vorbis-over-ogg">
 <appendixinfo>
  <releaseinfo>
-  <emphasis>Last update to this document: July 14, 2002</emphasis>
-  $Id: a1-encapsulation_ogg.xml,v 1.3 2003/10/08 01:42:20 giles Exp $
+  $Id$
  </releaseinfo>
 </appendixinfo>
 <title>Embedding Vorbis into an Ogg stream</title>
@@ -89,7 +88,7 @@
 <itemizedlist>
 
 <listitem><simpara>
-  The first Vorbis packet (the indentification header), which
+  The first Vorbis packet (the identification header), which
   uniquely identifies a stream as Vorbis audio, is placed alone in the
   first page of the logical Ogg stream.  This results in a first Ogg
   page of exactly 58 bytes at the very beginning of the logical stream.


Property changes on: branches/vorbis-aotuv/doc/xml/a1-encapsulation_ogg.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/xml/a2-encapsulation_rtp.xml
===================================================================
--- branches/vorbis-aotuv/doc/xml/a2-encapsulation_rtp.xml	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/xml/a2-encapsulation_rtp.xml	2006-11-05 14:40:48 UTC (rev 12025)
@@ -7,7 +7,7 @@
 <appendix id="vorbis-over-rtp">
 <appendixinfo>
  <releaseinfo>
-  <emphasis>$Id: a2-encapsulation_rtp.xml,v 1.5 2003/09/24 11:13:42 giles Exp $</emphasis>
+  $Id$
  </releaseinfo>
 </appendixinfo>
 <title>Vorbis encapsulation in RTP</title>
@@ -15,10 +15,10 @@
 <literallayout class="monospaced">
 <!-- this works with extensions implemented in Saxon and Xalan
 <textobject><textdata 
-fileref="../draft-kerr-avt-vorbis-rtp-02.txt"/></textobject> -->
+fileref="draft-rtp.xml"/></textobject> -->
 <!-- this works with xinclude, implemented in xsltproc -->
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../draft-kerr-avt-vorbis-rtp-02.txt" parse="text">
+      href="draft-rtp.xml" parse="text">
   <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude">
     <para>Please consult the internet draft <citetitle>RTP Payload Format for Vorbis Encoded
     Audio</citetitle> for description of how to embed Vorbis audio in an RTP stream.</para>


Property changes on: branches/vorbis-aotuv/doc/xml/a2-encapsulation_rtp.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/xml/footer.xml
===================================================================
--- branches/vorbis-aotuv/doc/xml/footer.xml	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/xml/footer.xml	2006-11-05 14:40:48 UTC (rev 12025)
@@ -49,7 +49,7 @@
 <para>
 Ogg, Vorbis, Xiph.org Foundation and their logos are trademarks (tm)
 of the <ulink url="http://www.xiph.org/">Xiph.org Foundation</ulink>.  These
-pages are copyright (C) 1994-2002 Xiph.org Foundation. All rights
+pages are copyright (C) 1994-2004 Xiph.org Foundation. All rights
 reserved.</para>
 
 <para>


Property changes on: branches/vorbis-aotuv/doc/xml/footer.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/doc/xml/spec-common.xsl
===================================================================
--- branches/vorbis-aotuv/doc/xml/spec-common.xsl	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/doc/xml/spec-common.xsl	2006-11-05 14:40:48 UTC (rev 12025)
@@ -4,7 +4,7 @@
       common to all docbook output formats
 
       this file is included by the format-specific stylesheets
-      $Id: spec-common.xsl,v 1.3 2002/10/28 12:14:56 giles Exp $
+      $Id$
 -->
 
   <xsl:param name="use.svg" select="'0'"/>


Property changes on: branches/vorbis-aotuv/doc/xml/spec-common.xsl
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/xml/spec-fo.xsl
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/doc/xml/spec-html.xsl
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/examples
___________________________________________________________________
Name: svn:ignore
   + .deps
.libs
Makefile
Makefile.in
*_example



Property changes on: branches/vorbis-aotuv/examples/.cvsignore
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/examples/Makefile.am
===================================================================
--- branches/vorbis-aotuv/examples/Makefile.am	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/examples/Makefile.am	2006-11-05 14:40:48 UTC (rev 12025)
@@ -7,8 +7,9 @@
 noinst_PROGRAMS = decoder_example encoder_example chaining_example\
 		vorbisfile_example seeking_example
 
-LDFLAGS = -all-static
-LDADD = ../lib/libvorbis.la
+# uncomment to build static executables from the example code
+#LDFLAGS = -all-static 
+LDADD = ../lib/libvorbis.la 
 
 decoder_example_SOURCES = decoder_example.c
 encoder_example_SOURCES = encoder_example.c


Property changes on: branches/vorbis-aotuv/examples/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/examples/chaining_example.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/examples/decoder_example.c
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/examples/encoder_example.c
===================================================================
--- branches/vorbis-aotuv/examples/encoder_example.c	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/examples/encoder_example.c	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,21 +11,9 @@
  ********************************************************************
 
  function: simple example encoder
- last mod: $Id: encoder_example.c,v 1.50 2002/07/16 09:26:07 xiphmont Exp $
+ last mod: $Id$
 
- ********************************************************************
-  modified by AOYUMI
-   //-   delete
-   //+   add
-   //+~, //~+   add range
-   // /[asterisk]-~, [asterisk]/   delete range
-   
-   support only 16bit PCM .WAV file
-   
-   2004/04/26 
-    In order to enable it to compile by Linux, a patch is applied to 
-   a this code.  This patch is offer from Frederik Himpe. 
- *********************************************************************/
+ ********************************************************************/
 
 /* takes a stereo 16bit 44.1kHz WAV file from stdin and encodes it into
    a Vorbis bitstream */
@@ -36,8 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <sys/types.h> //+
-#include <sys/stat.h> //+
 #include <math.h>
 #include <vorbis/vorbisenc.h>
 
@@ -51,12 +37,9 @@
 #endif
 
 #define READ 1024
-#define DEF_Q 0  /* Default Quality Setting */  //+
-
 signed char readbuffer[READ*4+44]; /* out of the data segment, not the stack */
 
-//- int main(){
-  int main(int argc, char *argv[]){ //+
+int main(){
   ogg_stream_state os; /* take physical pages, weld into a logical
 			  stream of packets */
   ogg_page         og; /* one Ogg bitstream page.  Vorbis packets are inside */
@@ -72,27 +55,6 @@
   int eos=0,ret;
   int i, founddata;
 
-//+~
-  float qnum = DEF_Q;
-  int qx = 1;
-  if(argc < 2){
-	puts("usage: encoder_example -q4 filename.wav");
-	exit(1);
-  }
-  if( !strncmp(argv[1], "-q", 2) ){
-	if( strlen(argv[1]) > 2 ){
-		qnum = atof(argv[1]+2);
-	}
-	if( !((qnum >= -2) && (qnum <= 10)) ) qnum = DEF_Q;
-	qx++;
-  }
-  FILE *FP;
-  if( !(FP = fopen(argv[qx], "rb")) ){
-	puts("source file not found");
-	exit(1);
-  }
-//~+
-
 #if defined(macintosh) && defined(__MWERKS__)
   int argc = 0;
   char **argv = NULL;
@@ -118,38 +80,18 @@
      verify that it matches 16bit/stereo/44.1kHz.  This is just an
      example, after all. */
 
-  unsigned long footer = 0; //+
-  unsigned long sa_rate = 44100; //+
-  unsigned long channel; //+
-  struct stat sbuf; //+
-  stat(argv[qx], &sbuf); //+
-
   readbuffer[0] = '\0';
-//-  for (i=0, founddata=0; i<30 && ! feof(stdin) && ! ferror(stdin); i++)
-  for (i=0, founddata=0; i<30 && ! feof(FP) && ! ferror(FP); i++) //+
+  for (i=0, founddata=0; i<30 && ! feof(stdin) && ! ferror(stdin); i++)
   {
-//-    fread(readbuffer,1,2,stdin);
-    fread(readbuffer,1,2,FP); //+
-//+~
-    if ( ! memcmp(readbuffer, "fm", 2) ){
-       fread(readbuffer,1,8,FP); //+
-       fread(&channel,1,2,FP); //+
-       fread(&sa_rate,1,4,FP); //+
-    }
-//~+
-//-    if ( ! strncmp((char*)readbuffer, "da", 2) )
-    if ( ! memcmp(readbuffer, "da", 2) ) //+
+    fread(readbuffer,1,2,stdin);
+
+    if ( ! strncmp((char*)readbuffer, "da", 2) )
     {
       founddata = 1;
-//-      fread(readbuffer,1,6,stdin);
-      fread(readbuffer,1,6,FP); //+
-      memcpy(&footer, readbuffer+2, 4); //+
-      footer += ftell(FP); //+
+      fread(readbuffer,1,6,stdin);
       break;
     }
   }
-  footer = sbuf.st_size - footer; //+
-  printf("\n%dHz\n", sa_rate); //+
 
   /********** Encode setup ************/
 
@@ -174,39 +116,24 @@
 
    ---------------------------------------------------------------------
 
-   Encode using a qulity mode, but select that quality mode by asking for
+   Encode using a quality mode, but select that quality mode by asking for
    an approximate bitrate.  This is not ABR, it is true VBR, but selected
    using the bitrate interface, and then turning bitrate management off:
 
    ret = ( vorbis_encode_setup_managed(&vi,2,44100,-1,128000,-1) ||
-           vorbis_encode_ctl(&vi,OV_ECTL_RATEMANAGE_AVG,NULL) ||
+           vorbis_encode_ctl(&vi,OV_ECTL_RATEMANAGE2_SET,NULL) ||
            vorbis_encode_setup_init(&vi));
 
    *********************************************************************/
 
-//-  ret=vorbis_encode_init_vbr(&vi,2,44100,.4);
-  ret=vorbis_encode_init_vbr(&vi,channel,sa_rate, qnum/10); //+
+  ret=vorbis_encode_init_vbr(&vi,2,44100,0.1);
+
   /* do not continue if setup failed; this can happen if we ask for a
      mode that libVorbis does not support (eg, too low a bitrate, etc,
      will return 'OV_EIMPL') */
 
-//-  if(ret)exit(1);
-//+~
-  if(ret){
-	puts("encode init error");
-	exit(1);
-  }
-  char wfile[1024];
-  strcpy(wfile, argv[qx]);
-  strcat(wfile, ".ogg");
-  FILE *FP2;
-  if( !(FP2 = fopen(wfile, "wb")) ){
-	puts("file open error");
-	exit(1);
-  }
-  
-  printf("Quality %f\n Encoding...", qnum);
-//~+
+  if(ret)exit(1);
+
   /* add a comment */
   vorbis_comment_init(&vc);
   vorbis_comment_add_tag(&vc,"ENCODER","encoder_example.c");
@@ -245,26 +172,22 @@
 	while(!eos){
 		int result=ogg_stream_flush(&os,&og);
 		if(result==0)break;
-//-		fwrite(og.header,1,og.header_len,stdout);
-		fwrite(og.header,1,og.header_len,FP2); //+
-//-		fwrite(og.body,1,og.body_len,stdout);
-		fwrite(og.body,1,og.body_len,FP2); //+
+		fwrite(og.header,1,og.header_len,stdout);
+		fwrite(og.body,1,og.body_len,stdout);
 	}
 
   }
-
+  
   while(!eos){
     long i;
-//-   long bytes=fread(readbuffer,1,READ*4,stdin); /* stereo hardwired here */
-    long bytes=fread(readbuffer,1,READ*(channel*2),FP); //+
-    if(bytes < (READ*(channel*2))) bytes -= footer; //+
-    if(bytes < 0) bytes = 0; //+
+    long bytes=fread(readbuffer,1,READ*4,stdin); /* stereo hardwired here */
+
     if(bytes==0){
-     /* end of file.  this can be done implicitly in the mainline,
-        but it's easier to see here in non-clever fashion.
-        Tell the library we're at end of stream so that it can handle
-        the last frame and mark end of stream in the output properly */
-       vorbis_analysis_wrote(&vd,0);
+      /* end of file.  this can be done implicitly in the mainline,
+         but it's easier to see here in non-clever fashion.
+         Tell the library we're at end of stream so that it can handle
+         the last frame and mark end of stream in the output properly */
+      vorbis_analysis_wrote(&vd,0);
 
     }else{
       /* data to encode */
@@ -273,23 +196,13 @@
       float **buffer=vorbis_analysis_buffer(&vd,READ);
       
       /* uninterleave samples */
-/*-~
       for(i=0;i<bytes/4;i++){
 	buffer[0][i]=((readbuffer[i*4+1]<<8)|
 		      (0x00ff&(int)readbuffer[i*4]))/32768.f;
 	buffer[1][i]=((readbuffer[i*4+3]<<8)|
 		      (0x00ff&(int)readbuffer[i*4+2]))/32768.f;
       }
-*/
-//+~
-      for(i=0;i<bytes/(channel*2);i++){
-	buffer[0][i]=((readbuffer[i*(channel*2)+1]<<8)|
-		      (0x00ff&(int)readbuffer[i*(channel*2)]))/32768.f;
-	if(channel == 2)
-	buffer[1][i]=((readbuffer[i*(channel*2)+3]<<8)|
-		      (0x00ff&(int)readbuffer[i*(channel*2)+2]))/32768.f;
-      }
-//~+
+    
       /* tell the library how much we actually submitted */
       vorbis_analysis_wrote(&vd,i);
     }
@@ -312,10 +225,8 @@
 	while(!eos){
 	  int result=ogg_stream_pageout(&os,&og);
 	  if(result==0)break;
-//-	  fwrite(og.header,1,og.header_len,stdout);
-	  fwrite(og.header,1,og.header_len,FP2); //+
-//-	  fwrite(og.body,1,og.body_len,stdout);
-	  fwrite(og.body,1,og.body_len,FP2); //+
+	  fwrite(og.header,1,og.header_len,stdout);
+	  fwrite(og.body,1,og.body_len,stdout);
 	  
 	  /* this could be set above, but for illustrative purposes, I do
 	     it here (to show that vorbis does know where the stream ends) */
@@ -336,8 +247,7 @@
   
   /* ogg_page and ogg_packet structs always point to storage in
      libvorbis.  They're never freed or manipulated directly */
-  fclose(FP); //+
-  fclose(FP2); //+
+  
   fprintf(stderr,"Done.\n");
   return(0);
 }


Property changes on: branches/vorbis-aotuv/examples/encoder_example.c
___________________________________________________________________
Name: svn:keywords
   + Id

Deleted: branches/vorbis-aotuv/examples/encoder_example_modified.c
===================================================================
--- branches/vorbis-aotuv/examples/encoder_example_modified.c	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/examples/encoder_example_modified.c	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,326 +0,0 @@
-/********************************************************************
- *                                                                  *
- * 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-2002             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: simple example encoder
- last mod: $Id: encoder_example.c,v 1.50 2002/07/16 09:26:07 xiphmont Exp $
-
- ********************************************************************
-  modified by AOYUMI
-   //-   delete
-   //+   add
-   //+~, //~+   add range
-   
-   support only stereo 16bit PCM .WAV file
- ********************************************************************/
-
-/* takes a stereo 16bit 44.1kHz WAV file from stdin and encodes it into
-   a Vorbis bitstream */
-
-/* Note that this is POSIX, not ANSI, code */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <sys/types.h> //+
-#include <sys/stat.h> //+
-#include <math.h>
-#include <vorbis/vorbisenc.h>
-
-#ifdef _WIN32 /* We need the following two to set stdin/stdout to binary */
-#include <io.h>
-#include <fcntl.h>
-#endif
-
-#if defined(__MACOS__) && defined(__MWERKS__)
-#include <console.h>      /* CodeWarrior's Mac "command-line" support */
-#endif
-
-#define READ 1024
-#define DEF_Q 0  /* Default Quality Setting */  //+
-
-signed char readbuffer[READ*4+44]; /* out of the data segment, not the stack */
-
-//- int main(){
-  int main(int argc, char *argv[]){ //+
-  ogg_stream_state os; /* take physical pages, weld into a logical
-			  stream of packets */
-  ogg_page         og; /* one Ogg bitstream page.  Vorbis packets are inside */
-  ogg_packet       op; /* one raw packet of data for decode */
-  
-  vorbis_info      vi; /* struct that stores all the static vorbis bitstream
-			  settings */
-  vorbis_comment   vc; /* struct that stores all the user comments */
-
-  vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
-  vorbis_block     vb; /* local working space for packet->PCM decode */
-
-  int eos=0,ret;
-  int i, founddata;
-
-//+~
-  float qnum = DEF_Q;
-  int qx = 1;
-  if(argc < 2){
-	puts("usage: encoder_example -q4 filename.wav");
-	exit(1);
-  }
-  if( !strnicmp(argv[1], "-q", 2) ){
-	if( strlen(argv[1]) > 2 ){
-		qnum = atof(argv[1]+2);
-	}
-	if( !((qnum >= -2) && (qnum <= 10)) ) qnum = DEF_Q;
-	qx++;
-  }
-  FILE *FP;
-  if( !(FP = fopen(argv[qx], "rb")) ){
-	puts("source file not found");
-	exit(1);
-  }
-//~+
-
-#if defined(macintosh) && defined(__MWERKS__)
-  int argc = 0;
-  char **argv = NULL;
-  argc = ccommand(&argv); /* get a "command line" from the Mac user */
-                          /* 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. */
-
-#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
-     binary mode, eg, fopen("file.wav","wb"); */
-  /* Beware the evil ifdef. We avoid these where we can, but this one we 
-     cannot. Don't add any more, you'll probably go to hell if you do. */
-  _setmode( _fileno( stdin ), _O_BINARY );
-  _setmode( _fileno( stdout ), _O_BINARY );
-#endif
-
-
-  /* we cheat on the WAV header; we just bypass the header and never
-     verify that it matches 16bit/stereo/44.1kHz.  This is just an
-     example, after all. */
-
-  DWORD footer = 0; //+
-  DWORD sa_rate = 44100; //+
-  struct stat sbuf; //+
-  stat(argv[qx], &sbuf); //+
-
-  readbuffer[0] = '\0';
-//-  for (i=0, founddata=0; i<30 && ! feof(stdin) && ! ferror(stdin); i++)
-  for (i=0, founddata=0; i<30 && ! feof(FP) && ! ferror(FP); i++) //+
-  {
-//-    fread(readbuffer,1,2,stdin);
-    fread(readbuffer,1,2,FP); //+
-//+~
-    if ( ! memcmp(readbuffer, "fm", 2) ){
-       fread(readbuffer,1,10,FP); //+
-       fread(&sa_rate,1,4,FP); //+
-    }
-//~+
-//-    if ( ! strncmp((char*)readbuffer, "da", 2) )
-    if ( ! memcmp(readbuffer, "da", 2) ) //+
-    {
-      founddata = 1;
-//-      fread(readbuffer,1,6,stdin);
-      fread(readbuffer,1,6,FP); //+
-      memcpy(&footer, readbuffer+2, 4); //+
-      footer += ftell(FP); //+
-      break;
-    }
-  }
-  footer = sbuf.st_size - footer; //+
-  printf("\n%dHz\n", sa_rate); //+
-
-  /********** Encode setup ************/
-
-  vorbis_info_init(&vi);
-
-  /* choose an encoding mode.  A few possibilities commented out, one
-     actually used: */
-
-  /*********************************************************************
-   Encoding using a VBR quality mode.  The usable range is -.1
-   (lowest quality, smallest file) to 1. (highest quality, largest file).
-   Example quality mode .4: 44kHz stereo coupled, roughly 128kbps VBR 
-  
-   ret = vorbis_encode_init_vbr(&vi,2,44100,.4);
-
-   ---------------------------------------------------------------------
-
-   Encoding using an average bitrate mode (ABR).
-   example: 44kHz stereo coupled, average 128kbps VBR 
-  
-   ret = vorbis_encode_init(&vi,2,44100,-1,128000,-1);
-
-   ---------------------------------------------------------------------
-
-   Encode using a qulity mode, but select that quality mode by asking for
-   an approximate bitrate.  This is not ABR, it is true VBR, but selected
-   using the bitrate interface, and then turning bitrate management off:
-
-   ret = ( vorbis_encode_setup_managed(&vi,2,44100,-1,128000,-1) ||
-           vorbis_encode_ctl(&vi,OV_ECTL_RATEMANAGE_AVG,NULL) ||
-           vorbis_encode_setup_init(&vi));
-
-   *********************************************************************/
-
-//-  ret=vorbis_encode_init_vbr(&vi,2,44100,.4);
-  ret=vorbis_encode_init_vbr(&vi,2,sa_rate, qnum/10); //+
-  /* do not continue if setup failed; this can happen if we ask for a
-     mode that libVorbis does not support (eg, too low a bitrate, etc,
-     will return 'OV_EIMPL') */
-
-//-  if(ret)exit(1);
-//+~
-  if(ret){
-	puts("encode init error");
-	exit(1);
-  }
-  char wfile[1024];
-  strcpy(wfile, argv[qx]);
-  strcat(wfile, ".ogg");
-  FILE *FP2;
-  if( !(FP2 = fopen(wfile, "wb")) ){
-	puts("file open error");
-	exit(1);
-  }
-  
-  printf("Quality %f\n Encoding...", qnum);
-//~+
-  /* add a comment */
-  vorbis_comment_init(&vc);
-  vorbis_comment_add_tag(&vc,"ENCODER","encoder_example.c");
-
-  /* set up the analysis state and auxiliary encoding storage */
-  vorbis_analysis_init(&vd,&vi);
-  vorbis_block_init(&vd,&vb);
-  
-  /* set up our packet->stream encoder */
-  /* pick a random serial number; that way we can more likely build
-     chained streams just by concatenation */
-  srand(time(NULL));
-  ogg_stream_init(&os,rand());
-
-  /* Vorbis streams begin with three headers; the initial header (with
-     most of the codec setup parameters) which is mandated by the Ogg
-     bitstream spec.  The second header holds any comment fields.  The
-     third header holds the bitstream codebook.  We merely need to
-     make the headers, then pass them to libvorbis one at a time;
-     libvorbis handles the additional Ogg bitstream constraints */
-
-  {
-    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); /* automatically placed in its own
-					 page */
-    ogg_stream_packetin(&os,&header_comm);
-    ogg_stream_packetin(&os,&header_code);
-
-	/* This ensures the actual
-	 * audio data will start on a new page, as per spec
-	 */
-	while(!eos){
-		int result=ogg_stream_flush(&os,&og);
-		if(result==0)break;
-//-		fwrite(og.header,1,og.header_len,stdout);
-		fwrite(og.header,1,og.header_len,FP2); //+
-//-		fwrite(og.body,1,og.body_len,stdout);
-		fwrite(og.body,1,og.body_len,FP2); //+
-	}
-
-  }
-
-  while(!eos){
-    long i;
-//-   long bytes=fread(readbuffer,1,READ*4,stdin); /* stereo hardwired here */
-    long bytes=fread(readbuffer,1,READ*4,FP); /* stereo hardwired here */ //+
-    if(bytes < (READ*4)) bytes -= footer; //+
-    if(bytes < 0) bytes = 0; //+
-    if(bytes==0){
-     /* end of file.  this can be done implicitly in the mainline,
-        but it's easier to see here in non-clever fashion.
-        Tell the library we're at end of stream so that it can handle
-        the last frame and mark end of stream in the output properly */
-       vorbis_analysis_wrote(&vd,0);
-
-    }else{
-      /* data to encode */
-
-      /* expose the buffer to submit data */
-      float **buffer=vorbis_analysis_buffer(&vd,READ);
-      
-      /* uninterleave samples */
-      for(i=0;i<bytes/4;i++){
-	buffer[0][i]=((readbuffer[i*4+1]<<8)|
-		      (0x00ff&(int)readbuffer[i*4]))/32768.f;
-	buffer[1][i]=((readbuffer[i*4+3]<<8)|
-		      (0x00ff&(int)readbuffer[i*4+2]))/32768.f;
-      }
-
-      /* tell the library how much we actually submitted */
-      vorbis_analysis_wrote(&vd,i);
-    }
-
-    /* vorbis does some data preanalysis, then divvies up blocks for
-       more involved (potentially parallel) processing.  Get a single
-       block for encoding now */
-    while(vorbis_analysis_blockout(&vd,&vb)==1){
-
-      /* analysis, assume we want to use bitrate management */
-      vorbis_analysis(&vb,NULL);
-      vorbis_bitrate_addblock(&vb);
-
-      while(vorbis_bitrate_flushpacket(&vd,&op)){
-	
-	/* weld the packet into the bitstream */
-	ogg_stream_packetin(&os,&op);
-	
-	/* write out pages (if any) */
-	while(!eos){
-	  int result=ogg_stream_pageout(&os,&og);
-	  if(result==0)break;
-//-	  fwrite(og.header,1,og.header_len,stdout);
-	  fwrite(og.header,1,og.header_len,FP2); //+
-//-	  fwrite(og.body,1,og.body_len,stdout);
-	  fwrite(og.body,1,og.body_len,FP2); //+
-	  
-	  /* this could be set above, but for illustrative purposes, I do
-	     it here (to show that vorbis does know where the stream ends) */
-	  
-	  if(ogg_page_eos(&og))eos=1;
-	}
-      }
-    }
-  }
-
-  /* clean up and exit.  vorbis_info_clear() must be called last */
-  
-  ogg_stream_clear(&os);
-  vorbis_block_clear(&vb);
-  vorbis_dsp_clear(&vd);
-  vorbis_comment_clear(&vc);
-  vorbis_info_clear(&vi);
-  
-  /* ogg_page and ogg_packet structs always point to storage in
-     libvorbis.  They're never freed or manipulated directly */
-  fclose(FP); //+
-  fclose(FP2); //+
-  fprintf(stderr,"Done.\n");
-  return(0);
-}

Deleted: branches/vorbis-aotuv/examples/encoder_example_org.c
===================================================================
--- branches/vorbis-aotuv/examples/encoder_example_org.c	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/examples/encoder_example_org.c	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,253 +0,0 @@
-/********************************************************************
- *                                                                  *
- * 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-2002             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: simple example encoder
- last mod: $Id: encoder_example.c,v 1.50 2002/07/16 09:26:07 xiphmont Exp $
-
- ********************************************************************/
-
-/* takes a stereo 16bit 44.1kHz WAV file from stdin and encodes it into
-   a Vorbis bitstream */
-
-/* Note that this is POSIX, not ANSI, code */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <math.h>
-#include <vorbis/vorbisenc.h>
-
-#ifdef _WIN32 /* We need the following two to set stdin/stdout to binary */
-#include <io.h>
-#include <fcntl.h>
-#endif
-
-#if defined(__MACOS__) && defined(__MWERKS__)
-#include <console.h>      /* CodeWarrior's Mac "command-line" support */
-#endif
-
-#define READ 1024
-signed char readbuffer[READ*4+44]; /* out of the data segment, not the stack */
-
-int main(){
-  ogg_stream_state os; /* take physical pages, weld into a logical
-			  stream of packets */
-  ogg_page         og; /* one Ogg bitstream page.  Vorbis packets are inside */
-  ogg_packet       op; /* one raw packet of data for decode */
-  
-  vorbis_info      vi; /* struct that stores all the static vorbis bitstream
-			  settings */
-  vorbis_comment   vc; /* struct that stores all the user comments */
-
-  vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
-  vorbis_block     vb; /* local working space for packet->PCM decode */
-
-  int eos=0,ret;
-  int i, founddata;
-
-#if defined(macintosh) && defined(__MWERKS__)
-  int argc = 0;
-  char **argv = NULL;
-  argc = ccommand(&argv); /* get a "command line" from the Mac user */
-                          /* 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. */
-
-#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
-     binary mode, eg, fopen("file.wav","wb"); */
-  /* Beware the evil ifdef. We avoid these where we can, but this one we 
-     cannot. Don't add any more, you'll probably go to hell if you do. */
-  _setmode( _fileno( stdin ), _O_BINARY );
-  _setmode( _fileno( stdout ), _O_BINARY );
-#endif
-
-
-  /* we cheat on the WAV header; we just bypass the header and never
-     verify that it matches 16bit/stereo/44.1kHz.  This is just an
-     example, after all. */
-
-  readbuffer[0] = '\0';
-  for (i=0, founddata=0; i<30 && ! feof(stdin) && ! ferror(stdin); i++)
-  {
-    fread(readbuffer,1,2,stdin);
-
-    if ( ! strncmp((char*)readbuffer, "da", 2) )
-    {
-      founddata = 1;
-      fread(readbuffer,1,6,stdin);
-      break;
-    }
-  }
-
-  /********** Encode setup ************/
-
-  vorbis_info_init(&vi);
-
-  /* choose an encoding mode.  A few possibilities commented out, one
-     actually used: */
-
-  /*********************************************************************
-   Encoding using a VBR quality mode.  The usable range is -.1
-   (lowest quality, smallest file) to 1. (highest quality, largest file).
-   Example quality mode .4: 44kHz stereo coupled, roughly 128kbps VBR 
-  
-   ret = vorbis_encode_init_vbr(&vi,2,44100,.4);
-
-   ---------------------------------------------------------------------
-
-   Encoding using an average bitrate mode (ABR).
-   example: 44kHz stereo coupled, average 128kbps VBR 
-  
-   ret = vorbis_encode_init(&vi,2,44100,-1,128000,-1);
-
-   ---------------------------------------------------------------------
-
-   Encode using a qulity mode, but select that quality mode by asking for
-   an approximate bitrate.  This is not ABR, it is true VBR, but selected
-   using the bitrate interface, and then turning bitrate management off:
-
-   ret = ( vorbis_encode_setup_managed(&vi,2,44100,-1,128000,-1) ||
-           vorbis_encode_ctl(&vi,OV_ECTL_RATEMANAGE_AVG,NULL) ||
-           vorbis_encode_setup_init(&vi));
-
-   *********************************************************************/
-
-  ret=vorbis_encode_init_vbr(&vi,2,44100,.5);
-
-  /* do not continue if setup failed; this can happen if we ask for a
-     mode that libVorbis does not support (eg, too low a bitrate, etc,
-     will return 'OV_EIMPL') */
-
-  if(ret)exit(1);
-
-  /* add a comment */
-  vorbis_comment_init(&vc);
-  vorbis_comment_add_tag(&vc,"ENCODER","encoder_example.c");
-
-  /* set up the analysis state and auxiliary encoding storage */
-  vorbis_analysis_init(&vd,&vi);
-  vorbis_block_init(&vd,&vb);
-  
-  /* set up our packet->stream encoder */
-  /* pick a random serial number; that way we can more likely build
-     chained streams just by concatenation */
-  srand(time(NULL));
-  ogg_stream_init(&os,rand());
-
-  /* Vorbis streams begin with three headers; the initial header (with
-     most of the codec setup parameters) which is mandated by the Ogg
-     bitstream spec.  The second header holds any comment fields.  The
-     third header holds the bitstream codebook.  We merely need to
-     make the headers, then pass them to libvorbis one at a time;
-     libvorbis handles the additional Ogg bitstream constraints */
-
-  {
-    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); /* automatically placed in its own
-					 page */
-    ogg_stream_packetin(&os,&header_comm);
-    ogg_stream_packetin(&os,&header_code);
-
-	/* This ensures the actual
-	 * audio data will start on a new page, as per spec
-	 */
-	while(!eos){
-		int result=ogg_stream_flush(&os,&og);
-		if(result==0)break;
-		fwrite(og.header,1,og.header_len,stdout);
-		fwrite(og.body,1,og.body_len,stdout);
-	}
-
-  }
-  
-  while(!eos){
-    long i;
-    long bytes=fread(readbuffer,1,READ*4,stdin); /* stereo hardwired here */
-
-    if(bytes==0){
-      /* end of file.  this can be done implicitly in the mainline,
-         but it's easier to see here in non-clever fashion.
-         Tell the library we're at end of stream so that it can handle
-         the last frame and mark end of stream in the output properly */
-      vorbis_analysis_wrote(&vd,0);
-
-    }else{
-      /* data to encode */
-
-      /* expose the buffer to submit data */
-      float **buffer=vorbis_analysis_buffer(&vd,READ);
-      
-      /* uninterleave samples */
-      for(i=0;i<bytes/4;i++){
-	buffer[0][i]=((readbuffer[i*4+1]<<8)|
-		      (0x00ff&(int)readbuffer[i*4]))/32768.f;
-	buffer[1][i]=((readbuffer[i*4+3]<<8)|
-		      (0x00ff&(int)readbuffer[i*4+2]))/32768.f;
-      }
-    
-      /* tell the library how much we actually submitted */
-      vorbis_analysis_wrote(&vd,i);
-    }
-
-    /* vorbis does some data preanalysis, then divvies up blocks for
-       more involved (potentially parallel) processing.  Get a single
-       block for encoding now */
-    while(vorbis_analysis_blockout(&vd,&vb)==1){
-
-      /* analysis, assume we want to use bitrate management */
-      vorbis_analysis(&vb,NULL);
-      vorbis_bitrate_addblock(&vb);
-
-      while(vorbis_bitrate_flushpacket(&vd,&op)){
-	
-	/* weld the packet into the bitstream */
-	ogg_stream_packetin(&os,&op);
-	
-	/* write out pages (if any) */
-	while(!eos){
-	  int result=ogg_stream_pageout(&os,&og);
-	  if(result==0)break;
-	  fwrite(og.header,1,og.header_len,stdout);
-	  fwrite(og.body,1,og.body_len,stdout);
-	  
-	  /* this could be set above, but for illustrative purposes, I do
-	     it here (to show that vorbis does know where the stream ends) */
-	  
-	  if(ogg_page_eos(&og))eos=1;
-	}
-      }
-    }
-  }
-
-  /* clean up and exit.  vorbis_info_clear() must be called last */
-  
-  ogg_stream_clear(&os);
-  vorbis_block_clear(&vb);
-  vorbis_dsp_clear(&vd);
-  vorbis_comment_clear(&vc);
-  vorbis_info_clear(&vi);
-  
-  /* ogg_page and ogg_packet structs always point to storage in
-     libvorbis.  They're never freed or manipulated directly */
-  
-  fprintf(stderr,"Done.\n");
-  return(0);
-}


Property changes on: branches/vorbis-aotuv/examples/frameview.pl
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/examples/seeking_example.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/examples/vorbisfile_example.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/include
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/vorbis-aotuv/include/.cvsignore
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/include/Makefile.am
===================================================================
--- branches/vorbis-aotuv/include/Makefile.am	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/include/Makefile.am	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,5 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 SUBDIRS = vorbis


Property changes on: branches/vorbis-aotuv/include/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/include/vorbis
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/vorbis-aotuv/include/vorbis/.cvsignore
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/include/vorbis/Makefile.am
===================================================================
--- branches/vorbis-aotuv/include/vorbis/Makefile.am	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/include/vorbis/Makefile.am	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 includedir = $(prefix)/include/vorbis
 
 include_HEADERS = codec.h vorbisfile.h vorbisenc.h


Property changes on: branches/vorbis-aotuv/include/vorbis/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/include/vorbis/codec.h
===================================================================
--- branches/vorbis-aotuv/include/vorbis/codec.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/include/vorbis/codec.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: libvorbis codec headers
- last mod: $Id: codec.h,v 1.45 2003/09/05 22:34:46 giles Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -32,14 +32,14 @@
 
   /* The below bitrate declarations are *hints*.
      Combinations of the three values carry the following implications:
-     
-     all three set to the same value: 
+
+     all three set to the same value:
        implies a fixed rate bitstream
-     only nominal set: 
-       implies a VBR stream that averages the nominal bitrate.  No hard 
+     only nominal set:
+       implies a VBR stream that averages the nominal bitrate.  No hard
        upper/lower limit
-     upper and or lower set: 
-       implies a VBR bitstream that obeys the bitrate limits. nominal 
+     upper and or lower set:
+       implies a VBR bitstream that obeys the bitrate limits. nominal
        may also be set to give a nominal rate.
      none set:
        the coder does not care to speculate.
@@ -87,9 +87,9 @@
 
 typedef struct vorbis_block{
   /* necessary stream state for linking to the framing abstraction */
-  float  **pcm;       /* this is a pointer into local storage */ 
+  float  **pcm;       /* this is a pointer into local storage */
   oggpack_buffer opb;
-  
+
   long  lW;
   long  W;
   long  nW;
@@ -166,8 +166,8 @@
 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_tag(vorbis_comment *vc, 
+extern void     vorbis_comment_add(vorbis_comment *vc, 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);
@@ -216,7 +216,7 @@
 
 /* Vorbis ERRORS and return codes ***********************************/
 
-#define OV_FALSE      -1  
+#define OV_FALSE      -1
 #define OV_EOF        -2
 #define OV_HOLE       -3
 


Property changes on: branches/vorbis-aotuv/include/vorbis/codec.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/include/vorbis/vorbisenc.h
===================================================================
--- branches/vorbis-aotuv/include/vorbis/vorbisenc.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/include/vorbis/vorbisenc.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: vorbis encode-engine setup
- last mod: $Id: vorbisenc.h,v 1.10 2002/07/01 11:20:10 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -28,7 +28,7 @@
 extern int vorbis_encode_init(vorbis_info *vi,
 			      long channels,
 			      long rate,
-			      
+
 			      long max_bitrate,
 			      long nominal_bitrate,
 			      long min_bitrate);
@@ -36,22 +36,22 @@
 extern int vorbis_encode_setup_managed(vorbis_info *vi,
 				       long channels,
 				       long rate,
-				       
+
 				       long max_bitrate,
 				       long nominal_bitrate,
 				       long min_bitrate);
-  
+
 extern int vorbis_encode_setup_vbr(vorbis_info *vi,
 				  long channels,
 				  long rate,
-				  
-				  float /* quality level from 0. (lo) to 1. (hi) */
+
+				  float quality /* quality level from 0. (lo) to 1. (hi) */
 				  );
 
 extern int vorbis_encode_init_vbr(vorbis_info *vi,
 				  long channels,
 				  long rate,
-				  
+
 				  float base_quality /* quality level from 0. (lo) to 1. (hi) */
 				  );
 
@@ -59,18 +59,12 @@
 
 extern int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg);
 
+  /* deprecated rate management supported only for compatability */
 #define OV_ECTL_RATEMANAGE_GET       0x10
-
 #define OV_ECTL_RATEMANAGE_SET       0x11
 #define OV_ECTL_RATEMANAGE_AVG       0x12
 #define OV_ECTL_RATEMANAGE_HARD      0x13
 
-#define OV_ECTL_LOWPASS_GET          0x20
-#define OV_ECTL_LOWPASS_SET          0x21
-
-#define OV_ECTL_IBLOCK_GET           0x30
-#define OV_ECTL_IBLOCK_SET           0x31
-
 struct ovectl_ratemanage_arg {
   int    management_active;
 
@@ -84,6 +78,31 @@
   double bitrate_av_window_center;
 };
 
+
+  /* new rate setup */
+#define OV_ECTL_RATEMANAGE2_GET      0x14
+#define OV_ECTL_RATEMANAGE2_SET      0x15
+
+struct ovectl_ratemanage2_arg {
+  int    management_active;
+
+  long   bitrate_limit_min_kbps;
+  long   bitrate_limit_max_kbps;
+  long   bitrate_limit_reservoir_bits;
+  double bitrate_limit_reservoir_bias;
+
+  long   bitrate_average_kbps;
+  double bitrate_average_damping;
+};
+
+
+
+#define OV_ECTL_LOWPASS_GET          0x20
+#define OV_ECTL_LOWPASS_SET          0x21
+
+#define OV_ECTL_IBLOCK_GET           0x30
+#define OV_ECTL_IBLOCK_SET           0x31
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */


Property changes on: branches/vorbis-aotuv/include/vorbis/vorbisenc.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/include/vorbis/vorbisfile.h
===================================================================
--- branches/vorbis-aotuv/include/vorbis/vorbisfile.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/include/vorbis/vorbisfile.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: stdio-based convenience library for opening/seeking/decoding
- last mod: $Id: vorbisfile.h,v 1.20 2003/08/18 05:34:01 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -27,11 +27,11 @@
 #include "codec.h"
 
 /* The function prototypes for the callbacks are basically the same as for
- * the stdio functions fread, fseek, fclose, ftell. 
+ * the stdio functions fread, fseek, fclose, ftell.
  * The one difference is that the FILE * arguments have been replaced with
  * a void * - this is to be used as a pointer to whatever internal data these
  * functions might need. In the stdio case, it's just a FILE * cast to a void *
- * 
+ *
  * If you use other functions, check the docs for these functions and return
  * the right values. For seek_func(), you *MUST* return -1 if the stream is
  * unseekable
@@ -54,7 +54,7 @@
   int              seekable;
   ogg_int64_t      offset;
   ogg_int64_t      end;
-  ogg_sync_state   oy; 
+  ogg_sync_state   oy;
 
   /* If the FILE handle isn't seekable (eg, a pipe), only the current
      stream appears */


Property changes on: branches/vorbis-aotuv/include/vorbis/vorbisfile.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in
.deps
.libs



Property changes on: branches/vorbis-aotuv/lib/.cvsignore
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/Makefile.am
===================================================================
--- branches/vorbis-aotuv/lib/Makefile.am	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/Makefile.am	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 SUBDIRS = modes books
 
 INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
@@ -18,6 +16,7 @@
 			registry.h scales.h window.h lookup.h lookup_data.h\
 			codec_internal.h backends.h bitrate.h 
 libvorbis_la_LDFLAGS = -no-undefined -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
+libvorbis_la_LIBADD = @OGG_LIBS@ @VORBIS_LIBS@
 
 libvorbisfile_la_SOURCES = vorbisfile.c
 libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@


Property changes on: branches/vorbis-aotuv/lib/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/analysis.c
===================================================================
--- branches/vorbis-aotuv/lib/analysis.c	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/analysis.c	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: single-block PCM analysis mode dispatch
- last mod: $Id: analysis.c,v 1.55 2002/07/11 06:40:48 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -30,7 +30,8 @@
 
 /* decides between modes, dispatches to the appropriate mapping. */
 int vorbis_analysis(vorbis_block *vb, ogg_packet *op){
-  int                   ret;
+  int ret,i;
+  vorbis_block_internal *vbi=vb->internal;
 
   vb->glue_bits=0;
   vb->time_bits=0;
@@ -38,7 +39,8 @@
   vb->res_bits=0;
 
   /* first things first.  Make sure encode is ready */
-  oggpack_reset(&vb->opb);
+  for(i=0;i<PACKETBLOBS;i++)
+    oggpack_reset(vbi->packetblob[i]);
   
   /* we only have one mapping type (0), and we let the mapping code
      itself figure out what soft mode to use.  This allows easier


Property changes on: branches/vorbis-aotuv/lib/analysis.c
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/backends.h
===================================================================
--- branches/vorbis-aotuv/lib/backends.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/backends.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -12,7 +12,7 @@
 
  function: libvorbis backend and mapping structures; needed for 
            static mode headers
- last mod: $Id: backends.h,v 1.14 2002/07/11 06:40:48 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -94,7 +94,8 @@
   void (*free_look)    (vorbis_look_residue *);
   long **(*class)      (struct vorbis_block *,vorbis_look_residue *,
 			float **,int *,int);
-  int  (*forward)      (struct vorbis_block *,vorbis_look_residue *,
+  int  (*forward)      (oggpack_buffer *,struct vorbis_block *,
+			vorbis_look_residue *,
 			float **,float **,int *,int,long **);
   int  (*inverse)      (struct vorbis_block *,vorbis_look_residue *,
 			float **,int *,int);


Property changes on: branches/vorbis-aotuv/lib/backends.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/barkmel.c
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/bitrate.c
===================================================================
--- branches/vorbis-aotuv/lib/bitrate.c	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/bitrate.c	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,11 +11,10 @@
  ********************************************************************
 
  function: bitrate tracking and management
- last mod: $Id: bitrate.c,v 1.21 2002/10/11 11:14:41 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
@@ -26,146 +25,40 @@
 #include "misc.h"
 #include "bitrate.h"
 
-
-static long BINBYTES(bitrate_manager_state *bm,long pos,long bin){
-  int bins=bm->queue_bins;
-  return(bm->queue_binned[pos*bins+bin]);
-}
-
-#define LIMITBYTES(pos,bin) (bm->minmax_binstack[(pos)*bins*2+((bin)+bins)])
-
-static long LACING_ADJUST(long bytes){
-  int addto=bytes/255+1;
-  return(bytes+addto);
-}
-
-static int floater_interpolate(bitrate_manager_state *bm,vorbis_info *vi,
-				  double desired_rate){
-  int bin=rint(bm->avgfloat);
-  double lobitrate,hibitrate;
-
-
-  lobitrate=(double)(bm->avg_binacc[bin]*8)/bm->avg_sampleacc*vi->rate;
-  while(lobitrate>desired_rate && bin>0){
-    bin--;
-    lobitrate=(double)(bm->avg_binacc[bin]*8)/bm->avg_sampleacc*vi->rate;
-  }
-
-  if(bin+1<bm->queue_bins){
-    hibitrate=(double)(bm->avg_binacc[bin+1]*8)/bm->avg_sampleacc*vi->rate;
-    if(fabs(hibitrate-desired_rate) < fabs(lobitrate-desired_rate))bin++;
-  }
-  return(bin);
-}
-
-/* try out a new limit */
-static long limit_sum(bitrate_manager_state *bm,int limit){
-  int i=bm->minmax_stackptr;
-  long acc=bm->minmax_acctotal;
-  long bins=bm->queue_bins;
-  
-  acc-=LIMITBYTES(i,0);
-  acc+=LIMITBYTES(i,limit);
-
-  while(i-->0){
-    if(bm->minmax_limitstack[i]<=limit)break;
-    acc-=LIMITBYTES(i,bm->minmax_limitstack[i]);
-    acc+=LIMITBYTES(i,limit);
-  }
-  return(acc);
-}
-
-/* compute bitrate tracking setup, allocate circular packet size queue */
+/* compute bitrate tracking setup  */
 void vorbis_bitrate_init(vorbis_info *vi,bitrate_manager_state *bm){
-  int i;
   codec_setup_info *ci=vi->codec_setup;
   bitrate_manager_info *bi=&ci->bi;
-  long maxlatency;
 
   memset(bm,0,sizeof(*bm));
   
-  if(bi){
+  if(bi && (bi->reservoir_bits>0)){
+    long ratesamples=vi->rate;
+    int  halfsamples=ci->blocksizes[0]>>1;
+
+    bm->short_per_long=ci->blocksizes[1]/ci->blocksizes[0];
+    bm->managed=1;
+
+    bm->avg_bitsper= rint(1.*bi->avg_rate*halfsamples/ratesamples);
+    bm->min_bitsper= rint(1.*bi->min_rate*halfsamples/ratesamples);
+    bm->max_bitsper= rint(1.*bi->max_rate*halfsamples/ratesamples);
     
-    bm->avg_sampledesired=bi->queue_avg_time*vi->rate;
-    bm->avg_centerdesired=bi->queue_avg_time*vi->rate*bi->queue_avg_center;
-    bm->minmax_sampledesired=bi->queue_minmax_time*vi->rate;
-    
-    /* first find the max possible needed queue size */
-    maxlatency=max(bm->avg_sampledesired-bm->avg_centerdesired,
-		   bm->minmax_sampledesired)+bm->avg_centerdesired;
-    
-    if(maxlatency>0 &&
-       (bi->queue_avgmin>0 || bi->queue_avgmax>0 || bi->queue_hardmax>0 ||
-	bi->queue_hardmin>0)){
-      long maxpackets=maxlatency/(ci->blocksizes[0]>>1)+3;
-      long bins=PACKETBLOBS;
-      
-      bm->queue_size=maxpackets;
-      bm->queue_bins=bins;
-      bm->queue_binned=_ogg_calloc(maxpackets,bins*sizeof(*bm->queue_binned));
-      bm->queue_actual=_ogg_calloc(maxpackets,sizeof(*bm->queue_actual));
-      
-      if((bi->queue_avgmin>0 || bi->queue_avgmax>0) &&
-	 bi->queue_avg_time>0){
-	
-	bm->avg_binacc=_ogg_calloc(bins,sizeof(*bm->avg_binacc));
-	bm->avgfloat=PACKETBLOBS/2;
-	
-      }else{
-	bm->avg_tail= -1;
-      }
-      
-      if((bi->queue_hardmin>0 || bi->queue_hardmax>0) &&
-	 bi->queue_minmax_time>0){
-	
-	bm->minmax_binstack=_ogg_calloc((bins*2+1)*bins*2,
-					sizeof(*bm->minmax_binstack));
-	bm->minmax_posstack=_ogg_calloc((bins*2+1),
-				      sizeof(*bm->minmax_posstack));
-	bm->minmax_limitstack=_ogg_calloc((bins*2+1),
-					  sizeof(*bm->minmax_limitstack));
-      }else{
-	bm->minmax_tail= -1;
-      }
-      
-      /* space for the packet queueing */
-      bm->packetbuffers=_ogg_calloc(maxpackets,sizeof(*bm->packetbuffers));
-      bm->packets=_ogg_calloc(maxpackets,sizeof(*bm->packets));
-      for(i=0;i<maxpackets;i++)
-	oggpack_writeinit(bm->packetbuffers+i);
-      
-    }else{
-      bm->packetbuffers=_ogg_calloc(1,sizeof(*bm->packetbuffers));
-      bm->packets=_ogg_calloc(1,sizeof(*bm->packets));
-      oggpack_writeinit(bm->packetbuffers);
+    bm->avgfloat=PACKETBLOBS/2;    
 
-    }      
-  }
+    /* not a necessary fix, but one that leads to a more balanced
+       typical initialization */
+    {
+      long desired_fill=bi->reservoir_bits*bi->reservoir_bias;
+      bm->minmax_reservoir=desired_fill;
+      bm->avg_reservoir=desired_fill;
+    }
+
+  }    
 }
 
 void vorbis_bitrate_clear(bitrate_manager_state *bm){
-  int i;
-  if(bm){
-    if(bm->queue_binned)_ogg_free(bm->queue_binned);
-    if(bm->queue_actual)_ogg_free(bm->queue_actual);
-    if(bm->avg_binacc)_ogg_free(bm->avg_binacc);
-    if(bm->minmax_binstack)_ogg_free(bm->minmax_binstack);
-    if(bm->minmax_posstack)_ogg_free(bm->minmax_posstack);
-    if(bm->minmax_limitstack)_ogg_free(bm->minmax_limitstack);
-
-    if(bm->packetbuffers){
-      if(bm->queue_size==0){
-	oggpack_writeclear(bm->packetbuffers);
-      }else{
-	for(i=0;i<bm->queue_size;i++)
-	  oggpack_writeclear(bm->packetbuffers+i);	
-      }
-      _ogg_free(bm->packetbuffers);
-    }
-    if(bm->packets)_ogg_free(bm->packets);
-    
-    memset(bm,0,sizeof(*bm));
-  }
+  memset(bm,0,sizeof(*bm));
+  return;
 }
 
 int vorbis_bitrate_managed(vorbis_block *vb){
@@ -173,13 +66,12 @@
   private_state         *b=vd->backend_state; 
   bitrate_manager_state *bm=&b->bms;
 
-  if(bm->queue_binned)return(1);
+  if(bm && bm->managed)return(1);
   return(0);
 }
 
 /* finish taking in the block we just processed */
 int vorbis_bitrate_addblock(vorbis_block *vb){
-  int i; 
   vorbis_block_internal *vbi=vb->internal;
   vorbis_dsp_state      *vd=vb->vd;
   private_state         *b=vd->backend_state; 
@@ -187,345 +79,175 @@
   vorbis_info           *vi=vd->vi;
   codec_setup_info      *ci=vi->codec_setup;
   bitrate_manager_info  *bi=&ci->bi;
-  int                    eofflag=vb->eofflag;
-  int                    head=bm->queue_head;
-  int                    next_head=head+1;
-  int                    bins=bm->queue_bins;
-  int                    minmax_head,new_minmax_head;
-  
-  ogg_uint32_t           *head_ptr;
-  oggpack_buffer          temp;
 
-  if(!bm->queue_binned){
-    oggpack_buffer temp;
+  int  choice=rint(bm->avgfloat);
+  long this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
+  long min_target_bits=(vb->W?bm->min_bitsper*bm->short_per_long:bm->min_bitsper);
+  long max_target_bits=(vb->W?bm->max_bitsper*bm->short_per_long:bm->max_bitsper);
+  int  samples=ci->blocksizes[vb->W]>>1;
+  long desired_fill=bi->reservoir_bits*bi->reservoir_bias;
+  if(!bm->managed){
     /* not a bitrate managed stream, but for API simplicity, we'll
-       buffer one packet to keep the code path clean */
+       buffer the packet to keep the code path clean */
     
-    if(bm->queue_head)return(-1); /* one has been submitted without
-                                     being claimed */
-    bm->queue_head++;
-
-    bm->packets[0].packet=oggpack_get_buffer(&vb->opb);
-    bm->packets[0].bytes=oggpack_bytes(&vb->opb);
-    bm->packets[0].b_o_s=0;
-    bm->packets[0].e_o_s=vb->eofflag;
-    bm->packets[0].granulepos=vb->granulepos;
-    bm->packets[0].packetno=vb->sequence; /* for sake of completeness */
-
-    memcpy(&temp,bm->packetbuffers,sizeof(vb->opb));
-    memcpy(bm->packetbuffers,&vb->opb,sizeof(vb->opb));
-    memcpy(&vb->opb,&temp,sizeof(vb->opb));
-
+    if(bm->vb)return(-1); /* one has been submitted without
+			     being claimed */
+    bm->vb=vb;
     return(0);
   }
 
-  /* add encoded packet to head */
-  if(next_head>=bm->queue_size)next_head=0;
-  head_ptr=bm->queue_binned+bins*head;
+  bm->vb=vb;
+  
+  /* look ahead for avg floater */
+  if(bm->avg_bitsper>0){
+    double slew=0.;
+    long avg_target_bits=(vb->W?bm->avg_bitsper*bm->short_per_long:bm->avg_bitsper);
+    double slewlimit= 15./bi->slew_damp;
 
-  /* is there room to add a block? In proper use of the API, this will
-     never come up... but guard it anyway */
-  if(next_head==bm->avg_tail || next_head==bm->minmax_tail)return(-1);
+    /* choosing a new floater:
+       if we're over target, we slew down
+       if we're under target, we slew up
 
-  /* add the block to the toplevel queue */
-  bm->queue_head=next_head;
-  bm->queue_actual[head]=(vb->W?0x80000000UL:0);
+       choose slew as follows: look through packetblobs of this frame
+       and set slew as the first in the appropriate direction that
+       gives us the slew we want.  This may mean no slew if delta is
+       already favorable.
 
-  /* buffer packet fields */
-  bm->packets[head].packet=oggpack_get_buffer(&vb->opb);
-  bm->packets[head].bytes=oggpack_bytes(&vb->opb);
-  bm->packets[head].b_o_s=0;
-  bm->packets[head].e_o_s=vb->eofflag;
-  bm->packets[head].granulepos=vb->granulepos;
-  bm->packets[head].packetno=vb->sequence; /* for sake of completeness */
+       Then limit slew to slew max */
 
-  /* swap packet buffers */
-  memcpy(&temp,bm->packetbuffers+head,sizeof(vb->opb));
-  memcpy(bm->packetbuffers+head,&vb->opb,sizeof(vb->opb));
-  memcpy(&vb->opb,&temp,sizeof(vb->opb));
+    if(bm->avg_reservoir+(this_bits-avg_target_bits)>desired_fill){
+      while(choice>0 && this_bits>avg_target_bits &&
+	    bm->avg_reservoir+(this_bits-avg_target_bits)>desired_fill){
+	choice--;
+	this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
+      }
+    }else if(bm->avg_reservoir+(this_bits-avg_target_bits)<desired_fill){
+      while(choice+1<PACKETBLOBS && this_bits<avg_target_bits &&
+	    bm->avg_reservoir+(this_bits-avg_target_bits)<desired_fill){
+	choice++;
+	this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
+      }
+    }
 
-  /* save markers */
-  head_ptr[0]=vbi->packetblob_markers[0];
-  for(i=1;i<PACKETBLOBS;i++){
-    head_ptr[i]=vbi->packetblob_markers[i]-vbi->packetblob_markers[i-1];
+    slew=rint(choice-bm->avgfloat)/samples*vi->rate;
+    if(slew<-slewlimit)slew=-slewlimit;
+    if(slew>slewlimit)slew=slewlimit;
+    choice=rint(bm->avgfloat+= slew/vi->rate*samples);
+    this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
   }
 
-  if(bm->avg_binacc)
-    new_minmax_head=minmax_head=bm->avg_center;
-  else
-    new_minmax_head=minmax_head=head;
 
-  /* the average tracking queue is updated first; its results (if it's
-     in use) are taken into account by the min/max limiter (if min/max
-     is in use) */
-  if(bm->avg_binacc){
-    unsigned long desired_center=bm->avg_centerdesired;
-    if(eofflag)desired_center=0;
 
-    /* update the avg head */
-    for(i=0;i<bins;i++)
-      bm->avg_binacc[i]+=LACING_ADJUST(head_ptr[i]);
-    bm->avg_sampleacc+=ci->blocksizes[vb->W]>>1;
-    bm->avg_centeracc+=ci->blocksizes[vb->W]>>1;
-
-    if(bm->avg_sampleacc>bm->avg_sampledesired || eofflag){
-
-      /* update the avg center */
-      if(bm->avg_centeracc>desired_center){
-	/* choose the new average floater */
-	int samples=ci->blocksizes[vb->W]>>1;
-	double upper=floater_interpolate(bm,vi,bi->queue_avgmax);
-	double lower=floater_interpolate(bm,vi,bi->queue_avgmin);
-	double new=PACKETBLOBS/2.,slew;
-	int bin;
-	
-	if(upper<new)new=upper;
-	if(lower>new)new=lower;
-	
-	slew=(new-bm->avgfloat)/samples*vi->rate;
-	
-	if(slew<bi->avgfloat_downslew_max)
-	  new=bm->avgfloat+bi->avgfloat_downslew_max/vi->rate*samples;
-	if(slew>bi->avgfloat_upslew_max)
-	  new=bm->avgfloat+bi->avgfloat_upslew_max/vi->rate*samples;
-	
-	bm->avgfloat=new;
-	/* apply the average floater to new blocks */
-	bin=rint(bm->avgfloat);
-
-	/*fprintf(stderr,"%d ",bin);*/
-	
-	while(bm->avg_centeracc>desired_center){
-	  samples=ci->blocksizes[bm->queue_actual[bm->avg_center]&
-				0x80000000UL?1:0]>>1;
-	  
-	  bm->queue_actual[bm->avg_center]|=bin;
-	  
-	  bm->avg_centeracc-=samples;
-	  bm->avg_center++;
-	  if(bm->avg_center>=bm->queue_size)bm->avg_center=0;
-	}
-	new_minmax_head=bm->avg_center;
-	
+  /* enforce min(if used) on the current floater (if used) */
+  if(bm->min_bitsper>0){
+    /* do we need to force the bitrate up? */
+    if(this_bits<min_target_bits){
+      while(bm->minmax_reservoir-(min_target_bits-this_bits)<0){
+	choice++;
+	if(choice>=PACKETBLOBS)break;
+	this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
       }
-      
-      /* update the avg tail if needed */
-      while(bm->avg_sampleacc>bm->avg_sampledesired){
-	int samples=
-	  ci->blocksizes[bm->queue_actual[bm->avg_tail]&0x80000000UL?1:0]>>1;
-	for(i=0;i<bm->queue_bins;i++)
-	  bm->avg_binacc[i]-=LACING_ADJUST(bm->queue_binned[bins*bm->avg_tail+i]);
-	bm->avg_sampleacc-=samples;
-	bm->avg_tail++;
-	if(bm->avg_tail>=bm->queue_size)bm->avg_tail=0;
-      }
-      
-      
     }
-  }else{
-    /* if we're not using an average tracker, the 'float' is nailed to
-       the avgfloat_initial value.  It needs to be set for the min/max
-       to deal properly */
-    long bin=PACKETBLOBS/2;
-    bm->queue_actual[head]|=bin;
-    new_minmax_head=next_head;
-  }	
+  }
   
-  /* update the min/max queues and enforce limits */
-  if(bm->minmax_binstack){
-    unsigned long sampledesired=eofflag?0:bm->minmax_sampledesired;
-    
-    /* add to stack recent */
-    while(minmax_head!=new_minmax_head){
-      unsigned int i;
-      int samples=ci->blocksizes[bm->queue_actual[minmax_head]&
-				0x80000000UL?1:0]>>1;
-      int actual=bm->queue_actual[minmax_head]&0x7fffffffUL;
-
-      for(i=0;i<(unsigned int)bins;i++){
-	bm->minmax_binstack[bm->minmax_stackptr*bins*2+bins+i]+=
-	  LACING_ADJUST(BINBYTES(bm,minmax_head,
-				actual>i?actual:i));
-	
-	bm->minmax_binstack[bm->minmax_stackptr*bins*2+i]+=
-	  LACING_ADJUST(BINBYTES(bm,minmax_head,
-				actual<i?actual:i));
+  /* enforce max (if used) on the current floater (if used) */
+  if(bm->max_bitsper>0){
+    /* do we need to force the bitrate down? */
+    if(this_bits>max_target_bits){
+      while(bm->minmax_reservoir+(this_bits-max_target_bits)>bi->reservoir_bits){
+	choice--;
+	if(choice<0)break;
+	this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
       }
-      
-      bm->minmax_posstack[bm->minmax_stackptr]=minmax_head; /* not one
-							       past
-							       like
-							       typical */
-      bm->minmax_limitstack[bm->minmax_stackptr]=0;
-      bm->minmax_sampleacc+=samples;
-      bm->minmax_acctotal+=
-	LACING_ADJUST(BINBYTES(bm,minmax_head,actual));
-      
-      minmax_head++;
-      if(minmax_head>=bm->queue_size)minmax_head=0;
+    }
+  }
 
+  /* Choice of packetblobs now made based on floater, and min/max
+     requirements. Now boundary check extreme choices */
 
-    }
+  if(choice<0){
+    /* choosing a smaller packetblob is insufficient to trim bitrate.
+       frame will need to be truncated */
+    long maxsize=(max_target_bits+(bi->reservoir_bits-bm->minmax_reservoir))/8;
+    bm->choice=choice=0;
     
-    /* check limits, enforce changes */
-    if(bm->minmax_sampleacc>sampledesired){
-      double bitrate=(double)(bm->minmax_acctotal*8)/
-	bm->minmax_sampleacc*vi->rate;
-      int limit=0;
+    if(oggpack_bytes(vbi->packetblob[choice])>maxsize){
       
-      if((bi->queue_hardmax>0 && bitrate>bi->queue_hardmax) || 
-	 (bi->queue_hardmin>0 && bitrate<bi->queue_hardmin)){
-	int newstack;
-	int stackctr;
-	long bitsum=bm->minmax_acctotal*8;
+      oggpack_writetrunc(vbi->packetblob[choice],maxsize*8);
+      this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
+    }
+  }else{
+    long minsize=(min_target_bits-bm->minmax_reservoir+7)/8;
+    if(choice>=PACKETBLOBS)
+      choice=PACKETBLOBS-1;
 
-	bitrate=(double)bitsum/bm->minmax_sampleacc*vi->rate;
+    bm->choice=choice;
 
-	/* we're off rate.  Iteratively try out new hard floater
-           limits until we find one that brings us inside.  Here's
-           where we see the whole point of the limit stacks.  */
-	if(bi->queue_hardmax>0 && bitrate>bi->queue_hardmax){
-	  for(limit=-1;limit>-bins+1;limit--){
-	    long bitsum=limit_sum(bm,limit)*8;
-	    bitrate=(double)bitsum/bm->minmax_sampleacc*vi->rate;
-	    if(bitrate<=bi->queue_hardmax)break;
-	  }
-	}else if(bitrate<bi->queue_hardmin){
-	  for(limit=1;limit<bins-1;limit++){
-	    long bitsum=limit_sum(bm,limit)*8;
-	    bitrate=(double)bitsum/bm->minmax_sampleacc*vi->rate;
-	    if(bitrate>=bi->queue_hardmin)break;
-	  }
-	  if(bitrate>bi->queue_hardmax)limit--;
-	}
+    /* prop up bitrate according to demand. pad this frame out with zeroes */
+    minsize-=oggpack_bytes(vbi->packetblob[choice]);
+    while(minsize-->0)oggpack_write(vbi->packetblob[choice],0,8);
+    this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
 
-	/* trace the limit backward, stop when we see a lower limit */
-	newstack=bm->minmax_stackptr-1;
-	while(newstack>=0){
-	  if(bm->minmax_limitstack[newstack]<limit)break;
-	  newstack--;
-	}
-	
-	/* update bit counter with new limit and replace any stack
-           limits that have been replaced by our new lower limit */
-	stackctr=bm->minmax_stackptr;
-	while(stackctr>newstack){
-	  bm->minmax_acctotal-=
-	    LIMITBYTES(stackctr,bm->minmax_limitstack[stackctr]);
-	  bm->minmax_acctotal+=LIMITBYTES(stackctr,limit);
-	  
-	  if(stackctr<bm->minmax_stackptr)
-	    for(i=0;i<bins*2;i++)
-	      bm->minmax_binstack[stackctr*bins*2+i]+=
-		bm->minmax_binstack[(stackctr+1)*bins*2+i];
+  }
 
-	  stackctr--;
-	}
-	stackctr++;
-	bm->minmax_posstack[stackctr]=bm->minmax_posstack[bm->minmax_stackptr];
-	bm->minmax_limitstack[stackctr]=limit;
+  /* now we have the final packet and the final packet size.  Update statistics */
+  /* min and max reservoir */
+  if(bm->min_bitsper>0 || bm->max_bitsper>0){
 
-	/* set up new blank stack entry */
-	stackctr++;
-	bm->minmax_stackptr=stackctr;
-	memset(&bm->minmax_binstack[stackctr*bins*2],
-	       0,
-	       sizeof(*bm->minmax_binstack)*bins*2);
-	bm->minmax_limitstack[stackctr]=0;
-	bm->minmax_posstack[stackctr]=-1;
-	
+    if(max_target_bits>0 && this_bits>max_target_bits){
+      bm->minmax_reservoir+=(this_bits-max_target_bits);
+    }else if(min_target_bits>0 && this_bits<min_target_bits){
+      bm->minmax_reservoir+=(this_bits-min_target_bits);
+    }else{
+      /* inbetween; we want to take reservoir toward but not past desired_fill */
+      if(bm->minmax_reservoir>desired_fill){
+	if(max_target_bits>0){ /* logical bulletproofing against initialization state */
+	  bm->minmax_reservoir+=(this_bits-max_target_bits);
+	  if(bm->minmax_reservoir<desired_fill)bm->minmax_reservoir=desired_fill;
+	}else{
+	  bm->minmax_reservoir=desired_fill;
+	}
+      }else{
+	if(min_target_bits>0){ /* logical bulletproofing against initialization state */
+	  bm->minmax_reservoir+=(this_bits-min_target_bits);
+	  if(bm->minmax_reservoir>desired_fill)bm->minmax_reservoir=desired_fill;
+	}else{
+	  bm->minmax_reservoir=desired_fill;
+	}
       }
     }
-    
-    /* remove from tail */
-    while(bm->minmax_sampleacc>sampledesired){
-      int samples=
-	ci->blocksizes[bm->queue_actual[bm->minmax_tail]&0x80000000UL?1:0]>>1;
-      int actual=bm->queue_actual[bm->minmax_tail]&0x7fffffffUL;
+  }
 
-      for(i=0;i<bins;i++){
-	bm->minmax_binstack[bins+i]-= /* always comes off the stack bottom */
-	  LACING_ADJUST(BINBYTES(bm,bm->minmax_tail,
-				actual>i?
-				actual:i));
-	bm->minmax_binstack[i]-= 
-	  LACING_ADJUST(BINBYTES(bm,bm->minmax_tail,
-				actual<i?
-				actual:i));
-      }
-
-      if(bm->minmax_limitstack[0]>actual)
-	actual=bm->minmax_limitstack[0];
-      if(bins+bm->minmax_limitstack[0]<actual)
-	actual=bins+bm->minmax_limitstack[0];
-      
-      bm->minmax_acctotal-=LACING_ADJUST(BINBYTES(bm,bm->minmax_tail,actual));
-      bm->minmax_sampleacc-=samples;
-
-      /* revise queue_actual to reflect the limit */
-      bm->queue_actual[bm->minmax_tail]&=0x80000000UL;
-      bm->queue_actual[bm->minmax_tail]|=actual;
-      
-      if(bm->minmax_tail==bm->minmax_posstack[0]){
-	/* the stack becomes a FIFO; the first data has fallen off */
-	memmove(bm->minmax_binstack,bm->minmax_binstack+bins*2,
-		sizeof(*bm->minmax_binstack)*bins*2*bm->minmax_stackptr);
-	memmove(bm->minmax_posstack,bm->minmax_posstack+1,
-		sizeof(*bm->minmax_posstack)*bm->minmax_stackptr);
-	memmove(bm->minmax_limitstack,bm->minmax_limitstack+1,
-		sizeof(*bm->minmax_limitstack)*bm->minmax_stackptr);
-	bm->minmax_stackptr--;
-      }
-      
-      bm->minmax_tail++;
-      if(bm->minmax_tail>=bm->queue_size)bm->minmax_tail=0;
-
-    }
-    
-    
-    bm->last_to_flush=bm->minmax_tail;
-  }else{
-    bm->last_to_flush=bm->avg_center;
+  /* avg reservoir */
+  if(bm->avg_bitsper>0){
+    long avg_target_bits=(vb->W?bm->avg_bitsper*bm->short_per_long:bm->avg_bitsper);    
+    bm->avg_reservoir+=this_bits-avg_target_bits;
   }
-  if(eofflag)
-    bm->last_to_flush=bm->queue_head;
+
   return(0);
 }
 
 int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd,ogg_packet *op){
   private_state         *b=vd->backend_state;
   bitrate_manager_state *bm=&b->bms;
+  vorbis_block          *vb=bm->vb;
+  int                    choice=PACKETBLOBS/2;
+  if(!vb)return 0;
 
-  if(bm->queue_size==0){
-    if(bm->queue_head==0)return(0);
+  if(op){
+    vorbis_block_internal *vbi=vb->internal;
+    
+    if(vorbis_bitrate_managed(vb))
+      choice=bm->choice;
 
-    memcpy(op,bm->packets,sizeof(*op));
-    bm->queue_head=0;
-
-  }else{
-
-    if(bm->next_to_flush==bm->last_to_flush)return(0);
-
-    {
-      long bin=bm->queue_actual[bm->next_to_flush]&0x7fffffff,i;
-      long bins=bm->queue_bins;
-      ogg_uint32_t *markers=bm->queue_binned+bins*bm->next_to_flush;
-      long bytes=markers[bin];
-
-      memcpy(op,bm->packets+bm->next_to_flush,sizeof(*op));
-
-      /* we have [PACKETBLOBS] possible packets all squished together in
-	 the buffer, in sequence.  count in to number [bin] */
-      for(i=0;i<bin;i++)
-	op->packet+=markers[i];
-      op->bytes=bytes;
-	
-    }
-
-    bm->next_to_flush++;
-    if(bm->next_to_flush>=bm->queue_size)bm->next_to_flush=0;
-
+    op->packet=oggpack_get_buffer(vbi->packetblob[choice]);
+    op->bytes=oggpack_bytes(vbi->packetblob[choice]);
+    op->b_o_s=0;
+    op->e_o_s=vb->eofflag;
+    op->granulepos=vb->granulepos;
+    op->packetno=vb->sequence; /* for sake of completeness */
   }
-
+  
+  bm->vb=0;
   return(1);
 }


Property changes on: branches/vorbis-aotuv/lib/bitrate.c
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/bitrate.h
===================================================================
--- branches/vorbis-aotuv/lib/bitrate.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/bitrate.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: bitrate tracking and management
- last mod: $Id: bitrate.h,v 1.7 2002/07/11 06:40:48 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -24,54 +24,29 @@
 
 /* encode side bitrate tracking */
 typedef struct bitrate_manager_state {
-  ogg_uint32_t  *queue_binned;
-  ogg_uint32_t  *queue_actual;
-  int            queue_size;
+  int            managed;
 
-  int            queue_head;
-  int            queue_bins;
+  long           avg_reservoir;
+  long           minmax_reservoir;
+  long           avg_bitsper;
+  long           min_bitsper;
+  long           max_bitsper;
 
-  long          *avg_binacc;
-  int            avg_center;
-  int            avg_tail;
-  ogg_uint32_t   avg_centeracc;
-  ogg_uint32_t   avg_sampleacc;
-  ogg_uint32_t   avg_sampledesired;
-  ogg_uint32_t   avg_centerdesired;
-
-  long          *minmax_binstack;
-  long          *minmax_posstack;
-  long          *minmax_limitstack;
-  long           minmax_stackptr;
-
-  long           minmax_acctotal;
-  int            minmax_tail;
-  ogg_uint32_t   minmax_sampleacc;
-  ogg_uint32_t   minmax_sampledesired;
-
-  int            next_to_flush;
-  int            last_to_flush;
-  
+  long           short_per_long;
   double         avgfloat;
 
-  /* unfortunately, we need to hold queued packet data somewhere */
-  oggpack_buffer *packetbuffers;
-  ogg_packet     *packets;
-
+  vorbis_block  *vb;
+  int            choice;
 } bitrate_manager_state;
 
 typedef struct bitrate_manager_info{
-  /* detailed bitrate management setup */
-  double queue_avg_time;
-  double queue_avg_center;
-  double queue_minmax_time;
-  double queue_hardmin;
-  double queue_hardmax;
-  double queue_avgmin;
-  double queue_avgmax;
+  long           avg_rate;
+  long           min_rate;
+  long           max_rate;
+  long           reservoir_bits;
+  double         reservoir_bias;
 
-  double avgfloat_downslew_max;
-  double avgfloat_upslew_max;
+  double         slew_damp;
 
 } bitrate_manager_info;
 


Property changes on: branches/vorbis-aotuv/lib/bitrate.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/block.c
===================================================================
--- branches/vorbis-aotuv/lib/block.c	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/block.c	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: PCM data vector blocking, windowing and dis/reassembly
- last mod: $Id: block.c,v 1.75 2003/09/02 04:39:26 xiphmont Exp $
+ last mod: $Id$
 
  Handle windowing, overlap-add, etc of the PCM vectors.  This is made
  more amusing by Vorbis' current two allowed block sizes.
@@ -86,6 +86,7 @@
 #endif
 
 int vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb){
+  int i;
   memset(vb,0,sizeof(*vb));
   vb->vd=v;
   vb->localalloc=0;
@@ -93,8 +94,17 @@
   if(v->analysisp){
     vorbis_block_internal *vbi=
       vb->internal=_ogg_calloc(1,sizeof(vorbis_block_internal));
-    oggpack_writeinit(&vb->opb);
     vbi->ampmax=-9999;
+
+    for(i=0;i<PACKETBLOBS;i++){
+      if(i==PACKETBLOBS/2){
+	vbi->packetblob[i]=&vb->opb;
+      }else{
+	vbi->packetblob[i]=
+	  _ogg_calloc(1,sizeof(oggpack_buffer));
+      }
+      oggpack_writeinit(vbi->packetblob[i]);
+    }    
   }
   
   return(0);
@@ -147,15 +157,19 @@
 }
 
 int vorbis_block_clear(vorbis_block *vb){
-  if(vb->vd)
-    if(vb->vd->analysisp)
-      oggpack_writeclear(&vb->opb);
+  int i;
+  vorbis_block_internal *vbi=vb->internal;
+
   _vorbis_block_ripcord(vb);
   if(vb->localstore)_ogg_free(vb->localstore);
 
-  if(vb->internal)
-    _ogg_free(vb->internal);
-
+  if(vbi){
+    for(i=0;i<PACKETBLOBS;i++){
+      oggpack_writeclear(vbi->packetblob[i]);
+      if(i!=PACKETBLOBS/2)_ogg_free(vbi->packetblob[i]);
+    }
+    _ogg_free(vbi);
+  }
   memset(vb,0,sizeof(*vb));
   return(0);
 }


Property changes on: branches/vorbis-aotuv/lib/block.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/books
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/vorbis-aotuv/lib/books/.cvsignore
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/books/Makefile.am
===================================================================
--- branches/vorbis-aotuv/lib/books/Makefile.am	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/books/Makefile.am	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,4 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
 SUBDIRS = coupled uncoupled floor


Property changes on: branches/vorbis-aotuv/lib/books/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/books/coupled
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/vorbis-aotuv/lib/books/coupled/.cvsignore
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/books/coupled/Makefile.am
===================================================================
--- branches/vorbis-aotuv/lib/books/coupled/Makefile.am	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/books/coupled/Makefile.am	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,5 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
-EXTRA_DIST = res_books_stereo.h
\ No newline at end of file
+EXTRA_DIST = res_books_stereo.h


Property changes on: branches/vorbis-aotuv/lib/books/coupled/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/books/coupled/res_books_stereo.h
===================================================================
--- branches/vorbis-aotuv/lib/books/coupled/res_books_stereo.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/books/coupled/res_books_stereo.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: static codebooks autogenerated by huff/huffbuld
- last modified: $Id: res_books_stereo.h,v 1.2 2002/07/11 10:27:51 xiphmont Exp $
+ last modified: $Id$
 
  ********************************************************************/
 
@@ -3318,46 +3318,25 @@
 	0
 };
 
-static long _huff_lengthlist__44c0_s_long[] = {
-	 3, 4,18, 8, 8, 8, 9,10,11,13, 3, 2,18, 5, 5, 6,
-	 8,11,12,12,18,18,18,18,18,18,18,18,18,18, 8, 5,
-	18, 7, 8, 8,10,14,14,16, 8, 5,18, 7, 5, 6, 7,11,
-	12,13, 8, 6,18, 7, 5, 6, 7,10,12,14, 8, 7,18,10,
-	 7, 6, 6, 8,11,14, 9,10,18,13, 9, 7, 6, 8,10,13,
-	11,13,18,16,13,10, 9, 8, 8,11,12,17,18,17,18,14,
-	11, 9,10,14,
-};
-
-static static_codebook _huff_book__44c0_s_long = {
-	2, 100,
-	_huff_lengthlist__44c0_s_long,
-	0, 0, 0, 0, 0,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c0_s_p1_0[] = {
+static long _vq_quantlist__8c0_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c0_s_p1_0[] = {
-	 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0,
+static 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,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 7, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0, 0,
+	 0, 5, 8, 8, 0, 0, 0, 0, 0, 0, 7, 8, 9, 0, 0, 0,
 	 0, 0, 0, 7, 8, 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, 0, 0, 0, 0, 0, 0, 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, 7, 8, 0, 0, 0, 0, 0, 0, 7, 9, 8, 0, 0,
-	 0, 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 5, 8, 8, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
+	 0, 0, 0, 0, 7, 9, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -3391,18 +3370,18 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 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, 8, 7, 0, 0, 0, 0,
-	 0, 0, 8, 9, 9, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 8, 8, 0, 0, 0, 0,
+	 0, 0, 8,10,10, 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0, 0,
-	 0, 0, 0, 9, 9,11, 0, 0, 0, 0, 0, 0, 9,11,10, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7,10, 9, 0, 0, 0,
+	 0, 0, 0, 8, 9,11, 0, 0, 0, 0, 0, 0, 9,11,11, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
-	 0, 0, 0, 0, 8,10, 9, 0, 0, 0, 0, 0, 0, 9,10,11,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9,10, 0, 0,
+	 0, 0, 0, 0, 9,11,10, 0, 0, 0, 0, 0, 0, 9,11,11,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -3437,18 +3416,18 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
-	 0, 0, 0, 0, 8, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 5, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0, 0,
+	 0, 0, 0, 0, 8, 9,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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 9,11,10, 0,
-	 0, 0, 0, 0, 0, 8, 9,11, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 9,11,11, 0,
+	 0, 0, 0, 0, 0, 9,10,11, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 9,10,10,
-	 0, 0, 0, 0, 0, 0, 9,11,10, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 7, 9,10, 0, 0, 0, 0, 0, 0, 9,11,11,
+	 0, 0, 0, 0, 0, 0, 8,11, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -3759,33 +3738,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c0_s_p1_0[] = {
+static float _vq_quantthresh__8c0_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44c0_s_p1_0[] = {
+static long _vq_quantmap__8c0_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 encode_aux_threshmatch _vq_auxt__8c0_s_p1_0 = {
+	_vq_quantthresh__8c0_s_p1_0,
+	_vq_quantmap__8c0_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44c0_s_p1_0 = {
+static static_codebook _8c0_s_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__44c0_s_p1_0,
+	_vq_lengthlist__8c0_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44c0_s_p1_0,
+	_vq_quantlist__8c0_s_p1_0,
 	NULL,
-	&_vq_auxt__44c0_s_p1_0,
+	&_vq_auxt__8c0_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p2_0[] = {
+static long _vq_quantlist__8c0_s_p2_0[] = {
 	2,
 	1,
 	3,
@@ -3793,7 +3772,7 @@
 	4,
 };
 
-static long _vq_lengthlist__44c0_s_p2_0[] = {
+static long _vq_lengthlist__8c0_s_p2_0[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -3836,33 +3815,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c0_s_p2_0[] = {
+static float _vq_quantthresh__8c0_s_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c0_s_p2_0[] = {
+static long _vq_quantmap__8c0_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 encode_aux_threshmatch _vq_auxt__8c0_s_p2_0 = {
+	_vq_quantthresh__8c0_s_p2_0,
+	_vq_quantmap__8c0_s_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44c0_s_p2_0 = {
+static static_codebook _8c0_s_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44c0_s_p2_0,
+	_vq_lengthlist__8c0_s_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c0_s_p2_0,
+	_vq_quantlist__8c0_s_p2_0,
 	NULL,
-	&_vq_auxt__44c0_s_p2_0,
+	&_vq_auxt__8c0_s_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p3_0[] = {
+static long _vq_quantlist__8c0_s_p3_0[] = {
 	2,
 	1,
 	3,
@@ -3870,14 +3849,14 @@
 	4,
 };
 
-static long _vq_lengthlist__44c0_s_p3_0[] = {
+static 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, 5, 7, 7, 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,
 	 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, 0, 0, 6, 7, 7, 9, 9,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 7, 8, 8,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 7, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 6, 7, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -3913,33 +3892,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c0_s_p3_0[] = {
+static float _vq_quantthresh__8c0_s_p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c0_s_p3_0[] = {
+static long _vq_quantmap__8c0_s_p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p3_0 = {
-	_vq_quantthresh__44c0_s_p3_0,
-	_vq_quantmap__44c0_s_p3_0,
+static encode_aux_threshmatch _vq_auxt__8c0_s_p3_0 = {
+	_vq_quantthresh__8c0_s_p3_0,
+	_vq_quantmap__8c0_s_p3_0,
 	5,
 	5
 };
 
-static static_codebook _44c0_s_p3_0 = {
+static static_codebook _8c0_s_p3_0 = {
 	4, 625,
-	_vq_lengthlist__44c0_s_p3_0,
+	_vq_lengthlist__8c0_s_p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c0_s_p3_0,
+	_vq_quantlist__8c0_s_p3_0,
 	NULL,
-	&_vq_auxt__44c0_s_p3_0,
+	&_vq_auxt__8c0_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p4_0[] = {
+static long _vq_quantlist__8c0_s_p4_0[] = {
 	4,
 	3,
 	5,
@@ -3951,43 +3930,43 @@
 	8,
 };
 
-static long _vq_lengthlist__44c0_s_p4_0[] = {
-	 1, 3, 2, 8, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0,
+static 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,
-	 8, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0,
-	 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 8, 8, 0, 0, 0, 0, 0, 0, 0, 9, 8, 0, 0, 0, 0, 0,
+	 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
 };
 
-static float _vq_quantthresh__44c0_s_p4_0[] = {
+static 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__44c0_s_p4_0[] = {
+static long _vq_quantmap__8c0_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 encode_aux_threshmatch _vq_auxt__8c0_s_p4_0 = {
+	_vq_quantthresh__8c0_s_p4_0,
+	_vq_quantmap__8c0_s_p4_0,
 	9,
 	9
 };
 
-static static_codebook _44c0_s_p4_0 = {
+static static_codebook _8c0_s_p4_0 = {
 	2, 81,
-	_vq_lengthlist__44c0_s_p4_0,
+	_vq_lengthlist__8c0_s_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c0_s_p4_0,
+	_vq_quantlist__8c0_s_p4_0,
 	NULL,
-	&_vq_auxt__44c0_s_p4_0,
+	&_vq_auxt__8c0_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p5_0[] = {
+static long _vq_quantlist__8c0_s_p5_0[] = {
 	4,
 	3,
 	5,
@@ -3999,43 +3978,43 @@
 	8,
 };
 
-static long _vq_lengthlist__44c0_s_p5_0[] = {
-	 1, 3, 3, 6, 6, 6, 6, 8, 8, 0, 0, 0, 6, 7, 7, 7,
-	 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 7, 7,
-	 8, 8, 9, 9, 0, 0, 0, 7, 7, 8, 8,10, 9, 0, 0, 0,
-	 8, 8, 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0,
-	 0, 0,10, 9, 9, 9,11,11, 0, 0, 0, 0, 0, 9, 9,11,
-	11,
+static 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,
+	 9, 9, 8, 8,10,10, 0, 0, 0, 9, 9, 8, 8,10,10, 0,
+	 0, 0,10,10, 9, 9,10,10, 0, 0, 0, 0, 0, 9, 9,10,
+	10,
 };
 
-static float _vq_quantthresh__44c0_s_p5_0[] = {
+static 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__44c0_s_p5_0[] = {
+static long _vq_quantmap__8c0_s_p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p5_0 = {
-	_vq_quantthresh__44c0_s_p5_0,
-	_vq_quantmap__44c0_s_p5_0,
+static encode_aux_threshmatch _vq_auxt__8c0_s_p5_0 = {
+	_vq_quantthresh__8c0_s_p5_0,
+	_vq_quantmap__8c0_s_p5_0,
 	9,
 	9
 };
 
-static static_codebook _44c0_s_p5_0 = {
+static static_codebook _8c0_s_p5_0 = {
 	2, 81,
-	_vq_lengthlist__44c0_s_p5_0,
+	_vq_lengthlist__8c0_s_p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c0_s_p5_0,
+	_vq_quantlist__8c0_s_p5_0,
 	NULL,
-	&_vq_auxt__44c0_s_p5_0,
+	&_vq_auxt__8c0_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p6_0[] = {
+static long _vq_quantlist__8c0_s_p6_0[] = {
 	8,
 	7,
 	9,
@@ -4055,99 +4034,99 @@
 	16,
 };
 
-static long _vq_lengthlist__44c0_s_p6_0[] = {
-	 1, 3, 4, 6, 6, 7, 8, 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,
-	11,11,11, 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,11,12,12, 0, 0, 0, 8, 8, 9, 9, 9,10,10,10,
-	10,11,11,11,12,12, 0, 0, 0, 8, 8, 9, 9, 9, 9,10,
-	10,11,11,11,11,12,12, 0, 0, 0, 9, 9, 9, 9,10,10,
-	10,10,11,11,12,12,12,13, 0, 0, 0, 0, 0, 9, 9,10,
-	10,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 9, 9,
-	 9,10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9,
-	 9, 9, 9,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0,
-	10, 9,10,10,11,11,11,12,12,13,13,13, 0, 0, 0, 0,
-	 0, 0, 0,10,10,11,11,12,12,12,12,13,13, 0, 0, 0,
-	 0, 0, 0, 0,11,11,11,11,12,12,13,13,13,13, 0, 0,
-	 0, 0, 0, 0, 0,11,11,11,11,12,12,13,12,13,13, 0,
-	 0, 0, 0, 0, 0, 0,11,11,12,12,12,12,13,13,13,14,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,13,
+static 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,
+	11,12,11, 0, 0, 0, 8, 8, 9, 9,10,10, 9, 9,10,10,
+	11,11,12,12, 0, 0, 0, 8, 8, 9, 9,10,10, 9, 9,11,
+	10,11,11,12,12, 0, 0, 0, 9, 9, 9, 9,10,10,10,10,
+	11,11,11,12,12,12, 0, 0, 0, 9, 9, 9, 9,10,10,10,
+	10,11,11,12,12,13,13, 0, 0, 0,10,10,10,10,11,11,
+	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0,10, 9,10,
+	11,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,
+	10, 9,10,11,12,12,13,13,14,13, 0, 0, 0, 0, 0, 9,
+	 9, 9,10,10,10,11,11,13,12,13,13, 0, 0, 0, 0, 0,
+	10,10,10,10,11,11,12,12,13,13,14,14, 0, 0, 0, 0,
+	 0, 0, 0,10,10,11,11,12,12,13,13,13,14, 0, 0, 0,
+	 0, 0, 0, 0,11,11,11,11,12,12,13,14,14,14, 0, 0,
+	 0, 0, 0, 0, 0,11,11,11,11,12,12,13,13,14,13, 0,
+	 0, 0, 0, 0, 0, 0,11,11,12,12,13,13,14,14,14,14,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,14,
 	14,
 };
 
-static float _vq_quantthresh__44c0_s_p6_0[] = {
+static 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__44c0_s_p6_0[] = {
+static 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__44c0_s_p6_0 = {
-	_vq_quantthresh__44c0_s_p6_0,
-	_vq_quantmap__44c0_s_p6_0,
+static encode_aux_threshmatch _vq_auxt__8c0_s_p6_0 = {
+	_vq_quantthresh__8c0_s_p6_0,
+	_vq_quantmap__8c0_s_p6_0,
 	17,
 	17
 };
 
-static static_codebook _44c0_s_p6_0 = {
+static static_codebook _8c0_s_p6_0 = {
 	2, 289,
-	_vq_lengthlist__44c0_s_p6_0,
+	_vq_lengthlist__8c0_s_p6_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c0_s_p6_0,
+	_vq_quantlist__8c0_s_p6_0,
 	NULL,
-	&_vq_auxt__44c0_s_p6_0,
+	&_vq_auxt__8c0_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p7_0[] = {
+static long _vq_quantlist__8c0_s_p7_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c0_s_p7_0[] = {
-	 1, 4, 4, 6, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,10,
-	 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,10,11,
-	10,11,10,10, 6, 9, 9,11,10,10,11, 9,10, 6, 9, 9,
-	11,10,10,11, 9, 9, 7,10,10,11,11,11,12,11,11, 7,
-	 9, 9,10, 9, 9,11,11,10, 7, 9, 9,10,10,10,12,10,
-	11,
+static 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,
+	11,11,11,11,10,10, 7,10,11,12,11,11,12,11,12, 6,
+	 9, 9,10, 9, 9,11,10,10, 6, 9, 9,10,10,10,11,10,
+	10,
 };
 
-static float _vq_quantthresh__44c0_s_p7_0[] = {
+static float _vq_quantthresh__8c0_s_p7_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44c0_s_p7_0[] = {
+static long _vq_quantmap__8c0_s_p7_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p7_0 = {
-	_vq_quantthresh__44c0_s_p7_0,
-	_vq_quantmap__44c0_s_p7_0,
+static encode_aux_threshmatch _vq_auxt__8c0_s_p7_0 = {
+	_vq_quantthresh__8c0_s_p7_0,
+	_vq_quantmap__8c0_s_p7_0,
 	3,
 	3
 };
 
-static static_codebook _44c0_s_p7_0 = {
+static static_codebook _8c0_s_p7_0 = {
 	4, 81,
-	_vq_lengthlist__44c0_s_p7_0,
+	_vq_lengthlist__8c0_s_p7_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44c0_s_p7_0,
+	_vq_quantlist__8c0_s_p7_0,
 	NULL,
-	&_vq_auxt__44c0_s_p7_0,
+	&_vq_auxt__8c0_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p7_1[] = {
+static long _vq_quantlist__8c0_s_p7_1[] = {
 	5,
 	4,
 	6,
@@ -4161,46 +4140,46 @@
 	10,
 };
 
-static long _vq_lengthlist__44c0_s_p7_1[] = {
-	 2, 3, 3, 6, 6, 7, 7, 7, 7, 7, 7,10, 9, 9, 6, 6,
-	 7, 7, 8, 8, 8, 8, 9, 9, 9, 6, 6, 7, 7, 8, 8, 8,
-	 8,10, 9,10, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7,
-	 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 8, 8, 8, 8,
-	 8, 8,10,10,10, 8, 7, 8, 8, 8, 8, 8, 8,10,10,10,
-	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,10,10, 8, 8, 8,
-	 8, 8, 8,10,10,10,10,10, 9, 9, 8, 8, 9, 8,10,10,
-	10,10,10, 8, 8, 8, 8, 8, 8,
+static 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,
+	 8, 9, 9, 9, 9, 8, 9,10,10,10, 8, 8, 9, 9, 9,10,
+	10,10,10,10,10, 9, 9, 9, 9, 9, 9,10,10,11,10,11,
+	 9, 9, 9, 9,10,10,10,10,11,11,11,10,10, 9, 9,10,
+	10,10, 9,11,10,10,10,10,10,10, 9, 9,10,10,11,11,
+	10,10,10, 9, 9, 9,10,10,10,
 };
 
-static float _vq_quantthresh__44c0_s_p7_1[] = {
+static 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__44c0_s_p7_1[] = {
+static long _vq_quantmap__8c0_s_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p7_1 = {
-	_vq_quantthresh__44c0_s_p7_1,
-	_vq_quantmap__44c0_s_p7_1,
+static encode_aux_threshmatch _vq_auxt__8c0_s_p7_1 = {
+	_vq_quantthresh__8c0_s_p7_1,
+	_vq_quantmap__8c0_s_p7_1,
 	11,
 	11
 };
 
-static static_codebook _44c0_s_p7_1 = {
+static static_codebook _8c0_s_p7_1 = {
 	2, 121,
-	_vq_lengthlist__44c0_s_p7_1,
+	_vq_lengthlist__8c0_s_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c0_s_p7_1,
+	_vq_quantlist__8c0_s_p7_1,
 	NULL,
-	&_vq_auxt__44c0_s_p7_1,
+	&_vq_auxt__8c0_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p8_0[] = {
+static long _vq_quantlist__8c0_s_p8_0[] = {
 	6,
 	5,
 	7,
@@ -4216,49 +4195,49 @@
 	12,
 };
 
-static long _vq_lengthlist__44c0_s_p8_0[] = {
-	 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8,10, 9, 7, 5, 5,
-	 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 6, 6, 7, 7, 8,
-	 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 8, 9, 9,
-	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
-	11, 0,12,12, 9, 8, 9, 9,10,10,10,11,12,11, 0,13,
-	13, 9, 8, 9, 9,10,10,10,11,11,11, 0, 0, 0,10,10,
-	 9, 9,10,10,11,11,12,12, 0, 0, 0,10,10, 9, 8,10,
-	10,11,11,12,12, 0, 0, 0,13,13,10,10,11,11,12,12,
-	12,12, 0, 0, 0,15,15,10,10,11, 9,12,12,13,13, 0,
-	 0, 0, 0, 0,12,11,11,11,12,12,13,13, 0, 0, 0, 0,
-	 0,12,12,11,11,12,11,14,13,
+static 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,
+	 9, 9,10,10, 0, 8, 8, 8, 8, 8, 9, 8, 9, 9, 9,11,
+	10, 0, 0,13, 9, 8, 9, 9, 9, 9,10,10,11,11, 0,13,
+	 0, 9, 9, 9, 9, 9, 9,11,10,11,11, 0, 0, 0, 8, 9,
+	10, 9,10,10,13,11,12,12, 0, 0, 0, 8, 9, 9, 9,10,
+	10,13,12,12,13, 0, 0, 0,12, 0,10,10,12,11,10,11,
+	12,12, 0, 0, 0,13,13,10,10,10,11,12, 0,13, 0, 0,
+	 0, 0, 0, 0,13,11, 0,12,12,12,13,12, 0, 0, 0, 0,
+	 0, 0,13,13,11,13,13,11,12,
 };
 
-static float _vq_quantthresh__44c0_s_p8_0[] = {
+static 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__44c0_s_p8_0[] = {
+static 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__44c0_s_p8_0 = {
-	_vq_quantthresh__44c0_s_p8_0,
-	_vq_quantmap__44c0_s_p8_0,
+static encode_aux_threshmatch _vq_auxt__8c0_s_p8_0 = {
+	_vq_quantthresh__8c0_s_p8_0,
+	_vq_quantmap__8c0_s_p8_0,
 	13,
 	13
 };
 
-static static_codebook _44c0_s_p8_0 = {
+static static_codebook _8c0_s_p8_0 = {
 	2, 169,
-	_vq_lengthlist__44c0_s_p8_0,
+	_vq_lengthlist__8c0_s_p8_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44c0_s_p8_0,
+	_vq_quantlist__8c0_s_p8_0,
 	NULL,
-	&_vq_auxt__44c0_s_p8_0,
+	&_vq_auxt__8c0_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p8_1[] = {
+static long _vq_quantlist__8c0_s_p8_1[] = {
 	2,
 	1,
 	3,
@@ -4266,256 +4245,240 @@
 	4,
 };
 
-static long _vq_lengthlist__44c0_s_p8_1[] = {
-	 2, 3, 4, 4, 4, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6,
-	 6, 6, 5, 5, 6, 6, 6, 5, 5,
+static 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__44c0_s_p8_1[] = {
+static float _vq_quantthresh__8c0_s_p8_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c0_s_p8_1[] = {
+static long _vq_quantmap__8c0_s_p8_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p8_1 = {
-	_vq_quantthresh__44c0_s_p8_1,
-	_vq_quantmap__44c0_s_p8_1,
+static encode_aux_threshmatch _vq_auxt__8c0_s_p8_1 = {
+	_vq_quantthresh__8c0_s_p8_1,
+	_vq_quantmap__8c0_s_p8_1,
 	5,
 	5
 };
 
-static static_codebook _44c0_s_p8_1 = {
+static static_codebook _8c0_s_p8_1 = {
 	2, 25,
-	_vq_lengthlist__44c0_s_p8_1,
+	_vq_lengthlist__8c0_s_p8_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c0_s_p8_1,
+	_vq_quantlist__8c0_s_p8_1,
 	NULL,
-	&_vq_auxt__44c0_s_p8_1,
+	&_vq_auxt__8c0_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p9_0[] = {
-	2,
+static long _vq_quantlist__8c0_s_p9_0[] = {
 	1,
-	3,
 	0,
-	4,
+	2,
 };
 
-static long _vq_lengthlist__44c0_s_p9_0[] = {
-	 1, 7, 7,11,11,10,11,11,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,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,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, 8,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,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,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, 8,11,11,11,11,11,
-	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
-	11,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,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,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,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,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,
-	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,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,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,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,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,10,
-	10,
+static 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,
+	 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,
+	 7,
 };
 
-static float _vq_quantthresh__44c0_s_p9_0[] = {
-	-331.5, -110.5, 110.5, 331.5, 
+static float _vq_quantthresh__8c0_s_p9_0[] = {
+	-157.5, 157.5, 
 };
 
-static long _vq_quantmap__44c0_s_p9_0[] = {
-	    3,    1,    0,    2,    4,
+static long _vq_quantmap__8c0_s_p9_0[] = {
+	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_s_p9_0 = {
-	_vq_quantthresh__44c0_s_p9_0,
-	_vq_quantmap__44c0_s_p9_0,
-	5,
-	5
+static encode_aux_threshmatch _vq_auxt__8c0_s_p9_0 = {
+	_vq_quantthresh__8c0_s_p9_0,
+	_vq_quantmap__8c0_s_p9_0,
+	3,
+	3
 };
 
-static static_codebook _44c0_s_p9_0 = {
-	4, 625,
-	_vq_lengthlist__44c0_s_p9_0,
-	1, -518283264, 1627103232, 3, 0,
-	_vq_quantlist__44c0_s_p9_0,
+static static_codebook _8c0_s_p9_0 = {
+	4, 81,
+	_vq_lengthlist__8c0_s_p9_0,
+	1, -518803456, 1628680192, 2, 0,
+	_vq_quantlist__8c0_s_p9_0,
 	NULL,
-	&_vq_auxt__44c0_s_p9_0,
+	&_vq_auxt__8c0_s_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p9_1[] = {
+static long _vq_quantlist__8c0_s_p9_1[] = {
+	7,
 	6,
+	8,
 	5,
-	7,
+	9,
 	4,
-	8,
+	10,
 	3,
-	9,
+	11,
 	2,
-	10,
+	12,
 	1,
-	11,
+	13,
 	0,
-	12,
+	14,
 };
 
-static long _vq_lengthlist__44c0_s_p9_1[] = {
-	 1, 4, 4, 6, 6, 7, 7, 9, 9,12,12,13,12, 6, 5, 5,
-	 7, 7, 8, 8,10,10,12,11,14,13, 6, 5, 5, 7, 7, 7,
-	 8, 9, 9,11,12,13,12,15, 7, 7, 7, 7, 9, 9,11,11,
-	14,13,14,13,15, 7, 7, 8, 8, 8, 9,10,10,11,11,12,
-	11,15,10,10, 8, 8,10,10,12,11,13,15,14,14,15,11,
-	10, 8, 8,11,11,11,11,13,13,12,13,15,15,15,10,10,
-	10,10,12,13,13,13,15,14,15,15,15,10,10,10,11,13,
-	14,13,14,14,14,15,15,15,15,15,11,12,11,13,14,14,
-	15,15,15,15,15,14,15,11,11,13,12,14,13,15,15,15,
-	15,15,15,15,13,12,13,12,15,15,15,15,15,15,15,15,
-	15,12,13,12,12,15,14,15,15,
+static 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,
+	 8, 8, 9, 9,11,11,11,11,11,11,11,11,11, 9, 8, 7,
+	 8, 9,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,10,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,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,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,11,11,11,11,
+	11,
 };
 
-static float _vq_quantthresh__44c0_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 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__44c0_s_p9_1[] = {
-	   11,    9,    7,    5,    3,    1,    0,    2,
-	    4,    6,    8,   10,   12,
+static 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__44c0_s_p9_1 = {
-	_vq_quantthresh__44c0_s_p9_1,
-	_vq_quantmap__44c0_s_p9_1,
-	13,
-	13
+static encode_aux_threshmatch _vq_auxt__8c0_s_p9_1 = {
+	_vq_quantthresh__8c0_s_p9_1,
+	_vq_quantmap__8c0_s_p9_1,
+	15,
+	15
 };
 
-static static_codebook _44c0_s_p9_1 = {
-	2, 169,
-	_vq_lengthlist__44c0_s_p9_1,
-	1, -522616832, 1620115456, 4, 0,
-	_vq_quantlist__44c0_s_p9_1,
+static static_codebook _8c0_s_p9_1 = {
+	2, 225,
+	_vq_lengthlist__8c0_s_p9_1,
+	1, -520986624, 1620377600, 4, 0,
+	_vq_quantlist__8c0_s_p9_1,
 	NULL,
-	&_vq_auxt__44c0_s_p9_1,
+	&_vq_auxt__8c0_s_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_s_p9_2[] = {
+static long _vq_quantlist__8c0_s_p9_2[] = {
+	10,
+	9,
+	11,
 	8,
+	12,
 	7,
-	9,
+	13,
 	6,
-	10,
+	14,
 	5,
-	11,
+	15,
 	4,
-	12,
+	16,
 	3,
-	13,
+	17,
 	2,
-	14,
+	18,
 	1,
-	15,
+	19,
 	0,
-	16,
+	20,
 };
 
-static long _vq_lengthlist__44c0_s_p9_2[] = {
-	 2, 4, 4, 6, 6, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 8,
-	 9,10,10,10, 7, 7, 8, 7, 8, 8, 9, 9, 9, 9, 9, 9,
-	 9, 9,10,10,10, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9,10,10,10, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9,10,10,10, 7, 7, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9,11,10,10, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9,10,10,10, 8, 8, 8, 8, 8, 9, 9,
-	 9, 9, 9, 9,10, 9, 9,10,10,11, 9, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,11, 9, 8, 9,
-	 9, 9, 9, 9, 9, 9, 9,10,10,11,11,10,11,11, 9, 9,
-	 9, 9, 9, 9,10, 9, 9, 9,10, 9,10,10,10,11,11, 9,
-	 9, 9, 9, 9, 9, 9,10, 9, 9, 9,10,11,10,10,10,11,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,
-	11,11,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,
-	11,11,10,10, 9,10,10,10, 9,10, 9, 9, 9, 9,10,10,
-	11,10,11,11,11, 9,10, 9, 9, 9, 9, 9, 9, 9,10,10,
-	11,10,11,11,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9,
-	10,10,10,10,11,11,10,11,11, 9, 9, 9, 9, 9, 9, 9,
-	 9,
+static 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,
+	 7, 8, 9,10,10,10, 9,10,10, 9,10,10,11,11,11,11,
+	11,11, 9, 9, 9, 9, 8, 9,10,10,11,10,10,11,11,12,
+	10,10,12,12,11,11,10, 9, 9,10, 8, 9,10,10,10, 9,
+	10,10,11,11,10,11,10,10,10,12,12,12, 9,10, 9,10,
+	 9, 9,10,10,11,11,11,11,10,10,10,11,12,11,12,11,
+	12,10,11,10,11, 9,10, 9,10, 9,10,10, 9,10,10,11,
+	10,11,11,11,11,12,11, 9,10,10,10,10,11,11,11,11,
+	11,10,11,11,11,11,10,12,10,12,12,11,12,10,10,11,
+	10, 9,11,10,11, 9,10,11,10,10,10,11,11,11,11,12,
+	12,10, 9, 9,11,10, 9,12,11,10,12,12,11,11,11,11,
+	10,11,11,12,11,10,12, 9,11,10,11,10,10,11,10,11,
+	 9,10,10,10,11,12,11,11,12,11,10,10,11,11, 9,10,
+	10,12,10,11,10,10,10, 9,10,10,10,10, 9,10,10,11,
+	11,11,11,12,11,10,10,10,10,11,11,10,11,11, 9,11,
+	10,12,10,12,11,10,11,10,10,10,11,10,10,11,11,10,
+	11,10,10,10,10,11,11,12,10,10,10,11,10,11,12,11,
+	10,11,10,10,11,11,10,12,10, 9,10,10,11,11,11,10,
+	12,10,10,11,11,11,10,10,11,10,10,10,11,10,11,10,
+	12,11,11,10,10,10,12,10,10,11, 9,10,11,11,11,10,
+	10,11,10,10, 9,11,11,12,12,11,12,11,11,11,11,11,
+	11, 9,10,11,10,12,10,10,10,10,11,10,10,11,10,10,
+	12,10,10,10,10,10, 9,12,10,10,10,10,12, 9,11,10,
+	10,11,10,12,12,10,12,12,12,10,10,10,10, 9,10,11,
+	10,10,12,10,10,12,11,10,11,10,10,12,11,10,12,10,
+	10,11, 9,11,10, 9,10, 9,10,
 };
 
-static float _vq_quantthresh__44c0_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 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__44c0_s_p9_2[] = {
-	   15,   13,   11,    9,    7,    5,    3,    1,
-	    0,    2,    4,    6,    8,   10,   12,   14,
-	   16,
+static 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__44c0_s_p9_2 = {
-	_vq_quantthresh__44c0_s_p9_2,
-	_vq_quantmap__44c0_s_p9_2,
-	17,
-	17
+static encode_aux_threshmatch _vq_auxt__8c0_s_p9_2 = {
+	_vq_quantthresh__8c0_s_p9_2,
+	_vq_quantmap__8c0_s_p9_2,
+	21,
+	21
 };
 
-static static_codebook _44c0_s_p9_2 = {
-	2, 289,
-	_vq_lengthlist__44c0_s_p9_2,
-	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c0_s_p9_2,
+static static_codebook _8c0_s_p9_2 = {
+	2, 441,
+	_vq_lengthlist__8c0_s_p9_2,
+	1, -529268736, 1611661312, 5, 0,
+	_vq_quantlist__8c0_s_p9_2,
 	NULL,
-	&_vq_auxt__44c0_s_p9_2,
+	&_vq_auxt__8c0_s_p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44c0_s_short[] = {
-	 6, 8,17,12,12,12,14,15,17,16, 5, 1,16, 5, 6, 6,
-	 9,12,14,13,16,16,16,16,16,16,16,16,16,16, 9, 4,
-	16, 6, 9, 7,10,14,14,14, 8, 5,16, 8, 6, 7,10,13,
-	15,16, 9, 6,16, 7, 7, 7,10,12,15,14,10, 8,16, 9,
-	 9, 9,10,12,15,14,13, 7,16, 8, 7, 7,10,12,14,13,
-	15, 6,16, 7, 5, 5, 7, 9,13,16,14, 7,16, 8, 6, 6,
-	 8, 9,11,14,
+static 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,
+	11,15, 6, 4,17, 6, 6, 4, 5, 8,11,16, 6, 6,17, 8,
+	 6, 5, 6, 9,13,16, 8, 9,17,11, 9, 8, 8,11,13,17,
+	 9,12,17,15,14,13,12,13,14,17,12,15,17,17,17,17,
+	17,16,17,17,
 };
 
-static static_codebook _huff_book__44c0_s_short = {
+static static_codebook _huff_book__8c0_s_single = {
 	2, 100,
-	_huff_lengthlist__44c0_s_short,
+	_huff_lengthlist__8c0_s_single,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -4524,46 +4487,25 @@
 	0
 };
 
-static long _huff_lengthlist__44c0_sm_long[] = {
-	 3, 4,10, 8,11, 9,10,10,11,13, 3, 2,10, 5, 8, 6,
-	 8,11,12,13,10, 8, 7,10, 7, 8, 9,11,12,13, 8, 5,
-	12, 6, 9, 7,10,13,14,16,11, 7, 7, 9, 5, 6, 7,10,
-	13,13, 8, 6, 7, 7, 5, 5, 6, 9,12,13, 9, 8, 8, 8,
-	 7, 6, 6, 8,11,14,10,10,10,11, 9, 8, 7, 8,10,13,
-	11,14,12,15,13,11, 9, 8, 9,12,12,18,15,18,17,15,
-	12,10,10,14,
-};
-
-static static_codebook _huff_book__44c0_sm_long = {
-	2, 100,
-	_huff_lengthlist__44c0_sm_long,
-	0, 0, 0, 0, 0,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c0_sm_p1_0[] = {
+static long _vq_quantlist__8c1_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c0_sm_p1_0[] = {
+static 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,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 7, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0, 0,
+	 0, 5, 8, 7, 0, 0, 0, 0, 0, 0, 7, 8, 9, 0, 0, 0,
 	 0, 0, 0, 7, 8, 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, 0, 0, 0, 0, 0, 0, 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, 7, 8, 0, 0, 0, 0, 0, 0, 7, 9, 8, 0, 0,
-	 0, 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 7, 9, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -4597,13 +4539,13 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 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, 8, 7, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 8, 8, 0, 0, 0, 0,
 	 0, 0, 8, 9, 9, 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0, 0,
-	 0, 0, 0, 9, 9,10, 0, 0, 0, 0, 0, 0, 9,10,10, 0,
+	 0, 0, 0, 8, 8,10, 0, 0, 0, 0, 0, 0, 9,10,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, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -4643,7 +4585,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, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 5, 7, 8, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
+	 0, 0, 5, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0, 0,
 	 0, 0, 0, 0, 8, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -4654,7 +4596,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, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 9,10,10,
-	 0, 0, 0, 0, 0, 0, 9,10, 9, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 8,10, 8, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -4965,33 +4907,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c0_sm_p1_0[] = {
+static float _vq_quantthresh__8c1_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__44c0_sm_p1_0[] = {
+static long _vq_quantmap__8c1_s_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 encode_aux_threshmatch _vq_auxt__8c1_s_p1_0 = {
+	_vq_quantthresh__8c1_s_p1_0,
+	_vq_quantmap__8c1_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _44c0_sm_p1_0 = {
+static static_codebook _8c1_s_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__44c0_sm_p1_0,
+	_vq_lengthlist__8c1_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44c0_sm_p1_0,
+	_vq_quantlist__8c1_s_p1_0,
 	NULL,
-	&_vq_auxt__44c0_sm_p1_0,
+	&_vq_auxt__8c1_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_sm_p2_0[] = {
+static long _vq_quantlist__8c1_s_p2_0[] = {
 	2,
 	1,
 	3,
@@ -4999,35 +4941,20 @@
 	4,
 };
 
-static long _vq_lengthlist__44c0_sm_p2_0[] = {
-	 1, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 6, 6, 0, 0, 0,
-	 8, 8, 0, 0, 0, 0, 0, 0, 0, 5, 7, 6, 0, 0, 0, 8,
-	 8, 0, 0, 0, 8, 8, 0, 0, 0,10,10, 0, 0, 0, 0, 0,
-	 0, 0, 5, 6, 7, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0,
-	 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+static long _vq_lengthlist__8c1_s_p2_0[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 8, 0, 0, 0, 8, 8, 0, 0,
-	 0, 8, 8, 0, 0, 0,10, 9, 0, 0, 0, 0, 0, 0, 0, 6,
-	 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 9,
-	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, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8,
-	 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 6, 8, 8, 0,
-	 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0,10,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, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 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,10,10, 0, 0, 0,10,10, 0, 0, 0, 9,10, 0, 0, 0,
-	10,10, 0, 0, 0, 0, 0, 0, 0, 8,10,10, 0, 0, 0,10,
-	10, 0, 0, 0,10, 9, 0, 0, 0,10,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, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -5039,51 +4966,8 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,
-};
-
-static float _vq_quantthresh__44c0_sm_p2_0[] = {
-	-1.5, -0.5, 0.5, 1.5, 
-};
-
-static 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,
-	5,
-	5
-};
-
-static static_codebook _44c0_sm_p2_0 = {
-	4, 625,
-	_vq_lengthlist__44c0_sm_p2_0,
-	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c0_sm_p2_0,
-	NULL,
-	&_vq_auxt__44c0_sm_p2_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c0_sm_p3_0[] = {
-	2,
-	1,
-	3,
-	0,
-	4,
-};
-
-static long _vq_lengthlist__44c0_sm_p3_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, 5, 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, 0, 0, 6, 6, 6, 8, 8,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 6, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -5097,1166 +4981,47 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
 };
 
-static float _vq_quantthresh__44c0_sm_p3_0[] = {
+static float _vq_quantthresh__8c1_s_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c0_sm_p3_0[] = {
+static long _vq_quantmap__8c1_s_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p3_0 = {
-	_vq_quantthresh__44c0_sm_p3_0,
-	_vq_quantmap__44c0_sm_p3_0,
+static encode_aux_threshmatch _vq_auxt__8c1_s_p2_0 = {
+	_vq_quantthresh__8c1_s_p2_0,
+	_vq_quantmap__8c1_s_p2_0,
 	5,
 	5
 };
 
-static static_codebook _44c0_sm_p3_0 = {
+static static_codebook _8c1_s_p2_0 = {
 	4, 625,
-	_vq_lengthlist__44c0_sm_p3_0,
+	_vq_lengthlist__8c1_s_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c0_sm_p3_0,
+	_vq_quantlist__8c1_s_p2_0,
 	NULL,
-	&_vq_auxt__44c0_sm_p3_0,
+	&_vq_auxt__8c1_s_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c0_sm_p4_0[] = {
-	4,
-	3,
-	5,
+static long _vq_quantlist__8c1_s_p3_0[] = {
 	2,
-	6,
 	1,
-	7,
-	0,
-	8,
-};
-
-static long _vq_lengthlist__44c0_sm_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,
-	 7, 8, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0,
-	 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,
-};
-
-static 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[] = {
-	    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,
-	9,
-	9
-};
-
-static static_codebook _44c0_sm_p4_0 = {
-	2, 81,
-	_vq_lengthlist__44c0_sm_p4_0,
-	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c0_sm_p4_0,
-	NULL,
-	&_vq_auxt__44c0_sm_p4_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c0_sm_p5_0[] = {
-	4,
 	3,
-	5,
-	2,
-	6,
-	1,
-	7,
 	0,
-	8,
-};
-
-static long _vq_lengthlist__44c0_sm_p5_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,10,10, 0, 7, 7, 8, 8,
-	 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0,
-	 8, 8, 9, 9,11,11, 0, 0, 0, 9, 9, 9, 9,11,11, 0,
-	 0, 0,10,10, 9, 9,11,11, 0, 0, 0, 0, 0, 9, 9,11,
-	11,
-};
-
-static float _vq_quantthresh__44c0_sm_p5_0[] = {
-	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
-};
-
-static long _vq_quantmap__44c0_sm_p5_0[] = {
-	    7,    5,    3,    1,    0,    2,    4,    6,
-	    8,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p5_0 = {
-	_vq_quantthresh__44c0_sm_p5_0,
-	_vq_quantmap__44c0_sm_p5_0,
-	9,
-	9
-};
-
-static static_codebook _44c0_sm_p5_0 = {
-	2, 81,
-	_vq_lengthlist__44c0_sm_p5_0,
-	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c0_sm_p5_0,
-	NULL,
-	&_vq_auxt__44c0_sm_p5_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c0_sm_p6_0[] = {
-	8,
-	7,
-	9,
-	6,
-	10,
-	5,
-	11,
 	4,
-	12,
-	3,
-	13,
-	2,
-	14,
-	1,
-	15,
-	0,
-	16,
 };
 
-static long _vq_lengthlist__44c0_sm_p6_0[] = {
-	 1, 4, 4, 6, 6, 8, 8, 9, 9, 8, 8,10,10,10,10,11,
-	11, 0, 6, 5, 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,
-	11,12,12, 0, 7, 7, 8, 8, 8, 8,10,10,10,10,11,11,
-	11,11,12,12, 0, 0, 0, 8, 7, 8, 8,10,10,10,10,11,
-	11,11,11,12,12, 0, 0, 0, 8, 8, 9, 9,10,10,10,10,
-	11,11,12,12,12,12, 0, 0, 0, 8, 8, 9, 9,10,10,10,
-	10,11,11,12,12,12,13, 0, 0, 0, 9, 9, 9, 9,10,10,
-	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,10,
-	10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,
-	10,10,11,11,12,12,12,13,13,13, 0, 0, 0, 0, 0, 9,
-	 9,10, 9,11,11,12,12,13,13,13,13, 0, 0, 0, 0, 0,
-	10,10,10,10,11,11,12,12,13,13,14,14, 0, 0, 0, 0,
-	 0, 0, 0,10,10,11,11,12,12,13,13,14,14, 0, 0, 0,
-	 0, 0, 0, 0,11,11,11,11,12,12,13,13,14,14, 0, 0,
-	 0, 0, 0, 0, 0,11,11,11,11,12,12,13,13,14,14, 0,
-	 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,13,13,14,14,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,14,
-	14,
-};
-
-static float _vq_quantthresh__44c0_sm_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__44c0_sm_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__44c0_sm_p6_0 = {
-	_vq_quantthresh__44c0_sm_p6_0,
-	_vq_quantmap__44c0_sm_p6_0,
-	17,
-	17
-};
-
-static static_codebook _44c0_sm_p6_0 = {
-	2, 289,
-	_vq_lengthlist__44c0_sm_p6_0,
-	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c0_sm_p6_0,
-	NULL,
-	&_vq_auxt__44c0_sm_p6_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c0_sm_p7_0[] = {
-	1,
-	0,
-	2,
-};
-
-static long _vq_lengthlist__44c0_sm_p7_0[] = {
-	 1, 4, 4, 6, 6, 6, 7, 6, 6, 5, 7, 6,10, 9, 9,10,
-	 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 6,10,10,10,10,
-	10,11,10,10, 6, 9, 9,10,10,10,11, 9,10, 6, 9, 9,
-	10,10,10,11,10, 9, 7,10,10,11,11,11,11,11,11, 6,
-	 9, 9,10, 9,10,11,11,10, 6, 9, 9,10,10,10,11,10,
-	11,
-};
-
-static float _vq_quantthresh__44c0_sm_p7_0[] = {
-	-5.5, 5.5, 
-};
-
-static long _vq_quantmap__44c0_sm_p7_0[] = {
-	    1,    0,    2,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p7_0 = {
-	_vq_quantthresh__44c0_sm_p7_0,
-	_vq_quantmap__44c0_sm_p7_0,
-	3,
-	3
-};
-
-static static_codebook _44c0_sm_p7_0 = {
-	4, 81,
-	_vq_lengthlist__44c0_sm_p7_0,
-	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44c0_sm_p7_0,
-	NULL,
-	&_vq_auxt__44c0_sm_p7_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c0_sm_p7_1[] = {
-	5,
-	4,
-	6,
-	3,
-	7,
-	2,
-	8,
-	1,
-	9,
-	0,
-	10,
-};
-
-static long _vq_lengthlist__44c0_sm_p7_1[] = {
-	 2, 4, 4, 5, 5, 7, 7, 7, 7, 7, 7, 9, 5, 5, 7, 7,
-	 7, 7, 8, 8, 8, 8, 9, 5, 5, 7, 7, 7, 7, 8, 8, 8,
-	 8,10, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8,10,10,10, 7,
-	 7, 7, 7, 8, 8, 8, 8,10,10,10, 8, 8, 8, 8, 8, 8,
-	 8, 8,10,10,10, 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,
-	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,10,10, 8, 8, 8,
-	 8, 8, 8,10,10,10,10,10, 9, 9, 8, 8, 8, 8,10,10,
-	10,10,10, 8, 8, 8, 8, 8, 8,
-};
-
-static float _vq_quantthresh__44c0_sm_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__44c0_sm_p7_1[] = {
-	    9,    7,    5,    3,    1,    0,    2,    4,
-	    6,    8,   10,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p7_1 = {
-	_vq_quantthresh__44c0_sm_p7_1,
-	_vq_quantmap__44c0_sm_p7_1,
-	11,
-	11
-};
-
-static static_codebook _44c0_sm_p7_1 = {
-	2, 121,
-	_vq_lengthlist__44c0_sm_p7_1,
-	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c0_sm_p7_1,
-	NULL,
-	&_vq_auxt__44c0_sm_p7_1,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c0_sm_p8_0[] = {
-	6,
-	5,
-	7,
-	4,
-	8,
-	3,
-	9,
-	2,
-	10,
-	1,
-	11,
-	0,
-	12,
-};
-
-static long _vq_lengthlist__44c0_sm_p8_0[] = {
-	 1, 4, 4, 6, 6, 7, 7, 7, 7, 9, 9,10,10, 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,
-	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
-	11, 0,12,12, 9, 9, 9, 9,10,10,11,11,12,11, 0,12,
-	12, 9, 9, 9, 9,10,10,11,11,12,11, 0, 0, 0, 9, 9,
-	 9,10,11,11,11,11,12,12, 0, 0, 0,10,10, 9, 9,11,
-	11,11,11,12,12, 0, 0, 0,13,13,10,10,11,11,12,12,
-	13,13, 0, 0, 0,14,14,10,10,11,10,12,12,13,13, 0,
-	 0, 0, 0, 0,12,12,11,11,12,12,13,13, 0, 0, 0, 0,
-	 0,12,12,11,10,12,11,14,14,
-};
-
-static float _vq_quantthresh__44c0_sm_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__44c0_sm_p8_0[] = {
-	   11,    9,    7,    5,    3,    1,    0,    2,
-	    4,    6,    8,   10,   12,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p8_0 = {
-	_vq_quantthresh__44c0_sm_p8_0,
-	_vq_quantmap__44c0_sm_p8_0,
-	13,
-	13
-};
-
-static static_codebook _44c0_sm_p8_0 = {
-	2, 169,
-	_vq_lengthlist__44c0_sm_p8_0,
-	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44c0_sm_p8_0,
-	NULL,
-	&_vq_auxt__44c0_sm_p8_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c0_sm_p8_1[] = {
-	2,
-	1,
-	3,
-	0,
-	4,
-};
-
-static long _vq_lengthlist__44c0_sm_p8_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__44c0_sm_p8_1[] = {
-	-1.5, -0.5, 0.5, 1.5, 
-};
-
-static long _vq_quantmap__44c0_sm_p8_1[] = {
-	    3,    1,    0,    2,    4,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p8_1 = {
-	_vq_quantthresh__44c0_sm_p8_1,
-	_vq_quantmap__44c0_sm_p8_1,
-	5,
-	5
-};
-
-static static_codebook _44c0_sm_p8_1 = {
-	2, 25,
-	_vq_lengthlist__44c0_sm_p8_1,
-	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c0_sm_p8_1,
-	NULL,
-	&_vq_auxt__44c0_sm_p8_1,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c0_sm_p9_0[] = {
-	4,
-	3,
-	5,
-	2,
-	6,
-	1,
-	7,
-	0,
-	8,
-};
-
-static long _vq_lengthlist__44c0_sm_p9_0[] = {
-	 1, 3, 4,11,11,11,11,11,11, 4, 6, 6,10,10,10,10,
-	10,10, 4, 6, 5,10,10,10,10,10,10,10, 6, 7,10, 9,
-	10,10,10,10,10, 7, 9,10, 9,10,10,10,10,10, 9,10,
-	 7, 9,10,10,10,10,10,10,10, 9,10,10,10,10,10,10,
-	10,10, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,
-};
-
-static float _vq_quantthresh__44c0_sm_p9_0[] = {
-	-773.5, -552.5, -331.5, -110.5, 110.5, 331.5, 552.5, 773.5, 
-};
-
-static long _vq_quantmap__44c0_sm_p9_0[] = {
-	    7,    5,    3,    1,    0,    2,    4,    6,
-	    8,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p9_0 = {
-	_vq_quantthresh__44c0_sm_p9_0,
-	_vq_quantmap__44c0_sm_p9_0,
-	9,
-	9
-};
-
-static static_codebook _44c0_sm_p9_0 = {
-	2, 81,
-	_vq_lengthlist__44c0_sm_p9_0,
-	1, -516186112, 1627103232, 4, 0,
-	_vq_quantlist__44c0_sm_p9_0,
-	NULL,
-	&_vq_auxt__44c0_sm_p9_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c0_sm_p9_1[] = {
-	6,
-	5,
-	7,
-	4,
-	8,
-	3,
-	9,
-	2,
-	10,
-	1,
-	11,
-	0,
-	12,
-};
-
-static long _vq_lengthlist__44c0_sm_p9_1[] = {
-	 1, 4, 4, 6, 6, 7, 7, 9, 9,12,12,13,13, 6, 5, 5,
-	 7, 7, 8, 8,10,10,12,12,14,13, 6, 5, 5, 6, 7, 8,
-	 8,10, 9,11,12,13,12,18, 7, 7, 7, 7, 9, 9,11,11,
-	14,14,14,13,17, 7, 7, 8, 7, 9, 9,10,10,12,11,13,
-	12,18,10,10, 8, 8,10,10,12,11,13,14,16,15,17,11,
-	11, 8, 8,11,11,11,12,13,13,13,15,18,18,18,10,11,
-	10,10,12,13,14,13,17,14,17,17,17,10,10,11,11,14,
-	14,14,13,14,14,18,18,18,17,15,11,12,12,13,15,15,
-	16,17,18,16,18,14,15,11,11,14,13,14,14,16,17,18,
-	17,17,17,18,14,13,13,12,17,15,17,16,18,17,18,18,
-	18,12,13,12,13,16,14,18,18,
-};
-
-static float _vq_quantthresh__44c0_sm_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__44c0_sm_p9_1[] = {
-	   11,    9,    7,    5,    3,    1,    0,    2,
-	    4,    6,    8,   10,   12,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c0_sm_p9_1 = {
-	_vq_quantthresh__44c0_sm_p9_1,
-	_vq_quantmap__44c0_sm_p9_1,
-	13,
-	13
-};
-
-static static_codebook _44c0_sm_p9_1 = {
-	2, 169,
-	_vq_lengthlist__44c0_sm_p9_1,
-	1, -522616832, 1620115456, 4, 0,
-	_vq_quantlist__44c0_sm_p9_1,
-	NULL,
-	&_vq_auxt__44c0_sm_p9_1,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c0_sm_p9_2[] = {
-	8,
-	7,
-	9,
-	6,
-	10,
-	5,
-	11,
-	4,
-	12,
-	3,
-	13,
-	2,
-	14,
-	1,
-	15,
-	0,
-	16,
-};
-
-static long _vq_lengthlist__44c0_sm_p9_2[] = {
-	 2, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9,
-	 9,10, 6, 6, 7, 7, 8, 7, 8, 8, 9, 9, 9, 9, 9, 9,
-	 9, 9,10, 6, 6, 7, 7, 7, 7, 8, 8, 9, 8, 9, 9, 9,
-	 9, 9, 9,10, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9,10,10,10, 7, 7, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9,10,10,10, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9,11,10,10, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9,10, 9,10,11,10, 9, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9,10,10,10,10,11,11, 9, 8, 9,
-	 9, 9, 9, 9, 9, 9, 9,10,10,10,11,10,11,11, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,11,11, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11,10,10,11,11,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,
-	11,11,10, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,11,10,
-	11,11,10,10, 9,10,10,10, 9, 9, 9, 9, 9, 9,10,10,
-	10,11,11,11,11,10,10, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	11,10,11,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9,
-	10,10,10,11,11,11,10,11,11, 9, 9, 9, 9, 9, 9, 9,
-	 9,
-};
-
-static float _vq_quantthresh__44c0_sm_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__44c0_sm_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__44c0_sm_p9_2 = {
-	_vq_quantthresh__44c0_sm_p9_2,
-	_vq_quantmap__44c0_sm_p9_2,
-	17,
-	17
-};
-
-static static_codebook _44c0_sm_p9_2 = {
-	2, 289,
-	_vq_lengthlist__44c0_sm_p9_2,
-	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c0_sm_p9_2,
-	NULL,
-	&_vq_auxt__44c0_sm_p9_2,
-	NULL,
-	0
-};
-
-static long _huff_lengthlist__44c0_sm_short[] = {
-	 5, 7,12,12,13,13,13,15,16,18, 4, 2,11, 5, 9, 7,
-	 9,12,13,14,13, 7, 8, 9, 8, 9,11,13,19,19, 9, 4,
-	12, 5,10, 7, 9,12,15,14,11, 6, 7, 7, 5, 6, 8,11,
-	15,17,10, 5, 8, 6, 6, 5, 6, 9,14,14,10, 5, 9, 7,
-	 7, 6, 6, 9,12,14,12, 6,10, 7, 7, 7, 8, 9,13,14,
-	14, 7, 9, 7, 5, 5, 6, 9,11,13,14, 9,10, 9, 6, 6,
-	 7, 8,10,13,
-};
-
-static static_codebook _huff_book__44c0_sm_short = {
-	2, 100,
-	_huff_lengthlist__44c0_sm_short,
-	0, 0, 0, 0, 0,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	0
-};
-
-static long _huff_lengthlist__44c1_s_long[] = {
-	 3, 4,19, 9,10, 9, 9,10,11,12, 4, 2,19, 5, 6, 6,
-	 8,10,12,11,19,19,19,19,19,19,19,19,18,18, 8, 4,
-	18, 6, 8, 7,10,13,14,13,10, 5,18, 7, 4, 6, 7,10,
-	12,13, 9, 6,18, 7, 5, 6, 7,10,12,13, 9, 7,18, 9,
-	 7, 6, 6, 7,10,13, 9, 9,18,12, 9, 8, 6, 6, 9,12,
-	10,12,18,15,12,11, 9, 8, 8,11,11,14,18,17,15,13,
-	12, 9,10,12,
-};
-
-static static_codebook _huff_book__44c1_s_long = {
-	2, 100,
-	_huff_lengthlist__44c1_s_long,
-	0, 0, 0, 0, 0,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c1_s_p1_0[] = {
-	1,
-	0,
-	2,
-};
-
-static 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,
+static 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,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0, 0,
-	 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
-	 0, 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 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, 7, 7, 0, 0, 0, 0,
-	 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0, 0,
-	 0, 0, 0, 8, 9, 9, 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0, 0,
-	 0, 0, 0, 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, 8, 8, 0, 0,
-	 0, 0, 0, 0, 8, 9, 8, 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
-	 0, 0, 0, 0, 7, 8, 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, 0, 0, 0, 0, 0, 0, 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, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0,
-	 0, 0, 0, 0, 0, 8, 8, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 7, 8, 9, 0, 0, 0, 0, 0, 0, 8, 9, 9,
-	 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,
-};
-
-static float _vq_quantthresh__44c1_s_p1_0[] = {
-	-0.5, 0.5, 
-};
-
-static 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,
-	3,
-	3
-};
-
-static static_codebook _44c1_s_p1_0 = {
-	8, 6561,
-	_vq_lengthlist__44c1_s_p1_0,
-	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44c1_s_p1_0,
-	NULL,
-	&_vq_auxt__44c1_s_p1_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c1_s_p2_0[] = {
-	2,
-	1,
-	3,
-	0,
-	4,
-};
-
-static long _vq_lengthlist__44c1_s_p2_0[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,
-};
-
-static float _vq_quantthresh__44c1_s_p2_0[] = {
-	-1.5, -0.5, 0.5, 1.5, 
-};
-
-static 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,
-	5,
-	5
-};
-
-static static_codebook _44c1_s_p2_0 = {
-	4, 625,
-	_vq_lengthlist__44c1_s_p2_0,
-	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c1_s_p2_0,
-	NULL,
-	&_vq_auxt__44c1_s_p2_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c1_s_p3_0[] = {
-	2,
-	1,
-	3,
-	0,
-	4,
-};
-
-static long _vq_lengthlist__44c1_s_p3_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, 5, 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, 0, 0, 6, 6, 6, 7, 7,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -6296,33 +5061,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__44c1_s_p3_0[] = {
+static float _vq_quantthresh__8c1_s_p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c1_s_p3_0[] = {
+static long _vq_quantmap__8c1_s_p3_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_s_p3_0 = {
-	_vq_quantthresh__44c1_s_p3_0,
-	_vq_quantmap__44c1_s_p3_0,
+static encode_aux_threshmatch _vq_auxt__8c1_s_p3_0 = {
+	_vq_quantthresh__8c1_s_p3_0,
+	_vq_quantmap__8c1_s_p3_0,
 	5,
 	5
 };
 
-static static_codebook _44c1_s_p3_0 = {
+static static_codebook _8c1_s_p3_0 = {
 	4, 625,
-	_vq_lengthlist__44c1_s_p3_0,
+	_vq_lengthlist__8c1_s_p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c1_s_p3_0,
+	_vq_quantlist__8c1_s_p3_0,
 	NULL,
-	&_vq_auxt__44c1_s_p3_0,
+	&_vq_auxt__8c1_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p4_0[] = {
+static long _vq_quantlist__8c1_s_p4_0[] = {
 	4,
 	3,
 	5,
@@ -6334,43 +5099,43 @@
 	8,
 };
 
-static long _vq_lengthlist__44c1_s_p4_0[] = {
-	 1, 3, 2, 7, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0,
+static 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,
-	 8, 9, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0,
+	 8, 8, 0, 0, 0, 0, 0, 0, 0, 9, 8, 0, 0, 0, 0, 0,
 	 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
 };
 
-static float _vq_quantthresh__44c1_s_p4_0[] = {
+static 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__44c1_s_p4_0[] = {
+static long _vq_quantmap__8c1_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 encode_aux_threshmatch _vq_auxt__8c1_s_p4_0 = {
+	_vq_quantthresh__8c1_s_p4_0,
+	_vq_quantmap__8c1_s_p4_0,
 	9,
 	9
 };
 
-static static_codebook _44c1_s_p4_0 = {
+static static_codebook _8c1_s_p4_0 = {
 	2, 81,
-	_vq_lengthlist__44c1_s_p4_0,
+	_vq_lengthlist__8c1_s_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c1_s_p4_0,
+	_vq_quantlist__8c1_s_p4_0,
 	NULL,
-	&_vq_auxt__44c1_s_p4_0,
+	&_vq_auxt__8c1_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p5_0[] = {
+static long _vq_quantlist__8c1_s_p5_0[] = {
 	4,
 	3,
 	5,
@@ -6382,43 +5147,43 @@
 	8,
 };
 
-static long _vq_lengthlist__44c1_s_p5_0[] = {
-	 1, 3, 3, 5, 5, 6, 6, 8, 8, 0, 0, 0, 7, 7, 8, 7,
-	 9, 9, 0, 0, 0, 7, 7, 8, 8, 9, 9, 0, 0, 0, 7, 7,
-	 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0,
-	 8, 8, 9, 9,10,10, 0, 0, 0, 8, 8, 9, 9,10,10, 0,
-	 0, 0,10,10, 9, 9,11,11, 0, 0, 0, 0, 0, 9, 9,11,
-	11,
+static 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,
+	11,10, 8, 8,10,10, 0, 0, 0,11,11, 8, 8,10,10, 0,
+	 0, 0,12,12, 9, 9,10,10, 0, 0, 0, 0, 0, 9, 9,10,
+	10,
 };
 
-static float _vq_quantthresh__44c1_s_p5_0[] = {
+static 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__44c1_s_p5_0[] = {
+static long _vq_quantmap__8c1_s_p5_0[] = {
 	    7,    5,    3,    1,    0,    2,    4,    6,
 	    8,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_s_p5_0 = {
-	_vq_quantthresh__44c1_s_p5_0,
-	_vq_quantmap__44c1_s_p5_0,
+static encode_aux_threshmatch _vq_auxt__8c1_s_p5_0 = {
+	_vq_quantthresh__8c1_s_p5_0,
+	_vq_quantmap__8c1_s_p5_0,
 	9,
 	9
 };
 
-static static_codebook _44c1_s_p5_0 = {
+static static_codebook _8c1_s_p5_0 = {
 	2, 81,
-	_vq_lengthlist__44c1_s_p5_0,
+	_vq_lengthlist__8c1_s_p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c1_s_p5_0,
+	_vq_quantlist__8c1_s_p5_0,
 	NULL,
-	&_vq_auxt__44c1_s_p5_0,
+	&_vq_auxt__8c1_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p6_0[] = {
+static long _vq_quantlist__8c1_s_p6_0[] = {
 	8,
 	7,
 	9,
@@ -6438,99 +5203,99 @@
 	16,
 };
 
-static long _vq_lengthlist__44c1_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,11,11,
-	11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,
-	11,11,11, 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,11,12,12, 0, 0, 0, 8, 8, 9, 9,10,10,10,10,
-	10,10,11,11,12,12, 0, 0, 0, 8, 8, 9, 9, 9,10,10,
-	10,11,11,11,11,12,12, 0, 0, 0, 9, 9, 9, 9,10,10,
-	10,10,11,11,12,12,13,12, 0, 0, 0, 0, 0, 9, 9,10,
-	10,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 9, 9,
-	10,10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9,
-	 9,10, 9,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0,
-	10,10,10,10,11,11,11,11,12,12,13,13, 0, 0, 0, 0,
-	 0, 0, 0,10,10,11,11,11,11,12,12,13,13, 0, 0, 0,
-	 0, 0, 0, 0,11,11,11,11,12,12,13,12,13,13, 0, 0,
-	 0, 0, 0, 0, 0,11,11,11,11,12,12,13,13,13,13, 0,
-	 0, 0, 0, 0, 0, 0,11,11,11,12,12,12,13,13,14,14,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,12,12,13,13,14,
+static 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,
+	11,12,12, 0, 0, 0, 9, 9, 8, 8,10,10,10,10,11,11,
+	12,12,12,12, 0, 0, 0, 9, 9, 8, 8,10,10,10,10,11,
+	11,12,12,12,12, 0, 0, 0,10,10, 9, 9,10,10,10,10,
+	11,11,12,12,13,13, 0, 0, 0,10,10, 9, 9,10,10,10,
+	10,11,11,12,12,13,13, 0, 0, 0,11,11, 9, 9,10,10,
+	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,10,
+	10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,
+	10,10,11,11,12,12,12,12,13,13, 0, 0, 0, 0, 0, 9,
+	 9,10,10,11,11,12,11,12,12,13,13, 0, 0, 0, 0, 0,
+	10,10,11,11,11,11,12,12,13,12,13,13, 0, 0, 0, 0,
+	 0, 0, 0,11,10,11,11,12,12,13,13,13,13, 0, 0, 0,
+	 0, 0, 0, 0,11,11,12,12,12,12,13,13,13,14, 0, 0,
+	 0, 0, 0, 0, 0,11,11,12,12,12,12,13,13,14,13, 0,
+	 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,13,13,14,14,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,13,13,13,13,14,
 	14,
 };
 
-static float _vq_quantthresh__44c1_s_p6_0[] = {
+static 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__44c1_s_p6_0[] = {
+static 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__44c1_s_p6_0 = {
-	_vq_quantthresh__44c1_s_p6_0,
-	_vq_quantmap__44c1_s_p6_0,
+static encode_aux_threshmatch _vq_auxt__8c1_s_p6_0 = {
+	_vq_quantthresh__8c1_s_p6_0,
+	_vq_quantmap__8c1_s_p6_0,
 	17,
 	17
 };
 
-static static_codebook _44c1_s_p6_0 = {
+static static_codebook _8c1_s_p6_0 = {
 	2, 289,
-	_vq_lengthlist__44c1_s_p6_0,
+	_vq_lengthlist__8c1_s_p6_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c1_s_p6_0,
+	_vq_quantlist__8c1_s_p6_0,
 	NULL,
-	&_vq_auxt__44c1_s_p6_0,
+	&_vq_auxt__8c1_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p7_0[] = {
+static long _vq_quantlist__8c1_s_p7_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__44c1_s_p7_0[] = {
+static 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,11,10,10, 9, 9, 6, 9, 9,
-	10,10,10,10, 9, 9, 7,10,10,11,10,10,11,11,11, 6,
-	 9, 9,10, 9, 9,11,10,10, 6, 9, 9,10, 9, 9,11,10,
-	10,
+	10,11,10,10, 6, 9, 9,10, 9,10,11,10,10, 6, 9, 9,
+	10, 9, 9,11, 9,10, 7,10,10,11,11,11,11,10,10, 6,
+	 9, 9,10,10,10,11, 9, 9, 6, 9, 9,10,10,10,10, 9,
+	 9,
 };
 
-static float _vq_quantthresh__44c1_s_p7_0[] = {
+static float _vq_quantthresh__8c1_s_p7_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__44c1_s_p7_0[] = {
+static long _vq_quantmap__8c1_s_p7_0[] = {
 	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_s_p7_0 = {
-	_vq_quantthresh__44c1_s_p7_0,
-	_vq_quantmap__44c1_s_p7_0,
+static encode_aux_threshmatch _vq_auxt__8c1_s_p7_0 = {
+	_vq_quantthresh__8c1_s_p7_0,
+	_vq_quantmap__8c1_s_p7_0,
 	3,
 	3
 };
 
-static static_codebook _44c1_s_p7_0 = {
+static static_codebook _8c1_s_p7_0 = {
 	4, 81,
-	_vq_lengthlist__44c1_s_p7_0,
+	_vq_lengthlist__8c1_s_p7_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44c1_s_p7_0,
+	_vq_quantlist__8c1_s_p7_0,
 	NULL,
-	&_vq_auxt__44c1_s_p7_0,
+	&_vq_auxt__8c1_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p7_1[] = {
+static long _vq_quantlist__8c1_s_p7_1[] = {
 	5,
 	4,
 	6,
@@ -6544,46 +5309,46 @@
 	10,
 };
 
-static long _vq_lengthlist__44c1_s_p7_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,
+static 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,
-	 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 8, 8, 8, 8,
-	 8, 8,10,10,10, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10,
+	 7, 7, 7, 8, 8, 8, 8,10,10,10, 8, 8, 8, 8, 8, 8,
+	 8, 8,10,10,10, 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,
 	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,10,10, 8, 8, 8,
-	 8, 8, 8,10,10,10,10,10, 9, 9, 8, 8, 8, 8,10,10,
+	 8, 8, 8,10,10,10,10,10, 8, 8, 8, 8, 8, 8,10,10,
 	10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__44c1_s_p7_1[] = {
+static 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__44c1_s_p7_1[] = {
+static long _vq_quantmap__8c1_s_p7_1[] = {
 	    9,    7,    5,    3,    1,    0,    2,    4,
 	    6,    8,   10,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_s_p7_1 = {
-	_vq_quantthresh__44c1_s_p7_1,
-	_vq_quantmap__44c1_s_p7_1,
+static encode_aux_threshmatch _vq_auxt__8c1_s_p7_1 = {
+	_vq_quantthresh__8c1_s_p7_1,
+	_vq_quantmap__8c1_s_p7_1,
 	11,
 	11
 };
 
-static static_codebook _44c1_s_p7_1 = {
+static static_codebook _8c1_s_p7_1 = {
 	2, 121,
-	_vq_lengthlist__44c1_s_p7_1,
+	_vq_lengthlist__8c1_s_p7_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c1_s_p7_1,
+	_vq_quantlist__8c1_s_p7_1,
 	NULL,
-	&_vq_auxt__44c1_s_p7_1,
+	&_vq_auxt__8c1_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p8_0[] = {
+static long _vq_quantlist__8c1_s_p8_0[] = {
 	6,
 	5,
 	7,
@@ -6599,49 +5364,49 @@
 	12,
 };
 
-static long _vq_lengthlist__44c1_s_p8_0[] = {
-	 1, 4, 4, 6, 6, 7, 7, 7, 7, 9, 8,10,10, 6, 5, 5,
-	 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 6, 6, 7, 7, 8,
-	 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9,
-	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
-	11, 0,12,12, 9, 9, 9, 9,10,10,10,11,12,11, 0,12,
-	13, 9, 8, 9, 9,10,10,11,11,11,11, 0, 0, 0, 9, 9,
+static 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,
+	 9,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
+	11, 0,12,12, 9, 9, 9, 9,10, 9,10,11,11,11, 0,13,
+	12, 9, 8, 9, 9,10,10,11,11,12,11, 0, 0, 0, 9, 9,
 	 9, 9,10,10,11,11,12,12, 0, 0, 0,10,10, 9, 9,10,
-	10,11,11,12,12, 0, 0, 0,13,14,10,10,11,11,12,12,
-	12,13, 0, 0, 0,14,14,10,10,11,10,12,12,13,13, 0,
-	 0, 0, 0, 0,12,11,11,11,12,12,13,13, 0, 0, 0, 0,
-	 0,12,12,11,10,12,11,14,13,
+	10,11,11,12,12, 0, 0, 0,13,13,10,10,11,11,12,11,
+	13,12, 0, 0, 0,14,14,10,10,11,10,11,11,12,12, 0,
+	 0, 0, 0, 0,12,12,11,11,12,12,13,13, 0, 0, 0, 0,
+	 0,12,12,11,10,12,11,13,12,
 };
 
-static float _vq_quantthresh__44c1_s_p8_0[] = {
+static 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__44c1_s_p8_0[] = {
+static 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__44c1_s_p8_0 = {
-	_vq_quantthresh__44c1_s_p8_0,
-	_vq_quantmap__44c1_s_p8_0,
+static encode_aux_threshmatch _vq_auxt__8c1_s_p8_0 = {
+	_vq_quantthresh__8c1_s_p8_0,
+	_vq_quantmap__8c1_s_p8_0,
 	13,
 	13
 };
 
-static static_codebook _44c1_s_p8_0 = {
+static static_codebook _8c1_s_p8_0 = {
 	2, 169,
-	_vq_lengthlist__44c1_s_p8_0,
+	_vq_lengthlist__8c1_s_p8_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44c1_s_p8_0,
+	_vq_quantlist__8c1_s_p8_0,
 	NULL,
-	&_vq_auxt__44c1_s_p8_0,
+	&_vq_auxt__8c1_s_p8_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p8_1[] = {
+static long _vq_quantlist__8c1_s_p8_1[] = {
 	2,
 	1,
 	3,
@@ -6649,38 +5414,38 @@
 	4,
 };
 
-static long _vq_lengthlist__44c1_s_p8_1[] = {
+static 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__44c1_s_p8_1[] = {
+static float _vq_quantthresh__8c1_s_p8_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__44c1_s_p8_1[] = {
+static long _vq_quantmap__8c1_s_p8_1[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__44c1_s_p8_1 = {
-	_vq_quantthresh__44c1_s_p8_1,
-	_vq_quantmap__44c1_s_p8_1,
+static encode_aux_threshmatch _vq_auxt__8c1_s_p8_1 = {
+	_vq_quantthresh__8c1_s_p8_1,
+	_vq_quantmap__8c1_s_p8_1,
 	5,
 	5
 };
 
-static static_codebook _44c1_s_p8_1 = {
+static static_codebook _8c1_s_p8_1 = {
 	2, 25,
-	_vq_lengthlist__44c1_s_p8_1,
+	_vq_lengthlist__8c1_s_p8_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c1_s_p8_1,
+	_vq_quantlist__8c1_s_p8_1,
 	NULL,
-	&_vq_auxt__44c1_s_p8_1,
+	&_vq_auxt__8c1_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p9_0[] = {
+static long _vq_quantlist__8c1_s_p9_0[] = {
 	6,
 	5,
 	7,
@@ -6696,1377 +5461,210 @@
 	12,
 };
 
-static long _vq_lengthlist__44c1_s_p9_0[] = {
-	 1, 6, 6, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 7, 6,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 4, 6, 6, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 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, 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, 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, 9, 9, 9, 9, 9, 8,
+static 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,
+	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,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,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,10,10,10,10,10,10,10,
+	10,10,10,10,10, 9, 9, 9, 9,
 };
 
-static float _vq_quantthresh__44c1_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 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__44c1_s_p9_0[] = {
+static 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__44c1_s_p9_0 = {
-	_vq_quantthresh__44c1_s_p9_0,
-	_vq_quantmap__44c1_s_p9_0,
+static encode_aux_threshmatch _vq_auxt__8c1_s_p9_0 = {
+	_vq_quantthresh__8c1_s_p9_0,
+	_vq_quantmap__8c1_s_p9_0,
 	13,
 	13
 };
 
-static static_codebook _44c1_s_p9_0 = {
+static static_codebook _8c1_s_p9_0 = {
 	2, 169,
-	_vq_lengthlist__44c1_s_p9_0,
-	1, -514541568, 1627103232, 4, 0,
-	_vq_quantlist__44c1_s_p9_0,
+	_vq_lengthlist__8c1_s_p9_0,
+	1, -513964032, 1628680192, 4, 0,
+	_vq_quantlist__8c1_s_p9_0,
 	NULL,
-	&_vq_auxt__44c1_s_p9_0,
+	&_vq_auxt__8c1_s_p9_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_s_p9_1[] = {
+static long _vq_quantlist__8c1_s_p9_1[] = {
+	7,
 	6,
-	5,
-	7,
-	4,
 	8,
-	3,
-	9,
-	2,
-	10,
-	1,
-	11,
-	0,
-	12,
-};
-
-static long _vq_lengthlist__44c1_s_p9_1[] = {
-	 1, 4, 4, 6, 6, 7, 7, 9, 9,12,12,13,12, 6, 5, 5,
-	 7, 7, 8, 8,10,10,11,12,13,13, 6, 5, 5, 7, 7, 8,
-	 8, 9, 9,11,11,12,12,15, 7, 7, 7, 7, 9, 9,11,11,
-	13,13,14,13,15, 7, 7, 8, 7, 9, 9,10,10,12,11,14,
-	12,15,10,10, 8, 8,10,10,12,11,12,13,14,13,15,10,
-	10, 8, 8,11,10,11,11,13,12,13,15,14,15,15,10,10,
-	10,10,12,13,13,12,15,14,15,15,13,10,10,11,11,13,
-	13,13,12,13,13,15,15,15,14,15,11,11,13,13,13,13,
-	14,15,15,15,15,13,13,11,11,12,13,13,14,13,15,15,
-	15,14,15,15,13,12,12,11,13,13,15,15,15,15,15,15,
-	14,13,12,13,12,15,13,15,15,
-};
-
-static float _vq_quantthresh__44c1_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__44c1_s_p9_1[] = {
-	   11,    9,    7,    5,    3,    1,    0,    2,
-	    4,    6,    8,   10,   12,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c1_s_p9_1 = {
-	_vq_quantthresh__44c1_s_p9_1,
-	_vq_quantmap__44c1_s_p9_1,
-	13,
-	13
-};
-
-static static_codebook _44c1_s_p9_1 = {
-	2, 169,
-	_vq_lengthlist__44c1_s_p9_1,
-	1, -522616832, 1620115456, 4, 0,
-	_vq_quantlist__44c1_s_p9_1,
-	NULL,
-	&_vq_auxt__44c1_s_p9_1,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c1_s_p9_2[] = {
-	8,
-	7,
-	9,
-	6,
-	10,
 	5,
-	11,
-	4,
-	12,
-	3,
-	13,
-	2,
-	14,
-	1,
-	15,
-	0,
-	16,
-};
-
-static long _vq_lengthlist__44c1_s_p9_2[] = {
-	 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 8, 9, 8, 9, 9,
-	 9,10,10,10, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9,10,10,10, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9,10,10,10, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9,10,10,10, 7, 7, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9,10,10,11,10, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9,10, 9, 9, 9,10,10,10, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9,10,10,11, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9,10, 9,10,10,10,11,11, 9, 8, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9,10,10,11,11,11,11, 9, 9,
-	 9, 9, 9, 9,10, 9,10, 9, 9, 9,10,10,10,11,10, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,11,11,11,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,
-	11,11,10, 9, 9,10, 9, 9, 9, 9, 9, 9, 9,10,10,10,
-	11,11,11,10, 9,10,10,10, 9, 9, 9, 9,10, 9,10,10,
-	10,10,11,11,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	11,10,10,10,10,10,10, 9, 9, 9, 9,10, 9, 9, 9, 9,
-	10,10,10,11,11,10,10,11,11, 9, 9,10, 9, 9, 9, 9,
-	 9,
-};
-
-static float _vq_quantthresh__44c1_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__44c1_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__44c1_s_p9_2 = {
-	_vq_quantthresh__44c1_s_p9_2,
-	_vq_quantmap__44c1_s_p9_2,
-	17,
-	17
-};
-
-static static_codebook _44c1_s_p9_2 = {
-	2, 289,
-	_vq_lengthlist__44c1_s_p9_2,
-	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c1_s_p9_2,
-	NULL,
-	&_vq_auxt__44c1_s_p9_2,
-	NULL,
-	0
-};
-
-static long _huff_lengthlist__44c1_s_short[] = {
-	 5, 7,17,13,12,12,14,16,15,16, 4, 2,17, 5, 7, 6,
-	 8,11,14,13,16,16,16,16,16,16,16,16,16,16,10, 4,
-	16, 4, 8, 6, 7,11,14,14,10, 5,16, 6, 5, 6, 8,12,
-	15,15,10, 5,16, 5, 6, 5, 7,10,14,15,11, 6,16, 7,
-	 8, 7, 7,10,14,14,13, 8,16, 8, 7, 7, 8,10,12,13,
-	12, 8,16, 7, 5, 5, 6, 8,11,13,13, 9,16, 9, 6, 6,
-	 7, 8,10,13,
-};
-
-static static_codebook _huff_book__44c1_s_short = {
-	2, 100,
-	_huff_lengthlist__44c1_s_short,
-	0, 0, 0, 0, 0,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	0
-};
-
-static long _huff_lengthlist__44c1_sm_long[] = {
-	 3, 4,10, 9,11, 9,10,11,11,13, 4, 2,11, 5, 7, 7,
-	 8,10,12,13,10,10, 7,12, 8, 9, 9,10,12,13, 8, 5,
-	13, 6, 9, 7,10,12,15,15,10, 6, 7, 8, 5, 5, 7,10,
-	12,13, 9, 6, 8, 7, 5, 5, 6, 9,11,12, 9, 8, 9, 9,
-	 6, 5, 5, 7,10,13,10,10,10,12, 9, 7, 6, 7, 9,13,
-	10,13,11,17,11,11, 9, 8, 9,12,12,16,14,17,15,14,
-	12,10,10,12,
-};
-
-static static_codebook _huff_book__44c1_sm_long = {
-	2, 100,
-	_huff_lengthlist__44c1_sm_long,
-	0, 0, 0, 0, 0,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c1_sm_p1_0[] = {
-	1,
-	0,
-	2,
-};
-
-static 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,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 7, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0, 0,
-	 0, 0, 0, 7, 8, 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, 0, 0, 0, 0, 0, 0, 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, 7, 8, 0, 0, 0, 0, 0, 0, 7, 9, 8, 0, 0,
-	 0, 0, 0, 0, 7, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 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, 8, 7, 0, 0, 0, 0,
-	 0, 0, 8, 9, 9, 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0, 0,
-	 0, 0, 0, 9, 9,10, 0, 0, 0, 0, 0, 0, 9,10,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, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
-	 0, 0, 0, 0, 8,10, 9, 0, 0, 0, 0, 0, 0, 9,10,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, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 8, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
-	 0, 0, 0, 0, 8, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 9,10,10, 0,
-	 0, 0, 0, 0, 0, 8, 9,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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 9,10,10,
-	 0, 0, 0, 0, 0, 0, 9,10, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,
-};
-
-static float _vq_quantthresh__44c1_sm_p1_0[] = {
-	-0.5, 0.5, 
-};
-
-static 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,
-	3,
-	3
-};
-
-static static_codebook _44c1_sm_p1_0 = {
-	8, 6561,
-	_vq_lengthlist__44c1_sm_p1_0,
-	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__44c1_sm_p1_0,
-	NULL,
-	&_vq_auxt__44c1_sm_p1_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c1_sm_p2_0[] = {
-	2,
-	1,
-	3,
-	0,
-	4,
-};
-
-static long _vq_lengthlist__44c1_sm_p2_0[] = {
-	 1, 5, 5, 0, 0, 0, 5, 6, 0, 0, 0, 5, 6, 0, 0, 0,
-	 8, 8, 0, 0, 0, 0, 0, 0, 0, 5, 7, 6, 0, 0, 0, 8,
-	 8, 0, 0, 0, 8, 8, 0, 0, 0,10,10, 0, 0, 0, 0, 0,
-	 0, 0, 5, 6, 7, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0,
-	 0, 0,10,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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 8, 0, 0, 0, 8, 8, 0, 0,
-	 0, 8, 8, 0, 0, 0,10, 9, 0, 0, 0, 0, 0, 0, 0, 6,
-	 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 9,
-	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, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8,
-	 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 6, 8, 8, 0,
-	 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0,10,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, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 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,10,10, 0, 0, 0,10,10, 0, 0, 0, 9,10, 0, 0, 0,
-	10,10, 0, 0, 0, 0, 0, 0, 0, 8,10,10, 0, 0, 0,10,
-	10, 0, 0, 0,10, 9, 0, 0, 0,10,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, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,
-};
-
-static float _vq_quantthresh__44c1_sm_p2_0[] = {
-	-1.5, -0.5, 0.5, 1.5, 
-};
-
-static 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,
-	5,
-	5
-};
-
-static static_codebook _44c1_sm_p2_0 = {
-	4, 625,
-	_vq_lengthlist__44c1_sm_p2_0,
-	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c1_sm_p2_0,
-	NULL,
-	&_vq_auxt__44c1_sm_p2_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c1_sm_p3_0[] = {
-	2,
-	1,
-	3,
-	0,
-	4,
-};
-
-static long _vq_lengthlist__44c1_sm_p3_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, 7, 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, 0, 0, 6, 6, 6, 8, 8,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 6, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,
-};
-
-static float _vq_quantthresh__44c1_sm_p3_0[] = {
-	-1.5, -0.5, 0.5, 1.5, 
-};
-
-static long _vq_quantmap__44c1_sm_p3_0[] = {
-	    3,    1,    0,    2,    4,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p3_0 = {
-	_vq_quantthresh__44c1_sm_p3_0,
-	_vq_quantmap__44c1_sm_p3_0,
-	5,
-	5
-};
-
-static static_codebook _44c1_sm_p3_0 = {
-	4, 625,
-	_vq_lengthlist__44c1_sm_p3_0,
-	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c1_sm_p3_0,
-	NULL,
-	&_vq_auxt__44c1_sm_p3_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c1_sm_p4_0[] = {
-	4,
-	3,
-	5,
-	2,
-	6,
-	1,
-	7,
-	0,
-	8,
-};
-
-static long _vq_lengthlist__44c1_sm_p4_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,
-	 8, 9, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0,
-	 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0,
-};
-
-static 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[] = {
-	    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,
 	9,
-	9
-};
-
-static static_codebook _44c1_sm_p4_0 = {
-	2, 81,
-	_vq_lengthlist__44c1_sm_p4_0,
-	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c1_sm_p4_0,
-	NULL,
-	&_vq_auxt__44c1_sm_p4_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c1_sm_p5_0[] = {
 	4,
+	10,
 	3,
-	5,
+	11,
 	2,
-	6,
+	12,
 	1,
-	7,
-	0,
-	8,
-};
-
-static long _vq_lengthlist__44c1_sm_p5_0[] = {
-	 2, 3, 3, 5, 5, 6, 6, 8, 8, 0, 5, 5, 6, 6, 7, 7,
-	 9, 9, 0, 5, 5, 6, 6, 7, 7, 9, 9, 0, 6, 6, 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, 9, 9, 9, 9,10,10, 0, 0, 0, 0, 0, 8, 8,10,
-	10,
-};
-
-static float _vq_quantthresh__44c1_sm_p5_0[] = {
-	-3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 
-};
-
-static long _vq_quantmap__44c1_sm_p5_0[] = {
-	    7,    5,    3,    1,    0,    2,    4,    6,
-	    8,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p5_0 = {
-	_vq_quantthresh__44c1_sm_p5_0,
-	_vq_quantmap__44c1_sm_p5_0,
-	9,
-	9
-};
-
-static static_codebook _44c1_sm_p5_0 = {
-	2, 81,
-	_vq_lengthlist__44c1_sm_p5_0,
-	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__44c1_sm_p5_0,
-	NULL,
-	&_vq_auxt__44c1_sm_p5_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c1_sm_p6_0[] = {
-	8,
-	7,
-	9,
-	6,
-	10,
-	5,
-	11,
-	4,
-	12,
-	3,
 	13,
-	2,
-	14,
-	1,
-	15,
 	0,
-	16,
-};
-
-static long _vq_lengthlist__44c1_sm_p6_0[] = {
-	 2, 3, 4, 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,
-	10,11,11, 0, 6, 6, 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,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,11,12,12, 0, 0, 0, 8, 8, 8, 8,10,10,
-	10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 8, 8,10,
-	10,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 8, 8,
-	 9, 9,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 8,
-	 8, 9, 9,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0,
-	 9, 9,10,10,10,10,11,11,12,12,13,13, 0, 0, 0, 0,
-	 0, 0, 0,10,10,10,10,11,11,12,12,13,13, 0, 0, 0,
-	 0, 0, 0, 0,10,10,11,11,11,11,13,12,13,13, 0, 0,
-	 0, 0, 0, 0, 0,10,10,11,11,11,11,13,13,13,13, 0,
-	 0, 0, 0, 0, 0, 0,11,11,11,11,12,12,13,13,14,14,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,12,12,13,12,14,
 	14,
 };
 
-static float _vq_quantthresh__44c1_sm_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_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,
+	 8, 8,10,10,11,11,12,13,13,13,13,13,17, 7, 7, 8,
+	 8,10,10,11,11,13,13,13,13,14,14,17,11,11, 9, 9,
+	11,11,12,12,12,13,13,14,15,13,17,12,12, 9, 9,11,
+	11,12,12,13,13,13,13,14,16,17,17,17,11,12,12,12,
+	13,13,13,14,15,14,15,15,17,17,17,12,12,11,11,13,
+	13,14,14,15,14,15,15,17,17,17,15,15,13,13,14,14,
+	15,14,15,15,16,15,17,17,17,15,15,13,13,13,14,14,
+	15,15,15,15,16,17,17,17,17,16,14,15,14,14,15,14,
+	14,15,15,15,17,17,17,17,17,14,14,16,14,15,15,15,
+	15,15,15,17,17,17,17,17,17,16,16,15,17,15,15,14,
+	17,15,17,16,17,17,17,17,16,15,14,15,15,15,15,15,
+	15,
 };
 
-static long _vq_quantmap__44c1_sm_p6_0[] = {
-	   15,   13,   11,    9,    7,    5,    3,    1,
-	    0,    2,    4,    6,    8,   10,   12,   14,
-	   16,
+static 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 encode_aux_threshmatch _vq_auxt__44c1_sm_p6_0 = {
-	_vq_quantthresh__44c1_sm_p6_0,
-	_vq_quantmap__44c1_sm_p6_0,
-	17,
-	17
+static long _vq_quantmap__8c1_s_p9_1[] = {
+	   13,   11,    9,    7,    5,    3,    1,    0,
+	    2,    4,    6,    8,   10,   12,   14,
 };
 
-static static_codebook _44c1_sm_p6_0 = {
-	2, 289,
-	_vq_lengthlist__44c1_sm_p6_0,
-	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c1_sm_p6_0,
-	NULL,
-	&_vq_auxt__44c1_sm_p6_0,
-	NULL,
-	0
+static encode_aux_threshmatch _vq_auxt__8c1_s_p9_1 = {
+	_vq_quantthresh__8c1_s_p9_1,
+	_vq_quantmap__8c1_s_p9_1,
+	15,
+	15
 };
 
-static long _vq_quantlist__44c1_sm_p7_0[] = {
-	1,
-	0,
-	2,
-};
-
-static long _vq_lengthlist__44c1_sm_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,10,10,10, 6, 9, 9,10,10,10,10, 9, 9, 6, 9, 9,
-	10,10,10,10,10, 9, 7,10,10,11,10,10,11,11,11, 6,
-	 9, 9,10, 9, 9,11,10,10, 6, 9, 9,10, 9, 9,11,10,
-	10,
-};
-
-static float _vq_quantthresh__44c1_sm_p7_0[] = {
-	-5.5, 5.5, 
-};
-
-static long _vq_quantmap__44c1_sm_p7_0[] = {
-	    1,    0,    2,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p7_0 = {
-	_vq_quantthresh__44c1_sm_p7_0,
-	_vq_quantmap__44c1_sm_p7_0,
-	3,
-	3
-};
-
-static static_codebook _44c1_sm_p7_0 = {
-	4, 81,
-	_vq_lengthlist__44c1_sm_p7_0,
-	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__44c1_sm_p7_0,
+static static_codebook _8c1_s_p9_1 = {
+	2, 225,
+	_vq_lengthlist__8c1_s_p9_1,
+	1, -520986624, 1620377600, 4, 0,
+	_vq_quantlist__8c1_s_p9_1,
 	NULL,
-	&_vq_auxt__44c1_sm_p7_0,
+	&_vq_auxt__8c1_s_p9_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__44c1_sm_p7_1[] = {
-	5,
-	4,
-	6,
-	3,
-	7,
-	2,
-	8,
-	1,
-	9,
-	0,
+static long _vq_quantlist__8c1_s_p9_2[] = {
 	10,
-};
-
-static long _vq_lengthlist__44c1_sm_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, 7, 6, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7,
-	 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, 7, 8, 8, 8, 8,
-	 8, 8,10,10,10, 7, 7, 8, 8, 8, 8, 9, 8,10,10,10,
-	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,10,10, 8, 8, 8,
-	 8, 8, 8,10,10,10,10,10, 9, 9, 8, 8, 8, 8,10,10,
-	10,10,10, 8, 8, 8, 8, 8, 8,
-};
-
-static float _vq_quantthresh__44c1_sm_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__44c1_sm_p7_1[] = {
-	    9,    7,    5,    3,    1,    0,    2,    4,
-	    6,    8,   10,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p7_1 = {
-	_vq_quantthresh__44c1_sm_p7_1,
-	_vq_quantmap__44c1_sm_p7_1,
-	11,
-	11
-};
-
-static static_codebook _44c1_sm_p7_1 = {
-	2, 121,
-	_vq_lengthlist__44c1_sm_p7_1,
-	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__44c1_sm_p7_1,
-	NULL,
-	&_vq_auxt__44c1_sm_p7_1,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c1_sm_p8_0[] = {
-	6,
-	5,
-	7,
-	4,
-	8,
-	3,
 	9,
-	2,
-	10,
-	1,
 	11,
-	0,
-	12,
-};
-
-static long _vq_lengthlist__44c1_sm_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, 6, 7, 7, 8,
-	 8, 8, 8, 9, 9,11,10, 0, 8, 8, 8, 8, 9, 9, 9, 9,
-	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
-	11, 0,12,12, 9, 9, 9, 9,10,10,11,11,12,11, 0,13,
-	13, 9, 9, 9, 9,10,10,11,11,12,12, 0, 0, 0, 9, 9,
-	 9, 9,10,10,11,12,12,12, 0, 0, 0,10,10, 9, 9,11,
-	11,12,12,13,13, 0, 0, 0,13,13,10,10,11,11,12,12,
-	13,13, 0, 0, 0,14,14,10,10,11,10,12,12,13,13, 0,
-	 0, 0, 0, 0,12,11,11,11,12,12,14,13, 0, 0, 0, 0,
-	 0,12,12,11,10,12,12,14,13,
-};
-
-static float _vq_quantthresh__44c1_sm_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__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,
-	13,
-	13
-};
-
-static static_codebook _44c1_sm_p8_0 = {
-	2, 169,
-	_vq_lengthlist__44c1_sm_p8_0,
-	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__44c1_sm_p8_0,
-	NULL,
-	&_vq_auxt__44c1_sm_p8_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c1_sm_p8_1[] = {
-	2,
-	1,
-	3,
-	0,
-	4,
-};
-
-static long _vq_lengthlist__44c1_sm_p8_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_p8_1[] = {
-	-1.5, -0.5, 0.5, 1.5, 
-};
-
-static long _vq_quantmap__44c1_sm_p8_1[] = {
-	    3,    1,    0,    2,    4,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p8_1 = {
-	_vq_quantthresh__44c1_sm_p8_1,
-	_vq_quantmap__44c1_sm_p8_1,
-	5,
-	5
-};
-
-static static_codebook _44c1_sm_p8_1 = {
-	2, 25,
-	_vq_lengthlist__44c1_sm_p8_1,
-	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__44c1_sm_p8_1,
-	NULL,
-	&_vq_auxt__44c1_sm_p8_1,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c1_sm_p9_0[] = {
-	6,
-	5,
-	7,
-	4,
 	8,
-	3,
-	9,
-	2,
-	10,
-	1,
-	11,
-	0,
 	12,
-};
-
-static long _vq_lengthlist__44c1_sm_p9_0[] = {
-	 1, 5, 5,11,11,11,11,11,11,11,11,11,11, 4, 5, 5,
-	11,10,11,11,11,11,11,11,11,11, 4, 5, 4,11,11,11,
-	11,11,11,11,11,11,11,11, 6, 7,11, 9,11,11,11,11,
-	11,11,11,11,11, 6, 7, 9, 8,11,11,11,11,11,11,11,
-	11,11, 9, 9, 7, 8,11,11,11,11,11,11,11,11,11,10,
-	10, 9,10,11,11,11,11,11,11,11,11,11,11,11, 8,11,
-	10,10,11,11,11,11,11,11,11,11,11, 9,11,11,11,11,
-	11,11,11,11,11,11,11,11,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,10,10,10,10,10,
-};
-
-static float _vq_quantthresh__44c1_sm_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__44c1_sm_p9_0[] = {
-	   11,    9,    7,    5,    3,    1,    0,    2,
-	    4,    6,    8,   10,   12,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p9_0 = {
-	_vq_quantthresh__44c1_sm_p9_0,
-	_vq_quantmap__44c1_sm_p9_0,
-	13,
-	13
-};
-
-static static_codebook _44c1_sm_p9_0 = {
-	2, 169,
-	_vq_lengthlist__44c1_sm_p9_0,
-	1, -514541568, 1627103232, 4, 0,
-	_vq_quantlist__44c1_sm_p9_0,
-	NULL,
-	&_vq_auxt__44c1_sm_p9_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c1_sm_p9_1[] = {
-	6,
-	5,
 	7,
-	4,
-	8,
-	3,
-	9,
-	2,
-	10,
-	1,
-	11,
-	0,
-	12,
-};
-
-static long _vq_lengthlist__44c1_sm_p9_1[] = {
-	 1, 4, 4, 6, 6, 7, 7,10,10,12,12,13,13, 6, 5, 5,
-	 7, 7, 8, 8,10,10,12,12,14,13, 6, 5, 5, 7, 7, 8,
-	 8,10,10,12,12,13,13,16, 7, 7, 7, 7, 9, 9,11,11,
-	13,14,13,15,18, 7, 6, 8, 7, 9, 9,11,10,12,12,14,
-	12,19,10,10, 8, 8,10,10,12,11,13,15,15,15,17,11,
-	11, 8, 7,11,10,12,12,13,13,14,15,16,17,17,10,11,
-	10,10,13,13,14,13,16,15,17,17,16,10,10,11,11,14,
-	14,16,13,14,14,17,19,17,15,14,11,11,13,13,15,14,
-	16,15,17,16,17,14,14,11,11,14,13,14,14,14,15,17,
-	16,16,16,17,13,13,13,13,16,14,17,15,16,17,18,18,
-	17,13,13,13,13,15,15,16,16,
-};
-
-static float _vq_quantthresh__44c1_sm_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__44c1_sm_p9_1[] = {
-	   11,    9,    7,    5,    3,    1,    0,    2,
-	    4,    6,    8,   10,   12,
-};
-
-static encode_aux_threshmatch _vq_auxt__44c1_sm_p9_1 = {
-	_vq_quantthresh__44c1_sm_p9_1,
-	_vq_quantmap__44c1_sm_p9_1,
 	13,
-	13
-};
-
-static static_codebook _44c1_sm_p9_1 = {
-	2, 169,
-	_vq_lengthlist__44c1_sm_p9_1,
-	1, -522616832, 1620115456, 4, 0,
-	_vq_quantlist__44c1_sm_p9_1,
-	NULL,
-	&_vq_auxt__44c1_sm_p9_1,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__44c1_sm_p9_2[] = {
-	8,
-	7,
-	9,
 	6,
-	10,
+	14,
 	5,
-	11,
+	15,
 	4,
-	12,
+	16,
 	3,
-	13,
+	17,
 	2,
-	14,
+	18,
 	1,
-	15,
+	19,
 	0,
-	16,
+	20,
 };
 
-static long _vq_lengthlist__44c1_sm_p9_2[] = {
-	 2, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9,10, 6, 6, 7, 7, 8, 7, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9,10, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9, 9,10, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9,10,10,10, 7, 7, 8, 8, 9, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9,11,11,11, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9,10,10,10, 7, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9,10, 9,10,10,10, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9,10,10,10,10,11,11, 8, 8, 9,
-	 9, 9, 9, 9, 9, 9, 9,10, 9,10,11,10,11,11, 9, 9,
-	 9, 9, 9, 9, 9,10,10, 9, 9, 9,10,11,10,11,11, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,11,11,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,11,10,11,
-	11,10,11, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,
-	11,11,11,11, 9,10,10,10, 9, 9, 9, 9,10, 9,10,10,
-	10,11,11,11,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	11,10,11,10,11,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9,
-	10,10,10,11,11,10,10,10,11, 9, 9, 9, 9, 9, 9, 9,
-	 9,
+static 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,
+	 7, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,11,
+	11,12, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,10,10,10,10,
+	10,10,10,10,11,11,11, 7, 7, 8, 8, 8, 8, 9, 9, 9,
+	 9,10,10,10,10,10,10,10,10,11,11,11, 8, 8, 8, 8,
+	 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,11,11,
+	11, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,10,
+	10,10,10,11,12,11, 9, 9, 8, 9, 9, 9, 9, 9,10,10,
+	10,10,10,10,10,10,10,10,11,11,11,11,11, 8, 8, 9,
+	 9, 9, 9,10,10,10,10,10,10,10,10,10,10,11,12,11,
+	12,11, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,
+	10,10,11,11,11,11,11, 9, 9, 9, 9,10,10,10,10,10,
+	10,10,10,10,10,10,10,12,11,12,11,11, 9, 9, 9,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,12,11,11,11,
+	11,11,11,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	11,11,11,12,11,11,12,11,10,10,10,10,10,10,10,10,
+	10,10,10,10,11,10,11,11,11,11,11,11,11,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,11,11,12,11,12,
+	11,11,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	11,11,12,11,12,11,11,11,11,10,10,10,10,10,10,10,
+	10,10,10,10,10,11,11,12,11,11,12,11,11,12,10,10,
+	11,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,
+	11,11,11,10,10,10,10,10,10,10,10,10,10,10,10,12,
+	12,11,12,11,11,12,12,12,11,11,10,10,10,10,10,10,
+	10,10,10,11,12,12,11,12,12,11,12,11,11,11,11,10,
+	10,10,10,10,10,10,10,10,10,
 };
 
-static float _vq_quantthresh__44c1_sm_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 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__44c1_sm_p9_2[] = {
-	   15,   13,   11,    9,    7,    5,    3,    1,
-	    0,    2,    4,    6,    8,   10,   12,   14,
-	   16,
+static 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__44c1_sm_p9_2 = {
-	_vq_quantthresh__44c1_sm_p9_2,
-	_vq_quantmap__44c1_sm_p9_2,
-	17,
-	17
+static encode_aux_threshmatch _vq_auxt__8c1_s_p9_2 = {
+	_vq_quantthresh__8c1_s_p9_2,
+	_vq_quantmap__8c1_s_p9_2,
+	21,
+	21
 };
 
-static static_codebook _44c1_sm_p9_2 = {
-	2, 289,
-	_vq_lengthlist__44c1_sm_p9_2,
-	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__44c1_sm_p9_2,
+static static_codebook _8c1_s_p9_2 = {
+	2, 441,
+	_vq_lengthlist__8c1_s_p9_2,
+	1, -529268736, 1611661312, 5, 0,
+	_vq_quantlist__8c1_s_p9_2,
 	NULL,
-	&_vq_auxt__44c1_sm_p9_2,
+	&_vq_auxt__8c1_s_p9_2,
 	NULL,
 	0
 };
 
-static long _huff_lengthlist__44c1_sm_short[] = {
-	 4, 7,13,13,13,13,14,16,16,19, 4, 2,13, 5, 8, 7,
-	 9,12,14,13,16, 9,10,10, 9,10,11,13,17,19, 9, 4,
-	13, 5,10, 6, 8,11,15,15,11, 6, 9, 7, 6, 6, 8,11,
-	14,18,11, 5, 9, 6, 6, 5, 6, 9,13,15,12, 6, 9, 7,
-	 6, 5, 5, 8,12,15,13, 7,10, 8, 6, 6, 7, 9,12,13,
-	13, 9,11, 9, 6, 5, 6, 8,11,13,13,11,13,11, 7, 6,
-	 7, 8,10,12,
+static 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,
+	10,13, 7, 5,17, 6, 8, 4, 5, 6, 8,10, 6, 5,17, 6,
+	 8, 5, 4, 5, 7, 9, 7, 7,17, 8, 9, 6, 5, 5, 6, 8,
+	 8, 8,17, 9,11, 8, 6, 6, 6, 7, 9,10,17,12,12,10,
+	 9, 7, 7, 8,
 };
 
-static static_codebook _huff_book__44c1_sm_short = {
+static static_codebook _huff_book__8c1_s_single = {
 	2, 100,
-	_huff_lengthlist__44c1_sm_short,
+	_huff_lengthlist__8c1_s_single,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -8076,13 +5674,13 @@
 };
 
 static long _huff_lengthlist__44c2_s_long[] = {
-	 5, 5,12,10,11,10,10,10,11,13, 5, 1, 9, 5, 8, 7,
-	 8,10,13,13,12, 9, 8,11, 7, 8, 9,11,13,15, 9, 5,
-	12, 6, 9, 8,10,12,15,14,12, 7, 6, 8, 5, 6, 7,10,
-	12,13,10, 7, 8, 7, 6, 6, 7, 9,12,12,10, 8, 9, 9,
-	 7, 6, 6, 7,10,11,10, 9,10,11, 9, 8, 6, 6, 8,11,
-	10,12,13,15,11,10, 8, 7, 8,11,11,13,16,16,14,13,
-	11, 9, 9,10,
+	 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,
+	12,14, 9, 6, 8, 7, 6, 6, 7, 9,12,12, 9, 7, 9, 9,
+	 7, 6, 6, 7,10,10,10, 9,10,11, 8, 7, 6, 6, 8,10,
+	12,11,13,13,11,10, 8, 8, 8,10,11,13,15,15,14,13,
+	10, 8, 8, 9,
 };
 
 static static_codebook _huff_book__44c2_s_long = {
@@ -8103,17 +5701,17 @@
 };
 
 static long _vq_lengthlist__44c2_s_p1_0[] = {
-	 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 7, 6, 0, 0, 0, 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,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0, 0,
-	 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 6, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
+	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 6, 8, 7, 0, 0,
 	 0, 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -8148,18 +5746,18 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 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, 7, 7, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0,
 	 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0, 0,
-	 0, 0, 0, 8, 9,10, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0,
+	 0, 0, 0, 8, 9, 9, 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0, 0,
 	 0, 0, 0, 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, 8, 8, 0, 0,
-	 0, 0, 0, 0, 8, 9, 8, 0, 0, 0, 0, 0, 0, 8, 9,10,
+	 0, 0, 0, 0, 8, 9, 8, 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -8199,13 +5797,13 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 8, 0, 0, 0, 0, 0, 0, 8,10, 9, 0,
+	 0, 0, 0, 6, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0,
 	 0, 0, 0, 0, 0, 8, 8, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9,
-	 0, 0, 0, 0, 0, 0, 8,10, 9, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -8552,33 +6150,33 @@
 
 static long _vq_lengthlist__44c2_s_p2_0[] = {
 	 1, 4, 4, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0,
-	 7, 7, 0, 0, 0, 0, 0, 0, 0, 4, 6, 6, 0, 0, 0, 8,
+	 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,
-	 0, 0, 4, 6, 6, 0, 0, 0, 8, 9, 0, 0, 0, 8, 8, 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, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0, 0,11,10, 0, 0,
-	 0,11,11, 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 7,
+	 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0, 0,11,11, 0, 0,
+	 0,11,11, 0, 0, 0,12,11, 0, 0, 0, 0, 0, 0, 0, 7,
 	 8, 8, 0, 0, 0,10,11, 0, 0, 0,11,11, 0, 0, 0,11,
-	11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 7, 8, 8, 0, 0, 0,11,11, 0, 0, 0,11,11,
-	 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0,
-	 0, 0,11,11, 0, 0, 0,11,11, 0, 0, 0,11,11, 0, 0,
+	 0, 0, 0, 6, 8, 8, 0, 0, 0,11,11, 0, 0, 0,11,11,
+	 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 6, 8, 8, 0,
+	 0, 0,10,11, 0, 0, 0,10,11, 0, 0, 0,11,11, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 7, 9, 9, 0, 0, 0,11,12, 0, 0, 0,11,12, 0, 0, 0,
-	12,11, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0, 0,12,
-	11, 0, 0, 0,11,11, 0, 0, 0,11,11, 0, 0, 0, 0, 0,
+	 8, 9, 9, 0, 0, 0,11,12, 0, 0, 0,11,12, 0, 0, 0,
+	12,11, 0, 0, 0, 0, 0, 0, 0, 8,10, 9, 0, 0, 0,12,
+	11, 0, 0, 0,12,11, 0, 0, 0,11,12, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -8631,10 +6229,10 @@
 	 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,
-	 0, 0, 4, 4, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 7, 7,
+	 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, 0, 0, 6, 6, 6, 9, 9,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 6, 6, 6, 7, 7, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 6, 6, 7, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -8710,9 +6308,9 @@
 
 static 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, 6, 6, 7, 7,
-	 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0,
-	 7, 8, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 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,
+	 7, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0,
 	 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
 };
@@ -8757,10 +6355,10 @@
 };
 
 static long _vq_lengthlist__44c2_s_p5_0[] = {
-	 1, 3, 3, 6, 6, 6, 6, 8, 8, 0, 7, 7, 7, 7, 8, 8,
-	 9, 9, 0, 7, 7, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 7,
-	 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0,
-	 8, 8, 9, 9,10,10, 0, 0, 0, 8, 8, 9, 9,10,10, 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,
+	 9, 9, 8, 8,10,10, 0, 0, 0, 9, 9, 8, 8,10,10, 0,
 	 0, 0,10,10, 9, 9,11,11, 0, 0, 0, 0, 0, 9, 9,11,
 	11,
 };
@@ -8813,24 +6411,24 @@
 };
 
 static long _vq_lengthlist__44c2_s_p6_0[] = {
-	 1, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,
-	11, 0, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10,
-	11,11, 0, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,
-	10,11,11, 0, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,
-	11,11,11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,
-	10,11,11,12,12, 0, 0, 0, 8, 8, 9, 9, 9, 9, 9, 9,
-	10,10,11,11,12,12, 0, 0, 0, 8, 8, 9, 9, 9, 9, 9,
-	 9,10,11,11,11,12,12, 0, 0, 0, 9, 9, 9, 9,10,10,
-	10,10,11,11,11,12,12,12, 0, 0, 0, 0, 0, 9, 9,10,
-	10,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 9, 9,
-	 9, 9,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 9,
-	 9, 9, 9,10,10,11,11,12,12,12,13, 0, 0, 0, 0, 0,
-	10,10,10,10,10,11,11,11,12,12,13,13, 0, 0, 0, 0,
-	 0, 0, 0,10,10,10,10,11,11,12,12,13,13, 0, 0, 0,
-	 0, 0, 0, 0,11,11,11,11,12,12,12,12,13,13, 0, 0,
-	 0, 0, 0, 0, 0,11,11,11,11,12,11,12,12,13,13, 0,
-	 0, 0, 0, 0, 0, 0,11,11,11,11,12,12,13,12,14,13,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,12,12,12,13,13,
+	 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,
+	11,11,12, 0, 8, 8, 7, 7, 9, 9,10,10, 9, 9,10,10,
+	11,11,12,12, 0, 0, 0, 7, 7, 9, 9,10,10,10, 9,10,
+	10,11,11,12,12, 0, 0, 0, 8, 8, 9, 9,10,10,10,10,
+	11,11,11,11,12,12, 0, 0, 0, 8, 8, 9, 9,10,10,10,
+	10,11,11,12,12,12,12, 0, 0, 0, 9, 9, 9, 9,10,10,
+	10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 9, 9,10,
+	10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,
+	10,10,11,11,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9,
+	 9,10,10,11,11,11,11,12,12,13,13, 0, 0, 0, 0, 0,
+	10,10,10,10,11,11,12,12,13,12,13,13, 0, 0, 0, 0,
+	 0, 0, 0,10,10,11,11,12,12,13,13,13,13, 0, 0, 0,
+	 0, 0, 0, 0,11,11,12,12,12,12,13,13,13,14, 0, 0,
+	 0, 0, 0, 0, 0,11,11,12,12,12,12,13,13,13,14, 0,
+	 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,13,13,14,14,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,13,13,13,13,14,
 	14,
 };
 
@@ -8870,12 +6468,12 @@
 };
 
 static long _vq_lengthlist__44c2_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, 9,10,10,
-	10,11,10,10, 6, 9, 9,10,10,10,11, 9, 9, 6, 9, 9,
-	10,10,10,11, 9, 9, 7,10,10,11,10,10,11,11,10, 6,
-	 9, 9,10, 9, 9,11,10,10, 6, 9, 9,10, 9,10,11,10,
-	10,
+	 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,
+	11,10,11,11,10,10, 7,11,10,11,11,11,12,11,11, 6,
+	 9, 9,11,10,10,11,11,10, 6, 9, 9,11,10,10,12,10,
+	11,
 };
 
 static float _vq_quantthresh__44c2_s_p7_0[] = {
@@ -8919,14 +6517,14 @@
 };
 
 static long _vq_lengthlist__44c2_s_p7_1[] = {
-	 2, 4, 4, 6, 6, 7, 7, 7, 7, 7, 7,10, 6, 6, 6, 6,
-	 7, 7, 8, 7, 8, 8, 9, 6, 6, 6, 6, 7, 7, 7, 7, 7,
-	 7,10, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8,10, 9, 9, 6,
-	 6, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 8, 8, 8, 8,
-	 8, 8,10,10,10, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10,
-	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,10, 9, 8, 8, 8,
-	 8, 8, 8,10,10,10, 9,10, 8, 8, 8, 8, 8, 8,10,10,
-	10,10, 9, 8, 8, 8, 8, 8, 8,
+	 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,
+	 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 8, 8, 8, 8,
+	 8, 8,10,10,10, 7, 8, 8, 8, 8, 8, 8, 8,10,10,10,
+	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,10,10, 8, 8, 8,
+	 8, 8, 8,10,10,10,10,10, 9, 9, 8, 8, 8, 8,10,10,
+	10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
 static float _vq_quantthresh__44c2_s_p7_1[] = {
@@ -8974,17 +6572,17 @@
 };
 
 static long _vq_lengthlist__44c2_s_p8_0[] = {
-	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5,
-	 7, 7, 8, 8, 9, 8, 9, 9,10,10, 7, 5, 5, 7, 7, 8,
-	 8, 8, 9,10, 9,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,
-	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9,10,10,10,11,
-	11, 0,12,12, 9, 9,10,10,10,10,11,11,12,12, 0,13,
-	12, 9, 9,10, 9,10,10,11,11,11,12, 0, 0, 0,10,10,
-	10,10,11,11,11,11,12,12, 0, 0, 0,10,10, 9, 9,11,
-	11,12,12,12,13, 0, 0, 0,13,13,10,10,11,11,12,12,
-	13,13, 0, 0, 0,14,14,10,10,11,11,12,12,13,13, 0,
-	 0, 0, 0, 0,12,12,11,12,12,12,14,13, 0, 0, 0, 0,
-	 0,12,12,12,12,12,12,14,13,
+	 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,
+	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
+	11, 0,12,12, 9, 9,10,10,10,10,11,11,11,11, 0,13,
+	13, 9, 9,10,10,10,10,11,11,12,12, 0, 0, 0,10,10,
+	10,10,11,11,12,12,12,13, 0, 0, 0,10,10,10,10,11,
+	11,12,12,12,12, 0, 0, 0,14,14,10,11,11,11,12,12,
+	13,13, 0, 0, 0,14,14,11,10,11,11,13,12,13,13, 0,
+	 0, 0, 0, 0,12,12,11,12,13,12,14,14, 0, 0, 0, 0,
+	 0,12,12,12,12,13,12,14,14,
 };
 
 static float _vq_quantthresh__44c2_s_p8_0[] = {
@@ -9024,7 +6622,7 @@
 };
 
 static long _vq_lengthlist__44c2_s_p8_1[] = {
-	 2, 4, 4, 4, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6,
+	 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,
 };
 
@@ -9071,17 +6669,17 @@
 };
 
 static long _vq_lengthlist__44c2_s_p9_0[] = {
-	 1, 5, 4,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 5, 7, 7,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 9, 6, 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, 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, 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,
+	 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,
+	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,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,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,11,11,11,11,11,11,11,11,
 };
 
 static float _vq_quantthresh__44c2_s_p9_0[] = {
@@ -9129,17 +6727,17 @@
 };
 
 static long _vq_lengthlist__44c2_s_p9_1[] = {
-	 1, 4, 4, 6, 6, 7, 7, 9, 9,11,11,12,12, 6, 5, 5,
-	 7, 7, 8, 8,10,10,12,11,13,13, 6, 5, 5, 7, 7, 8,
-	 8, 9, 9,11,11,12,13,16, 7, 7, 8, 8, 9, 9,10,10,
-	13,13,16,14,16, 7, 7, 8, 8, 9, 9,10,10,13,13,15,
-	13,16,10,10, 8, 8,10,10,11,11,12,12,15,14,16,11,
-	11, 8, 8,10,10,11,11,12,12,14,13,16,16,16,10,11,
-	10,10,12,12,14,13,13,13,16,16,16,10, 9,10, 7,13,
-	12,13,13,13,13,16,16,16,14,15,11,11,12,12,13,13,
-	15,14,16,16,16,16,14,11, 9,12, 9,15,13,13,14,16,
-	16,16,16,16,13,13,12,12,14,15,16,15,16,16,15,16,
-	16,13,12,12,11,15,13,14,15,
+	 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,
+	12,12,12,13,18, 8, 8, 8, 8, 9, 9,10,10,12,12,13,
+	13,18,11,11, 8, 8,10,10,11,11,12,11,13,12,18,11,
+	11, 9, 7,10,10,11,11,11,12,12,13,17,17,17,10,10,
+	11,11,12,12,12,10,12,12,17,17,17,11,10,11,10,13,
+	12,11,12,12,12,17,17,17,15,14,11,11,12,11,13,10,
+	13,12,17,17,17,14,14,12,10,11,11,13,13,13,13,17,
+	17,16,17,16,13,13,12,10,13,10,14,13,17,16,17,16,
+	17,13,12,12,10,13,11,14,14,
 };
 
 static float _vq_quantthresh__44c2_s_p9_1[] = {
@@ -9191,24 +6789,24 @@
 };
 
 static long _vq_lengthlist__44c2_s_p9_2[] = {
-	 2, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9,
-	 9,10, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9,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, 9, 9, 9, 9,
-	 9, 9, 9, 9,10,10,10, 7, 7, 8, 8, 9, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9,10,11,10, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9,10,10,10, 7, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9,10,11,11, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10, 8, 8, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9,10,11,11,10,11,10, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,11,10, 9,
-	 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,10,11,11,
-	 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 9, 9,11,10,10,11,
-	10,10,11, 9, 9,10,10, 9, 9,10,10, 9, 9,10,10,10,
-	11,10,11,10,10, 9, 9,10, 9, 9, 9, 9, 9, 9,10,10,
-	10,10,11,10,10, 9,10, 9, 9, 9, 9,10, 9, 9, 9,10,
-	10,10,11,11,10,10,10,10, 9, 9,10, 9, 9, 9,10, 9,
-	10,10,10,10,11,10,11,11,10, 9, 9, 9, 9, 9, 9, 9,
+	 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,
+	 9, 9, 9,10, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
+	 9, 9, 9, 9,10,10,10, 8, 7, 8, 8, 8, 8, 9, 9, 9,
+	 9, 9, 9, 9, 9,10,11,11, 8, 8, 8, 8, 9, 9, 9, 9,
+	 9, 9,10, 9, 9, 9,10,11,10, 8, 8, 8, 8, 9, 9, 9,
+	 9, 9, 9, 9,10,10,10,10,11,10, 8, 8, 9, 9, 9, 9,
+	 9, 9,10, 9, 9,10, 9,10,11,10,11,11,11, 8, 8, 9,
+	 9, 9, 9, 9, 9, 9, 9,10,10,11,11,11,11,11, 9, 9,
+	 9, 9, 9, 9,10, 9, 9, 9,10,10,11,11,11,11,11, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,11,11,11,11,11,
+	 9, 9, 9, 9,10,10, 9, 9, 9,10,10,10,11,11,11,11,
+	11,11,11, 9, 9, 9,10, 9, 9,10,10,10,10,11,11,10,
+	11,11,11,11,10, 9,10,10, 9, 9, 9, 9,10,10,11,10,
+	11,11,11,11,11, 9, 9, 9, 9,10, 9,10,10,10,10,11,
+	10,11,11,11,11,11,10,10, 9, 9,10, 9,10,10,10,10,
+	10,10,10,11,11,11,11,11,11, 9, 9,10, 9,10, 9,10,
 	10,
 };
 
@@ -9242,13 +6840,13 @@
 };
 
 static long _huff_lengthlist__44c2_s_short[] = {
-	 9, 9,12,11,11,11,12,12,12,13, 6, 2, 9, 4, 7, 6,
-	 8,11,15,17,12, 7, 8, 9, 7, 9,10,13,15,17,11, 4,
-	12, 4, 9, 5, 8,11,16,17,12, 6, 7, 6, 6, 6, 8,11,
-	15,17,11, 5, 9, 5, 6, 5, 6,10,15,15,12, 7,11, 7,
-	 7, 6, 7,10,13,16,13, 8,11, 9, 8, 6, 7,10,12,16,
-	13, 9, 9, 8, 5, 5, 6, 9,12,14,16,10, 9, 9, 6, 5,
-	 6, 8,11,14,
+	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,
+	13,16,11, 4, 9, 5, 6, 4, 6,10,13,16,11, 6,11, 7,
+	 7, 6, 7,10,13,15,13, 9,12, 9, 8, 6, 8,10,12,14,
+	14,10,10, 8, 6, 5, 6, 9,11,13,15,11,11, 9, 6, 5,
+	 6, 8, 9,12,
 };
 
 static static_codebook _huff_book__44c2_s_short = {
@@ -9263,13 +6861,13 @@
 };
 
 static long _huff_lengthlist__44c3_s_long[] = {
-	 4, 5,11,10,12,10,10,10,11,12, 4, 2,11, 5,11, 6,
-	 7, 9,13,16,11,11, 7,11, 6, 8, 8, 9,11,12,10, 5,
-	11, 6,10, 7, 9,11,16,16,14, 9, 6, 9, 4, 5, 7, 8,
-	11,13,10, 6, 7, 7, 5, 5, 6, 8,10,11,10, 7, 8, 8,
-	 6, 6, 5, 7, 9,10,10, 9, 8,11, 8, 7, 6, 6, 7,10,
-	10,12,10,14, 9, 9, 7, 7, 7, 9,10,14,11,16,12,12,
-	 9, 8, 8, 9,
+	 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,
+	10,13,10, 5, 7, 7, 5, 5, 6, 8,10,11,10, 7, 7, 8,
+	 6, 5, 5, 7, 9, 9,11, 8, 8,11, 8, 7, 6, 6, 7, 9,
+	12,11,10,13, 9, 9, 7, 7, 7, 9,11,13,12,15,12,11,
+	 9, 8, 8, 8,
 };
 
 static static_codebook _huff_book__44c3_s_long = {
@@ -9290,17 +6888,17 @@
 };
 
 static long _vq_lengthlist__44c3_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,
+	 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,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0, 0,
-	 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 6, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
+	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 6, 8, 7, 0, 0,
 	 0, 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -9335,18 +6933,18 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 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, 7, 7, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0,
 	 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0, 0,
-	 0, 0, 0, 8, 9,10, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0,
+	 0, 0, 0, 8, 8, 9, 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0, 0,
 	 0, 0, 0, 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, 8, 8, 0, 0,
-	 0, 0, 0, 0, 8, 9, 8, 0, 0, 0, 0, 0, 0, 8, 9,10,
+	 0, 0, 0, 0, 7, 9, 8, 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -9381,18 +6979,18 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
+	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
 	 0, 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 8, 0, 0, 0, 0, 0, 0, 8,10, 9, 0,
-	 0, 0, 0, 0, 0, 8, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 6, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0,
+	 0, 0, 0, 0, 0, 7, 8, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9,
-	 0, 0, 0, 0, 0, 0, 8,10, 9, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 6, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9,
+	 0, 0, 0, 0, 0, 0, 8, 9, 8, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -9739,32 +7337,32 @@
 
 static long _vq_lengthlist__44c3_s_p2_0[] = {
 	 2, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0,
-	 8, 7, 0, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 8,
-	 7, 0, 0, 0, 7, 7, 0, 0, 0,10, 9, 0, 0, 0, 0, 0,
-	 0, 0, 5, 5, 6, 0, 0, 0, 7, 8, 0, 0, 0, 7, 7, 0,
-	 0, 0, 9,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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,
+	 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, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 7, 7, 0, 0,
-	 0, 7, 8, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 5,
+	 0, 7, 7, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 5,
 	 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 9,
 	 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, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 7, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7,
-	 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 5, 7, 8, 0,
+	 0, 0, 0, 5, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7,
+	 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0,
 	 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 9, 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, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 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, 9,10, 0, 0, 0, 9, 9, 0, 0, 0, 9, 9, 0, 0, 0,
-	10,10, 0, 0, 0, 0, 0, 0, 0, 8,10, 9, 0, 0, 0, 9,
+	 8,10,10, 0, 0, 0, 9, 9, 0, 0, 0, 9, 9, 0, 0, 0,
+	10,10, 0, 0, 0, 0, 0, 0, 0, 8,10,10, 0, 0, 0, 9,
 	 9, 0, 0, 0, 9, 9, 0, 0, 0,10,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, 0, 0, 0, 0, 0, 0, 0,
@@ -9815,13 +7413,13 @@
 };
 
 static long _vq_lengthlist__44c3_s_p3_0[] = {
-	 2, 3, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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,
-	 0, 0, 4, 4, 4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 8, 8,
+	 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, 0, 0, 6, 6, 6, 9, 9,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 6, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 6, 6, 7, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -9899,7 +7497,7 @@
 	 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,
-	 7, 7, 0, 0, 0, 0, 0, 0, 0, 8, 7, 0, 0, 0, 0, 0,
+	 7, 8, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0,
 	 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
 };
@@ -9944,12 +7542,12 @@
 };
 
 static long _vq_lengthlist__44c3_s_p5_0[] = {
-	 2, 3, 3, 5, 5, 7, 7, 9, 8, 0, 4, 4, 7, 7, 7, 7,
-	 9, 9, 0, 5, 5, 6, 7, 7, 7, 9, 9, 0, 6, 6, 7, 7,
-	 7, 7, 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0,
-	 8, 8, 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0,
-	 0, 0,10,10, 9, 9,10,10, 0, 0, 0, 0, 0, 9, 9,10,
-	10,
+	 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,
+	 9, 9, 9, 9,10,10, 0, 0, 0, 9, 9, 9, 9,10,10, 0,
+	 0, 0,10,10,10,10,11,11, 0, 0, 0, 0, 0,10,10,11,
+	11,
 };
 
 static float _vq_quantthresh__44c3_s_p5_0[] = {
@@ -10001,23 +7599,23 @@
 
 static long _vq_lengthlist__44c3_s_p6_0[] = {
 	 2, 3, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,
-	11, 0, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11,
-	11,11, 0, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,
-	11,11,11, 0, 6, 6, 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,11,12,12, 0, 0, 0, 8, 8, 8, 8, 9, 9,10, 9,
-	10,10,11,11,12,12, 0, 0, 0, 8, 8, 8, 8, 9, 9,10,
+	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,
+	10,11,11, 0, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,
+	11,11,11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,
+	10,11,11,11,12, 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,11,12,12, 0, 0, 0, 9, 9, 9, 9,10,10,
-	10,10,11,11,12,11,12,12, 0, 0, 0, 0, 0, 9, 9,10,
-	10,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 8, 8,
+	10,10,11,10,11,11,12,12, 0, 0, 0, 0, 0, 9, 9,10,
+	10,10,10,11,11,11,11,12,12, 0, 0, 0, 0, 0, 9, 8,
 	 9, 9,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 8,
-	 8, 9, 9,10,10,11,11,12,12,13,12, 0, 0, 0, 0, 0,
-	 9, 9,10,10,11,10,11,11,12,12,13,13, 0, 0, 0, 0,
+	 8, 9, 9,10,10,11,11,12,11,12,12, 0, 0, 0, 0, 0,
+	 9,10,10,10,11,11,11,11,12,12,13,13, 0, 0, 0, 0,
 	 0, 0, 0,10,10,10,10,11,11,12,12,13,13, 0, 0, 0,
-	 0, 0, 0, 0,10,10,11,11,12,12,12,12,13,13, 0, 0,
-	 0, 0, 0, 0, 0,10,10,11,11,11,11,12,12,13,13, 0,
-	 0, 0, 0, 0, 0, 0,11,11,12,12,12,12,12,13,13,13,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,12,12,12,12,13,
+	 0, 0, 0, 0,11,11,11,11,12,12,12,12,13,13, 0, 0,
+	 0, 0, 0, 0, 0,11,11,11,11,12,12,12,12,13,13, 0,
+	 0, 0, 0, 0, 0, 0,11,11,12,12,12,12,13,13,13,13,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,13,
 	13,
 };
 
@@ -10057,11 +7655,11 @@
 };
 
 static long _vq_lengthlist__44c3_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,10,10,10, 9, 9, 6, 9, 9,
-	10,10,10,10, 9, 9, 7,10,10,10,11,11,11,10,11, 6,
-	 9, 9,10,10, 9,11,10,10, 6, 9, 9,10, 9, 9,10,10,
+	 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,
+	11,10,10,11,10,10, 7,11,11,11,11,11,12,11,11, 6,
+	 9, 9,11,10,10,11,10,10, 6, 9, 9,11,10,10,11,10,
 	10,
 };
 
@@ -10106,14 +7704,14 @@
 };
 
 static long _vq_lengthlist__44c3_s_p7_1[] = {
-	 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6,
+	 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,
-	 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, 7, 8, 8, 8, 8,
-	 8, 8,10,10,10, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10,
+	 7, 8, 7, 8, 8, 8, 8,10,10,10, 8, 8, 8, 8, 8, 8,
+	 8, 8,10,10,10, 7, 8, 8, 8, 8, 8, 8, 8,10,10,10,
 	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,10,10, 8, 8, 8,
-	 8, 8, 8,10,10,10,10,10, 9, 9, 8, 8, 8, 8,10,10,
-	10,10,10, 8, 8, 8, 8, 8, 9,
+	 8, 8, 8,10,10,10,10,10, 9, 9, 8, 8, 9, 8,10,10,
+	10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
 static float _vq_quantthresh__44c3_s_p7_1[] = {
@@ -10161,17 +7759,17 @@
 };
 
 static long _vq_lengthlist__44c3_s_p8_0[] = {
-	 1, 4, 4, 6, 6, 7, 8, 8, 8, 9, 9,10,10, 6, 5, 5,
-	 7, 7, 8, 8, 9, 9, 9, 9,10,10, 7, 5, 5, 7, 7, 8,
-	 8, 9, 9, 9,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,
+	 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,
 	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
-	11, 0,11,12, 9, 9, 9,10,10,10,11,11,11,12, 0,13,
-	13, 9, 9, 9, 9,10,10,11,11,12,12, 0, 0, 0,10, 9,
-	 9, 9,10,11,11,11,12,12, 0, 0, 0,10,10, 9, 9,11,
-	11,11,11,12,13, 0, 0, 0,13,13,10,10,11,11,12,12,
-	13,13, 0, 0, 0,14,14,10,10,11,11,12,12,13,13, 0,
-	 0, 0, 0, 0,12,12,11,11,12,12,13,13, 0, 0, 0, 0,
-	 0,12,12,11,11,12,12,13,13,
+	11, 0,12,12, 9, 9,10,10,10,10,11,11,11,12, 0,13,
+	13, 9, 9,10,10,10,10,11,11,12,12, 0, 0, 0,10,10,
+	10,10,11,11,12,12,12,12, 0, 0, 0,10,10,10,10,11,
+	11,12,12,12,12, 0, 0, 0,14,14,11,11,11,11,12,12,
+	13,13, 0, 0, 0,14,14,11,11,11,11,12,12,13,13, 0,
+	 0, 0, 0, 0,12,12,12,12,13,13,14,13, 0, 0, 0, 0,
+	 0,13,13,12,12,13,12,14,13,
 };
 
 static float _vq_quantthresh__44c3_s_p8_0[] = {
@@ -10258,17 +7856,17 @@
 };
 
 static long _vq_lengthlist__44c3_s_p9_0[] = {
-	 1, 4, 4,10,10,10,10,10,10,10,10,10,10, 5,10, 7,
-	10,10,10,10,10,10,10,10,10,10, 5, 8, 6,10,10,10,
-	10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 8, 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, 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, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 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,
+	12,12,12,12,12,12,11,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	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,11,11,11,
+	11,11,11,11,11,11,11,11,11,
 };
 
 static float _vq_quantthresh__44c3_s_p9_0[] = {
@@ -10318,21 +7916,21 @@
 };
 
 static long _vq_lengthlist__44c3_s_p9_1[] = {
-	 1, 4, 4, 6, 6, 7, 7, 9, 9,11,11,11,12,12,12, 6,
-	 5, 5, 7, 7, 8, 8,10, 9,11,11,13,12,13,14, 6, 5,
-	 5, 7, 7, 8, 8,10,10,11,11,12,12,13,13,17, 7, 7,
-	 8, 8, 9, 9,10,10,12,12,14,13,14,14,17, 8, 7, 8,
-	 7, 9, 9,10,10,12,12,13,13,13,14,17,11,11, 8, 8,
-	10,10,11,11,12,12,13,13,15,14,17,11,11, 8, 7,10,
-	10,11,11,12,12,13,14,14,13,17,17,17,10,11,10,10,
-	12,12,13,12,13,13,14,14,17,16,16,10,10,11, 9,13,
-	12,13,13,13,13,14,14,16,16,15,13,15,11,12,12,12,
-	14,14,14,14,14,15,16,16,16,14,14,11, 9,12,10,13,
-	13,14,14,14,14,16,16,16,16,16,12,13,12,12,13,14,
-	14,14,15,15,15,16,16,15,16,13,11,13,10,14,12,15,
-	14,16,14,15,16,16,16,16,15,15,13,13,13,13,14,14,
-	16,16,16,16,16,15,16,16,14,13,12,13,13,14,16,16,
-	16,
+	 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,
+	 8, 8, 9, 9,10, 9,11,10,12,12,13,13,18, 8, 8, 8,
+	 8, 9, 9,10,10,11,11,13,12,14,13,18,11,11, 9, 9,
+	10,10,11,11,11,12,13,12,13,14,18,11,11, 9, 8,11,
+	10,11,11,11,11,12,12,14,13,18,18,18,10,11,10,11,
+	12,12,12,12,13,12,14,13,18,18,18,10,11,11, 9,12,
+	11,12,12,12,13,13,13,18,18,17,14,14,11,11,12,12,
+	13,12,14,12,14,13,18,18,18,14,14,11,10,12, 9,12,
+	13,13,13,13,13,18,18,17,16,18,13,13,12,12,13,11,
+	14,12,14,14,17,18,18,17,18,13,12,13,10,12,11,14,
+	14,14,14,17,18,18,18,18,15,16,12,12,13,10,14,12,
+	14,15,18,18,18,16,17,16,14,12,11,13,10,13,13,14,
+	15,
 };
 
 static float _vq_quantthresh__44c3_s_p9_1[] = {
@@ -10384,25 +7982,25 @@
 };
 
 static long _vq_lengthlist__44c3_s_p9_2[] = {
-	 3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9,
-	 8,10, 5, 5, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9,10, 5, 5, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9,
+	 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,
 	 9, 9, 9,10, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9,10,10,10, 7, 7, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9,10,10,10, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9,10,10,10, 8, 7, 8, 8, 9, 8, 9,
-	 9, 9, 9, 9, 9, 9, 9,10,10,10, 8, 8, 8, 8, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,11,10, 8, 8, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,11, 8,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,11,10,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,
-	10,10,11, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,
-	11,10,11,10, 9, 9, 9,10, 9, 9, 9, 9, 9, 9,10,10,
-	10,10,11,11,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9,10, 9,
-	10,10,10,10,11,10,11,10,10, 9, 9, 9, 9, 9, 9, 9,
-	 9,
+	 9, 9, 9, 9,10,10,10, 7, 7, 8, 8, 8, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9,11,11,11, 8, 8, 8, 8, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9,10,10,10, 8, 8, 8, 8, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9,10,10,10, 8, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9,10, 9,10,10,10,11,11, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9,11,10,11,11,11, 9, 9,
+	 9, 9, 9, 9,10,10, 9, 9,10, 9,11,10,11,11,11, 9,
+	 9, 9, 9, 9, 9, 9, 9,10,10,10, 9,11,11,11,11,11,
+	 9, 9, 9, 9,10,10, 9, 9, 9, 9,10, 9,11,11,11,11,
+	11,11,11, 9, 9, 9, 9, 9, 9,10,10,10,10,11,11,11,
+	11,11,11,11,10, 9,10,10, 9,10, 9, 9,10, 9,11,10,
+	10,11,11,11,11, 9,10, 9, 9, 9, 9,10,10,10,10,11,
+	11,11,11,11,11,10,10,10, 9, 9,10, 9,10, 9,10,10,
+	10,10,11,11,11,11,11,11,11, 9, 9, 9, 9, 9,10,10,
+	10,
 };
 
 static float _vq_quantthresh__44c3_s_p9_2[] = {
@@ -10435,13 +8033,13 @@
 };
 
 static long _huff_lengthlist__44c3_s_short[] = {
-	10,10,13,12,13,12,12,12,12,13, 8, 3,11, 5,10, 5,
-	 7,11,14,16,11, 6, 9, 8, 7, 7, 9,12,15,16,12, 4,
-	12, 4,10, 5, 8,12,15,16,12, 6, 8, 7, 5, 5, 7,11,
-	14,15,11, 4, 9, 4, 6, 4, 6, 9,13,15,10, 6,10, 7,
-	 7, 5, 6, 9,13,15,12, 9,11, 9, 8, 6, 7, 9,12,15,
-	13,11,10, 9, 6, 5, 5, 8,11,14,16,12,11,10, 6, 5,
-	 6, 8,10,14,
+	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,
+	12,16,10, 4, 8, 5, 6, 4, 6, 9,13,16,10, 6,10, 7,
+	 7, 6, 7, 9,13,15,12, 9,11, 9, 8, 6, 7,10,12,14,
+	14,11,10, 9, 6, 5, 6, 9,11,13,15,13,11,10, 6, 5,
+	 6, 8, 9,11,
 };
 
 static static_codebook _huff_book__44c3_s_short = {
@@ -10456,13 +8054,13 @@
 };
 
 static long _huff_lengthlist__44c4_s_long[] = {
-	 3, 5,11,11,13,11,11,11,12,12, 5, 2,11, 6,10, 7,
-	 8,10,13,16,10, 9, 6,10, 6, 7, 8, 9,11,12,11, 5,
-	11, 7,10, 8,10,12,15,17,12, 8, 5, 9, 4, 5, 7, 8,
-	10,12,10, 6, 7, 8, 5, 5, 6, 8,10,11,10, 8, 8, 9,
-	 6, 6, 6, 7, 9,10,11,10, 9,11, 8, 7, 6, 6, 7, 9,
-	11,13,10,15, 9, 9, 7, 7, 7, 8,10,15,11,17,11,11,
-	 9, 8, 7, 8,
+	 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,
+	10,11,10, 6, 7, 7, 5, 5, 6, 8, 9,11,10, 7, 8, 9,
+	 6, 6, 6, 7, 8, 9,11, 9, 9,11, 7, 7, 6, 6, 7, 9,
+	12,12,10,13, 9, 8, 7, 7, 7, 8,11,13,11,14,11,10,
+	 9, 8, 7, 7,
 };
 
 static static_codebook _huff_book__44c4_s_long = {
@@ -10483,17 +8081,17 @@
 };
 
 static long _vq_lengthlist__44c4_s_p1_0[] = {
-	 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 7, 6, 0, 0, 0, 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,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0, 0,
-	 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 6, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 0, 0, 0, 6, 8, 8, 0, 0,
+	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 6, 8, 7, 0, 0,
 	 0, 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -10528,18 +8126,18 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 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, 7, 7, 0, 0, 0, 0,
-	 0, 0, 7, 9, 8, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0,
+	 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 8, 0, 0, 0,
-	 0, 0, 0, 8, 9,10, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0, 0,
+	 0, 0, 0, 8, 9, 9, 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0, 0,
 	 0, 0, 0, 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, 8, 8, 0, 0,
-	 0, 0, 0, 0, 8,10, 8, 0, 0, 0, 0, 0, 0, 8, 9,10,
+	 0, 0, 0, 0, 8, 9, 8, 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -10579,13 +8177,13 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 8, 0, 0, 0, 0, 0, 0, 8,10, 9, 0,
-	 0, 0, 0, 0, 0, 8, 8,10, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 6, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0,
+	 0, 0, 0, 0, 0, 8, 8, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 7, 8, 9, 0, 0, 0, 0, 0, 0, 8, 9, 9,
-	 0, 0, 0, 0, 0, 0, 8,10, 9, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9,
+	 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -10932,7 +8530,7 @@
 
 static 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, 8,
+	 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,
 	 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, 0, 0, 0, 0, 0, 0, 0,
@@ -10940,16 +8538,16 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 7, 7, 0, 0,
+	 0, 0, 0, 0, 0, 0, 5, 8, 7, 0, 0, 0, 7, 7, 0, 0,
 	 0, 7, 7, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 5,
-	 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 9,
+	 7, 8, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 9,
 	 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, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 7, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7,
-	 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 5, 7, 8, 0,
+	 0, 0, 0, 5, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7,
+	 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0,
 	 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 9, 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, 0, 0, 0, 0,
@@ -10957,7 +8555,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, 0, 0, 0, 0, 0,
 	 7,10,10, 0, 0, 0, 9, 9, 0, 0, 0, 9, 9, 0, 0, 0,
-	10,10, 0, 0, 0, 0, 0, 0, 0, 7,10,10, 0, 0, 0, 9,
+	10,10, 0, 0, 0, 0, 0, 0, 0, 8,10,10, 0, 0, 0, 9,
 	 9, 0, 0, 0, 9, 9, 0, 0, 0,10,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, 0, 0, 0, 0, 0, 0, 0,
@@ -11008,13 +8606,13 @@
 };
 
 static long _vq_lengthlist__44c4_s_p3_0[] = {
-	 2, 3, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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,
-	 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, 0, 0, 6, 6, 6, 7, 7,
+	 0, 0, 4, 4, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 9, 9,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 6, 6, 6, 7, 7, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 6, 6, 7, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -11137,12 +8735,12 @@
 };
 
 static long _vq_lengthlist__44c4_s_p5_0[] = {
-	 2, 3, 3, 6, 6, 7, 7, 9, 9, 0, 4, 4, 7, 7, 7, 7,
-	 9, 9, 0, 4, 4, 7, 7, 7, 7, 9, 9, 0, 6, 6, 7, 7,
-	 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0,
-	 8, 8, 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0,
-	 0, 0,10,10, 9, 9,11,11, 0, 0, 0, 0, 0, 9, 9,11,
-	11,
+	 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,
+	 9, 8, 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0,
+	 0, 0,10,10, 9, 9,11,11, 0, 0, 0, 0, 0, 9, 9,10,
+	10,
 };
 
 static float _vq_quantthresh__44c4_s_p5_0[] = {
@@ -11193,24 +8791,24 @@
 };
 
 static long _vq_lengthlist__44c4_s_p6_0[] = {
-	 2, 4, 4, 6, 6, 8, 8, 8, 8, 9, 9,10, 9,10,10,11,
-	11, 0, 4, 4, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11,
-	11,11, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,
-	11,12,12, 0, 6, 6, 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,11,12,12, 0, 0, 0, 8, 8, 8, 8, 9, 9,10, 9,
-	10,11,11,11,12,12, 0, 0, 0, 8, 8, 8, 8, 9, 9,10,
-	10,11,10,11,11,12,12, 0, 0, 0, 9, 9, 9, 9,10,10,
+	 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,
+	11,11,11, 0, 6, 6, 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,11,12,12, 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,11,12,12, 0, 0, 0, 9, 9, 9, 9,10,10,
 	10,10,11,11,11,11,12,12, 0, 0, 0, 0, 0, 9, 9,10,
-	10,10,10,11,11,12,11,12,12, 0, 0, 0, 0, 0, 8, 8,
-	 9, 9,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 8,
-	 8, 9, 9,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0,
-	 9, 9,10,10,11,10,11,11,12,12,12,12, 0, 0, 0, 0,
-	 0, 0, 0,10,10,10,10,11,11,12,12,13,12, 0, 0, 0,
-	 0, 0, 0, 0,11,11,11,11,11,12,12,12,13,12, 0, 0,
-	 0, 0, 0, 0, 0,11,11,11,11,11,11,12,12,13,13, 0,
-	 0, 0, 0, 0, 0, 0,11,11,12,12,12,12,12,12,13,13,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,12,12,12,12,13,
+	10,10,10,11,11,11,11,12,12, 0, 0, 0, 0, 0, 9, 9,
+	 9,10,10,10,11,11,11,11,12,12, 0, 0, 0, 0, 0, 9,
+	 9, 9, 9,10,10,11,11,11,12,12,12, 0, 0, 0, 0, 0,
+	10,10,10,10,11,11,11,11,12,12,13,12, 0, 0, 0, 0,
+	 0, 0, 0,10,10,11,11,11,11,12,12,12,12, 0, 0, 0,
+	 0, 0, 0, 0,11,11,11,11,12,12,12,12,13,13, 0, 0,
+	 0, 0, 0, 0, 0,11,11,11,11,12,12,12,12,13,13, 0,
+	 0, 0, 0, 0, 0, 0,12,12,12,12,12,12,13,13,13,13,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,12,13,13,
 	13,
 };
 
@@ -11250,11 +8848,11 @@
 };
 
 static long _vq_lengthlist__44c4_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,10,10,10,10, 9, 6, 9, 9,
-	10, 9,10,11, 9, 9, 7,10,10,11,11,11,11,10,10, 6,
-	 9, 9,10, 9, 9,10,10, 9, 6, 9, 9,10,10,10,10,10,
+	 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,
+	11,10,10,11,10,10, 7,11,11,12,11,11,12,11,11, 6,
+	 9, 9,11,10,10,11,10,10, 6, 9, 9,11,10,10,11,10,
 	10,
 };
 
@@ -11299,14 +8897,14 @@
 };
 
 static long _vq_lengthlist__44c4_s_p7_1[] = {
-	 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6,
+	 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,
-	 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, 7, 8, 8, 8, 8,
+	 7, 8, 8, 8, 8, 8, 8,10,10,10, 8, 7, 8, 8, 8, 8,
 	 8, 8,10,10,10, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10,
 	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,10,10, 8, 8, 8,
-	 8, 8, 8,10,10,10,10,10, 9, 9, 8, 8, 8, 9,10,10,
-	10,10,10, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8,10,10,10,10,10, 9, 9, 8, 8, 9, 8,10,10,
+	10,10,10, 8, 8, 8, 8, 9, 9,
 };
 
 static float _vq_quantthresh__44c4_s_p7_1[] = {
@@ -11354,17 +8952,17 @@
 };
 
 static long _vq_lengthlist__44c4_s_p8_0[] = {
-	 1, 4, 4, 6, 6, 8, 8, 8, 8, 9, 9,10,10, 6, 5, 5,
-	 7, 7, 8, 8, 9, 9,10,10,11,11, 7, 5, 5, 7, 7, 8,
+	 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,
 	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
-	11, 0,12,12, 9, 9, 9, 9,10,10,10,10,11,11, 0,12,
-	12, 9, 8, 9, 9,10,10,11,11,12,11, 0, 0, 0, 9,10,
-	 9, 9,10,10,11,11,12,12, 0, 0, 0,10,10, 9, 9,10,
-	10,11,11,12,12, 0, 0, 0,13,13,10,10,10,11,12,12,
-	12,12, 0, 0, 0,14,14,10,10,11,11,11,11,12,12, 0,
-	 0, 0, 0, 0,11,12,11,11,12,12,12,13, 0, 0, 0, 0,
-	 0,12,12,11,11,12,12,13,13,
+	11, 0,12,12, 9, 9, 9, 9,10,10,10,10,11,11, 0,13,
+	13, 9, 9,10, 9,10,10,11,11,11,12, 0, 0, 0,10,10,
+	10,10,10,10,11,11,12,12, 0, 0, 0,10,10,10,10,10,
+	10,11,11,12,12, 0, 0, 0,14,14,11,11,11,11,12,12,
+	12,12, 0, 0, 0,14,14,11,11,11,11,12,12,12,13, 0,
+	 0, 0, 0, 0,12,12,12,12,12,12,13,13, 0, 0, 0, 0,
+	 0,13,12,12,12,12,12,13,13,
 };
 
 static float _vq_quantthresh__44c4_s_p8_0[] = {
@@ -11404,7 +9002,7 @@
 };
 
 static long _vq_lengthlist__44c4_s_p8_1[] = {
-	 2, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 4, 5, 5, 5, 6,
+	 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,
 };
 
@@ -11451,17 +9049,17 @@
 };
 
 static long _vq_lengthlist__44c4_s_p9_0[] = {
-	 1, 3, 3,10,10,10,10,10,10,10,10,10,10, 5, 7, 7,
-	10,10,10,10,10,10,10,10,10,10, 5, 7, 8,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,
-	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,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,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, 9, 9, 9, 9,
+	 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,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,
 };
 
 static float _vq_quantthresh__44c4_s_p9_0[] = {
@@ -11511,20 +9109,20 @@
 };
 
 static long _vq_lengthlist__44c4_s_p9_1[] = {
-	 1, 4, 4, 5, 6, 7, 7, 9, 9,11,11,12,12,12,13, 6,
-	 5, 5, 6, 7, 8, 8,10,10,11,11,13,13,13,13, 6, 5,
-	 5, 7, 7, 8, 8,11,10,11,11,12,13,12,13,17, 7, 7,
-	 8, 8, 9, 9,11,11,12,12,12,13,15,14,17, 7, 7, 8,
-	 8, 9, 9,11,10,12,12,13,13,14,13,17,11,12, 9, 9,
-	10,10,12,12,13,13,14,14,14,14,17,12,11, 9, 8,11,
-	10,11,12,13,13,13,14,14,14,17,17,17,11,11,11,11,
-	13,13,13,13,14,13,15,14,17,17,17,11,10,11, 9,13,
-	12,13,14,15,14,15,14,17,17,17,14,14,11,12,12,13,
-	14,14,16,15,15,15,17,17,17,15,15,12,11,13,11,13,
-	13,13,15,16,14,17,17,17,17,17,13,13,14,13,14,14,
-	15,15,16,15,17,17,17,17,17,14,14,14,12,14,12,16,
-	14,15,14,17,17,17,17,17,16,17,13,14,14,15,15,15,
-	17,15,17,17,17,17,17,16,17,13,14,14,14,15,17,15,
+	 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,
+	 8, 8, 9, 9,10,10,12,11,12,12,13,13,19, 8, 8, 8,
+	 8, 9, 9,11,11,12,12,13,13,13,13,19,12,12, 9, 9,
+	11,11,11,11,12,11,13,12,13,13,18,12,12, 9, 9,11,
+	10,11,11,12,12,12,13,13,14,19,18,18,11,11,11,11,
+	12,12,13,12,13,13,14,14,16,18,18,11,11,11,10,12,
+	11,13,13,13,13,13,14,17,18,18,14,15,11,12,12,13,
+	13,13,13,14,14,14,18,18,18,15,15,12,10,13,10,13,
+	13,13,13,13,14,18,17,18,17,18,12,13,12,13,13,13,
+	14,14,16,14,18,17,18,18,17,13,12,13,10,12,12,14,
+	14,14,14,17,18,18,18,18,14,15,12,12,13,12,14,14,
+	15,15,18,18,18,17,18,15,14,12,11,12,12,14,14,14,
 	15,
 };
 
@@ -11581,33 +9179,33 @@
 };
 
 static long _vq_lengthlist__44c4_s_p9_2[] = {
-	 3, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9,11, 5, 5, 7, 7, 7, 7, 8, 8, 8, 8,
-	 9, 9, 9, 9, 9, 9, 9, 9,10,10,11, 5, 5, 7, 7, 7,
-	 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11,
-	 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,10,10,
-	10,10,10,10,11,11,11, 7, 7, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9,10,10,10,10,10,10,11,11,11, 8, 8, 8, 8,
-	 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,11,11,
-	11, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,
-	10,10,10,11,11,11, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9,
-	10,10,10,10,10,10,10,10,11,11,11,11,11, 8, 8, 9,
-	 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,11,11,11,
-	11,11, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,
-	10,10,11,11,11,11,11, 9, 9, 9, 9, 9,10,10,10,10,
-	10,10,10,10,10,10,10,11,11,11,11,11, 9, 9, 9, 9,
-	10,10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,
-	11,11,11, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,
-	10,11,11,11,11,11,11,11,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,11,11,11,11,11,11,11,10,10, 9,
-	10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,
+	 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,
+	 8, 8, 8, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,11,
+	 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9,10,10,10,
+	10,10,10,10,12,11,11, 7, 7, 8, 8, 9, 9, 9, 9, 9,
+	 9,10,10,10,10,10,10,10,10,12,11,12, 8, 8, 8, 8,
+	 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,11,11,
+	11, 8, 8, 8, 8, 9, 9, 9, 9,10,10,10,10,10,10,10,
+	10,10,10,11,11,12, 9, 9, 9, 9, 9, 9,10, 9,10,10,
+	10,10,10,10,10,10,10,10,11,11,11,11,11, 9, 9, 9,
+	 9,10,10,10,10,10,10,10,10,10,10,10,10,11,12,11,
+	11,11, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,11,11,11,11,11, 9, 9, 9, 9,10,10,10,10,10,
+	10,10,10,10,10,10,10,11,11,11,12,12,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,11,12,11,12,
+	11,11,11, 9,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,11,12,11,11,11,11,11,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,11,11,11,12,11,11,11,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,12,11,11,12,11,
 	11,11,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
 	11,11,11,11,11,11,11,11,11,10,10,10,10,10,10,10,
-	10,10,10,10,10,11,11,11,11,11,11,11,11,11,10,10,
-	10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,
-	12,11,11,10,10,10,10,10,10,10,10,10,10,10,10,12,
-	11,12,12,11,11,11,11,11,10,10,10,10,10,10,10,10,
-	10,10,10,10,11,11,11,11,11,11,11,11,11,11,11,10,
+	10,10,10,10,10,11,11,11,11,12,12,11,11,11,11,11,
+	11,11,10,10,10,10,10,10,10,10,12,12,12,11,11,11,
+	12,11,11,11,10,10,10,10,10,10,10,10,10,10,10,12,
+	11,12,12,12,12,12,11,12,11,11,10,10,10,10,10,10,
+	10,10,10,10,12,12,12,12,11,11,11,11,11,11,11,10,
 	10,10,10,10,10,10,10,10,10,
 };
 
@@ -11642,13 +9240,13 @@
 };
 
 static long _huff_lengthlist__44c4_s_short[] = {
-	 4, 9,13,12,16,11,12,15,15,16, 4, 2,11, 5,10, 6,
-	 8,11,14,14,13,11, 8,11, 7, 8,10,13,17,17,10, 4,
-	11, 5, 9, 6, 9,13,17,17,13, 9, 6, 9, 5, 5, 7,11,
-	15,17,10, 5, 7, 6, 5, 4, 7,10,15,15,10, 7, 9, 8,
-	 7, 6, 7,10,14,13,13,10,11,10, 8, 7, 8,10,14,14,
-	12,11,10, 9, 6, 5, 6, 9,13,17,14,13,11,10, 6, 6,
-	 6, 8,11,16,
+	 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,
+	12,13, 9, 5, 7, 6, 5, 5, 7,10,13,13,10, 8, 9, 8,
+	 7, 6, 8,10,14,14,13,11,10,10, 7, 7, 8,11,14,15,
+	13,12, 9, 9, 6, 5, 7,10,14,17,15,13,11,10, 6, 6,
+	 7, 9,12,17,
 };
 
 static static_codebook _huff_book__44c4_s_short = {
@@ -11663,12 +9261,12 @@
 };
 
 static long _huff_lengthlist__44c5_s_long[] = {
-	 3, 6, 9,14,11,13,12,12,12,12, 6, 3, 5, 8, 6, 8,
-	10,11,12,14, 9, 5, 4,10, 5, 7, 8, 9,11,12,13, 8,
-	10, 9, 9, 9,12,15,16,17,10, 6, 5, 9, 3, 5, 6, 8,
-	10,12,10, 8, 7, 9, 5, 5, 6, 8,10,11,10, 9, 8,11,
-	 6, 6, 6, 7, 8,10,12,11, 9,13, 8, 7, 6, 6, 7, 9,
-	11,13,10,15, 9, 9, 7, 7, 7, 8,10,15,10,17,11,10,
+	 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,
+	10,11,11, 8, 6, 9, 5, 5, 6, 7, 9,11,12, 9, 7,11,
+	 6, 6, 6, 7, 8,10,12,11, 9,12, 7, 7, 6, 6, 7, 9,
+	13,12,10,13, 9, 8, 7, 7, 7, 8,11,15,11,15,11,10,
 	 9, 8, 7, 7,
 };
 
@@ -11690,7 +9288,7 @@
 };
 
 static long _vq_lengthlist__44c5_s_p1_0[] = {
-	 2, 4, 4, 0, 0, 0, 0, 0, 0, 4, 7, 6, 0, 0, 0, 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,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -11700,7 +9298,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, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 7, 9, 8, 0, 0,
+	 0, 0, 4, 7, 7, 0, 0, 0, 0, 0, 0, 7, 9, 8, 0, 0,
 	 0, 0, 0, 0, 7, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -11736,7 +9334,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, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 7, 7, 0, 0, 0, 0,
-	 0, 0, 7, 9, 8, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
+	 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 7, 9, 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, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -11745,7 +9343,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, 0, 0, 0, 0, 0,
 	 0, 0, 0, 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, 9, 8, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
 	 0, 0, 0, 0, 8,10, 9, 0, 0, 0, 0, 0, 0, 9,10,11,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -11782,11 +9380,11 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
-	 0, 0, 0, 0, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 7, 9, 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, 0, 0, 0, 0, 0, 0, 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, 9, 8, 0, 0, 0, 0, 0, 0, 9,11,10, 0,
+	 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 9,11,10, 0,
 	 0, 0, 0, 0, 0, 8, 9,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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -12138,34 +9736,34 @@
 };
 
 static long _vq_lengthlist__44c5_s_p2_0[] = {
-	 2, 4, 4, 0, 0, 0, 6, 5, 0, 0, 0, 5, 5, 0, 0, 0,
-	 7, 7, 0, 0, 0, 0, 0, 0, 0, 4, 6, 5, 0, 0, 0, 8,
-	 7, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0,
-	 0, 0, 4, 5, 6, 0, 0, 0, 7, 8, 0, 0, 0, 7, 8, 0,
-	 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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,
+	 0, 0, 4, 6, 6, 0, 0, 0, 8, 8, 0, 0, 0, 7, 8, 0,
+	 0, 0,10,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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 7, 0, 0, 0, 8, 8, 0, 0,
-	 0, 8, 8, 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 6,
+	 0, 8, 8, 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 5,
 	 7, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0,10,
 	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, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 7, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8,
-	 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 6, 7, 8, 0,
+	 0, 0, 0, 5, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8,
+	 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 5, 8, 8, 0,
 	 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0,10,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, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 7, 9, 9, 0, 0, 0,10,10, 0, 0, 0,10,10, 0, 0, 0,
-	10,10, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0, 0,10,
-	10, 0, 0, 0,10,10, 0, 0, 0,10,10, 0, 0, 0, 0, 0,
+	 8,10,10, 0, 0, 0,10,10, 0, 0, 0, 9,10, 0, 0, 0,
+	11,10, 0, 0, 0, 0, 0, 0, 0, 8,10,10, 0, 0, 0,10,
+	10, 0, 0, 0,10,10, 0, 0, 0,10,11, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -12215,13 +9813,13 @@
 };
 
 static long _vq_lengthlist__44c5_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,
+	 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,
-	 0, 0, 4, 4, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 7, 7,
+	 0, 0, 3, 5, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 8, 8,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 6, 6, 6, 7, 7, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 5, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -12299,7 +9897,7 @@
 	 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,
-	 8, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0,
+	 7, 7, 0, 0, 0, 0, 0, 0, 0, 8, 7, 0, 0, 0, 0, 0,
 	 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
 };
@@ -12344,10 +9942,10 @@
 };
 
 static long _vq_lengthlist__44c5_s_p5_0[] = {
-	 2, 3, 4, 5, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7,
+	 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,
-	 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0,
-	 7, 7, 8, 8,10,10, 0, 0, 0, 7, 8, 8, 8,10,10, 0,
+	 7, 7, 9, 9, 0, 0, 0, 7, 6, 7, 7, 9, 9, 0, 0, 0,
+	 8, 8, 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0,
 	 0, 0, 9, 9, 9, 9,10,10, 0, 0, 0, 0, 0, 9, 9,10,
 	10,
 };
@@ -12400,23 +9998,23 @@
 };
 
 static long _vq_lengthlist__44c5_s_p6_0[] = {
-	 2, 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,11,
+	 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,
-	11,12,12, 0, 6, 6, 7, 7, 8, 8, 9,10,10,10,11,11,
-	11,12,12,12, 0, 0, 0, 7, 7, 8, 8,10,10,10,10,11,
-	11,12,12,12,12, 0, 0, 0, 7, 7, 9, 9,10,10,10,10,
-	11,11,12,12,12,12, 0, 0, 0, 7, 7, 8, 9,10,10,10,
-	10,11,11,12,12,12,13, 0, 0, 0, 8, 8, 9, 9,10,10,
-	10,10,11,11,12,12,13,12, 0, 0, 0, 0, 0, 9, 9,10,
-	10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 8, 8,
-	 9, 9,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 8,
-	 8, 9, 9,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0,
-	 9, 9,10,10,11,11,11,12,12,12,13,13, 0, 0, 0, 0,
-	 0, 0, 0,10,10,11,11,11,12,12,12,13,13, 0, 0, 0,
+	11,12,12, 0, 6, 6, 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,11,12,12, 0, 0, 0, 7, 7, 9, 9,10,10,10,10,
+	11,11,11,11,12,12, 0, 0, 0, 7, 7, 8, 9,10,10,10,
+	10,11,11,11,11,12,12, 0, 0, 0, 8, 8, 9, 9,10,10,
+	10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 9, 9,10,
+	10,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 9, 9,
+	10,10,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 9,
+	 9, 9,10,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0,
+	10,10,10,10,11,11,11,12,12,12,13,13, 0, 0, 0, 0,
+	 0, 0, 0,10,10,11,11,11,11,12,12,13,13, 0, 0, 0,
 	 0, 0, 0, 0,11,11,11,11,12,12,12,13,13,13, 0, 0,
-	 0, 0, 0, 0, 0,11,11,11,11,12,12,13,12,13,13, 0,
-	 0, 0, 0, 0, 0, 0,11,11,12,12,12,12,13,13,13,13,
+	 0, 0, 0, 0, 0,11,11,11,11,12,12,12,12,13,13, 0,
+	 0, 0, 0, 0, 0, 0,12,12,12,12,13,12,13,13,13,13,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,13,
 	13,
 };
@@ -12457,12 +10055,12 @@
 };
 
 static long _vq_lengthlist__44c5_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,10, 9,11,10,10, 6, 9, 9,
-	10, 9,10,11,10, 9, 7,10,10,11,11,11,11,10,10, 6,
-	 9, 9,10,10, 9,10, 9, 9, 6, 9, 9,10,10,10,11, 9,
-	 9,
+	 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,
+	11,10,10,11,10,10, 7,11,11,12,11,11,12,11,11, 6,
+	 9, 9,11,10,10,11,10,10, 6, 9, 9,11,10,10,11,10,
+	10,
 };
 
 static float _vq_quantthresh__44c5_s_p7_0[] = {
@@ -12511,8 +10109,8 @@
 	 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7,
 	 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, 7, 8, 8, 8, 8,
 	 8, 8,10,10,10, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10,
-	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,10,10, 8, 8, 8,
-	 8, 8, 8,10,10,10,10,10, 9, 9, 8, 8, 9, 8,10,10,
+	 8, 8, 8, 8, 8, 8, 8, 9,10,10,10,10,10, 8, 8, 8,
+	 8, 8, 8,10,10,10,10,10, 9, 9, 8, 8, 8, 8,10,10,
 	10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
@@ -12561,17 +10159,17 @@
 };
 
 static long _vq_lengthlist__44c5_s_p8_0[] = {
-	 1, 4, 4, 6, 6, 8, 8, 8, 8, 9, 9,10,10, 6, 5, 5,
-	 7, 7, 8, 8, 9, 9,10,10,10,10, 7, 5, 5, 7, 7, 8,
-	 8, 9, 9,10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,
+	 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,
 	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
-	11, 0,11,12, 9, 9, 9, 9, 9,10,10,10,11,11, 0,13,
-	12, 9, 9, 9, 9,10,10,11,11,11,11, 0, 0, 0, 9,10,
-	 9, 9,10,10,11,11,12,11, 0, 0, 0,10,10, 9, 9,10,
-	10,11,11,12,12, 0, 0, 0,13,13,10,10,11,11,11,12,
-	12,12, 0, 0, 0,14,14,10,10,11,11,11,11,12,12, 0,
-	 0, 0, 0, 0,12,12,11,11,12,12,13,13, 0, 0, 0, 0,
-	 0,12,12,11,11,12,12,13,13,
+	11, 0,12,12, 9, 9, 9,10,10,10,10,10,11,11, 0,13,
+	13, 9, 9, 9, 9,10,10,11,11,11,11, 0, 0, 0,10,10,
+	10,10,10,10,11,11,11,11, 0, 0, 0,10,10,10,10,10,
+	10,11,11,12,12, 0, 0, 0,14,14,11,11,11,11,12,12,
+	12,12, 0, 0, 0,14,14,11,11,11,11,12,12,12,12, 0,
+	 0, 0, 0, 0,12,12,12,12,12,12,13,13, 0, 0, 0, 0,
+	 0,12,12,12,12,12,12,13,13,
 };
 
 static float _vq_quantthresh__44c5_s_p8_0[] = {
@@ -12660,21 +10258,21 @@
 };
 
 static long _vq_lengthlist__44c5_s_p9_0[] = {
-	 1, 3, 3,11,11,11,11,11,11,11,11,11,11,11,11, 5,
-	 7, 7,11,11,11,11,11,11,11,11,11,11,11,11, 5, 9,
-	 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,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,11,11,11,11,11,11,11,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,
-	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,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,10,10,10,10,10,10,10,10,10,10,
-	10,
+	 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,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,12,12,12,12,12,12,12,
+	12,
 };
 
 static float _vq_quantthresh__44c5_s_p9_0[] = {
@@ -12726,24 +10324,24 @@
 };
 
 static long _vq_lengthlist__44c5_s_p9_1[] = {
-	 1, 4, 4, 6, 6, 8, 7, 9, 9,10,10,11,11,12,12,13,
-	13, 6, 5, 5, 6, 6, 8, 8,10,10,11,11,12,12,13,13,
-	13,13, 6, 5, 5, 7, 7, 8, 8,10,10,11,11,12,12,13,
-	13,13,13,18, 7, 7, 8, 8, 9, 9,10,11,11,11,12,12,
-	13,13,13,14,18, 7, 7, 8, 8, 9, 9,11,10,12,12,13,
-	13,13,13,14,15,18,12,12, 9, 9,10,10,11,11,12,12,
-	13,13,13,14,14,14,18,12,12, 9, 8,10,10,11,11,12,
-	12,14,13,13,14,15,15,18,16,18,11,11,11,11,12,12,
-	13,13,13,14,14,14,14,15,17,18,17,11,10,11, 9,12,
-	13,13,13,14,14,13,14,14,14,18,18,18,13,14,11,12,
-	12,12,13,14,13,13,14,15,16,15,18,18,18,15,13,12,
-	 9,12,11,13,14,14,15,14,14,16,14,18,18,18,18,18,
-	12,13,13,13,13,14,15,14,15,15,15,15,18,18,18,18,
-	17,14,12,13,11,14,12,15,14,14,15,16,15,18,18,18,
-	17,18,15,18,13,13,14,13,15,14,16,15,17,16,18,18,
-	17,18,18,15,17,14,13,14,12,14,14,15,15,15,15,18,
-	18,18,17,17,18,18,14,15,14,14,14,14,15,14,16,16,
-	17,18,18,18,18,17,17,15,15,13,13,15,13,15,13,15,
+	 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,
+	12,13,13,18, 8, 8, 8, 8, 9, 9,10,11,11,11,12,11,
+	13,11,13,12,18, 8, 8, 8, 8,10,10,11,11,12,12,13,
+	13,13,13,13,14,18,12,12, 9, 9,11,11,11,11,12,12,
+	13,12,13,12,13,13,20,13,12, 9, 9,11,11,11,11,12,
+	12,13,13,13,14,14,13,20,18,19,11,12,11,11,12,12,
+	13,13,13,13,13,13,14,13,18,19,19,12,11,11,11,12,
+	12,13,12,13,13,13,14,14,13,18,17,19,14,15,12,12,
+	12,13,13,13,14,14,14,14,14,14,19,19,19,16,15,12,
+	11,13,12,14,14,14,13,13,14,14,14,19,18,19,18,19,
+	13,13,13,13,14,14,14,13,14,14,14,14,18,17,19,19,
+	19,13,13,13,11,13,11,13,14,14,14,14,14,19,17,17,
+	18,18,16,16,13,13,13,13,14,13,15,15,14,14,19,19,
+	17,17,18,16,16,13,11,14,10,13,12,14,14,14,14,19,
+	19,19,19,19,18,17,13,14,13,11,14,13,14,14,15,15,
+	19,19,19,17,19,18,18,14,13,12,11,14,11,15,15,15,
 	15,
 };
 
@@ -12801,28 +10399,28 @@
 };
 
 static long _vq_lengthlist__44c5_s_p9_2[] = {
-	 3, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9,11, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9,10,11, 5, 5, 7, 7, 7,
+	 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,
 	 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11,
 	 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
-	10,10,10,10,11,11,11, 7, 7, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9,10,10,11,11,11, 8, 8, 8, 8,
-	 8, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,11,11,
-	11, 8, 8, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9,10,10,10,
-	10,10,10,11,11,11, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
-	 9,10,10,10,10,10,10,10,11,11,11,11,11, 8, 8, 9,
-	 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,11,11,11,
-	11,11, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,
-	10,10,11,11,11,11,11, 9, 9, 9, 9, 9, 9, 9,10,10,
-	10,10,10,10,10,10,10,11,11,11,11,11, 9, 9, 9, 9,
-	 9, 9,10,10,10,10,10,10,10,10,10,10,11,11,11,11,
-	11,11,11, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,
-	10,11,11,11,11,11,11,11,10, 9,10,10,10,10,10,10,
-	10,10,10, 9,10,10,11,11,11,11,11,11,11, 9, 9,10,
+	 9,10, 9,10,11,11,11, 7, 7, 8, 8, 8, 8, 9, 9, 9,
+	 9, 9, 9,10,10,10,10,10,10,11,11,11, 8, 8, 8, 8,
+	 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,11,11,
+	11, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,10,
+	10,10,10,11,11,11, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	10,10,10,10,10,10,10,10,11,11,11,11,11, 9, 9, 9,
+	 9, 9, 9,10, 9,10,10,10,10,10,10,10,10,11,11,11,
+	11,11, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,
+	10,10,11,11,11,11,11, 9, 9, 9, 9, 9, 9,10,10,10,
+	10,10,10,10,10,10,10,11,11,11,11,11, 9, 9,10, 9,
+	10,10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,
+	11,11,11, 9, 9,10,10,10,10,10,10,10,10,10,10,10,
+	10,11,11,11,11,11,11,11,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,11,11,11,11,11,11,11,10,10,10,
 	10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,
 	11,11,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	11,11,11,11,11,11,11,11,11,10,10,10,10,10, 9,10,
+	11,11,11,11,11,11,11,11,11,10,10,10,10,10,10,10,
 	10,10,10,10,10,11,11,11,11,11,11,11,11,11,10,10,
 	10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,
 	11,11,11,10,10,10,10,10,10,10,10,10,10,10,10,11,
@@ -12862,13 +10460,13 @@
 };
 
 static long _huff_lengthlist__44c5_s_short[] = {
-	 3, 9,10,15,10,10,11,15,15,17, 4, 5, 7, 8, 7, 7,
-	 9,13,15,16, 7, 6, 6,10, 6, 8, 9,12,12,16,10, 8,
-	11, 8, 8, 7,11,15,17,17, 8, 5, 5, 8, 3, 4, 6,10,
-	15,17,10, 7, 7, 7, 4, 4, 5,10,14,17,10, 9, 8, 9,
-	 6, 5, 6,10,14,17,12,12,11,12, 9, 8, 8,11,14,17,
-	13,14,13,10, 7, 5, 6, 9,13,17,14,14,14,10, 7, 5,
-	 6, 7,10,15,
+	 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,
+	14,16, 9, 7, 6, 7, 4, 3, 5, 9,14,18,10, 9, 8,10,
+	 6, 5, 6, 9,14,18,12,12,11,12, 8, 7, 8,11,14,18,
+	14,13,12,10, 7, 5, 6, 9,14,18,14,14,13,10, 6, 5,
+	 6, 8,11,16,
 };
 
 static static_codebook _huff_book__44c5_s_short = {
@@ -12883,13 +10481,13 @@
 };
 
 static long _huff_lengthlist__44c6_s_long[] = {
-	 3, 8,11,13,13,13,12,12,13,18, 6, 3, 4, 7, 9, 9,
-	11,11,13,16, 9, 4, 3, 5, 7, 7, 9,10,14,18,11, 7,
-	 4, 4, 6, 6, 8,10,14,15,11, 9, 6, 6, 6, 6, 8,10,
-	13,15,10, 9, 7, 6, 6, 6, 7, 8,12,12,12,10, 9, 8,
-	 7, 6, 6, 7,11,12,11,10,10, 9, 9, 7, 7, 6, 9,12,
-	12,12,13,13,13,10, 9, 8,10,12,13,14,16,16,17,14,
-	12,11,11,13,
+	 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,
+	13,14,11, 9, 7, 6, 6, 6, 7, 8,12,11,13,10, 9, 8,
+	 7, 6, 6, 7,11,11,13,11,10, 9, 9, 7, 7, 6,10,11,
+	13,13,13,13,13,11, 9, 8,10,12,12,15,15,16,15,12,
+	11,10,10,12,
 };
 
 static static_codebook _huff_book__44c6_s_long = {
@@ -12910,11 +10508,11 @@
 };
 
 static long _vq_lengthlist__44c6_s_p1_0[] = {
-	 1, 5, 5, 0, 5, 5, 0, 5, 5, 5, 8, 7, 0, 9, 8, 0,
-	 8, 8, 6, 7, 8, 0, 8, 9, 0, 8, 8, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 5, 8, 8, 0, 8, 8, 0, 8, 8, 5, 8, 8,
+	 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,
 	 0, 8, 8, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
-	 9, 8, 0, 8, 8, 0, 8, 8, 5, 8, 9, 0, 8, 8, 0, 8,
+	 9, 9, 0, 8, 8, 0, 8, 8, 5, 9, 9, 0, 8, 8, 0, 8,
 	 8,
 };
 
@@ -12953,45 +10551,45 @@
 };
 
 static long _vq_lengthlist__44c6_s_p2_0[] = {
-	 3, 5, 5, 8, 8, 0, 5, 5, 9, 9, 0, 5, 5, 9, 9, 0,
-	 7, 7,10,10, 0, 0, 0,10,10, 5, 7, 7, 9, 9, 0, 8,
-	 7,10, 9, 0, 8, 8,10,10, 0,10,10,11,11, 0, 0, 0,
-	11,11, 5, 7, 7, 9, 9, 0, 7, 8, 9,10, 0, 7, 8,10,
-	10, 0,10,10,11,11, 0, 0, 0,11,11, 8, 9, 9,11,10,
-	 0,11,10,12,12, 0,11,11,12,12, 0,13,13,14,14, 0,
-	 0, 0,14,14, 8, 9, 9,10,11, 0,10,11,12,12, 0,11,
-	11,12,12, 0,13,13,14,14, 0, 0, 0,14,14, 0, 0, 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,
+	11,11, 5, 7, 7, 9, 9, 0, 8, 8,10,10, 0, 7, 8, 9,
+	10, 0,10,10,11,11, 0, 0, 0,11,11, 8, 9, 9,11,11,
+	 0,11,11,12,12, 0,11,10,12,12, 0,13,14,14,14, 0,
+	 0, 0,14,13, 8, 9, 9,11,11, 0,11,11,12,12, 0,10,
+	11,12,12, 0,14,13,14,14, 0, 0, 0,13,14, 0, 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, 8, 8,11,11, 0, 7, 7,10,10,
-	 0, 7, 7,10,10, 0, 9, 8,11,10, 0, 0, 0,11,11, 5,
-	 7, 8,11,11, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 8,
-	 9,10,11, 0, 0, 0,11,11, 9,10,10,12,12, 0,10,10,
-	12,11, 0,10,10,12,12, 0,12,12,13,13, 0, 0, 0,13,
-	13, 9,10,10,12,12, 0,10,10,11,12, 0,10,10,12,12,
+	 0, 0, 0, 0, 0, 0, 5, 8, 7,11,10, 0, 7, 7,10,10,
+	 0, 7, 7,10,10, 0, 9, 9,11,10, 0, 0, 0,11,11, 5,
+	 7, 8,10,11, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 9,
+	 9,10,11, 0, 0, 0,11,11, 8,10, 9,12,12, 0,10,10,
+	12,12, 0,10,10,12,12, 0,12,12,13,13, 0, 0, 0,13,
+	13, 8, 9,10,12,12, 0,10,10,11,12, 0,10,10,12,12,
 	 0,12,12,13,13, 0, 0, 0,13,13, 0, 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, 8, 7,11,10, 0, 7, 7,10,10, 0, 7, 7,
-	10,10, 0, 8, 9,11,11, 0, 0, 0,11,10, 5, 7, 8,10,
-	11, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 9, 8,11,11,
-	 0, 0, 0,11,11, 9,10,10,12,12, 0,10,10,12,12, 0,
-	10,10,12,12, 0,12,12,13,13, 0, 0, 0,13,13, 9, 9,
-	10,12,12, 0,10,10,12,12, 0,10,10,12,12, 0,12,12,
+	 0, 0, 0, 5, 8, 8,11,11, 0, 7, 7,10,10, 0, 7, 7,
+	10,10, 0, 9, 9,10,11, 0, 0, 0,11,10, 5, 8, 8,11,
+	11, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 9, 9,11,11,
+	 0, 0, 0,10,11, 8,10,10,12,12, 0,10,10,12,12, 0,
+	10,10,12,12, 0,12,13,13,13, 0, 0, 0,14,13, 8,10,
+	10,12,12, 0,10,10,12,12, 0,10,10,12,12, 0,13,12,
 	13,13, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 7,10,10,13,13, 0, 9, 8,12,12, 0, 8, 9,12,12, 0,
-	10, 9,12,12, 0, 0, 0,12,12, 7,10,10,13,13, 0, 9,
-	 9,12,12, 0, 9, 8,12,12, 0, 9,10,12,12, 0, 0, 0,
-	12,12,10,11,11,14,14, 0,11,10,13,13, 0,11,11,13,
-	13, 0,12,12,13,13, 0, 0, 0,13,13,10,11,11,14,14,
-	 0,10,11,13,13, 0,11,11,13,13, 0,12,12,13,13, 0,
+	 7,10,10,14,13, 0, 9, 9,13,12, 0, 9, 9,12,12, 0,
+	10,10,12,12, 0, 0, 0,12,12, 7,10,10,13,14, 0, 9,
+	 9,12,13, 0, 9, 9,12,12, 0,10,10,12,12, 0, 0, 0,
+	12,12, 9,11,11,14,13, 0,11,10,14,13, 0,11,11,13,
+	13, 0,12,12,13,13, 0, 0, 0,13,13, 9,11,11,13,14,
+	 0,10,11,13,14, 0,11,11,13,13, 0,12,12,13,13, 0,
 	 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
 	11,11,14,14, 0,11,11,13,13, 0,11,10,13,13, 0,12,
-	12,13,13, 0, 0, 0,13,13,10,11,11,14,14, 0,11,11,
-	13,13, 0,10,11,13,13, 0,12,12,13,13, 0, 0, 0,13,
+	12,13,13, 0, 0, 0,13,13, 9,11,11,14,14, 0,11,11,
+	13,13, 0,10,11,13,13, 0,12,12,14,13, 0, 0, 0,13,
 	13,
 };
 
@@ -13034,10 +10632,10 @@
 };
 
 static long _vq_lengthlist__44c6_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,
-	 7, 7, 8, 8,10,10, 0, 0, 0, 7, 7, 9, 9,10,10, 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,
+	 7, 7, 9, 9,11,11, 0, 0, 0, 7, 7, 9, 9,11,11, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
 };
@@ -13090,16 +10688,16 @@
 };
 
 static long _vq_lengthlist__44c6_s_p4_0[] = {
-	 3, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,
-	11, 0, 4, 4, 6, 6, 7, 7, 8, 8, 8, 9,10,10,11,11,
-	11,11, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,
-	11,11,11, 0, 5, 5, 6, 6, 8, 8, 9, 9, 9, 9,10,10,
-	11,11,12,12, 0, 0, 0, 6, 6, 8, 8, 9, 9, 9, 9,10,
-	10,11,11,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,10,10,
-	11,11,12,11,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,10,
-	10,11,11,12,12,12,12, 0, 0, 0, 6, 6, 7, 7, 9, 9,
-	10,10,11,11,12,12,12,13, 0, 0, 0, 0, 0, 7, 7, 9,
-	 9,10,10,11,11,12,12,12,13, 0, 0, 0, 0, 0, 0, 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,
+	10,11,11, 0, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,
+	11,11,11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,
+	10,11,11,11,11, 0, 0, 0, 7, 7, 9, 9,10,10,10,10,
+	11,11,11,11,12,12, 0, 0, 0, 7, 7, 9, 9,10,10,10,
+	10,11,11,11,11,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,
+	10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 8, 8, 9,
+	 9,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -13147,11 +10745,11 @@
 };
 
 static long _vq_lengthlist__44c6_s_p5_0[] = {
-	 1, 4, 4, 5, 7, 7, 5, 7, 7, 4, 7, 7, 9,10,10,10,
-	10,10, 4, 7, 7, 9,10,10,10,10,10, 5, 9, 9, 9,11,
-	11, 9,11,11, 7,10,10,11,12,11,12,12,12, 7,10,10,
-	11,12,12,12,12,12, 6,10,10, 9,11,11,10,11,11, 7,
-	10, 9,11,12,12,11,12,11, 7,10,10,11,12,12,11,12,
+	 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,
+	11,12,12,12,12,12, 6,10,10,10,12,12,11,12,12, 7,
+	 9,10,11,12,12,12,12,12, 7,10, 9,12,12,12,12,12,
 	12,
 };
 
@@ -13196,14 +10794,14 @@
 };
 
 static long _vq_lengthlist__44c6_s_p5_1[] = {
-	 3, 4, 4, 6, 6, 8, 8, 8, 8, 9, 9,11, 4, 4, 6, 6,
-	 8, 8, 9, 9, 9, 9,11, 4, 4, 6, 6, 8, 8, 9, 8, 9,
-	 9,12, 5, 5, 6, 6, 8, 8, 9, 9, 9, 9,12,12,12, 6,
-	 6, 8, 8, 9, 9, 9, 9,11,11,11, 7, 7, 8, 8, 9, 9,
-	 9, 9,11,11,11, 7, 7, 8, 8, 8, 8, 9, 9,11,11,11,
-	 7, 7, 8, 8, 8, 8, 9, 9,11,11,11,11,11, 8, 8, 8,
-	 8, 9, 9,11,11,11,11,11, 7, 7, 8, 8, 8, 8,11,11,
-	11,11,11, 7, 7, 8, 8, 8, 8,
+	 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,
+	 6, 7, 8, 8, 8, 8, 9,11,11,11, 7, 7, 8, 8, 8, 8,
+	 8, 8,11,11,11, 7, 7, 8, 8, 8, 8, 8, 8,11,11,11,
+	 8, 8, 8, 8, 8, 8, 8, 8,11,11,11,10,10, 8, 8, 8,
+	 8, 8, 8,11,11,11,10,10, 8, 8, 8, 8, 8, 8,11,11,
+	11,10,10, 7, 7, 8, 8, 8, 8,
 };
 
 static float _vq_quantthresh__44c6_s_p5_1[] = {
@@ -13251,12 +10849,12 @@
 };
 
 static long _vq_lengthlist__44c6_s_p6_0[] = {
-	 1, 4, 4, 6, 7, 8, 8, 8, 8, 9, 9,10,10, 5, 5, 5,
+	 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, 9, 9,10,10,11,11, 0, 7, 7, 7, 7, 9, 9,10,10,
-	11,11,11,11, 0, 7, 7, 7, 7, 9, 9,10,10,11,11,12,
-	12, 0,11,11, 8, 8,10, 9,10,11,11,11,12,12, 0,12,
-	12, 8, 8,10, 9,11,11,12,11,13,13, 0, 0, 0, 0, 0,
+	 9,10, 9,11,10,11,11, 0, 6, 6, 7, 7, 9, 9,10,10,
+	11,11,12,12, 0, 7, 7, 7, 7, 9, 9,10,10,11,11,12,
+	12, 0,11,11, 8, 8,10,10,11,11,12,12,12,12, 0,11,
+	12, 9, 8,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -13301,7 +10899,7 @@
 };
 
 static long _vq_lengthlist__44c6_s_p6_1[] = {
-	 3, 4, 4, 5, 5, 6, 4, 4, 5, 5, 6, 4, 4, 5, 4, 6,
+	 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,
 };
 
@@ -13348,17 +10946,17 @@
 };
 
 static long _vq_lengthlist__44c6_s_p7_0[] = {
-	 1, 4, 4, 7, 7, 8, 8, 9, 9,10,10,11,11, 5, 5, 5,
-	 7, 7, 8, 8, 9, 9,11,11,12,12, 6, 5, 5, 7, 7, 9,
-	 9, 9, 9,11,11,12,12,19, 7, 7, 7, 7, 9, 9,10,10,
-	11,11,12,12,19, 7, 7, 7, 7, 9, 9,10,10,11,11,12,
-	12,19,11,11, 8, 8,10,10,11,11,11,12,12,12,19,12,
-	12, 8, 8,10, 9,11,11,12,12,13,12,19,19,19,11,11,
-	10,10,11,11,12,12,13,13,19,19,19,11,11,10,10,11,
-	11,12,12,13,13,19,19,19,14,14,11,11,11,12,13,13,
-	13,13,19,19,19,15,15,11,11,12,12,13,12,14,14,19,
-	19,19,19,18,13,13,12,12,13,13,14,14,18,18,18,18,
-	18,13,12,12,12,13,13,14,14,
+	 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,
+	11,11,12,12,21, 7, 7, 7, 7, 9, 9,10,10,11,11,12,
+	12,21,12,12, 9, 9,10,10,11,11,11,11,12,12,21,12,
+	12, 9, 9,10,10,11,11,12,12,12,12,21,21,21,11,11,
+	10,10,11,12,12,12,13,13,21,21,21,11,11,10,10,12,
+	12,12,12,13,13,21,21,21,15,15,11,11,12,12,13,13,
+	13,13,21,21,21,15,16,11,11,12,12,13,13,14,14,21,
+	21,21,21,20,13,13,13,13,13,13,14,14,20,20,20,20,
+	20,13,13,13,13,13,13,14,14,
 };
 
 static float _vq_quantthresh__44c6_s_p7_0[] = {
@@ -13404,14 +11002,14 @@
 };
 
 static long _vq_lengthlist__44c6_s_p7_1[] = {
-	 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 9, 5, 5, 7, 7,
-	 7, 7, 7, 7, 8, 8, 9, 5, 5, 6, 6, 7, 7, 7, 7, 7,
-	 7, 9, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 9, 9, 9, 7,
-	 7, 7, 7, 7, 8, 7, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8,
-	 8, 8, 9, 9, 9, 7, 7, 7, 7, 7, 7, 7, 7, 9, 9, 9,
-	 7, 7, 8, 8, 7, 7, 8, 8, 9, 9, 9, 8, 9, 8, 8, 7,
-	 7, 7, 7, 9, 9, 8, 8, 9, 8, 8, 7, 7, 8, 8, 9, 9,
-	 9, 9, 8, 7, 7, 7, 7, 8, 8,
+	 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,
+	 7, 7, 7, 7, 7, 7, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8,
+	 8, 8, 9, 9, 9, 7, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9,
+	 8, 8, 8, 8, 7, 7, 8, 8, 9, 9, 9, 9, 8, 8, 8, 7,
+	 7, 8, 8, 9, 9, 9, 8, 8, 8, 8, 7, 7, 8, 8, 9, 9,
+	 9, 8, 8, 7, 7, 7, 7, 8, 8,
 };
 
 static float _vq_quantthresh__44c6_s_p7_1[] = {
@@ -13461,21 +11059,21 @@
 };
 
 static long _vq_lengthlist__44c6_s_p8_0[] = {
-	 1, 4, 4, 7, 7, 8, 8, 7, 7, 9, 9, 9,10,11,11, 6,
-	 5, 5, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11,11, 6, 5,
-	 5, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11,11,17, 8, 8,
-	 8, 8,10,10, 8, 9,10,10,11,11,12,11,17, 8, 8, 9,
-	 9,10,10, 9, 9,10,10,11,12,12,12,17,12,13, 9, 9,
-	10,10, 9,10,10,10,11,11,13,12,17,13,13,10, 9,10,
-	10,10,10,10,11,12,11,12,12,17,17,17, 9, 9, 9, 9,
-	10,10,11,11,11,12,12,13,17,17,17, 9, 9, 9, 9,11,
-	10,11,11,12,12,12,13,17,17,17,13,13,10,10,11,11,
-	12,11,12,13,13,13,17,17,17,14,13,10, 9,11, 9,12,
-	12,12,13,13,14,17,17,17,17,17,11,12,11,11,12,12,
-	13,14,13,14,17,17,17,17,17,12,10,11, 8,12,11,13,
-	14,14,14,17,17,16,16,16,13,15,11,12,12,13,13,13,
-	14,14,16,16,16,16,16,14,13,12, 9,13,10,14,13,14,
-	13,
+	 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,
+	 9, 8,10,10, 9, 9,10,10,10,10,11,10,18, 8, 8, 9,
+	 9,10,10, 9, 9,10,10,11,11,12,12,18,12,13, 9,10,
+	10,10, 9,10,10,10,11,11,12,11,18,13,13, 9, 9,10,
+	10,10,10,10,10,11,11,12,12,18,18,18,10,10, 9, 9,
+	11,11,11,11,11,12,12,12,18,18,18,10, 9,10, 9,11,
+	10,11,11,11,11,13,12,18,18,18,14,13,10,10,11,11,
+	12,12,12,12,12,12,18,18,18,14,13,10,10,11,10,12,
+	12,12,12,12,12,18,18,18,18,18,12,12,11,11,12,12,
+	13,13,13,14,18,18,18,18,18,12,12,11,11,12,11,13,
+	13,14,13,18,18,18,18,18,16,16,11,12,12,13,13,13,
+	14,13,18,18,18,18,18,16,15,12,11,12,11,13,11,15,
+	14,
 };
 
 static float _vq_quantthresh__44c6_s_p8_0[] = {
@@ -13531,34 +11129,34 @@
 };
 
 static long _vq_lengthlist__44c6_s_p8_1[] = {
-	 3, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9,
-	 9, 8, 9, 9, 9,11, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,
+	 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,
-	 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11,
-	 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9,11,10,11, 7, 7, 8, 8, 8, 8, 9, 9, 9,
+	 8, 8, 8, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,
+	 7, 7, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9,10,11,11, 8, 7, 8, 8, 8, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9,11,11,11, 8, 8, 8, 8,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 9, 9, 9,11,11,
-	11, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,10,10, 9,10, 9,
-	10,10, 9,11,11,11, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	10,10, 9,10, 9, 9, 9, 9,11,11,11,11,11, 8, 8, 9,
-	 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,11,11,11,
-	11,11, 9, 9, 9, 9, 9, 9,10, 9, 9, 9,10,10, 9, 9,
-	 9, 9,11,11,11,11,11, 9, 9, 9, 9, 9, 9, 9,10,10,
-	 9,10, 9,10,10,10,10,11,11,11,11,11, 9, 9, 9, 9,
-	 9, 9,10,10,10,10, 9,10,10, 9,10, 9,11,11,11,11,
-	11,11,11, 9, 9, 9, 9,10, 9,10, 9, 9,10,10,10,10,
-	10,10,11,11,11,11,11,11, 9, 9, 9, 9,10,10,10,10,
-	 9,10, 9,10,10, 9,11,11,11,11,11,11,10, 9, 9, 9,
-	 9, 9,10, 9,10,10,10,10,10,10,10,11,11,11,11,11,
-	11,11, 9, 9,10,10,10,10,10,10,10,10,10,10,10,10,
-	11,11,11,11,11,11,11,11,11, 9,10, 9,10, 9,10,10,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11,11,
+	11, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9,11,11,11, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,11,11,11,11,11, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10, 9,11,11,11,
+	11,11, 9, 9, 9, 9, 9, 9,10, 9, 9,10, 9,10, 9, 9,
+	10, 9,11,11,11,11,11, 9, 9, 9, 9, 9, 9, 9,10,10,
+	10,10, 9,10,10, 9,10,11,11,11,11,11, 9, 9, 9, 9,
+	10,10,10, 9,10,10,10,10, 9,10,10, 9,11,11,11,11,
+	11,11,11, 9, 9, 9, 9,10,10,10,10, 9,10,10,10,10,
+	10,11,11,11,11,11,11,11,10, 9,10,10,10,10,10,10,
+	10, 9,10, 9,10,10,11,11,11,11,11,11,11,10, 9,10,
+	 9,10,10, 9,10,10,10,10,10,10,10,11,11,11,11,11,
+	11,11,10,10,10,10,10,10,10, 9,10,10,10,10,10, 9,
+	11,11,11,11,11,11,11,11,11,10,10,10,10,10,10,10,
 	10,10,10,10,10,11,11,11,11,11,11,11,11,11,10,10,
 	10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,
-	11,11,11,10,10, 9,10,10,10,10, 9,10, 9,10,10,11,
+	11,11,11,10,10,10,10,10,10,10,10,10, 9,10,10,11,
 	11,11,11,11,11,11,11,11,10,10,10, 9,10,10,10,10,
-	10,10,10,10,11,11,11,11,11,11,11,11,11,11,11,10,
-	10, 9,10,10,10,10,10,10,10,
+	10,10,10,10,10,11,11,11,11,11,11,11,11,10,11, 9,
+	10,10,10,10,10,10,10,10,10,
 };
 
 static float _vq_quantthresh__44c6_s_p8_1[] = {
@@ -13608,17 +11206,17 @@
 };
 
 static long _vq_lengthlist__44c6_s_p9_0[] = {
-	 1, 4, 4, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 6, 9, 8,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 6, 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, 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, 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, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 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,
+	11,11,11,11,11,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,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,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,10,10,
+	10,10,10,10,10,10,10,10,10,
 };
 
 static float _vq_quantthresh__44c6_s_p9_0[] = {
@@ -13666,17 +11264,17 @@
 };
 
 static long _vq_lengthlist__44c6_s_p9_1[] = {
-	 1, 4, 4, 7, 7, 7, 7, 7, 7, 8, 9,10,11, 6, 6, 6,
-	 7, 8, 8, 8, 7, 8, 9,10,11,10, 6, 5, 6, 7, 8, 8,
-	 8, 8, 8, 9,10,10,11,14, 9, 8, 8, 8, 9, 8, 8, 9,
-	10,10,12,11,14, 8, 8, 9, 8, 9, 8, 8, 8,11,10,11,
-	11,14,14,13, 8, 9, 9, 9, 9,10,11,11,12,12,13,12,
-	12, 8, 7,10, 9, 9, 9,11,11,11,10,13,13,13, 8, 9,
-	 9, 8,12,11,11,11,13,11,13,13,13, 9, 8, 9, 8,10,
-	10,11,10,11,10,13,13,13,12,12, 9,10,11,11,11,12,
-	13,12,13,13,13,13,12,10,10,10, 9,13,12,12,13,13,
-	13,13,13,13,12,12,10,10,12,12,13,13,13,13,13,13,
-	13,12,12,11,12,12,12,12,13,
+	 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,
+	10, 9,11,11,16, 8, 9, 9, 9, 9, 9, 9, 9,10,10,11,
+	11,16,13,13, 9, 9,10, 9, 9,10,11,11,11,12,16,13,
+	14, 9, 8,10, 8, 9, 9,10,10,12,11,16,14,16, 9, 9,
+	 9, 9,11,11,12,11,12,11,16,16,16, 9, 7, 9, 6,11,
+	11,11,10,11,11,16,16,16,11,12, 9,10,11,11,12,11,
+	13,13,16,16,16,12,11,10, 7,12,10,12,12,12,12,16,
+	16,15,16,16,10,11,10,11,13,13,14,12,16,16,16,15,
+	15,12,10,11,11,13,11,12,13,
 };
 
 static float _vq_quantthresh__44c6_s_p9_1[] = {
@@ -13760,8 +11358,8 @@
 };
 
 static long _vq_lengthlist__44c6_s_p9_2[] = {
-	 2, 4, 3, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 7, 6, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 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,
 };
@@ -13804,13 +11402,13 @@
 };
 
 static long _huff_lengthlist__44c6_s_short[] = {
-	 4, 9,11,11,13,13,17,16,17,17, 4, 4, 6, 7, 9, 9,
-	12,15,17,17, 7, 5, 4, 5, 7, 8,11,12,17,17, 9, 6,
-	 4, 3, 5, 6,10,14,17,17,11, 8, 6, 4, 5, 6, 9,13,
-	17,17,11,10, 7, 5, 5, 5, 8,12,17,17,13,12, 9, 8,
-	 7, 6, 8,11,17,17,13,13, 9, 6, 6, 5, 6, 9,17,17,
-	17,16,10, 8, 7, 7, 8, 9,17,17,17,17,14,12,11,11,
-	11,13,17,17,
+	 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,
+	17,19,11, 9, 7, 7, 5, 4, 5, 8,17,19,13,11, 8, 7,
+	 7, 5, 5, 7,16,18,14,13, 8, 6, 6, 5, 5, 7,16,18,
+	18,16,10, 8, 8, 7, 7, 9,16,18,18,18,12,10,10, 9,
+	 9,10,17,18,
 };
 
 static static_codebook _huff_book__44c6_s_short = {
@@ -13825,13 +11423,13 @@
 };
 
 static long _huff_lengthlist__44c7_s_long[] = {
-	 3, 8,11,13,14,13,13,12,14,16, 6, 4, 5, 7, 9,10,
-	11,11,13,15,10, 4, 3, 5, 7, 7,10,10,14,16,11, 7,
-	 4, 4, 5, 6, 8,10,13,15,12, 9, 6, 5, 5, 6, 8, 9,
-	13,15,11, 9, 7, 6, 5, 5, 6, 8,11,13,11,10, 9, 8,
-	 7, 6, 6, 7,11,12,12,11,10, 9, 8, 7, 6, 6, 9,11,
-	12,12,12,12,12,10, 9, 8,10,12,12,14,15,16,16,14,
-	12,10,11,13,
+	 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,
+	12,14,12, 9, 7, 6, 5, 5, 6, 8,11,11,12,11, 9, 8,
+	 7, 6, 6, 7,10,11,13,11,10, 9, 8, 7, 6, 6, 9,11,
+	13,13,12,12,12,10, 9, 8, 9,11,12,14,15,15,14,12,
+	11,10,10,12,
 };
 
 static static_codebook _huff_book__44c7_s_long = {
@@ -13852,11 +11450,11 @@
 };
 
 static long _vq_lengthlist__44c7_s_p1_0[] = {
-	 1, 5, 5, 0, 5, 5, 0, 5, 5, 6, 8, 7, 0, 9, 8, 0,
-	 8, 8, 5, 7, 8, 0, 8, 9, 0, 8, 8, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 5, 8, 8, 0, 8, 8, 0, 8, 8, 5, 8, 8,
+	 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,
 	 0, 8, 8, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
-	 9, 8, 0, 8, 8, 0, 8, 8, 5, 8, 9, 0, 8, 8, 0, 8,
+	 9, 9, 0, 8, 8, 0, 8, 8, 5, 8, 9, 0, 8, 8, 0, 8,
 	 8,
 };
 
@@ -13895,45 +11493,45 @@
 };
 
 static long _vq_lengthlist__44c7_s_p2_0[] = {
-	 3, 5, 5, 8, 8, 0, 5, 5, 9, 9, 0, 5, 5, 9, 9, 0,
-	 7, 7,10, 9, 0, 0, 0, 9,10, 5, 7, 7, 9, 9, 0, 8,
-	 7,10, 9, 0, 8, 7,10, 9, 0,10, 9,11,11, 0, 0, 0,
-	11,11, 6, 7, 7, 9, 9, 0, 7, 8, 9,10, 0, 7, 8,10,
-	10, 0, 9, 9,11,11, 0, 0, 0,11,11, 8, 9, 9,11,10,
-	 0,11,10,12,12, 0,11,11,12,12, 0,13,13,14,14, 0,
-	 0, 0,14,14, 8, 9, 9,10,11, 0,10,11,11,12, 0,11,
-	11,12,12, 0,13,13,14,14, 0, 0, 0,14,14, 0, 0, 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,
+	11,11, 5, 7, 7, 9, 9, 0, 8, 8,10,10, 0, 7, 8, 9,
+	10, 0,10,10,11,11, 0, 0, 0,11,11, 8, 9, 9,11,10,
+	 0,11,11,12,12, 0,11,10,12,12, 0,13,14,14,14, 0,
+	 0, 0,14,13, 8, 9, 9,10,11, 0,11,11,12,12, 0,10,
+	11,12,12, 0,13,13,14,14, 0, 0, 0,13,14, 0, 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, 8, 7,11,11, 0, 7, 7,10,10,
-	 0, 7, 7,10,10, 0, 9, 8,11,10, 0, 0, 0,11,11, 5,
-	 7, 8,11,11, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 8,
-	 9,10,11, 0, 0, 0,11,11, 9,10,10,12,12, 0,10,10,
-	12,11, 0,10,10,12,12, 0,12,12,13,13, 0, 0, 0,13,
-	13, 9,10,10,12,12, 0,10,10,11,12, 0,10,10,12,12,
+	 0, 0, 0, 0, 0, 0, 5, 8, 7,11,10, 0, 7, 7,10,10,
+	 0, 7, 7,10,10, 0, 9, 9,11,10, 0, 0, 0,11,11, 5,
+	 7, 8,10,11, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 9,
+	 9,10,11, 0, 0, 0,11,11, 8,10, 9,12,12, 0,10,10,
+	12,12, 0,10,10,12,12, 0,12,12,13,13, 0, 0, 0,13,
+	13, 8, 9,10,12,12, 0,10,10,12,12, 0,10,10,11,12,
 	 0,12,12,13,13, 0, 0, 0,13,13, 0, 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, 8, 7,11,10, 0, 7, 7,10,10, 0, 7, 7,
-	10,10, 0, 9, 9,11,11, 0, 0, 0,11,10, 5, 7, 8,10,
-	11, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 9, 9,11,11,
-	 0, 0, 0,10,11, 9,10, 9,12,11, 0,10,10,12,12, 0,
-	10,10,12,11, 0,12,12,13,13, 0, 0, 0,13,13, 9, 9,
-	10,11,12, 0,10,10,12,12, 0,10,10,11,12, 0,12,12,
-	13,13, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 5, 8, 8,11,11, 0, 7, 7,10,10, 0, 7, 7,
+	10,10, 0, 9, 9,10,11, 0, 0, 0,11,10, 5, 8, 8,10,
+	11, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 9, 9,11,10,
+	 0, 0, 0,10,11, 9,10,10,12,12, 0,10,10,12,12, 0,
+	10,10,12,12, 0,12,13,13,13, 0, 0, 0,13,12, 9,10,
+	10,12,12, 0,10,10,12,12, 0,10,10,12,12, 0,13,12,
+	13,13, 0, 0, 0,12,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 7, 9, 9,13,13, 0, 9, 8,12,12, 0, 8, 9,12,12, 0,
-	10, 9,12,12, 0, 0, 0,12,12, 7,10, 9,13,13, 0, 9,
-	 9,12,12, 0, 9, 8,12,12, 0, 9,10,12,12, 0, 0, 0,
-	12,12,10,11,11,14,14, 0,11,10,13,12, 0,11,11,13,
-	13, 0,12,12,13,13, 0, 0, 0,13,13,10,11,11,14,14,
+	 7,10,10,14,13, 0, 9, 9,12,12, 0, 9, 9,12,12, 0,
+	10,10,12,12, 0, 0, 0,12,12, 7,10,10,13,14, 0, 9,
+	 9,12,13, 0, 9, 9,12,12, 0,10,10,12,12, 0, 0, 0,
+	12,12, 9,11,11,14,13, 0,11,10,13,12, 0,11,11,13,
+	13, 0,12,12,13,13, 0, 0, 0,13,13, 9,11,11,13,14,
 	 0,10,11,12,13, 0,11,11,13,13, 0,12,12,13,13, 0,
 	 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,
-	11,11,14,14, 0,11,11,13,13, 0,11,10,13,13, 0,12,
-	12,13,13, 0, 0, 0,13,13,10,11,11,14,14, 0,11,11,
-	13,13, 0,10,11,13,13, 0,12,12,13,13, 0, 0, 0,13,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
+	11,11,14,14, 0,10,11,13,13, 0,11,10,13,13, 0,12,
+	12,13,13, 0, 0, 0,13,12, 9,11,11,14,14, 0,11,10,
+	13,13, 0,10,11,13,13, 0,12,12,14,13, 0, 0, 0,13,
 	13,
 };
 
@@ -13976,10 +11574,10 @@
 };
 
 static long _vq_lengthlist__44c7_s_p3_0[] = {
-	 2, 4, 4, 5, 5, 7, 7, 8, 8, 0, 4, 4, 6, 6, 7, 7,
+	 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,
-	 7, 7, 9, 9,10,10, 0, 0, 0, 7, 7, 9, 9,10,10, 0,
+	 7, 7, 9, 9,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
 };
@@ -14032,14 +11630,14 @@
 };
 
 static long _vq_lengthlist__44c7_s_p4_0[] = {
-	 3, 4, 4, 6, 5, 7, 7, 7, 7, 8, 8, 9, 9,10,10,11,
-	11, 0, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9,10,10,10,
-	11,11, 0, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10,
-	11,11,11, 0, 5, 5, 6, 6, 8, 8, 9, 9, 9, 9,10,10,
-	11,11,12,12, 0, 0, 0, 6, 6, 8, 8, 9, 9, 9, 9,10,
+	 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,
+	11,12,12, 0, 5, 5, 6, 6, 8, 8, 9, 9, 9, 9,10,10,
+	11,12,12,12, 0, 0, 0, 6, 6, 8, 7, 9, 9, 9, 9,10,
 	10,11,11,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,10,10,
-	11,11,12,12,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,10,
-	10,11,11,12,12,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,
+	11,11,12,12,13,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,10,
+	10,11,11,12,12,12,13, 0, 0, 0, 7, 7, 8, 8, 9, 9,
 	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 8, 8, 9,
 	 9,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -14089,11 +11687,11 @@
 };
 
 static long _vq_lengthlist__44c7_s_p5_0[] = {
-	 1, 4, 4, 5, 7, 7, 5, 7, 7, 4, 7, 7,10,11,10,10,
-	11,11, 4, 7, 7,10,10,11,10,10,11, 5,10,10, 9,12,
-	11,10,12,12, 7,11,10,12,12,12,12,13,13, 7,10,11,
-	11,12,12,12,13,13, 5,10,10,10,12,12,10,12,12, 7,
-	11,10,12,13,13,12,12,12, 7,10,11,12,13,13,12,12,
+	 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,
+	11,12,12,12,12,12, 6,10,10,10,12,12,11,12,12, 7,
+	10,10,12,12,12,12,11,12, 7,10,10,11,12,12,12,12,
 	12,
 };
 
@@ -14138,14 +11736,14 @@
 };
 
 static long _vq_lengthlist__44c7_s_p5_1[] = {
-	 3, 5, 5, 6, 6, 7, 7, 8, 8, 8, 9,12, 4, 4, 6, 6,
-	 7, 7, 8, 8, 9, 9,11, 5, 5, 6, 6, 7, 7, 8, 8, 9,
-	 9,12, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,12,12,12, 6,
-	 6, 7, 7, 8, 8, 9, 9,12,12,12, 6, 6, 7, 7, 8, 8,
-	 9, 9,12,11,11, 6, 6, 7, 7, 8, 8, 9, 9,12,12,11,
-	 7, 7, 8, 8, 8, 8, 8, 8,12,12,12,11,11, 8, 8, 8,
-	 8, 8, 8,12,12,12,11,11, 7, 7, 7, 7, 8, 8,12,12,
-	12,11,11, 7, 7, 7, 7, 8, 8,
+	 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,
+	 6, 7, 7, 9, 9, 9, 9,11,11,11, 7, 7, 7, 7, 8, 8,
+	 9, 9,11,11,11, 7, 7, 7, 7, 8, 8, 9, 9,11,11,11,
+	 7, 7, 8, 8, 8, 8, 9, 9,11,11,11,11,11, 8, 8, 8,
+	 8, 8, 9,11,11,11,11,11, 8, 8, 8, 8, 8, 8,11,11,
+	11,11,11, 7, 7, 8, 8, 8, 8,
 };
 
 static float _vq_quantthresh__44c7_s_p5_1[] = {
@@ -14193,12 +11791,12 @@
 };
 
 static long _vq_lengthlist__44c7_s_p6_0[] = {
-	 1, 4, 4, 7, 7, 8, 8, 9, 9,10, 9,10,10, 5, 5, 5,
-	 7, 7, 9, 9, 9, 9,10,10,11,11, 6, 5, 5, 7, 7, 9,
-	 9, 9, 9,11,10,11,11, 0, 6, 6, 7, 7, 9, 9,10,10,
-	11,11,12,12, 0, 7, 7, 7, 7, 9, 9,10,10,11,11,12,
-	12, 0,11,10, 8, 8,10,10,11,11,11,12,12,12, 0,11,
-	11, 8, 8,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 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,
+	10,10,11,11, 0, 8, 8, 7, 7, 8, 9, 9, 9,10,10,11,
+	11, 0,11,11, 9, 9,10,10,11,10,11,11,12,12, 0,12,
+	12, 9, 9,10,10,11,11,11,11,12,12, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -14243,7 +11841,7 @@
 };
 
 static long _vq_lengthlist__44c7_s_p6_1[] = {
-	 3, 4, 4, 5, 5, 6, 4, 4, 5, 5, 6, 4, 4, 4, 5, 6,
+	 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,
 };
 
@@ -14290,17 +11888,17 @@
 };
 
 static long _vq_lengthlist__44c7_s_p7_0[] = {
-	 1, 4, 4, 7, 7, 8, 8, 9, 9,10,10,11,11, 5, 5, 5,
-	 7, 7, 9, 8, 9, 9,11,11,12,12, 6, 5, 5, 7, 7, 9,
-	 9, 9,10,11,11,12,12,20, 7, 7, 7, 7, 9, 9,10,10,
-	11,11,12,12,20, 7, 7, 7, 7, 9, 9,10,10,11,11,12,
-	12,20,11,11, 8, 8,10, 9,11,11,11,11,12,12,20,12,
-	12, 8, 8, 9, 9,11,11,12,12,12,12,20,20,20,11,11,
-	10,10,11,11,12,12,13,13,20,20,20,11,11,10,10,11,
-	11,12,12,13,13,20,20,20,14,14,11,11,11,12,13,13,
-	13,13,20,20,20,15,14,11,11,11,11,13,13,14,14,20,
-	20,20,20,19,12,12,12,12,13,13,14,14,19,19,19,19,
-	19,13,12,12,12,13,13,14,14,
+	 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,
+	11,11,12,13,20, 7, 7, 7, 7, 9, 9,10,10,11,12,13,
+	13,20,11,11, 8, 8, 9, 9,11,11,12,12,13,13,20,11,
+	11, 8, 8, 9, 9,11,11,12,12,13,13,20,20,20,10,10,
+	10,10,12,12,13,13,13,13,20,20,20,10,10,10,10,12,
+	12,13,13,13,14,20,20,20,14,14,11,11,12,12,13,13,
+	14,14,20,20,20,14,14,11,11,12,12,13,13,14,14,20,
+	20,20,20,19,13,13,13,13,14,14,15,14,19,19,19,19,
+	19,13,13,13,13,14,14,15,15,
 };
 
 static float _vq_quantthresh__44c7_s_p7_0[] = {
@@ -14346,14 +11944,14 @@
 };
 
 static long _vq_lengthlist__44c7_s_p7_1[] = {
-	 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 9, 5, 5, 6, 6,
-	 7, 7, 7, 7, 8, 8, 9, 5, 5, 6, 6, 7, 7, 7, 7, 7,
-	 7, 9, 6, 6, 7, 7, 7, 7, 8, 8, 7, 8, 9, 9, 9, 7,
-	 7, 7, 7, 7, 7, 8, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8,
-	 8, 8, 9, 9, 9, 7, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9,
-	 7, 7, 8, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 7, 7, 7,
-	 7, 8, 7, 9, 9, 9, 9, 9, 8, 8, 7, 7, 8, 8, 9, 9,
-	 9, 9, 9, 7, 7, 7, 7, 8, 8,
+	 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,
+	 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 7, 7, 7, 7, 7, 7,
+	 7, 7, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8,
+	 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 7, 7, 7,
+	 7, 7, 7, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 8, 8,
+	 8, 8, 8, 7, 7, 7, 7, 7, 7,
 };
 
 static float _vq_quantthresh__44c7_s_p7_1[] = {
@@ -14403,20 +12001,20 @@
 };
 
 static long _vq_lengthlist__44c7_s_p8_0[] = {
-	 1, 4, 4, 7, 7, 8, 8, 8, 8, 9, 9, 9,10,11,11, 6,
-	 5, 5, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11,11, 6, 5,
-	 5, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11,11,17, 8, 8,
-	 8, 8,10, 9, 8, 9,10,10,11,11,11,11,17, 8, 8, 8,
-	 8,10,10, 9, 9,10,10,11,11,12,12,17,12,13, 9, 9,
-	10,10, 9, 9,10,11,11,11,12,12,17,13,13, 9, 9,10,
-	10,10,10,10,10,11,11,12,12,17,17,17, 9, 9, 9, 9,
-	10,10,11,11,11,12,12,12,17,17,17, 9, 9, 9, 9,11,
-	10,11,12,11,12,13,12,17,17,17,13,14,10,10,10,11,
-	12,11,12,12,12,13,17,17,17,14,14,10, 9,10, 9,12,
-	12,12,12,13,13,17,17,17,17,17,11,11,11,11,11,12,
-	13,13,13,14,17,17,17,17,17,12,10,11, 9,12,11,13,
-	15,14,14,17,17,17,17,17,14,15,11,12,12,13,13,12,
-	14,14,17,16,16,16,16,15,13,12, 9,12,10,14,12,15,
+	 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,
+	 8, 8,10,10, 9, 9,10,10,11,11,12,11,19, 8, 8, 8,
+	 8,10,10, 9, 9,10,10,11,11,12,12,19,12,12, 9, 9,
+	10,10, 9,10,10,10,11,11,12,12,19,12,12, 9, 9,10,
+	10,10,10,10,10,12,12,12,12,19,19,19, 9, 9, 9, 9,
+	11,10,11,11,12,11,13,13,19,19,19, 9, 9, 9, 9,11,
+	10,11,11,11,12,13,13,19,19,19,13,13,10,10,11,11,
+	12,12,12,12,13,12,19,19,19,14,13,10,10,11,11,12,
+	12,12,13,13,13,19,19,19,19,19,12,12,12,11,12,13,
+	14,13,13,13,19,19,19,19,19,12,12,12,11,12,12,13,
+	14,13,14,19,19,19,19,19,16,16,12,13,12,13,13,14,
+	15,14,19,18,18,18,18,16,15,12,11,12,11,14,12,14,
 	14,
 };
 
@@ -14473,34 +12071,34 @@
 };
 
 static long _vq_lengthlist__44c7_s_p8_1[] = {
-	 3, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9,
-	 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,
+	 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,
-	 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11,
-	 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9,11,11,11, 7, 7, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9,11,11,11, 8, 8, 8, 8,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11,11,
-	11, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,10, 9, 9, 9, 9,
-	10,10, 9,11,11,11, 8, 9, 9, 8, 9, 9, 9, 9, 9, 9,
-	 9, 9,10,10, 9, 9,10, 9,11,11,11,11,11, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,11,10,11,
-	11,11, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,10, 9,
-	 9,10,11,11,11,11,11, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	10, 9, 9,10,10,10,10,11,11,11,11,11, 9, 9, 9, 9,
-	 9, 9, 9,10,10,10, 9,10,10,10,10, 9,11,11,10,11,
-	11,11,11, 9, 9, 9, 9,10,10,10,10,10,10,10, 9,10,
-	10,10,11,11,11,11,11,11, 9, 9, 9, 9, 9,10,10,10,
-	10,10, 9, 9,10, 9,11,10,11,11,11,11,11, 9, 9, 9,
-	 9, 9,10,10, 9,10,10,10,10,10,10,11,11,11,11,11,
-	11,11,10, 9,10, 9,10,10,10,10,10,10,10,10,10, 9,
-	10,11,10,11,11,11,11,11,10, 9, 9,10,10,10,10,10,
-	10,10,10,10,10,11,11,11,11,11,11,11,10,11,10,10,
-	10,10,10,10,10,10, 9,10,10, 9,11,11,11,11,11,10,
-	11,11,11,10,10, 9, 9,10,10,10,10,10, 9,10,10,11,
-	11,11,11,11,10,11,11,11,10,10, 9, 9,10,10,10,10,
-	10,10,10,10,11,11,11,11,11,11,11,11,11,11,11, 9,
-	 9, 9, 9,10,10,10,10,10,10,
+	 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
+	 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9,10,10,10, 8, 8, 8, 8, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10, 8, 8, 8, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,
+	10, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,10,11,10,10,10, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9,10, 9, 9,10, 9, 9,10,11,10,
+	11,10, 9, 9, 9, 9, 9, 9, 9,10,10,10, 9,10, 9, 9,
+	 9, 9,11,10,11,10,10, 9, 9, 9, 9, 9, 9,10, 9, 9,
+	10, 9, 9,10, 9, 9,10,11,10,10,11,10, 9, 9, 9, 9,
+	 9,10,10, 9,10,10,10,10, 9,10,10,10,10,10,10,11,
+	11,11,10, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,11,11,10,10,10,10,10,10,10,10,10,10,10,
+	10, 9,10,10, 9,10,11,11,10,11,10,11,10, 9,10,10,
+	 9,10,10,10,10,10,10,10,10,10,10,11,11,11,11,10,
+	11,11,10,10,10,10,10,10, 9,10, 9,10,10, 9,10, 9,
+	10,10,10,11,10,11,10,11,11,10,10,10,10,10,10, 9,
+	10,10,10,10,10,10,10,11,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,11,10,11,
+	11,10,10,10,10, 9, 9,10,10, 9, 9,10, 9,10,10,10,
+	10,11,11,10,10,10,10,10,10,10, 9, 9,10,10,10, 9,
+	 9,10,10,10,10,10,11,10,11,10,10,10,10,10,10, 9,
+	10,10,10,10,10,10,10,10,10,
 };
 
 static float _vq_quantthresh__44c7_s_p8_1[] = {
@@ -14550,17 +12148,17 @@
 };
 
 static long _vq_lengthlist__44c7_s_p9_0[] = {
-	 1, 4, 4, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 9, 8,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 6, 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, 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, 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, 8, 8, 8,
+	 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,
+	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,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,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,
 };
 
 static float _vq_quantthresh__44c7_s_p9_0[] = {
@@ -14608,17 +12206,17 @@
 };
 
 static long _vq_lengthlist__44c7_s_p9_1[] = {
-	 1, 4, 4, 7, 7, 7, 7, 7, 7, 9, 8,10,10, 6, 6, 6,
-	 7, 8, 8, 8, 8, 8, 9, 9,10,11, 6, 5, 6, 8, 7, 8,
-	 8, 8, 8, 9, 9,10,11,14, 9, 8, 9, 8, 9, 8, 8, 9,
-	10,10,11,11,14, 8, 9, 8, 8, 8, 9, 9, 8,12,10,11,
-	11,14,13,13, 8, 9, 9, 9, 9,10,10,12,12,12,14,14,
-	13, 8, 7,10, 9, 9,10,10,11,11,10,14,14,14, 8, 9,
-	 9, 8,11,10,12,11,11,11,14,14,14, 9, 7, 9, 8,10,
-	10,11,11,11,10,14,14,14,12,12,10, 9,11,11,11,13,
-	12,13,14,14,14,12,12,10,10,11, 8,11,11,14,13,14,
-	14,14,14,14,12,13,11,12,12,11,14,13,13,13,13,13,
-	13,12,11,11, 9,12,12,12,13,
+	 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,
+	10, 9,11,10,16, 8, 8, 9, 9,10,10, 9, 9,10,10,11,
+	11,16,13,13, 9, 9,10,10, 9,10,11,11,12,11,16,13,
+	13, 9, 8,10, 9,10,10,10,10,11,11,16,14,16, 8, 9,
+	 9, 9,11,10,11,11,12,11,16,16,16, 9, 7,10, 7,11,
+	10,11,11,12,11,16,16,16,12,12, 9,10,11,11,12,11,
+	12,12,16,16,16,12,10,10, 7,11, 8,12,11,12,12,16,
+	16,15,16,16,11,12,10,10,12,11,12,12,16,16,16,15,
+	15,11,11,10,10,12,12,12,12,
 };
 
 static float _vq_quantthresh__44c7_s_p9_1[] = {
@@ -14746,13 +12344,13 @@
 };
 
 static long _huff_lengthlist__44c7_s_short[] = {
-	 4,10,12,13,15,15,16,16,17,17, 5, 5, 7, 8, 9, 9,
-	12,17,18,18, 7, 5, 4, 5, 7, 8,10,13,18,18, 8, 6,
-	 5, 4, 5, 6, 9,12,17,18,10, 9, 6, 4, 4, 5, 8,12,
-	18,17,11, 9, 7, 5, 4, 4, 6,10,17,17,13,12,10, 8,
-	 6, 5, 6, 9,17,17,14,13,12, 7, 6, 5, 5, 8,16,17,
-	16,15,14, 8, 8, 7, 7, 9,14,17,17,17,17,12,11,11,
-	11,12,16,17,
+	 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,
+	15,19,10, 8, 7, 6, 7, 6, 7, 9,14,16,12,10, 9, 7,
+	 7, 6, 4, 5,10,15,14,13,11, 7, 6, 6, 4, 2, 7,13,
+	16,16,15, 9, 8, 8, 8, 6, 9,13,19,19,17,12,11,10,
+	10, 9,11,14,
 };
 
 static static_codebook _huff_book__44c7_s_short = {
@@ -14767,13 +12365,13 @@
 };
 
 static long _huff_lengthlist__44c8_s_long[] = {
-	 3, 8,12,14,14,13,13,12,13,15, 6, 4, 6, 8,10,10,
-	11,11,13,15, 9, 5, 4, 5, 7, 8, 9,10,13,15,11, 7,
-	 4, 4, 5, 6, 8, 9,13,14,12, 9, 6, 5, 5, 5, 7, 9,
-	12,14,11,10, 7, 6, 5, 4, 6, 7,11,12,11,10, 9, 8,
-	 7, 5, 6, 6,10,11,12,11,10, 9, 8, 6, 6, 5, 8,10,
-	12,12,12,11,11,10, 9, 7, 8,11,12,13,14,14,15,13,
-	10, 9, 9,11,
+	 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,
+	11,14,12,10, 7, 6, 5, 4, 6, 7,10,11,12,11, 9, 8,
+	 7, 5, 5, 6,10,10,13,12,10, 9, 8, 6, 6, 5, 8,10,
+	14,13,12,12,11,10, 9, 7, 8,10,12,13,14,14,13,12,
+	11, 9, 9,10,
 };
 
 static static_codebook _huff_book__44c8_s_long = {
@@ -14794,11 +12392,11 @@
 };
 
 static long _vq_lengthlist__44c8_s_p1_0[] = {
-	 1, 5, 5, 0, 5, 5, 0, 5, 5, 6, 7, 7, 0, 9, 8, 0,
-	 8, 8, 6, 7, 8, 0, 8, 9, 0, 8, 8, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 5, 8, 8, 0, 8, 8, 0, 8, 8, 5, 8, 8,
+	 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,
 	 0, 8, 8, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
-	 8, 8, 0, 8, 8, 0, 8, 7, 5, 8, 8, 0, 8, 8, 0, 7,
+	 9, 8, 0, 8, 8, 0, 8, 8, 5, 8, 9, 0, 8, 8, 0, 8,
 	 8,
 };
 
@@ -14837,45 +12435,45 @@
 };
 
 static long _vq_lengthlist__44c8_s_p2_0[] = {
-	 3, 5, 5, 8, 8, 0, 6, 6, 8, 8, 0, 5, 6, 8, 8, 0,
-	 7, 7, 9, 9, 0, 0, 0, 9, 9, 5, 7, 6, 9, 9, 0, 7,
-	 7,10, 9, 0, 7, 7,10, 9, 0, 9, 9,11,11, 0, 0, 0,
-	11,11, 5, 6, 7, 9, 9, 0, 7, 7, 9,10, 0, 7, 7, 9,
-	10, 0, 9, 9,11,11, 0, 0, 0,11,11, 8, 9, 9,11,10,
-	 0,11,10,12,11, 0,10,10,12,11, 0,13,13,14,13, 0,
-	 0, 0,14,13, 8, 9, 9,10,11, 0,10,11,11,12, 0,10,
-	10,12,12, 0,13,13,13,14, 0, 0, 0,13,14, 0, 0, 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,
+	11,11, 5, 7, 7, 9, 9, 0, 7, 8, 9,10, 0, 7, 8, 9,
+	10, 0,10,10,11,11, 0, 0, 0,11,11, 8, 9, 9,11,10,
+	 0,11,10,12,11, 0,11,10,12,12, 0,13,13,14,14, 0,
+	 0, 0,14,13, 8, 9, 9,10,11, 0,10,11,12,12, 0,10,
+	11,12,12, 0,13,13,14,14, 0, 0, 0,13,14, 0, 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, 7, 7,10,10, 0, 7, 7,10,10,
-	 0, 7, 7,10,10, 0, 9, 8,10,10, 0, 0, 0,10,10, 6,
-	 7, 7,10,10, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 8,
-	 9,10,10, 0, 0, 0,10,10, 8,10, 9,12,12, 0,10, 9,
-	12,11, 0,10,10,11,12, 0,12,11,13,12, 0, 0, 0,13,
-	13, 8, 9,10,11,12, 0, 9,10,11,12, 0,10,10,11,12,
-	 0,11,12,12,13, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 5, 8, 7,11,10, 0, 7, 7,10,10,
+	 0, 7, 7,10,10, 0, 9, 9,10,10, 0, 0, 0,11,10, 5,
+	 7, 8,10,11, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 9,
+	 9,10,10, 0, 0, 0,10,10, 8,10, 9,12,12, 0,10,10,
+	12,11, 0,10,10,12,12, 0,12,12,13,12, 0, 0, 0,13,
+	12, 8, 9,10,12,12, 0,10,10,11,12, 0,10,10,11,12,
+	 0,12,12,13,13, 0, 0, 0,12,13, 0, 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, 8, 7,11,10, 0, 7, 7,10,10, 0, 7, 7,
-	10, 9, 0, 8, 9,10,10, 0, 0, 0,10,10, 6, 7, 8,10,
-	11, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 9, 8,10,10,
-	 0, 0, 0,10,10, 8,10, 9,12,11, 0,10,10,12,11, 0,
-	10,10,12,11, 0,11,12,13,12, 0, 0, 0,13,12, 9, 9,
-	10,11,12, 0,10,10,11,12, 0,10,10,11,12, 0,12,11,
-	12,13, 0, 0, 0,12,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	10,10, 0, 9, 9,10,11, 0, 0, 0,10,10, 6, 7, 8,10,
+	11, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 9, 9,10,10,
+	 0, 0, 0,10,10, 9,10, 9,12,12, 0,10,10,12,12, 0,
+	10,10,12,11, 0,12,12,13,13, 0, 0, 0,13,12, 8, 9,
+	10,12,12, 0,10,10,12,12, 0,10,10,11,12, 0,12,12,
+	13,13, 0, 0, 0,12,13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 7, 9, 9,12,13, 0, 9, 8,12,11, 0, 8, 9,11,12, 0,
-	10, 9,12,11, 0, 0, 0,11,12, 7, 9, 9,13,13, 0, 9,
-	 9,11,12, 0, 9, 8,12,11, 0, 9,10,11,12, 0, 0, 0,
-	12,11, 9,11,11,14,13, 0,10,10,13,12, 0,10,10,13,
-	13, 0,12,11,13,12, 0, 0, 0,13,13, 9,11,11,13,14,
-	 0,10,10,12,13, 0,10,10,13,13, 0,11,12,12,13, 0,
+	 7,10,10,13,13, 0, 9, 9,12,12, 0, 9, 9,12,12, 0,
+	10,10,12,12, 0, 0, 0,12,12, 7,10,10,13,13, 0, 9,
+	 9,12,12, 0, 9, 9,12,12, 0,10,10,12,12, 0, 0, 0,
+	12,12, 9,11,11,14,13, 0,10,10,13,12, 0,11,10,13,
+	12, 0,12,12,13,12, 0, 0, 0,13,13, 9,11,11,13,14,
+	 0,10,11,12,13, 0,10,11,13,13, 0,12,12,12,13, 0,
 	 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
-	11,11,14,13, 0,10,10,13,12, 0,10,10,13,12, 0,11,
-	12,13,13, 0, 0, 0,13,12, 9,11,11,13,14, 0,10,10,
-	13,13, 0,10,10,12,13, 0,12,11,13,13, 0, 0, 0,12,
+	11,11,14,14, 0,10,11,13,13, 0,11,10,13,13, 0,11,
+	12,13,13, 0, 0, 0,13,12, 9,11,11,14,14, 0,11,10,
+	13,13, 0,10,11,13,13, 0,12,12,13,13, 0, 0, 0,12,
 	13,
 };
 
@@ -14918,10 +12516,10 @@
 };
 
 static long _vq_lengthlist__44c8_s_p3_0[] = {
-	 3, 3, 4, 5, 5, 7, 6, 8, 8, 0, 4, 4, 5, 5, 7, 7,
-	 9, 9, 0, 4, 4, 5, 6, 7, 7, 9, 9, 0, 5, 5, 6, 6,
+	 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,
-	 7, 7, 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0,
+	 7, 7, 9, 9,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
 };
@@ -14974,14 +12572,14 @@
 };
 
 static long _vq_lengthlist__44c8_s_p4_0[] = {
-	 3, 4, 4, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10,10,
-	10, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,10,10,
+	 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,
-	10,11,11, 0, 5, 5, 6, 6, 8, 8, 9, 9, 9, 9,10,10,
-	11,11,12,12, 0, 0, 0, 6, 6, 8, 8, 9, 9, 9, 9,10,
+	11,11,11, 0, 6, 5, 6, 6, 7, 7, 9, 9, 9, 9,10,10,
+	11,11,12,12, 0, 0, 0, 6, 6, 7, 7, 9, 9, 9, 9,10,
 	10,11,11,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,10,10,
-	11,11,12,12,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,10,
-	10,11,11,12,12,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,
+	11,11,11,12,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,10,
+	10,11,11,11,12,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,
 	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 8, 8, 9,
 	 9,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -15031,11 +12629,11 @@
 };
 
 static long _vq_lengthlist__44c8_s_p5_0[] = {
-	 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 6, 6,10,10,10,10,
-	10,10, 4, 6, 6,10,10,10,10,10,10, 5,10,10, 9,12,
-	12,10,12,12, 7,10,10,12,12,12,12,12,12, 7,10,10,
-	12,12,12,12,12,13, 6,10,10,10,12,12,11,12,12, 8,
-	10,10,12,13,12,12,12,12, 7,10,10,12,12,13,12,13,
+	 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,
+	11,12,12,12,12,12, 6,10,10,10,12,12,10,12,12, 7,
+	10,10,11,12,12,12,12,12, 7,10,10,11,12,12,12,12,
 	12,
 };
 
@@ -15080,12 +12678,12 @@
 };
 
 static long _vq_lengthlist__44c8_s_p5_1[] = {
-	 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7,10, 4, 4, 6, 6,
-	 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8,
-	 8,11, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,11,11,11, 6,
-	 6, 7, 7, 8, 8, 8, 8,11,11,11, 6, 6, 7, 7, 8, 8,
+	 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,
+	 6, 7, 7, 8, 8, 9, 9,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,
-	 7, 7, 7, 7, 8, 8, 8, 8,11,11,11,11,11, 7, 7, 8,
+	 7, 7, 7, 8, 8, 8, 8, 8,11,11,11,11,11, 7, 7, 8,
 	 8, 8, 8,11,11,11,11,11, 7, 7, 7, 7, 8, 8,11,11,
 	11,11,11, 7, 7, 7, 7, 8, 8,
 };
@@ -15135,12 +12733,12 @@
 };
 
 static long _vq_lengthlist__44c8_s_p6_0[] = {
-	 1, 4, 4, 7, 6, 8, 8, 9, 9,10,10,11,11, 5, 5, 5,
-	 7, 7, 9, 9,10, 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,
-	11,11,12,12, 0, 7, 7, 7, 7, 9, 9,10,10,12,12,12,
-	12, 0,10,10, 8, 8,10,10,11,11,12,12,13,13, 0,11,
-	11, 8, 8,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 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,
+	10,10,11,11, 0, 7, 7, 7, 7, 9, 9,10,10,10,10,11,
+	11, 0,11,11, 9, 9,10,10,11,11,11,11,12,12, 0,12,
+	12, 9, 9,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -15232,17 +12830,17 @@
 };
 
 static long _vq_lengthlist__44c8_s_p7_0[] = {
-	 1, 4, 4, 7, 7, 8, 8, 9, 9,10,10,11,11, 5, 5, 5,
-	 7, 7, 9, 9,10,10,11,11,12,12, 6, 5, 5, 7, 7, 9,
-	 9,10,10,11,11,12,12,20, 6, 7, 7, 7, 9, 9,10,10,
-	11,11,12,12,20, 7, 7, 7, 7, 9, 9,10,10,11,11,12,
-	12,20,11,11, 8, 8,10,10,11,11,12,12,12,12,20,12,
-	12, 8, 8,10, 9,11,11,12,12,13,13,20,20,20,11,10,
-	10,10,11,11,12,12,13,13,20,20,20,10,11,10,10,11,
-	11,12,12,13,13,20,20,20,14,15,11,11,12,12,13,13,
-	14,13,20,20,20,15,15,11,11,12,12,13,13,14,14,20,
-	20,20,20,19,13,13,12,12,13,13,14,14,19,19,19,19,
-	19,13,13,12,12,13,13,14,14,
+	 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,
+	11,11,12,12,21, 7, 7, 7, 7, 9, 9,10,10,12,12,13,
+	13,21,11,11, 8, 8, 9, 9,11,11,12,12,13,13,21,11,
+	11, 8, 8, 9, 9,11,11,12,12,13,13,21,21,21,10,10,
+	10,10,11,11,12,13,13,13,21,21,21,10,10,10,10,11,
+	11,13,13,14,13,21,21,21,13,13,11,11,12,12,13,13,
+	14,14,21,21,21,14,14,11,11,12,12,13,13,14,14,21,
+	21,21,21,20,13,13,13,12,14,14,16,15,20,20,20,20,
+	20,13,13,13,13,14,13,15,15,
 };
 
 static float _vq_quantthresh__44c8_s_p7_0[] = {
@@ -15288,13 +12886,13 @@
 };
 
 static long _vq_lengthlist__44c8_s_p7_1[] = {
-	 4, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 5, 5, 7, 7,
-	 7, 7, 7, 7, 7, 7, 8, 5, 5, 7, 7, 7, 7, 7, 7, 7,
+	 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,
 	 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 7, 7, 7, 7, 7, 7,
 	 7, 7, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8,
 	 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 7, 7, 7,
-	 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 8, 8,
+	 7, 7, 7, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 8, 8,
 	 8, 8, 8, 7, 7, 7, 7, 7, 7,
 };
 
@@ -15345,21 +12943,21 @@
 };
 
 static long _vq_lengthlist__44c8_s_p8_0[] = {
-	 1, 4, 4, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,11, 6,
-	 5, 5, 7, 7, 9, 9, 8, 8,10,10,11,11,11,12, 6, 5,
-	 5, 7, 7, 9, 9, 9, 8,10,10,11,10,11,12,18, 8, 8,
-	 8, 8, 9, 9, 9, 9,10,10,11,11,12,12,18, 8, 8, 8,
-	 8, 9, 9, 9, 9,10,10,11,11,12,13,18,12,12, 9, 9,
-	10,10, 9, 9,10,11,11,12,13,12,18,12,12, 9, 9,10,
-	10,10,10,10,11,11,12,13,13,18,18,18, 9, 9, 9, 9,
-	10,10,11,11,12,12,12,12,18,18,18, 9, 9, 9, 9,10,
-	10,11,11,12,12,13,13,18,18,18,13,13,10,10,11,11,
-	12,11,12,12,13,13,18,18,18,14,14,10, 9,11,10,12,
-	12,12,12,13,13,18,18,18,18,18,11,12,11,11,12,12,
-	13,13,14,13,18,18,18,18,18,12,11,11,10,12,11,13,
-	13,13,14,18,18,18,18,18,15,16,12,12,12,13,13,13,
-	14,14,18,17,17,17,17,16,14,12,11,12,11,13,12,15,
-	14,
+	 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,
+	 8, 8, 9, 9, 9, 9,10,10,11,11,12,12,20, 8, 8, 8,
+	 8,10, 9, 9, 9,10,10,11,11,12,12,20,12,12, 9, 9,
+	10,10,10,10,10,11,12,12,12,12,20,12,12, 9, 9,10,
+	10,10,10,11,11,12,12,13,13,20,20,20, 9, 9, 9, 9,
+	11,10,11,11,12,12,12,13,20,19,19, 9, 9, 9, 9,11,
+	11,11,12,12,12,13,13,19,19,19,13,13,10,10,11,11,
+	12,12,13,13,13,13,19,19,19,14,13,11,10,11,11,12,
+	12,12,13,13,13,19,19,19,19,19,12,12,12,12,13,13,
+	13,13,14,13,19,19,19,19,19,12,12,12,11,12,12,13,
+	14,14,14,19,19,19,19,19,16,15,13,12,13,13,13,14,
+	14,14,19,19,19,19,19,17,17,13,12,13,11,14,13,15,
+	15,
 };
 
 static float _vq_quantthresh__44c8_s_p8_0[] = {
@@ -15415,34 +13013,34 @@
 };
 
 static long _vq_lengthlist__44c8_s_p8_1[] = {
-	 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-	 8, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8,
+	 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,
 	 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	 7, 7, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9,10,10,10, 8, 8, 8, 8, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10, 8, 8, 8, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,
 	10, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9,10,10,11, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9,11,11,10,11,10, 9, 9, 9,
+	 9, 9, 9,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,
-	10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,
-	 9, 9,10,11,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9,10,10,11,10,10, 9, 9, 9, 9,
-	 9, 9, 9, 9,10, 9, 9, 9, 9, 9, 9, 9,11,10,11,10,
-	10,10,10, 9, 9, 9, 9, 9, 9,10, 9, 9, 9, 9, 9, 9,
-	 9,11,11,11,10,10,11,10, 9, 9, 9, 9, 9, 9,10,10,
-	 9, 9, 9, 9, 9, 9,10,11,10,10,10,11,10, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9,10, 9,10, 9,11,11,10,10,10,
-	10,10, 9, 9, 9,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	10,10,11,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9,10,10,11,11,10,11,10,10,10,10,10,10, 9,
-	10, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,
-	10,10,10, 9,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9,
-	 9, 9,10, 9,10,10,10,10,10,10,10,10,10,10,10, 9,
-	 9, 9, 9,10, 9, 9,10, 9, 9,
+	10,10, 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 9, 9, 9, 9,
+	 9, 9,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10, 9, 9, 9, 9,
+	 9, 9, 9, 9,10,10,10, 9, 9, 9, 9, 9,10,10,10,10,
+	10,10,10, 9, 9, 9, 9, 9,10,10,10, 9, 9, 9, 9, 9,
+	 9,10,10,10,10,10,10,10, 9,10,10, 9,10,10,10,10,
+	 9,10, 9,10,10, 9,10,10,10,10,10,10,10, 9,10,10,
+	10,10,10,10, 9, 9,10,10, 9,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10, 9, 9, 9,10, 9, 9, 9, 9,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9, 9,
+	10, 9,10, 9,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10, 9, 9,10, 9, 9, 9,10,10,10,10,10,10,
+	10,10,10,10,10, 9, 9, 9, 9, 9, 9,10, 9, 9,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10, 9,10, 9,
+	 9,10, 9, 9,10,10,10,10,10,10,10,10,10,10,10,10,
+	10, 9, 9,10,10, 9,10, 9, 9,
 };
 
 static float _vq_quantthresh__44c8_s_p8_1[] = {
@@ -15496,25 +13094,25 @@
 };
 
 static long _vq_lengthlist__44c8_s_p9_0[] = {
-	 1, 5, 5,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10, 7,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10, 6, 8,10,10,10,10,10,10,10,10,10,10,10,10,
+	 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,
+	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,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,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,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,11,11,11,11,11,11,11,11,
+	11,11,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,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,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,10,10,10,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, 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, 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, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9,
+	10,
 };
 
 static float _vq_quantthresh__44c8_s_p9_0[] = {
@@ -15569,29 +13167,29 @@
 };
 
 static long _vq_lengthlist__44c8_s_p9_1[] = {
-	 1, 4, 4, 7, 7, 7, 7, 7, 7, 9, 9,10,10,11,10,13,
-	12,11,12, 6, 6, 6, 8, 8, 8, 8, 8, 8, 9,10,10,10,
-	12,12,12,12,13,15, 5, 5, 5, 8, 8, 8, 8, 8, 8,10,
-	 9,10,11,12,13,12,13,13,12,15, 9, 8, 9, 9, 9, 9,
-	 9, 9,10,10,10,11,14,12,13,15,12,14,15, 8, 9, 9,
-	 9, 9, 9, 9, 9,10,10,12,11,12,11,12,13,13,13,15,
-	13,13, 9, 9,10, 9,10,10,11,10,11,12,12,12,14,13,
-	14,15,15,13,13, 9, 8,10, 9,10,10,11,10,12,12,13,
-	13,14,13,14,15,15,15,15, 9, 9, 9, 9,10,11,12,12,
-	12,13,13,13,14,15,15,14,15,15,15, 9, 7, 9, 8,12,
-	11,11,13,12,12,13,12,14,13,13,14,15,15,15,13,13,
-	10,10,12,11,13,13,12,12,13,13,14,13,13,15,15,15,
-	15,12,13,11, 9,11,10,12,12,15,13,13,13,14,13,14,
-	13,15,15,15,15,15,12,12,11,11,12,13,15,13,13,14,
-	14,14,15,14,15,15,15,15,15,13,11,12,11,12,11,13,
-	14,13,13,14,14,13,14,15,15,15,15,15,15,15,12,12,
-	12,13,15,13,15,14,15,14,13,15,15,15,15,15,15,14,
-	15,13,13,12,11,14,12,15,13,14,14,14,13,15,15,15,
-	15,15,15,15,14,13,14,13,15,13,15,15,15,14,15,14,
-	15,15,15,15,15,15,15,14,14,14,13,13,13,15,15,15,
-	15,14,15,15,15,15,15,15,15,15,15,15,12,13,13,13,
-	14,15,15,13,15,15,15,15,15,15,15,15,15,15,15,15,
-	15,14,14,15,15,15,14,14,15,
+	 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,
+	 9,11,11,12,12,13,13,13,13,17, 8, 8, 9, 9, 9, 9,
+	 9, 9,10, 9,12,10,12,12,13,12,13,13,17, 9, 8, 9,
+	 9, 9, 9, 9, 9,10,10,12,12,12,12,13,13,13,13,17,
+	13,13, 9, 9,10,10,10,10,11,11,12,11,13,12,13,13,
+	14,15,17,13,13, 9, 8,10, 9,10,10,11,11,12,12,14,
+	13,15,13,14,15,17,17,17, 9,10, 9,10,11,11,12,12,
+	12,12,13,13,14,14,15,15,17,17,17, 9, 8, 9, 8,11,
+	11,12,12,12,12,14,13,14,14,14,15,17,17,17,12,14,
+	 9,10,11,11,12,12,14,13,13,14,15,13,15,15,17,17,
+	17,13,11,10, 8,11, 9,13,12,13,13,13,13,13,14,14,
+	14,17,17,17,17,17,11,12,11,11,13,13,14,13,15,14,
+	13,15,16,15,17,17,17,17,17,11,11,12, 8,13,12,14,
+	13,17,14,15,14,15,14,17,17,17,17,17,15,15,12,12,
+	12,12,13,14,14,14,15,14,17,14,17,17,17,17,17,16,
+	17,12,12,13,12,13,13,14,14,14,14,14,14,17,17,17,
+	17,17,17,17,14,14,13,12,13,13,15,15,14,13,15,17,
+	17,17,17,17,17,17,17,13,14,13,13,13,13,14,15,15,
+	15,14,15,17,17,17,17,17,17,17,16,15,13,14,13,13,
+	14,14,15,14,14,16,17,17,17,17,17,17,17,16,16,13,
+	14,13,13,14,14,15,14,15,14,
 };
 
 static float _vq_quantthresh__44c8_s_p9_1[] = {
@@ -15677,8 +13275,8 @@
 };
 
 static long _vq_lengthlist__44c8_s_p9_2[] = {
-	 3, 4, 3, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 6, 7, 6, 7,
+	 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,
 };
@@ -15721,13 +13319,13 @@
 };
 
 static long _huff_lengthlist__44c8_s_short[] = {
-	 4,11,13,14,16,15,16,16,17,16, 5, 6, 8, 9,10, 9,
-	11,17,16,17, 6, 6, 6, 6, 7, 8, 9,14,16,17, 8, 6,
-	 5, 4, 6, 7, 9,12,14,17, 9, 7, 6, 5, 5, 5, 8,11,
-	14,17,10, 9, 7, 6, 5, 3, 5, 8,13,17,12,11, 9, 8,
-	 7, 4, 4, 6,14,17,13,13,12, 8, 7, 5, 4, 5,12,17,
-	17,14,15,10, 8, 7, 7, 7,11,17,17,16,17,14,12,10,
-	11,11,15,17,
+	 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,
+	15,19,10, 8, 7, 6, 6, 6, 7, 9,13,15,12,10, 9, 8,
+	 7, 6, 4, 5,10,15,13,13,11, 8, 6, 6, 4, 2, 7,12,
+	17,15,16,10, 8, 8, 7, 6, 9,12,19,18,17,13,11,10,
+	10, 9,11,14,
 };
 
 static static_codebook _huff_book__44c8_s_short = {
@@ -15742,13 +13340,13 @@
 };
 
 static long _huff_lengthlist__44c9_s_long[] = {
-	 3, 8,13,14,15,15,13,13,14,14, 6, 5, 8,10,12,12,
-	13,12,13,14,10, 6, 5, 6, 8, 9,11,11,13,14,13, 8,
-	 5, 4, 5, 6, 9,10,13,14,14,11, 7, 5, 4, 5, 8, 9,
-	12,14,12,11, 8, 6, 5, 3, 5, 7,10,13,12,10,10, 8,
-	 7, 5, 4, 6, 9,12,13,12,11,10, 9, 6, 5, 5, 7,10,
-	13,12,12,11,11, 9, 8, 7, 8,10,12,12,13,13,14,12,
-	10, 9, 9,10,
+	 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,
+	11,12,13,11, 8, 6, 5, 4, 5, 7, 9,11,12,11,10, 8,
+	 7, 5, 4, 5, 9,10,13,13,11,10, 8, 6, 5, 4, 7, 9,
+	15,14,13,12,10, 9, 8, 7, 8, 9,12,12,14,13,12,11,
+	10, 9, 8, 9,
 };
 
 static static_codebook _huff_book__44c9_s_long = {
@@ -15770,8 +13368,8 @@
 
 static long _vq_lengthlist__44c9_s_p1_0[] = {
 	 1, 5, 5, 0, 5, 5, 0, 5, 5, 6, 8, 8, 0, 9, 8, 0,
-	 8, 8, 6, 8, 8, 0, 8, 9, 0, 8, 8, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 5, 8, 8, 0, 8, 7, 0, 8, 8, 5, 8, 8,
+	 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,
 	 0, 7, 8, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
 	 9, 8, 0, 8, 8, 0, 7, 7, 5, 8, 9, 0, 8, 8, 0, 7,
 	 7,
@@ -15812,45 +13410,45 @@
 };
 
 static long _vq_lengthlist__44c9_s_p2_0[] = {
-	 3, 6, 6, 8, 8, 0, 6, 6, 8, 8, 0, 5, 5, 8, 8, 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,
-	 7, 9, 9, 0, 7, 7, 9, 9, 0, 9, 9,11,10, 0, 0, 0,
-	10,10, 6, 7, 7, 8, 9, 0, 7, 8, 9, 9, 0, 7, 7, 9,
-	 9, 0, 9, 9,10,11, 0, 0, 0,10,10, 8, 9, 9,10,10,
-	 0,10,10,11,11, 0,10,10,11,11, 0,12,12,13,12, 0,
-	 0, 0,13,13, 8, 8, 9,10,10, 0,10,10,11,12, 0,10,
-	10,11,11, 0,12,12,13,13, 0, 0, 0,13,13, 0, 0, 0,
+	 8, 9, 9, 0, 8, 7, 9, 9, 0, 9,10,10,10, 0, 0, 0,
+	11,10, 6, 7, 7, 8, 9, 0, 8, 8, 9, 9, 0, 7, 8, 9,
+	 9, 0,10, 9,11,10, 0, 0, 0,10,10, 8, 9, 8,10,10,
+	 0,10,10,12,11, 0,10,10,11,11, 0,12,13,13,13, 0,
+	 0, 0,13,12, 8, 8, 9,10,10, 0,10,10,11,12, 0,10,
+	10,11,11, 0,13,12,13,13, 0, 0, 0,13,13, 0, 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, 8, 7,10,10, 0, 7, 7,10, 9,
-	 0, 7, 7,10,10, 0, 9, 8,10,10, 0, 0, 0,10,10, 6,
-	 7, 7,10,10, 0, 7, 7, 9,10, 0, 7, 7,10,10, 0, 8,
-	 9,10,10, 0, 0, 0,10,10, 8, 9, 9,11,11, 0,10, 9,
-	11,11, 0,10,10,11,11, 0,11,11,12,12, 0, 0, 0,12,
-	12, 8, 9, 9,11,11, 0, 9,10,11,11, 0,10,10,11,11,
-	 0,11,11,12,12, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0,
+	 0, 7, 7,10,10, 0, 9, 9,10,10, 0, 0, 0,10,10, 6,
+	 7, 8,10,10, 0, 7, 7, 9,10, 0, 7, 7,10,10, 0, 9,
+	 9,10,10, 0, 0, 0,10,10, 8, 9, 9,11,11, 0,10,10,
+	11,11, 0,10,10,11,11, 0,12,12,12,12, 0, 0, 0,12,
+	12, 8, 9,10,11,11, 0, 9,10,11,11, 0,10,10,11,11,
+	 0,12,12,12,12, 0, 0, 0,12,12, 0, 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, 8, 7,10,10, 0, 7, 7,10,10, 0, 7, 7,
-	10, 9, 0, 8, 9,10,10, 0, 0, 0,10, 9, 5, 7, 8,10,
-	10, 0, 7, 7,10,10, 0, 7, 7, 9,10, 0, 9, 8,10,10,
-	 0, 0, 0,10,10, 8, 9, 9,12,11, 0,10,10,11,11, 0,
-	10, 9,11,11, 0,11,11,12,12, 0, 0, 0,12,12, 8, 9,
-	 9,11,11, 0,10,10,11,11, 0, 9,10,11,11, 0,11,11,
+	10, 9, 0, 9, 9,10,10, 0, 0, 0,10,10, 6, 7, 8,10,
+	10, 0, 7, 7,10,10, 0, 7, 7, 9,10, 0, 9, 9,10,10,
+	 0, 0, 0,10,10, 8,10, 9,12,11, 0,10,10,12,11, 0,
+	10, 9,11,11, 0,11,12,12,12, 0, 0, 0,12,12, 8, 9,
+	10,11,12, 0,10,10,11,11, 0, 9,10,11,11, 0,12,11,
 	12,12, 0, 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 7, 9, 9,12,12, 0, 9, 9,11,11, 0, 8, 9,11,11, 0,
-	10, 9,12,11, 0, 0, 0,11,11, 7, 9, 9,12,12, 0, 8,
-	 9,11,11, 0, 9, 8,11,11, 0, 9,10,11,11, 0, 0, 0,
-	11,11, 9,11,11,13,13, 0,10,10,12,12, 0,10,10,12,
-	12, 0,12,11,12,12, 0, 0, 0,13,13, 9,10,11,13,13,
-	 0,10,10,12,12, 0,10,10,12,12, 0,11,11,12,12, 0,
-	 0, 0,12,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 7,10, 9,12,12, 0, 9, 9,12,11, 0, 9, 9,11,11, 0,
+	10,10,12,11, 0, 0, 0,11,12, 7, 9,10,12,12, 0, 9,
+	 9,11,12, 0, 9, 9,11,11, 0,10,10,11,12, 0, 0, 0,
+	11,11, 9,11,10,13,12, 0,10,10,12,12, 0,10,10,12,
+	12, 0,11,11,12,12, 0, 0, 0,13,12, 9,10,11,12,13,
+	 0,10,10,12,12, 0,10,10,12,12, 0,11,12,12,12, 0,
+	 0, 0,12,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
-	11,10,13,13, 0,10,10,12,12, 0,10, 9,12,12, 0,11,
-	11,12,13, 0, 0, 0,12,11, 9,10,10,12,13, 0,10,10,
-	12,12, 0,10,10,12,12, 0,11,11,13,12, 0, 0, 0,12,
+	11,10,13,13, 0,10,10,12,12, 0,10,10,12,12, 0,11,
+	12,12,12, 0, 0, 0,12,12, 9,10,11,13,13, 0,10,10,
+	12,12, 0,10,10,12,12, 0,12,11,13,12, 0, 0, 0,12,
 	12,
 };
 
@@ -15893,7 +13491,7 @@
 };
 
 static long _vq_lengthlist__44c9_s_p3_0[] = {
-	 3, 4, 4, 5, 5, 6, 6, 8, 8, 0, 4, 4, 5, 5, 7, 6,
+	 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,
 	 7, 7, 8, 8, 9, 9, 0, 0, 0, 7, 7, 8, 8, 9, 9, 0,
@@ -15949,16 +13547,16 @@
 };
 
 static long _vq_lengthlist__44c9_s_p4_0[] = {
-	 4, 4, 4, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9,10,
-	10, 0, 5, 5, 5, 5, 6, 6, 8, 7, 8, 8, 9, 9,10,10,
-	11,11, 0, 5, 5, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,
-	10,11,11, 0, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,
-	11,11,12,12, 0, 0, 0, 6, 6, 7, 7, 8, 8, 9, 9,10,
+	 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,
+	10,11,11, 0, 6, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,
+	11,11,11,12, 0, 0, 0, 6, 6, 7, 7, 8, 8, 9, 9,10,
 	10,11,11,12,12, 0, 0, 0, 7, 7, 7, 7, 9, 9, 9, 9,
-	11,11,11,11,12,12, 0, 0, 0, 7, 7, 7, 8, 9, 9, 9,
-	 9,11,10,11,11,12,12, 0, 0, 0, 7, 7, 7, 7, 9, 9,
-	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 7, 7, 9,
-	 9,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 0, 0,
+	10,10,11,11,12,12, 0, 0, 0, 7, 7, 7, 8, 9, 9, 9,
+	 9,10,10,11,11,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,
+	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 8, 8, 9,
+	 9,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -16006,11 +13604,11 @@
 };
 
 static long _vq_lengthlist__44c9_s_p5_0[] = {
-	 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 6, 6,10,10,10,10,
-	10,10, 4, 6, 6,10,10,10,10,10,10, 5,10,10, 9,12,
-	12,10,12,12, 7,10,10,12,12,12,12,12,13, 7,10,10,
-	12,12,12,12,13,13, 6,10,10,10,12,12,11,12,12, 8,
-	10,10,12,12,12,12,12,12, 7,10,10,12,12,13,12,12,
+	 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,
+	11,11,12,12,12,12, 6,10,10,10,12,12,10,12,11, 7,
+	10,10,11,12,12,11,12,12, 7,10,10,11,12,12,12,12,
 	12,
 };
 
@@ -16055,12 +13653,12 @@
 };
 
 static long _vq_lengthlist__44c9_s_p5_1[] = {
-	 4, 5, 5, 6, 6, 6, 7, 7, 7, 7, 7,10, 5, 5, 6, 6,
-	 7, 7, 7, 7, 8, 8,10, 5, 5, 6, 6, 7, 7, 7, 7, 8,
+	 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,
-	 6, 7, 7, 8, 8, 8, 8,11,11,11, 6, 6, 7, 7, 8, 8,
+	 6, 7, 7, 7, 8, 8, 8,11,11,11, 6, 6, 7, 7, 7, 8,
 	 8, 8,11,11,11, 6, 6, 7, 7, 7, 7, 8, 8,11,11,11,
-	 7, 7, 7, 7, 7, 7, 8, 8,11,11,11,11,11, 7, 7, 7,
+	 7, 7, 7, 7, 7, 7, 8, 8,11,11,11,10,10, 7, 7, 7,
 	 7, 8, 8,11,11,11,11,11, 7, 7, 7, 7, 7, 7,11,11,
 	11,11,11, 7, 7, 7, 7, 7, 7,
 };
@@ -16110,12 +13708,12 @@
 };
 
 static long _vq_lengthlist__44c9_s_p6_0[] = {
-	 2, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 5, 4, 4,
-	 6, 6, 8, 8, 9, 9,10,10,11,11, 6, 4, 4, 6, 6, 8,
-	 8, 9, 9,10,10,12,12, 0, 6, 6, 6, 6, 8, 8,10,10,
-	11,11,12,12, 0, 6, 6, 6, 6, 8, 8,10,10,11,11,12,
-	12, 0,10,10, 8, 8, 9, 9,11,11,12,12,13,13, 0,11,
-	11, 8, 8, 9,10,11,11,12,12,13,13, 0, 0, 0, 0, 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,
+	10,10,11,11, 0, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,
+	11, 0,10,10, 8, 8, 9, 9,10,10,11,11,12,12, 0,11,
+	11, 8, 8, 9, 9,10,10,11,11,12,12, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -16207,17 +13805,17 @@
 };
 
 static long _vq_lengthlist__44c9_s_p7_0[] = {
-	 1, 4, 4, 7, 7, 8, 8, 9, 9,10,10,11,11, 6, 5, 5,
-	 7, 7, 9, 8,10,10,11,11,12,12, 6, 5, 5, 7, 7, 9,
-	 9,10,10,11,11,12,12,20, 6, 6, 7, 7, 9, 9,10,10,
-	11,11,12,12,20, 7, 7, 7, 7, 9, 9,10,10,11,11,13,
-	12,20,10,10, 8, 8, 9, 9,11,11,12,12,13,13,20,11,
-	11, 8, 8, 9, 9,11,11,12,12,13,13,20,20,20,10,10,
-	10,10,11,11,12,12,13,13,20,20,20,10,10,10,10,11,
-	11,12,12,13,13,20,20,20,14,14,11,11,12,12,13,13,
-	14,13,20,20,20,14,15,11,11,11,11,13,13,14,13,20,
-	20,20,20,19,12,12,12,12,13,13,14,14,19,19,19,19,
-	19,13,13,12,12,13,13,14,14,
+	 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,
+	11,11,12,12,20, 6, 6, 6, 6, 8, 8,10,10,11,11,12,
+	12,20,10,10, 7, 7, 9, 9,10,10,11,11,12,12,20,11,
+	11, 7, 7, 9, 9,10,10,11,11,12,12,20,20,20, 9, 9,
+	 9, 9,11,11,12,12,13,13,20,20,20, 9, 9, 9, 9,11,
+	11,12,12,13,13,20,20,20,13,13,10,10,11,11,12,13,
+	13,13,20,20,20,13,13,10,10,11,11,12,13,13,13,20,
+	20,20,20,19,12,12,12,12,13,13,14,15,19,19,19,19,
+	19,12,12,12,12,13,13,14,14,
 };
 
 static float _vq_quantthresh__44c9_s_p7_0[] = {
@@ -16263,8 +13861,8 @@
 };
 
 static long _vq_lengthlist__44c9_s_p7_1[] = {
-	 5, 6, 6, 6, 6, 7, 6, 7, 7, 7, 7, 8, 6, 6, 6, 6,
-	 7, 7, 7, 7, 7, 7, 8, 6, 6, 6, 6, 7, 7, 7, 7, 7,
+	 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,
 	 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 7, 7, 7, 7, 7, 7,
 	 7, 7, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8,
@@ -16320,20 +13918,20 @@
 };
 
 static long _vq_lengthlist__44c9_s_p8_0[] = {
-	 1, 4, 4, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,11, 6,
+	 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,19, 7, 8,
-	 8, 8, 9, 9, 9, 9,10,10,11,11,12,13,19, 8, 8, 8,
-	 8, 9, 9, 9, 9,10,10,11,12,12,12,19,12,12, 9, 9,
-	 9,10, 9,10,10,10,12,12,12,12,19,12,12, 9, 9,10,
-	 9,10,10,11,11,12,11,13,13,19,19,19, 9, 9, 9, 9,
-	10,10,11,11,12,12,12,12,19,19,19, 9, 9, 9, 9,10,
-	10,11,11,12,12,13,13,19,19,19,13,13,10,10,10,10,
-	12,12,12,12,13,13,19,19,19,13,13,10,10,10,10,12,
-	12,12,12,13,13,19,19,19,19,19,11,12,11,11,12,12,
-	13,12,13,13,19,19,19,18,18,12,11,11,10,12,11,13,
-	13,13,14,18,18,18,18,18,15,16,12,12,13,12,13,13,
-	14,14,18,18,18,18,18,16,15,12,11,12,11,13,13,14,
+	 5, 7, 7, 9, 9, 9, 9,10,10,11,11,12,12,21, 7, 8,
+	 8, 8, 9, 9, 9, 9,10,10,11,11,12,12,21, 8, 8, 8,
+	 8, 9, 9, 9, 9,10,10,11,11,12,12,21,11,12, 9, 9,
+	10,10,10,10,10,11,11,12,12,12,21,12,12, 9, 8,10,
+	10,10,10,11,11,12,12,13,13,21,21,21, 9, 9, 9, 9,
+	11,11,11,11,12,12,12,13,21,20,20, 9, 9, 9, 9,10,
+	11,11,11,12,12,13,13,20,20,20,13,13,10,10,11,11,
+	12,12,13,13,13,13,20,20,20,13,13,10,10,11,11,12,
+	12,13,13,13,13,20,20,20,20,20,12,12,12,12,12,12,
+	13,13,14,14,20,20,20,20,20,12,12,12,11,13,12,13,
+	13,14,14,20,20,20,20,20,15,16,13,12,13,13,14,13,
+	14,14,20,20,20,20,20,16,15,12,12,13,12,14,13,14,
 	14,
 };
 
@@ -16390,34 +13988,34 @@
 };
 
 static long _vq_lengthlist__44c9_s_p8_1[] = {
-	 4, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,
+	 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,
 	 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9,10,10,10, 7, 8, 8, 8, 9, 9, 9, 9, 9,
+	 7, 7, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9,10,10,10, 8, 8, 8, 8, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10, 8, 8, 8, 8,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,
 	10, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9,10,10,10, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,
 	10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 	 9, 9,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,
-	10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9,10,10,10,10,10,10,10, 9, 9, 9, 9,10,10,10,10,
-	 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,
-	10,10, 9, 9, 9, 9, 9,10, 9, 9, 9, 9, 9, 9, 9, 9,
-	10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 9, 9,10,10,10,10,
+	10,10,10, 9, 9, 9, 9, 9, 9,10, 9, 9, 9, 9, 9, 9,
+	 9,10,10,10,10,10,10,10, 9, 9, 9,10,10,10,10,10,
+	 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10, 9, 9,10,
+	 9,10, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,
+	10,10,10,10, 9, 9,10,10, 9, 9, 9, 9, 9, 9, 9, 9,
+	10,10,10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9,
 	 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,
-	10,10, 9, 9, 9,10, 9, 9, 9, 9,10,10,10,10,10,10,
-	10,10,10, 9,10, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,
-	10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9,
+	10,10, 9, 9,10, 9, 9, 9, 9, 9,10,10,10,10,10,10,
+	10,10,10,10,10, 9, 9,10,10, 9, 9,10, 9, 9, 9,10,
+	10,10,10,10,10,10,10,10,10,10, 9, 9,10, 9, 9, 9,
 	 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9,10, 9, 9, 9, 9, 9,
 };
 
 static float _vq_quantthresh__44c9_s_p8_1[] = {
@@ -16473,29 +14071,29 @@
 };
 
 static long _vq_lengthlist__44c9_s_p9_0[] = {
-	 1, 4, 4,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10, 7, 9,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10,10, 7, 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,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,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,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,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,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,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,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,
-	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, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 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,
+	12,12,12,12,12,12,12,12,12,12,12,11,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	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,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,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,
 };
 
 static float _vq_quantthresh__44c9_s_p9_0[] = {
@@ -16551,29 +14149,29 @@
 };
 
 static long _vq_lengthlist__44c9_s_p9_1[] = {
-	 1, 4, 4, 7, 7, 8, 8, 8, 8, 9,10,10,10,12,11,12,
-	13,13,12, 6, 5, 5, 8, 8, 8, 9, 8, 9,10,10,11,11,
-	12,12,14,13,13,12, 5, 5, 5, 8, 8, 9, 8, 8, 9,10,
-	10,11,11,12,12,14,12,13,13,16, 8, 8, 9, 9, 9, 9,
-	 9, 9,10,10,11,12,13,13,13,13,14,14,16, 8, 8, 9,
-	 9, 9, 9, 9, 9,11,11,12,11,13,13,14,13,13,13,16,
-	14,13, 9, 9, 9, 9,10,10,11,12,12,13,13,13,14,13,
-	15,14,16,13,13, 9, 8, 9, 9,10,10,12,11,13,13,14,
-	14,14,14,15,14,16,16,16, 9, 9, 9, 9,10,10,12,12,
-	12,13,13,13,15,13,15,15,16,16,16, 9, 7, 9, 8,10,
-	11,11,12,12,13,13,16,15,14,14,14,16,16,16,13,13,
-	10,10,11,11,13,15,13,14,13,14,14,13,14,14,16,16,
-	16,13,12,10, 9,11,11,12,12,14,14,13,14,14,14,14,
-	14,16,16,16,16,16,12,13,11,11,12,13,13,13,14,15,
-	14,14,16,15,16,16,16,16,16,12,11,12,12,15,13,13,
-	13,14,13,15,14,15,14,16,16,16,16,16,14,15,12,13,
-	13,12,14,15,15,14,15,14,15,13,16,16,16,16,16,16,
-	16,13,13,14,12,16,12,16,15,14,15,14,14,16,16,16,
-	16,16,16,16,15,14,14,14,15,16,16,16,16,14,16,16,
-	16,16,16,16,16,16,16,14,14,14,12,15,11,15,13,16,
-	15,16,15,16,16,16,16,16,16,16,15,16,14,14,15,13,
-	15,16,16,16,16,15,16,16,16,16,16,16,16,16,16,15,
-	15,14,13,14,16,16,14,15,16,
+	 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,
+	10,11,11,12,12,13,12,13,13,17, 8, 8, 9, 9, 9, 9,
+	 9, 9,10,10,12,11,13,12,13,13,13,13,18, 8, 8, 9,
+	 9, 9, 9, 9, 9,11,11,12,12,13,13,13,13,13,13,17,
+	13,12, 9, 9,10,10,10,10,11,11,12,12,12,13,13,13,
+	14,14,18,13,12, 9, 9,10,10,10,10,11,11,12,12,13,
+	13,13,14,14,14,17,18,18,10,10,10,10,11,11,11,12,
+	12,12,14,13,14,13,13,14,18,18,18,10, 9,10, 9,11,
+	11,12,12,12,12,13,13,15,14,14,14,18,18,16,13,14,
+	10,11,11,11,12,13,13,13,13,14,13,13,14,14,18,18,
+	18,14,12,11, 9,11,10,13,12,13,13,13,14,14,14,13,
+	14,18,18,17,18,18,11,12,12,12,13,13,14,13,14,14,
+	13,14,14,14,18,18,18,18,17,12,10,12, 9,13,11,13,
+	14,14,14,14,14,15,14,18,18,17,17,18,14,15,12,13,
+	13,13,14,13,14,14,15,14,15,14,18,17,18,18,18,15,
+	15,12,10,14,10,14,14,13,13,14,14,14,14,18,16,18,
+	18,18,18,17,14,14,13,14,14,13,13,14,14,14,15,15,
+	18,18,18,18,17,17,17,14,14,14,12,14,13,14,14,15,
+	14,15,14,18,18,18,18,18,18,18,17,16,13,13,13,14,
+	14,14,14,15,16,15,18,18,18,18,18,18,18,17,17,13,
+	13,13,13,14,13,14,15,15,15,
 };
 
 static float _vq_quantthresh__44c9_s_p9_1[] = {
@@ -16659,9 +14257,9 @@
 };
 
 static long _vq_lengthlist__44c9_s_p9_2[] = {
-	 3, 4, 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, 6, 6, 6, 6,
-	 6, 7, 6, 6, 7, 7, 6, 7, 6, 7, 7, 7, 7, 7, 7, 7,
+	 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,
 };
 
@@ -16703,13 +14301,13 @@
 };
 
 static long _huff_lengthlist__44c9_s_short[] = {
-	 5,13,17,15,16,16,18,17,18,18, 5, 7,10,12,12,12,
-	12,17,18,17, 7, 6, 7, 8, 9, 9, 9,13,17,17, 8, 6,
-	 6, 5, 6, 7, 8,11,16,18, 9, 7, 7, 5, 5, 6, 7,10,
-	15,18, 9, 8, 7, 6, 5, 4, 5, 7,13,17,11,11, 9, 8,
-	 7, 4, 3, 5,12,18,13,13,12,10, 7, 5, 4, 3, 8,13,
-	16,16,16,13, 8, 8, 7, 5, 8,12,15,18,17,15,11,10,
-	 9, 8,10,14,
+	 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,
+	15,19, 9, 8, 7, 6, 5, 5, 6, 8,13,15,11,10, 8, 8,
+	 7, 5, 4, 4,10,14,12,13,11, 9, 7, 6, 4, 2, 6,12,
+	18,16,16,13, 8, 7, 7, 5, 8,13,16,17,18,15,11, 9,
+	 9, 8,10,13,
 };
 
 static static_codebook _huff_book__44c9_s_short = {
@@ -16723,25 +14321,45 @@
 	0
 };
 
-static long _vq_quantlist__8c0_s_p1_0[] = {
+static 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,
+	 7, 7, 7, 7,10,12,10,10,11, 9, 8, 7, 7, 9,11,11,
+	12,13,12,11, 9, 8, 9,11,13,16,16,15,15,12,10,11,
+	12,
+};
+
+static static_codebook _huff_book__44c0_s_long = {
+	2, 81,
+	_huff_lengthlist__44c0_s_long,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c0_s_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__8c0_s_p1_0[] = {
-	 1, 5, 4, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0,
+static 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,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 8, 0, 0, 0, 0, 0, 0, 7, 8, 9, 0, 0, 0,
-	 0, 0, 0, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 5, 8, 7, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0, 0,
+	 0, 0, 0, 7, 9, 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, 0, 0, 0, 0, 0, 0, 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, 8, 8, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
-	 0, 0, 0, 0, 7, 9, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
+	 0, 0, 0, 0, 7, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -16775,18 +14393,18 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 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, 8, 8, 0, 0, 0, 0,
-	 0, 0, 8,10,10, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0,
+	 0, 0, 8,10, 9, 0, 0, 0, 0, 0, 0, 7, 9, 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, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7,10, 9, 0, 0, 0,
-	 0, 0, 0, 8, 9,11, 0, 0, 0, 0, 0, 0, 9,11,11, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0, 0,
+	 0, 0, 0, 9,10,11, 0, 0, 0, 0, 0, 0, 9,11,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, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9,10, 0, 0,
-	 0, 0, 0, 0, 9,11,10, 0, 0, 0, 0, 0, 0, 9,11,11,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
+	 0, 0, 0, 0, 9,11, 9, 0, 0, 0, 0, 0, 0, 9,10,11,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -16821,18 +14439,18 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0, 0,
-	 0, 0, 0, 0, 8, 9,10, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
+	 0, 0, 0, 0, 8, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 9,11,11, 0,
-	 0, 0, 0, 0, 0, 9,10,11, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 9,11,10, 0,
+	 0, 0, 0, 0, 0, 9, 9,11, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 7, 9,10, 0, 0, 0, 0, 0, 0, 9,11,11,
-	 0, 0, 0, 0, 0, 0, 8,11, 9, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 7, 9,10, 0, 0, 0, 0, 0, 0, 9,10,11,
+	 0, 0, 0, 0, 0, 0, 9,11,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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -17143,33 +14761,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__8c0_s_p1_0[] = {
+static float _vq_quantthresh__44c0_s_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__8c0_s_p1_0[] = {
+static long _vq_quantmap__44c0_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 encode_aux_threshmatch _vq_auxt__44c0_s_p1_0 = {
+	_vq_quantthresh__44c0_s_p1_0,
+	_vq_quantmap__44c0_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _8c0_s_p1_0 = {
+static static_codebook _44c0_s_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__8c0_s_p1_0,
+	_vq_lengthlist__44c0_s_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__8c0_s_p1_0,
+	_vq_quantlist__44c0_s_p1_0,
 	NULL,
-	&_vq_auxt__8c0_s_p1_0,
+	&_vq_auxt__44c0_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p2_0[] = {
+static long _vq_quantlist__44c0_s_p2_0[] = {
 	2,
 	1,
 	3,
@@ -17177,9 +14795,14 @@
 	4,
 };
 
-static long _vq_lengthlist__8c0_s_p2_0[] = {
+static 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,
+	 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, 0, 0, 6, 7, 7, 9, 9,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 6, 7, 7, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -17212,56 +14835,1101 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
 };
 
-static float _vq_quantthresh__8c0_s_p2_0[] = {
+static float _vq_quantthresh__44c0_s_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8c0_s_p2_0[] = {
+static long _vq_quantmap__44c0_s_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c0_s_p2_0 = {
-	_vq_quantthresh__8c0_s_p2_0,
-	_vq_quantmap__8c0_s_p2_0,
+static encode_aux_threshmatch _vq_auxt__44c0_s_p2_0 = {
+	_vq_quantthresh__44c0_s_p2_0,
+	_vq_quantmap__44c0_s_p2_0,
 	5,
 	5
 };
 
-static static_codebook _8c0_s_p2_0 = {
+static static_codebook _44c0_s_p2_0 = {
 	4, 625,
-	_vq_lengthlist__8c0_s_p2_0,
+	_vq_lengthlist__44c0_s_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8c0_s_p2_0,
+	_vq_quantlist__44c0_s_p2_0,
 	NULL,
-	&_vq_auxt__8c0_s_p2_0,
+	&_vq_auxt__44c0_s_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p3_0[] = {
+static long _vq_quantlist__44c0_s_p3_0[] = {
+	4,
+	3,
+	5,
 	2,
+	6,
 	1,
+	7,
+	0,
+	8,
+};
+
+static 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,
+	 8, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0,
+	 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,
+};
+
+static 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[] = {
+	    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,
+	9,
+	9
+};
+
+static static_codebook _44c0_s_p3_0 = {
+	2, 81,
+	_vq_lengthlist__44c0_s_p3_0,
+	1, -531628032, 1611661312, 4, 0,
+	_vq_quantlist__44c0_s_p3_0,
+	NULL,
+	&_vq_auxt__44c0_s_p3_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c0_s_p4_0[] = {
+	4,
 	3,
+	5,
+	2,
+	6,
+	1,
+	7,
 	0,
+	8,
+};
+
+static 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,
+	 9, 9, 8, 8,10,10, 0, 0, 0, 8, 9, 8, 8,10,10, 0,
+	 0, 0,10,10, 9, 9,10,10, 0, 0, 0, 0, 0, 9, 9,10,
+	10,
+};
+
+static 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[] = {
+	    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,
+	9,
+	9
+};
+
+static static_codebook _44c0_s_p4_0 = {
+	2, 81,
+	_vq_lengthlist__44c0_s_p4_0,
+	1, -531628032, 1611661312, 4, 0,
+	_vq_quantlist__44c0_s_p4_0,
+	NULL,
+	&_vq_auxt__44c0_s_p4_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c0_s_p5_0[] = {
+	8,
+	7,
+	9,
+	6,
+	10,
+	5,
+	11,
 	4,
+	12,
+	3,
+	13,
+	2,
+	14,
+	1,
+	15,
+	0,
+	16,
 };
 
-static long _vq_lengthlist__8c0_s_p3_0[] = {
+static 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,
+	10,11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,
+	11,11,11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,
+	10,11,11,11,11, 0, 0, 0, 8, 8, 9, 9, 9, 9,10,10,
+	10,10,11,11,12,12, 0, 0, 0, 8, 8, 9, 9, 9, 9,10,
+	10,10,10,11,11,12,12, 0, 0, 0, 9, 9, 9, 9,10,10,
+	10,10,11,11,11,12,12,12, 0, 0, 0, 0, 0, 9, 9,10,
+	10,10,10,11,11,11,11,12,12, 0, 0, 0, 0, 0, 9, 9,
+	10,10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9,
+	 9,10,10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0,
+	10,10,11,11,11,11,11,12,12,12,13,13, 0, 0, 0, 0,
+	 0, 0, 0,11,10,11,11,11,11,12,12,13,13, 0, 0, 0,
+	 0, 0, 0, 0,11,11,12,11,12,12,12,12,13,13, 0, 0,
+	 0, 0, 0, 0, 0,11,11,11,12,12,12,12,13,13,13, 0,
+	 0, 0, 0, 0, 0, 0,12,12,12,12,12,13,13,13,14,14,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,14,
+	14,
+};
+
+static 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[] = {
+	   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,
+	17,
+	17
+};
+
+static static_codebook _44c0_s_p5_0 = {
+	2, 289,
+	_vq_lengthlist__44c0_s_p5_0,
+	1, -529530880, 1611661312, 5, 0,
+	_vq_quantlist__44c0_s_p5_0,
+	NULL,
+	&_vq_auxt__44c0_s_p5_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c0_s_p6_0[] = {
+	1,
+	0,
+	2,
+};
+
+static 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,
+	11,10,11,11,10,10, 7,11,10,12,11,11,11,11,11, 7,
+	 9, 9,10,10,10,11,11,10, 6, 9, 9,11,10,10,11,10,
+	10,
+};
+
+static float _vq_quantthresh__44c0_s_p6_0[] = {
+	-5.5, 5.5, 
+};
+
+static 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,
+	3,
+	3
+};
+
+static static_codebook _44c0_s_p6_0 = {
+	4, 81,
+	_vq_lengthlist__44c0_s_p6_0,
+	1, -529137664, 1618345984, 2, 0,
+	_vq_quantlist__44c0_s_p6_0,
+	NULL,
+	&_vq_auxt__44c0_s_p6_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c0_s_p6_1[] = {
+	5,
+	4,
+	6,
+	3,
+	7,
+	2,
+	8,
+	1,
+	9,
+	0,
+	10,
+};
+
+static 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,
+	 7, 7, 7, 8, 8, 8, 8,10,10,10, 8, 7, 8, 8, 8, 8,
+	 8, 8,10,10,10, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10,
+	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,10,10, 8, 8, 8,
+	 8, 8, 8,10,10,10,10,10, 9, 9, 8, 8, 8, 8,10,10,
+	10,10,10, 8, 8, 8, 8, 8, 8,
+};
+
+static 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[] = {
+	    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,
+	11,
+	11
+};
+
+static static_codebook _44c0_s_p6_1 = {
+	2, 121,
+	_vq_lengthlist__44c0_s_p6_1,
+	1, -531365888, 1611661312, 4, 0,
+	_vq_quantlist__44c0_s_p6_1,
+	NULL,
+	&_vq_auxt__44c0_s_p6_1,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c0_s_p7_0[] = {
+	6,
+	5,
+	7,
+	4,
+	8,
+	3,
+	9,
+	2,
+	10,
+	1,
+	11,
+	0,
+	12,
+};
+
+static 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,
+	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
+	11, 0,12,12, 9, 9,10,10,10,10,11,11,11,11, 0,13,
+	13, 9, 9, 9, 9,10,10,11,11,11,12, 0, 0, 0,10,10,
+	10,10,11,11,11,11,12,12, 0, 0, 0,10,10, 9, 9,11,
+	11,11,12,12,12, 0, 0, 0,13,13,10,10,11,11,12,12,
+	13,13, 0, 0, 0,14,14,10,10,11,11,12,12,13,13, 0,
+	 0, 0, 0, 0,11,11,11,11,13,12,13,13, 0, 0, 0, 0,
+	 0,12,12,11,11,12,12,13,13,
+};
+
+static 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[] = {
+	   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,
+	13,
+	13
+};
+
+static static_codebook _44c0_s_p7_0 = {
+	2, 169,
+	_vq_lengthlist__44c0_s_p7_0,
+	1, -526516224, 1616117760, 4, 0,
+	_vq_quantlist__44c0_s_p7_0,
+	NULL,
+	&_vq_auxt__44c0_s_p7_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c0_s_p7_1[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static 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[] = {
+	-1.5, -0.5, 0.5, 1.5, 
+};
+
+static 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,
+	5,
+	5
+};
+
+static static_codebook _44c0_s_p7_1 = {
+	2, 25,
+	_vq_lengthlist__44c0_s_p7_1,
+	1, -533725184, 1611661312, 3, 0,
+	_vq_quantlist__44c0_s_p7_1,
+	NULL,
+	&_vq_auxt__44c0_s_p7_1,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c0_s_p8_0[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static 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,
+	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,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,10,10,10,10,10,10,10, 8,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,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,10,10,10,10,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,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,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,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,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,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,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,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,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,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,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+	11,
+};
+
+static float _vq_quantthresh__44c0_s_p8_0[] = {
+	-331.5, -110.5, 110.5, 331.5, 
+};
+
+static 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,
+	5,
+	5
+};
+
+static static_codebook _44c0_s_p8_0 = {
+	4, 625,
+	_vq_lengthlist__44c0_s_p8_0,
+	1, -518283264, 1627103232, 3, 0,
+	_vq_quantlist__44c0_s_p8_0,
+	NULL,
+	&_vq_auxt__44c0_s_p8_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c0_s_p8_1[] = {
+	6,
+	5,
+	7,
+	4,
+	8,
+	3,
+	9,
+	2,
+	10,
+	1,
+	11,
+	0,
+	12,
+};
+
+static 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,
+	12,12,13,12,16, 7, 7, 8, 7, 9, 9,10,10,11,12,12,
+	13,16,10,10, 8, 8,10,10,11,12,12,12,13,13,16,11,
+	10, 8, 7,11,10,11,11,12,11,13,13,16,16,16,10,10,
+	10,10,11,11,13,12,13,13,16,16,16,11, 9,11, 9,15,
+	13,12,13,13,13,16,16,16,15,13,11,11,12,13,12,12,
+	14,13,16,16,16,14,13,11,11,13,12,14,13,13,13,16,
+	16,16,16,16,13,13,13,12,14,13,14,14,16,16,16,16,
+	16,13,13,12,12,14,14,15,13,
+};
+
+static 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[] = {
+	   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,
+	13,
+	13
+};
+
+static static_codebook _44c0_s_p8_1 = {
+	2, 169,
+	_vq_lengthlist__44c0_s_p8_1,
+	1, -522616832, 1620115456, 4, 0,
+	_vq_quantlist__44c0_s_p8_1,
+	NULL,
+	&_vq_auxt__44c0_s_p8_1,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c0_s_p8_2[] = {
+	8,
+	7,
+	9,
+	6,
+	10,
+	5,
+	11,
+	4,
+	12,
+	3,
+	13,
+	2,
+	14,
+	1,
+	15,
+	0,
+	16,
+};
+
+static 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,
+	 9, 9, 9,10,10,10, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,
+	 9,10, 9, 9,10,10,10, 7, 7, 8, 8, 9, 8, 9, 9, 9,
+	 9,10, 9, 9,10,10,10,10, 8, 8, 8, 8, 9, 8, 9, 9,
+	 9, 9, 9,10, 9,10,10,10,10, 7, 7, 8, 8, 9, 9, 9,
+	 9, 9, 9,10, 9,10,10,10,10,10, 8, 8, 8, 9, 9, 9,
+	 9, 9, 9, 9,10,10,10, 9,11,10,10,10,10, 8, 8, 9,
+	 9, 9, 9, 9,10, 9, 9, 9,10,10,10,10,11,11, 9, 9,
+	 9, 9, 9, 9, 9, 9,10, 9, 9,10,11,10,10,11,11, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,11,11,10,11,11,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,11,10,10,11,
+	11,11,11, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,
+	11,11,11,11, 9,10, 9,10, 9, 9, 9, 9,10, 9,10,11,
+	10,11,10,10,10,10,10, 9, 9, 9,10, 9, 9, 9,10,11,
+	11,10,11,11,10,11,10,10,10, 9, 9, 9, 9,10, 9, 9,
+	10,11,10,11,11,11,11,10,11,10,10, 9,10, 9, 9, 9,
+	10,
+};
+
+static 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[] = {
+	   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,
+	17,
+	17
+};
+
+static static_codebook _44c0_s_p8_2 = {
+	2, 289,
+	_vq_lengthlist__44c0_s_p8_2,
+	1, -529530880, 1611661312, 5, 0,
+	_vq_quantlist__44c0_s_p8_2,
+	NULL,
+	&_vq_auxt__44c0_s_p8_2,
+	NULL,
+	0
+};
+
+static 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,
+	 9, 9,10,12,16,16,13, 7, 8, 7, 7, 9,12,14,15,13,
+	 6, 7, 5, 5, 7,10,13,13,14, 7, 8, 5, 6, 7, 9,10,
+	12,
+};
+
+static static_codebook _huff_book__44c0_s_short = {
+	2, 81,
+	_huff_lengthlist__44c0_s_short,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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,
+	 7, 6, 7, 8,11,12,11,11,11, 9, 8, 7, 8,10,12,12,
+	13,14,12,11, 9, 9, 9,12,12,17,17,15,16,12,10,11,
+	13,
+};
+
+static static_codebook _huff_book__44c0_sm_long = {
+	2, 81,
+	_huff_lengthlist__44c0_sm_long,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c0_sm_p1_0[] = {
+	1,
+	0,
+	2,
+};
+
+static 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,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 7, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0, 0,
+	 0, 0, 0, 7, 8, 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, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 0, 0, 0, 7, 9, 8, 0, 0,
+	 0, 0, 0, 0, 7, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 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, 8, 7, 0, 0, 0, 0,
+	 0, 0, 8, 9, 9, 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0, 0,
+	 0, 0, 0, 9,10,10, 0, 0, 0, 0, 0, 0, 9,10,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, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
+	 0, 0, 0, 0, 8,10, 9, 0, 0, 0, 0, 0, 0, 9,10,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, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 8, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
+	 0, 0, 0, 0, 8, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 9,10,10, 0,
+	 0, 0, 0, 0, 0, 9, 9,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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 9,10,10,
+	 0, 0, 0, 0, 0, 0, 9,10,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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,
+};
+
+static float _vq_quantthresh__44c0_sm_p1_0[] = {
+	-0.5, 0.5, 
+};
+
+static 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,
+	3,
+	3
+};
+
+static static_codebook _44c0_sm_p1_0 = {
+	8, 6561,
+	_vq_lengthlist__44c0_sm_p1_0,
+	1, -535822336, 1611661312, 2, 0,
+	_vq_quantlist__44c0_sm_p1_0,
+	NULL,
+	&_vq_auxt__44c0_sm_p1_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c0_sm_p2_0[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static 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, 6, 7, 7, 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,
 	 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, 0, 0, 6, 7, 7, 8, 8,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 7, 9, 9,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 6, 7, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 7, 7, 7, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -17297,33 +15965,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__8c0_s_p3_0[] = {
+static float _vq_quantthresh__44c0_sm_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8c0_s_p3_0[] = {
+static long _vq_quantmap__44c0_sm_p2_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 encode_aux_threshmatch _vq_auxt__44c0_sm_p2_0 = {
+	_vq_quantthresh__44c0_sm_p2_0,
+	_vq_quantmap__44c0_sm_p2_0,
 	5,
 	5
 };
 
-static static_codebook _8c0_s_p3_0 = {
+static static_codebook _44c0_sm_p2_0 = {
 	4, 625,
-	_vq_lengthlist__8c0_s_p3_0,
+	_vq_lengthlist__44c0_sm_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8c0_s_p3_0,
+	_vq_quantlist__44c0_sm_p2_0,
 	NULL,
-	&_vq_auxt__8c0_s_p3_0,
+	&_vq_auxt__44c0_sm_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p4_0[] = {
+static long _vq_quantlist__44c0_sm_p3_0[] = {
 	4,
 	3,
 	5,
@@ -17335,43 +16003,43 @@
 	8,
 };
 
-static 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,
-	 8, 8, 0, 0, 0, 0, 0, 0, 0, 9, 8, 0, 0, 0, 0, 0,
-	 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+static 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,
+	 9,10, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0,
+	 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
 };
 
-static float _vq_quantthresh__8c0_s_p4_0[] = {
+static 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__8c0_s_p4_0[] = {
+static long _vq_quantmap__44c0_sm_p3_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 encode_aux_threshmatch _vq_auxt__44c0_sm_p3_0 = {
+	_vq_quantthresh__44c0_sm_p3_0,
+	_vq_quantmap__44c0_sm_p3_0,
 	9,
 	9
 };
 
-static static_codebook _8c0_s_p4_0 = {
+static static_codebook _44c0_sm_p3_0 = {
 	2, 81,
-	_vq_lengthlist__8c0_s_p4_0,
+	_vq_lengthlist__44c0_sm_p3_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__8c0_s_p4_0,
+	_vq_quantlist__44c0_sm_p3_0,
 	NULL,
-	&_vq_auxt__8c0_s_p4_0,
+	&_vq_auxt__44c0_sm_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p5_0[] = {
+static long _vq_quantlist__44c0_sm_p4_0[] = {
 	4,
 	3,
 	5,
@@ -17383,43 +16051,43 @@
 	8,
 };
 
-static 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,
-	 9, 9, 8, 8,10,10, 0, 0, 0, 9, 9, 8, 8,10,10, 0,
-	 0, 0,10,10, 9, 9,10,10, 0, 0, 0, 0, 0, 9, 9,10,
-	10,
+static 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,
+	 9, 9, 9, 9,11,11, 0, 0, 0, 9, 9, 9, 9,11,11, 0,
+	 0, 0,10,10,10,10,11,11, 0, 0, 0, 0, 0, 9, 9,11,
+	11,
 };
 
-static float _vq_quantthresh__8c0_s_p5_0[] = {
+static 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__8c0_s_p5_0[] = {
+static long _vq_quantmap__44c0_sm_p4_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 encode_aux_threshmatch _vq_auxt__44c0_sm_p4_0 = {
+	_vq_quantthresh__44c0_sm_p4_0,
+	_vq_quantmap__44c0_sm_p4_0,
 	9,
 	9
 };
 
-static static_codebook _8c0_s_p5_0 = {
+static static_codebook _44c0_sm_p4_0 = {
 	2, 81,
-	_vq_lengthlist__8c0_s_p5_0,
+	_vq_lengthlist__44c0_sm_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__8c0_s_p5_0,
+	_vq_quantlist__44c0_sm_p4_0,
 	NULL,
-	&_vq_auxt__8c0_s_p5_0,
+	&_vq_auxt__44c0_sm_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p6_0[] = {
+static long _vq_quantlist__44c0_sm_p5_0[] = {
 	8,
 	7,
 	9,
@@ -17439,99 +16107,99 @@
 	16,
 };
 
-static 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,
-	11,12,11, 0, 0, 0, 8, 8, 9, 9,10,10, 9, 9,10,10,
-	11,11,12,12, 0, 0, 0, 8, 8, 9, 9,10,10, 9, 9,11,
-	10,11,11,12,12, 0, 0, 0, 9, 9, 9, 9,10,10,10,10,
-	11,11,11,12,12,12, 0, 0, 0, 9, 9, 9, 9,10,10,10,
-	10,11,11,12,12,13,13, 0, 0, 0,10,10,10,10,11,11,
-	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0,10, 9,10,
-	11,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,
-	10, 9,10,11,12,12,13,13,14,13, 0, 0, 0, 0, 0, 9,
-	 9, 9,10,10,10,11,11,13,12,13,13, 0, 0, 0, 0, 0,
-	10,10,10,10,11,11,12,12,13,13,14,14, 0, 0, 0, 0,
-	 0, 0, 0,10,10,11,11,12,12,13,13,13,14, 0, 0, 0,
-	 0, 0, 0, 0,11,11,11,11,12,12,13,14,14,14, 0, 0,
-	 0, 0, 0, 0, 0,11,11,11,11,12,12,13,13,14,13, 0,
-	 0, 0, 0, 0, 0, 0,11,11,12,12,13,13,14,14,14,14,
+static 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,
+	11,11,11, 0, 7, 7, 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,11,12,12, 0, 0, 0, 8, 8, 9, 9,10,10,10,10,
+	11,11,11,11,12,12, 0, 0, 0, 8, 8, 9, 9,10,10,10,
+	10,11,11,11,11,12,12, 0, 0, 0, 9, 9, 9, 9,10,10,
+	10,10,11,11,12,12,12,13, 0, 0, 0, 0, 0, 9, 9,10,
+	10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,
+	10,10,11,11,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9,
+	 9,10,10,11,10,11,11,12,12,13,13, 0, 0, 0, 0, 0,
+	10,10,10,10,11,11,12,12,12,13,13,13, 0, 0, 0, 0,
+	 0, 0, 0,10,10,11,11,12,12,12,13,13,13, 0, 0, 0,
+	 0, 0, 0, 0,11,11,12,12,12,12,13,13,14,14, 0, 0,
+	 0, 0, 0, 0, 0,11,11,12,11,12,12,13,13,13,13, 0,
+	 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,13,13,14,14,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,14,
 	14,
 };
 
-static float _vq_quantthresh__8c0_s_p6_0[] = {
+static 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__8c0_s_p6_0[] = {
+static 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__8c0_s_p6_0 = {
-	_vq_quantthresh__8c0_s_p6_0,
-	_vq_quantmap__8c0_s_p6_0,
+static encode_aux_threshmatch _vq_auxt__44c0_sm_p5_0 = {
+	_vq_quantthresh__44c0_sm_p5_0,
+	_vq_quantmap__44c0_sm_p5_0,
 	17,
 	17
 };
 
-static static_codebook _8c0_s_p6_0 = {
+static static_codebook _44c0_sm_p5_0 = {
 	2, 289,
-	_vq_lengthlist__8c0_s_p6_0,
+	_vq_lengthlist__44c0_sm_p5_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__8c0_s_p6_0,
+	_vq_quantlist__44c0_sm_p5_0,
 	NULL,
-	&_vq_auxt__8c0_s_p6_0,
+	&_vq_auxt__44c0_sm_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p7_0[] = {
+static long _vq_quantlist__44c0_sm_p6_0[] = {
 	1,
 	0,
 	2,
 };
 
-static 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,
-	11,11,11,11,10,10, 7,10,11,12,11,11,12,11,12, 6,
-	 9, 9,10, 9, 9,11,10,10, 6, 9, 9,10,10,10,11,10,
-	10,
+static 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,
+	11,10,11,11,10,10, 7,11,10,11,11,11,11,11,11, 6,
+	 9, 9,11,10,10,11,11,10, 6, 9, 9,11,10,10,11,10,
+	11,
 };
 
-static float _vq_quantthresh__8c0_s_p7_0[] = {
+static float _vq_quantthresh__44c0_sm_p6_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__8c0_s_p7_0[] = {
+static long _vq_quantmap__44c0_sm_p6_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 encode_aux_threshmatch _vq_auxt__44c0_sm_p6_0 = {
+	_vq_quantthresh__44c0_sm_p6_0,
+	_vq_quantmap__44c0_sm_p6_0,
 	3,
 	3
 };
 
-static static_codebook _8c0_s_p7_0 = {
+static static_codebook _44c0_sm_p6_0 = {
 	4, 81,
-	_vq_lengthlist__8c0_s_p7_0,
+	_vq_lengthlist__44c0_sm_p6_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__8c0_s_p7_0,
+	_vq_quantlist__44c0_sm_p6_0,
 	NULL,
-	&_vq_auxt__8c0_s_p7_0,
+	&_vq_auxt__44c0_sm_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p7_1[] = {
+static long _vq_quantlist__44c0_sm_p6_1[] = {
 	5,
 	4,
 	6,
@@ -17545,46 +16213,46 @@
 	10,
 };
 
-static 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,
-	 8, 9, 9, 9, 9, 8, 9,10,10,10, 8, 8, 9, 9, 9,10,
-	10,10,10,10,10, 9, 9, 9, 9, 9, 9,10,10,11,10,11,
-	 9, 9, 9, 9,10,10,10,10,11,11,11,10,10, 9, 9,10,
-	10,10, 9,11,10,10,10,10,10,10, 9, 9,10,10,11,11,
-	10,10,10, 9, 9, 9,10,10,10,
+static 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,
+	 7, 7, 7, 8, 8, 8, 8,10,10,10, 8, 8, 8, 8, 8, 8,
+	 8, 8,10,10,10, 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,
+	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,10,10, 8, 8, 8,
+	 8, 8, 8,10,10,10,10,10, 9, 9, 8, 8, 8, 8,10,10,
+	10,10,10, 8, 8, 8, 8, 8, 8,
 };
 
-static float _vq_quantthresh__8c0_s_p7_1[] = {
+static 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__8c0_s_p7_1[] = {
+static long _vq_quantmap__44c0_sm_p6_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 encode_aux_threshmatch _vq_auxt__44c0_sm_p6_1 = {
+	_vq_quantthresh__44c0_sm_p6_1,
+	_vq_quantmap__44c0_sm_p6_1,
 	11,
 	11
 };
 
-static static_codebook _8c0_s_p7_1 = {
+static static_codebook _44c0_sm_p6_1 = {
 	2, 121,
-	_vq_lengthlist__8c0_s_p7_1,
+	_vq_lengthlist__44c0_sm_p6_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__8c0_s_p7_1,
+	_vq_quantlist__44c0_sm_p6_1,
 	NULL,
-	&_vq_auxt__8c0_s_p7_1,
+	&_vq_auxt__44c0_sm_p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p8_0[] = {
+static long _vq_quantlist__44c0_sm_p7_0[] = {
 	6,
 	5,
 	7,
@@ -17600,49 +16268,49 @@
 	12,
 };
 
-static 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,
-	 9, 9,10,10, 0, 8, 8, 8, 8, 8, 9, 8, 9, 9, 9,11,
-	10, 0, 0,13, 9, 8, 9, 9, 9, 9,10,10,11,11, 0,13,
-	 0, 9, 9, 9, 9, 9, 9,11,10,11,11, 0, 0, 0, 8, 9,
-	10, 9,10,10,13,11,12,12, 0, 0, 0, 8, 9, 9, 9,10,
-	10,13,12,12,13, 0, 0, 0,12, 0,10,10,12,11,10,11,
-	12,12, 0, 0, 0,13,13,10,10,10,11,12, 0,13, 0, 0,
-	 0, 0, 0, 0,13,11, 0,12,12,12,13,12, 0, 0, 0, 0,
-	 0, 0,13,13,11,13,13,11,12,
+static 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,
+	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
+	11, 0,12,12, 9, 9,10,10,10,10,11,11,11,11, 0,13,
+	13, 9, 9, 9, 9,10,10,11,11,11,12, 0, 0, 0, 9,10,
+	10,10,11,11,12,11,12,12, 0, 0, 0,10,10, 9, 9,11,
+	11,12,12,12,12, 0, 0, 0,13,13,10,10,11,11,12,12,
+	13,13, 0, 0, 0,14,14,10,10,11,11,12,12,13,13, 0,
+	 0, 0, 0, 0,11,12,11,11,13,12,13,13, 0, 0, 0, 0,
+	 0,12,12,11,11,13,12,14,14,
 };
 
-static float _vq_quantthresh__8c0_s_p8_0[] = {
+static 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__8c0_s_p8_0[] = {
+static 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__8c0_s_p8_0 = {
-	_vq_quantthresh__8c0_s_p8_0,
-	_vq_quantmap__8c0_s_p8_0,
+static encode_aux_threshmatch _vq_auxt__44c0_sm_p7_0 = {
+	_vq_quantthresh__44c0_sm_p7_0,
+	_vq_quantmap__44c0_sm_p7_0,
 	13,
 	13
 };
 
-static static_codebook _8c0_s_p8_0 = {
+static static_codebook _44c0_sm_p7_0 = {
 	2, 169,
-	_vq_lengthlist__8c0_s_p8_0,
+	_vq_lengthlist__44c0_sm_p7_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__8c0_s_p8_0,
+	_vq_quantlist__44c0_sm_p7_0,
 	NULL,
-	&_vq_auxt__8c0_s_p8_0,
+	&_vq_auxt__44c0_sm_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p8_1[] = {
+static long _vq_quantlist__44c0_sm_p7_1[] = {
 	2,
 	1,
 	3,
@@ -17650,240 +16318,1334 @@
 	4,
 };
 
-static 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 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__8c0_s_p8_1[] = {
+static float _vq_quantthresh__44c0_sm_p7_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8c0_s_p8_1[] = {
+static long _vq_quantmap__44c0_sm_p7_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 encode_aux_threshmatch _vq_auxt__44c0_sm_p7_1 = {
+	_vq_quantthresh__44c0_sm_p7_1,
+	_vq_quantmap__44c0_sm_p7_1,
 	5,
 	5
 };
 
-static static_codebook _8c0_s_p8_1 = {
+static static_codebook _44c0_sm_p7_1 = {
 	2, 25,
-	_vq_lengthlist__8c0_s_p8_1,
+	_vq_lengthlist__44c0_sm_p7_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8c0_s_p8_1,
+	_vq_quantlist__44c0_sm_p7_1,
 	NULL,
-	&_vq_auxt__8c0_s_p8_1,
+	&_vq_auxt__44c0_sm_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p9_0[] = {
+static long _vq_quantlist__44c0_sm_p8_0[] = {
+	4,
+	3,
+	5,
+	2,
+	6,
 	1,
+	7,
 	0,
+	8,
+};
+
+static 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,
+	11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,
+};
+
+static 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[] = {
+	    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,
+	9,
+	9
+};
+
+static static_codebook _44c0_sm_p8_0 = {
+	2, 81,
+	_vq_lengthlist__44c0_sm_p8_0,
+	1, -516186112, 1627103232, 4, 0,
+	_vq_quantlist__44c0_sm_p8_0,
+	NULL,
+	&_vq_auxt__44c0_sm_p8_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c0_sm_p8_1[] = {
+	6,
+	5,
+	7,
+	4,
+	8,
+	3,
+	9,
 	2,
+	10,
+	1,
+	11,
+	0,
+	12,
 };
 
-static 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,
-	 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,
-	 7,
+static 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,
+	12,12,13,13,18, 7, 7, 8, 7, 9, 9,10,10,12,12,12,
+	13,19,10,10, 8, 8,10,10,11,11,12,12,13,14,19,11,
+	10, 8, 7,10,10,11,11,12,12,13,12,19,19,19,10,10,
+	10,10,11,11,12,12,13,13,19,19,19,11, 9,11, 9,14,
+	12,13,12,13,13,19,20,18,13,14,11,11,12,12,13,13,
+	14,13,20,20,20,15,13,11,10,13,11,13,13,14,13,20,
+	20,20,20,20,13,14,12,12,13,13,13,13,20,20,20,20,
+	20,13,13,12,12,16,13,15,13,
 };
 
-static float _vq_quantthresh__8c0_s_p9_0[] = {
-	-157.5, 157.5, 
+static 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__8c0_s_p9_0[] = {
+static 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,
+	13,
+	13
+};
+
+static static_codebook _44c0_sm_p8_1 = {
+	2, 169,
+	_vq_lengthlist__44c0_sm_p8_1,
+	1, -522616832, 1620115456, 4, 0,
+	_vq_quantlist__44c0_sm_p8_1,
+	NULL,
+	&_vq_auxt__44c0_sm_p8_1,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c0_sm_p8_2[] = {
+	8,
+	7,
+	9,
+	6,
+	10,
+	5,
+	11,
+	4,
+	12,
+	3,
+	13,
+	2,
+	14,
+	1,
+	15,
+	0,
+	16,
+};
+
+static 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,
+	 9, 9, 9,10, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9,10,10,10, 7, 7, 8, 8, 9, 8, 9, 9, 9,
+	 9,10, 9, 9,10,10,10,11, 8, 8, 8, 8, 9, 9, 9, 9,
+	 9, 9, 9,10, 9,10,10,10,10, 8, 8, 8, 8, 9, 9, 9,
+	 9, 9, 9, 9, 9,10,10,11,10,10, 8, 8, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9,10,10,10,10,10,11,11, 8, 8, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,10,11,11,11,11,11, 9, 9,
+	 9, 9, 9, 9, 9, 9,10, 9,10, 9,11,11,10,11,11, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,11,11,10,11,11,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,11,10,11,11,
+	11,11,11, 9, 9,10, 9, 9, 9, 9, 9, 9, 9,10,11,10,
+	11,11,11,11,10,10,10,10, 9, 9, 9, 9, 9, 9,10,11,
+	11,11,11,11,11, 9,10, 9, 9, 9, 9, 9, 9, 9, 9,11,
+	11,10,11,11,11,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9,
+	10,11,10,11,11,11,11,11,11, 9, 9, 9, 9, 9, 9, 9,
+	 9,
+};
+
+static 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[] = {
+	   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,
+	17,
+	17
+};
+
+static static_codebook _44c0_sm_p8_2 = {
+	2, 289,
+	_vq_lengthlist__44c0_sm_p8_2,
+	1, -529530880, 1611661312, 5, 0,
+	_vq_quantlist__44c0_sm_p8_2,
+	NULL,
+	&_vq_auxt__44c0_sm_p8_2,
+	NULL,
+	0
+};
+
+static 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,
+	 7, 6, 7,10,13,16,11, 5, 7, 7, 7, 8,10,12,15,13,
+	 6, 7, 5, 5, 7, 9,12,13,16, 8, 9, 6, 6, 7, 9,10,
+	12,
+};
+
+static static_codebook _huff_book__44c0_sm_short = {
+	2, 81,
+	_huff_lengthlist__44c0_sm_short,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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,
+	 7, 6, 6, 7,10,10,10, 9,12, 9, 8, 7, 7,10,12,11,
+	11,13,12,10, 9, 8, 9,11,11,14,15,15,13,11, 9, 9,
+	11,
+};
+
+static static_codebook _huff_book__44c1_s_long = {
+	2, 81,
+	_huff_lengthlist__44c1_s_long,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_s_p1_0[] = {
+	1,
+	0,
+	2,
+};
+
+static 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,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0, 0,
+	 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
+	 0, 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 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, 7, 7, 0, 0, 0, 0,
+	 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0, 0,
+	 0, 0, 0, 8, 9,10, 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0, 0,
+	 0, 0, 0, 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, 8, 8, 0, 0,
+	 0, 0, 0, 0, 8, 9, 8, 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 7, 7, 0, 0, 0, 0, 0, 0, 7, 8, 8, 0, 0,
+	 0, 0, 0, 0, 7, 8, 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, 0, 0, 0, 0, 0, 0, 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, 8, 8, 0, 0, 0, 0, 0, 0, 8,10, 9, 0,
+	 0, 0, 0, 0, 0, 8, 8, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 7, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9,
+	 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,
+};
+
+static float _vq_quantthresh__44c1_s_p1_0[] = {
+	-0.5, 0.5, 
+};
+
+static long _vq_quantmap__44c1_s_p1_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 encode_aux_threshmatch _vq_auxt__44c1_s_p1_0 = {
+	_vq_quantthresh__44c1_s_p1_0,
+	_vq_quantmap__44c1_s_p1_0,
 	3,
 	3
 };
 
-static static_codebook _8c0_s_p9_0 = {
-	4, 81,
-	_vq_lengthlist__8c0_s_p9_0,
-	1, -518803456, 1628680192, 2, 0,
-	_vq_quantlist__8c0_s_p9_0,
+static static_codebook _44c1_s_p1_0 = {
+	8, 6561,
+	_vq_lengthlist__44c1_s_p1_0,
+	1, -535822336, 1611661312, 2, 0,
+	_vq_quantlist__44c1_s_p1_0,
 	NULL,
-	&_vq_auxt__8c0_s_p9_0,
+	&_vq_auxt__44c1_s_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p9_1[] = {
+static long _vq_quantlist__44c1_s_p2_0[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static 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,
+	 0, 0, 4, 4, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 8, 8,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 6, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,
+};
+
+static float _vq_quantthresh__44c1_s_p2_0[] = {
+	-1.5, -0.5, 0.5, 1.5, 
+};
+
+static 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,
+	5,
+	5
+};
+
+static static_codebook _44c1_s_p2_0 = {
+	4, 625,
+	_vq_lengthlist__44c1_s_p2_0,
+	1, -533725184, 1611661312, 3, 0,
+	_vq_quantlist__44c1_s_p2_0,
+	NULL,
+	&_vq_auxt__44c1_s_p2_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_s_p3_0[] = {
+	4,
+	3,
+	5,
+	2,
+	6,
+	1,
 	7,
+	0,
+	8,
+};
+
+static 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,
+	 8, 9, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0,
+	 0, 0,11,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,
+};
+
+static 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[] = {
+	    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,
+	9,
+	9
+};
+
+static static_codebook _44c1_s_p3_0 = {
+	2, 81,
+	_vq_lengthlist__44c1_s_p3_0,
+	1, -531628032, 1611661312, 4, 0,
+	_vq_quantlist__44c1_s_p3_0,
+	NULL,
+	&_vq_auxt__44c1_s_p3_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_s_p4_0[] = {
+	4,
+	3,
+	5,
+	2,
 	6,
+	1,
+	7,
+	0,
 	8,
+};
+
+static 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,
+	 9, 9, 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0,
+	 0, 0,10,10, 9, 9,11,11, 0, 0, 0, 0, 0, 9, 9,11,
+	11,
+};
+
+static 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[] = {
+	    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,
+	9,
+	9
+};
+
+static static_codebook _44c1_s_p4_0 = {
+	2, 81,
+	_vq_lengthlist__44c1_s_p4_0,
+	1, -531628032, 1611661312, 4, 0,
+	_vq_quantlist__44c1_s_p4_0,
+	NULL,
+	&_vq_auxt__44c1_s_p4_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_s_p5_0[] = {
+	8,
+	7,
+	9,
+	6,
+	10,
 	5,
-	9,
+	11,
 	4,
-	10,
+	12,
 	3,
-	11,
+	13,
 	2,
-	12,
+	14,
 	1,
-	13,
+	15,
 	0,
+	16,
+};
+
+static 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,
+	10,11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,
+	11,11,11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,
+	10,11,11,12,11, 0, 0, 0, 8, 8, 9, 9, 9,10,10,10,
+	10,10,11,11,12,12, 0, 0, 0, 8, 8, 9, 9,10, 9,10,
+	10,10,10,11,11,12,12, 0, 0, 0, 9, 9, 9, 9,10,10,
+	10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 9, 9,10,
+	10,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 9, 9,
+	10,10,10,11,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9,
+	 9,10,10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0,
+	10,10,10,10,11,11,12,12,12,12,13,13, 0, 0, 0, 0,
+	 0, 0, 0,10,10,11,11,12,12,12,12,13,13, 0, 0, 0,
+	 0, 0, 0, 0,11,11,12,12,12,12,13,13,13,13, 0, 0,
+	 0, 0, 0, 0, 0,11,11,11,11,12,12,13,13,13,13, 0,
+	 0, 0, 0, 0, 0, 0,12,12,12,12,12,12,13,13,14,14,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,14,
 	14,
 };
 
-static 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,
-	 8, 8, 9, 9,11,11,11,11,11,11,11,11,11, 9, 8, 7,
-	 8, 9,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,10,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,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,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,11,11,11,11,
+static 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[] = {
+	   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,
+	17,
+	17
+};
+
+static static_codebook _44c1_s_p5_0 = {
+	2, 289,
+	_vq_lengthlist__44c1_s_p5_0,
+	1, -529530880, 1611661312, 5, 0,
+	_vq_quantlist__44c1_s_p5_0,
+	NULL,
+	&_vq_auxt__44c1_s_p5_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_s_p6_0[] = {
+	1,
+	0,
+	2,
+};
+
+static 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,
+	11,10,11,11,10,10, 7,11,10,11,11,11,12,11,11, 7,
+	 9, 9,11,10,10,11,11,10, 6, 9, 9,10,10,10,12,10,
 	11,
 };
 
-static 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 float _vq_quantthresh__44c1_s_p6_0[] = {
+	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__8c0_s_p9_1[] = {
-	   13,   11,    9,    7,    5,    3,    1,    0,
-	    2,    4,    6,    8,   10,   12,   14,
+static long _vq_quantmap__44c1_s_p6_0[] = {
+	    1,    0,    2,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c0_s_p9_1 = {
-	_vq_quantthresh__8c0_s_p9_1,
-	_vq_quantmap__8c0_s_p9_1,
-	15,
-	15
+static encode_aux_threshmatch _vq_auxt__44c1_s_p6_0 = {
+	_vq_quantthresh__44c1_s_p6_0,
+	_vq_quantmap__44c1_s_p6_0,
+	3,
+	3
 };
 
-static static_codebook _8c0_s_p9_1 = {
-	2, 225,
-	_vq_lengthlist__8c0_s_p9_1,
-	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__8c0_s_p9_1,
+static static_codebook _44c1_s_p6_0 = {
+	4, 81,
+	_vq_lengthlist__44c1_s_p6_0,
+	1, -529137664, 1618345984, 2, 0,
+	_vq_quantlist__44c1_s_p6_0,
 	NULL,
-	&_vq_auxt__8c0_s_p9_1,
+	&_vq_auxt__44c1_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c0_s_p9_2[] = {
+static long _vq_quantlist__44c1_s_p6_1[] = {
+	5,
+	4,
+	6,
+	3,
+	7,
+	2,
+	8,
+	1,
+	9,
+	0,
 	10,
+};
+
+static 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,
+	 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 8, 8, 8, 8,
+	 8, 8,10,10,10, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10,
+	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,10,10, 8, 8, 8,
+	 8, 8, 8,10,10,10,10,10, 9, 9, 8, 8, 8, 8,10,10,
+	10,10,10, 8, 8, 8, 8, 8, 8,
+};
+
+static 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[] = {
+	    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,
+	11,
+	11
+};
+
+static static_codebook _44c1_s_p6_1 = {
+	2, 121,
+	_vq_lengthlist__44c1_s_p6_1,
+	1, -531365888, 1611661312, 4, 0,
+	_vq_quantlist__44c1_s_p6_1,
+	NULL,
+	&_vq_auxt__44c1_s_p6_1,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_s_p7_0[] = {
+	6,
+	5,
+	7,
+	4,
+	8,
+	3,
 	9,
+	2,
+	10,
+	1,
 	11,
+	0,
+	12,
+};
+
+static 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,
+	10,10,11,10, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
+	11, 0,12,12, 9, 9, 9,10,10,10,11,11,11,11, 0,13,
+	13, 9, 9, 9, 9,10,10,11,11,11,11, 0, 0, 0,10,10,
+	10,10,11,11,12,11,12,12, 0, 0, 0,10,10,10, 9,11,
+	11,12,11,13,12, 0, 0, 0,13,13,10,10,11,11,12,12,
+	13,13, 0, 0, 0,14,14,10,10,11,11,12,12,13,13, 0,
+	 0, 0, 0, 0,11,12,11,11,12,12,14,13, 0, 0, 0, 0,
+	 0,12,11,11,11,13,10,14,13,
+};
+
+static 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[] = {
+	   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,
+	13,
+	13
+};
+
+static static_codebook _44c1_s_p7_0 = {
+	2, 169,
+	_vq_lengthlist__44c1_s_p7_0,
+	1, -526516224, 1616117760, 4, 0,
+	_vq_quantlist__44c1_s_p7_0,
+	NULL,
+	&_vq_auxt__44c1_s_p7_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_s_p7_1[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static 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[] = {
+	-1.5, -0.5, 0.5, 1.5, 
+};
+
+static 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,
+	5,
+	5
+};
+
+static static_codebook _44c1_s_p7_1 = {
+	2, 25,
+	_vq_lengthlist__44c1_s_p7_1,
+	1, -533725184, 1611661312, 3, 0,
+	_vq_quantlist__44c1_s_p7_1,
+	NULL,
+	&_vq_auxt__44c1_s_p7_1,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_s_p8_0[] = {
+	6,
+	5,
+	7,
+	4,
 	8,
+	3,
+	9,
+	2,
+	10,
+	1,
+	11,
+	0,
 	12,
+};
+
+static 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,
+	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,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,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,10,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,
+};
+
+static 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[] = {
+	   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,
+	13,
+	13
+};
+
+static static_codebook _44c1_s_p8_0 = {
+	2, 169,
+	_vq_lengthlist__44c1_s_p8_0,
+	1, -514541568, 1627103232, 4, 0,
+	_vq_quantlist__44c1_s_p8_0,
+	NULL,
+	&_vq_auxt__44c1_s_p8_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_s_p8_1[] = {
+	6,
+	5,
 	7,
+	4,
+	8,
+	3,
+	9,
+	2,
+	10,
+	1,
+	11,
+	0,
+	12,
+};
+
+static 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,
+	12,12,13,12,15, 8, 8, 8, 7, 9, 9,10,10,12,12,13,
+	13,16,11,10, 8, 8,10,10,11,11,12,12,13,13,16,11,
+	11, 9, 8,11,10,11,11,12,12,13,12,16,16,16,10,11,
+	10,11,12,12,12,12,13,13,16,16,16,11, 9,11, 9,14,
+	12,12,12,13,13,16,16,16,12,14,11,12,12,12,13,13,
+	14,13,16,16,16,15,13,12,10,13,10,13,14,13,13,16,
+	16,16,16,16,13,14,12,13,13,12,13,13,16,16,16,16,
+	16,13,12,12,11,14,12,15,13,
+};
+
+static 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[] = {
+	   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,
 	13,
+	13
+};
+
+static static_codebook _44c1_s_p8_1 = {
+	2, 169,
+	_vq_lengthlist__44c1_s_p8_1,
+	1, -522616832, 1620115456, 4, 0,
+	_vq_quantlist__44c1_s_p8_1,
+	NULL,
+	&_vq_auxt__44c1_s_p8_1,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_s_p8_2[] = {
+	8,
+	7,
+	9,
 	6,
-	14,
+	10,
 	5,
-	15,
+	11,
 	4,
-	16,
+	12,
 	3,
-	17,
+	13,
 	2,
-	18,
+	14,
 	1,
-	19,
+	15,
 	0,
-	20,
+	16,
 };
 
-static 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,
-	 7, 8, 9,10,10,10, 9,10,10, 9,10,10,11,11,11,11,
-	11,11, 9, 9, 9, 9, 8, 9,10,10,11,10,10,11,11,12,
-	10,10,12,12,11,11,10, 9, 9,10, 8, 9,10,10,10, 9,
-	10,10,11,11,10,11,10,10,10,12,12,12, 9,10, 9,10,
-	 9, 9,10,10,11,11,11,11,10,10,10,11,12,11,12,11,
-	12,10,11,10,11, 9,10, 9,10, 9,10,10, 9,10,10,11,
-	10,11,11,11,11,12,11, 9,10,10,10,10,11,11,11,11,
-	11,10,11,11,11,11,10,12,10,12,12,11,12,10,10,11,
-	10, 9,11,10,11, 9,10,11,10,10,10,11,11,11,11,12,
-	12,10, 9, 9,11,10, 9,12,11,10,12,12,11,11,11,11,
-	10,11,11,12,11,10,12, 9,11,10,11,10,10,11,10,11,
-	 9,10,10,10,11,12,11,11,12,11,10,10,11,11, 9,10,
-	10,12,10,11,10,10,10, 9,10,10,10,10, 9,10,10,11,
-	11,11,11,12,11,10,10,10,10,11,11,10,11,11, 9,11,
-	10,12,10,12,11,10,11,10,10,10,11,10,10,11,11,10,
-	11,10,10,10,10,11,11,12,10,10,10,11,10,11,12,11,
-	10,11,10,10,11,11,10,12,10, 9,10,10,11,11,11,10,
-	12,10,10,11,11,11,10,10,11,10,10,10,11,10,11,10,
-	12,11,11,10,10,10,12,10,10,11, 9,10,11,11,11,10,
-	10,11,10,10, 9,11,11,12,12,11,12,11,11,11,11,11,
-	11, 9,10,11,10,12,10,10,10,10,11,10,10,11,10,10,
-	12,10,10,10,10,10, 9,12,10,10,10,10,12, 9,11,10,
-	10,11,10,12,12,10,12,12,12,10,10,10,10, 9,10,11,
-	10,10,12,10,10,12,11,10,11,10,10,12,11,10,12,10,
-	10,11, 9,11,10, 9,10, 9,10,
+static 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,
+	 9, 9, 9,10,10,10, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9,
+	 9,10, 9, 9,10,10,10, 7, 7, 8, 8, 9, 8, 9, 9, 9,
+	 9,10, 9, 9,10,10,11,11, 8, 8, 8, 8, 9, 9, 9, 9,
+	 9, 9,10, 9, 9,10,10,10,10, 8, 8, 8, 8, 9, 9, 9,
+	 9, 9, 9, 9, 9,10,10,11,11,11, 8, 8, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9,10,10,10,10,11,11,11, 8, 8, 9,
+	 9, 9, 9,10, 9, 9, 9, 9, 9,11,11,11,11,11, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11,10,10,11,11, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,11,10,11,11,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10, 9,10,10,11,11,
+	11,11,11, 9, 9, 9,10, 9, 9, 9, 9, 9, 9,10,11,11,
+	11,11,11,11,10,10,10,10, 9, 9, 9, 9, 9, 9,10,11,
+	11,11,11,11,11, 9,10, 9, 9, 9, 9,10, 9, 9, 9,11,
+	11,11,11,11,11,11,10,10, 9, 9, 9, 9, 9, 9,10, 9,
+	11,11,10,11,11,11,11,10,11, 9, 9, 9, 9, 9, 9, 9,
+	 9,
 };
 
-static 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 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__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 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__8c0_s_p9_2 = {
-	_vq_quantthresh__8c0_s_p9_2,
-	_vq_quantmap__8c0_s_p9_2,
-	21,
-	21
+static encode_aux_threshmatch _vq_auxt__44c1_s_p8_2 = {
+	_vq_quantthresh__44c1_s_p8_2,
+	_vq_quantmap__44c1_s_p8_2,
+	17,
+	17
 };
 
-static static_codebook _8c0_s_p9_2 = {
-	2, 441,
-	_vq_lengthlist__8c0_s_p9_2,
-	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__8c0_s_p9_2,
+static static_codebook _44c1_s_p8_2 = {
+	2, 289,
+	_vq_lengthlist__44c1_s_p8_2,
+	1, -529530880, 1611661312, 5, 0,
+	_vq_quantlist__44c1_s_p8_2,
 	NULL,
-	&_vq_auxt__8c0_s_p9_2,
+	&_vq_auxt__44c1_s_p8_2,
 	NULL,
 	0
 };
 
-static 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,
-	11,15, 6, 4,17, 6, 6, 4, 5, 8,11,16, 6, 6,17, 8,
-	 6, 5, 6, 9,13,16, 8, 9,17,11, 9, 8, 8,11,13,17,
-	 9,12,17,15,14,13,12,13,14,17,12,15,17,17,17,17,
-	17,16,17,17,
+static 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,
+	 8, 7, 8,10,13,15,13, 8, 8, 7, 7, 8,10,12,15,15,
+	 7, 7, 5, 5, 7, 9,12,14,15, 8, 8, 6, 6, 7, 8,10,
+	11,
 };
 
-static static_codebook _huff_book__8c0_s_single = {
-	2, 100,
-	_huff_lengthlist__8c0_s_single,
+static static_codebook _huff_book__44c1_s_short = {
+	2, 81,
+	_huff_lengthlist__44c1_s_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -17892,25 +17654,45 @@
 	0
 };
 
-static long _vq_quantlist__8c1_s_p1_0[] = {
+static 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,
+	 6, 5, 5, 7,10,10,10, 9,11, 8, 7, 6, 7, 9,11,11,
+	12,13,10,10, 9, 8, 9,11,11,15,15,12,13,11, 9,10,
+	11,
+};
+
+static static_codebook _huff_book__44c1_sm_long = {
+	2, 81,
+	_huff_lengthlist__44c1_sm_long,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_sm_p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static long _vq_lengthlist__8c1_s_p1_0[] = {
+static 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,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 7, 0, 0, 0, 0, 0, 0, 7, 8, 9, 0, 0, 0,
+	 0, 5, 8, 7, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0, 0,
 	 0, 0, 0, 7, 8, 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, 0, 0, 0, 0, 0, 0, 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, 7, 8, 0, 0, 0, 0, 0, 0, 7, 9, 8, 0, 0,
-	 0, 0, 0, 0, 7, 9, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 7, 9, 8, 0, 0,
+	 0, 0, 0, 0, 7, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -17944,13 +17726,13 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 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, 8, 8, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 8, 7, 0, 0, 0, 0,
 	 0, 0, 8, 9, 9, 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0, 0,
-	 0, 0, 0, 8, 8,10, 0, 0, 0, 0, 0, 0, 9,10,10, 0,
+	 0, 0, 0, 9, 9,10, 0, 0, 0, 0, 0, 0, 9,10,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, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -17990,7 +17772,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, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 5, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0, 0,
+	 0, 0, 5, 7, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0, 0,
 	 0, 0, 0, 0, 8, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -18001,7 +17783,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, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 9,10,10,
-	 0, 0, 0, 0, 0, 0, 8,10, 8, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 9,10, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -18312,33 +18094,33 @@
 	 0,
 };
 
-static float _vq_quantthresh__8c1_s_p1_0[] = {
+static float _vq_quantthresh__44c1_sm_p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__8c1_s_p1_0[] = {
+static long _vq_quantmap__44c1_sm_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 encode_aux_threshmatch _vq_auxt__44c1_sm_p1_0 = {
+	_vq_quantthresh__44c1_sm_p1_0,
+	_vq_quantmap__44c1_sm_p1_0,
 	3,
 	3
 };
 
-static static_codebook _8c1_s_p1_0 = {
+static static_codebook _44c1_sm_p1_0 = {
 	8, 6561,
-	_vq_lengthlist__8c1_s_p1_0,
+	_vq_lengthlist__44c1_sm_p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__8c1_s_p1_0,
+	_vq_quantlist__44c1_sm_p1_0,
 	NULL,
-	&_vq_auxt__8c1_s_p1_0,
+	&_vq_auxt__44c1_sm_p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p2_0[] = {
+static long _vq_quantlist__44c1_sm_p2_0[] = {
 	2,
 	1,
 	3,
@@ -18346,9 +18128,14 @@
 	4,
 };
 
-static long _vq_lengthlist__8c1_s_p2_0[] = {
+static 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,
+	 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, 0, 0, 6, 6, 6, 9, 9,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 6, 6, 7, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -18381,60 +18168,639 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
 };
 
-static float _vq_quantthresh__8c1_s_p2_0[] = {
+static float _vq_quantthresh__44c1_sm_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8c1_s_p2_0[] = {
+static long _vq_quantmap__44c1_sm_p2_0[] = {
 	    3,    1,    0,    2,    4,
 };
 
-static encode_aux_threshmatch _vq_auxt__8c1_s_p2_0 = {
-	_vq_quantthresh__8c1_s_p2_0,
-	_vq_quantmap__8c1_s_p2_0,
+static encode_aux_threshmatch _vq_auxt__44c1_sm_p2_0 = {
+	_vq_quantthresh__44c1_sm_p2_0,
+	_vq_quantmap__44c1_sm_p2_0,
 	5,
 	5
 };
 
-static static_codebook _8c1_s_p2_0 = {
+static static_codebook _44c1_sm_p2_0 = {
 	4, 625,
-	_vq_lengthlist__8c1_s_p2_0,
+	_vq_lengthlist__44c1_sm_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8c1_s_p2_0,
+	_vq_quantlist__44c1_sm_p2_0,
 	NULL,
-	&_vq_auxt__8c1_s_p2_0,
+	&_vq_auxt__44c1_sm_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p3_0[] = {
+static long _vq_quantlist__44c1_sm_p3_0[] = {
+	4,
+	3,
+	5,
 	2,
+	6,
 	1,
+	7,
+	0,
+	8,
+};
+
+static 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,
+	 8, 9, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0,
+	 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,
+};
+
+static 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[] = {
+	    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,
+	9,
+	9
+};
+
+static static_codebook _44c1_sm_p3_0 = {
+	2, 81,
+	_vq_lengthlist__44c1_sm_p3_0,
+	1, -531628032, 1611661312, 4, 0,
+	_vq_quantlist__44c1_sm_p3_0,
+	NULL,
+	&_vq_auxt__44c1_sm_p3_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_sm_p4_0[] = {
+	4,
 	3,
+	5,
+	2,
+	6,
+	1,
+	7,
 	0,
+	8,
+};
+
+static 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,
+	 8, 8, 9, 9,11,11, 0, 0, 0, 9, 9, 9, 9,11,11, 0,
+	 0, 0,10,10,10,10,11,11, 0, 0, 0, 0, 0, 9, 9,11,
+	11,
+};
+
+static 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[] = {
+	    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,
+	9,
+	9
+};
+
+static static_codebook _44c1_sm_p4_0 = {
+	2, 81,
+	_vq_lengthlist__44c1_sm_p4_0,
+	1, -531628032, 1611661312, 4, 0,
+	_vq_quantlist__44c1_sm_p4_0,
+	NULL,
+	&_vq_auxt__44c1_sm_p4_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_sm_p5_0[] = {
+	8,
+	7,
+	9,
+	6,
+	10,
+	5,
+	11,
 	4,
+	12,
+	3,
+	13,
+	2,
+	14,
+	1,
+	15,
+	0,
+	16,
 };
 
-static 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,
+static 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,
+	10,11,11, 0, 7, 7, 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,11,12,12, 0, 0, 0, 8, 8, 8, 8, 9, 9,10,10,
+	10,11,11,11,12,12, 0, 0, 0, 8, 8, 8, 8, 9, 9,10,
+	10,10,10,11,11,12,12, 0, 0, 0, 9, 9, 9, 9,10,10,
+	10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 9, 9,10,
+	10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,
+	 9, 9,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9,
+	 9, 9, 9,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0,
+	 9, 9,10,10,11,11,12,12,12,12,13,13, 0, 0, 0, 0,
+	 0, 0, 0,10,10,11,11,12,12,12,12,13,13, 0, 0, 0,
+	 0, 0, 0, 0,11,11,11,11,12,12,13,13,13,13, 0, 0,
+	 0, 0, 0, 0, 0,11,11,11,11,12,12,13,13,13,13, 0,
+	 0, 0, 0, 0, 0, 0,11,11,12,12,12,12,13,13,14,14,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,14,
+	14,
+};
+
+static 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[] = {
+	   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,
+	17,
+	17
+};
+
+static static_codebook _44c1_sm_p5_0 = {
+	2, 289,
+	_vq_lengthlist__44c1_sm_p5_0,
+	1, -529530880, 1611661312, 5, 0,
+	_vq_quantlist__44c1_sm_p5_0,
+	NULL,
+	&_vq_auxt__44c1_sm_p5_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_sm_p6_0[] = {
+	1,
+	0,
+	2,
+};
+
+static 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,
+	11,10,11,11,10,10, 7,11,11,11,11,11,11,11,11, 6,
+	 9, 9,11,10,10,11,11,10, 6, 9, 9,10,10,10,11,10,
+	11,
+};
+
+static float _vq_quantthresh__44c1_sm_p6_0[] = {
+	-5.5, 5.5, 
+};
+
+static 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,
+	3,
+	3
+};
+
+static static_codebook _44c1_sm_p6_0 = {
+	4, 81,
+	_vq_lengthlist__44c1_sm_p6_0,
+	1, -529137664, 1618345984, 2, 0,
+	_vq_quantlist__44c1_sm_p6_0,
+	NULL,
+	&_vq_auxt__44c1_sm_p6_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_sm_p6_1[] = {
+	5,
+	4,
+	6,
+	3,
+	7,
+	2,
+	8,
+	1,
+	9,
+	0,
+	10,
+};
+
+static 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,
+	 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 8, 8, 8, 8,
+	 8, 8,10,10,10, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10,
+	 8, 8, 8, 8, 8, 8, 9, 8,10,10,10,10,10, 8, 8, 8,
+	 8, 8, 8,10,10,10,10,10, 9, 9, 8, 8, 8, 8,10,10,
+	10,10,10, 8, 8, 8, 8, 8, 8,
+};
+
+static 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[] = {
+	    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,
+	11,
+	11
+};
+
+static static_codebook _44c1_sm_p6_1 = {
+	2, 121,
+	_vq_lengthlist__44c1_sm_p6_1,
+	1, -531365888, 1611661312, 4, 0,
+	_vq_quantlist__44c1_sm_p6_1,
+	NULL,
+	&_vq_auxt__44c1_sm_p6_1,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_sm_p7_0[] = {
+	6,
+	5,
+	7,
+	4,
+	8,
+	3,
+	9,
+	2,
+	10,
+	1,
+	11,
+	0,
+	12,
+};
+
+static 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,
+	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
+	11, 0,12,12, 9, 9,10,10,10,10,11,11,11,11, 0,13,
+	13, 9, 9, 9, 9,10,10,11,11,12,12, 0, 0, 0, 9,10,
+	 9,10,11,11,12,11,13,12, 0, 0, 0,10,10, 9, 9,11,
+	11,12,12,13,12, 0, 0, 0,13,13,10,10,11,11,12,12,
+	13,13, 0, 0, 0,14,14,10,10,11,11,12,12,13,13, 0,
+	 0, 0, 0, 0,11,12,11,11,12,13,14,13, 0, 0, 0, 0,
+	 0,12,12,11,11,13,12,14,13,
+};
+
+static 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[] = {
+	   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,
+	13,
+	13
+};
+
+static static_codebook _44c1_sm_p7_0 = {
+	2, 169,
+	_vq_lengthlist__44c1_sm_p7_0,
+	1, -526516224, 1616117760, 4, 0,
+	_vq_quantlist__44c1_sm_p7_0,
+	NULL,
+	&_vq_auxt__44c1_sm_p7_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_sm_p7_1[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static 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[] = {
+	-1.5, -0.5, 0.5, 1.5, 
+};
+
+static 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,
+	5,
+	5
+};
+
+static static_codebook _44c1_sm_p7_1 = {
+	2, 25,
+	_vq_lengthlist__44c1_sm_p7_1,
+	1, -533725184, 1611661312, 3, 0,
+	_vq_quantlist__44c1_sm_p7_1,
+	NULL,
+	&_vq_auxt__44c1_sm_p7_1,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_sm_p8_0[] = {
+	6,
+	5,
+	7,
+	4,
+	8,
+	3,
+	9,
+	2,
+	10,
+	1,
+	11,
+	0,
+	12,
+};
+
+static 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,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,
+};
+
+static 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[] = {
+	   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,
+	13,
+	13
+};
+
+static static_codebook _44c1_sm_p8_0 = {
+	2, 169,
+	_vq_lengthlist__44c1_sm_p8_0,
+	1, -514541568, 1627103232, 4, 0,
+	_vq_quantlist__44c1_sm_p8_0,
+	NULL,
+	&_vq_auxt__44c1_sm_p8_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_sm_p8_1[] = {
+	6,
+	5,
+	7,
+	4,
+	8,
+	3,
+	9,
+	2,
+	10,
+	1,
+	11,
+	0,
+	12,
+};
+
+static 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,
+	12,12,13,13,17, 7, 7, 8, 7, 9, 9,11,10,12,12,13,
+	13,19,11,10, 8, 8,10,10,11,11,12,12,13,13,19,11,
+	11, 9, 7,11,10,11,11,12,12,13,12,19,19,19,10,10,
+	10,10,11,12,12,12,13,14,18,19,19,11, 9,11, 9,13,
+	12,12,12,13,13,19,20,19,13,15,11,11,12,12,13,13,
+	14,13,18,19,20,15,13,12,10,13,10,13,13,13,14,20,
+	20,20,20,20,13,14,12,12,13,12,13,13,20,20,20,20,
+	20,13,12,12,12,14,12,14,13,
+};
+
+static 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[] = {
+	   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,
+	13,
+	13
+};
+
+static static_codebook _44c1_sm_p8_1 = {
+	2, 169,
+	_vq_lengthlist__44c1_sm_p8_1,
+	1, -522616832, 1620115456, 4, 0,
+	_vq_quantlist__44c1_sm_p8_1,
+	NULL,
+	&_vq_auxt__44c1_sm_p8_1,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44c1_sm_p8_2[] = {
+	8,
+	7,
+	9,
+	6,
+	10,
+	5,
+	11,
+	4,
+	12,
+	3,
+	13,
+	2,
+	14,
+	1,
+	15,
+	0,
+	16,
+};
+
+static 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,
+	 9, 9, 9,10, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9,10,10,10, 7, 7, 8, 8, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9,10,11,11, 8, 8, 8, 8, 9, 9, 9, 9,
+	 9, 9,10,10, 9,10,10,10,10, 8, 8, 8, 8, 9, 9, 9,
+	 9, 9, 9, 9, 9,10,10,11,10,10, 8, 8, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9,10, 9,10,10,10,11,11, 8, 8, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9,11,11,11,11,11, 9, 9,
+	 9, 9, 9, 9, 9, 9,10, 9,10, 9,11,11,11,11,11, 9,
+	 8, 9, 9, 9, 9, 9, 9, 9,10,10, 9,11,11,10,11,11,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10, 9,11,11,11,11,
+	11,11,11, 9, 9,10, 9, 9, 9, 9,10, 9,10,10,11,10,
+	11,11,11,11, 9,10,10,10, 9, 9, 9, 9, 9, 9,10,11,
+	11,11,11,11,11, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,11,
+	11,10,11,11,11,11,10,10, 9, 9, 9, 9, 9, 9,10, 9,
+	10,11,10,11,11,11,11,11,11, 9, 9,10, 9, 9, 9, 9,
+	 9,
+};
+
+static 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[] = {
+	   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,
+	17,
+	17
+};
+
+static static_codebook _44c1_sm_p8_2 = {
+	2, 289,
+	_vq_lengthlist__44c1_sm_p8_2,
+	1, -529530880, 1611661312, 5, 0,
+	_vq_quantlist__44c1_sm_p8_2,
+	NULL,
+	&_vq_auxt__44c1_sm_p8_2,
+	NULL,
+	0
+};
+
+static 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,
+	 6, 5, 6, 8,12,14,14, 7, 8, 6, 6, 7, 9,11,14,14,
+	 8, 9, 6, 5, 6, 9,11,13,16,10,10, 7, 6, 7, 8,10,
+	11,
+};
+
+static static_codebook _huff_book__44c1_sm_short = {
+	2, 81,
+	_huff_lengthlist__44c1_sm_short,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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,
+	 8, 7, 7, 7,10,14, 9,10,12,10, 8, 8, 8,10,14,11,
+	13,15,13,12,11,11,12,16,17,18,18,19,20,18,16,16,
+	20,
+};
+
+static static_codebook _huff_book__44cn1_s_long = {
+	2, 81,
+	_huff_lengthlist__44cn1_s_long,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44cn1_s_p1_0[] = {
+	1,
+	0,
+	2,
+};
+
+static 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,
-	 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, 0, 0, 6, 6, 6, 7, 7,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 6, 6, 6, 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, 5, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0, 0, 0,
+	 0, 0, 0, 7, 9,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, 0, 0, 0, 0, 0, 0, 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, 8, 8, 0, 0, 0, 0, 0, 0, 7,10, 9, 0, 0,
+	 0, 0, 0, 0, 8,10, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -18463,36 +18829,483 @@
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 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, 8, 8, 0, 0, 0, 0,
+	 0, 0, 8,10,10, 0, 0, 0, 0, 0, 0, 8, 9,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, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7,10,10, 0, 0, 0,
+	 0, 0, 0, 9, 9,11, 0, 0, 0, 0, 0, 0,10,11,11, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7,10,10, 0, 0,
+	 0, 0, 0, 0, 9,11, 9, 0, 0, 0, 0, 0, 0,10,11,11,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 8, 0, 0, 0, 0, 0, 0, 8,10,10, 0, 0,
+	 0, 0, 0, 0, 8,10,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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 7,10,10, 0, 0, 0, 0, 0, 0,10,11,11, 0,
+	 0, 0, 0, 0, 0, 9, 9,11, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 7,10,10, 0, 0, 0, 0, 0, 0,10,11,11,
+	 0, 0, 0, 0, 0, 0, 9,11, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
 };
 
-static float _vq_quantthresh__8c1_s_p3_0[] = {
+static float _vq_quantthresh__44cn1_s_p1_0[] = {
+	-0.5, 0.5, 
+};
+
+static 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,
+	3,
+	3
+};
+
+static static_codebook _44cn1_s_p1_0 = {
+	8, 6561,
+	_vq_lengthlist__44cn1_s_p1_0,
+	1, -535822336, 1611661312, 2, 0,
+	_vq_quantlist__44cn1_s_p1_0,
+	NULL,
+	&_vq_auxt__44cn1_s_p1_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44cn1_s_p2_0[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static 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,
+	 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, 0, 0, 6, 7, 7, 9, 9,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 6, 7, 7, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,
+};
+
+static float _vq_quantthresh__44cn1_s_p2_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8c1_s_p3_0[] = {
+static long _vq_quantmap__44cn1_s_p2_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 encode_aux_threshmatch _vq_auxt__44cn1_s_p2_0 = {
+	_vq_quantthresh__44cn1_s_p2_0,
+	_vq_quantmap__44cn1_s_p2_0,
 	5,
 	5
 };
 
-static static_codebook _8c1_s_p3_0 = {
+static static_codebook _44cn1_s_p2_0 = {
 	4, 625,
-	_vq_lengthlist__8c1_s_p3_0,
+	_vq_lengthlist__44cn1_s_p2_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8c1_s_p3_0,
+	_vq_quantlist__44cn1_s_p2_0,
 	NULL,
-	&_vq_auxt__8c1_s_p3_0,
+	&_vq_auxt__44cn1_s_p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p4_0[] = {
+static long _vq_quantlist__44cn1_s_p3_0[] = {
 	4,
 	3,
 	5,
@@ -18504,43 +19317,43 @@
 	8,
 };
 
-static long _vq_lengthlist__8c1_s_p4_0[] = {
+static 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,
-	 8, 8, 0, 0, 0, 0, 0, 0, 0, 9, 8, 0, 0, 0, 0, 0,
+	 9, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0,
 	 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	 0,
 };
 
-static float _vq_quantthresh__8c1_s_p4_0[] = {
+static 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__8c1_s_p4_0[] = {
+static long _vq_quantmap__44cn1_s_p3_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 encode_aux_threshmatch _vq_auxt__44cn1_s_p3_0 = {
+	_vq_quantthresh__44cn1_s_p3_0,
+	_vq_quantmap__44cn1_s_p3_0,
 	9,
 	9
 };
 
-static static_codebook _8c1_s_p4_0 = {
+static static_codebook _44cn1_s_p3_0 = {
 	2, 81,
-	_vq_lengthlist__8c1_s_p4_0,
+	_vq_lengthlist__44cn1_s_p3_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__8c1_s_p4_0,
+	_vq_quantlist__44cn1_s_p3_0,
 	NULL,
-	&_vq_auxt__8c1_s_p4_0,
+	&_vq_auxt__44cn1_s_p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p5_0[] = {
+static long _vq_quantlist__44cn1_s_p4_0[] = {
 	4,
 	3,
 	5,
@@ -18552,43 +19365,43 @@
 	8,
 };
 
-static 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,
-	11,10, 8, 8,10,10, 0, 0, 0,11,11, 8, 8,10,10, 0,
-	 0, 0,12,12, 9, 9,10,10, 0, 0, 0, 0, 0, 9, 9,10,
-	10,
+static 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,
+	 9, 9, 9, 9,10,10, 0, 0, 0, 9, 9, 9, 9,10,10, 0,
+	 0, 0,10,10,10,10,11,11, 0, 0, 0, 0, 0,10,10,11,
+	11,
 };
 
-static float _vq_quantthresh__8c1_s_p5_0[] = {
+static 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__8c1_s_p5_0[] = {
+static long _vq_quantmap__44cn1_s_p4_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 encode_aux_threshmatch _vq_auxt__44cn1_s_p4_0 = {
+	_vq_quantthresh__44cn1_s_p4_0,
+	_vq_quantmap__44cn1_s_p4_0,
 	9,
 	9
 };
 
-static static_codebook _8c1_s_p5_0 = {
+static static_codebook _44cn1_s_p4_0 = {
 	2, 81,
-	_vq_lengthlist__8c1_s_p5_0,
+	_vq_lengthlist__44cn1_s_p4_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__8c1_s_p5_0,
+	_vq_quantlist__44cn1_s_p4_0,
 	NULL,
-	&_vq_auxt__8c1_s_p5_0,
+	&_vq_auxt__44cn1_s_p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p6_0[] = {
+static long _vq_quantlist__44cn1_s_p5_0[] = {
 	8,
 	7,
 	9,
@@ -18608,99 +19421,99 @@
 	16,
 };
 
-static 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,
-	11,12,12, 0, 0, 0, 9, 9, 8, 8,10,10,10,10,11,11,
-	12,12,12,12, 0, 0, 0, 9, 9, 8, 8,10,10,10,10,11,
-	11,12,12,12,12, 0, 0, 0,10,10, 9, 9,10,10,10,10,
-	11,11,12,12,13,13, 0, 0, 0,10,10, 9, 9,10,10,10,
-	10,11,11,12,12,13,13, 0, 0, 0,11,11, 9, 9,10,10,
-	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,10,
-	10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,
-	10,10,11,11,12,12,12,12,13,13, 0, 0, 0, 0, 0, 9,
-	 9,10,10,11,11,12,11,12,12,13,13, 0, 0, 0, 0, 0,
-	10,10,11,11,11,11,12,12,13,12,13,13, 0, 0, 0, 0,
-	 0, 0, 0,11,10,11,11,12,12,13,13,13,13, 0, 0, 0,
+static 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,
+	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,11,11,11, 0, 0, 0, 8, 8, 9, 9, 9, 9,10,10,
+	10,10,11,11,12,12, 0, 0, 0, 8, 8, 9, 9, 9, 9,10,
+	10,10,11,11,11,12,12, 0, 0, 0, 9, 9,10, 9,10,10,
+	10,10,11,11,11,11,12,12, 0, 0, 0, 0, 0, 9, 9,10,
+	10,10,10,11,11,12,12,12,12, 0, 0, 0, 0, 0, 9, 9,
+	10,10,10,11,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9,
+	 9,10,10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0,
+	10,10,11,10,11,11,11,12,13,12,13,13, 0, 0, 0, 0,
+	 0, 0, 0,11,10,11,11,12,12,12,12,13,13, 0, 0, 0,
 	 0, 0, 0, 0,11,11,12,12,12,12,13,13,13,14, 0, 0,
-	 0, 0, 0, 0, 0,11,11,12,12,12,12,13,13,14,13, 0,
-	 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,13,13,14,14,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,13,13,13,13,14,
+	 0, 0, 0, 0, 0,11,11,12,12,12,12,13,13,13,14, 0,
+	 0, 0, 0, 0, 0, 0,12,12,12,13,13,13,13,13,14,14,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,13,12,13,13,14,
 	14,
 };
 
-static float _vq_quantthresh__8c1_s_p6_0[] = {
+static 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__8c1_s_p6_0[] = {
+static 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__8c1_s_p6_0 = {
-	_vq_quantthresh__8c1_s_p6_0,
-	_vq_quantmap__8c1_s_p6_0,
+static encode_aux_threshmatch _vq_auxt__44cn1_s_p5_0 = {
+	_vq_quantthresh__44cn1_s_p5_0,
+	_vq_quantmap__44cn1_s_p5_0,
 	17,
 	17
 };
 
-static static_codebook _8c1_s_p6_0 = {
+static static_codebook _44cn1_s_p5_0 = {
 	2, 289,
-	_vq_lengthlist__8c1_s_p6_0,
+	_vq_lengthlist__44cn1_s_p5_0,
 	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__8c1_s_p6_0,
+	_vq_quantlist__44cn1_s_p5_0,
 	NULL,
-	&_vq_auxt__8c1_s_p6_0,
+	&_vq_auxt__44cn1_s_p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p7_0[] = {
+static long _vq_quantlist__44cn1_s_p6_0[] = {
 	1,
 	0,
 	2,
 };
 
-static 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,
-	10, 9, 9,11, 9,10, 7,10,10,11,11,11,11,10,10, 6,
-	 9, 9,10,10,10,11, 9, 9, 6, 9, 9,10,10,10,10, 9,
-	 9,
+static 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,
+	11,10,11,11,10,10, 7,10,10,11,11,11,12,11,11, 7,
+	 9, 9,11,10,10,11,10,10, 7, 9, 9,11,10,10,11,10,
+	10,
 };
 
-static float _vq_quantthresh__8c1_s_p7_0[] = {
+static float _vq_quantthresh__44cn1_s_p6_0[] = {
 	-5.5, 5.5, 
 };
 
-static long _vq_quantmap__8c1_s_p7_0[] = {
+static long _vq_quantmap__44cn1_s_p6_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 encode_aux_threshmatch _vq_auxt__44cn1_s_p6_0 = {
+	_vq_quantthresh__44cn1_s_p6_0,
+	_vq_quantmap__44cn1_s_p6_0,
 	3,
 	3
 };
 
-static static_codebook _8c1_s_p7_0 = {
+static static_codebook _44cn1_s_p6_0 = {
 	4, 81,
-	_vq_lengthlist__8c1_s_p7_0,
+	_vq_lengthlist__44cn1_s_p6_0,
 	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__8c1_s_p7_0,
+	_vq_quantlist__44cn1_s_p6_0,
 	NULL,
-	&_vq_auxt__8c1_s_p7_0,
+	&_vq_auxt__44cn1_s_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p7_1[] = {
+static long _vq_quantlist__44cn1_s_p6_1[] = {
 	5,
 	4,
 	6,
@@ -18714,46 +19527,46 @@
 	10,
 };
 
-static 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,
-	 7, 7, 7, 8, 8, 8, 8,10,10,10, 8, 8, 8, 8, 8, 8,
-	 8, 8,10,10,10, 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,
-	 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,10,10, 8, 8, 8,
-	 8, 8, 8,10,10,10,10,10, 8, 8, 8, 8, 8, 8,10,10,
-	10,10,10, 8, 8, 8, 8, 8, 8,
+static 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,
+	 7, 8, 8, 8, 8, 8, 8,10,10,10, 8, 8, 8, 8, 9, 9,
+	 9, 9,10,10,10, 8, 8, 8, 8, 9, 9, 9, 9,10,10,10,
+	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10, 9, 9, 9,
+	 9, 9, 9,10,10,10,10,10, 9, 9, 9, 9, 9, 9,10,10,
+	10,10,10, 9, 9, 9, 9, 9, 9,
 };
 
-static float _vq_quantthresh__8c1_s_p7_1[] = {
+static 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__8c1_s_p7_1[] = {
+static long _vq_quantmap__44cn1_s_p6_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 encode_aux_threshmatch _vq_auxt__44cn1_s_p6_1 = {
+	_vq_quantthresh__44cn1_s_p6_1,
+	_vq_quantmap__44cn1_s_p6_1,
 	11,
 	11
 };
 
-static static_codebook _8c1_s_p7_1 = {
+static static_codebook _44cn1_s_p6_1 = {
 	2, 121,
-	_vq_lengthlist__8c1_s_p7_1,
+	_vq_lengthlist__44cn1_s_p6_1,
 	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__8c1_s_p7_1,
+	_vq_quantlist__44cn1_s_p6_1,
 	NULL,
-	&_vq_auxt__8c1_s_p7_1,
+	&_vq_auxt__44cn1_s_p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p8_0[] = {
+static long _vq_quantlist__44cn1_s_p7_0[] = {
 	6,
 	5,
 	7,
@@ -18769,49 +19582,49 @@
 	12,
 };
 
-static 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,
-	 9,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
-	11, 0,12,12, 9, 9, 9, 9,10, 9,10,11,11,11, 0,13,
-	12, 9, 8, 9, 9,10,10,11,11,12,11, 0, 0, 0, 9, 9,
-	 9, 9,10,10,11,11,12,12, 0, 0, 0,10,10, 9, 9,10,
-	10,11,11,12,12, 0, 0, 0,13,13,10,10,11,11,12,11,
-	13,12, 0, 0, 0,14,14,10,10,11,10,11,11,12,12, 0,
-	 0, 0, 0, 0,12,12,11,11,12,12,13,13, 0, 0, 0, 0,
-	 0,12,12,11,10,12,11,13,12,
+static 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,
+	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
+	11, 0,12,12, 9, 9, 9,10,10,10,11,11,11,12, 0,13,
+	13, 9, 9, 9, 9,10,10,11,11,11,12, 0, 0, 0,10,10,
+	10,10,11,11,12,12,12,13, 0, 0, 0,10,10,10,10,11,
+	11,12,12,13,12, 0, 0, 0,14,14,11,10,11,12,12,13,
+	13,14, 0, 0, 0,15,15,11,11,12,11,12,12,14,13, 0,
+	 0, 0, 0, 0,12,12,12,12,13,13,14,14, 0, 0, 0, 0,
+	 0,13,13,12,12,13,13,13,14,
 };
 
-static float _vq_quantthresh__8c1_s_p8_0[] = {
+static 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__8c1_s_p8_0[] = {
+static 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__8c1_s_p8_0 = {
-	_vq_quantthresh__8c1_s_p8_0,
-	_vq_quantmap__8c1_s_p8_0,
+static encode_aux_threshmatch _vq_auxt__44cn1_s_p7_0 = {
+	_vq_quantthresh__44cn1_s_p7_0,
+	_vq_quantmap__44cn1_s_p7_0,
 	13,
 	13
 };
 
-static static_codebook _8c1_s_p8_0 = {
+static static_codebook _44cn1_s_p7_0 = {
 	2, 169,
-	_vq_lengthlist__8c1_s_p8_0,
+	_vq_lengthlist__44cn1_s_p7_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__8c1_s_p8_0,
+	_vq_quantlist__44cn1_s_p7_0,
 	NULL,
-	&_vq_auxt__8c1_s_p8_0,
+	&_vq_auxt__44cn1_s_p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p8_1[] = {
+static long _vq_quantlist__44cn1_s_p7_1[] = {
 	2,
 	1,
 	3,
@@ -18819,38 +19632,115 @@
 	4,
 };
 
-static long _vq_lengthlist__8c1_s_p8_1[] = {
+static 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__8c1_s_p8_1[] = {
+static float _vq_quantthresh__44cn1_s_p7_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8c1_s_p8_1[] = {
+static long _vq_quantmap__44cn1_s_p7_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 encode_aux_threshmatch _vq_auxt__44cn1_s_p7_1 = {
+	_vq_quantthresh__44cn1_s_p7_1,
+	_vq_quantmap__44cn1_s_p7_1,
 	5,
 	5
 };
 
-static static_codebook _8c1_s_p8_1 = {
+static static_codebook _44cn1_s_p7_1 = {
 	2, 25,
-	_vq_lengthlist__8c1_s_p8_1,
+	_vq_lengthlist__44cn1_s_p7_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8c1_s_p8_1,
+	_vq_quantlist__44cn1_s_p7_1,
 	NULL,
-	&_vq_auxt__8c1_s_p8_1,
+	&_vq_auxt__44cn1_s_p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p9_0[] = {
+static long _vq_quantlist__44cn1_s_p8_0[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static 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,
+	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,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,11,11,11,11,11,11,11,11,11, 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,10,11,11,11,11,11,11,11,11,11,
+	11,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,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,
+	11,11,11,11,11,11,11,11,11,11, 8,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,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,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,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,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,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,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,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,
+};
+
+static float _vq_quantthresh__44cn1_s_p8_0[] = {
+	-331.5, -110.5, 110.5, 331.5, 
+};
+
+static 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,
+	5,
+	5
+};
+
+static static_codebook _44cn1_s_p8_0 = {
+	4, 625,
+	_vq_lengthlist__44cn1_s_p8_0,
+	1, -518283264, 1627103232, 3, 0,
+	_vq_quantlist__44cn1_s_p8_0,
+	NULL,
+	&_vq_auxt__44cn1_s_p8_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44cn1_s_p8_1[] = {
 	6,
 	5,
 	7,
@@ -18866,210 +19756,1229 @@
 	12,
 };
 
-static 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,
-	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,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,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,10,10,10,10,10,10,10,
-	10,10,10,10,10, 9, 9, 9, 9,
+static 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,
+	10,12,10,11,15, 7, 8, 8, 8, 9, 9,11,11,13,12,12,
+	13,15,10,10, 8, 8,10,10,12,12,11,14,10,10,15,11,
+	11, 8, 8,10,10,12,13,13,14,15,13,15,15,15,10,10,
+	10,10,12,12,13,12,13,10,15,15,15,10,10,11,10,13,
+	11,13,13,15,13,15,15,15,13,13,10,11,11,11,12,10,
+	14,11,15,15,14,14,13,10,10,12,11,13,13,14,14,15,
+	15,15,15,15,11,11,11,11,12,11,15,12,15,15,15,15,
+	15,12,12,11,11,14,12,13,14,
 };
 
-static 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 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__8c1_s_p9_0[] = {
+static 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__8c1_s_p9_0 = {
-	_vq_quantthresh__8c1_s_p9_0,
-	_vq_quantmap__8c1_s_p9_0,
+static encode_aux_threshmatch _vq_auxt__44cn1_s_p8_1 = {
+	_vq_quantthresh__44cn1_s_p8_1,
+	_vq_quantmap__44cn1_s_p8_1,
 	13,
 	13
 };
 
-static static_codebook _8c1_s_p9_0 = {
+static static_codebook _44cn1_s_p8_1 = {
 	2, 169,
-	_vq_lengthlist__8c1_s_p9_0,
-	1, -513964032, 1628680192, 4, 0,
-	_vq_quantlist__8c1_s_p9_0,
+	_vq_lengthlist__44cn1_s_p8_1,
+	1, -522616832, 1620115456, 4, 0,
+	_vq_quantlist__44cn1_s_p8_1,
 	NULL,
-	&_vq_auxt__8c1_s_p9_0,
+	&_vq_auxt__44cn1_s_p8_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p9_1[] = {
+static long _vq_quantlist__44cn1_s_p8_2[] = {
+	8,
 	7,
+	9,
 	6,
+	10,
+	5,
+	11,
+	4,
+	12,
+	3,
+	13,
+	2,
+	14,
+	1,
+	15,
+	0,
+	16,
+};
+
+static 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,
+	 9, 9, 9,10,10,10, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9,
+	 9, 9,10, 9,10,11,10, 7, 6, 7, 7, 8, 8, 9, 9, 9,
+	 9, 9, 9, 9,10,10,10,11, 7, 7, 8, 8, 8, 8, 9, 9,
+	 9, 9, 9, 9, 9, 9,10,10,10, 7, 7, 8, 8, 8, 8, 9,
+	 9, 9, 9, 9, 9, 9,10,11,11,11, 8, 8, 8, 8, 8, 8,
+	 9, 9, 9, 9, 9, 9, 9, 9,11,10,10,11,11, 8, 8, 8,
+	 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,11,11, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11,11,10,11,11, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,11,10,11,11,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11,10,10,11,
+	11,11,11, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,11,11,
+	10,11,11,11, 9,10,10, 9, 9, 9, 9, 9, 9, 9,10,11,
+	11,11,11,11,11, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11,
+	11,11,11,11,11,11,10,10, 9, 9, 9, 9, 9, 9, 9, 9,
+	11,11,11,10,11,11,11,11,11, 9, 9, 9,10, 9, 9, 9,
+	 9,
+};
+
+static 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[] = {
+	   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,
+	17,
+	17
+};
+
+static static_codebook _44cn1_s_p8_2 = {
+	2, 289,
+	_vq_lengthlist__44cn1_s_p8_2,
+	1, -529530880, 1611661312, 5, 0,
+	_vq_quantlist__44cn1_s_p8_2,
+	NULL,
+	&_vq_auxt__44cn1_s_p8_2,
+	NULL,
+	0
+};
+
+static 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,
+	14,10,12,13,14,15,13, 9, 9, 7, 6, 8,11,12,12,14,
+	 8, 8, 5, 4, 5, 8,11,12,16,10,10, 6, 5, 6, 8, 9,
+	10,
+};
+
+static static_codebook _huff_book__44cn1_s_short = {
+	2, 81,
+	_huff_lengthlist__44cn1_s_short,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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,
+	 7, 7, 6, 8,10,13, 9,11,12, 9, 9, 7, 8,10,12,10,
+	13,15,11,11,10, 9,10,13,13,16,17,14,15,14,13,14,
+	17,
+};
+
+static static_codebook _huff_book__44cn1_sm_long = {
+	2, 81,
+	_huff_lengthlist__44cn1_sm_long,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44cn1_sm_p1_0[] = {
+	1,
+	0,
+	2,
+};
+
+static 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,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0, 0, 0,
+	 0, 0, 0, 7, 8, 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, 0, 0, 0, 0, 0, 0, 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, 8, 8, 0, 0, 0, 0, 0, 0, 7, 9, 8, 0, 0,
+	 0, 0, 0, 0, 8, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 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, 8, 8, 0, 0, 0, 0,
+	 0, 0, 8,10, 9, 0, 0, 0, 0, 0, 0, 8, 9, 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, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7,10, 9, 0, 0, 0,
+	 0, 0, 0, 9, 9,10, 0, 0, 0, 0, 0, 0, 9,10,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, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 9, 9, 0, 0,
+	 0, 0, 0, 0, 8,10, 9, 0, 0, 0, 0, 0, 0, 9,10,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, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0, 0,
+	 0, 0, 0, 0, 8, 9,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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 7, 9, 9, 0, 0, 0, 0, 0, 0, 9,10,10, 0,
+	 0, 0, 0, 0, 0, 8, 9,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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 7, 9,10, 0, 0, 0, 0, 0, 0, 9,10,10,
+	 0, 0, 0, 0, 0, 0, 9,10, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,
+};
+
+static float _vq_quantthresh__44cn1_sm_p1_0[] = {
+	-0.5, 0.5, 
+};
+
+static 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,
+	3,
+	3
+};
+
+static static_codebook _44cn1_sm_p1_0 = {
+	8, 6561,
+	_vq_lengthlist__44cn1_sm_p1_0,
+	1, -535822336, 1611661312, 2, 0,
+	_vq_quantlist__44cn1_sm_p1_0,
+	NULL,
+	&_vq_auxt__44cn1_sm_p1_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44cn1_sm_p2_0[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static 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,
+	 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, 0, 0, 6, 7, 7, 9, 9,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 7, 7, 7, 9, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,
+};
+
+static float _vq_quantthresh__44cn1_sm_p2_0[] = {
+	-1.5, -0.5, 0.5, 1.5, 
+};
+
+static 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,
+	5,
+	5
+};
+
+static static_codebook _44cn1_sm_p2_0 = {
+	4, 625,
+	_vq_lengthlist__44cn1_sm_p2_0,
+	1, -533725184, 1611661312, 3, 0,
+	_vq_quantlist__44cn1_sm_p2_0,
+	NULL,
+	&_vq_auxt__44cn1_sm_p2_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44cn1_sm_p3_0[] = {
+	4,
+	3,
+	5,
+	2,
+	6,
+	1,
+	7,
+	0,
 	8,
+};
+
+static 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,
+	 9, 9, 0, 0, 0, 0, 0, 0, 0,10, 9, 0, 0, 0, 0, 0,
+	 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0,
+};
+
+static 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[] = {
+	    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,
+	9,
+	9
+};
+
+static static_codebook _44cn1_sm_p3_0 = {
+	2, 81,
+	_vq_lengthlist__44cn1_sm_p3_0,
+	1, -531628032, 1611661312, 4, 0,
+	_vq_quantlist__44cn1_sm_p3_0,
+	NULL,
+	&_vq_auxt__44cn1_sm_p3_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44cn1_sm_p4_0[] = {
+	4,
+	3,
 	5,
+	2,
+	6,
+	1,
+	7,
+	0,
+	8,
+};
+
+static 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,
+	 9, 9, 9, 9,10,10, 0, 0, 0, 9, 9, 9, 9,10,10, 0,
+	 0, 0,10,10,10,10,11,11, 0, 0, 0, 0, 0,10,10,11,
+	11,
+};
+
+static 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[] = {
+	    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,
 	9,
+	9
+};
+
+static static_codebook _44cn1_sm_p4_0 = {
+	2, 81,
+	_vq_lengthlist__44cn1_sm_p4_0,
+	1, -531628032, 1611661312, 4, 0,
+	_vq_quantlist__44cn1_sm_p4_0,
+	NULL,
+	&_vq_auxt__44cn1_sm_p4_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44cn1_sm_p5_0[] = {
+	8,
+	7,
+	9,
+	6,
+	10,
+	5,
+	11,
 	4,
-	10,
+	12,
 	3,
-	11,
+	13,
 	2,
-	12,
+	14,
 	1,
-	13,
+	15,
 	0,
+	16,
+};
+
+static 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,
+	11,12,12, 0, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,
+	11,11,12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9,10,10,11,
+	11,11,11,12,12, 0, 0, 0, 8, 8, 9, 9,10,10,10,10,
+	11,11,12,12,12,12, 0, 0, 0, 8, 8, 9, 9,10,10,10,
+	10,11,11,12,12,12,12, 0, 0, 0, 9, 9, 9, 9,10,10,
+	10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,10,
+	10,10,10,11,11,12,12,13,13, 0, 0, 0, 0, 0, 9, 9,
+	10,10,11,11,12,12,13,13,13,13, 0, 0, 0, 0, 0, 9,
+	 9,10,10,11,11,12,12,12,13,13,13, 0, 0, 0, 0, 0,
+	10,10,11,11,11,11,12,12,13,13,14,14, 0, 0, 0, 0,
+	 0, 0, 0,11,11,11,11,12,12,13,13,14,14, 0, 0, 0,
+	 0, 0, 0, 0,11,11,12,12,13,13,13,13,14,14, 0, 0,
+	 0, 0, 0, 0, 0,11,11,12,12,13,13,13,13,14,14, 0,
+	 0, 0, 0, 0, 0, 0,12,12,12,13,13,13,14,14,14,14,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,13,13,14,14,14,
 	14,
 };
 
-static 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,
-	 8, 8,10,10,11,11,12,13,13,13,13,13,17, 7, 7, 8,
-	 8,10,10,11,11,13,13,13,13,14,14,17,11,11, 9, 9,
-	11,11,12,12,12,13,13,14,15,13,17,12,12, 9, 9,11,
-	11,12,12,13,13,13,13,14,16,17,17,17,11,12,12,12,
-	13,13,13,14,15,14,15,15,17,17,17,12,12,11,11,13,
-	13,14,14,15,14,15,15,17,17,17,15,15,13,13,14,14,
-	15,14,15,15,16,15,17,17,17,15,15,13,13,13,14,14,
-	15,15,15,15,16,17,17,17,17,16,14,15,14,14,15,14,
-	14,15,15,15,17,17,17,17,17,14,14,16,14,15,15,15,
-	15,15,15,17,17,17,17,17,17,16,16,15,17,15,15,14,
-	17,15,17,16,17,17,17,17,16,15,14,15,15,15,15,15,
-	15,
+static 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 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__44cn1_sm_p5_0[] = {
+	   15,   13,   11,    9,    7,    5,    3,    1,
+	    0,    2,    4,    6,    8,   10,   12,   14,
+	   16,
 };
 
-static 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__44cn1_sm_p5_0 = {
+	_vq_quantthresh__44cn1_sm_p5_0,
+	_vq_quantmap__44cn1_sm_p5_0,
+	17,
+	17
 };
 
-static encode_aux_threshmatch _vq_auxt__8c1_s_p9_1 = {
-	_vq_quantthresh__8c1_s_p9_1,
-	_vq_quantmap__8c1_s_p9_1,
-	15,
-	15
+static static_codebook _44cn1_sm_p5_0 = {
+	2, 289,
+	_vq_lengthlist__44cn1_sm_p5_0,
+	1, -529530880, 1611661312, 5, 0,
+	_vq_quantlist__44cn1_sm_p5_0,
+	NULL,
+	&_vq_auxt__44cn1_sm_p5_0,
+	NULL,
+	0
 };
 
-static static_codebook _8c1_s_p9_1 = {
-	2, 225,
-	_vq_lengthlist__8c1_s_p9_1,
-	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__8c1_s_p9_1,
+static long _vq_quantlist__44cn1_sm_p6_0[] = {
+	1,
+	0,
+	2,
+};
+
+static 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,
+	11,10,11,11,10,10, 7,11,11,11,11,11,12,11,11, 7,
+	 9, 9,11,10,10,12,10,10, 7, 9, 9,11,10,10,11,10,
+	10,
+};
+
+static float _vq_quantthresh__44cn1_sm_p6_0[] = {
+	-5.5, 5.5, 
+};
+
+static 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,
+	3,
+	3
+};
+
+static static_codebook _44cn1_sm_p6_0 = {
+	4, 81,
+	_vq_lengthlist__44cn1_sm_p6_0,
+	1, -529137664, 1618345984, 2, 0,
+	_vq_quantlist__44cn1_sm_p6_0,
 	NULL,
-	&_vq_auxt__8c1_s_p9_1,
+	&_vq_auxt__44cn1_sm_p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8c1_s_p9_2[] = {
+static long _vq_quantlist__44cn1_sm_p6_1[] = {
+	5,
+	4,
+	6,
+	3,
+	7,
+	2,
+	8,
+	1,
+	9,
+	0,
 	10,
+};
+
+static 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,
+	 7, 7, 7, 8, 8, 8, 8,10,10,10, 8, 8, 8, 8, 8, 8,
+	 8, 8,10,10,10, 8, 8, 8, 8, 8, 8, 8, 8,10,10,10,
+	 8, 8, 8, 8, 8, 8, 9, 9,10,10,10,10,10, 8, 8, 8,
+	 8, 9, 9,10,10,10,10,10, 9, 9, 9, 9, 8, 9,10,10,
+	10,10,10, 8, 9, 8, 8, 9, 8,
+};
+
+static 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[] = {
+	    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,
+	11,
+	11
+};
+
+static static_codebook _44cn1_sm_p6_1 = {
+	2, 121,
+	_vq_lengthlist__44cn1_sm_p6_1,
+	1, -531365888, 1611661312, 4, 0,
+	_vq_quantlist__44cn1_sm_p6_1,
+	NULL,
+	&_vq_auxt__44cn1_sm_p6_1,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44cn1_sm_p7_0[] = {
+	6,
+	5,
+	7,
+	4,
+	8,
+	3,
 	9,
+	2,
+	10,
+	1,
 	11,
-	8,
+	0,
 	12,
-	7,
+};
+
+static 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,
+	10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,
+	11, 0,12,12, 9, 9, 9,10,10,10,11,11,12,12, 0,13,
+	13, 9, 9, 9, 9,10,10,11,11,12,12, 0, 0, 0,10,10,
+	10,10,11,11,12,12,12,13, 0, 0, 0,10,10,10,10,11,
+	11,12,12,12,12, 0, 0, 0,14,14,11,11,11,11,12,13,
+	13,13, 0, 0, 0,14,14,11,10,11,11,12,12,13,13, 0,
+	 0, 0, 0, 0,12,12,12,12,13,13,13,14, 0, 0, 0, 0,
+	 0,13,12,12,12,13,13,13,14,
+};
+
+static 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[] = {
+	   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,
 	13,
+	13
+};
+
+static static_codebook _44cn1_sm_p7_0 = {
+	2, 169,
+	_vq_lengthlist__44cn1_sm_p7_0,
+	1, -526516224, 1616117760, 4, 0,
+	_vq_quantlist__44cn1_sm_p7_0,
+	NULL,
+	&_vq_auxt__44cn1_sm_p7_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44cn1_sm_p7_1[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static 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[] = {
+	-1.5, -0.5, 0.5, 1.5, 
+};
+
+static 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,
+	5,
+	5
+};
+
+static static_codebook _44cn1_sm_p7_1 = {
+	2, 25,
+	_vq_lengthlist__44cn1_sm_p7_1,
+	1, -533725184, 1611661312, 3, 0,
+	_vq_quantlist__44cn1_sm_p7_1,
+	NULL,
+	&_vq_auxt__44cn1_sm_p7_1,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44cn1_sm_p8_0[] = {
+	4,
+	3,
+	5,
+	2,
 	6,
+	1,
+	7,
+	0,
+	8,
+};
+
+static 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,
+	13,14,14,14,14,14,14,14,13,14,10,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
 	14,
+};
+
+static 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[] = {
+	    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,
+	9,
+	9
+};
+
+static static_codebook _44cn1_sm_p8_0 = {
+	2, 81,
+	_vq_lengthlist__44cn1_sm_p8_0,
+	1, -516186112, 1627103232, 4, 0,
+	_vq_quantlist__44cn1_sm_p8_0,
+	NULL,
+	&_vq_auxt__44cn1_sm_p8_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44cn1_sm_p8_1[] = {
+	6,
 	5,
-	15,
+	7,
 	4,
-	16,
+	8,
 	3,
-	17,
+	9,
 	2,
-	18,
+	10,
 	1,
-	19,
+	11,
 	0,
-	20,
+	12,
 };
 
-static 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,
-	 7, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,11,
-	11,12, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,10,10,10,10,
-	10,10,10,10,11,11,11, 7, 7, 8, 8, 8, 8, 9, 9, 9,
-	 9,10,10,10,10,10,10,10,10,11,11,11, 8, 8, 8, 8,
-	 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,11,11,
-	11, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,10,
-	10,10,10,11,12,11, 9, 9, 8, 9, 9, 9, 9, 9,10,10,
-	10,10,10,10,10,10,10,10,11,11,11,11,11, 8, 8, 9,
-	 9, 9, 9,10,10,10,10,10,10,10,10,10,10,11,12,11,
-	12,11, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,
-	10,10,11,11,11,11,11, 9, 9, 9, 9,10,10,10,10,10,
-	10,10,10,10,10,10,10,12,11,12,11,11, 9, 9, 9,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,12,11,11,11,
-	11,11,11,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	11,11,11,12,11,11,12,11,10,10,10,10,10,10,10,10,
-	10,10,10,10,11,10,11,11,11,11,11,11,11,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,11,11,12,11,12,
-	11,11,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	11,11,12,11,12,11,11,11,11,10,10,10,10,10,10,10,
-	10,10,10,10,10,11,11,12,11,11,12,11,11,12,10,10,
-	11,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,
-	11,11,11,10,10,10,10,10,10,10,10,10,10,10,10,12,
-	12,11,12,11,11,12,12,12,11,11,10,10,10,10,10,10,
-	10,10,10,11,12,12,11,12,12,11,12,11,11,11,11,10,
-	10,10,10,10,10,10,10,10,10,
+static 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,
+	11,12,11,12,17, 7, 7, 8, 7, 9, 9,11,11,12,12,12,
+	12,14,11,11, 8, 8,10,10,11,12,12,13,11,12,14,11,
+	11, 8, 8,10,10,11,12,12,13,13,12,14,15,14,10,10,
+	10,10,11,12,12,12,12,11,14,13,16,10,10,10, 9,12,
+	11,12,12,13,14,14,15,14,14,13,10,10,11,11,12,11,
+	13,11,14,12,15,13,14,11,10,12,10,12,12,13,13,13,
+	13,14,15,15,12,12,11,11,12,11,13,12,14,14,14,14,
+	17,12,12,11,10,13,11,13,13,
 };
 
-static 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 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__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 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__8c1_s_p9_2 = {
-	_vq_quantthresh__8c1_s_p9_2,
-	_vq_quantmap__8c1_s_p9_2,
-	21,
-	21
+static encode_aux_threshmatch _vq_auxt__44cn1_sm_p8_1 = {
+	_vq_quantthresh__44cn1_sm_p8_1,
+	_vq_quantmap__44cn1_sm_p8_1,
+	13,
+	13
 };
 
-static static_codebook _8c1_s_p9_2 = {
-	2, 441,
-	_vq_lengthlist__8c1_s_p9_2,
-	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__8c1_s_p9_2,
+static static_codebook _44cn1_sm_p8_1 = {
+	2, 169,
+	_vq_lengthlist__44cn1_sm_p8_1,
+	1, -522616832, 1620115456, 4, 0,
+	_vq_quantlist__44cn1_sm_p8_1,
 	NULL,
-	&_vq_auxt__8c1_s_p9_2,
+	&_vq_auxt__44cn1_sm_p8_1,
 	NULL,
 	0
 };
 
-static 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,
-	10,13, 7, 5,17, 6, 8, 4, 5, 6, 8,10, 6, 5,17, 6,
-	 8, 5, 4, 5, 7, 9, 7, 7,17, 8, 9, 6, 5, 5, 6, 8,
-	 8, 8,17, 9,11, 8, 6, 6, 6, 7, 9,10,17,12,12,10,
-	 9, 7, 7, 8,
+static long _vq_quantlist__44cn1_sm_p8_2[] = {
+	8,
+	7,
+	9,
+	6,
+	10,
+	5,
+	11,
+	4,
+	12,
+	3,
+	13,
+	2,
+	14,
+	1,
+	15,
+	0,
+	16,
 };
 
-static static_codebook _huff_book__8c1_s_single = {
-	2, 100,
-	_huff_lengthlist__8c1_s_single,
+static 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,
+	 9, 9, 9,10, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,
+	 9, 9, 9, 9,10,10,10, 7, 7, 7, 8, 8, 8, 9, 9, 9,
+	 9, 9, 9, 9, 9,10,10,10, 8, 8, 8, 8, 8, 8, 9, 9,
+	 9, 9, 9, 9, 9, 9,10,10,10, 8, 8, 8, 8, 8, 8, 9,
+	 9, 9, 9, 9, 9, 9, 9,11,10,11, 8, 8, 8, 8, 8, 8,
+	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,11,11, 8, 8, 8,
+	 8, 9, 9, 9, 9, 9, 9, 9, 9,11,10,11,11,11, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,11,10,11,11, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,11,11,10,11,11,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11,10,11,11,
+	11,11,11, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,11,11,
+	11,11,11,11, 9,10,10,10, 9, 9, 9, 9, 9, 9,11,10,
+	11,11,11,11,11, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11,
+	11,11,11,11,11,11,10,10, 9, 9, 9, 9, 9, 9, 9, 9,
+	10,11,11,11,11,11,11,11,11, 9, 9, 9, 9, 9, 9, 9,
+	 9,
+};
+
+static 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[] = {
+	   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,
+	17,
+	17
+};
+
+static static_codebook _44cn1_sm_p8_2 = {
+	2, 289,
+	_vq_lengthlist__44cn1_sm_p8_2,
+	1, -529530880, 1611661312, 5, 0,
+	_vq_quantlist__44cn1_sm_p8_2,
+	NULL,
+	&_vq_auxt__44cn1_sm_p8_2,
+	NULL,
+	0
+};
+
+static 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,
+	 6, 5, 6, 9,12,14,12, 6, 7, 8, 6, 7, 9,12,13,14,
+	 8, 8, 7, 5, 5, 8,10,12,16, 9, 9, 8, 6, 6, 7, 9,
+	 9,
+};
+
+static static_codebook _huff_book__44cn1_sm_short = {
+	2, 81,
+	_huff_lengthlist__44cn1_sm_short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,


Property changes on: branches/vorbis-aotuv/lib/books/coupled/res_books_stereo.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/books/floor
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/vorbis-aotuv/lib/books/floor/.cvsignore
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/books/floor/Makefile.am
===================================================================
--- branches/vorbis-aotuv/lib/books/floor/Makefile.am	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/books/floor/Makefile.am	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,5 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 EXTRA_DIST = floor_books.h


Property changes on: branches/vorbis-aotuv/lib/books/floor/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/books/floor/floor_books.h
===================================================================
--- branches/vorbis-aotuv/lib/books/floor/floor_books.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/books/floor/floor_books.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,25 +11,19 @@
  ********************************************************************
 
  function: static codebooks autogenerated by huff/huffbuld
- last modified: $Id: floor_books.h,v 1.3 2002/07/11 06:41:01 xiphmont Exp $
+ last modified: $Id$
 
  ********************************************************************/
 
 #include "codebook.h"
-static 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, 7, 5, 7, 5, 7, 5, 8, 5, 8, 6,
-	 8, 6, 9, 6, 9, 6, 9, 6,10, 6,10, 6,11, 6,11, 6,
-	11, 6,12, 6,12, 7,12, 7,12, 7,12, 7,12, 7,12, 7,
-	12, 7,12, 7,12, 7,12, 7,12, 8,12, 8,11, 8,11, 8,
-	12, 9,11, 9, 9,10,11, 9,12, 9,12,12,14,13,13,14,
-	13,13,13,12,14,16,20,20,21,14,14,15,21,21,21,20,
-	21,21,21,21,21,21,21,21,21,21,20,20,20,20,20,20,
+
+static long _huff_lengthlist_line_256x7_0sub1[] = {
+	 0, 2, 3, 3, 3, 3, 4, 3, 4,
 };
 
-static static_codebook _huff_book_line_1024x27_0sub0 = {
-	1, 128,
-	_huff_lengthlist_line_1024x27_0sub0,
+static static_codebook _huff_book_line_256x7_0sub1 = {
+	1, 9,
+	_huff_lengthlist_line_256x7_0sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -38,14 +32,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_1sub0[] = {
-	 2, 5, 5, 4, 5, 4, 5, 4, 5, 4, 6, 4, 6, 5, 6, 5,
-	 7, 5, 7, 6, 8, 6, 8, 6, 8, 6, 9, 6,10, 6,10, 6,
+static 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_1024x27_1sub0 = {
-	1, 32,
-	_huff_lengthlist_line_1024x27_1sub0,
+static static_codebook _huff_book_line_256x7_0sub2 = {
+	1, 25,
+	_huff_lengthlist_line_256x7_0sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -54,20 +48,135 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_1sub1[] = {
+static 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 = {
+	1, 64,
+	_huff_lengthlist_line_256x7_0sub3,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static long _huff_lengthlist_line_256x7_1sub1[] = {
+	 0, 3, 3, 3, 3, 2, 4, 3, 4,
+};
+
+static static_codebook _huff_book_line_256x7_1sub1 = {
+	1, 9,
+	_huff_lengthlist_line_256x7_1sub1,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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 = {
+	1, 25,
+	_huff_lengthlist_line_256x7_1sub2,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static long _huff_lengthlist_line_256x7_1sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 9, 5,10, 4,10, 4, 9, 4, 9, 3, 9, 4, 9, 4, 9, 4,
-	 9, 4, 9, 4, 9, 4, 8, 4, 8, 4, 8, 5, 9, 5, 9, 6,
-	 8, 6, 9, 7,10, 8,10, 9,10,10,10,12,11,13,12,13,
-	13,15,13,14,13,14,12,15,13,15,14,15,13,16,14,16,
-	14,15,14,14,14,16,15,18,15,18,16,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,17,
+	 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_1024x27_1sub1 = {
+static static_codebook _huff_book_line_256x7_1sub3 = {
+	1, 64,
+	_huff_lengthlist_line_256x7_1sub3,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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 = {
+	1, 64,
+	_huff_lengthlist_line_256x7_class0,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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,
+	15,13,15,15,15,10,11,15,15,13,13,15,15,15,15,15,
+	 4, 6, 7,15, 6, 8, 9,15,10,10,12,15,15,15,15,15,
+	 2, 5, 6,15, 5, 6, 7,15, 8, 6, 7,15,15,15,15,15,
+	 5, 6, 8,15, 5, 6, 7,15, 9, 6, 7,15,15,15,15,15,
+	14,12,13,15,12,10,11,15,15,15,15,15,15,15,15,15,
+	 7, 8, 9,15, 9,10,10,15,15,14,14,15,15,15,15,15,
+	 5, 6, 7,15, 7, 8, 9,15,12, 9,10,15,15,15,15,15,
+	 7, 7, 9,15, 7, 7, 8,15,12, 8, 9,15,15,15,15,15,
+	13,13,14,15,12,11,12,15,15,15,15,15,15,15,15,15,
+	15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+	13,13,13,15,15,15,15,15,15,15,15,15,15,15,15,15,
+	15,12,13,15,15,12,13,15,15,14,15,15,15,15,15,15,
+	15,15,15,15,15,15,13,15,15,15,15,15,15,15,15,15,
+};
+
+static static_codebook _huff_book_line_256x7_class1 = {
+	1, 256,
+	_huff_lengthlist_line_256x7_class1,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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,
+	 9, 7, 9, 8, 9, 8,10, 8,10, 8,10, 7,10, 6,10, 8,
+	10, 8,11, 7,10, 7,11, 8,11,11,12,12,11,11,12,11,
+	13,11,13,11,13,12,15,12,13,13,14,14,14,14,14,15,
+	15,15,16,14,17,19,19,18,18,18,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_512x17_0sub0 = {
 	1, 128,
-	_huff_lengthlist_line_1024x27_1sub1,
+	_huff_lengthlist_line_512x17_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -76,14 +185,14 @@
 	0
 };
 
-static 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, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9,10,10,
+static 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_1024x27_2sub0 = {
+static static_codebook _huff_book_line_512x17_1sub0 = {
 	1, 32,
-	_huff_lengthlist_line_1024x27_2sub0,
+	_huff_lengthlist_line_512x17_1sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -92,20 +201,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_2sub1[] = {
+static 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,
-	 3, 3, 4, 3, 4, 4, 5, 4, 5, 5, 5, 5, 6, 5, 6, 6,
-	 7, 6, 7, 7, 7, 7, 7, 7, 8, 9, 8, 9, 8,10, 8,11,
-	 8,12, 9,13, 9,14, 9,14, 8,12, 8,14, 9,14, 8,12,
-	 8,11, 8,11, 8,11, 9,11,10,11,10,12,10,12,11,12,
-	12,12,12,12,11,12,11,13,11,13,12,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,13,
+	 4, 3, 5, 3, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 6, 5,
+	 6, 5, 7, 5, 8, 6, 8, 6, 8, 6, 8, 6, 8, 7, 9, 7,
+	 9, 7,11, 9,11,11,12,11,14,12,14,16,14,16,13,16,
+	14,16,12,15,13,16,14,16,13,14,12,15,13,15,13,13,
+	13,15,12,14,14,15,13,15,12,15,15,15,15,15,15,15,
+	15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
 };
 
-static static_codebook _huff_book_line_1024x27_2sub1 = {
+static static_codebook _huff_book_line_512x17_1sub1 = {
 	1, 128,
-	_huff_lengthlist_line_1024x27_2sub1,
+	_huff_lengthlist_line_512x17_1sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -114,14 +223,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_3sub1[] = {
-	 0, 4, 5, 4, 5, 3, 5, 3, 5, 3, 5, 4, 4, 4, 5, 4,
-	 5, 5,
+static 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_1024x27_3sub1 = {
+static static_codebook _huff_book_line_512x17_2sub1 = {
 	1, 18,
-	_huff_lengthlist_line_1024x27_3sub1,
+	_huff_lengthlist_line_512x17_2sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -130,16 +239,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_3sub2[] = {
+static long _huff_lengthlist_line_512x17_2sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 3, 3, 3, 3, 4, 4, 4, 5, 4, 6, 5, 6, 5, 7,
-	 5, 9, 5,10, 6,11, 6,12, 7,13, 8,15, 8,15, 9,15,
-	 9,15,
+	 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_1024x27_3sub2 = {
+static static_codebook _huff_book_line_512x17_2sub2 = {
 	1, 50,
-	_huff_lengthlist_line_1024x27_3sub2,
+	_huff_lengthlist_line_512x17_2sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -148,20 +257,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_3sub3[] = {
+static 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,
-	 0, 0, 2, 9, 2, 9, 2, 9, 4, 9, 6, 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, 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,
+	 0, 0, 3, 3, 3, 3, 4, 3, 4, 4, 5, 5, 6, 6, 7, 7,
+	 7, 8, 8,11, 8, 9, 9, 9,10,11,11,11, 9,10,10,11,
+	11,11,11,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,10,10,10,10,10,10,10,10,10,10,
 };
 
-static static_codebook _huff_book_line_1024x27_3sub3 = {
+static static_codebook _huff_book_line_512x17_2sub3 = {
 	1, 128,
-	_huff_lengthlist_line_1024x27_3sub3,
+	_huff_lengthlist_line_512x17_2sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -170,14 +279,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_4sub1[] = {
-	 0, 4, 5, 4, 5, 4, 6, 3, 6, 3, 5, 3, 5, 3, 6, 4,
-	 6, 4,
+static 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_1024x27_4sub1 = {
+static static_codebook _huff_book_line_512x17_3sub1 = {
 	1, 18,
-	_huff_lengthlist_line_1024x27_4sub1,
+	_huff_lengthlist_line_512x17_3sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -186,16 +295,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_4sub2[] = {
+static long _huff_lengthlist_line_512x17_3sub2[] = {
 	 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, 6, 7, 7,
-	 7, 8, 8, 8, 8, 8, 9, 8, 9, 9, 9, 9, 9,10,10,11,
-	10,11,
+	 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_1024x27_4sub2 = {
+static static_codebook _huff_book_line_512x17_3sub2 = {
 	1, 50,
-	_huff_lengthlist_line_1024x27_4sub2,
+	_huff_lengthlist_line_512x17_3sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -204,20 +313,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_4sub3[] = {
+static 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,
-	 0, 0, 3, 3, 3, 6, 4, 6, 4, 5, 5, 7, 4, 8, 5, 9,
-	 4, 9, 5, 9, 5, 9, 6, 9, 5, 9, 7, 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, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 0, 0, 4, 8, 4, 8, 4, 8, 4, 8, 5, 8, 5, 8, 6, 8,
+	 4, 8, 4, 8, 5, 8, 5, 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, 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 static_codebook _huff_book_line_1024x27_4sub3 = {
+static static_codebook _huff_book_line_512x17_3sub3 = {
 	1, 128,
-	_huff_lengthlist_line_1024x27_4sub3,
+	_huff_lengthlist_line_512x17_3sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -226,13 +335,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_class1[] = {
-	 2, 9, 8,14, 7,13,11,14, 1, 5, 3, 7, 4,10, 7,12,
+static long _huff_lengthlist_line_512x17_class1[] = {
+	 1, 2, 3, 6, 5, 4, 7, 7,
 };
 
-static static_codebook _huff_book_line_1024x27_class1 = {
-	1, 16,
-	_huff_lengthlist_line_1024x27_class1,
+static static_codebook _huff_book_line_512x17_class1 = {
+	1, 8,
+	_huff_lengthlist_line_512x17_class1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -241,13 +350,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_class2[] = {
-	 1, 3, 2, 5, 4, 7, 6, 7,
+static 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_1024x27_class2 = {
-	1, 8,
-	_huff_lengthlist_line_1024x27_class2,
+static static_codebook _huff_book_line_512x17_class2 = {
+	1, 64,
+	_huff_lengthlist_line_512x17_class2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -256,28 +368,46 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_class3[] = {
-	 1, 5, 6,19, 5, 8,10,19, 9,10,15,19,19,19,19,19,
-	 4, 7, 9,19, 6, 7,10,19,11,11,15,19,19,19,19,19,
-	 8,11,13,19, 8,11,14,19,13,13,17,19,19,19,19,19,
-	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
-	 3, 7, 9,19, 6, 8,11,19,11,11,15,19,19,19,19,19,
-	 5, 7,11,19, 6, 7,11,19,11,10,14,19,19,19,19,19,
-	 8,11,15,19, 8,10,14,19,13,13,16,19,19,19,19,19,
-	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
-	 6, 9,11,19, 8,10,12,19,15,14,17,19,19,19,19,19,
-	 5, 8,11,19, 7, 9,12,19,14,11,16,19,19,19,19,19,
-	 9,10,18,19, 9,10,15,19,14,16,19,19,19,19,19,19,
-	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
-	16,17,19,19,16,17,17,19,19,19,19,19,19,19,19,19,
-	12,14,16,19,12,12,16,19,19,19,19,19,19,19,19,19,
-	18,18,19,19,17,16,19,19,19,19,19,19,19,19,19,19,
-	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,18,
+static 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_1024x27_class3 = {
+static static_codebook _huff_book_line_512x17_class3 = {
+	1, 64,
+	_huff_lengthlist_line_512x17_class3,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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,
+	15,15,14,15,15,14,13,14,15,12,12,17,17,17,17,17,
+	 7, 7, 6, 9, 6, 6, 6, 9, 7, 6, 6, 8,11,11,10,12,
+	 7, 7, 7, 9, 7, 6, 6, 9, 7, 6, 6, 9,13,10,10,11,
+	10, 9, 8,10, 9, 8, 8,10, 8, 8, 7, 9,13,12,10,11,
+	17,14,14,13,15,14,12,13,17,13,12,15,17,17,14,17,
+	 7, 6, 6, 7, 6, 6, 5, 7, 6, 6, 6, 6,11, 9, 9, 9,
+	 7, 7, 6, 7, 7, 6, 6, 7, 6, 6, 6, 6,10, 9, 8, 9,
+	10, 9, 8, 8, 9, 8, 7, 8, 8, 7, 6, 8,11,10, 9,10,
+	17,17,12,15,15,15,12,14,14,14,10,12,15,13,12,13,
+	11,10, 8,10,11,10, 8, 8,10, 9, 7, 7,10, 9, 9,11,
+	11,11, 9,10,11,10, 8, 9,10, 8, 6, 8,10, 9, 9,11,
+	14,13,10,12,12,11,10,10, 8, 7, 8,10,10,11,11,12,
+	17,17,15,17,17,17,17,17,17,13,12,17,17,17,14,17,
+};
+
+static static_codebook _huff_book_line_128x4_class0 = {
 	1, 256,
-	_huff_lengthlist_line_1024x27_class3,
+	_huff_lengthlist_line_128x4_class0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -286,16 +416,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_1024x27_class4[] = {
-	 1, 4, 8,12, 4, 6, 8,21, 9, 8,10,21,20,16,18,20,
-	 2, 6, 8,20, 7, 6, 9,19,11, 9,10,20,17,15,16,20,
-	 5, 8,11,19, 8, 8,10,15,12,10,12,15,20,20,15,20,
-	17,20,20,20,15,20,20,19,20,20,16,19,20,20,20,20,
+static long _huff_lengthlist_line_128x4_0sub0[] = {
+	 2, 2, 2, 2,
 };
 
-static static_codebook _huff_book_line_1024x27_class4 = {
-	1, 64,
-	_huff_lengthlist_line_1024x27_class4,
+static static_codebook _huff_book_line_128x4_0sub0 = {
+	1, 4,
+	_huff_lengthlist_line_128x4_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -304,20 +431,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_0sub0[] = {
-	 5, 5, 6, 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, 6, 6, 6, 6,
-	 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6,
-	 8, 7, 8, 7, 8, 7, 8, 7, 9, 7, 9, 7, 9, 8,10, 8,
-	10, 8,10, 8,10, 8,10, 9,11, 9,11, 9,10, 9,10,10,
-	11,10,11,11,11,11,12,12,13,14,13,14,16,16,16,16,
-	16,16,15,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,15,15,15,
+static long _huff_lengthlist_line_128x4_0sub1[] = {
+	 0, 0, 0, 0, 3, 2, 3, 2, 3, 3,
 };
 
-static static_codebook _huff_book_line_128x11_0sub0 = {
-	1, 128,
-	_huff_lengthlist_line_128x11_0sub0,
+static static_codebook _huff_book_line_128x4_0sub1 = {
+	1, 10,
+	_huff_lengthlist_line_128x4_0sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -326,14 +446,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_1sub0[] = {
-	 2, 5, 5, 4, 5, 5, 5, 5, 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 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_128x11_1sub0 = {
-	1, 32,
-	_huff_lengthlist_line_128x11_1sub0,
+static static_codebook _huff_book_line_128x4_0sub2 = {
+	1, 25,
+	_huff_lengthlist_line_128x4_0sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -342,20 +462,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_1sub1[] = {
+static 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, 0, 0, 0, 0, 0, 0, 0,
-	 6, 3, 6, 3, 7, 3, 7, 4, 8, 4, 8, 4, 8, 4, 9, 4,
-	10, 5, 9, 5,10, 5,10, 5,10, 5,12, 6,12, 6,10, 6,
-	10, 7,10, 8,10, 8,10, 9,11, 9,12,11,10,11,11,13,
-	12,12,12,13,10,13,10,13,10,13,10,13,11,13,10,13,
-	10,13,10,13,10,13,10,13,11,12,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	 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_128x11_1sub1 = {
-	1, 128,
-	_huff_lengthlist_line_128x11_1sub1,
+static static_codebook _huff_book_line_128x4_0sub3 = {
+	1, 64,
+	_huff_lengthlist_line_128x4_0sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -364,14 +480,28 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_2sub1[] = {
-	 0, 4, 5, 4, 5, 4, 5, 3, 4, 3, 4, 4, 4, 4, 4, 5,
-	 5, 5,
+static 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,
+	11,11,12,14,11,12,11,15,15,12,13,15,15,15,15,15,
+	 6, 6, 7,10, 6, 6, 6,11, 7, 6, 6, 9,14,12,11,13,
+	 7, 7, 7,10, 6, 6, 7, 9, 7, 7, 6,10,13,12,10,12,
+	 9, 9, 9,11, 9, 9, 8, 9, 9, 8, 8,10,13,12,10,12,
+	12,12,11,13,12,12,11,12,15,13,12,15,15,15,14,14,
+	 6, 6, 6, 8, 6, 6, 5, 6, 7, 7, 6, 5,11,10, 9, 8,
+	 7, 6, 6, 7, 6, 6, 5, 6, 7, 7, 6, 6,11,10, 9, 8,
+	 8, 8, 8, 9, 8, 8, 7, 8, 8, 8, 6, 7,11,10, 9, 9,
+	14,11,10,14,14,11,10,15,13,11, 9,11,15,12,12,11,
+	11, 9, 8, 8,10, 9, 8, 9,11,10, 9, 8,12,11,12,11,
+	13,10, 8, 9,11,10, 8, 9,10, 9, 8, 9,10, 8,12,12,
+	15,11,10,10,13,11,10,10, 8, 8, 7,12,10, 9,11,12,
+	15,12,11,15,13,11,11,15,12,14,11,13,15,15,13,13,
 };
 
-static static_codebook _huff_book_line_128x11_2sub1 = {
-	1, 18,
-	_huff_lengthlist_line_128x11_2sub1,
+static static_codebook _huff_book_line_256x4_class0 = {
+	1, 256,
+	_huff_lengthlist_line_256x4_class0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -380,16 +510,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_2sub2[] = {
-	 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, 5, 5, 6, 5, 6, 6, 6,
-	 6, 8, 6,10, 7,10, 8,10, 8,10,10,10,10,10,10,10,
-	10,10,
+static long _huff_lengthlist_line_256x4_0sub0[] = {
+	 2, 2, 2, 2,
 };
 
-static static_codebook _huff_book_line_128x11_2sub2 = {
-	1, 50,
-	_huff_lengthlist_line_128x11_2sub2,
+static static_codebook _huff_book_line_256x4_0sub0 = {
+	1, 4,
+	_huff_lengthlist_line_256x4_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -398,20 +525,47 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_2sub3[] = {
+static long _huff_lengthlist_line_256x4_0sub1[] = {
+	 0, 0, 0, 0, 2, 2, 3, 3, 3, 3,
+};
+
+static static_codebook _huff_book_line_256x4_0sub1 = {
+	1, 10,
+	_huff_lengthlist_line_256x4_0sub1,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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 = {
+	1, 25,
+	_huff_lengthlist_line_256x4_0sub2,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 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, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 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_128x11_2sub3 = {
-	1, 128,
-	_huff_lengthlist_line_128x11_2sub3,
+static static_codebook _huff_book_line_256x4_0sub3 = {
+	1, 64,
+	_huff_lengthlist_line_256x4_0sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -420,14 +574,16 @@
 	0
 };
 
-static 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 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_128x11_3sub1 = {
-	1, 18,
-	_huff_lengthlist_line_128x11_3sub1,
+static static_codebook _huff_book_line_128x7_class0 = {
+	1, 64,
+	_huff_lengthlist_line_128x7_class0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -436,16 +592,77 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_3sub2[] = {
+static 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,
+	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+	 6,11,15,17, 7,10,15,17, 8,10,17,17,17,15,17,17,
+	 4, 8,13,17, 4, 7,13,17, 6, 8,15,17,16,15,17,17,
+	 6,11,15,17, 6, 9,13,17, 8,10,17,17,15,17,17,17,
+	16,17,17,17,12,14,15,17,13,14,15,17,17,17,17,17,
+	 5,10,14,17, 5, 9,14,17, 7, 9,15,17,15,15,17,17,
+	 3, 7,12,17, 3, 6,11,17, 5, 7,13,17,12,12,17,17,
+	 5, 9,14,17, 3, 7,11,17, 5, 8,13,17,13,11,16,17,
+	12,17,17,17, 9,14,15,17,10,11,14,17,16,14,17,17,
+	 8,12,17,17, 8,12,17,17,10,12,17,17,17,17,17,17,
+	 5,10,17,17, 5, 9,15,17, 7, 9,17,17,13,13,17,17,
+	 7,11,17,17, 6,10,15,17, 7, 9,15,17,12,11,17,17,
+	12,15,17,17,11,14,17,17,11,10,15,17,17,16,17,17,
+};
+
+static static_codebook _huff_book_line_128x7_class1 = {
+	1, 256,
+	_huff_lengthlist_line_128x7_class1,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static long _huff_lengthlist_line_128x7_0sub1[] = {
+	 0, 3, 3, 3, 3, 3, 3, 3, 3,
+};
+
+static static_codebook _huff_book_line_128x7_0sub1 = {
+	1, 9,
+	_huff_lengthlist_line_128x7_0sub1,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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 = {
+	1, 25,
+	_huff_lengthlist_line_128x7_0sub2,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static long _huff_lengthlist_line_128x7_0sub3[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 5, 3, 5, 3, 6, 4, 7, 4, 7, 4, 7, 4, 8, 4,
-	 8, 4, 9, 4, 9, 4, 9, 5,10, 5,11, 5,12, 6,13, 6,
-	13, 7,
+	 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_128x11_3sub2 = {
-	1, 50,
-	_huff_lengthlist_line_128x11_3sub2,
+static static_codebook _huff_book_line_128x7_0sub3 = {
+	1, 64,
+	_huff_lengthlist_line_128x7_0sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -454,20 +671,47 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x11_3sub3[] = {
+static long _huff_lengthlist_line_128x7_1sub1[] = {
+	 0, 3, 3, 2, 3, 3, 4, 3, 4,
+};
+
+static static_codebook _huff_book_line_128x7_1sub1 = {
+	1, 9,
+	_huff_lengthlist_line_128x7_1sub1,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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 = {
+	1, 25,
+	_huff_lengthlist_line_128x7_1sub2,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 7, 2, 6, 2, 7, 3, 8, 4, 7, 6, 9, 7, 9, 7,
-	 9, 9, 9, 8, 9, 8, 9, 9, 9, 9, 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, 8, 8, 8, 8, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 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_128x11_3sub3 = {
-	1, 128,
-	_huff_lengthlist_line_128x11_3sub3,
+static static_codebook _huff_book_line_128x7_1sub3 = {
+	1, 64,
+	_huff_lengthlist_line_128x7_1sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -477,7 +721,7 @@
 };
 
 static long _huff_lengthlist_line_128x11_class1[] = {
-	 1, 6, 3, 7, 2, 5, 4, 7,
+	 1, 6, 3, 7, 2, 4, 5, 7,
 };
 
 static static_codebook _huff_book_line_128x11_class1 = {
@@ -492,10 +736,10 @@
 };
 
 static long _huff_lengthlist_line_128x11_class2[] = {
-	 1, 5,11,14, 4,11,13,14,10,14,13,14,14,14,13,13,
-	 2, 6,11,13, 5,11,12,13,11,12,13,13,13,13,13,13,
-	 4, 8,12,13, 5, 9,11,13,12,13,13,13,13,13,13,13,
-	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	 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 = {
@@ -510,10 +754,10 @@
 };
 
 static long _huff_lengthlist_line_128x11_class3[] = {
-	 6, 7,11,16, 6, 7,10,16,11, 9,13,15,15,15,15,15,
-	 4, 4, 7,14, 4, 4, 6,14, 8, 6, 8,15,15,15,15,15,
-	 4, 4, 6,15, 3, 2, 4,13, 6, 5, 6,14,15,12,11,14,
-	11,11,13,15, 9, 8,10,15,11,10,11,15,15,15,15,15,
+	 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 = {
@@ -527,20 +771,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_0sub0[] = {
-	 5, 5, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5,
-	 6, 5, 6, 5, 6, 5, 6, 5, 7, 5, 7, 5, 7, 6, 7, 6,
-	 7, 6, 8, 6, 8, 6, 8, 6, 8, 6, 8, 6, 8, 7, 9, 7,
-	 9, 7, 9, 7, 9, 7, 9, 7, 9, 7,10, 7,10, 8,10, 8,
-	11, 8,11, 8,11, 8,12, 8,12, 8,12, 8,12, 9,12, 9,
-	12, 9,12, 9,13, 9,13,10,13,10,13,11,14,12,14,13,
-	14,14,16,15,17,17,19,18,19,19,19,19,19,19,19,19,
-	19,19,19,19,19,19,19,19,19,19,19,18,18,18,18,18,
+static 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,
+	 8, 7, 8, 7, 8, 7, 9, 7, 9, 8, 9, 8, 9, 8,10, 8,
+	10, 9,10, 9,10, 9,11, 9,11, 9,10,10,11,10,11,10,
+	11,11,11,11,11,11,12,13,14,14,14,15,15,16,16,16,
+	17,15,16,15,16,16,17,17,16,17,17,17,17,17,17,17,
+	17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
 };
 
-static static_codebook _huff_book_line_128x17_0sub0 = {
+static static_codebook _huff_book_line_128x11_0sub0 = {
 	1, 128,
-	_huff_lengthlist_line_128x17_0sub0,
+	_huff_lengthlist_line_128x11_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -549,14 +793,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_1sub0[] = {
-	 2, 5, 5, 4, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 6, 5,
-	 6, 5, 6, 6, 7, 6, 7, 6, 8, 6, 8, 7, 9, 7, 9, 8,
+static 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_128x17_1sub0 = {
+static static_codebook _huff_book_line_128x11_1sub0 = {
 	1, 32,
-	_huff_lengthlist_line_128x17_1sub0,
+	_huff_lengthlist_line_128x11_1sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -565,20 +809,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_1sub1[] = {
+static 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,
-	 4, 2, 5, 3, 5, 3, 6, 4, 6, 4, 7, 4, 8, 5, 8, 5,
-	 8, 6, 9, 6, 9, 7, 9, 8,10, 8,10, 9,10,10,10,10,
-	10,12,10,14,11,15,12,15,11,15,11,15,11,14,11,15,
-	11,14,11,13,10,12,10,14,10,14,11,13,10,12,11,15,
-	12,15,13,15,12,13,14,15,15,15,15,15,15,15,15,15,
-	15,15,15,15,15,15,15,15,15,15,15,15,15,14,14,14,
+	 5, 3, 5, 3, 6, 4, 6, 4, 7, 4, 7, 4, 7, 4, 8, 4,
+	 8, 4, 9, 5, 9, 5, 9, 5, 9, 6,10, 6,10, 6,11, 7,
+	10, 7,10, 8,11, 9,11, 9,11,10,11,11,12,11,11,12,
+	15,15,12,14,11,14,12,14,11,14,13,14,12,14,11,14,
+	11,14,12,14,11,14,11,14,13,13,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
 };
 
-static static_codebook _huff_book_line_128x17_1sub1 = {
+static static_codebook _huff_book_line_128x11_1sub1 = {
 	1, 128,
-	_huff_lengthlist_line_128x17_1sub1,
+	_huff_lengthlist_line_128x11_1sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -587,14 +831,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_2sub1[] = {
-	 0, 4, 5, 4, 7, 3, 8, 3, 9, 3,10, 2,12, 3,12, 4,
-	11, 6,
+static 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_128x17_2sub1 = {
+static static_codebook _huff_book_line_128x11_2sub1 = {
 	1, 18,
-	_huff_lengthlist_line_128x17_2sub1,
+	_huff_lengthlist_line_128x11_2sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -603,16 +847,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_2sub2[] = {
+static long _huff_lengthlist_line_128x11_2sub2[] = {
 	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	 0, 0, 7, 1, 8, 2, 9, 3, 9, 7, 9, 7, 9, 7, 8, 7,
-	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-	 8, 8,
+	 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_128x17_2sub2 = {
+static static_codebook _huff_book_line_128x11_2sub2 = {
 	1, 50,
-	_huff_lengthlist_line_128x17_2sub2,
+	_huff_lengthlist_line_128x11_2sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -621,20 +865,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_2sub3[] = {
+static 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,
-	 0, 0, 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, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 0, 0, 4, 8, 3, 8, 4, 8, 4, 8, 6, 8, 5, 8, 4, 8,
+	 4, 8, 6, 8, 7, 8, 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, 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 static_codebook _huff_book_line_128x17_2sub3 = {
+static static_codebook _huff_book_line_128x11_2sub3 = {
 	1, 128,
-	_huff_lengthlist_line_128x17_2sub3,
+	_huff_lengthlist_line_128x11_2sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -643,14 +887,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_3sub1[] = {
-	 0, 4, 4, 4, 5, 4, 5, 3, 5, 3, 5, 3, 5, 4, 6, 4,
-	 6, 4,
+static 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_128x17_3sub1 = {
+static static_codebook _huff_book_line_128x11_3sub1 = {
 	1, 18,
-	_huff_lengthlist_line_128x17_3sub1,
+	_huff_lengthlist_line_128x11_3sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -659,16 +903,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_3sub2[] = {
+static 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, 6, 3, 6, 3, 7, 4, 8, 4, 8, 4, 9, 4,
-	 9, 4,10, 4,10, 5,11, 5,11, 5,12, 5,12, 6,12, 6,
-	12, 7,
+	 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_128x17_3sub2 = {
+static static_codebook _huff_book_line_128x11_3sub2 = {
 	1, 50,
-	_huff_lengthlist_line_128x17_3sub2,
+	_huff_lengthlist_line_128x11_3sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -677,20 +921,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x17_3sub3[] = {
+static 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,
-	 0, 0, 7, 1, 7, 3, 6, 3, 6, 4, 6, 5, 6, 8, 7,10,
-	 7,11, 7,11, 8,11, 9,11, 7,11, 8,11, 8,11,10,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,11,11,11,11,11,11,11,
+	 0, 0, 7, 1, 6, 3, 7, 3, 8, 4, 8, 5, 8, 8, 8, 9,
+	 7, 8, 8, 7, 7, 7, 8, 9,10, 9, 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,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9, 9,
 };
 
-static static_codebook _huff_book_line_128x17_3sub3 = {
+static static_codebook _huff_book_line_128x11_3sub3 = {
 	1, 128,
-	_huff_lengthlist_line_128x17_3sub3,
+	_huff_lengthlist_line_128x11_3sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -700,7 +944,7 @@
 };
 
 static long _huff_lengthlist_line_128x17_class1[] = {
-	 1, 3, 4, 7, 2, 6, 5, 7,
+	 1, 3, 4, 7, 2, 5, 6, 7,
 };
 
 static static_codebook _huff_book_line_128x17_class1 = {
@@ -715,10 +959,10 @@
 };
 
 static long _huff_lengthlist_line_128x17_class2[] = {
-	 1, 2, 7,14, 4, 9,13,14, 8,14,14,14,14,14,14,14,
-	 3, 5,10,14, 8,14,14,14,11,14,14,14,14,14,14,14,
-	 7,10,14,14,12,14,14,14,14,14,14,14,14,14,14,14,
-	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,13,
+	 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 = {
@@ -733,10 +977,10 @@
 };
 
 static long _huff_lengthlist_line_128x17_class3[] = {
-	 2, 6,11,19, 5, 9,12,19,10,11,13,19,19,19,19,19,
-	 2, 5, 8,19, 4, 6, 8,19, 8, 8, 9,19,19,16,19,19,
-	 3, 6, 8,19, 3, 5, 7,18, 8, 8, 9,16,16,11,16,19,
-	14,14,14,19,10,10,11,19,16,12,14,19,19,19,19,19,
+	 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 = {
@@ -750,13 +994,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x4_0sub0[] = {
-	 2, 2, 2, 2,
+static 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,
+	 9, 6, 9, 7, 9, 7, 9, 7, 9, 7,10, 7,10, 8,10, 8,
+	10, 8,10, 8,10, 8,11, 8,11, 8,11, 8,11, 8,11, 9,
+	12, 9,12, 9,12, 9,12, 9,12,10,12,10,13,11,13,11,
+	14,12,14,13,15,14,16,14,17,15,18,16,20,20,20,20,
+	20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
 };
 
-static static_codebook _huff_book_line_128x4_0sub0 = {
-	1, 4,
-	_huff_lengthlist_line_128x4_0sub0,
+static static_codebook _huff_book_line_128x17_0sub0 = {
+	1, 128,
+	_huff_lengthlist_line_128x17_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -765,13 +1016,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x4_0sub1[] = {
-	 0, 0, 0, 0, 3, 2, 3, 2, 3, 3,
+static 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_128x4_0sub1 = {
-	1, 10,
-	_huff_lengthlist_line_128x4_0sub1,
+static static_codebook _huff_book_line_128x17_1sub0 = {
+	1, 32,
+	_huff_lengthlist_line_128x17_1sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -780,14 +1032,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x4_0sub2[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 3, 4, 4, 4, 4,
-	 4, 3, 4, 4, 5, 3, 6, 4, 6,
+static 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,
+	 8, 5, 8, 6, 9, 7, 9, 7, 9, 8,10, 9,10, 9,11,10,
+	11,11,11,11,11,11,12,12,12,13,12,13,12,14,12,15,
+	12,14,12,16,13,17,13,17,14,17,14,16,13,17,14,17,
+	14,17,15,17,15,15,16,17,17,17,17,17,17,17,17,17,
+	17,17,17,17,17,17,16,16,16,16,16,16,16,16,16,16,
 };
 
-static static_codebook _huff_book_line_128x4_0sub2 = {
-	1, 25,
-	_huff_lengthlist_line_128x4_0sub2,
+static static_codebook _huff_book_line_128x17_1sub1 = {
+	1, 128,
+	_huff_lengthlist_line_128x17_1sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -796,16 +1054,32 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x4_0sub3[] = {
+static 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 = {
+	1, 18,
+	_huff_lengthlist_line_128x17_2sub1,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static long _huff_lengthlist_line_128x17_2sub2[] = {
 	 0, 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, 5, 2, 6, 3, 6, 3,
-	 7, 4, 7, 5, 7, 5, 7, 6, 8, 8, 9,10,10,16,10,16,
-	10,14,10,14,11,15,15,15,15,15,15,15,15,15,15,15,
+	 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_128x4_0sub3 = {
-	1, 64,
-	_huff_lengthlist_line_128x4_0sub3,
+static static_codebook _huff_book_line_128x17_2sub2 = {
+	1, 50,
+	_huff_lengthlist_line_128x17_2sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -814,28 +1088,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x4_class0[] = {
-	 8, 8, 8,14, 7, 7, 8,13, 7, 6, 7,11,11,11,10,13,
-	 9, 9,10,16, 8, 8, 9,12, 7, 7, 7,11,11,11,10,12,
-	11,11,11,14,10,10,10,14, 9, 8, 9,12,13,14,12,14,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	 8, 7, 8,11, 7, 7, 7,11, 6, 6, 6,10,10,10,10,14,
-	 8, 8, 8,12, 7, 7, 8,11, 6, 7, 7,10,10,10,10,13,
-	10,10,10,12,10, 9, 9,12, 9, 9, 9,12,12,13,12,14,
-	16,16,16,16,16,14,16,16,14,14,16,16,16,16,16,16,
-	 7, 6, 5, 7, 6, 6, 5, 6, 6, 5, 5, 5, 9,10, 9,10,
-	 8, 7, 6, 7, 7, 6, 5, 6, 6, 6, 5, 6,10,10, 9, 9,
-	10, 9, 7, 8, 9, 8, 7, 7, 8, 7, 6, 7,11,11,10, 9,
-	16,13,14,16,14,14,13,15,16,14,12,13,16,16,14,16,
-	 9, 8, 7, 8, 8, 8, 7, 8, 8, 7, 6, 7,10,10, 9,12,
-	 9, 9, 8, 8, 9, 8, 7, 8, 8, 8, 6, 7,10,10, 9,12,
-	11,10, 9,10,10, 9, 7, 9, 9, 8, 6, 9,12,11,10,13,
-	12,16,16,16,12,13,12,16,15,12,11,14,16,16,16,16,
+static 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,
+	 0, 0, 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, 6, 6,
+	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
 };
 
-static static_codebook _huff_book_line_128x4_class0 = {
-	1, 256,
-	_huff_lengthlist_line_128x4_class0,
+static static_codebook _huff_book_line_128x17_2sub3 = {
+	1, 128,
+	_huff_lengthlist_line_128x17_2sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -844,13 +1110,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x7_0sub1[] = {
-	 0, 3, 3, 3, 3, 3, 3, 3, 3,
+static 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_128x7_0sub1 = {
-	1, 9,
-	_huff_lengthlist_line_128x7_0sub1,
+static static_codebook _huff_book_line_128x17_3sub1 = {
+	1, 18,
+	_huff_lengthlist_line_128x17_3sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -859,14 +1126,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x7_0sub2[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 4, 3, 4, 4, 4,
-	 5, 4, 5, 4, 5, 4, 6, 4, 6,
+static 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_128x7_0sub2 = {
-	1, 25,
-	_huff_lengthlist_line_128x7_0sub2,
+static static_codebook _huff_book_line_128x17_3sub2 = {
+	1, 50,
+	_huff_lengthlist_line_128x17_3sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -875,16 +1144,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x7_0sub3[] = {
+static 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, 3, 5, 3, 5, 3, 6, 4,
-	 6, 4, 6, 4, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 5, 5,
-	 6, 7, 8,10,12,12,12,12,12,12,12,12,12,12,12,12,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 4, 4, 4, 5, 4, 7, 5, 8, 5,11,
+	 6,10, 6,12, 7,12, 7,12, 8,12, 8,12,10,12,12,12,
+	12,12,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,11,11,11,11,
 };
 
-static static_codebook _huff_book_line_128x7_0sub3 = {
-	1, 64,
-	_huff_lengthlist_line_128x7_0sub3,
+static static_codebook _huff_book_line_128x17_3sub3 = {
+	1, 128,
+	_huff_lengthlist_line_128x17_3sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -893,13 +1166,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x7_1sub1[] = {
-	 0, 3, 3, 3, 3, 2, 4, 3, 4,
+static 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_128x7_1sub1 = {
-	1, 9,
-	_huff_lengthlist_line_128x7_1sub1,
+static static_codebook _huff_book_line_1024x27_class1 = {
+	1, 16,
+	_huff_lengthlist_line_1024x27_class1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -908,14 +1181,13 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x7_1sub2[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 3, 6, 3, 7, 3,
-	 8, 3, 9, 3,10, 3,11, 4,11,
+static long _huff_lengthlist_line_1024x27_class2[] = {
+	 1, 4, 2, 6, 3, 7, 5, 7,
 };
 
-static static_codebook _huff_book_line_128x7_1sub2 = {
-	1, 25,
-	_huff_lengthlist_line_128x7_1sub2,
+static static_codebook _huff_book_line_1024x27_class2 = {
+	1, 8,
+	_huff_lengthlist_line_1024x27_class2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -924,16 +1196,28 @@
 	0
 };
 
-static 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,12, 2, 9, 3,10, 4,
-	12, 5,12, 6,12,10,12,11,12,12,12,12,12,12,12,11,
-	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+static 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,
+	20,20,20,20,13,20,20,20,18,18,20,20,20,20,20,20,
+	 3, 6, 8,20, 6, 7, 9,20,10, 9,12,20,20,20,20,20,
+	 5, 7, 9,20, 6, 6, 9,20,10, 9,12,20,20,20,20,20,
+	 8,10,13,20, 8, 9,12,20,11,10,12,20,20,20,20,20,
+	18,20,20,20,15,17,18,20,18,17,18,20,20,20,20,20,
+	 7,10,12,20, 8, 9,11,20,14,13,14,20,20,20,20,20,
+	 6, 9,12,20, 7, 8,11,20,12,11,13,20,20,20,20,20,
+	 9,11,15,20, 8,10,14,20,12,11,14,20,20,20,20,20,
+	20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
+	11,16,18,20,15,15,17,20,20,17,20,20,20,20,20,20,
+	 9,14,16,20,12,12,15,20,17,15,18,20,20,20,20,20,
+	16,19,18,20,15,16,20,20,17,17,20,20,20,20,20,20,
+	20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
 };
 
-static static_codebook _huff_book_line_128x7_1sub3 = {
-	1, 64,
-	_huff_lengthlist_line_128x7_1sub3,
+static static_codebook _huff_book_line_1024x27_class3 = {
+	1, 256,
+	_huff_lengthlist_line_1024x27_class3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -942,16 +1226,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x7_class0[] = {
-	10, 7, 8,14,10, 7, 7,12,11, 8, 8,13,16,16,16,16,
-	 8, 5, 5,10, 7, 4, 4, 8, 8, 5, 5, 9,16,16,16,16,
-	 7, 4, 5, 7, 6, 3, 3, 6, 8, 5, 5, 7,16,14,13,16,
-	 9, 7, 7,10, 7, 4, 4, 7, 9, 6, 5, 6,15,13,11,14,
+static 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_128x7_class0 = {
+static static_codebook _huff_book_line_1024x27_class4 = {
 	1, 64,
-	_huff_lengthlist_line_128x7_class0,
+	_huff_lengthlist_line_1024x27_class4,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -960,28 +1244,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_128x7_class1[] = {
-	 8,12,16,16,10,14,16,16,12,15,16,16,16,16,16,16,
-	 7,11,15,16, 7,11,16,16,10,12,16,16,16,16,16,16,
-	 9,15,16,16, 9,12,16,16,11,15,16,16,16,16,16,16,
-	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-	 6,10,13,16, 7,10,15,16, 9,11,16,16,16,16,16,16,
-	 4, 8,13,16, 5, 8,15,16, 7, 9,15,16,16,16,16,16,
-	 6,12,16,16, 6,10,15,16, 9,10,14,16,16,16,16,16,
-	14,16,16,16,12,14,16,16,15,16,16,16,16,16,16,16,
-	 4, 9,11,16, 5, 9,13,16, 7, 9,15,16,16,16,16,16,
-	 2, 7,11,16, 3, 6,11,16, 5, 7,12,16,16,16,16,16,
-	 4, 9,14,16, 4, 7,13,16, 6, 8,13,16,16,16,16,16,
-	11,14,16,16,10,16,14,16,11,16,16,16,16,16,16,16,
-	 7,13,16,16, 9,13,15,16,11,13,16,16,16,16,16,16,
-	 5,10,14,16, 6,10,15,16, 9,10,16,16,16,16,16,16,
-	 7,13,16,16, 6,10,16,16, 9,12,16,16,16,16,16,16,
-	11,16,16,16,10,16,16,16,13,16,16,16,16,16,16,16,
+static 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,
+	11, 7,11, 7,12, 7,12, 7,12, 7,12, 7,12, 7,12, 7,
+	12, 7,12, 8,13, 8,12, 8,12, 8,13, 8,13, 9,13, 9,
+	13, 9,13, 9,12,10,12,10,13,10,14,11,14,12,14,13,
+	14,13,14,14,15,16,15,15,15,14,15,17,21,22,22,21,
+	22,22,22,22,22,22,21,21,21,21,21,21,21,21,21,21,
 };
 
-static static_codebook _huff_book_line_128x7_class1 = {
-	1, 256,
-	_huff_lengthlist_line_128x7_class1,
+static static_codebook _huff_book_line_1024x27_0sub0 = {
+	1, 128,
+	_huff_lengthlist_line_1024x27_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -990,13 +1266,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x4_0sub0[] = {
-	 1, 3, 2, 3,
+static 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_256x4_0sub0 = {
-	1, 4,
-	_huff_lengthlist_line_256x4_0sub0,
+static static_codebook _huff_book_line_1024x27_1sub0 = {
+	1, 32,
+	_huff_lengthlist_line_1024x27_1sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1005,13 +1282,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x4_0sub1[] = {
-	 0, 0, 0, 0, 2, 2, 3, 3, 3, 3,
+static 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,
+	 9, 4, 9, 4, 9, 4, 8, 4, 8, 4, 9, 5, 9, 5, 9, 5,
+	 9, 5, 9, 6,10, 6,10, 7,10, 8,11, 9,11,11,12,13,
+	12,14,13,15,13,15,14,16,14,17,15,17,15,15,16,16,
+	15,16,16,16,15,18,16,15,17,17,19,19,19,19,19,19,
+	19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
 };
 
-static static_codebook _huff_book_line_256x4_0sub1 = {
-	1, 10,
-	_huff_lengthlist_line_256x4_0sub1,
+static static_codebook _huff_book_line_1024x27_1sub1 = {
+	1, 128,
+	_huff_lengthlist_line_1024x27_1sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1020,14 +1304,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x4_0sub2[] = {
-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 4, 3, 4,
-	 4, 4, 5, 4, 5, 5, 6, 4, 6,
+static 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_256x4_0sub2 = {
-	1, 25,
-	_huff_lengthlist_line_256x4_0sub2,
+static static_codebook _huff_book_line_1024x27_2sub0 = {
+	1, 32,
+	_huff_lengthlist_line_1024x27_2sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1036,16 +1320,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x4_0sub3[] = {
+static 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, 2, 4, 3, 4, 3, 4, 4,
-	 5, 4, 5, 5, 6, 5, 7, 6, 8, 7, 9, 8, 9, 9,10,12,
-	15,15,15,15,15,15,15,15,14,14,14,14,14,14,14,14,
+	 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,
+	 7, 5, 7, 6, 7, 6, 8, 7, 8, 7, 8, 7, 9, 8, 9, 9,
+	 9, 9,10,10,10,11, 9,12, 9,12, 9,15,10,14, 9,13,
+	10,13,10,12,10,12,10,13,10,12,11,13,11,14,12,13,
+	13,14,14,13,14,15,14,16,13,13,14,16,16,16,16,16,
+	16,16,16,16,16,16,16,16,16,16,16,16,16,16,15,15,
 };
 
-static static_codebook _huff_book_line_256x4_0sub3 = {
-	1, 64,
-	_huff_lengthlist_line_256x4_0sub3,
+static static_codebook _huff_book_line_1024x27_2sub1 = {
+	1, 128,
+	_huff_lengthlist_line_1024x27_2sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1054,28 +1342,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x4_class0[] = {
-	 4, 5, 6,11, 5, 5, 6,10, 7, 6, 5, 6,14,13,10,10,
-	 6, 6, 6,10, 6, 6, 6,10, 7, 7, 7, 9, 9,10, 9,12,
-	 9, 8, 8,11, 8, 8, 8,10, 8, 8, 9,11, 8, 9, 9,13,
-	18,18,18,18,16,17,18,18,12,13,14,18,14,14,10,12,
-	 5, 5, 6,12, 6, 5, 6,10, 7, 7, 6, 7,13,12, 9,12,
-	 6, 6, 6,11, 6, 6, 6, 9, 7, 7, 7,10,10,10, 9,12,
-	 9, 8, 8,12, 8, 8, 7,11, 8, 8, 8,11, 9, 9, 8,10,
-	18,18,17,18,18,18,15,18,16,14,12,18,14,12,10,11,
-	 8, 7, 7,12, 8, 7, 7,10, 8, 7, 6, 6,11,10, 9,10,
-	 8, 8, 7,11, 8, 7, 7, 9, 8, 8, 7, 9,10,10, 9, 9,
-	10, 9, 8,12, 9, 9, 8,11,10, 9, 8, 9, 8, 8, 7, 9,
-	18,18,18,18,18,18,18,18,17,16,14,18,13,12,11,13,
-	12,12,13,16,11,10,10,16,12,12, 9, 7,15,12,11,11,
-	14,14,14,14,12,11,11,18,14,12,10,11,18,13,11,13,
-	18,18,18,17,17,16,15,17,18,15,16,18,16,12,11,11,
-	18,18,18,18,18,18,18,18,18,18,17,18,18,13,12,15,
+static 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_256x4_class0 = {
-	1, 256,
-	_huff_lengthlist_line_256x4_class0,
+static static_codebook _huff_book_line_1024x27_3sub1 = {
+	1, 18,
+	_huff_lengthlist_line_1024x27_3sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1084,13 +1358,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x7_0sub1[] = {
-	 0, 2, 3, 3, 3, 3, 4, 3, 4,
+static 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_256x7_0sub1 = {
-	1, 9,
-	_huff_lengthlist_line_256x7_0sub1,
+static static_codebook _huff_book_line_1024x27_3sub2 = {
+	1, 50,
+	_huff_lengthlist_line_1024x27_3sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1099,14 +1376,20 @@
 	0
 };
 
-static 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 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,
+	 0, 0, 3, 7, 3, 8, 3,10, 3, 8, 3, 9, 3, 8, 4, 9,
+	 4, 9, 5, 9, 6,10, 6, 9, 7,11, 7,12, 9,13,10,13,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
 };
 
-static static_codebook _huff_book_line_256x7_0sub2 = {
-	1, 25,
-	_huff_lengthlist_line_256x7_0sub2,
+static static_codebook _huff_book_line_1024x27_3sub3 = {
+	1, 128,
+	_huff_lengthlist_line_1024x27_3sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1115,16 +1398,32 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x7_0sub3[] = {
+static 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 = {
+	1, 18,
+	_huff_lengthlist_line_1024x27_4sub1,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static long _huff_lengthlist_line_1024x27_4sub2[] = {
 	 0, 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,
+	 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_256x7_0sub3 = {
-	1, 64,
-	_huff_lengthlist_line_256x7_0sub3,
+static static_codebook _huff_book_line_1024x27_4sub2 = {
+	1, 50,
+	_huff_lengthlist_line_1024x27_4sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1133,13 +1432,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_256x7_1sub1[] = {
-	 0, 3, 3, 3, 3, 2, 4, 3, 4,
+static 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,
+	 0, 0, 2, 5, 2, 6, 3, 6, 4, 7, 4, 7, 5, 9, 5,11,
+	 6,11, 6,11, 7,11, 6,11, 6,11, 9,11, 8,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,11,11,11,10,10,10,10,10,10,
 };
 
-static static_codebook _huff_book_line_256x7_1sub1 = {
-	1, 9,
-	_huff_lengthlist_line_256x7_1sub1,
+static static_codebook _huff_book_line_1024x27_4sub3 = {
+	1, 128,
+	_huff_lengthlist_line_1024x27_4sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1148,14 +1454,13 @@
 	0
 };
 
-static 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 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_256x7_1sub2 = {
-	1, 25,
-	_huff_lengthlist_line_256x7_1sub2,
+static static_codebook _huff_book_line_2048x27_class1 = {
+	1, 16,
+	_huff_lengthlist_line_2048x27_class1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1164,16 +1469,13 @@
 	0
 };
 
-static 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 long _huff_lengthlist_line_2048x27_class2[] = {
+	 1, 2, 3, 6, 4, 7, 5, 7,
 };
 
-static static_codebook _huff_book_line_256x7_1sub3 = {
-	1, 64,
-	_huff_lengthlist_line_256x7_1sub3,
+static static_codebook _huff_book_line_2048x27_class2 = {
+	1, 8,
+	_huff_lengthlist_line_2048x27_class2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1182,16 +1484,46 @@
 	0
 };
 
-static 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 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,
+	16,16,16,16,13,16,16,16,15,16,16,16,16,16,16,16,
+	 5, 4, 7,16, 6, 5, 8,16, 9, 8,10,16,16,16,16,16,
+	 5, 5, 7,15, 5, 4, 6,15, 7, 6, 8,16,16,16,16,16,
+	 9, 9,11,15, 7, 7, 9,16, 8, 8, 9,16,16,16,16,16,
+	16,16,16,16,15,15,15,16,15,15,14,16,16,16,16,16,
+	 8, 8,11,16, 8, 9,10,16,11,10,14,16,16,16,16,16,
+	 6, 8,10,16, 6, 7,10,16, 8, 8,11,16,14,16,16,16,
+	10,11,14,16, 9, 9,11,16,10,10,11,16,16,16,16,16,
+	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	16,16,16,16,15,16,16,16,16,16,16,16,16,16,16,16,
+	12,16,15,16,12,14,16,16,16,16,16,16,16,16,16,16,
+	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
 };
 
-static static_codebook _huff_book_line_256x7_class0 = {
+static static_codebook _huff_book_line_2048x27_class3 = {
+	1, 256,
+	_huff_lengthlist_line_2048x27_class3,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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 = {
 	1, 64,
-	_huff_lengthlist_line_256x7_class0,
+	_huff_lengthlist_line_2048x27_class4,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1200,28 +1532,20 @@
 	0
 };
 
-static 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,
-	15,13,15,15,15,10,11,15,15,13,13,15,15,15,15,15,
-	 4, 6, 7,15, 6, 8, 9,15,10,10,12,15,15,15,15,15,
-	 2, 5, 6,15, 5, 6, 7,15, 8, 6, 7,15,15,15,15,15,
-	 5, 6, 8,15, 5, 6, 7,15, 9, 6, 7,15,15,15,15,15,
-	14,12,13,15,12,10,11,15,15,15,15,15,15,15,15,15,
-	 7, 8, 9,15, 9,10,10,15,15,14,14,15,15,15,15,15,
-	 5, 6, 7,15, 7, 8, 9,15,12, 9,10,15,15,15,15,15,
-	 7, 7, 9,15, 7, 7, 8,15,12, 8, 9,15,15,15,15,15,
-	13,13,14,15,12,11,12,15,15,15,15,15,15,15,15,15,
-	15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
-	13,13,13,15,15,15,15,15,15,15,15,15,15,15,15,15,
-	15,12,13,15,15,12,13,15,15,14,15,15,15,15,15,15,
-	15,15,15,15,15,15,13,15,15,15,15,15,15,15,15,15,
+static 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,
+	11, 6,11, 6,12, 7,11, 7,11, 7,11, 7,11, 7,10, 7,
+	11, 7,11, 7,12, 7,11, 8,11, 8,11, 8,11, 8,13, 8,
+	12, 9,11, 9,11, 9,11,10,12,10,12, 9,12,10,12,11,
+	14,12,16,12,12,11,14,16,17,17,17,17,17,17,17,17,
+	17,17,17,17,17,17,17,17,17,17,17,17,16,16,16,16,
 };
 
-static static_codebook _huff_book_line_256x7_class1 = {
-	1, 256,
-	_huff_lengthlist_line_256x7_class1,
+static static_codebook _huff_book_line_2048x27_0sub0 = {
+	1, 128,
+	_huff_lengthlist_line_2048x27_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1230,20 +1554,36 @@
 	0
 };
 
-static 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,
-	 9, 7, 9, 8, 9, 8,10, 8,10, 8,10, 7,10, 6,10, 8,
-	10, 8,11, 7,10, 7,11, 8,11,11,12,12,11,11,12,11,
-	13,11,13,11,13,12,15,12,13,13,14,14,14,14,14,15,
-	15,15,16,14,17,19,19,18,18,18,18,18,18,18,18,18,
-	18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
+static 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_512x17_0sub0 = {
+static static_codebook _huff_book_line_2048x27_1sub0 = {
+	1, 32,
+	_huff_lengthlist_line_2048x27_1sub0,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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,
+	 8, 4, 9, 4, 9, 4, 9, 4, 9, 4, 9, 5, 9, 5, 9, 6,
+	 9, 7, 9, 8, 9, 9, 9,10, 9,11, 9,14, 9,15,10,15,
+	10,15,10,15,10,15,11,15,10,14,12,14,11,14,13,14,
+	13,15,15,15,12,15,15,15,13,15,13,15,13,15,15,15,
+	15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,14,
+};
+
+static static_codebook _huff_book_line_2048x27_1sub1 = {
 	1, 128,
-	_huff_lengthlist_line_512x17_0sub0,
+	_huff_lengthlist_line_2048x27_1sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1252,14 +1592,14 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_1sub0[] = {
+static 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, 7, 6, 7, 6, 8, 7, 8, 7, 8, 7, 8, 7,
+	 6, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8,
 };
 
-static static_codebook _huff_book_line_512x17_1sub0 = {
+static static_codebook _huff_book_line_2048x27_2sub0 = {
 	1, 32,
-	_huff_lengthlist_line_512x17_1sub0,
+	_huff_lengthlist_line_2048x27_2sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1268,20 +1608,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_1sub1[] = {
+static 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,
-	 4, 3, 5, 3, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 6, 5,
-	 6, 5, 7, 5, 8, 6, 8, 6, 8, 6, 8, 6, 8, 7, 9, 7,
-	 9, 7,11, 9,11,11,12,11,14,12,14,16,14,16,13,16,
-	14,16,12,15,13,16,14,16,13,14,12,15,13,15,13,13,
-	13,15,12,14,14,15,13,15,12,15,15,15,15,15,15,15,
-	15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+	 3, 4, 3, 4, 3, 4, 4, 5, 4, 5, 5, 5, 6, 6, 6, 7,
+	 6, 8, 6, 8, 6, 9, 7,10, 7,10, 7,10, 7,12, 7,12,
+	 7,12, 9,12,11,12,10,12,10,12,11,12,12,12,10,12,
+	10,12,10,12, 9,12,11,12,12,12,12,12,11,12,11,12,
+	12,12,12,12,12,12,12,12,10,10,12,12,12,12,12,10,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
 };
 
-static static_codebook _huff_book_line_512x17_1sub1 = {
+static static_codebook _huff_book_line_2048x27_2sub1 = {
 	1, 128,
-	_huff_lengthlist_line_512x17_1sub1,
+	_huff_lengthlist_line_2048x27_2sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1290,14 +1630,14 @@
 	0
 };
 
-static 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 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_512x17_2sub1 = {
+static static_codebook _huff_book_line_2048x27_3sub1 = {
 	1, 18,
-	_huff_lengthlist_line_512x17_2sub1,
+	_huff_lengthlist_line_2048x27_3sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1306,16 +1646,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_2sub2[] = {
+static long _huff_lengthlist_line_2048x27_3sub2[] = {
 	 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,
+	 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_512x17_2sub2 = {
+static static_codebook _huff_book_line_2048x27_3sub2 = {
 	1, 50,
-	_huff_lengthlist_line_512x17_2sub2,
+	_huff_lengthlist_line_2048x27_3sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1324,20 +1664,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_2sub3[] = {
+static 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,
-	 0, 0, 3, 3, 3, 3, 4, 3, 4, 4, 5, 5, 6, 6, 7, 7,
-	 7, 8, 8,11, 8, 9, 9, 9,10,11,11,11, 9,10,10,11,
-	11,11,11,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,10,10,10,10,10,10,10,10,10,10,
+	 0, 0, 3, 6, 3, 7, 3, 7, 5, 7, 7, 7, 7, 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, 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, 7, 7, 7, 7, 7, 7, 7,
 };
 
-static static_codebook _huff_book_line_512x17_2sub3 = {
+static static_codebook _huff_book_line_2048x27_3sub3 = {
 	1, 128,
-	_huff_lengthlist_line_512x17_2sub3,
+	_huff_lengthlist_line_2048x27_3sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1346,14 +1686,14 @@
 	0
 };
 
-static 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 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_512x17_3sub1 = {
+static static_codebook _huff_book_line_2048x27_4sub1 = {
 	1, 18,
-	_huff_lengthlist_line_512x17_3sub1,
+	_huff_lengthlist_line_2048x27_4sub1,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1362,16 +1702,16 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_3sub2[] = {
+static long _huff_lengthlist_line_2048x27_4sub2[] = {
 	 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,
+	 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_512x17_3sub2 = {
+static static_codebook _huff_book_line_2048x27_4sub2 = {
 	1, 50,
-	_huff_lengthlist_line_512x17_3sub2,
+	_huff_lengthlist_line_2048x27_4sub2,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1380,20 +1720,20 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_3sub3[] = {
+static 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,
-	 0, 0, 4, 8, 4, 8, 4, 8, 4, 8, 5, 8, 5, 8, 6, 8,
-	 4, 8, 4, 8, 5, 8, 5, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	 0, 0, 3, 6, 5, 7, 5, 7, 7, 7, 7, 7, 5, 7, 5, 7,
+	 5, 7, 5, 7, 7, 7, 7, 7, 4, 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, 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, 6, 6, 6, 6, 6, 6, 6, 6, 6,
 };
 
-static static_codebook _huff_book_line_512x17_3sub3 = {
+static static_codebook _huff_book_line_2048x27_4sub3 = {
 	1, 128,
-	_huff_lengthlist_line_512x17_3sub3,
+	_huff_lengthlist_line_2048x27_4sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1402,13 +1742,28 @@
 	0
 };
 
-static long _huff_lengthlist_line_512x17_class1[] = {
-	 1, 2, 3, 6, 5, 4, 7, 7,
+static 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,
+	19,19,18,19,15,16,16,19,11,11,10,13,10,10, 9,15,
+	 5, 5, 6,13, 6, 6, 6,11, 8, 7, 6, 7,14,11,10,11,
+	 6, 6, 6,12, 7, 6, 6,11, 8, 7, 7,11,13,11, 9,11,
+	 9, 7, 6,12, 8, 7, 6,12, 9, 8, 8,11,13,10, 7,13,
+	19,19,17,19,17,14,14,19,12,10, 8,12,13,10, 9,16,
+	 7, 8, 7,12, 7, 7, 7,11, 8, 7, 7, 8,12,12,11,11,
+	 8, 8, 7,12, 8, 7, 6,11, 8, 7, 7,10,10,11,10,11,
+	 9, 8, 8,13, 9, 8, 7,12,10, 9, 7,11, 9, 8, 7,11,
+	18,18,15,18,18,16,17,18,15,11,10,18,11, 9, 9,18,
+	16,16,13,16,12,11,10,16,12,11, 9, 6,15,12,11,13,
+	16,16,14,14,13,11,12,16,12, 9, 9,13,13,10,10,12,
+	17,18,17,17,14,15,14,16,14,12,14,15,12,10,11,12,
+	18,18,18,18,18,18,18,18,18,12,13,18,16,11, 9,18,
 };
 
-static static_codebook _huff_book_line_512x17_class1 = {
-	1, 8,
-	_huff_lengthlist_line_512x17_class1,
+static static_codebook _huff_book_line_256x4low_class0 = {
+	1, 256,
+	_huff_lengthlist_line_256x4low_class0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1417,16 +1772,13 @@
 	0
 };
 
-static 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 long _huff_lengthlist_line_256x4low_0sub0[] = {
+	 1, 3, 2, 3,
 };
 
-static static_codebook _huff_book_line_512x17_class2 = {
-	1, 64,
-	_huff_lengthlist_line_512x17_class2,
+static static_codebook _huff_book_line_256x4low_0sub0 = {
+	1, 4,
+	_huff_lengthlist_line_256x4low_0sub0,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,
@@ -1435,16 +1787,47 @@
 	0
 };
 
-static 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 long _huff_lengthlist_line_256x4low_0sub1[] = {
+	 0, 0, 0, 0, 2, 3, 2, 3, 3, 3,
 };
 
-static static_codebook _huff_book_line_512x17_class3 = {
+static static_codebook _huff_book_line_256x4low_0sub1 = {
+	1, 10,
+	_huff_lengthlist_line_256x4low_0sub1,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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 = {
+	1, 25,
+	_huff_lengthlist_line_256x4low_0sub2,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static 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 = {
 	1, 64,
-	_huff_lengthlist_line_512x17_class3,
+	_huff_lengthlist_line_256x4low_0sub3,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,


Property changes on: branches/vorbis-aotuv/lib/books/floor/floor_books.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/books/uncoupled
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/vorbis-aotuv/lib/books/uncoupled/.cvsignore
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/books/uncoupled/Makefile.am
===================================================================
--- branches/vorbis-aotuv/lib/books/uncoupled/Makefile.am	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/books/uncoupled/Makefile.am	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,5 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 EXTRA_DIST = res_books_uncoupled.h


Property changes on: branches/vorbis-aotuv/lib/books/uncoupled/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/books/uncoupled/res_books_uncoupled.h
===================================================================
--- branches/vorbis-aotuv/lib/books/uncoupled/res_books_uncoupled.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/books/uncoupled/res_books_uncoupled.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: static codebooks autogenerated by huff/huffbuld
- last modified: $Id: res_books_uncoupled.h,v 1.2 2002/07/11 10:27:53 xiphmont Exp $
+ last modified: $Id$
 
  ********************************************************************/
 
@@ -2346,11 +2346,1352 @@
 	0
 };
 
+static long _vq_quantlist__8u0__p1_0[] = {
+	1,
+	0,
+	2,
+};
+
+static 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,
+	10,13,12,10,13,13, 5, 9, 8, 8,11,11, 8,11,11, 7,
+	11,11, 9,13,13,10,12,13, 7,11,11,10,13,13,10,13,
+	11,
+};
+
+static float _vq_quantthresh__8u0__p1_0[] = {
+	-0.5, 0.5, 
+};
+
+static 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,
+	3,
+	3
+};
+
+static static_codebook _8u0__p1_0 = {
+	4, 81,
+	_vq_lengthlist__8u0__p1_0,
+	1, -535822336, 1611661312, 2, 0,
+	_vq_quantlist__8u0__p1_0,
+	NULL,
+	&_vq_auxt__8u0__p1_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u0__p2_0[] = {
+	1,
+	0,
+	2,
+};
+
+static 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,
+	 8,10, 8, 8,10,10, 5, 7, 7, 7, 8, 8, 7, 8, 9, 6,
+	 8, 8, 8,10,10, 8, 8,10, 6, 8, 9, 8,10,10, 7,10,
+	 8,
+};
+
+static float _vq_quantthresh__8u0__p2_0[] = {
+	-0.5, 0.5, 
+};
+
+static 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,
+	3,
+	3
+};
+
+static static_codebook _8u0__p2_0 = {
+	4, 81,
+	_vq_lengthlist__8u0__p2_0,
+	1, -535822336, 1611661312, 2, 0,
+	_vq_quantlist__8u0__p2_0,
+	NULL,
+	&_vq_auxt__8u0__p2_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u0__p3_0[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static 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,
+	12,13, 6, 8, 8,10,10, 8,10,10,11,11, 8,10,10,11,
+	11, 9,10,11,12,12,10,11,11,12,12, 8,11,11,14,13,
+	10,12,11,15,13,10,12,11,14,14,12,13,12,16,14,12,
+	14,12,16,15, 8,11,11,13,14,10,11,12,13,15,10,11,
+	12,13,15,11,12,13,14,15,12,12,14,14,16, 5, 8, 8,
+	11,11, 9,11,11,12,12, 8,10,11,12,12,11,12,12,15,
+	14,11,12,12,14,14, 7,11,10,13,12,10,11,12,13,14,
+	10,12,12,14,13,12,13,13,14,15,12,13,13,15,15, 7,
+	10,11,12,13,10,12,11,14,13,10,12,13,13,15,12,13,
+	12,14,14,11,13,13,15,16, 9,12,12,15,14,11,13,13,
+	15,16,11,13,13,16,16,13,14,15,15,15,12,14,15,17,
+	16, 9,12,12,14,15,11,13,13,15,16,11,13,13,16,18,
+	13,14,14,17,16,13,15,15,17,18, 5, 8, 9,11,11, 8,
+	11,11,12,12, 8,10,11,12,12,11,12,12,14,14,11,12,
+	12,14,15, 7,11,10,12,13,10,12,12,14,13,10,11,12,
+	13,14,11,13,13,15,14,12,13,13,14,15, 7,10,11,13,
+	13,10,12,12,13,14,10,12,12,13,13,11,13,13,16,16,
+	12,13,13,15,14, 9,12,12,16,15,10,13,13,15,15,11,
+	13,13,17,15,12,15,15,18,17,13,14,14,15,16, 9,12,
+	12,15,15,11,13,13,15,16,11,13,13,15,15,12,15,15,
+	16,16,13,15,14,17,15, 7,11,11,15,15,10,13,13,16,
+	15,10,13,13,15,16,14,15,15,17,19,13,15,14,15,18,
+	 9,12,12,16,16,11,13,14,17,16,11,13,13,17,16,15,
+	15,16,17,19,13,15,16, 0,18, 9,12,12,16,15,11,14,
+	13,17,17,11,13,14,16,16,15,16,16,19,18,13,15,15,
+	17,19,11,14,14,19,16,12,14,15, 0,18,12,16,15,18,
+	17,15,15,18,16,19,14,15,17,19,19,11,14,14,18,19,
+	13,15,14,19,19,12,16,15,18,17,15,17,15, 0,16,14,
+	17,16,19, 0, 7,11,11,14,14,10,12,12,15,15,10,13,
+	13,16,15,13,15,15,17, 0,14,15,15,16,19, 9,12,12,
+	16,16,11,14,14,16,16,11,13,13,16,16,14,17,16,19,
+	 0,14,18,17,17,19, 9,12,12,15,16,11,13,13,15,17,
+	12,14,13,19,16,13,15,15,17,19,15,17,16,17,19,11,
+	14,14,19,16,12,15,15,19,17,13,14,15,17,19,14,16,
+	17,19,19,16,15,16,17,19,11,15,14,16,16,12,15,15,
+	19, 0,12,14,15,19,19,14,16,16, 0,18,15,19,14,18,
+	16,
+};
+
+static float _vq_quantthresh__8u0__p3_0[] = {
+	-1.5, -0.5, 0.5, 1.5, 
+};
+
+static 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,
+	5,
+	5
+};
+
+static static_codebook _8u0__p3_0 = {
+	4, 625,
+	_vq_lengthlist__8u0__p3_0,
+	1, -533725184, 1611661312, 3, 0,
+	_vq_quantlist__8u0__p3_0,
+	NULL,
+	&_vq_auxt__8u0__p3_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u0__p4_0[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static 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,
+	11,12, 6, 7, 7,10,10, 7, 8, 8,10,10, 7, 8, 7,10,
+	10, 9,10,10,12,11,10,10,10,11,10, 9,10,10,12,11,
+	10,10,10,13,11, 9,10,10,12,12,11,11,12,12,13,11,
+	11,11,12,13, 9,10,10,12,12,10,10,11,12,12,10,10,
+	11,12,12,11,11,11,13,13,11,12,12,13,13, 5, 7, 7,
+	10,10, 7, 8, 8,10,10, 7, 8, 8,10,10,10,11,11,12,
+	12,10,11,10,12,12, 7, 8, 8,11,11, 7, 8, 9,10,11,
+	 8, 9, 9,11,11,11,10,11,10,12,10,11,11,12,13, 7,
+	 8, 8,10,11, 8, 9, 8,12,10, 8, 9, 9,11,12,10,11,
+	10,13,11,10,11,11,13,12, 9,11,10,13,12,10,10,11,
+	12,12,10,11,11,13,13,12,10,13,11,14,11,12,12,15,
+	13, 9,11,11,13,13,10,11,11,13,12,10,11,11,12,14,
+	12,13,11,14,12,12,12,12,14,14, 5, 7, 7,10,10, 7,
+	 8, 8,10,10, 7, 8, 8,11,10,10,11,11,12,12,10,11,
+	10,12,12, 7, 8, 8,10,11, 8, 9, 9,12,11, 8, 8, 9,
+	10,11,10,11,11,12,13,11,10,11,11,13, 6, 8, 8,10,
+	11, 8, 9, 9,11,11, 7, 9, 7,11,10,10,11,11,12,12,
+	10,11,10,13,10, 9,11,10,13,12,10,12,11,13,13,10,
+	10,11,12,13,11,12,13,15,14,11,11,13,12,13, 9,10,
+	11,12,13,10,11,11,12,13,10,11,10,13,12,12,13,13,
+	13,14,12,12,11,14,11, 8,10,10,12,13,10,11,11,13,
+	13,10,11,10,13,13,12,13,14,15,14,12,12,12,14,13,
+	 9,10,10,13,12,10,10,12,13,13,10,11,11,15,12,12,
+	12,13,15,14,12,13,13,15,13, 9,10,11,12,13,10,12,
+	10,13,12,10,11,11,12,13,12,14,12,15,13,12,12,12,
+	15,14,11,12,11,14,13,11,11,12,14,14,12,13,13,14,
+	13,13,11,15,11,15,14,14,14,16,15,11,12,12,13,14,
+	11,13,11,14,14,12,12,13,14,15,12,14,12,15,12,13,
+	15,14,16,15, 8,10,10,12,12,10,10,10,12,13,10,11,
+	11,13,13,12,12,12,13,14,13,13,13,15,15, 9,10,10,
+	12,12,10,11,11,13,12,10,10,11,13,13,12,12,12,14,
+	14,12,12,13,15,14, 9,10,10,13,12,10,10,12,12,13,
+	10,11,10,13,13,12,13,13,14,14,12,13,12,14,13,11,
+	12,12,14,13,12,13,12,14,14,10,12,12,14,14,14,14,
+	14,16,14,13,12,14,12,15,10,12,12,14,15,12,13,13,
+	14,16,11,12,11,15,14,13,14,14,14,15,13,14,11,14,
+	12,
+};
+
+static float _vq_quantthresh__8u0__p4_0[] = {
+	-1.5, -0.5, 0.5, 1.5, 
+};
+
+static 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,
+	5,
+	5
+};
+
+static static_codebook _8u0__p4_0 = {
+	4, 625,
+	_vq_lengthlist__8u0__p4_0,
+	1, -533725184, 1611661312, 3, 0,
+	_vq_quantlist__8u0__p4_0,
+	NULL,
+	&_vq_auxt__8u0__p4_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u0__p5_0[] = {
+	4,
+	3,
+	5,
+	2,
+	6,
+	1,
+	7,
+	0,
+	8,
+};
+
+static 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,
+	 9, 9,10,10,12,11, 7, 8, 8, 9, 9,10,10,11,11, 9,
+	10,10,11,11,11,12,12,12, 9,10,10,11,11,12,12,12,
+	12,
+};
+
+static 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[] = {
+	    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,
+	9,
+	9
+};
+
+static static_codebook _8u0__p5_0 = {
+	2, 81,
+	_vq_lengthlist__8u0__p5_0,
+	1, -531628032, 1611661312, 4, 0,
+	_vq_quantlist__8u0__p5_0,
+	NULL,
+	&_vq_auxt__8u0__p5_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u0__p6_0[] = {
+	6,
+	5,
+	7,
+	4,
+	8,
+	3,
+	9,
+	2,
+	10,
+	1,
+	11,
+	0,
+	12,
+};
+
+static 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,
+	14,14,17,16, 7, 9, 9,11,11,13,12,13,13,14,14,17,
+	 0, 9,11,11,12,13,14,14,14,13,15,14,17,17, 9,11,
+	11,12,12,14,14,13,14,14,15, 0, 0,11,12,12,15,14,
+	15,14,15,14,15,16,17, 0,11,12,13,13,13,14,14,15,
+	14,15,15, 0, 0,12,14,14,15,15,14,16,15,15,17,16,
+	 0,18,13,14,14,15,14,15,14,15,16,17,16, 0, 0,17,
+	17,18, 0,16,18,16, 0, 0, 0,17, 0, 0,16, 0, 0,16,
+	16, 0,15, 0,17, 0, 0, 0, 0,
+};
+
+static 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[] = {
+	   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,
+	13,
+	13
+};
+
+static static_codebook _8u0__p6_0 = {
+	2, 169,
+	_vq_lengthlist__8u0__p6_0,
+	1, -526516224, 1616117760, 4, 0,
+	_vq_quantlist__8u0__p6_0,
+	NULL,
+	&_vq_auxt__8u0__p6_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u0__p6_1[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static 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[] = {
+	-1.5, -0.5, 0.5, 1.5, 
+};
+
+static 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,
+	5,
+	5
+};
+
+static static_codebook _8u0__p6_1 = {
+	2, 25,
+	_vq_lengthlist__8u0__p6_1,
+	1, -533725184, 1611661312, 3, 0,
+	_vq_quantlist__8u0__p6_1,
+	NULL,
+	&_vq_auxt__8u0__p6_1,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u0__p7_0[] = {
+	1,
+	0,
+	2,
+};
+
+static 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,
+	 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,
+	 7,
+};
+
+static float _vq_quantthresh__8u0__p7_0[] = {
+	-157.5, 157.5, 
+};
+
+static 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,
+	3,
+	3
+};
+
+static static_codebook _8u0__p7_0 = {
+	4, 81,
+	_vq_lengthlist__8u0__p7_0,
+	1, -518803456, 1628680192, 2, 0,
+	_vq_quantlist__8u0__p7_0,
+	NULL,
+	&_vq_auxt__8u0__p7_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u0__p7_1[] = {
+	7,
+	6,
+	8,
+	5,
+	9,
+	4,
+	10,
+	3,
+	11,
+	2,
+	12,
+	1,
+	13,
+	0,
+	14,
+};
+
+static 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,
+	11, 8,11,11,11,11,11,11,11,11,11,11, 5, 6, 6, 9,
+	10,11,10,11,11,11,11,11,11,11,11, 7,10,10,11,11,
+	11,11,11,11,11,11,11,11,11,11, 7,11, 8,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,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,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,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,
+};
+
+static 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[] = {
+	   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,
+	15,
+	15
+};
+
+static static_codebook _8u0__p7_1 = {
+	2, 225,
+	_vq_lengthlist__8u0__p7_1,
+	1, -520986624, 1620377600, 4, 0,
+	_vq_quantlist__8u0__p7_1,
+	NULL,
+	&_vq_auxt__8u0__p7_1,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u0__p7_2[] = {
+	10,
+	9,
+	11,
+	8,
+	12,
+	7,
+	13,
+	6,
+	14,
+	5,
+	15,
+	4,
+	16,
+	3,
+	17,
+	2,
+	18,
+	1,
+	19,
+	0,
+	20,
+};
+
+static 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,
+	10,11,10,11,12,11,10,11,11,11,11,11,11,12,10, 8,
+	 9, 9,10, 9,10,10, 9,10,10,10,10,10, 9,10,10,10,
+	10, 9,10,10, 9, 9, 9, 9,10,10, 9, 9,10,10,11,10,
+	 9,12,10,11,10, 9,10,10,10, 8, 9, 9,10, 9,10, 9,
+	 9,10,10, 9,10, 9,11,10,10,10,10,10, 9,10, 8, 8,
+	 9, 9,10, 9,11, 9, 8, 9, 9,10,11,10,10,10,11,12,
+	 9, 9,11, 8, 9, 8,11,10,11,10,10, 9,11,10,10,10,
+	10,10,10,10,11,11,11,11, 8, 9, 9, 9,10,10,10,11,
+	11,12,11,12,11,10,10,10,12,11,11,11,10, 8,10, 9,
+	11,10,10,11,12,10,11,12,11,11,12,11,12,12,10,11,
+	11,10, 9, 9,10,11,12,10,10,10,11,10,11,11,10,12,
+	12,10,11,10,11,12,10, 9,10,10,11,10,11,11,11,11,
+	11,12,11,11,11, 9,11,10,11,10,11,10, 9, 9,10,11,
+	11,11,10,10,11,12,12,11,12,11,11,11,12,12,12,12,
+	11, 9,11,11,12,10,11,11,11,11,11,11,12,11,11,12,
+	11,11,11,10,11,11, 9,11,10,11,11,11,10,10,10,11,
+	11,11,12,10,11,10,11,11,11,11,12, 9,11,10,11,11,
+	10,10,11,11, 9,11,11,12,10,10,10,10,10,11,11,10,
+	 9,10,11,11,12,11,10,10,12,11,11,12,11,12,11,11,
+	10,10,11,11,10,12,11,10,11,10,11,10,10,10,11,11,
+	10,10,11,11,11,11,10,10,10,12,11,11,11,11,10, 9,
+	10,11,11,11,12,11,11,11,12,10,11,11,11, 9,10,11,
+	11,11,11,11,11,10,10,11,11,12,11,10,11,12,11,10,
+	10,11, 9,10,11,11,11,11,11,10,11,11,10,12,11,11,
+	11,12,11,11,11,10,10,11,11,
+};
+
+static 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[] = {
+	   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,
+	21,
+	21
+};
+
+static static_codebook _8u0__p7_2 = {
+	2, 441,
+	_vq_lengthlist__8u0__p7_2,
+	1, -529268736, 1611661312, 5, 0,
+	_vq_quantlist__8u0__p7_2,
+	NULL,
+	&_vq_auxt__8u0__p7_2,
+	NULL,
+	0
+};
+
+static 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 = {
+	2, 64,
+	_huff_lengthlist__8u0__single,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u1__p1_0[] = {
+	1,
+	0,
+	2,
+};
+
+static 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,
+	 9,12,11,10,12,12, 5, 8, 8, 8,10,10, 8,10,10, 7,
+	10,10,10,12,12, 9,11,12, 7,10,10,10,12,12, 9,12,
+	10,
+};
+
+static float _vq_quantthresh__8u1__p1_0[] = {
+	-0.5, 0.5, 
+};
+
+static 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,
+	3,
+	3
+};
+
+static static_codebook _8u1__p1_0 = {
+	4, 81,
+	_vq_lengthlist__8u1__p1_0,
+	1, -535822336, 1611661312, 2, 0,
+	_vq_quantlist__8u1__p1_0,
+	NULL,
+	&_vq_auxt__8u1__p1_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u1__p2_0[] = {
+	1,
+	0,
+	2,
+};
+
+static 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,
+	 7, 9, 7, 8, 9, 9, 5, 6, 6, 6, 7, 7, 7, 8, 8, 6,
+	 8, 7, 8, 9, 9, 7, 7, 9, 6, 7, 8, 8, 9, 9, 7, 9,
+	 7,
+};
+
+static float _vq_quantthresh__8u1__p2_0[] = {
+	-0.5, 0.5, 
+};
+
+static 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,
+	3,
+	3
+};
+
+static static_codebook _8u1__p2_0 = {
+	4, 81,
+	_vq_lengthlist__8u1__p2_0,
+	1, -535822336, 1611661312, 2, 0,
+	_vq_quantlist__8u1__p2_0,
+	NULL,
+	&_vq_auxt__8u1__p2_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u1__p3_0[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static 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,
+	12,13, 6, 8, 8,10,10, 8,10, 9,11,11, 8,10, 9,11,
+	11,10,11,11,12,12,10,11,11,12,12, 9,11,11,14,13,
+	10,12,11,14,14,10,12,11,14,13,12,13,13,15,14,12,
+	13,13,15,14, 8,11,11,13,14,10,11,12,13,15,10,11,
+	12,14,14,12,13,13,14,15,12,13,13,14,15, 5, 8, 8,
+	11,11, 8,10,10,12,12, 8,10,10,12,12,11,12,12,14,
+	13,11,12,12,13,14, 8,10,10,12,12, 9,11,12,13,14,
+	10,12,12,13,13,12,12,13,14,14,11,13,13,15,15, 7,
+	10,10,12,12, 9,12,11,14,12,10,11,12,13,14,12,13,
+	12,14,14,12,13,13,15,16,10,12,12,15,14,11,12,13,
+	15,15,11,13,13,15,16,14,14,15,15,16,13,14,15,17,
+	15, 9,12,12,14,15,11,13,12,15,15,11,13,13,15,15,
+	13,14,13,15,14,13,14,14,17, 0, 5, 8, 8,11,11, 8,
+	10,10,12,12, 8,10,10,12,12,11,12,12,14,14,11,12,
+	12,14,14, 7,10,10,12,12,10,12,12,13,13, 9,11,12,
+	12,13,11,12,13,15,15,11,12,13,14,15, 8,10,10,12,
+	12,10,12,11,13,13,10,12,11,13,13,11,13,13,15,14,
+	12,13,12,15,13, 9,12,12,14,14,11,13,13,16,15,11,
+	12,13,16,15,13,14,15,16,16,13,13,15,15,16,10,12,
+	12,15,14,11,13,13,14,16,11,13,13,15,16,13,15,15,
+	16,17,13,15,14,16,15, 8,11,11,14,15,10,12,12,15,
+	15,10,12,12,15,16,14,15,15,16,17,13,14,14,16,16,
+	 9,12,12,15,15,11,13,14,15,17,11,13,13,15,16,14,
+	15,16,19,17,13,15,15, 0,17, 9,12,12,15,15,11,14,
+	13,16,15,11,13,13,15,16,15,15,15,18,17,13,15,15,
+	17,17,11,15,14,18,16,12,14,15,17,17,12,15,15,18,
+	18,15,15,16,15,19,14,16,16, 0, 0,11,14,14,16,17,
+	12,15,14,18,17,12,15,15,18,18,15,17,15,18,16,14,
+	16,16,18,18, 7,11,11,14,14,10,12,12,15,15,10,12,
+	13,15,15,13,14,15,16,16,14,15,15,18,18, 9,12,12,
+	15,15,11,13,13,16,15,11,12,13,16,16,14,15,15,17,
+	16,15,16,16,17,17, 9,12,12,15,15,11,13,13,15,17,
+	11,14,13,16,15,13,15,15,17,17,15,15,15,18,17,11,
+	14,14,17,15,12,14,15,17,18,13,13,15,17,17,14,16,
+	16,19,18,16,15,17,17, 0,11,14,14,17,17,12,15,15,
+	18, 0,12,15,14,18,16,14,17,17,19, 0,16,18,15, 0,
+	16,
+};
+
+static float _vq_quantthresh__8u1__p3_0[] = {
+	-1.5, -0.5, 0.5, 1.5, 
+};
+
+static 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,
+	5,
+	5
+};
+
+static static_codebook _8u1__p3_0 = {
+	4, 625,
+	_vq_lengthlist__8u1__p3_0,
+	1, -533725184, 1611661312, 3, 0,
+	_vq_quantlist__8u1__p3_0,
+	NULL,
+	&_vq_auxt__8u1__p3_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u1__p4_0[] = {
+	2,
+	1,
+	3,
+	0,
+	4,
+};
+
+static 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,
+	10,12, 6, 7, 7, 9, 9, 7, 8, 7,10, 9, 7, 8, 7,10,
+	 9, 9,10, 9,12,11,10,10, 9,12,10, 9,10,10,12,11,
+	 9,10,10,12,11, 9,10,10,12,12,11,11,12,12,13,11,
+	11,12,12,13, 9, 9,10,12,11, 9,10,10,12,12,10,10,
+	10,12,12,11,12,11,13,12,11,12,11,13,12, 6, 7, 7,
+	 9, 9, 7, 8, 8,10,10, 7, 8, 7,10, 9,10,10,10,12,
+	12,10,10,10,12,11, 7, 8, 7,10,10, 7, 7, 9,10,11,
+	 8, 9, 9,11,10,10,10,11,10,12,10,10,11,12,12, 7,
+	 8, 8,10,10, 7, 9, 8,11,10, 8, 8, 9,11,11,10,11,
+	10,12,11,10,11,11,12,12, 9,10,10,12,12, 9,10,10,
+	12,12,10,11,11,13,12,11,10,12,10,14,12,12,12,13,
+	14, 9,10,10,12,12, 9,11,10,12,12,10,11,11,12,12,
+	11,12,11,14,12,12,12,12,14,14, 5, 7, 7, 9, 9, 7,
+	 7, 7, 9,10, 7, 8, 8,10,10,10,10,10,11,11,10,10,
+	10,12,12, 7, 8, 8,10,10, 8, 9, 8,11,10, 7, 8, 9,
+	10,11,10,10,10,11,12,10,10,11,11,13, 6, 7, 8,10,
+	10, 8, 9, 9,10,10, 7, 9, 7,11,10,10,11,10,12,12,
+	10,11,10,12,10, 9,10,10,12,12,10,11,11,13,12, 9,
+	10,10,12,12,12,12,12,14,13,11,11,12,11,14, 9,10,
+	10,11,12,10,11,11,12,13, 9,10,10,12,12,12,12,12,
+	14,13,11,12,10,14,11, 9, 9,10,11,12, 9,10,10,12,
+	12, 9,10,10,12,12,12,12,12,14,14,11,12,12,13,12,
+	 9,10, 9,12,12, 9,10,11,12,13,10,11,10,13,11,12,
+	12,13,13,14,12,12,12,13,13, 9,10,10,12,12,10,11,
+	10,13,12,10,10,11,12,13,12,13,12,14,13,12,12,12,
+	13,14,11,12,11,14,13,10,10,11,13,13,12,12,12,14,
+	13,12,10,14,10,15,13,14,14,14,14,11,11,12,13,14,
+	10,12,11,13,13,12,12,12,13,15,12,13,11,15,12,13,
+	13,14,14,14, 9,10, 9,12,12, 9,10,10,12,12,10,10,
+	10,12,12,11,11,12,12,13,12,12,12,14,14, 9,10,10,
+	12,12,10,11,10,13,12,10,10,11,12,13,12,12,12,14,
+	13,12,12,13,13,14, 9,10,10,12,13,10,10,11,11,12,
+	 9,11,10,13,12,12,12,12,13,14,12,13,12,14,13,11,
+	12,11,13,13,12,13,12,14,13,10,11,12,13,13,13,13,
+	13,14,15,12,11,14,12,14,11,11,12,12,13,12,12,12,
+	13,14,10,12,10,14,13,13,13,13,14,15,12,14,11,15,
+	10,
+};
+
+static float _vq_quantthresh__8u1__p4_0[] = {
+	-1.5, -0.5, 0.5, 1.5, 
+};
+
+static 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,
+	5,
+	5
+};
+
+static static_codebook _8u1__p4_0 = {
+	4, 625,
+	_vq_lengthlist__8u1__p4_0,
+	1, -533725184, 1611661312, 3, 0,
+	_vq_quantlist__8u1__p4_0,
+	NULL,
+	&_vq_auxt__8u1__p4_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u1__p5_0[] = {
+	4,
+	3,
+	5,
+	2,
+	6,
+	1,
+	7,
+	0,
+	8,
+};
+
+static 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,
+	 9, 9,10,10,12,11, 8, 8, 8, 9, 9,10,10,11,11, 9,
+	10,10,11,11,11,11,13,12, 9,10,10,11,11,12,12,12,
+	13,
+};
+
+static 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[] = {
+	    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,
+	9,
+	9
+};
+
+static static_codebook _8u1__p5_0 = {
+	2, 81,
+	_vq_lengthlist__8u1__p5_0,
+	1, -531628032, 1611661312, 4, 0,
+	_vq_quantlist__8u1__p5_0,
+	NULL,
+	&_vq_auxt__8u1__p5_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u1__p6_0[] = {
+	4,
+	3,
+	5,
+	2,
+	6,
+	1,
+	7,
+	0,
+	8,
+};
+
+static 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,
+	 8, 8, 8, 9,10,10, 7, 7, 7, 8, 8, 9, 8,10,10, 9,
+	 9, 9, 9, 9,10,10,10,10, 9, 9, 9, 9, 9,10,10,10,
+	10,
+};
+
+static 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[] = {
+	    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,
+	9,
+	9
+};
+
+static static_codebook _8u1__p6_0 = {
+	2, 81,
+	_vq_lengthlist__8u1__p6_0,
+	1, -531628032, 1611661312, 4, 0,
+	_vq_quantlist__8u1__p6_0,
+	NULL,
+	&_vq_auxt__8u1__p6_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u1__p7_0[] = {
+	1,
+	0,
+	2,
+};
+
+static 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,
+	10,13,12,10,13,13, 4,10,10, 9,12,12, 9,12,12, 7,
+	12,12,10,13,13,10,12,13, 7,11,12,10,13,13,10,13,
+	11,
+};
+
+static float _vq_quantthresh__8u1__p7_0[] = {
+	-5.5, 5.5, 
+};
+
+static 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,
+	3,
+	3
+};
+
+static static_codebook _8u1__p7_0 = {
+	4, 81,
+	_vq_lengthlist__8u1__p7_0,
+	1, -529137664, 1618345984, 2, 0,
+	_vq_quantlist__8u1__p7_0,
+	NULL,
+	&_vq_auxt__8u1__p7_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u1__p7_1[] = {
+	5,
+	4,
+	6,
+	3,
+	7,
+	2,
+	8,
+	1,
+	9,
+	0,
+	10,
+};
+
+static 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,
+	 8, 8, 8, 9, 9, 9, 9, 8, 8, 8, 8, 8, 9, 9, 9, 9,
+	 9, 9, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 8, 9, 9,
+	 9, 9, 9, 9,10,10,10,10, 8, 9, 9, 9, 9, 9, 9,10,
+	10,10,10, 8, 9, 9, 9, 9, 9, 9,10,10,10,10, 8, 9,
+	 9, 9, 9, 9, 9,10,10,10,10,
+};
+
+static 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[] = {
+	    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,
+	11,
+	11
+};
+
+static static_codebook _8u1__p7_1 = {
+	2, 121,
+	_vq_lengthlist__8u1__p7_1,
+	1, -531365888, 1611661312, 4, 0,
+	_vq_quantlist__8u1__p7_1,
+	NULL,
+	&_vq_auxt__8u1__p7_1,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u1__p8_0[] = {
+	5,
+	4,
+	6,
+	3,
+	7,
+	2,
+	8,
+	1,
+	9,
+	0,
+	10,
+};
+
+static 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,
+	 9,11,11,12,12,13,13, 8, 9, 9,11,11,12,12,13,13,
+	14,14, 8, 9, 9,11,11,12,12,13,13,14,14, 9,11,11,
+	12,12,13,13,14,14,15,15, 9,11,11,12,12,13,13,14,
+	14,15,14,11,12,12,13,13,14,14,15,15,16,16,11,12,
+	12,13,13,14,14,15,15,15,15,
+};
+
+static 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[] = {
+	    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,
+	11,
+	11
+};
+
+static static_codebook _8u1__p8_0 = {
+	2, 121,
+	_vq_lengthlist__8u1__p8_0,
+	1, -524582912, 1618345984, 4, 0,
+	_vq_quantlist__8u1__p8_0,
+	NULL,
+	&_vq_auxt__8u1__p8_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u1__p8_1[] = {
+	5,
+	4,
+	6,
+	3,
+	7,
+	2,
+	8,
+	1,
+	9,
+	0,
+	10,
+};
+
+static 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,
+	 7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8,
+	 8, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 9, 8, 9, 9, 7, 8, 8, 8, 8, 8, 8, 9,
+	 8, 9, 9, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 8, 8,
+	 8, 8, 8, 8, 8, 9, 9, 9, 9,
+};
+
+static 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[] = {
+	    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,
+	11,
+	11
+};
+
+static static_codebook _8u1__p8_1 = {
+	2, 121,
+	_vq_lengthlist__8u1__p8_1,
+	1, -531365888, 1611661312, 4, 0,
+	_vq_quantlist__8u1__p8_1,
+	NULL,
+	&_vq_auxt__8u1__p8_1,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u1__p9_0[] = {
+	7,
+	6,
+	8,
+	5,
+	9,
+	4,
+	10,
+	3,
+	11,
+	2,
+	12,
+	1,
+	13,
+	0,
+	14,
+};
+
+static 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,
+	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,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,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,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,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,
+};
+
+static 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[] = {
+	   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,
+	15,
+	15
+};
+
+static static_codebook _8u1__p9_0 = {
+	2, 225,
+	_vq_lengthlist__8u1__p9_0,
+	1, -514071552, 1627381760, 4, 0,
+	_vq_quantlist__8u1__p9_0,
+	NULL,
+	&_vq_auxt__8u1__p9_0,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u1__p9_1[] = {
+	7,
+	6,
+	8,
+	5,
+	9,
+	4,
+	10,
+	3,
+	11,
+	2,
+	12,
+	1,
+	13,
+	0,
+	14,
+};
+
+static 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,
+	12,12,11,12,10,10,11,10,12,11,11,11, 7, 9, 9,11,
+	11,13,12, 9, 9,11,10,11,11,12,11, 9,10,10,12,12,
+	14,14,10,10,11,12,12,11,11,11, 9,10,11,11,13,14,
+	13,10,11,11,11,12,11,12,12, 7, 8, 8,10, 9,11,10,
+	11,12,12,11,12,14,12,13, 7, 8, 8, 9,10,10,11,12,
+	12,12,11,12,12,12,13, 9, 9, 9,11,11,13,12,12,12,
+	12,11,12,12,13,12, 8,10,10,11,10,11,12,12,12,12,
+	12,12,14,12,12, 9,11,11,11,12,12,12,12,13,13,12,
+	12,13,13,12,10,11,11,12,11,12,12,12,11,12,13,12,
+	12,12,13,11,11,12,12,12,13,12,12,11,12,13,13,12,
+	12,13,12,11,12,12,13,13,12,13,12,13,13,13,13,14,
+	13,
+};
+
+static 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[] = {
+	   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,
+	15,
+	15
+};
+
+static static_codebook _8u1__p9_1 = {
+	2, 225,
+	_vq_lengthlist__8u1__p9_1,
+	1, -522338304, 1620115456, 4, 0,
+	_vq_quantlist__8u1__p9_1,
+	NULL,
+	&_vq_auxt__8u1__p9_1,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__8u1__p9_2[] = {
+	8,
+	7,
+	9,
+	6,
+	10,
+	5,
+	11,
+	4,
+	12,
+	3,
+	13,
+	2,
+	14,
+	1,
+	15,
+	0,
+	16,
+};
+
+static 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,
+	 9, 9, 9, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9,10,10, 9, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9,10,10, 8, 8, 8, 9, 9, 9, 9,10,10,10, 9,
+	10,10,10,10,10,10, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9,
+	10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9,10,
+	10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9,10,10,10,
+	10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9,10,
+	10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9,10,
+	10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9,10,
+	10,10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9,
+	 9,10,10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9,10,
+	 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,10, 9,
+	10, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	 9, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,
+};
+
+static 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[] = {
+	   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,
+	17,
+	17
+};
+
+static static_codebook _8u1__p9_2 = {
+	2, 289,
+	_vq_lengthlist__8u1__p9_2,
+	1, -529530880, 1611661312, 5, 0,
+	_vq_quantlist__8u1__p9_2,
+	NULL,
+	&_vq_auxt__8u1__p9_2,
+	NULL,
+	0
+};
+
+static 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,
+	11,15, 7, 5, 8, 6, 7, 5, 7, 6, 9,13,13, 9, 9, 8,
+	 6, 6, 5, 5, 9,14, 8, 6, 8, 6, 6, 4, 5, 3, 5,13,
+	 9, 9,11, 8,10, 7, 8, 4, 5,12,11,16,17,15,17,12,
+	13, 8, 8,15,
+};
+
+static static_codebook _huff_book__8u1__single = {
+	2, 100,
+	_huff_lengthlist__8u1__single,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
 static long _huff_lengthlist__44u0__long[] = {
-	 3, 7,12,10,15,10, 9,18, 5, 2, 5, 6, 8, 7, 9,20,
-	10, 4, 4, 6, 6, 8,11,20, 9, 5, 6, 5, 7, 6, 9,20,
-	11, 7, 5, 7, 5, 7,10,20,10, 6, 7, 6, 6, 6, 8,17,
-	 9, 8,10, 7, 7, 5, 5,17,11,18,19,14,13, 9, 8,19,
+	 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 = {
@@ -2372,10 +3713,10 @@
 
 static long _vq_lengthlist__44u0__p1_0[] = {
 	 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,11,11, 8,
-	10,11, 5, 8, 8, 8,10,10, 8,11,11, 4, 8, 8, 8,11,
-	11, 8,11,11, 8,11,11,11,13,14,11,13,14, 7,11,11,
-	10,14,12,11,13,14, 4, 8, 8, 8,11,11, 8,11,11, 8,
-	11,11,11,14,13,10,12,13, 8,11,12,11,14,14,11,14,
+	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,
+	10,13,12,11,13,14, 4, 8, 8, 8,11,11, 8,11,12, 8,
+	11,11,11,13,13,10,12,13, 8,11,11,11,14,13,11,14,
 	13,
 };
 
@@ -2412,11 +3753,11 @@
 };
 
 static long _vq_lengthlist__44u0__p2_0[] = {
-	 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 6, 7, 8, 8, 6,
-	 7, 8, 5, 6, 7, 6, 8, 7, 7, 8, 8, 5, 7, 7, 7, 8,
+	 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,
-	 7,10, 8, 8,10,10, 5, 7, 7, 7, 8, 8, 7, 8, 8, 6,
-	 8, 8, 8,10,10, 7, 8,10, 6, 8, 8, 8,10,10, 8,10,
+	 8,10, 8, 8,10,10, 5, 7, 7, 7, 8, 8, 7, 8, 8, 6,
+	 8, 8, 8,10,10, 8, 8,10, 6, 8, 8, 8,10,10, 8,10,
 	 9,
 };
 
@@ -2455,45 +3796,45 @@
 };
 
 static long _vq_lengthlist__44u0__p3_0[] = {
-	 1, 5, 5, 8, 8, 5, 7, 7, 9, 9, 5, 7, 8, 9, 9, 8,
-	10, 9,12,11, 8, 9,10,11,12, 6, 8, 8,10,10, 8,10,
-	10,11,11, 8, 9,10,11,11,10,12,11,13,13,10,11,11,
-	13,13, 6, 8, 8,10,10, 8,10, 9,11,11, 8,10,10,11,
+	 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,
+	13,13, 5, 8, 8,10,10, 8,10,10,11,11, 8,10,10,11,
 	11,10,11,11,13,13,10,11,11,13,13, 9,11,11,15,14,
-	10,12,11,15,14,10,12,11,15,14,12,14,13,16,15,12,
-	13,13,17,15, 9,11,11,14,14,10,11,12,14,15,10,11,
-	12,14,17,12,13,14,15,16,13,13,14,15,17, 5, 8, 8,
-	11,11, 8,10,10,12,12, 8,10,10,12,12,11,12,12,15,
-	14,11,12,12,14,15, 8,10,10,13,12,10,12,12,13,13,
-	10,12,12,14,14,12,13,13,15,15,11,13,13,15,16, 7,
-	10,10,12,12, 9,12,11,14,13,10,12,12,13,14,12,13,
-	12,15,15,12,13,13,16,17,10,12,12,15,16,12,13,13,
-	17,15,11,13,13,17,16,15,15,15,17,17,13,15,16,18,
-	18, 9,12,12,15,17,11,13,12,16,16,11,13,13,16,18,
-	14,15,14,16,16,13,15,15,17,18, 5, 8, 8,11,11, 8,
-	10,10,12,12, 8,10,10,12,12,10,12,12,15,15,11,12,
-	12,14,15, 7,10,10,12,12,10,12,12,14,14, 9,11,12,
-	13,13,12,13,13,16,16,12,12,13,15,15, 8,10,10,12,
-	13,10,12,12,13,14,10,12,12,13,13,12,13,13,16,16,
-	12,13,13,15,15,10,12,12,15,16,11,13,13,17,16,11,
-	12,13,17,16,13,15,15,18,19,14,14,14,17,16,10,12,
-	12,15,15,11,13,13,15,16,11,13,13,15,17,13,15,15,
-	18,20,14,15,15,17,17, 8,11,11,15,16,10,13,12,17,
-	16,10,12,13,16,17,15,16,15,20,19,14,15,16,18,19,
-	 9,12,12,15,17,11,13,14,18,18,11,13,14,17,17,16,
-	17,18,19,19,15,16,18,19,20, 9,12,12,16,16,11,14,
-	12,17,17,11,13,13,16,19,15,16,15,20,19,15,15,15,
-	19,17,12,14,14,18,19,14,15,15,19,18,13,15,15,18,
-	17,17,18,19,20, 0,15,16,17,20, 0,12,15,14,17,18,
-	13,16,14,20,20,13,16,15,19,18,16,20,17,20,19,16,
-	17,16, 0,19, 8,11,11,15,15,10,12,12,17,17,10,12,
-	13,16,16,13,14,15,17,17,15,16,17,19,19, 9,12,12,
-	16,17,11,13,13,18,16,11,13,13,16,17,14,15,16,19,
-	18,15,16,17,17,18, 9,12,12,17,16,11,14,13,16,16,
-	12,14,13,17,18,14,16,15,18,19,17,17,17,19,18,12,
-	14,14,19,17,13,15,15,17, 0,13,14,16, 0, 0,15,16,
-	16,19, 0,16,16,19,19, 0,12,15,14,19,18,13,15,15,
-	19, 0,14,16,15, 0,19,15,17,17, 0,19,17,18,17, 0,
+	10,12,12,15,14,10,12,11,15,14,13,14,14,16,16,12,
+	14,13,17,15, 9,11,11,14,15,10,11,12,14,16,10,11,
+	12,14,16,12,13,14,16,16,13,13,15,15,18, 5, 8, 8,
+	11,11, 8,10,10,12,12, 8,10,10,12,13,11,12,12,14,
+	14,11,12,12,15,15, 8,10,10,13,13,10,12,12,13,13,
+	10,12,12,14,14,12,13,13,15,15,12,13,13,16,16, 7,
+	10,10,12,12,10,12,11,13,13,10,12,12,13,14,12,13,
+	12,15,14,12,13,13,16,16,10,12,12,17,16,12,13,13,
+	16,15,11,13,13,17,17,15,15,15,16,17,14,15,15,19,
+	19,10,12,12,15,16,11,13,12,15,18,11,13,13,16,16,
+	14,15,15,17,17,14,15,15,17,19, 5, 8, 8,11,11, 8,
+	10,10,12,12, 8,10,10,12,12,11,12,12,16,15,11,12,
+	12,14,15, 7,10,10,13,13,10,12,12,14,13,10,11,12,
+	13,13,12,13,13,16,16,12,12,13,15,15, 8,10,10,13,
+	13,10,12,12,14,14,10,12,12,13,13,12,13,13,16,16,
+	12,13,13,15,15,10,12,12,16,15,11,13,13,17,16,11,
+	12,13,16,15,13,15,15,19,17,14,15,14,17,16,10,12,
+	12,16,16,11,13,13,16,17,12,13,13,15,17,14,15,15,
+	17,19,14,15,15,17,17, 8,11,11,16,16,10,13,12,17,
+	17,10,12,13,16,16,15,17,16,20,19,14,15,17,18,19,
+	 9,12,12,16,17,11,13,14,17,18,11,13,13,19,18,16,
+	17,18,19,19,15,16,16,19,19, 9,12,12,16,17,11,14,
+	13,18,17,11,13,13,17,17,16,17,16,20,19,14,16,16,
+	18,18,12,15,15,19,17,14,15,16, 0,20,13,15,16,20,
+	17,18,16,20, 0, 0,15,16,19,20, 0,12,15,14,18,19,
+	13,16,15,20,19,13,16,15,20,18,17,18,17, 0,20,16,
+	17,16, 0, 0, 8,11,11,16,15,10,12,12,17,17,10,13,
+	13,17,16,14,16,15,18,20,15,16,16,19,19, 9,12,12,
+	16,16,11,13,13,17,16,11,13,14,17,18,15,15,16,20,
+	20,16,16,17,19,19, 9,13,12,16,17,11,14,13,17,17,
+	11,14,14,18,17,14,16,15,18,19,16,17,18,18,19,12,
+	14,15,19,18,13,15,16,18, 0,13,14,15, 0, 0,16,16,
+	17,20, 0,17,17,20,20, 0,12,15,15,19,20,13,15,15,
+	 0, 0,14,16,15, 0, 0,15,18,16, 0, 0,17,18,16, 0,
 	19,
 };
 
@@ -2532,45 +3873,45 @@
 };
 
 static long _vq_lengthlist__44u0__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, 6, 7, 8, 9,10,10,10,10,11,12, 9,10,10,
-	11,12, 5, 7, 7, 9, 9, 6, 8, 7,10,10, 7, 8, 8,10,
-	10, 9,10,10,12,11,10,10,10,12,11, 9,10,10,12,12,
-	10,11,10,13,13, 9,10,10,13,13,12,12,12,14,14,11,
-	12,12,14,14, 9,10,10,12,12, 9,10,10,13,13,10,10,
-	10,12,13,11,12,12,14,14,12,13,12,14,14, 5, 7, 7,
-	10,10, 7, 8, 8,10,10, 7, 8, 8,10,10,10,10,10,13,
-	12,10,10,10,12,12, 7, 8, 8,11,10, 8, 8, 9,10,11,
-	 8, 9, 9,11,11,10,10,11,12,13,10,11,11,13,14, 6,
+	 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,
+	12,13, 5, 7, 7,10,10, 6, 8, 7,10,10, 7, 8, 7,10,
+	10, 9,10,10,12,12,10,10,10,13,11, 9,10,10,13,13,
+	10,11,10,13,13,10,10,10,13,13,12,12,13,14,14,12,
+	12,13,14,14, 9,10,10,13,13,10,10,10,13,13,10,10,
+	10,13,13,12,13,12,15,14,12,13,12,15,15, 5, 7, 6,
+	10,10, 7, 8, 8,10,10, 7, 8, 8,10,10,10,11,10,13,
+	13,10,10,10,12,12, 7, 8, 8,11,10, 8, 8, 9,10,11,
+	 8, 9, 9,11,11,11,10,11,11,14,11,11,11,13,13, 6,
 	 8, 8,10,10, 7, 9, 8,11,10, 8, 9, 9,11,11,10,11,
-	10,13,11,10,11,11,13,13,10,11,10,13,13,10,10,11,
-	13,14,10,11,11,14,13,12,11,13,12,14,12,13,13,15,
-	15, 9,10,10,13,13,10,11,10,13,13,10,11,11,13,14,
-	12,13,11,15,12,12,13,13,14,15, 5, 7, 7,10, 9, 7,
-	 8, 8,10,10, 7, 8, 8,10,10,10,10,10,12,12,10,10,
-	10,12,13, 6, 8, 8,10,10, 8, 9, 9,11,11, 7, 8, 9,
-	10,11,10,11,11,13,13,10,10,11,11,14, 7, 8, 8,10,
-	10, 8, 9, 9,11,11, 8, 9, 8,11,10,10,11,11,13,13,
-	10,11,10,13,11, 9,10,10,13,13,10,11,11,14,13,10,
-	10,11,12,13,13,13,13,15,14,12,11,13,12,15, 9,10,
-	11,13,13,10,11,11,13,14,10,11,10,13,13,12,13,13,
-	15,15,12,13,11,15,12, 8,10,10,13,12,10,11,11,13,
-	13, 9,10,11,13,13,13,13,13,15,15,12,13,13,15,15,
-	 9,10,10,13,13,10,11,11,13,14,10,11,11,14,13,13,
-	13,14,14,15,13,13,13,14,15, 9,10,10,13,13,10,11,
-	10,14,13,10,11,11,13,14,13,14,13,15,14,12,13,13,
-	14,15,11,13,13,15,14,11,11,13,14,15,12,14,13,15,
-	15,13,12,15,12,16,14,14,15,17,16,11,12,12,14,15,
-	11,13,11,15,14,12,13,13,15,15,14,14,12,17,13,14,
-	15,15,18,16, 8,10,10,13,12, 9,10,10,13,13,10,10,
-	11,13,13,12,13,13,14,14,12,13,13,15,15, 9,10,10,
-	13,13,10,11,11,14,13,10,10,11,13,14,12,13,13,17,
-	15,12,12,13,14,16, 9,10,10,13,13,10,11,11,13,13,
-	10,11,10,14,13,13,13,13,14,15,13,14,13,15,15,11,
-	13,12,14,14,12,13,13,16,14,11,12,13,15,15,14,15,
-	16,17,18,14,12,15,14,16,11,12,13,14,15,12,13,13,
-	15,16,11,13,11,15,14,14,16,14,16,17,14,15,12,16,
+	10,14,11,10,11,11,13,13,10,11,11,14,13,10,10,11,
+	14,13,10,11,11,14,14,12,11,13,12,16,13,14,14,15,
+	15,10,10,11,13,14,10,11,10,14,13,10,11,11,14,14,
+	12,13,12,15,13,13,13,14,15,16, 5, 7, 7,10,10, 7,
+	 8, 8,10,10, 7, 8, 8,10,10,10,10,10,13,13,10,10,
+	11,12,13, 6, 8, 8,11,10, 8, 9, 9,11,11, 7, 8, 9,
+	10,11,10,11,11,13,13,10,10,11,11,13, 6, 8, 8,10,
+	11, 8, 9, 9,11,11, 8, 9, 8,12,10,10,11,11,13,13,
+	10,11,10,14,11,10,10,10,14,13,10,11,11,14,13,10,
+	10,11,13,13,12,14,14,16,16,12,12,13,13,15,10,11,
+	11,13,14,10,11,11,14,15,10,11,10,13,13,13,14,13,
+	16,16,12,13,11,15,12, 9,10,10,13,13,10,11,11,14,
+	13,10,10,11,13,14,13,14,13,16,16,13,13,13,15,16,
+	 9,10,10,13,13,10,10,11,13,14,10,11,11,15,13,13,
+	13,14,14,18,13,13,14,16,15, 9,10,10,13,14,10,11,
+	10,14,13,10,11,11,13,14,13,14,13,16,15,13,13,14,
+	15,16,12,13,12,16,14,11,11,13,15,15,13,14,13,16,
+	15,15,12,16,12,17,14,15,15,17,17,12,13,13,14,16,
+	11,13,11,16,15,12,13,14,15,16,14,15,13, 0,14,14,
+	16,16, 0, 0, 9,10,10,13,13,10,11,10,14,14,10,11,
+	11,13,13,12,13,13,14,16,13,14,14,16,16, 9,10,10,
+	14,14,11,11,11,14,13,10,10,11,14,14,13,13,13,16,
+	16,13,13,14,14,17, 9,10,10,13,14,10,11,11,13,15,
+	10,11,10,14,14,13,13,13,14,17,13,14,13,17,14,12,
+	13,13,16,14,13,14,13,16,15,12,12,13,15,16,15,15,
+	16,18,16,15,13,15,14, 0,12,12,13,14,16,13,13,14,
+	15,16,11,12,11,16,14,15,16,16,17,17,14,15,12,17,
 	12,
 };
 
@@ -2613,12 +3954,12 @@
 };
 
 static long _vq_lengthlist__44u0__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,
-	10, 9,10,11,12,12, 8, 8, 8, 9, 9,11,11,12,12, 9,
-	10,10,11,11,12,12,13,13, 9,10,10,11,11,12,12,13,
-	13,
+	 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,
+	 9, 9,10,10,11,11, 7, 8, 8, 9, 9,10,10,11,11, 9,
+	 9, 9,10,10,11,11,12,12, 9, 9, 9,10,11,11,11,12,
+	12,
 };
 
 static float _vq_quantthresh__44u0__p5_0[] = {
@@ -2665,17 +4006,17 @@
 };
 
 static long _vq_lengthlist__44u0__p6_0[] = {
-	 1, 4, 4, 6, 6, 8, 8,10, 9,10,10,14,14, 4, 6, 5,
-	 8, 8, 9, 9,10,10,11,11,14,14, 4, 5, 6, 8, 8, 9,
-	 9,10,10,11,11,14,14, 7, 8, 8, 9, 9,10,10,11,11,
-	12,12,15,15, 7, 8, 8, 9, 9,10,10,11,11,12,12,14,
-	15, 9, 9, 9,10,10,11,11,12,11,12,12,15,16, 9, 9,
-	 9,10,10,11,11,11,11,12,12,15,15,10,10,10,11,11,
-	12,11,12,12,13,13,16,16,10,10,10,11,11,12,12,12,
-	12,13,13,16,17,11,11,12,12,12,13,13,14,13,14,14,
-	18,17,11,11,11,12,12,12,12,13,14,14,14,18,18,14,
-	14,14,15,15,15,16,16,16,17,17, 0,19,14,14,14,15,
-	15,16,17,16,17,17,17,19, 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,
+	12,12,16,15, 7, 8, 8, 9, 9,10,10,11,11,12,12,15,
+	15, 9,10,10,10,10,11,11,12,12,12,12,15,15, 9,10,
+	 9,10,11,11,11,12,12,12,13,15,15,10,10,11,11,11,
+	12,12,13,12,13,13,16,15,10,11,11,11,11,12,12,13,
+	12,13,13,16,17,11,11,12,12,12,13,13,13,14,14,15,
+	17,17,11,11,12,12,12,13,13,13,14,14,14,16,18,14,
+	15,15,15,15,16,16,16,16,17,18, 0, 0,14,15,15,15,
+	15,17,16,17,18,17,17,18, 0,
 };
 
 static float _vq_quantthresh__44u0__p6_0[] = {
@@ -2754,14 +4095,14 @@
 };
 
 static long _vq_lengthlist__44u0__p7_0[] = {
-	 1, 5, 5,11,11, 9,11,11,11,11,11,11,11,11,11,11,
-	11,11,11,11,11,11,11,11,11, 8,11,11,11,11,11,11,
+	 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,
 	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,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, 8,11,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,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,
@@ -2769,7 +4110,6 @@
 	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,11,11,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,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,
@@ -2777,7 +4117,15 @@
 	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,11,11,11,11,11,11,
-	11,11,11,11,10,10,10,10,10,10,10,10,10,10,10,10,
+	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,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,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,11,11,
+	11,11,11,11,11,11,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,10,10,10,10,10,10,10,
 	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
@@ -2786,13 +4134,6 @@
 	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,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,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,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,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
 	10,
 };
 
@@ -2839,17 +4180,17 @@
 };
 
 static long _vq_lengthlist__44u0__p7_1[] = {
-	 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 4, 7, 7,
-	 8, 8, 8, 8, 9, 9,11,10,12,11, 4, 6, 7, 8, 8, 7,
-	 8, 9, 9,10,11,12,11, 7, 8, 8, 9, 9,10,10,11,11,
-	12,11,13,13, 7, 8, 8, 9,10,10,10,11,11,12,12,12,
-	13, 7, 8, 8,10,10,12,12,13,12,16,13,13,14, 7, 8,
-	 8,10,11,12,12,13,12,13,13,14,14, 8, 9,10,12,12,
-	14,13,16,15,16,16,16,15, 8,10,10,12,12,14,13,14,
-	15,16,16,15,16,10,11,12,14,14,14,14,16,13,16,15,
-	16,16,10,11,12,13,13,15,14,14,15,16,16,14,14,13,
-	14,13,15,16,16,16,15,15,16,16,16,16,11,15,14,16,
-	16,14,14,16,15,16,14,16,15,
+	 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,
+	12,12,15,12, 6, 8, 8, 9, 9, 9, 9,11,11,12,11,14,
+	12, 7, 8, 8,10,10,12,12,13,13,13,15,13,13, 7, 8,
+	 8,10,10,11,11,13,12,14,15,15,15, 9,10,10,11,12,
+	13,13,14,15,14,15,14,15, 8,10,10,12,12,14,14,15,
+	14,14,15,15,14,10,12,12,14,14,15,14,15,15,15,14,
+	15,15,10,12,12,13,14,15,14,15,15,14,15,15,15,12,
+	15,13,15,14,15,15,15,15,15,15,15,15,13,13,15,15,
+	15,15,15,15,15,15,15,15,15,
 };
 
 static float _vq_quantthresh__44u0__p7_1[] = {
@@ -2897,17 +4238,17 @@
 };
 
 static long _vq_lengthlist__44u0__p7_2[] = {
-	 2, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 5, 5, 6,
-	 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 5, 5, 5, 7, 7, 8,
-	 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 7, 8, 8, 8, 9, 9,
+	 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,
 	 9, 9, 9, 9, 6, 7, 7, 8, 7, 8, 8, 9, 9, 9, 9, 9,
-	 9, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 8, 8,
-	 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 9, 9, 9, 9, 8, 9,
-	 9, 9, 9, 9, 9, 8, 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,
-	 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, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 7, 8,
+	 8, 9, 8, 9, 8, 9, 9, 9, 9, 9, 9, 8, 9, 8, 9, 9,
+	 9, 9, 9, 9, 9, 9,10,10, 8, 8, 9, 9, 9, 9, 9, 9,
+	 9, 9,10, 9,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10, 9, 9, 9, 9, 9,
+	 9, 9, 9,10, 9, 9,10,10, 9,
 };
 
 static float _vq_quantthresh__44u0__p7_2[] = {
@@ -2939,10 +4280,10 @@
 };
 
 static long _huff_lengthlist__44u0__short[] = {
-	 6,10,11,12,13,12,12,12, 4, 6, 6, 9, 9,10,11,13,
-	 3, 4, 3, 7, 6, 8,10,15, 5, 7, 7, 9, 8, 9,11,16,
-	 6, 7, 5, 8, 5, 7,10,16, 7, 8, 7, 9, 6, 7,10,16,
-	10, 6, 3, 5, 4, 5, 7,16,13, 8, 5, 7, 6, 7,10,15,
+	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 = {
@@ -2957,10 +4298,10 @@
 };
 
 static long _huff_lengthlist__44u1__long[] = {
-	 4, 8,13,11,14,11,10,14, 6, 3, 5, 6, 8, 7, 9,14,
-	12, 4, 3, 6, 5, 7,10,18,11, 6, 6, 6, 6, 6, 8,16,
-	13, 7, 4, 6, 4, 6, 9,19,11, 6, 6, 5, 5, 5, 7,16,
-	10, 8, 9, 7, 9, 6, 4,12,11,16,18,19,18,10, 7,11,
+	 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 = {
@@ -2982,10 +4323,10 @@
 
 static long _vq_lengthlist__44u1__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,14, 8,11,11,
-	10,14,11,11,13,14, 4, 8, 8, 8,11,11, 8,11,11, 7,
-	11,11,11,14,13,10,12,13, 8,11,11,11,14,14,11,14,
+	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,
+	10,13,12,11,13,14, 4, 8, 8, 8,11,11, 8,11,12, 8,
+	11,11,11,13,13,10,12,13, 8,11,11,11,14,13,11,14,
 	13,
 };
 
@@ -3022,11 +4363,11 @@
 };
 
 static long _vq_lengthlist__44u1__p2_0[] = {
-	 2, 5, 5, 5, 6, 6, 5, 6, 6, 5, 6, 6, 7, 8, 8, 6,
-	 7, 8, 5, 6, 6, 6, 8, 7, 7, 8, 8, 5, 6, 6, 7, 8,
-	 8, 6, 8, 8, 7, 8, 8, 8, 9,10, 8, 9, 9, 6, 8, 8,
-	 7, 9, 8, 8, 9,10, 5, 6, 6, 6, 8, 8, 7, 8, 8, 6,
-	 8, 8, 8,10, 9, 7, 8, 9, 7, 8, 8, 8, 9, 9, 8,10,
+	 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,
+	 8,10, 8, 8,10,10, 5, 7, 7, 7, 8, 8, 7, 8, 8, 6,
+	 8, 8, 8,10,10, 8, 8,10, 6, 8, 8, 8,10,10, 8,10,
 	 9,
 };
 
@@ -3065,46 +4406,46 @@
 };
 
 static long _vq_lengthlist__44u1__p3_0[] = {
-	 2, 5, 4, 7, 7, 5, 7, 7, 9, 8, 5, 7, 7, 8, 9, 8,
-	 9, 9,11,11, 8, 9, 9,11,11, 5, 7, 7,10,10, 7, 9,
-	 9,11,10, 7, 9, 9,10,10, 9,11,10,13,12, 9,10,10,
-	12,13, 5, 7, 7,10, 9, 7, 9, 9,11,10, 7, 9, 9,10,
-	11, 9,10,10,12,12,10,10,11,12,13, 8,10,10,14,13,
-	 9,11,11,15,13, 9,11,11,15,13,12,14,12,16,14,12,
-	13,12,15,14, 8,10,10,13,14, 9,11,11,13,14,10,11,
-	11,13,15,12,12,13,14,15,12,13,14,14,16, 5, 7, 7,
-	10,10, 7, 9, 9,11,11, 7, 9, 9,11,12,10,11,11,14,
-	14,10,11,11,14,14, 7, 9, 9,12,12, 9,11,11,13,12,
-	 9,11,11,13,13,12,12,12,14,14,11,12,13,15,15, 7,
-	 9, 9,12,11, 9,11,10,12,12, 9,11,11,12,13,11,12,
-	11,14,14,11,12,12,15,16, 9,11,11,15,15,11,12,12,
-	16,15,10,12,12,16,15,14,15,15,17,16,13,14,14,17,
-	17, 9,11,11,14,15,10,12,11,15,15,10,12,12,15,17,
-	13,14,13,16,15,13,14,15,17,17, 5, 7, 7,10,10, 7,
-	 9, 9,12,11, 7, 9, 9,11,12,10,11,11,14,14,10,11,
-	11,13,14, 7, 9, 9,11,12, 9,11,11,13,13, 9,10,11,
-	12,12,11,12,12,15,15,11,12,12,13,14, 7,10, 9,12,
-	12, 9,11,11,13,13, 9,11,11,12,12,11,12,12,16,15,
-	11,12,12,14,14, 9,11,11,15,14,10,12,12,16,15,10,
-	11,12,15,15,13,14,14,17,18,13,13,14,15,16, 9,11,
-	11,15,16,10,12,12,15,15,11,12,12,14,17,13,14,14,
-	17,17,14,14,14,16,18, 7,10,10,14,15,10,12,12,16,
-	15,10,11,12,16,16,14,16,15,18,17,13,15,14,17,19,
-	 9,11,12,16,15,11,13,13,17,16,10,13,13,16,16,15,
-	16,16,17,19,13,15,15,17,17, 8,11,11,15,15,10,13,
-	11,16,16,10,13,13,16,17,14,16,15,18,19,13,15,15,
-	17,17,12,14,14,18,18,13,14,15,18,19,12,14,15,17,
-	18,16,18,18,19, 0,14,15,16,18,18,11,14,13,17,18,
-	12,16,14,19,19,12,15,14, 0,18,15,17,16,18,17,14,
-	17,16,18,18, 7,10,10,15,14,10,12,11,16,16,10,11,
-	12,16,16,13,15,14,19,18,14,15,16,18,18, 8,11,11,
-	15,15,10,13,12,17,16,10,12,13,16,17,14,14,15,19,
-	18,14,15,16,18, 0, 9,11,11,16,15,11,13,12,15,16,
-	11,13,13,16,16,14,15,14, 0,17,15,16,16,19,18,11,
-	14,14,18,17,12,14,15,17,17,12,13,15, 0,17,14,15,
-	16,18,17,16,17,18,17,19,11,14,13,17,19,12,15,14,
-	18,19,13,16,14, 0,19,14,17,15, 0,18,15,18,16, 0,
-	 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,
+	13,13, 5, 8, 8,10,10, 8,10,10,11,11, 8,10,10,11,
+	11,10,11,11,13,13,10,11,11,13,13, 9,11,11,15,14,
+	10,12,12,15,14,10,12,11,15,14,13,14,14,16,16,12,
+	14,13,17,15, 9,11,11,14,15,10,11,12,14,16,10,11,
+	12,14,16,12,13,14,16,16,13,13,15,15,18, 5, 8, 8,
+	11,11, 8,10,10,12,12, 8,10,10,12,13,11,12,12,14,
+	14,11,12,12,15,15, 8,10,10,13,13,10,12,12,13,13,
+	10,12,12,14,14,12,13,13,15,15,12,13,13,16,16, 7,
+	10,10,12,12,10,12,11,13,13,10,12,12,13,14,12,13,
+	12,15,14,12,13,13,16,16,10,12,12,17,16,12,13,13,
+	16,15,11,13,13,17,17,15,15,15,16,17,14,15,15,19,
+	19,10,12,12,15,16,11,13,12,15,18,11,13,13,16,16,
+	14,15,15,17,17,14,15,15,17,19, 5, 8, 8,11,11, 8,
+	10,10,12,12, 8,10,10,12,12,11,12,12,16,15,11,12,
+	12,14,15, 7,10,10,13,13,10,12,12,14,13,10,11,12,
+	13,13,12,13,13,16,16,12,12,13,15,15, 8,10,10,13,
+	13,10,12,12,14,14,10,12,12,13,13,12,13,13,16,16,
+	12,13,13,15,15,10,12,12,16,15,11,13,13,17,16,11,
+	12,13,16,15,13,15,15,19,17,14,15,14,17,16,10,12,
+	12,16,16,11,13,13,16,17,12,13,13,15,17,14,15,15,
+	17,19,14,15,15,17,17, 8,11,11,16,16,10,13,12,17,
+	17,10,12,13,16,16,15,17,16,20,19,14,15,17,18,19,
+	 9,12,12,16,17,11,13,14,17,18,11,13,13,19,18,16,
+	17,18,19,19,15,16,16,19,19, 9,12,12,16,17,11,14,
+	13,18,17,11,13,13,17,17,16,17,16,20,19,14,16,16,
+	18,18,12,15,15,19,17,14,15,16, 0,20,13,15,16,20,
+	17,18,16,20, 0, 0,15,16,19,20, 0,12,15,14,18,19,
+	13,16,15,20,19,13,16,15,20,18,17,18,17, 0,20,16,
+	17,16, 0, 0, 8,11,11,16,15,10,12,12,17,17,10,13,
+	13,17,16,14,16,15,18,20,15,16,16,19,19, 9,12,12,
+	16,16,11,13,13,17,16,11,13,14,17,18,15,15,16,20,
+	20,16,16,17,19,19, 9,13,12,16,17,11,14,13,17,17,
+	11,14,14,18,17,14,16,15,18,19,16,17,18,18,19,12,
+	14,15,19,18,13,15,16,18, 0,13,14,15, 0, 0,16,16,
+	17,20, 0,17,17,20,20, 0,12,15,15,19,20,13,15,15,
+	 0, 0,14,16,15, 0, 0,15,18,16, 0, 0,17,18,16, 0,
+	19,
 };
 
 static float _vq_quantthresh__44u1__p3_0[] = {
@@ -3142,45 +4483,45 @@
 };
 
 static long _vq_lengthlist__44u1__p4_0[] = {
-	 4, 5, 5, 8, 8, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 9,
-	 9, 9,11,11, 9, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 8,
-	 8,10,10, 6, 7, 8, 9,10,10,10,10,11,12, 9, 9,10,
-	11,12, 6, 7, 7, 9, 9, 6, 8, 7,10, 9, 7, 8, 8,10,
-	10, 9,10, 9,12,11,10,10,10,12,11, 9,10,10,12,12,
-	10,10,10,13,12, 9,10,10,12,12,12,12,12,14,14,11,
-	12,12,13,14, 9,10,10,12,12, 9,10,10,13,12,10,10,
-	10,12,13,12,12,12,14,13,12,12,12,14,14, 5, 7, 7,
-	 9, 9, 7, 8, 7,10,10, 7, 7, 8,10,10,10,10,10,12,
-	12,10,10,10,12,12, 7, 8, 8,10,10, 8, 8, 9,10,11,
-	 8, 8, 8,11,11,10,10,11,11,13,10,11,11,12,13, 6,
-	 7, 7,10,10, 7, 8, 8,11,10, 8, 8, 9,11,11,10,11,
-	10,13,11,10,11,11,13,12,10,11,10,13,12,10,10,11,
-	13,13,10,11,11,13,13,12,11,13,12,14,12,13,13,15,
-	15, 9,10,10,12,13,10,11,10,13,13,10,11,11,13,14,
-	12,13,11,14,12,12,13,13,14,15, 5, 7, 7, 9,10, 7,
-	 8, 7,10,10, 7, 7, 8,10,10,10,10,10,12,12,10,10,
-	10,12,12, 6, 7, 7,10,10, 8, 9, 8,11,11, 7, 8, 8,
-	10,11,10,11,11,12,13,10,10,11,11,13, 7, 8, 8,10,
-	10, 8, 8, 8,11,11, 8, 9, 8,11,10,10,11,10,13,12,
-	10,11,10,13,12, 9,10,10,13,12,10,11,11,13,13, 9,
-	10,10,12,13,13,13,13,15,14,12,11,13,12,15,10,10,
-	11,12,13,10,11,11,13,13,10,11,10,13,13,12,13,13,
-	15,15,12,13,11,14,12, 8,10, 9,12,12, 9,10,10,13,
-	13, 9,10,10,13,13,13,13,13,14,15,12,12,12,14,14,
-	 9,10,10,13,12,10,11,11,13,13,10,11,11,13,12,13,
-	13,14,14,16,12,13,13,15,14, 9,10,10,13,13,10,11,
-	10,13,13,10,11,11,13,13,13,14,12,15,14,12,13,13,
-	14,15,12,12,12,14,14,11,12,12,14,15,12,13,13,15,
-	14,14,12,15,12,16,14,14,15,17,16,11,12,12,14,14,
-	11,12,11,15,14,12,13,13,15,15,13,14,12,16,13,14,
-	14,15,17,16, 8,10,10,12,12, 9,10,10,13,12,10,10,
-	10,13,13,12,13,12,14,14,12,13,13,15,14, 9,10,10,
-	13,13,10,11,11,13,13,10,10,11,12,13,13,13,13,15,
-	15,12,12,13,14,15, 9,10,10,12,13,10,11,11,12,13,
-	10,11,10,13,13,12,13,13,14,15,13,14,13,15,14,11,
-	12,12,15,14,12,13,13,15,14,11,12,12,14,15,14,14,
-	14,17,15,13,12,15,13,16,12,12,12,14,15,12,13,13,
-	14,15,11,12,12,15,14,14,15,14,16,17,13,15,12,16,
+	 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,
+	12,13, 5, 7, 7,10,10, 6, 8, 7,10,10, 7, 8, 7,10,
+	10, 9,10,10,12,12,10,10,10,13,11, 9,10,10,13,13,
+	10,11,10,13,13,10,10,10,13,13,12,12,13,14,14,12,
+	12,13,14,14, 9,10,10,13,13,10,10,10,13,13,10,10,
+	10,13,13,12,13,12,15,14,12,13,12,15,15, 5, 7, 6,
+	10,10, 7, 8, 8,10,10, 7, 8, 8,10,10,10,11,10,13,
+	13,10,10,10,12,12, 7, 8, 8,11,10, 8, 8, 9,10,11,
+	 8, 9, 9,11,11,11,10,11,11,14,11,11,11,13,13, 6,
+	 8, 8,10,10, 7, 9, 8,11,10, 8, 9, 9,11,11,10,11,
+	10,14,11,10,11,11,13,13,10,11,11,14,13,10,10,11,
+	14,13,10,11,11,14,14,12,11,13,12,16,13,14,14,15,
+	15,10,10,11,13,14,10,11,10,14,13,10,11,11,14,14,
+	12,13,12,15,13,13,13,14,15,16, 5, 7, 7,10,10, 7,
+	 8, 8,10,10, 7, 8, 8,10,10,10,10,10,13,13,10,10,
+	11,12,13, 6, 8, 8,11,10, 8, 9, 9,11,11, 7, 8, 9,
+	10,11,10,11,11,13,13,10,10,11,11,13, 6, 8, 8,10,
+	11, 8, 9, 9,11,11, 8, 9, 8,12,10,10,11,11,13,13,
+	10,11,10,14,11,10,10,10,14,13,10,11,11,14,13,10,
+	10,11,13,13,12,14,14,16,16,12,12,13,13,15,10,11,
+	11,13,14,10,11,11,14,15,10,11,10,13,13,13,14,13,
+	16,16,12,13,11,15,12, 9,10,10,13,13,10,11,11,14,
+	13,10,10,11,13,14,13,14,13,16,16,13,13,13,15,16,
+	 9,10,10,13,13,10,10,11,13,14,10,11,11,15,13,13,
+	13,14,14,18,13,13,14,16,15, 9,10,10,13,14,10,11,
+	10,14,13,10,11,11,13,14,13,14,13,16,15,13,13,14,
+	15,16,12,13,12,16,14,11,11,13,15,15,13,14,13,16,
+	15,15,12,16,12,17,14,15,15,17,17,12,13,13,14,16,
+	11,13,11,16,15,12,13,14,15,16,14,15,13, 0,14,14,
+	16,16, 0, 0, 9,10,10,13,13,10,11,10,14,14,10,11,
+	11,13,13,12,13,13,14,16,13,14,14,16,16, 9,10,10,
+	14,14,11,11,11,14,13,10,10,11,14,14,13,13,13,16,
+	16,13,13,14,14,17, 9,10,10,13,14,10,11,11,13,15,
+	10,11,10,14,14,13,13,13,14,17,13,14,13,17,14,12,
+	13,13,16,14,13,14,13,16,15,12,12,13,15,16,15,15,
+	16,18,16,15,13,15,14, 0,12,12,13,14,16,13,13,14,
+	15,16,11,12,11,16,14,15,16,16,17,17,14,15,12,17,
 	12,
 };
 
@@ -3223,12 +4564,12 @@
 };
 
 static long _vq_lengthlist__44u1__p5_0[] = {
-	 1, 4, 4, 7, 7, 8, 8,10,10, 4, 6, 5, 8, 8, 8, 8,
-	10,10, 4, 5, 6, 8, 8, 8, 8,10,10, 7, 8, 7, 9, 9,
-	 9, 9,11,11, 7, 8, 8, 9, 9, 9, 9,11,11, 8, 8, 8,
-	 9, 9,10,11,12,12, 8, 8, 9, 9, 9,10,10,12,12,10,
-	10,10,11,11,12,12,13,13,10,10,10,11,11,12,12,13,
-	13,
+	 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,
+	 9, 9,10,10,11,11, 7, 8, 8, 9, 9,10,10,11,11, 9,
+	 9, 9,10,10,11,11,12,12, 9, 9, 9,10,11,11,11,12,
+	12,
 };
 
 static float _vq_quantthresh__44u1__p5_0[] = {
@@ -3275,17 +4616,17 @@
 };
 
 static long _vq_lengthlist__44u1__p6_0[] = {
-	 1, 4, 4, 7, 7, 9, 8,10, 9,11,10,14,13, 4, 5, 5,
-	 8, 8, 9, 9,11,11,11,11,14,14, 4, 5, 5, 8, 8, 9,
-	 9,10,11,11,11,14,14, 7, 8, 8, 9, 9,11,10,11,11,
-	12,12,16,15, 7, 8, 8, 9, 9,10,11,11,11,12,12,15,
-	15, 9,10,10,11,11,11,11,12,12,13,13,16,16, 9,10,
-	10,11,11,11,11,12,12,12,13,16,15,10,11,11,11,11,
-	12,12,13,13,13,13,16,17,10,11,11,11,11,12,12,12,
-	12,13,14,16,16,11,12,12,12,12,13,13,14,14,14,15,
-	18,17,11,12,12,12,12,13,13,13,14,14,15,18,18,15,
-	14,15,15,15,16,16,17,17,18,17,20,20,14,15,15,15,
-	15,16,17,17,16,18, 0,19, 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,
+	12,12,16,15, 7, 8, 8, 9, 9,10,10,11,11,12,12,15,
+	15, 9,10,10,10,10,11,11,12,12,12,12,15,15, 9,10,
+	 9,10,11,11,11,12,12,12,13,15,15,10,10,11,11,11,
+	12,12,13,12,13,13,16,15,10,11,11,11,11,12,12,13,
+	12,13,13,16,17,11,11,12,12,12,13,13,13,14,14,15,
+	17,17,11,11,12,12,12,13,13,13,14,14,14,16,18,14,
+	15,15,15,15,16,16,16,16,17,18, 0, 0,14,15,15,15,
+	15,17,16,17,18,17,17,18, 0,
 };
 
 static float _vq_quantthresh__44u1__p6_0[] = {
@@ -3325,8 +4666,8 @@
 };
 
 static long _vq_lengthlist__44u1__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,
+	 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[] = {
@@ -3366,9 +4707,9 @@
 };
 
 static long _vq_lengthlist__44u1__p7_0[] = {
-	 1, 3, 3, 9, 9, 9, 9, 5, 7, 7, 9, 9, 9, 9, 5, 6,
-	 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, 8, 8, 8, 8, 8,
+	 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,
 };
 
@@ -3415,17 +4756,17 @@
 };
 
 static long _vq_lengthlist__44u1__p7_1[] = {
-	 1, 4, 4, 6, 6, 6, 7, 8, 8, 9, 9,11,10, 4, 7, 7,
-	 8, 8, 8, 8, 9, 9,11,10,12,11, 4, 6, 7, 8, 8, 8,
-	 8,10,10,10,11,12,11, 7, 8, 8, 9, 9,10,10,11,11,
-	12,12,13,13, 7, 8, 8, 9, 9,10,10,11,11,12,12,13,
-	13, 7, 8, 8,10,10,13,12,13,13,16,13,13,14, 7, 8,
-	 8,10,11,12,12,13,13,14,14,14,14, 8,10,10,13,12,
-	13,13,16,14,15,15,16,15, 8,10,11,12,13,13,13,13,
-	16,15,16,16,14,10,12,13,14,15,15,14,14,14,15,16,
-	15,16,10,11,12,13,13,15,15,16,16,16,14,16,16,12,
-	13,13,15,14,15,14,15,15,14,15,16,16,11,14,14,15,
-	14,16,15,16,14,15,16,14,15,
+	 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,
+	12,12,15,12, 6, 8, 8, 9, 9, 9, 9,11,11,12,11,14,
+	12, 7, 8, 8,10,10,12,12,13,13,13,15,13,13, 7, 8,
+	 8,10,10,11,11,13,12,14,15,15,15, 9,10,10,11,12,
+	13,13,14,15,14,15,14,15, 8,10,10,12,12,14,14,15,
+	14,14,15,15,14,10,12,12,14,14,15,14,15,15,15,14,
+	15,15,10,12,12,13,14,15,14,15,15,14,15,15,15,12,
+	15,13,15,14,15,15,15,15,15,15,15,15,13,13,15,15,
+	15,15,15,15,15,15,15,15,15,
 };
 
 static float _vq_quantthresh__44u1__p7_1[] = {
@@ -3473,17 +4814,17 @@
 };
 
 static long _vq_lengthlist__44u1__p7_2[] = {
-	 2, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 5, 6, 6,
-	 6, 7, 8, 7, 8, 8, 8, 9, 9, 9, 5, 6, 6, 7, 7, 8,
-	 8, 8, 8, 8, 8, 8, 9, 6, 7, 7, 7, 7, 8, 8, 8, 9,
-	 9, 9, 9, 9, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9,
-	 9, 7, 8, 8, 8, 8, 8, 8, 9, 8, 9, 9, 9, 9, 7, 8,
-	 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 8, 8, 9, 9, 9,
-	 8, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 9, 9, 9, 8, 9,
-	 9, 9, 9, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8,
-	 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,
+	 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,
+	 9, 9, 9, 9, 6, 7, 7, 8, 7, 8, 8, 9, 9, 9, 9, 9,
+	 9, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 7, 8,
+	 8, 9, 8, 9, 8, 9, 9, 9, 9, 9, 9, 8, 9, 8, 9, 9,
+	 9, 9, 9, 9, 9, 9,10,10, 8, 8, 9, 9, 9, 9, 9, 9,
+	 9, 9,10, 9,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10, 9, 9, 9, 9, 9,
+	 9, 9, 9,10, 9, 9,10,10, 9,
 };
 
 static float _vq_quantthresh__44u1__p7_2[] = {
@@ -3515,10 +4856,10 @@
 };
 
 static long _huff_lengthlist__44u1__short[] = {
-	 7,12,12,14,16,13,12,15, 6, 9,10,13,11,11,12,12,
-	 4, 5, 5, 8, 5, 7, 9,12, 6, 7, 8,10, 8, 9,11,16,
-	 5, 5, 4, 7, 4, 5, 7,15, 6, 5, 5, 8, 5, 5, 6,15,
-	 8, 7, 4, 7, 3, 4, 5,16,15,11, 6, 8, 5, 6, 8,16,
+	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 = {
@@ -3533,10 +4874,10 @@
 };
 
 static long _huff_lengthlist__44u2__long[] = {
-	 8,14,15,15,17,15,12,13,13, 3, 4, 7, 8, 7, 8,11,
-	20, 4, 3, 6, 5, 7, 9,16,15, 6, 5, 6, 6, 6, 8,15,
-	20, 7, 4, 6, 4, 5, 8,18,16, 7, 6, 6, 5, 5, 6,14,
-	11, 7, 8, 7, 7, 5, 4,10,10,13,15,16,19,10, 6,10,
+	 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 = {
@@ -3559,9 +4900,9 @@
 static 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, 8,11,11,
-	10,13,12,11,13,14, 4, 8, 8, 8,11,11, 8,11,11, 7,
-	11,11,11,14,13,10,12,13, 8,11,11,11,14,13,11,13,
+	11, 8,11,11, 8,11,11,11,13,14,11,13,13, 7,11,11,
+	10,13,12,11,14,14, 4, 8, 8, 8,11,11, 8,11,11, 8,
+	11,11,11,14,13,10,12,13, 8,11,11,11,13,13,11,13,
 	13,
 };
 
@@ -3598,11 +4939,11 @@
 };
 
 static long _vq_lengthlist__44u2__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, 7, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 8,
-	 7, 9, 8, 8, 9, 9, 5, 6, 6, 6, 8, 8, 6, 7, 8, 6,
-	 8, 8, 8, 9, 9, 7, 8, 9, 6, 8, 8, 8, 9, 9, 8, 9,
+	 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,
+	 7,10, 8, 8,10,10, 5, 6, 6, 6, 8, 8, 7, 8, 8, 6,
+	 8, 8, 8,10,10, 8, 8,10, 6, 8, 8, 8,10,10, 8,10,
 	 9,
 };
 
@@ -3641,45 +4982,45 @@
 };
 
 static long _vq_lengthlist__44u2__p3_0[] = {
-	 2, 4, 4, 8, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 8,
-	 9, 9,12,12, 8, 9,10,11,12, 5, 7, 7,10,10, 7, 9,
-	 9,11,10, 7, 8, 9,10,11,10,11,10,14,13, 9,10,10,
-	12,13, 5, 7, 7,10,10, 7, 9, 8,11,10, 7, 9, 9,11,
-	11, 9,10,10,13,12,10,10,11,13,13, 8,10,10,15,13,
-	10,11,11,15,13, 9,11,11,14,13,13,14,13,17,15,12,
-	13,13,15,15, 8,10,10,13,14, 9,11,11,13,14,10,11,
-	12,13,16,12,13,13,15,15,13,13,14,15,17, 5, 7, 7,
+	 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,
+	12,13, 5, 7, 7,10,10, 7, 9, 9,11,10, 7, 9, 9,11,
+	11, 9,11,10,13,13,10,11,11,13,13, 8,10,10,14,13,
+	10,11,11,15,14, 9,11,11,15,14,13,14,13,16,14,12,
+	13,13,15,16, 8,10,10,13,14, 9,11,11,14,15,10,11,
+	11,14,15,12,13,13,15,15,12,13,14,15,16, 5, 7, 7,
 	10,10, 7, 9, 9,11,11, 7, 9, 9,11,12,10,11,11,14,
-	14,10,11,12,14,14, 7, 9, 9,12,12, 9,11,11,13,12,
-	 9,11,11,13,13,12,13,12,14,14,11,12,12,15,14, 7,
-	 9, 9,12,11, 9,11,10,13,11, 9,11,11,12,13,11,12,
-	11,14,13,11,12,12,15,15,10,12,12,16,15,11,13,13,
-	16,16,10,12,12,16,16,14,14,14,17,16,13,14,14,17,
-	18, 9,11,11,14,15,10,12,11,15,15,10,12,12,15,17,
-	13,15,13,17,16,13,14,15,17,19, 5, 7, 7,10,10, 7,
-	 9, 9,12,11, 7, 9, 9,11,11,10,11,11,15,14,10,11,
-	12,13,14, 7, 9, 9,12,12, 9,11,11,13,12, 8,10,11,
-	12,12,11,12,12,15,15,11,11,12,14,14, 7, 9, 9,12,
-	12, 9,11,11,13,13, 9,11,11,12,12,11,12,12,16,15,
-	11,12,13,14,14, 9,11,11,16,15,10,12,12,16,15,10,
-	11,12,14,14,13,14,15,18,17,13,13,14,16,16,10,12,
-	12,15,15,10,13,12,15,17,11,13,12,15,16,13,15,14,
-	17,18,14,15,14,15,17, 8,10,10,15,15,10,12,12,17,
-	15,10,12,12,17,16,14,16,15,17,17,13,14,15,16,16,
-	 9,11,12,16,16,11,13,13,16,17,11,13,13,16,16,15,
-	16,16, 0, 0,14,15,15,19,17, 9,11,11,17,16,10,13,
-	11,16,16,11,12,12,16,17,15,16,15,19,19,14,16,15,
-	 0,18,12,14,15, 0, 0,14,15,16,18,18,13,14,15,17,
-	17,16,18,18, 0, 0,15,16,16,19,18,11,14,13, 0,18,
-	13,16,13,17,17,13,15,14, 0, 0,17,17,15,19,18,14,
-	16,16,19, 0, 8,10,10,15,15,10,12,11,16,16,10,11,
-	12,17,16,14,15,15,17,18,15,15,16, 0, 0, 9,11,11,
-	15,15,11,13,12,16,18,10,12,13,17,17,13,15,15,17,
-	19,15,15,16,19,18, 9,12,11, 0,16,11,13,12,16,16,
-	11,13,13,16,17,14,16,15,19,19,15,15,16,18,18,12,
-	14,14,17,18,13,14,15,18, 0,13,14,15,18,19,15,17,
-	16, 0,19,16,15,18,17,19,12,14,14,19,19,13,15,15,
-	 0,18,13,17,15,18,18,15,16,17, 0,19,17,19,18,18,
+	13,10,11,11,14,14, 7, 9, 9,12,12, 9,11,11,13,13,
+	 9,11,11,13,13,12,13,12,14,14,11,12,13,15,15, 7,
+	 9, 9,12,12, 8,11,10,13,12, 9,11,11,13,13,11,13,
+	12,15,13,11,13,13,15,16, 9,12,11,15,15,11,12,12,
+	16,15,11,12,13,16,16,13,14,15,16,15,13,15,15,17,
+	17, 9,11,11,14,15,10,12,12,15,15,11,13,12,15,16,
+	13,15,14,16,16,13,15,15,17,19, 5, 7, 7,10,10, 7,
+	 9, 9,12,11, 7, 9, 9,11,11,10,11,11,14,14,10,11,
+	11,13,14, 7, 9, 9,12,12, 9,11,11,13,13, 9,10,11,
+	12,13,11,13,12,16,15,11,12,12,14,15, 7, 9, 9,12,
+	12, 9,11,11,13,13, 9,11,11,13,12,11,13,12,15,16,
+	12,13,13,15,14, 9,11,11,15,14,11,13,12,16,15,10,
+	11,12,15,15,13,14,14,18,17,13,14,14,15,17,10,11,
+	11,14,15,11,13,12,15,17,11,13,12,15,16,13,15,14,
+	18,17,14,15,15,16,18, 7,10,10,14,14,10,12,12,15,
+	15,10,12,12,15,15,14,15,15,18,17,13,15,15,16,16,
+	 9,11,11,16,15,11,13,13,16,18,11,13,13,16,16,15,
+	16,16, 0, 0,14,15,16,18,17, 9,11,11,15,15,10,13,
+	12,17,16,11,12,13,16,17,14,15,16,19,19,14,15,15,
+	 0,20,12,14,14, 0, 0,13,14,16,19,18,13,15,16,20,
+	17,16,18, 0, 0, 0,15,16,17,18,19,11,14,14, 0,19,
+	12,15,14,17,17,13,15,15, 0, 0,16,17,15,20,19,15,
+	17,16,19, 0, 8,10,10,14,15,10,12,11,15,15,10,11,
+	12,16,15,13,14,14,19,17,14,15,15, 0, 0, 9,11,11,
+	16,15,11,13,13,17,16,10,12,13,16,17,14,15,15,18,
+	18,14,15,16,20,19, 9,12,12, 0,15,11,13,13,16,17,
+	11,13,13,19,17,14,16,16,18,17,15,16,16,17,19,11,
+	14,14,18,18,13,14,15, 0, 0,12,14,15,19,18,15,16,
+	19, 0,19,15,16,19,19,17,12,14,14,16,19,13,15,15,
+	 0,17,13,15,14,18,18,15,16,15, 0,18,16,17,17, 0,
 	 0,
 };
 
@@ -3718,46 +5059,46 @@
 };
 
 static long _vq_lengthlist__44u2__p4_0[] = {
-	 4, 5, 5, 9, 9, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 9,
-	10, 9,12,11, 9, 9,10,11,12, 6, 7, 7,10,10, 7, 8,
-	 7,10,10, 7, 7, 8,10,10,10,10,10,12,12, 9,10,10,
-	11,12, 6, 7, 7,10,10, 7, 8, 7,10,10, 7, 7, 7,10,
-	10, 9,10,10,12,11,10,10,10,12,12, 9,10,10,13,12,
-	10,10,10,13,13,10,10,10,13,12,12,12,12,14,14,12,
-	12,12,14,14, 9,10,10,12,13, 9,10,10,13,13,10,10,
-	10,13,13,12,12,12,15,14,12,13,12,14,14, 5, 7, 7,
-	10,10, 7, 8, 7,10,10, 7, 7, 8,10,10,10,10,10,12,
-	12,10,10,10,12,12, 7, 8, 8,10,10, 8, 8, 8,10,11,
-	 8, 8, 8,11,10,10,10,11,11,13,10,10,11,12,13, 6,
-	 7, 7,10,10, 7, 8, 7,11,10, 8, 8, 8,10,11,10,11,
-	10,13,11,10,10,10,13,12,10,11,10,13,13,10,10,10,
-	12,13,10,11,11,13,13,12,11,13,11,14,12,13,13,14,
-	14, 9,10,10,12,13,10,10,10,13,12,10,10,11,13,13,
-	12,13,11,14,12,13,13,13,15,14, 5, 7, 7,10,10, 7,
-	 7, 7,10,10, 7, 7, 8,10,10,10,10,10,12,12,10,10,
-	10,12,13, 6, 7, 7,10,10, 8, 8, 8,11,10, 7, 7, 8,
-	10,11,10,10,10,12,12,10,10,11,11,13, 7, 8, 8,10,
-	10, 7, 8, 8,10,11, 8, 8, 8,11,10,10,11,10,13,12,
-	10,11,10,13,11, 9,10,10,13,13,10,11,11,13,13,10,
-	10,10,12,13,13,13,13,14,14,12,11,13,12,14,10,10,
-	11,13,13,10,11,11,13,13,10,10,10,13,12,12,13,13,
-	14,14,12,13,11,15,12, 9,10,10,13,13,10,10,10,13,
-	13,10,10,10,13,13,13,13,13,15,15,12,13,13,14,14,
-	 9,10,10,13,13,10,10,11,13,13,10,11,10,13,12,13,
-	12,13,14,15,13,13,13,15,14, 9,10,10,13,13,10,10,
-	10,13,12,10,10,11,12,13,13,13,12,15,14,13,13,13,
-	14,14,12,13,12,15,14,12,11,12,14,14,12,13,12,15,
-	14,14,12,15,12,16,14,14,15,16,16,12,12,12,14,15,
-	11,12,11,15,14,12,13,13,14,15,14,14,12,16,13,14,
-	14,15,16,16, 9,10,10,13,13,10,10,10,13,13,10,10,
-	10,13,13,12,13,12,14,14,13,13,13,15,15, 9,10,10,
-	13,13,10,11,10,13,12,10,10,10,12,13,13,13,13,14,
-	14,12,12,13,14,15, 9,10,10,13,13,10,10,11,12,13,
-	10,11,10,13,13,13,13,13,14,15,13,13,13,15,14,12,
-	12,12,15,14,12,13,12,15,14,11,11,12,14,15,14,14,
-	14,17,16,14,12,14,13,17,12,12,13,14,16,13,13,13,
-	13,15,12,12,11,14,14,14,15,14,16,16,14,14,12,16,
-	12,
+	 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,
+	11,12, 5, 7, 7, 9, 9, 6, 8, 7,10,10, 7, 8, 8,10,
+	10, 9,10,10,12,11, 9,10,10,12,11, 9,10,10,12,12,
+	10,10,10,13,12, 9,10,10,12,13,12,12,12,14,14,11,
+	12,12,13,14, 9,10,10,12,12, 9,10,10,12,13,10,10,
+	10,12,13,11,12,12,14,13,12,12,12,14,13, 5, 7, 7,
+	10, 9, 7, 8, 8,10,10, 7, 8, 8,10,10,10,10,10,12,
+	12,10,10,10,12,12, 7, 8, 8,11,10, 8, 8, 9,11,11,
+	 8, 9, 9,11,11,10,11,11,12,13,10,11,11,13,13, 6,
+	 8, 8,10,10, 7, 9, 8,11,10, 8, 9, 9,11,11,10,11,
+	10,13,11,10,11,11,13,13, 9,10,10,13,13,10,11,11,
+	13,13,10,11,11,14,13,12,11,13,12,15,12,13,13,15,
+	15, 9,10,10,12,13,10,11,10,13,13,10,11,11,13,13,
+	12,13,11,15,13,12,13,13,15,15, 5, 7, 7, 9,10, 7,
+	 8, 8,10,10, 7, 8, 8,10,10,10,10,10,12,12,10,10,
+	11,12,12, 6, 8, 8,10,10, 8, 9, 9,11,11, 7, 8, 9,
+	10,11,10,11,11,13,13,10,10,11,11,13, 7, 8, 8,10,
+	11, 8, 9, 9,11,11, 8, 9, 8,11,11,10,11,11,13,13,
+	10,11,11,13,12, 9,10,10,13,12,10,11,11,14,13,10,
+	10,11,13,13,12,13,13,15,15,12,11,13,12,14, 9,10,
+	10,12,13,10,11,11,13,14,10,11,11,13,13,12,13,13,
+	15,15,12,13,12,15,12, 8, 9, 9,12,12, 9,11,10,13,
+	13, 9,10,10,13,13,12,13,13,15,15,12,12,12,14,14,
+	 9,10,10,13,13,10,11,11,13,14,10,11,11,14,12,13,
+	13,14,14,16,12,13,13,15,14, 9,10,10,13,13,10,11,
+	10,14,13,10,11,11,13,14,12,14,13,16,14,13,13,13,
+	14,15,11,13,12,15,14,11,12,13,14,15,12,13,13,16,
+	15,14,12,15,12,16,14,15,15,17,16,11,12,12,14,15,
+	11,13,11,15,14,12,13,13,15,16,13,15,12,17,13,14,
+	15,15,16,16, 8, 9, 9,12,12, 9,10,10,13,13, 9,10,
+	10,13,13,12,13,12,14,14,12,13,13,15,15, 9,10,10,
+	13,13,10,11,11,14,13,10,10,11,13,14,12,13,13,15,
+	14,12,12,14,14,16, 9,10,10,13,13,10,11,11,13,14,
+	10,11,11,14,13,13,13,13,15,15,13,14,13,16,14,11,
+	12,12,14,14,12,13,13,16,15,11,12,13,14,15,14,15,
+	15,16,16,14,13,15,13,17,11,12,12,14,15,12,13,13,
+	15,16,11,13,12,15,15,14,15,14,16,16,14,15,12,17,
+	13,
 };
 
 static float _vq_quantthresh__44u2__p4_0[] = {
@@ -3799,12 +5140,12 @@
 };
 
 static long _vq_lengthlist__44u2__p5_0[] = {
-	 2, 4, 4, 6, 6, 7, 7, 9, 9, 4, 5, 4, 7, 7, 8, 7,
-	 9, 9, 4, 4, 4, 7, 7, 7, 8, 9, 9, 6, 7, 7, 8, 8,
-	 8, 9,10,10, 6, 7, 7, 8, 8, 9, 8,10,10, 7, 8, 7,
-	 8, 9, 9,10,11,11, 7, 7, 8, 9, 9,10,10,11,11, 9,
-	 9, 9,10,10,11,11,12,12, 9, 9, 9,10,10,11,11,12,
-	12,
+	 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,
+	 9, 9,10,11,12,12, 8, 8, 8, 9, 9,10,10,12,12,10,
+	10,10,11,11,12,12,13,13,10,10,10,11,11,12,12,13,
+	13,
 };
 
 static float _vq_quantthresh__44u2__p5_0[] = {
@@ -3851,17 +5192,17 @@
 };
 
 static long _vq_lengthlist__44u2__p6_0[] = {
-	 1, 4, 4, 6, 6, 8, 8, 9,10,11,11,14,14, 4, 6, 5,
-	 8, 8, 9, 9,11,11,11,11,14,14, 4, 5, 5, 8, 8, 9,
-	 9,10,11,11,12,14,14, 7, 8, 8, 9, 9,11,10,11,11,
-	12,12,15,15, 7, 8, 8, 9, 9,11,11,11,11,12,12,15,
-	14, 9,10,10,11,11,11,11,12,12,13,12,16,16, 9,10,
-	10,11,11,11,11,12,12,13,13,15,16,10,11,11,11,11,
-	12,12,13,13,13,13,17,16,10,11,11,12,12,12,12,12,
-	13,14,14,16,16,11,12,12,12,12,13,13,14,14,14,14,
-	17,17,11,12,12,12,12,13,13,14,14,15,14,18,17,15,
-	14,15,15,15,16,16,17,18,19,17,19, 0,15,15,15,15,
-	15,16,17,16,16,18,17, 0, 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,
+	12,12,15,15, 6, 8, 8, 9, 9,11,11,11,12,12,12,15,
+	15, 8,10,10,11,11,11,11,12,12,13,13,15,16, 8,10,
+	10,11,11,11,11,12,12,13,13,16,16,10,11,11,12,12,
+	12,12,13,13,13,13,17,16,10,11,11,12,12,12,12,13,
+	13,13,14,16,17,11,12,12,13,13,13,13,14,14,15,14,
+	18,17,11,12,12,13,13,13,13,14,14,14,15,19,18,14,
+	15,15,15,15,16,16,18,19,18,18, 0, 0,14,15,15,16,
+	15,17,17,16,18,17,18, 0, 0,
 };
 
 static float _vq_quantthresh__44u2__p6_0[] = {
@@ -3901,8 +5242,8 @@
 };
 
 static long _vq_lengthlist__44u2__p6_1[] = {
-	 2, 4, 4, 5, 5, 4, 5, 5, 6, 5, 4, 5, 5, 5, 5, 5,
-	 6, 6, 6, 6, 5, 5, 6, 6, 6,
+	 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[] = {
@@ -3944,12 +5285,12 @@
 };
 
 static long _vq_lengthlist__44u2__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,
-	 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,
+	 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,
+	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,
 };
 
 static float _vq_quantthresh__44u2__p7_0[] = {
@@ -3996,17 +5337,17 @@
 };
 
 static long _vq_lengthlist__44u2__p7_1[] = {
-	 1, 4, 4, 6, 6, 7, 7, 8, 7, 9, 9,10,10, 4, 7, 6,
-	 8, 8, 8, 8,10, 9,11,10,12,12, 4, 6, 7, 8, 8, 8,
-	 8,10,10,11,11,12,12, 7, 8, 8,10, 9,10,10,12,11,
-	13,12,13,13, 7, 8, 8, 9, 9,10,10,11,11,13,13,14,
-	15, 7, 8, 9,10,10,12,11,14,13,13,14,14,15, 7, 8,
-	 9,10,10,11,12,13,13,15,14,14,15, 8,10,10,12,11,
-	13,13,15,15,15,17,15,15, 8,10,10,11,12,14,13,14,
-	15,17,15,15,15,10,11,11,14,13,14,14,15,15,17,17,
-	16,17,10,11,12,13,13,14,14,14,15,16,15,15,17,11,
-	12,13,14,13,16,16,16,14,17,16,17,17,11,12,13,15,
-	15,15,15,16,15,15,15,15,17,
+	 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,
+	12,12,12,12, 7, 8, 8,10,10,10,10,11,11,12,12,13,
+	13, 7, 9, 9,11,10,12,12,13,13,14,13,14,14, 7, 9,
+	 9,10,11,11,12,13,13,13,13,16,14, 9,10,10,12,12,
+	13,13,14,14,15,16,15,16, 9,10,10,12,12,12,13,14,
+	14,14,15,16,15,10,12,12,13,13,15,13,16,16,15,17,
+	17,17,10,11,11,12,14,14,14,15,15,17,17,15,17,11,
+	12,12,14,14,14,15,15,15,17,16,17,17,10,12,12,13,
+	14,14,14,17,15,17,17,17,17,
 };
 
 static float _vq_quantthresh__44u2__p7_1[] = {
@@ -4054,16 +5395,16 @@
 };
 
 static long _vq_lengthlist__44u2__p7_2[] = {
-	 2, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 5, 6, 6,
-	 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 5, 6, 6, 7, 7, 8,
-	 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7, 7, 8, 8, 8, 8,
-	 9, 9, 9, 9, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9,
-	 9, 7, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 7, 8,
-	 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 8, 8, 8, 9, 8,
+	 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,
+	 9, 9, 9, 9, 6, 7, 7, 8, 7, 8, 8, 9, 9, 9, 9, 9,
+	 9, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 7, 8,
+	 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 8, 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, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9,
 };
 
@@ -4096,10 +5437,10 @@
 };
 
 static long _huff_lengthlist__44u2__short[] = {
-	16,15,15,16,14,16,16,16,16, 9, 8,11,10,10,10,15,
-	16, 6, 3, 7, 5, 7, 9,16,16,11, 7,11, 9,10,12,16,
-	16, 9, 4, 8, 3, 5, 8,16,16,11, 6, 9, 4, 4, 7,16,
-	16,11, 5, 9, 3, 3, 5,12,16,15, 6,11, 5, 5, 6,14,
+	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 = {
@@ -4114,10 +5455,10 @@
 };
 
 static long _huff_lengthlist__44u3__long[] = {
-	 7,11,14,13,14,12,12,12,12, 2, 5, 8, 9, 8, 9,11,
-	17, 4, 3, 6, 5, 7, 9,15,14, 6, 6, 7, 7, 7, 8,14,
-	17, 8, 5, 7, 4, 5, 7,15,13, 7, 6, 7, 5, 5, 6,14,
-	10, 8, 8, 7, 7, 5, 4, 9,10,12,15,14,16,10, 6, 9,
+	 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 = {
@@ -4138,11 +5479,11 @@
 };
 
 static long _vq_lengthlist__44u3__p1_0[] = {
-	 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,11,11, 8,
+	 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,13,14, 7,11,11,
-	10,13,11,11,13,14, 4, 8, 8, 8,11,11, 8,11,11, 8,
-	11,11,11,14,14,10,12,14, 8,11,11,11,14,13,11,14,
+	11, 8,11,11, 8,11,11,11,13,14,11,14,14, 8,11,11,
+	10,14,12,11,14,14, 4, 8, 8, 8,11,11, 8,11,11, 7,
+	11,11,11,14,14,10,12,14, 8,11,11,11,14,14,11,14,
 	13,
 };
 
@@ -4179,12 +5520,12 @@
 };
 
 static long _vq_lengthlist__44u3__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, 8, 9, 8, 9, 9, 6, 8, 7,
-	 7, 9, 8, 8, 9, 9, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6,
-	 8, 8, 8, 9, 9, 7, 8, 9, 6, 8, 8, 8, 9, 9, 8, 9,
-	 8,
+	 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,
+	 8,10, 8, 8,10,10, 5, 6, 6, 6, 8, 8, 7, 8, 8, 6,
+	 8, 8, 8,10,10, 8, 8,10, 7, 8, 8, 8,10,10, 8,10,
+	 9,
 };
 
 static float _vq_quantthresh__44u3__p2_0[] = {
@@ -4222,45 +5563,45 @@
 };
 
 static long _vq_lengthlist__44u3__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, 8, 9,10,11,10,11,10,14,13, 9,10,11,
-	13,13, 5, 7, 7,10,10, 7, 9, 8,11,10, 7, 9, 9,11,
-	11, 9,10,10,13,12,10,10,11,13,14, 8,10,10,14,13,
-	10,11,11,15,13, 9,11,11,14,13,13,14,13,17,15,12,
-	13,13,17,14, 8,10,10,14,14, 9,11,11,14,15,10,11,
-	12,14,16,12,13,13,14,17,13,13,14,14,17, 5, 7, 7,
-	10,10, 7, 9, 9,11,11, 7, 9, 9,11,11,10,11,11,15,
-	14,10,11,11,15,14, 7, 9, 9,12,12, 9,11,11,13,13,
-	 9,11,11,13,13,11,12,12,15,14,11,12,12,15,16, 7,
-	 9, 9,12,11, 8,11,10,13,12, 9,11,11,12,13,11,12,
-	11,16,14,11,12,13,15,16,10,12,12,17,15,11,12,13,
-	16,15,11,12,12,16,16,15,15,15,16,16,13,14,15, 0,
-	17, 9,11,11,15,15,10,12,11,16,15,11,12,12,15,17,
-	13,15,13,16,15,13,15,14, 0,18, 5, 7, 7,10,10, 7,
-	 9, 9,12,11, 7, 9, 9,11,11,10,11,11,14,14,10,11,
-	11,14,15, 7, 9, 9,12,11, 9,11,11,13,12, 8,10,11,
-	11,12,11,12,12,16,15,11,11,12,13,14, 7, 9, 9,12,
-	12, 9,11,11,13,13, 9,11,11,13,13,11,12,12,16,15,
-	12,12,12,15,15, 9,11,11,17,15,11,12,12,17,16,10,
-	11,12,15,15,13,14,15,18,17,13,13,14,15,15, 9,12,
-	12,15,14,11,13,12,16,16,11,12,12,15,15,13,15,14,
-	 0, 0,14,15,14,16,18, 8,10,10,15,15,10,12,12,16,
-	14,10,11,11,16,16,15,16,16,18,16,13,15,14,17,18,
-	 9,11,11,16,15,11,12,13,17,17,11,13,13,16,15,15,
-	16,16,18,18,14,16,15,18,17, 9,11,11,16,16,10,13,
-	12,16,16,11,12,12,16,16,14,16,16,17, 0,14,15,15,
-	18,16,12,14,14, 0, 0,14,15,16, 0, 0,14,15,15, 0,
-	 0,17,17,16, 0, 0,15,16,18,17, 0,11,14,14,18, 0,
-	12,15,13, 0,18,13,15,14,18, 0,15,16,15, 0,18,15,
-	18,17, 0,18, 8,10,10,15,15,10,12,11,15,15,10,11,
-	12,15,15,13,14,15,17, 0,14,15,16,17, 0, 9,11,11,
-	15,15,11,12,12,17,15,10,12,13,16,15,13,15,15,18,
-	18,15,16,17,18,18, 9,12,11,16,16,11,13,13,16,16,
-	11,13,13,18,15,14,15,15,18, 0,16,16,17, 0,17,12,
-	13,13,18,18,13,14,14,17,18,13,14,15,18,17,17,18,
-	18, 0,18,16,16,18,16, 0,12,15,13,18,18,13,14,15,
-	18,18,13,16,14,17,18,15,17,16, 0,18,17, 0,17, 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,
+	13,13, 5, 7, 7,10,10, 7, 9, 9,11,10, 7, 9, 9,11,
+	11, 9,11,10,13,13,10,11,11,14,13, 8,10,10,14,13,
+	10,11,11,15,14, 9,11,11,14,14,13,14,13,16,16,12,
+	13,13,15,15, 8,10,10,13,14, 9,11,11,14,14,10,11,
+	11,14,15,12,13,13,15,15,13,14,14,15,16, 5, 7, 7,
+	10,10, 7, 9, 9,11,11, 7, 9, 9,11,12,10,11,11,14,
+	14,10,11,11,14,14, 7, 9, 9,12,12, 9,11,11,13,13,
+	 9,11,11,13,13,12,12,13,15,15,11,12,13,15,16, 7,
+	 9, 9,11,11, 8,11,10,13,12, 9,11,11,13,13,11,13,
+	12,15,13,11,13,13,15,16, 9,12,11,15,14,11,12,13,
+	16,15,11,13,13,15,16,14,14,15,17,16,13,15,16, 0,
+	17, 9,11,11,15,15,10,13,12,15,15,11,13,13,15,16,
+	13,15,13,16,15,14,16,15, 0,19, 5, 7, 7,10,10, 7,
+	 9, 9,11,11, 7, 9, 9,11,11,10,12,11,14,14,10,11,
+	12,14,14, 7, 9, 9,12,12, 9,11,11,14,13, 9,10,11,
+	12,13,11,13,13,16,16,11,12,13,13,16, 7, 9, 9,12,
+	12, 9,11,11,13,13, 9,11,11,13,13,11,13,13,15,15,
+	12,13,12,15,14, 9,11,11,15,14,11,13,12,16,16,10,
+	12,12,15,15,13,15,15,17,19,13,14,15,16,17,10,12,
+	12,15,15,11,13,13,16,16,11,13,13,15,16,13,15,15,
+	 0, 0,14,15,15,16,16, 8,10,10,14,14,10,12,12,15,
+	15,10,12,11,15,16,14,15,15,19,20,13,14,14,18,16,
+	 9,11,11,15,15,11,13,13,17,16,11,13,13,16,16,15,
+	17,17,20,20,14,15,16,17,20, 9,11,11,15,15,10,13,
+	12,16,15,11,13,13,15,17,14,16,15,18, 0,14,16,15,
+	18,20,12,14,14, 0, 0,14,14,16, 0, 0,13,16,15, 0,
+	 0,17,17,18, 0, 0,16,17,19,19, 0,12,14,14,18, 0,
+	12,16,14, 0,17,13,15,15,18, 0,16,18,17, 0,17,16,
+	18,17, 0, 0, 7,10,10,14,14,10,12,11,15,15,10,12,
+	12,16,15,13,15,15,18, 0,14,15,15,17, 0, 9,11,11,
+	15,15,11,13,13,16,16,11,12,13,16,16,14,15,16,17,
+	17,14,16,16,16,18, 9,11,12,16,16,11,13,13,17,17,
+	11,14,13,20,17,15,16,16,19, 0,15,16,17, 0,19,11,
+	13,14,17,16,14,15,15,20,18,13,14,15,17,19,16,18,
+	18, 0,20,16,16,19,17, 0,12,15,14,17, 0,14,15,15,
+	18,19,13,16,15,19,20,15,18,18, 0,20,17, 0,16, 0,
 	 0,
 };
 
@@ -4299,46 +5640,46 @@
 };
 
 static long _vq_lengthlist__44u3__p4_0[] = {
-	 4, 6, 6, 9, 9, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 9,
-	10, 9,12,11, 9, 9,10,11,12, 6, 7, 7, 9, 9, 7, 7,
-	 7,10,10, 6, 7, 7, 9,10,10,10,10,12,12, 9, 9,10,
-	11,12, 6, 7, 7, 9, 9, 7, 7, 7,10, 9, 7, 7, 7,10,
-	10, 9,10, 9,12,11,10,10,10,12,12, 9,10,10,12,12,
-	10,10,10,13,12, 9,10,10,12,12,12,12,12,14,14,12,
-	12,12,13,14, 9,10,10,12,12, 9,10,10,12,12,10,10,
-	10,12,13,11,12,12,14,13,12,12,12,14,14, 6, 7, 7,
-	10, 9, 7, 8, 7,10,10, 7, 7, 7,10,10,10,10,10,12,
-	12,10,10,10,12,12, 7, 8, 8,10,10, 8, 8, 8,10,10,
-	 7, 8, 8,10,10,10,10,11,11,13,10,10,11,12,13, 6,
-	 7, 7,10,10, 7, 8, 7,10,10, 8, 8, 8,10,10,10,11,
-	10,13,11,10,10,10,12,12,10,10,10,13,12,10,10,10,
-	12,13,10,10,10,13,12,12,11,13,12,14,12,12,13,14,
-	14, 9,10,10,12,13, 9,10,10,12,12,10,10,11,12,13,
-	12,12,11,14,12,12,12,13,14,14, 6, 7, 7, 9, 9, 7,
-	 7, 7,10,10, 7, 7, 8,10,10,10,10,10,12,12,10,10,
-	10,12,12, 6, 7, 7,10,10, 8, 8, 8,10,10, 7, 7, 8,
-	10,10,10,10,10,12,12,10,10,11,11,13, 7, 8, 8,10,
-	10, 7, 8, 8,10,10, 8, 8, 8,10,10,10,10,10,12,12,
-	10,11,10,13,11, 9,10,10,13,12,10,11,10,13,12, 9,
-	10,10,12,13,12,13,12,14,14,12,11,12,12,14,10,10,
-	10,12,13,10,10,11,12,13,10,10,10,12,12,12,13,12,
-	14,14,12,12,11,14,12, 9,10, 9,12,12,10,10,10,13,
-	13, 9,10,10,13,13,12,13,13,15,14,12,12,13,14,14,
-	 9,10,10,13,13,10,10,10,12,13,10,10,10,13,12,13,
-	12,13,14,15,12,13,13,15,14, 9,10,10,13,12,10,10,
-	10,13,12,10,10,10,12,13,12,13,12,14,14,13,12,12,
-	14,14,12,12,12,15,14,12,11,12,14,14,12,13,12,14,
-	14,14,12,14,12,16,14,14,14,16,16,11,12,12,14,14,
-	11,12,11,15,13,12,12,12,14,15,13,14,12,16,13,14,
-	14,15,16,16, 9,10,10,12,12, 9,10,10,13,12, 9,10,
-	10,13,13,12,12,12,14,14,12,13,13,14,15, 9,10,10,
-	13,12,10,11,10,13,12,10,10,10,12,13,12,13,12,14,
-	14,12,12,13,14,15, 9,10,10,13,13,10,10,10,12,13,
-	10,10,10,13,13,12,13,13,14,15,13,13,12,14,14,11,
-	12,12,14,14,12,13,12,15,14,11,11,12,14,15,14,14,
-	14,16,16,14,12,14,13,16,12,12,12,14,15,12,12,13,
-	14,15,12,12,11,14,14,14,14,14,16,16,14,14,12,16,
-	12,
+	 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,
+	11,12, 5, 7, 7, 9, 9, 7, 8, 7,10,10, 7, 8, 8,10,
+	10, 9,10, 9,12,11, 9,10,10,12,11, 9,10, 9,12,12,
+	 9,10,10,13,12, 9,10,10,12,13,12,12,12,14,14,11,
+	12,12,13,14, 9, 9,10,12,12, 9,10,10,12,12, 9,10,
+	10,12,13,11,12,11,14,13,12,12,12,14,13, 5, 7, 7,
+	 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,10,10,10,10,12,
+	12, 9,10,10,12,12, 7, 8, 8,11,10, 8, 8, 9,11,11,
+	 8, 9, 9,11,11,11,11,11,12,13,10,11,11,13,13, 6,
+	 8, 8,10,10, 7, 9, 8,11,10, 8, 9, 9,11,11,10,11,
+	10,13,11,10,11,11,13,13, 9,11,10,13,12,10,11,11,
+	13,13,10,11,11,13,13,12,12,13,12,15,12,13,13,15,
+	15, 9,10,10,12,13,10,11,10,13,12,10,11,11,13,14,
+	12,13,11,15,13,12,13,13,15,15, 5, 7, 7, 9, 9, 7,
+	 8, 8,10,10, 7, 8, 8,10,10, 9,10,10,12,12,10,10,
+	11,12,12, 6, 8, 8,10,10, 8, 9, 9,11,11, 7, 8, 9,
+	10,11,10,11,11,13,13,10,10,11,11,13, 7, 8, 8,10,
+	10, 8, 9, 9,11,11, 8, 9, 9,11,11,10,11,11,13,13,
+	11,11,11,13,12, 9,10,10,13,12,10,11,11,14,13,10,
+	10,11,12,13,12,13,13,15,15,12,11,13,13,14, 9,10,
+	11,12,13,10,11,11,13,13,10,11,11,13,13,12,13,13,
+	15,15,12,13,12,15,12, 8, 9, 9,12,12, 9,11,10,13,
+	13, 9,10,10,13,13,12,13,13,15,14,12,12,12,14,13,
+	 9,10,10,13,12,10,11,11,13,13,10,11,11,14,12,13,
+	13,14,14,16,12,13,13,15,15, 9,10,10,13,13,10,11,
+	10,14,13,10,11,11,13,14,12,14,13,15,14,13,13,13,
+	15,15,11,13,12,15,14,11,12,13,14,15,12,13,13,16,
+	14,14,12,15,12,16,14,15,15,17,15,11,12,12,14,14,
+	11,13,11,15,14,12,13,13,15,15,13,15,12,17,13,14,
+	15,15,16,16, 8, 9, 9,12,12, 9,10,10,12,13, 9,10,
+	10,13,13,12,12,12,14,14,12,13,13,15,15, 9,10,10,
+	13,12,10,11,11,14,13,10,10,11,13,14,12,13,13,15,
+	15,12,12,13,14,16, 9,10,10,13,13,10,11,11,13,14,
+	10,11,11,14,13,12,13,13,14,15,13,14,13,16,14,11,
+	12,12,14,14,12,13,13,15,14,11,12,13,14,15,14,15,
+	15,16,16,13,13,15,13,16,11,12,12,14,15,12,13,13,
+	14,15,11,13,12,15,14,14,15,15,16,16,14,15,12,16,
+	13,
 };
 
 static float _vq_quantthresh__44u3__p4_0[] = {
@@ -4380,11 +5721,11 @@
 };
 
 static long _vq_lengthlist__44u3__p5_0[] = {
-	 2, 4, 4, 6, 6, 7, 7, 9, 9, 4, 5, 4, 7, 6, 8, 8,
-	 9, 9, 4, 4, 4, 6, 7, 8, 8, 9, 9, 6, 7, 6, 8, 8,
-	 9, 9,10,10, 6, 6, 7, 8, 8, 9, 9,10,10, 8, 8, 8,
-	 9, 9,10,10,11,11, 8, 8, 8, 9, 9,10,10,11,11, 9,
-	 9, 9,10,10,11,11,12,12, 9, 9,10,10,10,11,11,12,
+	 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,
+	 9, 9,10,10,11,11, 7, 8, 8, 9, 9,10,10,11,11, 9,
+	10,10,11,10,11,11,12,12, 9,10,10,10,10,11,11,12,
 	12,
 };
 
@@ -4432,17 +5773,17 @@
 };
 
 static long _vq_lengthlist__44u3__p6_0[] = {
-	 1, 4, 4, 6, 6, 8, 8, 9,10,10,11,13,14, 4, 6, 5,
-	 8, 8, 9, 9,10,10,11,11,14,14, 4, 5, 6, 8, 8, 9,
-	 9,10,10,11,11,14,14, 7, 8, 8, 9, 9,10,10,11,11,
-	12,12,15,15, 7, 8, 8, 9, 9,10,10,11,11,12,12,14,
-	15, 8, 9, 9,10,10,11,11,12,12,13,12,16,16, 8, 9,
-	 9,10,10,11,11,12,12,12,12,16,16,10,11,10,11,11,
-	12,12,13,13,13,13,17,16,10,11,11,11,11,12,12,12,
-	12,13,13,17,17,11,11,12,12,12,13,13,13,14,14,14,
-	16,17,11,12,11,12,12,13,13,14,14,14,14,19,17,14,
-	14,14,16,15,16,16,16,17,17,17,20,19,14,15,15,15,
-	15,15,16,16,17,17,17,20,19,
+	 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,
+	12,12,15,15, 6, 8, 8, 9, 9,10,11,11,11,12,12,15,
+	15, 8, 9, 9,11,10,11,11,12,12,13,13,15,16, 8, 9,
+	 9,10,11,11,11,12,12,13,13,16,16,10,10,11,11,11,
+	12,12,13,13,13,14,17,16, 9,10,11,12,11,12,12,13,
+	13,13,13,16,18,11,12,11,12,12,13,13,13,14,15,14,
+	17,17,11,11,12,12,12,13,13,13,14,14,15,18,17,14,
+	15,15,15,15,16,16,17,17,19,18, 0,20,14,15,14,15,
+	15,16,16,16,17,18,16,20,18,
 };
 
 static float _vq_quantthresh__44u3__p6_0[] = {
@@ -4525,12 +5866,12 @@
 };
 
 static long _vq_lengthlist__44u3__p7_0[] = {
-	 1, 4, 4, 9, 9, 9, 9, 9, 9, 4, 9, 9, 9, 9, 9, 9,
-	 9, 9, 3, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 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,
-	 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, 8, 8, 8, 8,
-	 8,
+	 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,
 };
 
 static float _vq_quantthresh__44u3__p7_0[] = {
@@ -4579,21 +5920,21 @@
 };
 
 static long _vq_lengthlist__44u3__p7_1[] = {
-	 1, 4, 4, 6, 5, 7, 7, 9, 8,10,10,11,11,12,13, 4,
-	 7, 6, 7, 7, 9, 9,10,10,11,11,14,13,14,13, 4, 6,
-	 7, 7, 8, 9, 9,10,10,12,12,13,13,13,13, 6, 8, 8,
-	10, 9,11,11,12,12,13,13,14,14,15,14, 6, 8, 8, 9,
-	 9,11,11,12,12,14,14,14,15,15,15, 8, 9, 9,11,10,
-	13,12,14,14,14,14,15,16,15,15, 8, 9, 9,11,11,12,
-	12,14,14,15,14,15,15,14,17, 9,10,10,13,12,14,14,
-	15,14,14,17,15,15,16,15, 9,11,11,12,13,14,14,15,
-	15,15,16,15,17,16,17,11,12,12,14,14,15,14,16,16,
-	16,15,15,17,16,16,11,12,13,14,15,15,15,15,15,16,
-	16,17,17,16,17,12,13,13,15,14,15,15,15,15,16,16,
-	16,17,17,17,13,12,14,14,15,15,15,15,16,17,17,15,
-	17,17,17,12,14,14,16,15,17,16,17,16,17,16,17,17,
-	17,17,14,13,14,15,16,17,17,17,15,17,17,17,16,17,
-	16,
+	 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,
+	 9, 9,10,10,11,11,12,12,13,12,13,13, 6, 8, 8, 9,
+	 9,10,11,11,11,12,12,13,14,13,13, 8, 9, 9,11,11,
+	12,12,12,13,14,13,14,14,14,15, 8, 9, 9,11,11,11,
+	12,13,14,13,14,15,17,14,15, 9,10,10,12,12,13,13,
+	13,14,15,15,15,16,16,16, 9,11,11,12,12,13,13,14,
+	14,14,15,16,16,16,16,10,12,12,13,13,14,14,15,15,
+	15,16,17,17,17,17,10,12,11,13,13,15,14,15,14,16,
+	17,16,16,16,16,11,13,12,14,14,14,14,15,16,17,16,
+	17,17,17,17,11,13,12,14,14,14,15,17,16,17,17,17,
+	17,17,17,12,13,13,15,16,15,16,17,17,16,16,17,17,
+	17,17,12,13,13,15,15,15,16,17,17,17,16,17,16,17,
+	17,
 };
 
 static float _vq_quantthresh__44u3__p7_1[] = {
@@ -4645,25 +5986,25 @@
 };
 
 static long _vq_lengthlist__44u3__p7_2[] = {
-	 3, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 5, 6, 6, 7, 7, 7, 8, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 6, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9,10, 9, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9,10,10,10, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9,10,10,10,10, 8, 8, 8, 9, 9, 9, 9, 9, 9,
-	 9, 9,10,10,10,10,10,10, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9, 9,10,10,10,10,10,10, 8, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9,10,10,10,10,10,10, 9, 9, 9, 9, 9,
-	 9, 9,10, 9,10,10,10,10,10,10,10,10, 9, 9, 9, 9,
-	 9, 9, 9,10,10,10,10,10,10,10,10,10,10, 9, 9, 9,
-	 9, 9,10,10,10,10,10,10,10,10,10,10,10,10, 9, 9,
-	 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9,
-	 9,10,10, 9,10, 9,10,10,10,10,10,10,10,10,10,10,
-	 9,10, 9,10, 9,10,10,10,10,10,10,10,10,10,10,10,
-	10,
+	 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,
+	 9,10, 9, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
+	10,10,10,10, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,
+	 9,10,10,10,10, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
+	10,10,10,10,10,10, 7, 8, 8, 9, 8, 9, 9, 9, 9,10,
+	 9,10,10,10,10,10,10, 8, 8, 8, 9, 9, 9, 9, 9, 9,
+	 9,10,10,10,10,10,10,10, 8, 9, 8, 9, 9, 9, 9,10,
+	 9,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9,10,
+	 9,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9,10,
+	 9,10,10,10,10,10,10,10,10,10,10, 9, 9, 9,10, 9,
+	10,10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,11, 9,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,11, 9,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	 9,10,10,10,10,10,10,10,10,10,10,10,11,11,11,10,
+	11,
 };
 
 static float _vq_quantthresh__44u3__p7_2[] = {
@@ -4696,10 +6037,10 @@
 };
 
 static long _huff_lengthlist__44u3__short[] = {
-	17,17,17,17,17,17,16,16,16,12,11,13,11,12,11,15,
-	16, 9, 4, 8, 5, 7, 9,15,16,14, 9,12,10,10,12,16,
-	16,11, 4, 9, 3, 4, 8,16,16,12, 6,10, 3, 4, 7,16,
-	16,12, 6,11, 3, 3, 4,12,16,16, 7,13, 5, 5, 6,13,
+	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 = {
@@ -4714,10 +6055,10 @@
 };
 
 static long _huff_lengthlist__44u4__long[] = {
-	 3, 7,11,11,12,11,11,12, 5, 3, 5, 7, 8, 8, 9,11,
-	 9, 4, 4, 6, 6, 7, 9,15,10, 6, 6, 7, 7, 7, 8,14,
-	12, 7, 5, 6, 4, 5, 7,15,10, 7, 6, 7, 5, 5, 6,13,
-	 9, 8, 8, 7, 7, 5, 4, 8,10,12,14,13,14,10, 5, 7,
+	 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 = {
@@ -4738,11 +6079,11 @@
 };
 
 static long _vq_lengthlist__44u4__p1_0[] = {
-	 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,11,11, 8,
+	 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, 7,11,10,
-	10,14,12,11,14,14, 4, 8, 8, 8,11,11, 8,11,11, 8,
-	11,11,11,14,14,10,12,14, 8,11,11,11,14,14,11,14,
+	11, 8,11,11, 8,11,11,11,13,14,11,15,14, 8,11,11,
+	10,13,12,11,14,14, 4, 8, 8, 8,11,11, 8,11,11, 7,
+	11,11,11,15,14,10,12,14, 8,11,11,11,14,14,11,14,
 	13,
 };
 
@@ -4780,10 +6121,10 @@
 
 static long _vq_lengthlist__44u4__p2_0[] = {
 	 2, 5, 5, 5, 6, 6, 5, 6, 6, 5, 6, 6, 7, 8, 8, 6,
-	 7, 8, 5, 6, 6, 6, 8, 7, 7, 8, 8, 5, 6, 6, 7, 8,
-	 8, 6, 8, 8, 7, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8,
-	 7, 9, 8, 8, 9,10, 5, 6, 6, 6, 8, 8, 7, 8, 8, 6,
-	 8, 8, 8,10, 9, 8, 8, 9, 6, 8, 8, 8,10,10, 8,10,
+	 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,
+	 8,10, 8, 8,10,10, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6,
+	 8, 8, 8,10,10, 8, 8,10, 6, 8, 8, 8,10,10, 8,10,
 	 9,
 };
 
@@ -4822,46 +6163,46 @@
 };
 
 static long _vq_lengthlist__44u4__p3_0[] = {
-	 2, 4, 4, 7, 7, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 8,
-	10, 9,12,12, 8, 9, 9,12,12, 5, 7, 7,10, 9, 7, 9,
-	 9,11,11, 7, 8, 9,10,11,10,11,11,13,13, 9,10,11,
-	13,13, 5, 7, 7, 9,10, 7, 9, 9,11,11, 7, 9, 9,11,
-	11, 9,11,10,13,12,10,11,11,13,13, 8,10,10,13,13,
-	10,11,11,15,13, 9,11,11,14,13,13,15,13,16,15,12,
-	13,13,15,15, 8,10,10,13,14, 9,11,11,14,14,10,11,
-	12,14,16,12,13,13,14,16,13,14,14,15,17, 5, 7, 7,
-	10,10, 7, 9, 9,11,11, 7, 9, 9,11,11,10,11,11,15,
-	14,10,11,11,14,14, 7, 9, 9,12,12, 9,11,11,13,13,
-	 9,11,11,13,13,11,12,13,15,15,11,13,13,16,15, 7,
-	 9, 9,11,11, 9,11,10,13,12, 9,11,12,13,13,11,13,
-	12,16,14,11,13,13,15,16,10,12,12,18,15,11,12,13,
-	16,15,11,13,13,17,16,15,15,15,17,17,14,15,16,18,
-	19, 9,11,11,15,15,10,12,11,15,16,11,13,13,15,16,
-	13,15,13,18,15,14,15,15,17,19, 5, 7, 7,10,10, 7,
-	 9, 9,12,11, 7, 9, 9,11,12,10,12,11,14,14,10,11,
-	12,14,15, 7, 9, 9,11,11, 9,11,11,13,12, 9,10,11,
-	12,13,11,13,13,16,17,11,11,13,14,15, 7, 9, 9,12,
-	12, 9,11,11,13,13, 9,11,11,13,13,11,13,12,15,16,
-	11,13,13,16,15, 9,11,11,16,15,11,13,12,16,15,10,
-	12,12,16,15,14,15,16,19,17,13,14,15,15,16,10,11,
-	12,15,15,11,13,13,16,16,11,13,12,16,17,14,15,15,
-	18,17,14,16,14,16,19, 7,10,10,15,14,10,12,12,16,
-	15,10,11,11,16,15,14,16,16,19,18,13,15,14,17,17,
-	 9,11,11,17,16,11,13,14,18,17,11,13,13,16,16,15,
-	16,17,19, 0,14,15,18,16,19, 9,11,11,16,15,11,13,
-	12,18,16,11,13,13,17,16,14,16,16,17,19,15,16,15,
-	18, 0,12,14,15,18,19,13,15,16,19,17,14,16,15,18,
-	 0,17,16,19, 0,18,16,17,18, 0, 0,11,13,14,18,19,
-	13,15,13,19,19,14,15,15,17,17,15,17,15,19,17,16,
-	18,18,19, 0, 8,10,10,14,14,10,12,11,15,15,10,11,
-	12,15,17,13,15,15,17,16,14,15,15,18, 0, 9,11,11,
-	15,15,11,13,13,18,16,10,12,13,16,17,14,15,16,17,
-	18,14,15,17,19,19, 9,12,12,15,16,11,13,13,16,17,
-	11,14,13,19,16,14,16,15,18,19,15,16,18,19,18,12,
-	14,14,19,18,13,15,17,18,17,13,14,15,18, 0,16, 0,
-	 0,18,18,16,15, 0,17,19,12,15,14,17, 0,13,15,16,
-	19,18,13,16,15, 0,19,16,18,16,19,18,17,19,16, 0,
-	19,
+	 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,
+	13,14, 5, 7, 7,10,10, 7, 9, 9,11,11, 7, 9, 9,11,
+	11, 9,11,10,14,13,10,11,11,14,14, 8,10,10,14,13,
+	10,12,12,15,14, 9,11,11,15,14,13,14,14,17,17,12,
+	14,14,16,16, 8,10,10,14,14, 9,11,11,14,15,10,12,
+	12,14,15,12,14,13,16,16,13,14,15,15,18, 4, 7, 7,
+	10,10, 7, 9, 9,12,11, 7, 9, 9,11,12,10,12,11,15,
+	14,10,11,12,14,15, 7, 9, 9,12,12, 9,11,12,13,13,
+	 9,11,12,13,13,12,13,13,15,16,11,13,13,15,16, 7,
+	 9, 9,12,12, 9,11,10,13,12, 9,11,12,13,14,11,13,
+	12,16,14,12,13,13,15,16,10,12,12,16,15,11,13,13,
+	17,16,11,13,13,17,16,14,15,15,17,17,14,16,16,18,
+	20, 9,11,11,15,16,11,13,12,16,16,11,13,13,16,17,
+	14,15,14,18,16,14,16,16,17,20, 5, 7, 7,10,10, 7,
+	 9, 9,12,11, 7, 9,10,11,12,10,12,11,15,15,10,12,
+	12,14,14, 7, 9, 9,12,12, 9,12,11,14,13, 9,10,11,
+	12,13,12,13,14,16,16,11,12,13,14,16, 7, 9, 9,12,
+	12, 9,12,11,13,13, 9,12,11,13,13,11,13,13,16,16,
+	12,13,13,16,15, 9,11,11,16,14,11,13,13,16,16,11,
+	12,13,16,16,14,16,16,17,17,13,14,15,16,17,10,12,
+	12,15,15,11,13,13,16,17,11,13,13,16,16,14,16,15,
+	19,19,14,15,15,17,18, 8,10,10,14,14,10,12,12,15,
+	15,10,12,12,16,16,14,16,15,20,19,13,15,15,17,16,
+	 9,12,12,16,16,11,13,13,16,18,11,14,13,16,17,16,
+	17,16,20, 0,15,16,18,18,20, 9,11,11,15,15,11,14,
+	12,17,16,11,13,13,17,17,15,17,15,20,20,14,16,16,
+	17, 0,13,15,14,18,16,14,15,16, 0,18,14,16,16, 0,
+	 0,18,16, 0, 0,20,16,18,18, 0, 0,12,14,14,17,18,
+	13,15,14,20,18,14,16,15,19,19,16,20,16, 0,18,16,
+	19,17,19, 0, 8,10,10,14,14,10,12,12,16,15,10,12,
+	12,16,16,13,15,15,18,17,14,16,16,19, 0, 9,11,11,
+	16,15,11,14,13,18,17,11,12,13,17,18,14,17,16,18,
+	18,15,16,17,18,18, 9,12,12,16,16,11,13,13,16,18,
+	11,14,13,17,17,15,16,16,18,20,16,17,17,20,20,12,
+	14,14,18,17,14,16,16, 0,19,13,14,15,18, 0,16, 0,
+	 0, 0, 0,16,16, 0,19,20,13,15,14, 0, 0,14,16,16,
+	18,19,14,16,15, 0,20,16,20,18, 0,20,17,20,17, 0,
+	 0,
 };
 
 static float _vq_quantthresh__44u4__p3_0[] = {
@@ -4899,46 +6240,46 @@
 };
 
 static long _vq_lengthlist__44u4__p4_0[] = {
-	 4, 5, 5, 8, 8, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 9,
-	 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,
-	11,12, 6, 7, 7, 9, 9, 7, 8, 7,10, 9, 7, 8, 8,10,
-	10, 9,10, 9,12,11, 9,10,10,12,11, 9, 9, 9,12,11,
-	 9,10,10,12,12, 9,10,10,12,12,11,12,12,13,14,11,
-	11,12,13,14, 9, 9, 9,11,12, 9,10,10,12,12, 9,10,
-	10,12,12,11,12,11,14,13,11,12,12,13,13, 5, 7, 7,
-	 9, 9, 7, 8, 8,10,10, 7, 7, 8,10,10, 9,10,10,12,
-	12, 9,10,10,12,12, 7, 8, 8,10,10, 8, 8, 9,10,11,
-	 8, 9, 9,11,11,10,10,11,11,13,10,10,11,12,13, 6,
-	 7, 8,10,10, 7, 9, 8,11,10, 8, 8, 9,10,11,10,11,
-	10,13,11,10,11,11,13,12, 9,10,10,12,12,10,10,11,
-	12,13,10,11,11,13,13,12,11,13,12,15,12,13,13,14,
-	14, 9,10,10,12,12, 9,11,10,13,12,10,11,11,13,13,
-	11,13,11,14,12,12,13,13,14,15, 5, 7, 7, 9, 9, 7,
-	 8, 7,10,10, 7, 8, 8,10,10, 9,10,10,12,12, 9,10,
-	10,12,12, 6, 8, 7,10,10, 8, 9, 8,11,10, 7, 8, 9,
-	10,11,10,11,11,12,13,10,10,11,11,13, 7, 8, 8,10,
-	10, 8, 9, 9,10,11, 8, 9, 8,11,10,10,11,11,13,12,
-	10,11,10,13,11, 9,10,10,13,12,10,11,11,13,13, 9,
-	10,10,12,13,12,13,13,15,14,11,11,13,12,14, 9,10,
-	10,12,12,10,11,11,13,13,10,11,10,13,12,12,13,13,
-	14,14,12,13,11,15,12, 8, 9, 9,12,12, 9,10,10,13,
-	12, 9,10,10,12,12,12,13,12,14,14,11,12,12,14,13,
-	 9,10,10,12,12,10,10,11,13,13,10,11,11,13,12,12,
-	13,13,14,15,12,13,13,15,14, 9,10,10,12,12, 9,11,
-	10,13,12,10,10,11,12,13,12,13,12,15,14,12,13,13,
-	14,14,11,12,12,14,13,11,11,12,13,14,12,13,13,15,
-	14,13,12,14,12,16,14,15,14,16,16,11,12,12,14,14,
-	11,12,11,15,13,12,13,13,14,15,13,14,12,16,13,14,
-	14,15,16,16, 8, 9, 9,12,12, 9,10,10,12,12, 9,10,
-	10,12,13,11,12,12,14,13,12,12,13,14,14, 9,10,10,
-	12,12,10,11,11,13,12,10,10,11,12,13,12,13,13,14,
-	14,12,12,13,14,15, 9,10,10,12,13,10,11,11,12,13,
-	10,11,10,13,13,12,13,13,14,15,12,13,13,15,14,11,
-	12,12,14,14,12,13,13,15,14,11,11,12,14,15,14,14,
-	14,17,16,13,12,14,13,16,11,12,12,13,15,12,13,13,
-	14,15,11,12,11,14,14,14,15,14,15,17,13,14,12,16,
-	12,
+	 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,
+	11,12, 5, 7, 7, 9, 9, 7, 8, 7,10,10, 7, 8, 8,10,
+	10, 9,10,10,12,11, 9,10,10,12,11, 9,10, 9,12,12,
+	 9,10,10,13,12, 9,10,10,12,12,12,12,12,14,14,11,
+	12,12,13,14, 9, 9,10,12,12, 9,10,10,13,13, 9,10,
+	10,12,13,11,12,12,14,13,11,12,12,14,14, 5, 7, 7,
+	 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,10,10,10,10,12,
+	12, 9,10,10,12,12, 7, 8, 8,11,10, 8, 8, 9,11,11,
+	 8, 9, 9,11,11,11,11,11,12,13,10,11,11,13,13, 6,
+	 8, 8,10,10, 7, 9, 8,11,10, 8, 9, 9,11,11,10,11,
+	10,13,11,10,11,11,13,13, 9,11,10,13,12,10,11,11,
+	13,14,10,11,11,14,13,12,12,13,12,15,12,13,13,15,
+	15, 9,10,10,12,13,10,11,10,13,12,10,11,11,13,14,
+	12,13,11,15,13,13,13,13,15,15, 5, 7, 7, 9, 9, 7,
+	 8, 8,10,10, 7, 8, 8,10,10, 9,10,10,12,12,10,10,
+	11,12,13, 6, 8, 8,10,10, 8, 9, 9,11,11, 7, 8, 9,
+	10,11,10,11,11,13,13,10,10,11,11,13, 7, 8, 8,10,
+	11, 8, 9, 9,11,11, 8, 9, 8,11,11,10,11,11,13,13,
+	11,12,11,13,12, 9,10,10,13,12,10,11,11,14,13,10,
+	10,11,12,13,12,13,13,15,15,12,11,13,13,14, 9,10,
+	11,12,13,10,11,11,13,14,10,11,11,13,13,12,13,13,
+	15,15,12,13,12,15,12, 8, 9, 9,12,12, 9,11,10,13,
+	13, 9,10,10,13,13,12,13,13,15,15,12,12,12,14,14,
+	 9,10,10,13,13,10,11,11,13,14,10,11,11,14,13,13,
+	13,14,14,16,13,13,13,15,15, 9,10,10,13,13,10,11,
+	10,14,13,10,11,11,13,14,12,14,13,16,14,12,13,13,
+	14,15,11,12,12,15,14,11,12,13,14,15,12,13,13,16,
+	15,14,12,15,12,16,14,15,15,16,16,11,12,12,14,14,
+	11,13,12,15,14,12,13,13,15,16,13,15,13,17,13,14,
+	15,15,16,17, 8, 9, 9,12,12, 9,10,10,12,13, 9,10,
+	10,13,13,12,12,12,14,14,12,13,13,15,15, 9,10,10,
+	13,12,10,11,11,14,13,10,10,11,13,14,13,13,13,15,
+	15,12,13,14,14,16, 9,10,10,13,13,10,11,11,13,14,
+	10,11,11,14,14,13,13,13,15,15,13,14,13,16,14,11,
+	12,12,15,14,12,13,13,16,15,11,12,13,14,15,14,15,
+	15,17,16,13,13,15,13,16,11,12,13,14,15,13,13,13,
+	15,16,11,13,12,15,14,14,15,15,16,16,14,15,12,17,
+	13,
 };
 
 static float _vq_quantthresh__44u4__p4_0[] = {
@@ -4980,11 +6321,11 @@
 };
 
 static long _vq_lengthlist__44u4__p5_0[] = {
-	 2, 4, 4, 6, 6, 7, 7, 9, 9, 4, 5, 4, 7, 6, 8, 7,
-	10, 9, 4, 4, 5, 6, 7, 7, 8, 9, 9, 6, 7, 6, 8, 8,
-	 8, 8,10,10, 6, 6, 7, 8, 8, 8, 9,10,10, 7, 8, 7,
-	 9, 8,10,10,11,11, 7, 7, 8, 8, 9,10,10,11,11, 9,
-	10, 9,10,10,11,11,12,12, 9, 9,10,10,10,11,11,12,
+	 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,
+	 9, 9,10,10,11,11, 7, 8, 8, 9, 9,10,10,11,11, 9,
+	10,10,11,10,11,11,12,12, 9,10,10,10,11,11,11,12,
 	12,
 };
 
@@ -5032,17 +6373,17 @@
 };
 
 static long _vq_lengthlist__44u4__p6_0[] = {
-	 1, 4, 4, 6, 6, 8, 8, 9,10,10,11,13,13, 4, 6, 5,
-	 8, 8, 9, 9,10,10,11,11,14,14, 4, 5, 6, 8, 8, 9,
-	 9,10,10,11,11,14,14, 7, 8, 8, 9, 9,10,10,11,11,
-	12,12,15,15, 7, 8, 8, 9, 9,10,10,11,11,12,12,15,
-	15, 8, 9, 9,10,10,11,11,12,12,13,13,16,16, 8, 9,
-	 9,10,10,11,11,12,12,13,13,16,16,10,10,10,11,11,
-	12,12,13,13,14,13,16,16,10,10,11,11,12,12,12,13,
-	13,13,14,16,17,11,12,11,12,12,13,13,13,14,14,14,
-	17,16,11,11,12,12,12,13,13,14,14,15,14,17,17,14,
-	14,14,15,15,16,16,17,17,17,19,19, 0,14,15,15,15,
-	15,16,16,16,17,17,19,20,20,
+	 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,
+	12,12,15,15, 6, 8, 8, 9, 9,10,11,11,11,12,12,15,
+	15, 8, 9, 9,11,10,11,11,12,12,13,13,16,16, 8, 9,
+	 9,10,10,11,11,12,12,13,13,16,16,10,10,10,12,11,
+	12,12,13,13,14,14,16,16,10,10,10,11,12,12,12,13,
+	13,13,14,16,17,11,12,11,12,12,13,13,14,14,15,14,
+	18,17,11,11,12,12,12,13,13,14,14,14,15,19,18,14,
+	15,14,15,15,17,16,17,17,17,17,21, 0,14,15,15,16,
+	16,16,16,17,17,18,17,20,21,
 };
 
 static float _vq_quantthresh__44u4__p6_0[] = {
@@ -5129,17 +6470,17 @@
 };
 
 static long _vq_lengthlist__44u4__p7_0[] = {
-	 1, 3, 3,11,11,11,11,11,11,11,11,11,11, 4,10, 9,
-	11,11,11,11,11,11,11,11,11,11, 4,10,10,11,11,11,
+	 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,
+	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+	12,12,12,12,12,12,12,12,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,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,11,
-	11,11,11,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,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,10,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,
+	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,
 };
 
 static float _vq_quantthresh__44u4__p7_0[] = {
@@ -5189,21 +6530,21 @@
 };
 
 static long _vq_lengthlist__44u4__p7_1[] = {
-	 1, 4, 4, 6, 6, 7, 7, 9, 8,10,10,11,11,12,12, 4,
-	 7, 6, 8, 7, 9, 9,10,10,11,10,12,11,12,12, 4, 6,
-	 6, 7, 8, 9, 9,10,10,11,11,12,12,13,13, 6, 8, 8,
-	10, 9,11,10,11,11,12,12,14,13,13,13, 6, 8, 8, 9,
-	 9,11,11,12,12,12,12,13,14,13,14, 8, 9, 9,11,10,
-	12,12,13,12,13,14,14,14,14,14, 8, 9, 9,10,11,12,
-	11,12,13,13,14,14,13,14,14, 9,10,10,12,12,14,13,
-	14,14,15,15,16,15,15,15, 9,10,10,11,12,13,13,13,
-	14,15,15,18,16,17,15,10,12,12,13,13,15,14,15,14,
-	16,16,16,15,16,15,10,11,11,13,13,14,14,17,16,15,
-	16,18,16,15,16,11,12,13,14,13,15,14,15,16,17,15,
-	16,16,15,16,11,12,13,14,15,14,16,15,15,16,15,15,
-	17,17,17,12,13,13,14,14,14,15,16,14,15,15,16,16,
-	16,16,12,13,13,13,14,15,15,15,14,16,16,16,16,16,
-	17,
+	 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,
+	10, 9,11,10,12,11,12,12,12,12,13,13, 6, 8, 8,10,
+	10,10,11,11,11,12,12,13,12,13,13, 8, 9, 9,11,11,
+	12,11,12,12,13,13,13,13,13,13, 8, 9, 9,11,11,11,
+	12,12,12,13,13,13,13,13,13, 9,10,10,12,11,13,13,
+	13,13,14,13,13,14,14,14, 9,10,11,11,12,12,13,13,
+	13,13,13,14,15,14,14,10,11,11,12,12,13,13,14,14,
+	14,14,14,15,16,16,10,11,11,12,13,13,13,13,15,14,
+	14,15,16,15,16,10,12,12,13,13,14,14,14,15,15,15,
+	15,15,15,16,11,12,12,13,13,14,14,14,15,15,15,16,
+	15,17,16,11,12,12,13,13,13,15,15,14,16,16,16,16,
+	16,17,11,12,12,13,13,14,14,15,14,15,15,17,17,16,
+	16,
 };
 
 static float _vq_quantthresh__44u4__p7_1[] = {
@@ -5255,24 +6596,24 @@
 };
 
 static long _vq_lengthlist__44u4__p7_2[] = {
-	 3, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9, 5, 6, 6, 7, 7, 8, 7, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 6, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9,10,10, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9,10,10, 8, 8, 8, 9, 9, 9, 9, 9, 9,
-	 9, 9,10,10,10,10,10,10, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9, 9,10,10,10,10,10,10, 8, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9,10,10,10,10,10,10, 8, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9,10,10,10,10,10,10, 9, 9, 9, 9, 9,
-	 9, 9,10, 9, 9,10,10,10,10,10,10,10, 9, 9, 9, 9,
-	 9, 9,10, 9,10,10,10,10,10,10,10,10,10, 9, 9, 9,
-	 9, 9,10,10,10,10,10,10,10,10,10,10,10,10, 9, 9,
-	 9, 9, 9,10, 9,10,10,10,10,10,10,10,10,10,10, 9,
-	 9, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	 9, 9, 9,10, 9,10,10,10,10,10,10,10,10,10,10,10,
+	 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,
+	 9, 9, 9, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
+	10,10,10,10, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,
+	 9,10, 9,10,10, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
+	10,10,10,10,10,10, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
+	 9,10,10,10,10,10,10, 8, 9, 8, 9, 9, 9, 9, 9, 9,
+	10,10,10,10,10,10,10,10, 8, 8, 8, 9, 9, 9, 9, 9,
+	10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9,10,10,
+	10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9,10,
+	10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9,10,
+	10,10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9,
+	10,10,10,10,10,10,10,10,10,11,10,10,10, 9, 9, 9,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9, 9,
+	 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9,
+	10, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	 9,10, 9,10,10,10,10,10,10,10,10,10,10,11,10,10,
 	10,
 };
 
@@ -5306,10 +6647,10 @@
 };
 
 static long _huff_lengthlist__44u4__short[] = {
-	 3, 9,14,12,17,13,13,13, 4, 7, 8, 9,12,10,11,12,
-	 6, 5, 4, 7, 6, 7, 9,14, 8, 8, 7, 9, 8, 9,10,13,
-	 9, 8, 5, 7, 3, 5, 8,15, 9, 9, 6, 8, 4, 5, 7,16,
-	11,10, 6, 9, 4, 3, 6,15,17,16, 8,11, 5, 5, 7,16,
+	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 = {
@@ -5324,13 +6665,13 @@
 };
 
 static long _huff_lengthlist__44u5__long[] = {
-	 3, 8,13,12,14,13,16,11,12,13, 5, 4, 5, 6, 8, 9,
-	10, 9,12,12,10, 5, 4, 6, 6, 8, 9,10,14,16,10, 6,
-	 6, 6, 6, 7, 9, 8,12,13,13, 7, 5, 6, 4, 6, 6, 7,
-	11,16,10, 7, 7, 7, 6, 6, 7, 7,11,14,14, 9, 8, 8,
-	 5, 6, 6, 7,11,16, 9, 8, 8, 8, 6, 6, 6, 4, 7,12,
-	11,10,12,11,10, 9,10, 5, 6,10,10,13,15,15,15,15,
-	14, 8, 7, 9,
+	 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,
+	11,14,11, 7, 7, 6, 6, 6, 7, 6,10,14,14, 9, 8, 8,
+	 6, 7, 7, 7,11,16,11, 8, 8, 7, 6, 6, 7, 4, 7,12,
+	10,10,12,10,10, 9,10, 5, 6, 9,10,12,15,13,14,14,
+	14, 8, 7, 8,
 };
 
 static static_codebook _huff_book__44u5__long = {
@@ -5352,9 +6693,9 @@
 
 static 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, 4, 8, 8, 8,11,
-	10, 8,10,10, 8,11,11,10,12,13,10,13,13, 7,10,10,
-	 9,13,11,10,13,13, 5, 8, 8, 8,10,10, 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,
+	10,13,11,10,13,13, 4, 8, 8, 8,11,10, 8,10,10, 7,
 	10,10,10,13,13,10,11,13, 8,10,11,10,13,13,10,13,
 	12,
 };
@@ -5394,9 +6735,9 @@
 static 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,
-	 7, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 7, 8,
+	 8, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 7,
 	 7, 9, 8, 8, 9, 9, 5, 6, 6, 6, 8, 7, 6, 8, 8, 6,
-	 8, 8, 8, 9, 9, 7, 8, 9, 6, 8, 8, 8, 9, 9, 8, 9,
+	 8, 7, 8, 9, 9, 7, 8, 9, 6, 8, 8, 8, 9, 9, 8, 9,
 	 9,
 };
 
@@ -5436,44 +6777,44 @@
 
 static long _vq_lengthlist__44u5__p3_0[] = {
 	 2, 4, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8,
-	10, 9,12,12, 8, 9,10,12,13, 5, 7, 7,10, 9, 7, 9,
-	 9,11,11, 7, 8, 9,10,11,10,11,11,13,14, 9,10,11,
-	13,13, 5, 7, 7, 9, 9, 7, 9, 8,11,10, 7, 9, 9,11,
-	11, 9,11,10,14,13,10,11,11,13,14, 8,10,10,13,13,
-	10,11,11,15,14, 9,11,11,14,14,13,15,14,18,16,12,
-	13,14,16,16, 8,10,10,13,13, 9,11,11,14,14,10,11,
-	12,14,15,12,13,13,16,16,13,14,14,15,17, 5, 7, 7,
-	10,10, 7, 9, 9,11,11, 7, 9, 9,11,11,10,11,11,15,
-	14,10,11,11,14,14, 7, 9, 9,12,11, 9,11,11,13,13,
-	 9,11,11,13,13,12,12,13,15,15,11,12,13,16,15, 6,
-	 9, 9,11,11, 8,11,10,13,12, 9,10,11,12,14,11,13,
-	11,16,14,11,13,13,15,16,10,11,11,15,15,11,12,13,
-	16,15,11,13,13,16,16,14,15,15,17,18,14,15,16,17,
-	18, 9,11,11,14,15,10,12,11,15,15,11,12,13,15,16,
-	13,15,13,17,15,14,15,16,18,19, 5, 7, 7,10,10, 7,
-	 9, 9,11,11, 7, 9, 9,11,11,10,11,11,15,14,10,11,
-	11,14,15, 6, 9, 9,11,11, 9,11,10,13,13, 8,10,11,
-	12,13,11,13,13,15,15,11,11,13,13,15, 7, 9, 9,11,
-	12, 9,11,11,13,13, 9,11,11,13,13,11,13,12,17,16,
-	11,13,12,16,15, 9,11,11,15,14,11,13,13,16,16,10,
-	11,12,15,15,14,15,15,17,17,13,13,15,15,17,10,11,
-	12,15,15,11,13,13,16,19,11,13,12,17,17,14,16,15,
-	19,17,14,15,15,18,18, 8,10,10,14,14,10,12,11,16,
-	15, 9,11,11,15,16,14,16,15,17,17,13,14,14,18,17,
-	 9,11,11,16,15,11,13,13,16,18,11,13,13,17,16,15,
-	16,17,18, 0,15,15,16, 0,18, 9,11,11,16,15,10,13,
-	12,17,15,11,13,13,16,17,14,18,15,19,18,15,16,16,
-	19,18,13,15,15,19,17,13,15,15,18,18,14,15,15,19,
-	 0,17,18, 0,19,19,16,17,17, 0,18,12,14,13,18,17,
-	13,15,13,19,18,14,15,15,19,19,16,17,15, 0,17,16,
-	19,17,19,18, 8,10,10,14,14,10,11,11,15,15,10,11,
-	11,16,16,13,15,15,17,16,14,15,15,18,19, 9,11,11,
-	16,15,11,13,13,19,16,10,12,13,15,17,15,15,15,19,
-	19,15,16,16,17, 0, 9,11,11,16,16,11,13,13,16,17,
-	11,13,13,18,18,14,16,15,18,18,15,17,16,19, 0,12,
-	14,14,17,18,13,16,16,18,18,13,14,15,17, 0,16,17,
-	17, 0, 0,16,15, 0,19,17,12,15,14,17,18,14,15,16,
-	 0,18,14,16,16,18, 0,16,17,17, 0, 0,17,19,17,19,
+	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,
+	13,14, 5, 7, 7, 9,10, 7, 9, 8,11,11, 7, 9, 9,11,
+	11, 9,11,10,14,13,10,11,11,14,14, 8,10,10,13,13,
+	10,11,11,15,14, 9,11,11,14,14,13,14,14,17,16,12,
+	13,13,15,16, 8,10,10,13,13, 9,11,11,14,15,10,11,
+	11,14,15,12,14,13,16,16,13,15,14,15,17, 5, 7, 7,
+	10,10, 7, 9, 9,11,11, 7, 9, 9,11,11,10,11,11,14,
+	14,10,11,12,14,14, 7, 9, 9,12,11, 9,11,11,13,13,
+	 9,11,11,13,13,12,13,13,15,16,11,12,13,15,16, 6,
+	 9, 9,11,11, 8,11,10,13,12, 9,11,11,13,14,11,13,
+	12,16,14,11,13,13,16,17,10,12,11,15,15,11,13,13,
+	16,16,11,13,13,17,16,14,15,15,17,17,14,16,16,17,
+	18, 9,11,11,14,15,10,12,12,15,15,11,13,13,16,17,
+	13,15,13,17,15,14,15,16,18, 0, 5, 7, 7,10,10, 7,
+	 9, 9,11,11, 7, 9, 9,11,11,10,11,11,14,14,10,11,
+	12,14,15, 6, 9, 9,12,11, 9,11,11,13,13, 8,10,11,
+	12,13,11,13,13,16,15,11,12,13,14,15, 7, 9, 9,11,
+	12, 9,11,11,13,13, 9,11,11,13,13,11,13,13,15,16,
+	11,13,13,15,14, 9,11,11,15,14,11,13,13,17,15,10,
+	12,12,15,15,14,16,16,17,17,13,13,15,15,17,10,11,
+	12,15,15,11,13,13,16,16,11,13,13,15,15,14,15,15,
+	18,18,14,15,15,17,17, 8,10,10,13,13,10,12,11,15,
+	15,10,11,12,15,15,14,15,15,18,18,13,14,14,18,18,
+	 9,11,11,15,16,11,13,13,17,17,11,13,13,16,16,15,
+	15,16,17, 0,14,15,17, 0, 0, 9,11,11,15,15,10,13,
+	12,18,16,11,13,13,15,16,14,16,15,20,20,14,15,16,
+	17, 0,13,14,14,20,16,14,15,16,19,18,14,15,15,19,
+	 0,18,16, 0,20,20,16,18,18, 0, 0,12,14,14,18,18,
+	13,15,14,18,16,14,15,16,18,20,16,19,16, 0,17,17,
+	18,18,19, 0, 8,10,10,14,14,10,11,11,14,15,10,11,
+	12,15,15,13,15,14,19,17,13,15,15,17, 0, 9,11,11,
+	16,15,11,13,13,16,16,10,12,13,15,17,14,16,16,18,
+	18,14,15,15,18, 0, 9,11,11,15,15,11,13,13,16,17,
+	11,13,13,18,17,14,18,16,18,18,15,17,17,18, 0,12,
+	14,14,18,18,14,15,15,20, 0,13,14,15,17, 0,16,18,
+	17, 0, 0,16,16, 0,17,20,12,14,14,18,18,14,16,15,
+	 0,18,14,16,15,18, 0,16,19,17, 0, 0,17,18,16, 0,
 	 0,
 };
 
@@ -5512,46 +6853,46 @@
 };
 
 static long _vq_lengthlist__44u5__p4_0[] = {
-	 4, 6, 6, 8, 8, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 8,
+	 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,11, 9, 9,10,
+	 8,10,10, 6, 7, 8, 9,10, 9,10,10,11,12, 9, 9,10,
 	11,12, 6, 7, 7, 9, 9, 6, 8, 7,10, 9, 7, 8, 8,10,
 	10, 9,10, 9,12,11, 9,10,10,12,11, 8, 9, 9,12,11,
-	 9,10,10,12,12, 9,10,10,12,12,11,12,12,13,13,11,
-	11,12,12,13, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
-	10,12,12,11,12,11,13,13,11,12,12,14,13, 6, 7, 7,
-	 9, 9, 7, 8, 7,10,10, 7, 7, 8, 9,10, 9,10,10,12,
-	11, 9,10,10,11,11, 7, 8, 8,10,10, 8, 8, 9,10,11,
-	 8, 8, 8,11,10,10,10,11,11,12,10,10,11,12,12, 6,
-	 7, 7,10,10, 7, 8, 8,11,10, 8, 8, 9,10,11,10,11,
-	10,13,11,10,10,11,12,12, 9,10,10,12,12,10,10,10,
-	12,13,10,11,11,13,13,12,11,12,11,14,12,12,13,13,
-	14, 9,10,10,12,12, 9,10,10,12,12,10,10,11,12,13,
-	11,12,11,14,12,12,12,12,14,14, 6, 7, 7, 9, 9, 7,
-	 8, 7,10,10, 7, 7, 8,10,10, 9,10,10,11,11, 9,10,
-	10,12,12, 6, 7, 7,10,10, 8, 9, 8,11,10, 7, 8, 8,
-	10,11,10,10,11,12,12,10,10,11,11,13, 7, 8, 8,10,
-	10, 8, 8, 8,10,11, 8, 9, 8,11,10,10,11,10,12,12,
-	10,11,10,12,11, 9,10,10,12,12,10,11,11,13,12, 9,
-	10,10,12,12,12,12,12,14,14,11,11,12,12,14, 9,10,
-	10,12,12,10,11,11,12,12,10,10,10,12,12,12,13,12,
-	14,14,11,12,11,14,11, 8, 9, 9,11,11, 9,10,10,12,
-	12, 9,10,10,12,12,11,12,12,14,14,11,12,12,13,13,
-	 9,10,10,12,12,10,10,11,12,13,10,11,10,13,12,12,
-	12,13,14,14,12,12,12,14,13, 9,10,10,12,12, 9,10,
-	10,13,12,10,10,11,12,13,12,13,12,14,13,12,12,13,
-	13,14,11,12,11,14,13,11,11,12,13,14,12,13,12,14,
-	14,13,12,14,11,16,13,14,14,16,15,11,11,11,13,13,
-	11,12,11,14,13,12,12,13,14,15,12,14,12,16,12,14,
-	14,14,16,16, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
-	10,12,12,11,12,12,13,13,12,12,12,14,14, 9,10,10,
-	12,12,10,11,10,13,12, 9,10,10,12,13,12,12,12,14,
-	13,12,12,13,13,15, 9,10,10,12,12,10,10,11,12,13,
-	10,11,10,13,12,12,13,12,14,14,12,13,12,14,13,11,
-	11,11,13,13,12,13,12,14,14,11,11,12,13,14,13,14,
-	14,16,15,13,12,14,12,15,11,12,12,13,14,12,12,13,
-	14,14,11,12,11,14,13,13,14,14,15,16,13,14,11,16,
-	11,
+	 9,10,10,12,12, 9,10,10,12,12,11,12,12,13,14,11,
+	11,12,13,14, 8, 9, 9,11,12, 9,10,10,12,12, 9,10,
+	10,12,12,11,12,11,14,13,11,12,12,13,13, 5, 7, 7,
+	 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,10, 9,10,10,12,
+	12, 9,10,10,12,12, 7, 8, 8,10,10, 8, 8, 9,10,11,
+	 8, 9, 9,11,11,10,10,11,11,13,10,11,11,12,13, 6,
+	 7, 8,10,10, 7, 9, 8,11,10, 8, 9, 9,11,11,10,11,
+	10,13,11,10,11,11,12,12, 9,10,10,12,12,10,10,11,
+	12,13,10,11,11,13,13,12,11,13,12,15,12,13,13,14,
+	15, 9,10,10,12,12, 9,11,10,13,12,10,11,11,13,13,
+	11,13,11,14,12,12,13,13,14,15, 5, 7, 7, 9, 9, 7,
+	 8, 8,10,10, 7, 8, 8,10,10, 9,10,10,12,12, 9,10,
+	10,12,12, 6, 8, 7,10,10, 8, 9, 9,11,11, 7, 8, 9,
+	10,11,10,11,11,12,12,10,10,11,11,13, 7, 8, 8,10,
+	10, 8, 9, 9,11,11, 8, 9, 8,11,10,10,11,11,13,12,
+	10,11,10,13,11, 9,10,10,12,12,10,11,11,13,12, 9,
+	10,10,12,13,12,13,13,14,15,11,11,13,12,14, 9,10,
+	10,12,12,10,11,11,13,13,10,11,10,13,12,12,13,13,
+	14,14,12,13,11,14,12, 8, 9, 9,12,12, 9,10,10,12,
+	12, 9,10,10,12,12,12,12,12,14,14,11,12,12,14,13,
+	 9,10,10,12,12,10,11,11,13,13,10,11,11,13,12,12,
+	12,13,14,15,12,13,13,15,14, 9,10,10,12,12,10,11,
+	10,13,12,10,11,11,12,13,12,13,12,15,13,12,13,13,
+	14,15,11,12,12,14,13,11,12,12,14,15,12,13,13,15,
+	14,13,12,14,12,16,13,14,14,15,15,11,11,12,14,14,
+	11,12,11,14,13,12,13,13,14,15,13,14,12,16,12,14,
+	14,15,16,16, 8, 9, 9,11,12, 9,10,10,12,12, 9,10,
+	10,12,13,11,12,12,13,13,12,12,13,14,14, 9,10,10,
+	12,12,10,11,10,13,12,10,10,11,12,13,12,13,13,15,
+	14,12,12,13,13,15, 9,10,10,12,13,10,11,11,12,13,
+	10,11,11,13,13,12,13,13,14,15,12,13,12,15,14,11,
+	12,11,14,13,12,13,13,15,14,11,11,12,13,14,14,15,
+	14,16,15,13,12,14,13,16,11,12,12,13,14,12,13,13,
+	14,15,11,12,11,14,14,14,14,14,15,16,13,15,12,16,
+	12,
 };
 
 static float _vq_quantthresh__44u5__p4_0[] = {
@@ -5593,10 +6934,10 @@
 };
 
 static long _vq_lengthlist__44u5__p5_0[] = {
-	 2, 4, 3, 6, 6, 8, 7,10,10, 3, 5, 5, 8, 7, 8, 8,
-	11,11, 3, 5, 5, 7, 8, 8, 8,10,11, 6, 8, 7, 9, 9,
-	10, 9,12,11, 7, 7, 8, 9, 9, 9,10,11,12, 8, 8, 8,
-	10, 9,11,11,13,12, 8, 8, 8, 9,10,11,12,12,13,10,
+	 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,
+	10,10,11,11,13,12, 8, 8, 9, 9,10,11,11,12,13,10,
 	11,10,12,11,13,12,14,14,10,10,11,11,12,12,13,14,
 	14,
 };
@@ -5641,11 +6982,11 @@
 };
 
 static long _vq_lengthlist__44u5__p6_0[] = {
-	 3, 4, 4, 5, 6, 7, 7, 9, 9, 4, 5, 4, 6, 6, 7, 7,
-	 9, 9, 4, 4, 4, 6, 6, 7, 7, 9, 9, 6, 6, 6, 7, 7,
+	 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,
-	 8, 8, 9, 9,10,10, 7, 7, 7, 8, 8, 9, 9,10,11, 9,
-	 9, 9,10,10,11,10,11,11, 9, 9, 9,10,10,11,11,11,
+	 8, 8, 9, 9,11,10, 7, 7, 7, 8, 8, 9, 9,10,11, 9,
+	 9, 9,10,10,11,10,11,11, 9, 9, 9,10,10,11,10,11,
 	11,
 };
 
@@ -5683,11 +7024,11 @@
 };
 
 static long _vq_lengthlist__44u5__p7_0[] = {
-	 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 8, 8,11,10, 7,
-	10,10, 5, 9, 9, 8,10,10, 8,10,11, 4, 9, 9, 9,11,
-	11, 9,12,11, 8,11,11,11,12,12,10,12,12, 7,11,11,
-	10,12,12,10,12,12, 4, 9, 9, 9,11,11, 9,11,11, 7,
-	11,11,10,12,12,10,11,12, 8,11,11,10,12,12,11,12,
+	 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,
+	11,12,12,10,12,13, 4, 9, 9, 9,12,12, 9,12,12, 7,
+	12,11,10,13,13,11,12,12, 7,12,12,10,13,13,11,12,
 	12,
 };
 
@@ -5733,10 +7074,10 @@
 
 static 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, 9, 8, 4, 5, 5, 7, 7, 8, 8, 8, 9, 9,
+	 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,
-	 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 9, 8, 9, 9, 9, 9,
-	 9, 9, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 8, 9, 8,
+	 8, 9, 9, 9, 9, 9, 9, 7, 8, 8, 9, 9, 9, 9, 9, 9,
+	 9, 9, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 8, 9, 9,
 	 9, 9, 9, 9,10,10,10,10, 8, 9, 9, 9, 9, 9, 9,10,
 	10,10,10, 8, 9, 9, 9, 9, 9, 9,10,10,10,10, 8, 9,
 	 9, 9, 9, 9, 9,10,10,10,10,
@@ -5787,12 +7128,12 @@
 static 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, 8, 9, 9,10,10,12,11,13,12, 6, 7, 8, 9,
-	 9,10,10,11,11,12,12, 8, 9, 9,10,10,11,12,12,12,
-	14,13, 8, 9, 9,10,10,11,11,12,13,14,13,10,11,10,
-	12,12,13,13,14,13,15,14,10,11,11,12,12,12,13,13,
-	13,15,15,11,12,12,13,12,13,14,14,14,15,14,11,11,
-	12,13,13,13,14,14,14,15,15,
+	11, 6, 8, 7, 9, 9,10,10,11,11,13,12, 6, 8, 8, 9,
+	 9,10,10,11,11,12,13, 8, 9, 9,10,10,12,12,13,12,
+	14,13, 8, 9, 9,10,10,12,12,13,13,14,14, 9,11,11,
+	12,12,13,13,14,14,15,14, 9,11,11,12,12,13,13,14,
+	14,15,14,11,12,12,13,13,14,14,15,14,15,14,11,11,
+	12,13,13,14,14,14,14,15,15,
 };
 
 static float _vq_quantthresh__44u5__p8_0[] = {
@@ -5838,10 +7179,10 @@
 };
 
 static long _vq_lengthlist__44u5__p8_1[] = {
-	 3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 5, 6, 5, 6, 6,
-	 7, 7, 8, 8, 8, 8, 5, 6, 6, 6, 6, 7, 7, 8, 8, 8,
-	 8, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 6, 6, 7, 7,
-	 7, 7, 7, 8, 8, 8, 8, 7, 7, 7, 7, 7, 8, 8, 8, 8,
+	 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,
+	 7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8,
 	 8, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 7, 8, 8,
 	 8, 8, 8, 8, 8, 8, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8,
 	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
@@ -5893,17 +7234,17 @@
 };
 
 static long _vq_lengthlist__44u5__p9_0[] = {
-	 1, 3, 3,12,10,12,12,12,12,12,12,12,12, 3, 8, 9,
-	12,12,12,12,12,12,12,12,12,12, 4, 9, 9,12,12,12,
-	12,12,12,12,12,12,12,11,12,12,12,12,12,12,12,12,
-	12,12,12,12, 9,12,12,12,12,12,12,12,12,12,12,12,
+	 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,
+	13,13,13,13,11,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+	13,13,13,13,13,13,13,13,13,13,13,13,13,12,12,12,
 	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,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,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,
+	12,12,12,12,12,12,12,12,12,
 };
 
 static float _vq_quantthresh__44u5__p9_0[] = {
@@ -5953,20 +7294,20 @@
 };
 
 static long _vq_lengthlist__44u5__p9_1[] = {
-	 1, 4, 4, 7, 7, 8, 9, 7, 7, 8, 8, 9, 9,10,10, 5,
-	 6, 6, 9, 8,10,10, 9, 8, 9, 9,10, 9,11,10, 4, 6,
-	 6, 8, 9, 9,10, 8, 9, 9,10,10,10,11,10, 7, 8, 8,
-	10,10,11,11,10,10,11,11,11,11,11,11, 7, 8, 8,10,
-	10,11,11,10,10,11,11,11,11,11,12, 8, 9,10,11,10,
-	12,12,11,11,11,11,12,12,12,13, 8, 9, 9,11,11,11,
-	12,11,11,11,11,12,12,12,12, 8, 9, 9,10,10,11,11,
-	12,11,12,12,12,13,13,13, 8, 9, 9,10,10,11,11,12,
-	11,12,12,13,13,12,13, 9,10,10,11,11,12,11,12,13,
-	14,14,15,15,15,14, 9,10,10,11,11,12,12,12,12,13,
-	13,14,14,14,14, 9,10,11,12,11,12,13,14,13,14,13,
-	14,14,14,14, 9,11,11,11,11,12,13,13,13,14,13,15,
-	15,14,14,10,11,11,12,12,13,13,13,13,14,14,14,15,
-	15,15,10,11,11,12,12,12,13,13,13,15,14,15,14,14,
+	 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,
+	10,10,11,11,10,10,11,11,11,12,11,11, 7, 8, 8,10,
+	10,11,11,10,10,11,11,12,11,11,11, 8, 9, 9,11,11,
+	12,12,11,11,12,11,12,12,12,12, 8, 9,10,11,11,12,
+	12,11,11,12,12,12,12,12,12, 8, 9, 9,10,10,12,11,
+	12,12,12,12,12,12,12,13, 8, 9, 9,11,11,11,11,12,
+	12,12,12,13,12,13,13, 9,10,10,11,11,12,12,12,13,
+	12,13,13,13,14,13, 9,10,10,11,11,12,12,12,13,13,
+	12,13,13,14,13, 9,11,10,12,11,13,12,12,13,13,13,
+	13,13,13,14, 9,10,10,12,12,12,12,12,13,13,13,13,
+	13,14,14,10,11,11,12,12,12,13,13,13,14,14,13,14,
+	14,14,10,11,11,12,12,12,12,13,12,13,14,13,14,14,
 	14,
 };
 
@@ -6019,25 +7360,25 @@
 };
 
 static long _vq_lengthlist__44u5__p9_2[] = {
-	 3, 5, 5, 7, 7, 8, 8, 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, 8, 8, 9, 9, 9,
-	 9, 9, 9, 7, 7, 7, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 7, 8, 8, 8, 8, 9, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9,10, 9, 8, 8, 8, 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,10, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 9,10, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9,10, 9, 9, 9, 9, 9,10, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9,10,10,10,10, 9,10,10,10,10, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10, 9, 9, 9, 9,10,
-	 9, 9, 9, 9, 9, 9, 9,10, 9,10, 9, 9, 9,10,10, 9,
-	 9,
+	 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,
+	 9, 9, 9, 7, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 7, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9,
+	 9,10, 9,10,10,10, 8, 8, 8, 9, 8, 9, 9, 9, 9, 9,
+	 9, 9,10, 9,10, 9,10, 8, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9,10, 9,10,10,10,10,10, 8, 9, 9, 9, 9, 9, 9,10,
+	 9,10, 9,10,10,10,10,10,10, 9, 9, 9, 9, 9,10, 9,
+	10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9,
+	 9,10, 9,10, 9,10,10,10,10,10,10, 9, 9, 9, 9, 9,
+	10,10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9,
+	 9, 9,10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9,
+	 9,10,10, 9,10,10,10,10,10,10,10,10,10,10, 9, 9,
+	 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,10, 9,
+	 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,10,
+	 9, 9, 9,10, 9,10,10,10,10,10,10,10,10,10,10,10,
+	10,
 };
 
 static float _vq_quantthresh__44u5__p9_2[] = {
@@ -6070,13 +7411,13 @@
 };
 
 static long _huff_lengthlist__44u5__short[] = {
-	 4,11,16,14,18,15,18,15,17,17, 4, 6, 9, 9,12, 9,
-	14,10,14,17, 6, 6, 5, 7, 6, 8,10,10,16,17, 7, 8,
-	 7, 9, 9,10,12,12,14,17, 8, 6, 5, 7, 4, 7, 5, 7,
-	14,17, 9, 9, 8, 9, 7,10, 8,10,14,17,11, 9, 7, 9,
-	 4, 7, 3, 6,15,17,11,10,10,10, 6, 9, 5, 6,14,17,
-	17,17,10,15, 4, 8, 3, 5,12,17,17,17,12,16, 7,11,
-	 6, 8,16,17,
+	 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,
+	14,17, 9, 9, 8, 9, 7, 9, 8,10,16,17,12,10, 7, 8,
+	 4, 7, 4, 7,16,17,12,11, 9,10, 6, 9, 5, 7,14,17,
+	14,13,10,15, 4, 8, 3, 5,14,17,17,14,11,15, 6,10,
+	 6, 8,15,17,
 };
 
 static static_codebook _huff_book__44u5__short = {
@@ -6091,13 +7432,13 @@
 };
 
 static long _huff_lengthlist__44u6__long[] = {
-	 3, 9,14,13,15,13,16,12,12,12, 5, 4, 6, 7, 8, 9,
-	10,10,13,12,10, 5, 5, 6, 6, 9, 9,10,14,14,10, 6,
-	 6, 7, 6, 8, 9, 9,13,12,13, 7, 5, 6, 4, 6, 6, 7,
-	11,15,10, 8, 7, 7, 6, 7, 7, 7,11,13,16,10, 8, 8,
-	 5, 6, 4, 6,10,14, 9, 9, 9, 8, 6, 6, 5, 4, 7,11,
-	11,11,12,11,10, 9, 9, 5, 5, 9,10,13,14,14,14,14,
-	15, 8, 7, 8,
+	 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,
+	11,14,10, 7, 7, 7, 6, 6, 6, 7,10,13,15,10, 9, 8,
+	 5, 6, 5, 6,10,14,10, 9, 8, 8, 6, 6, 5, 4, 6,11,
+	11,11,12,11,10, 9, 9, 5, 5, 9,10,12,15,13,13,13,
+	13, 8, 7, 7,
 };
 
 static static_codebook _huff_book__44u6__long = {
@@ -6119,10 +7460,10 @@
 
 static 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,11,
-	10, 8,10,10, 8,11,10,10,12,13,10,13,13, 7,10,10,
+	 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,
 	10,13,11,10,13,13, 5, 8, 8, 8,11,10, 8,10,10, 7,
-	10,10,10,13,13, 9,11,13, 8,10,11,10,13,13,10,13,
+	10,10,10,13,13,10,11,13, 8,10,11,10,13,13,10,13,
 	12,
 };
 
@@ -6159,12 +7500,12 @@
 };
 
 static long _vq_lengthlist__44u6__p2_0[] = {
-	 3, 5, 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,
-	 7, 6, 7, 8, 6, 8, 8, 8, 8, 9, 8, 9, 9, 6, 7, 7,
-	 7, 9, 8, 8, 9, 9, 5, 6, 6, 6, 8, 7, 6, 7, 8, 6,
-	 7, 7, 8, 9, 9, 7, 8, 9, 6, 8, 8, 8, 9, 9, 8, 9,
-	 8,
+	 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,
+	 7, 9, 8, 8, 9, 9, 5, 6, 6, 6, 8, 7, 6, 8, 8, 6,
+	 8, 8, 8, 9, 9, 7, 8, 9, 6, 8, 8, 8, 9, 9, 8, 9,
+	 9,
 };
 
 static float _vq_quantthresh__44u6__p2_0[] = {
@@ -6202,46 +7543,46 @@
 };
 
 static long _vq_lengthlist__44u6__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,13, 5, 7, 7,10, 9, 7, 9,
-	 9,11,11, 7, 8, 9,10,11,10,11,11,13,14, 9,10,11,
-	13,13, 5, 7, 7, 9, 9, 7, 9, 8,11,10, 7, 9, 9,11,
-	11, 9,11,10,14,13,10,11,11,14,13, 8,10,10,14,13,
-	10,12,11,15,14, 9,11,11,15,14,13,15,14,20,16,13,
+	 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,
+	13,14, 5, 7, 7, 9,10, 6, 9, 8,11,11, 7, 9, 9,11,
+	11, 9,11,10,14,13,10,11,11,14,13, 8,10,10,13,13,
+	10,11,11,15,15, 9,11,11,14,14,13,14,14,17,16,12,
 	13,14,16,16, 8,10,10,13,14, 9,11,11,14,15,10,11,
-	12,14,15,13,13,14,16,16,13,14,14,16,17, 5, 7, 7,
-	10,10, 7, 9, 9,11,11, 7, 9, 9,11,11,10,11,11,15,
-	14,10,11,11,14,14, 7, 9, 9,12,11, 9,11,11,12,13,
-	 9,11,11,13,13,11,12,13,14,16,11,12,13,16,16, 6,
-	 9, 8,11,11, 8,11,10,13,12, 9,10,11,12,13,11,13,
-	11,15,14,11,13,13,15,15,10,12,11,15,14,11,12,13,
-	17,16,11,13,13,16,17,14,15,16,17,17,14,15,16,20,
-	 0, 9,11,11,14,15,10,13,12,16,16,11,13,13,17,17,
-	13,15,14,17,15,15,16,16, 0, 0, 5, 7, 7,10,10, 7,
-	 9, 9,11,11, 7, 8, 9,11,11,10,11,11,14,14,10,11,
-	11,14,14, 6, 9, 9,11,11, 9,11,11,14,12, 8,10,11,
-	12,13,11,13,13,16,16,11,11,13,14,16, 7, 9, 9,11,
-	12, 9,11,11,13,13, 9,11,11,13,12,11,13,12,16,16,
-	12,13,12,16,14, 9,11,11,16,15,11,13,13,17,15,10,
-	12,12,15,16,14,16,16, 0,17,13,14,15,15,17,10,11,
-	12,15,15,11,13,13,17,17,11,13,13,15,16,14,15,15,
-	19,18,14,15,15,19,16, 8,10,10,14,14,10,12,11,15,
-	16,10,11,11,15,17,13,16,15,19,19,13,15,14,17,17,
-	 9,11,12,15,16,11,13,13,18,19,11,13,13,16,17,16,
-	16,17, 0, 0,15,15,16, 0,19, 9,11,11,15,16,10,13,
-	12,17,15,11,13,13,16,17,14,17,15,18,17,15,16,15,
-	18, 0,13,14,15, 0,19,14,16,16, 0,17,15,16,16, 0,
-	17,16,17, 0, 0, 0,16,17,19, 0, 0,12,14,14,17,17,
-	13,15,13, 0,19,14,16,16,18,19,16,18,15,19,18,17,
-	18,17,19, 0, 8,10,10,14,13,10,11,11,16,15,10,11,
-	11,15,15,13,15,15,19,18,14,15,16, 0,18, 9,11,11,
-	15,14,11,13,13, 0,16,10,12,13,15,17,14,16,16, 0,
-	18,15,16,17,17, 0, 9,11,11,16,15,11,13,13,16,16,
-	11,14,13,18,18,15,17,15,18,17,15,16,18, 0, 0,12,
-	14,14,18,19,14,15,16, 0,18,13,14,15,18, 0,17,17,
-	17, 0, 0,16,15,18,17, 0,12,14,15,17,19,14,16,16,
-	19, 0,14,17,16, 0,18,17,19,17, 0, 0,16,18,17, 0,
-	17,
+	12,14,15,12,14,13,16,15,13,14,14,15,17, 5, 7, 7,
+	10,10, 7, 9, 9,11,11, 7, 9, 9,11,11,10,12,11,14,
+	14,10,11,11,14,14, 7, 9, 9,12,11, 9,11,11,13,13,
+	 9,11,11,13,13,11,13,13,14,15,11,12,13,15,16, 6,
+	 9, 9,11,12, 8,11,10,13,12, 9,11,11,13,14,11,13,
+	12,16,14,11,13,13,15,16,10,12,11,14,15,11,13,13,
+	15,17,11,13,13,17,16,15,15,16,17,16,14,15,16,18,
+	 0, 9,11,11,14,15,10,12,12,16,15,11,13,13,16,16,
+	13,15,14,18,15,14,16,16, 0, 0, 5, 7, 7,10,10, 7,
+	 9, 9,11,11, 7, 9, 9,11,11,10,11,11,14,14,10,11,
+	12,14,14, 6, 9, 9,11,11, 9,11,11,13,13, 8,10,11,
+	12,13,11,13,13,16,15,11,12,13,14,16, 7, 9, 9,11,
+	12, 9,11,11,13,13, 9,11,11,13,13,11,13,13,16,15,
+	11,13,12,15,15, 9,11,11,15,14,11,13,13,17,16,10,
+	12,13,15,16,14,16,16, 0,18,14,14,15,15,17,10,11,
+	12,15,15,11,13,13,16,16,11,13,13,16,16,14,16,16,
+	19,17,14,15,15,17,17, 8,10,10,14,14,10,12,11,15,
+	15,10,11,12,16,15,14,15,15,18,20,13,14,16,17,18,
+	 9,11,11,15,16,11,13,13,17,17,11,13,13,17,16,15,
+	16,16, 0, 0,15,16,16, 0, 0, 9,11,11,15,15,10,13,
+	12,17,15,11,13,13,17,16,15,17,15,20,19,15,16,16,
+	19, 0,13,15,14, 0,17,14,15,16, 0,20,15,16,16, 0,
+	19,17,18, 0, 0, 0,16,17,18, 0, 0,12,14,14,19,18,
+	13,15,14, 0,17,14,15,16,19,19,16,18,16, 0,19,19,
+	20,17,20, 0, 8,10,10,13,14,10,11,11,15,15,10,12,
+	12,15,16,14,15,14,19,16,14,15,15, 0,18, 9,11,11,
+	16,15,11,13,13, 0,16,11,12,13,16,17,14,16,17, 0,
+	19,15,16,16,18, 0, 9,11,11,15,16,11,13,13,16,16,
+	11,14,13,18,17,15,16,16,18,20,15,17,19, 0, 0,12,
+	14,14,17,17,14,16,15, 0, 0,13,14,15,19, 0,16,18,
+	20, 0, 0,16,16,18,18, 0,12,14,14,17,20,14,16,16,
+	19, 0,14,16,14, 0,20,16,20,17, 0, 0,17, 0,15, 0,
+	19,
 };
 
 static float _vq_quantthresh__44u6__p3_0[] = {
@@ -6279,46 +7620,46 @@
 };
 
 static long _vq_lengthlist__44u6__p4_0[] = {
-	 4, 6, 6, 8, 8, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 8,
+	 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,
+	 8,10,10, 7, 7, 8, 9,10, 9,10,10,11,11, 9, 9,10,
 	11,12, 6, 7, 7, 9, 9, 7, 8, 7,10, 9, 7, 8, 8,10,
 	10, 9,10, 9,12,11, 9,10,10,12,11, 8, 9, 9,11,11,
-	 9,10,10,12,12, 9, 9,10,12,12,11,12,12,13,13,11,
-	11,12,12,13, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
-	10,12,12,11,12,11,13,13,11,12,12,13,13, 6, 7, 7,
-	 9, 9, 7, 8, 7,10, 9, 7, 7, 8, 9,10, 9,10,10,12,
-	11, 9,10,10,11,12, 7, 8, 8,10,10, 8, 8, 9,10,10,
-	 8, 8, 8,10,10,10,10,11,12,12,10,10,11,12,12, 6,
-	 7, 7,10,10, 7, 8, 8,11,10, 8, 8, 9,10,11,10,11,
-	10,12,11,10,10,11,12,12, 9,10,10,12,12,10,10,11,
-	12,12,10,11,10,13,12,12,12,12,12,14,12,12,12,13,
-	14, 9,10,10,12,12, 9,10,10,12,12,10,10,11,12,13,
-	11,12,11,14,12,12,12,13,14,14, 6, 7, 7, 9, 9, 7,
-	 8, 7,10, 9, 7, 7, 8,10,10, 9,10,10,12,11, 9,10,
-	10,11,12, 6, 7, 7,10,10, 8, 9, 8,11,10, 7, 8, 8,
-	10,10,10,10,11,12,12,10,10,10,11,12, 7, 8, 8,10,
-	10, 8, 8, 8,10,10, 8, 8, 8,10,10,10,11,10,12,12,
-	10,11,10,12,11, 9,10,10,12,12,10,11,10,13,12, 9,
-	10,10,12,12,12,12,12,14,14,11,11,12,12,13, 9,10,
-	10,12,12,10,11,11,12,12,10,11,10,12,12,12,12,12,
-	14,14,12,12,12,14,12, 8, 9, 9,11,11, 9,10,10,12,
-	12, 9,10,10,12,12,11,12,12,13,13,11,12,12,13,13,
-	 9,10,10,12,12,10,10,11,12,13,10,11,10,12,12,12,
-	12,13,13,14,12,12,12,14,14, 9,10,10,12,12, 9,10,
-	10,12,12,10,10,10,12,12,12,12,12,14,13,12,12,12,
-	14,14,11,12,12,13,13,11,12,12,14,14,12,12,12,14,
-	14,13,12,14,12,15,13,14,14,15,15,11,11,11,13,13,
-	11,12,11,14,13,12,12,12,14,14,12,14,12,15,12,13,
-	14,14,15,16, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
-	10,12,12,11,12,12,13,13,11,12,12,13,14, 9,10,10,
-	12,12,10,11,10,13,12, 9,10,10,12,13,12,12,12,15,
-	14,12,12,13,13,14, 9,10,10,12,12,10,10,11,12,12,
-	10,11,10,12,12,12,13,12,14,14,12,13,12,14,13,11,
-	11,11,13,13,12,12,12,14,13,11,11,12,13,14,13,14,
-	14,15,15,12,12,14,12,15,11,12,12,13,14,12,12,12,
-	14,14,11,12,12,14,14,13,14,14,15,15,13,14,12,16,
-	12,
+	 9,10,10,12,12, 9,10,10,12,12,11,12,12,14,13,11,
+	11,12,13,13, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
+	10,12,12,11,12,11,13,12,11,12,12,13,13, 5, 7, 7,
+	 9, 9, 7, 8, 7,10,10, 7, 7, 8,10,10, 9,10,10,12,
+	11, 9,10,10,11,12, 7, 8, 8,10,10, 8, 8, 9,11,11,
+	 8, 9, 9,11,11,10,10,11,12,13,10,10,11,12,12, 6,
+	 7, 7,10,10, 7, 9, 8,11,10, 8, 8, 9,10,11,10,11,
+	10,13,11,10,11,11,12,12, 9,10,10,12,12,10,10,11,
+	13,13,10,11,11,12,13,12,12,12,13,14,12,12,13,14,
+	14, 9,10,10,12,12, 9,10,10,13,12,10,11,11,13,13,
+	11,12,11,14,12,12,13,13,14,14, 6, 7, 7, 9, 9, 7,
+	 8, 7,10,10, 7, 8, 8,10,10, 9,10,10,12,11, 9,10,
+	10,11,12, 6, 7, 7,10,10, 8, 9, 8,11,10, 7, 8, 9,
+	10,11,10,11,11,12,12,10,10,11,11,13, 7, 8, 8,10,
+	10, 8, 9, 9,11,11, 8, 9, 8,11,11,10,11,10,13,12,
+	10,11,11,13,12, 9,10,10,12,12,10,11,11,13,12, 9,
+	10,10,12,13,12,13,12,14,14,11,11,12,12,14, 9,10,
+	10,12,12,10,11,11,13,13,10,11,10,13,12,12,12,12,
+	14,14,12,13,12,14,13, 8, 9, 9,11,11, 9,10,10,12,
+	12, 9,10,10,12,12,11,12,12,14,13,11,12,12,13,14,
+	 9,10,10,12,12,10,11,11,13,13,10,11,11,13,13,12,
+	12,13,14,15,12,12,13,14,14, 9,10,10,12,12, 9,11,
+	10,13,12,10,10,11,12,13,12,13,12,14,13,12,12,13,
+	14,15,11,12,12,14,13,11,12,12,14,14,12,13,13,14,
+	14,13,13,14,14,16,13,14,14,15,15,11,12,11,13,13,
+	11,12,11,14,13,12,12,13,14,15,12,14,12,15,12,13,
+	14,15,15,16, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
+	10,12,12,11,12,12,14,13,11,12,12,13,13, 9,10,10,
+	12,12,10,11,10,13,12, 9,10,11,12,13,12,13,12,14,
+	14,12,12,13,13,14, 9,10,10,12,12,10,11,11,13,13,
+	10,11,11,13,13,12,13,12,14,14,12,13,13,14,14,11,
+	11,11,13,13,12,13,12,14,14,11,11,12,13,14,14,14,
+	14,16,15,12,12,14,12,15,11,12,12,13,14,12,13,13,
+	14,15,11,12,12,14,14,13,14,14,16,16,13,14,13,16,
+	13,
 };
 
 static float _vq_quantthresh__44u6__p4_0[] = {
@@ -6361,10 +7702,10 @@
 
 static 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,10, 9,
-	10, 9,12,12, 6, 7, 8, 9,10, 9,10,12,12, 8, 8, 8,
-	10, 9,12,11,13,13, 8, 8, 8, 9,10,11,12,12,13,10,
-	11,11,12,11,13,12,14,14,10,10,11,11,12,13,13,14,
+	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,
+	10, 9,12,11,13,13, 8, 8, 9, 9,10,11,12,13,13,10,
+	11,11,12,12,13,13,14,14,10,10,11,11,12,13,13,14,
 	14,
 };
 
@@ -6409,11 +7750,11 @@
 
 static 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, 7, 9, 9, 5, 6, 6, 7, 7,
-	 8, 8,10,10, 6, 6, 6, 7, 7, 8, 8,10,10, 7, 7, 7,
-	 8, 8, 9, 9,10,10, 7, 7, 7, 8, 8, 9, 9,10,11, 9,
-	 9, 9,10,10,11,11,11,11, 9, 9, 9,10,10,10,11,11,
-	11,
+	 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,
+	 8, 8,10, 9,11,11, 7, 7, 8, 8, 8, 9,10,10,11, 9,
+	 9, 9,10,10,11,11,12,11, 9, 9, 9,10,10,11,11,11,
+	12,
 };
 
 static float _vq_quantthresh__44u6__p6_0[] = {
@@ -6450,12 +7791,12 @@
 };
 
 static long _vq_lengthlist__44u6__p7_0[] = {
-	 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 8, 8,11,10, 8,
-	11,10, 5, 8, 9, 7,10,10, 8,10,11, 4, 9, 9, 9,12,
-	11, 9,11,12, 8,11,12,11,12,13,10,13,12, 7,12,11,
-	10,12,12,10,13,13, 4, 9, 9, 8,11,11, 9,11,12, 7,
-	12,12,10,13,13,10,12,13, 8,12,12,10,13,13,11,13,
-	12,
+	 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,
+	10,13,12,10,13,13, 5, 9, 8, 8,11,11, 9,11,11, 7,
+	11,11,10,13,13,10,12,13, 7,11,11,10,13,13, 9,13,
+	10,
 };
 
 static float _vq_quantthresh__44u6__p7_0[] = {
@@ -6499,14 +7840,14 @@
 };
 
 static long _vq_lengthlist__44u6__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,
-	 7, 8, 8, 9, 9, 9, 9, 7, 8, 7, 8, 8, 9, 9, 9, 9,
-	 9, 9, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 8, 8, 8,
-	 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9, 9, 8, 8, 8, 9, 9, 9, 9, 9, 9,10,10, 8, 8,
-	 8, 9, 9, 9, 9, 9, 9,10,10,
+	 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,
+	 7, 8, 8, 8, 8, 8, 8, 7, 8, 8, 8, 8, 8, 8, 9, 9,
+	 9, 9, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 8, 8, 8,
+	 8, 8, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 9, 9, 9,
+	 9, 9, 9, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 8, 8,
+	 8, 8, 8, 9, 9, 9, 9, 9, 9,
 };
 
 static float _vq_quantthresh__44u6__p7_1[] = {
@@ -6557,9 +7898,9 @@
 	11, 6, 8, 8, 9, 9,10,10,11,11,12,12, 6, 8, 8, 9,
 	 9,10,10,11,11,12,12, 8, 9, 9,10,10,11,11,12,12,
 	13,13, 8, 9, 9,10,10,11,11,12,12,13,13,10,10,10,
-	11,11,12,12,13,13,14,14,10,10,10,11,11,12,13,13,
-	13,14,14,11,12,12,13,13,13,13,14,14,15,14,11,11,
-	11,13,13,14,13,14,14,15,14,
+	11,11,13,13,13,13,15,14, 9,10,10,12,11,12,13,13,
+	13,14,15,11,12,12,13,13,13,13,15,14,15,15,11,11,
+	12,13,13,14,14,14,15,15,15,
 };
 
 static float _vq_quantthresh__44u6__p8_0[] = {
@@ -6605,13 +7946,13 @@
 };
 
 static long _vq_lengthlist__44u6__p8_1[] = {
-	 3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 5, 6, 6, 7, 6,
-	 7, 7, 7, 7, 8, 8, 5, 6, 6, 6, 7, 7, 7, 7, 7, 8,
-	 8, 6, 7, 6, 7, 7, 7, 7, 8, 8, 8, 8, 6, 6, 7, 7,
-	 7, 7, 7, 8, 8, 8, 8, 7, 7, 7, 7, 7, 8, 8, 8, 8,
-	 8, 8, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 7, 7, 7,
-	 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 8, 8, 8, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 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,
+	 7, 7, 8, 8, 8, 8, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8,
+	 8, 8, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7,
+	 8, 8, 8, 8, 8, 8, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 8,
 	 8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
@@ -6662,21 +8003,21 @@
 };
 
 static long _vq_lengthlist__44u6__p9_0[] = {
-	 1, 3, 3,10,12,13,13,13,13,13,13,13,13,13,13, 3,
-	 9, 9,13,13,13,13,13,13,13,13,13,13,12,12, 4, 9,
-	 9,12,12,12,12,12,12,12,12,12,12,12,12, 9,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12, 9,11,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-	12,
+	 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,
+	14,14,14,14,14,14,14,14,14,14,14,14,11,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+	14,
 };
 
 static float _vq_quantthresh__44u6__p9_0[] = {
@@ -6726,21 +8067,21 @@
 };
 
 static long _vq_lengthlist__44u6__p9_1[] = {
-	 1, 4, 4, 7, 7, 8, 8, 7, 7, 8, 8, 9, 9, 9, 9, 5,
-	 6, 6, 8, 8,10,10, 9, 9,10, 9,10, 9,10,10, 4, 6,
-	 6, 8, 9,10,10, 8, 9, 9,10,10,10,10,10, 7, 9, 8,
-	10,10,11,11,10,10,11,11,11,11,12,12, 7, 8, 8,10,
-	10,11,11,10,10,10,11,11,11,11,12, 8,10,10,11,11,
-	12,12,11,11,11,11,12,12,12,13, 8, 9, 9,11,11,12,
-	12,11,11,12,12,12,12,12,12, 8, 9, 9,10,10,11,11,
-	13,12,13,12,13,13,13,13, 8, 9, 9,10,10,11,11,12,
-	12,12,12,13,12,13,12, 9,10,10,11,11,12,12,13,13,
-	14,12,13,13,14,13, 9,10,10,11,11,12,12,12,12,13,
-	13,13,13,14,14, 9,11,10,11,11,12,13,13,12,13,13,
-	15,13,14,14, 9,10,10,11,12,12,13,13,13,13,13,14,
-	14,14,14,10,11,11,12,12,13,12,13,13,14,14,14,14,
-	14,15,10,11,11,11,12,13,13,13,13,14,14,14,14,14,
-	14,
+	 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,
+	10,10,11,11,10,10,11,11,11,11,11,11, 7, 8, 9,10,
+	10,11,11,10,10,11,11,11,11,11,12, 8,10,10,11,11,
+	12,12,11,11,12,12,12,12,13,12, 8,10,10,11,11,12,
+	11,11,11,11,12,12,12,12,13, 8, 9, 9,11,10,11,11,
+	12,12,12,12,13,12,13,12, 8, 9, 9,11,11,11,11,12,
+	12,12,12,12,13,13,13, 9,10,10,11,12,12,12,12,12,
+	13,13,13,13,13,13, 9,10,10,11,11,12,12,12,12,13,
+	13,13,13,14,13,10,10,10,12,11,12,12,13,13,13,13,
+	13,13,13,13,10,10,11,11,11,12,12,13,13,13,13,13,
+	13,13,13,10,11,11,12,12,13,12,12,13,13,13,13,13,
+	13,14,10,11,11,12,12,13,12,13,13,13,14,13,13,14,
+	13,
 };
 
 static float _vq_quantthresh__44u6__p9_1[] = {
@@ -6792,25 +8133,25 @@
 };
 
 static long _vq_lengthlist__44u6__p9_2[] = {
-	 3, 5, 5, 7, 7, 8, 8, 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,
-	 9, 9, 9, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 9, 8, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
+	 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,
+	 9, 9, 9, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 9, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 8, 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,10, 9,10,10, 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,10,10, 9,10, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9,10, 9, 9, 9,10, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10, 9, 9, 9,10,
-	 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 9, 9,10, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9,10, 9, 9, 9,10, 9, 9,10, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,10,10,10, 9,10, 9,10,10,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10, 9,10,10, 9, 9,
+	10,
 };
 
 static float _vq_quantthresh__44u6__p9_2[] = {
@@ -6843,13 +8184,13 @@
 };
 
 static long _huff_lengthlist__44u6__short[] = {
-	 5,11,15,14,17,14,17,15,17,17, 4, 6, 9, 9,14, 9,
-	17,10,15,17, 6, 6, 5, 7, 7, 9,11,10,15,17, 6, 8,
-	 8,10, 9,11,14,13,16,17, 7, 6, 5, 7, 5, 7, 5, 8,
-	15,17, 9, 8, 8, 9, 8,10,10,11,14,17,10, 8, 7, 9,
-	 4, 7, 3, 5,11,17,10,10,10,10, 6, 9, 4, 5,11,17,
-	16,16,13,15, 5,10, 4, 3, 9,16,17,17,14,17, 7,11,
-	 6, 6,11,17,
+	 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,
+	16,17, 7, 9, 8, 9, 8,10,11,11,15,17, 7, 7, 7, 8,
+	 5, 8, 8, 9,15,17, 8, 7, 9, 9, 7, 8, 7, 2, 7,15,
+	14,13,13,15, 5,10, 4, 3, 6,17,17,15,13,17, 7,11,
+	 7, 6, 9,16,
 };
 
 static static_codebook _huff_book__44u6__short = {
@@ -6864,13 +8205,13 @@
 };
 
 static long _huff_lengthlist__44u7__long[] = {
-	 3, 9,15,13,16,13,16,12,12,12, 5, 5, 7, 8, 8,10,
-	11,10,13,13,10, 5, 5, 6, 6, 9, 9,10,14,14, 9, 6,
-	 6, 7, 6, 8, 9,10,13,12,13, 7, 5, 6, 4, 6, 6, 8,
-	12,13,11, 8, 7, 8, 6, 7, 7, 7,11,13,15,10, 8, 8,
-	 5, 6, 4, 5, 9,13, 9, 9, 8, 9, 7, 7, 4, 4, 6,11,
-	11,11,12,12,10,10, 8, 5, 5, 9,10,12,13,15,13,13,
-	12, 7, 6, 8,
+	 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,
+	12,15,10, 8, 7, 7, 6, 7, 7, 7,11,13,14,10, 9, 8,
+	 5, 6, 4, 5, 9,12,10, 9, 9, 8, 6, 6, 5, 3, 6,11,
+	12,11,12,12,10, 9, 8, 5, 5, 8,10,11,15,13,13,13,
+	12, 8, 6, 7,
 };
 
 static static_codebook _huff_book__44u7__long = {
@@ -6891,11 +8232,11 @@
 };
 
 static long _vq_lengthlist__44u7__p1_0[] = {
-	 1, 4, 4, 5, 7, 7, 4, 7, 7, 5, 8, 8, 8,10,10, 7,
-	10,10, 5, 8, 8, 7,10, 9, 8,10,10, 5, 8, 8, 8,11,
-	10, 8,10,10, 8,11,10,10,12,13,11,13,13, 7,10,10,
-	10,13,11,11,13,13, 5, 8, 8, 8,11,10, 8,10,10, 7,
-	10,10,11,13,13,10,11,13, 8,11,11,10,13,13,10,13,
+	 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,
+	10,13,12,10,13,13, 5, 8, 8, 8,11,10, 8,10,11, 7,
+	10,10,10,13,13,10,12,13, 8,11,11,10,13,13,10,13,
 	12,
 };
 
@@ -6932,11 +8273,11 @@
 };
 
 static long _vq_lengthlist__44u7__p2_0[] = {
-	 3, 5, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 7, 8, 6,
-	 7, 7, 5, 6, 6, 6, 7, 7, 6, 8, 8, 5, 6, 6, 6, 8,
-	 7, 6, 7, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 7, 7,
-	 7, 9, 8, 8, 9, 9, 5, 6, 6, 6, 8, 7, 6, 7, 8, 6,
-	 7, 7, 8, 9, 9, 7, 8, 9, 6, 8, 8, 8, 9, 9, 8, 9,
+	 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,
+	 7, 9, 8, 8, 9, 9, 5, 6, 6, 6, 8, 7, 6, 8, 8, 6,
+	 8, 8, 8, 9, 9, 7, 8, 9, 6, 8, 8, 8, 9, 9, 8, 9,
 	 9,
 };
 
@@ -6975,45 +8316,45 @@
 };
 
 static long _vq_lengthlist__44u7__p3_0[] = {
-	 2, 5, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8,
-	 9, 9,12,12, 8, 9, 9,12,12, 5, 7, 7,10, 9, 7, 9,
-	 9,11,11, 6, 8, 9,10,11,10,11,11,13,14, 9,10,11,
-	13,13, 5, 7, 7, 9, 9, 6, 9, 8,11,10, 7, 9, 9,11,
-	11, 9,11,10,13,13,10,11,11,14,13, 8,10,10,14,13,
-	10,11,11,16,14, 9,11,11,14,14,13,15,14,17,16,12,
-	13,14,16,15, 8, 9,10,13,14, 9,11,11,14,14,10,11,
-	11,14,15,13,13,14,17,17,13,14,15,16,17, 5, 7, 7,
-	10,10, 7, 9, 8,11,11, 7, 8, 9,11,11,10,11,11,14,
-	14,10,11,11,14,14, 7, 9, 9,11,11, 9,11,11,13,13,
-	 9,11,11,13,13,11,12,13,15,17,11,12,13,16,18, 6,
-	 8, 8,11,11, 8,10,10,13,12, 9,11,11,12,13,11,13,
-	11,16,14,11,13,12,16,16,10,11,11,15,15,11,13,13,
-	16,16,11,13,13,18,16,14,14,15,17,16,14,15,17,19,
-	 0, 9,11,11,14,15,10,12,12,15,17,11,13,13,15,17,
-	14,15,13, 0,15,15,17,16,18, 0, 5, 7, 7, 9,10, 7,
-	 9, 9,11,11, 7, 8, 9,11,11,10,11,11,14,14,10,11,
-	11,14,14, 6, 8, 9,11,11, 9,11,11,14,13, 8,10,10,
-	11,14,11,13,13,17,15,11,12,13,14,16, 7, 9, 9,11,
-	11, 9,11,11,13,12, 9,11,11,12,13,11,13,12,15,15,
-	11,13,12,16,15, 9,11,11,15,15,11,12,13,16,15,10,
-	11,12,16,15,15,16,16, 0, 0,14,13,15,16,19, 9,11,
-	12,15,15,11,13,13,17,16,11,13,12,15,17,14,16,16,
-	18, 0,15,15,16,18,17, 8,10,10,13,14,10,11,11,15,
-	16,10,11,11,15,16,14,15,15,17,19,14,14,15,19,19,
-	 9,11,11,16,15,11,13,13,17,17,11,13,13,17,17,15,
-	17,16, 0, 0,15,17,17, 0,17, 9,11,11,15,15,11,13,
-	12,16,16,11,13,13,18,17,15,16,15,19,19,14,16,18,
-	17,19,13,15,15, 0,18,14,16,17,17,18,14,16,16,19,
-	19,18,19,19, 0, 0,16,17,18,19, 0,12,14,14,16,18,
-	13,16,14, 0,19,14,16,17,19, 0,16,19,16,19,17,17,
-	18,18, 0, 0, 8,10,10,14,13, 9,11,11,15,14,10,11,
-	12,14,16,13,15,14,19,19,14,16,16,18,17, 9,11,11,
-	16,15,11,13,13, 0,17,10,12,13,15,16,15,18,16,19,
-	19,14,15,16,18,18, 9,11,12,15,15,11,13,13,17,19,
-	11,13,13,17,17,15,17,16,19,19,15,17,16, 0, 0,12,
-	14,14, 0,19,14,16,15, 0,19,13,14,16,19, 0,16,18,
-	18, 0, 0,16,16,17,17, 0,13,14,14,17, 0,14,17,16,
-	 0,19,14,16,16,19,18,17,19,17, 0, 0,18,18,17, 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,
+	13,14, 5, 7, 7, 9, 9, 7, 9, 8,11,11, 7, 9, 9,11,
+	11, 9,11,10,14,13,10,11,11,14,14, 8,10,10,14,13,
+	10,11,12,15,14, 9,11,11,15,14,13,14,14,16,16,12,
+	13,14,17,16, 8,10,10,13,13, 9,11,11,14,15,10,11,
+	12,14,15,12,14,13,16,16,13,14,15,15,17, 5, 7, 7,
+	10,10, 7, 9, 9,11,11, 7, 9, 9,11,11,10,12,11,15,
+	14,10,11,12,14,14, 7, 9, 9,12,12, 9,11,11,13,13,
+	 9,11,11,13,13,11,13,13,14,17,11,13,13,15,16, 6,
+	 9, 9,11,11, 8,11,10,13,12, 9,11,11,13,13,11,13,
+	12,16,14,11,13,13,16,16,10,12,12,15,15,11,13,13,
+	16,16,11,13,13,16,15,14,16,17,17,19,14,16,16,18,
+	 0, 9,11,11,14,15,10,13,12,16,15,11,13,13,16,16,
+	14,15,14, 0,16,14,16,16,18, 0, 5, 7, 7,10,10, 7,
+	 9, 9,12,11, 7, 9, 9,11,12,10,11,11,15,14,10,11,
+	12,14,14, 6, 9, 9,11,11, 9,11,11,13,13, 8,10,11,
+	12,13,11,13,13,17,15,11,12,13,14,15, 7, 9, 9,11,
+	12, 9,11,11,13,13, 9,11,11,13,13,11,13,12,16,16,
+	11,13,13,15,14, 9,11,11,14,15,11,13,13,16,15,10,
+	12,13,16,16,15,16,16, 0, 0,14,13,15,16,18,10,11,
+	11,15,15,11,13,14,16,18,11,13,13,16,15,15,16,16,
+	19, 0,14,15,15,16,16, 8,10,10,13,13,10,12,11,16,
+	15,10,11,11,16,15,13,15,16,18, 0,13,14,15,17,17,
+	 9,11,11,15,15,11,13,13,16,18,11,13,13,16,17,15,
+	16,16, 0, 0,15,18,16, 0,17, 9,11,11,15,15,11,13,
+	12,17,15,11,13,14,16,17,15,18,15, 0,17,15,16,16,
+	18,19,13,15,14, 0,18,14,16,16,19,18,14,16,15,19,
+	19,16,18,19, 0, 0,16,17, 0, 0, 0,12,14,14,17,17,
+	13,16,14, 0,18,14,16,15,18, 0,16,18,16,19,17,18,
+	19,17, 0, 0, 8,10,10,14,14, 9,12,11,15,15,10,11,
+	12,15,17,13,15,15,18,16,14,16,15,18,17, 9,11,11,
+	16,15,11,13,13, 0,16,11,12,13,16,15,15,16,16, 0,
+	17,15,15,16,18,17, 9,12,11,15,17,11,13,13,16,16,
+	11,14,13,16,16,15,15,16,18,19,16,18,16, 0, 0,12,
+	14,14, 0,16,14,16,16, 0,18,13,14,15,16, 0,17,16,
+	18, 0, 0,16,16,17,19, 0,13,14,14,17, 0,14,17,16,
+	 0,19,14,15,15,18,19,17,16,18, 0, 0,15,19,16, 0,
 	 0,
 };
 
@@ -7052,46 +8393,46 @@
 };
 
 static long _vq_lengthlist__44u7__p4_0[] = {
-	 5, 6, 6, 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,
-	 7,10,10, 6, 7, 8, 9,10, 9,10,10,11,12, 9, 9,10,
-	11,12, 6, 7, 7, 9, 9, 6, 7, 7,10, 9, 7, 7, 8,10,
+	 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,
+	11,12, 6, 7, 7, 9, 9, 6, 8, 7,10, 9, 7, 8, 8,10,
 	10, 9,10, 9,12,11, 9,10,10,12,11, 8, 9, 9,11,11,
-	 9,10,10,12,12, 9,10,10,11,12,11,12,12,13,13,11,
-	11,12,12,13, 8, 9, 9,11,11, 9,10,10,12,11, 9,10,
-	10,12,12,11,12,11,13,12,11,12,12,13,14, 6, 7, 7,
-	 9, 9, 7, 8, 7,10, 9, 7, 7, 8, 9,10, 9,10,10,12,
-	11, 9,10,10,11,12, 7, 8, 8,10,10, 8, 8, 8,10,10,
-	 8, 8, 8,10,10,10,10,11,12,12,10,10,11,12,12, 6,
-	 7, 7,10,10, 7, 8, 8,10,10, 8, 8, 8,10,11, 9,10,
-	10,12,11,10,10,11,12,12, 9,10,10,12,12,10,10,10,
-	12,12,10,11,10,12,12,12,12,12,13,14,12,12,12,13,
-	14, 9,10,10,11,12, 9,10,10,12,12,10,10,11,12,12,
-	11,12,11,14,12,12,12,12,14,14, 6, 7, 7, 9, 9, 7,
-	 8, 7,10, 9, 7, 7, 8, 9,10, 9,10,10,12,11, 9,10,
-	10,11,12, 6, 7, 7,10,10, 8, 8, 8,11,10, 7, 8, 8,
-	10,10,10,10,10,12,12,10,10,10,11,12, 7, 8, 8,10,
-	10, 8, 8, 8,10,10, 8, 8, 8,10,10,10,11,10,12,12,
-	10,11,10,12,12, 9,10,10,12,12,10,11,10,13,12, 9,
-	10,10,12,12,12,12,12,14,14,11,11,12,12,14, 9,10,
-	10,12,12,10,10,10,12,12,10,11,10,12,12,12,12,12,
-	14,14,12,12,12,14,13, 8, 9, 9,11,11, 9,10,10,12,
+	 9,10,10,12,12, 9,10,10,12,12,11,12,12,13,14,11,
+	11,12,13,13, 8, 9, 9,11,11, 9,10,10,12,11, 9,10,
+	10,12,12,11,12,11,13,13,11,12,12,13,13, 6, 7, 7,
+	 9, 9, 7, 8, 7,10,10, 7, 7, 8,10,10, 9,10,10,12,
+	11, 9,10,10,12,12, 7, 8, 8,10,10, 8, 8, 9,11,11,
+	 8, 9, 9,11,11,10,11,11,12,12,10,10,11,12,13, 6,
+	 7, 7,10,10, 7, 9, 8,11,10, 8, 8, 9,10,11,10,11,
+	10,13,11,10,11,11,12,12, 9,10,10,12,12,10,10,11,
+	13,13,10,11,11,13,12,12,12,13,13,14,12,12,13,14,
+	14, 9,10,10,12,12, 9,10,10,12,12,10,11,11,13,13,
+	11,12,11,14,12,12,13,13,14,14, 6, 7, 7, 9, 9, 7,
+	 8, 7,10,10, 7, 7, 8,10,10, 9,10,10,12,11, 9,10,
+	10,11,12, 6, 7, 7,10,10, 8, 9, 8,11,10, 7, 8, 9,
+	10,11,10,11,11,13,12,10,10,11,11,13, 7, 8, 8,10,
+	10, 8, 9, 9,11,11, 8, 9, 9,11,11,10,11,10,13,12,
+	10,11,11,12,12, 9,10,10,12,12,10,11,11,13,12, 9,
+	10,10,12,13,12,13,12,14,14,11,11,12,12,14, 9,10,
+	10,12,12,10,11,11,13,13,10,11,11,13,13,12,13,12,
+	14,14,12,13,12,14,13, 8, 9, 9,11,11, 9,10,10,12,
 	12, 9,10,10,12,12,11,12,12,14,13,11,12,12,13,13,
-	 9,10,10,12,12,10,10,10,12,12,10,11,11,12,12,12,
-	12,13,14,14,12,12,12,14,14, 9,10, 9,12,12, 9,10,
-	10,12,12,10,10,11,12,12,12,12,11,14,13,12,12,12,
-	13,14,11,12,12,13,13,12,12,12,14,14,12,13,12,14,
-	14,13,13,14,13,15,14,14,14,15,15,11,11,11,13,13,
-	11,12,11,14,13,12,12,12,14,14,12,13,12,15,12,13,
-	14,14,15,15, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
-	10,12,12,11,12,12,13,13,11,12,12,13,14, 9,10,10,
-	12,11,10,10,10,12,12, 9,10,10,12,12,12,13,12,14,
-	13,11,12,12,13,14, 9,10,10,12,12,10,10,10,12,12,
-	10,11,11,12,12,12,12,12,14,14,12,13,12,14,13,11,
-	11,11,13,13,12,12,12,14,13,11,11,12,13,14,13,14,
-	14,15,15,13,12,13,12,15,11,12,12,13,14,12,12,12,
-	14,14,11,12,12,14,14,13,14,14,15,15,13,14,13,15,
-	13,
+	 9,10,10,12,12,10,11,11,13,13,10,11,11,13,12,12,
+	13,13,14,14,12,12,13,14,14, 9,10,10,12,12, 9,11,
+	10,13,12,10,10,11,12,13,11,13,12,14,13,12,12,13,
+	14,14,11,12,12,13,13,11,12,13,14,14,12,13,13,14,
+	14,13,13,14,14,16,13,14,14,16,16,11,11,11,13,13,
+	11,12,11,14,13,12,12,13,14,15,13,14,12,16,13,14,
+	14,14,15,16, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
+	10,12,12,11,12,12,14,13,11,12,12,13,14, 9,10,10,
+	12,12,10,11,10,13,12, 9,10,11,12,13,12,13,12,14,
+	14,12,12,13,13,14, 9,10,10,12,12,10,11,11,12,13,
+	10,11,11,13,13,12,13,12,14,14,12,13,13,14,14,11,
+	12,12,13,13,12,13,12,14,14,11,11,12,13,14,13,15,
+	14,16,15,13,12,14,13,16,11,12,12,13,13,12,13,13,
+	14,14,12,12,12,14,14,13,14,14,15,15,13,14,13,16,
+	14,
 };
 
 static float _vq_quantthresh__44u7__p4_0[] = {
@@ -7133,11 +8474,11 @@
 };
 
 static long _vq_lengthlist__44u7__p5_0[] = {
-	 2, 3, 3, 6, 6, 8, 8,10,10, 3, 5, 5, 8, 7, 8, 8,
-	11,11, 4, 5, 5, 7, 8, 8, 8,11,11, 6, 8, 7, 9, 9,
-	10, 9,12,12, 6, 7, 8, 9,10, 9,10,12,12, 8, 8, 8,
-	10, 9,12,11,13,13, 8, 8, 8, 9,10,11,12,13,13,10,
-	11,11,12,11,13,13,14,14,10,11,11,12,12,13,13,14,
+	 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,
+	10,10,12,11,13,13, 8, 8, 9,10,10,11,11,13,13,10,
+	11,11,12,12,13,13,14,14,10,11,11,12,12,13,13,14,
 	14,
 };
 
@@ -7181,12 +8522,12 @@
 };
 
 static long _vq_lengthlist__44u7__p6_0[] = {
-	 4, 4, 4, 5, 5, 7, 7, 9, 9, 4, 4, 4, 6, 6, 7, 7,
+	 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, 9, 9, 5, 6, 6, 6, 7, 8, 8, 9, 9, 7, 7, 7,
-	 8, 8, 9, 9,10,10, 7, 7, 7, 8, 8, 9, 9,10,10, 9,
-	 9, 9,10, 9,10,10,11,11, 9, 9, 9, 9,10,10,10,11,
-	11,
+	 8, 8,10,10, 5, 6, 6, 7, 7, 8, 8,10,10, 7, 8, 7,
+	 8, 8,10, 9,11,11, 7, 7, 8, 8, 8, 9,10,11,11, 9,
+	 9, 9,10,10,11,10,12,11, 9, 9, 9,10,10,11,11,11,
+	12,
 };
 
 static float _vq_quantthresh__44u7__p6_0[] = {
@@ -7223,12 +8564,12 @@
 };
 
 static long _vq_lengthlist__44u7__p7_0[] = {
-	 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 8, 8,10,10, 8,
-	10,10, 5, 8, 9, 8,10,10, 8,10,10, 4, 9, 9, 9,11,
-	12, 8,12,11, 8,12,11,11,12,13,10,13,13, 7,12,11,
-	10,13,12,10,13,13, 4, 9, 9, 8,11,12, 9,11,12, 7,
-	11,12,10,13,13,10,12,13, 8,11,12,10,13,13,10,13,
-	12,
+	 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,
+	10,12,11,10,12,12, 5, 9, 9, 8,10,10, 9,11,11, 7,
+	11,10,10,12,12,10,11,12, 7,10,11,10,12,12,10,12,
+	10,
 };
 
 static float _vq_quantthresh__44u7__p7_0[] = {
@@ -7272,14 +8613,14 @@
 };
 
 static long _vq_lengthlist__44u7__p7_1[] = {
-	 3, 5, 4, 6, 6, 7, 7, 8, 8, 8, 8, 5, 5, 5, 6, 6,
-	 7, 7, 8, 8, 8, 8, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8,
-	 8, 6, 6, 6, 7, 7, 8, 7, 8, 8, 8, 8, 6, 6, 6, 7,
-	 7, 7, 8, 8, 8, 8, 8, 7, 7, 7, 8, 7, 8, 8, 9, 9,
-	 9, 9, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 8, 8, 8,
-	 8, 8, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 9, 9, 9,
-	 9, 9, 9, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 8, 8,
-	 8, 8, 8, 9, 9, 9, 9, 9, 9,
+	 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,
+	 7, 8, 8, 9, 9, 9, 9, 7, 8, 7, 8, 8, 9, 9, 9, 9,
+	 9, 9, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9, 8, 8, 8,
+	 9, 9, 9, 9,10, 9, 9, 9, 8, 8, 8, 9, 9, 9, 9, 9,
+	 9, 9,10, 8, 8, 8, 9, 9, 9, 9,10, 9,10,10, 8, 8,
+	 8, 9, 9, 9, 9, 9,10,10,10,
 };
 
 static float _vq_quantthresh__44u7__p7_1[] = {
@@ -7325,14 +8666,14 @@
 };
 
 static long _vq_lengthlist__44u7__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,
-	 9,10,10,11,11,12,12, 8, 9, 9,10,10,11,11,12,12,
-	14,13, 8, 9, 9,10,10,11,11,12,12,13,13,10,10,10,
-	11,11,12,12,13,13,14,14,10,10,10,11,11,12,13,13,
-	13,14,14,11,12,11,13,12,13,14,14,14,15,15,11,11,
-	12,13,13,13,13,14,14,15,15,
+	 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,
+	 8,10,10,11,12,13,13, 8, 9, 9,10,10,11,11,12,12,
+	14,14, 8, 9, 9,10,10,11,11,12,12,14,14,10,10,10,
+	11,11,13,12,14,14,15,15,10,10,10,12,12,13,13,14,
+	14,15,15,11,12,12,13,13,14,14,15,14,16,15,11,12,
+	12,13,13,14,14,15,15,15,16,
 };
 
 static float _vq_quantthresh__44u7__p8_0[] = {
@@ -7378,14 +8719,14 @@
 };
 
 static long _vq_lengthlist__44u7__p8_1[] = {
-	 3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 5, 6, 6, 7, 6,
-	 7, 7, 7, 7, 8, 8, 5, 6, 6, 6, 7, 7, 7, 7, 7, 8,
-	 8, 6, 7, 6, 7, 7, 7, 7, 8, 8, 8, 8, 6, 6, 7, 7,
-	 7, 7, 7, 8, 8, 8, 8, 7, 7, 7, 7, 7, 8, 8, 8, 8,
-	 8, 8, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 7, 7, 7,
-	 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 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,
+	 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,
+	 7, 7, 7, 7, 7, 8, 8, 7, 7, 7, 7, 7, 8, 7, 8, 8,
+	 8, 8, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 7, 7, 7,
+	 7, 7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 8, 8, 8,
+	 8, 8, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7,
+	 7, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
 static float _vq_quantthresh__44u7__p8_1[] = {
@@ -7431,14 +8772,14 @@
 };
 
 static long _vq_lengthlist__44u7__p9_0[] = {
-	 1, 4, 4, 9, 9, 9, 9, 9, 9, 9, 9, 5, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 4, 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, 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, 8, 8, 8, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 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,
+	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,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, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9,
 };
 
 static float _vq_quantthresh__44u7__p9_0[] = {
@@ -7486,17 +8827,17 @@
 };
 
 static long _vq_lengthlist__44u7__p9_1[] = {
-	 1, 4, 4, 5, 5, 7, 7,10, 9,11,11,12,12, 4, 7, 6,
-	 8, 8, 9, 9,11,10,13,12,13,13, 4, 6, 7, 8, 8, 9,
-	 9,10,11,13,13,12,13, 5, 8, 8,10, 9,12,11,12,12,
-	13,13,15,14, 6, 8, 8,10,10,11,11,13,12,13,14,14,
-	15, 8,10,10,12,11,13,13,14,15,15,16,15,16, 8, 9,
-	10,12,12,13,13,16,15,15,15,15,15,10,11,11,14,13,
-	14,14,16,16,15,16,16,16,10,12,12,12,14,14,14,15,
-	16,15,16,15,16,11,12,12,14,14,16,16,15,16,16,16,
-	16,16,12,12,13,13,15,15,14,15,16,16,16,16,16,12,
-	14,14,15,14,16,16,16,16,16,16,16,16,13,14,13,14,
-	15,16,15,16,16,16,16,16,16,
+	 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,
+	13,12,13,13, 6, 8, 8,10,10,11,11,12,12,12,13,14,
+	13, 8,10,10,11,11,12,13,14,14,14,14,15,15, 8,10,
+	10,11,12,12,13,13,14,14,14,14,15, 9,11,11,13,13,
+	14,14,15,14,16,15,17,15, 9,11,11,12,13,14,14,15,
+	14,15,15,15,16,10,12,12,13,14,15,15,15,15,16,17,
+	16,17,10,13,12,13,14,14,16,16,16,16,15,16,17,11,
+	13,13,14,15,14,17,15,16,17,17,17,17,11,13,13,14,
+	15,15,15,15,17,17,16,17,16,
 };
 
 static float _vq_quantthresh__44u7__p9_1[] = {
@@ -7580,9 +8921,9 @@
 };
 
 static long _vq_lengthlist__44u7__p9_2[] = {
-	 2, 4, 3, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6,
-	 6, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8,
-	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+	 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,
 };
 
@@ -7624,13 +8965,13 @@
 };
 
 static long _huff_lengthlist__44u7__short[] = {
-	 6,14,18,18,18,18,17,17,17,17, 4, 8,11,12,13,11,
-	13,11,16,17, 6, 7, 8, 9, 8, 9,12, 9,14,17, 6, 9,
-	11,12,12,12,15,12,17,17, 6, 6, 6, 8, 5, 7, 7, 8,
-	14,17, 7, 9, 9,11, 8,10,10,11,14,16, 8, 7, 7, 8,
-	 5, 7, 4, 5,11,17, 9, 8,10, 9, 7, 9, 4, 2, 9,16,
-	15,14,16,14, 8,14, 4, 3, 7,16,17,17,16,17, 9,15,
-	 6, 5,10,17,
+	 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,
+	16,16, 6,10, 9,10, 7,10,11,11,16,17, 6, 8, 8, 9,
+	 5, 7, 5, 8,16,17, 5, 5, 8, 7, 6, 7, 7, 6, 6,14,
+	12,10,12,11, 7,11, 4, 4, 2, 7,17,15,15,15, 8,15,
+	 6, 8, 5, 9,
 };
 
 static static_codebook _huff_book__44u7__short = {
@@ -7645,13 +8986,13 @@
 };
 
 static long _huff_lengthlist__44u8__long[] = {
-	 3, 9,13,13,14,13,13,13,13,14, 5, 4, 6, 8,10,12,
-	13,15,13,14, 9, 5, 3, 5, 8,10,12,14,13,13,11, 7,
-	 4, 3, 5, 7,10,11,12,14,11, 9, 7, 4, 4, 6, 8,10,
-	13,14,10,11, 9, 7, 6, 6, 7, 9,12,15,12,11,11, 8,
-	 7, 6, 6, 7,11,14,12,12,12,10, 8, 7, 6, 7, 9,13,
-	11,12,13,12,11, 8, 8, 7, 9,12,11,14,16,16,15,11,
-	10, 9, 9,11,
+	 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,
+	12,14,13,11, 9, 6, 5, 5, 6, 8,12,14,13,11,10, 8,
+	 7, 6, 6, 7,10,14,13,11,12,10, 8, 7, 6, 6, 9,13,
+	12,11,14,12,11, 9, 8, 7, 9,11,11,12,14,13,14,11,
+	10, 8, 8, 9,
 };
 
 static static_codebook _huff_book__44u8__long = {
@@ -7666,13 +9007,13 @@
 };
 
 static long _huff_lengthlist__44u8__short[] = {
-	 7,15,18,18,18,18,18,18,18,18, 4, 6, 9,10,10,11,
-	16,15,18,18, 5, 6, 6, 6, 8,10,15,15,18,18, 5, 6,
-	 5, 4, 6, 9,12,15,17,18, 7, 6, 6, 5, 6, 5, 8,11,
-	15,18,10, 9, 9, 7, 4, 3, 6,10,16,17,13,12,12, 6,
-	 6, 4, 5, 9,14,16,16,17,13, 5, 5, 4, 5, 8,13,16,
-	17,17,14, 7, 7, 6, 7,10,15,17,17,17,17,11,12,12,
-	12,14,17,17,
+	 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,
+	17,17, 7, 6, 7, 7, 7, 8, 7,10,15,16,12, 9, 9, 6,
+	 6, 5, 3, 5,11,15,14,14,13, 5, 5, 7, 3, 4, 8,15,
+	17,17,13, 7, 7,10, 6, 6,10,15,17,17,16,10,11,14,
+	10,10,15,17,
 };
 
 static static_codebook _huff_book__44u8__short = {
@@ -7694,10 +9035,10 @@
 
 static long _vq_lengthlist__44u8_p1_0[] = {
 	 1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 8, 9, 9, 7,
-	 8, 9, 5, 7, 7, 7, 9, 8, 8, 9, 9, 5, 7, 7, 7, 9,
-	 9, 7, 9, 9, 8, 9, 9, 9,10,11, 9,10,10, 7, 9, 9,
-	 9,10, 9, 9,10,11, 5, 7, 7, 7, 9, 9, 8, 9, 9, 7,
-	 9, 9, 9,11,10, 9, 9,10, 8, 9, 9, 9,10,10, 9,11,
+	 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,
+	 9,11,10, 9,10,11, 5, 7, 7, 7, 9, 9, 7, 9, 9, 7,
+	 9, 9, 9,11,10, 9,10,10, 8, 9, 9, 9,11,11, 9,11,
 	10,
 };
 
@@ -7736,45 +9077,45 @@
 };
 
 static long _vq_lengthlist__44u8_p2_0[] = {
-	 4, 5, 5, 8, 8, 6, 7, 6, 9, 9, 5, 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,12,12, 9, 9,10,
-	11,12, 6, 7, 7, 9, 9, 7, 8, 7,10, 9, 7, 8, 8,10,
-	10, 9,10, 9,12,11, 9,10,10,12,12, 8, 9, 9,11,11,
-	 9,10,10,12,12, 9,10,10,12,12,11,12,12,13,13,11,
-	11,12,13,13, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
-	10,12,12,11,12,11,13,13,11,12,12,14,13, 5, 7, 7,
+	 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,
+	11,12, 5, 7, 7, 9, 9, 7, 8, 7,10,10, 7, 8, 8,10,
+	10, 9,10, 9,12,11, 9,10,10,12,12, 8, 9, 9,12,11,
+	 9,10,10,12,12, 9,10,10,12,12,11,12,12,14,14,11,
+	11,12,13,14, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
+	10,12,12,11,12,11,13,13,11,12,12,14,14, 5, 7, 7,
 	 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,10, 9,10,10,12,
 	12, 9,10,10,11,12, 7, 8, 8,10,10, 8, 9, 9,11,11,
-	 8, 9, 9,10,11,10,11,11,12,12,10,10,11,12,13, 6,
-	 8, 8,10,10, 7, 8, 8,11,10, 8, 8, 9,10,11,10,11,
-	10,12,11,10,11,11,12,12, 9,10,10,12,12,10,11,11,
-	13,13,10,11,11,13,13,12,12,13,13,14,12,12,13,14,
-	14, 9,10,10,12,12, 9,10,10,12,12,10,11,11,12,13,
-	11,12,11,14,12,12,12,12,14,14, 5, 7, 7, 9, 9, 7,
-	 8, 8,10,10, 7, 8, 8,10,10, 9,10,10,12,11, 9,10,
-	10,12,12, 6, 8, 8,10,10, 8, 9, 8,11,10, 7, 8, 8,
-	10,11,10,11,11,13,12,10,10,11,11,13, 7, 8, 8,10,
-	10, 8, 9, 9,11,10, 8, 9, 9,11,11,10,11,10,13,12,
-	10,11,11,12,12, 9,10,10,12,12,10,11,11,13,12, 9,
-	10,10,12,12,12,13,13,14,14,11,11,12,12,14, 9,10,
-	10,12,12,10,11,11,13,13,10,11,11,13,12,12,13,12,
-	14,14,12,13,12,14,13, 8, 9, 9,11,11, 9,10,10,12,
-	12, 9,10,10,12,12,11,12,12,14,13,11,12,12,13,14,
+	 8, 9, 9,11,11,10,11,11,12,13,10,11,11,12,13, 6,
+	 8, 8,10,10, 8, 9, 8,11,10, 8, 9, 9,11,11,10,11,
+	10,13,12,10,11,11,13,13, 9,10,10,12,12,10,11,11,
+	13,13,10,11,11,13,13,12,12,13,13,14,12,13,13,14,
+	14, 9,10,10,12,12,10,11,10,13,12,10,11,11,13,13,
+	11,13,12,14,13,12,13,13,14,14, 5, 7, 7, 9, 9, 7,
+	 8, 8,10,10, 7, 8, 8,10,10, 9,10,10,12,12, 9,10,
+	10,12,12, 7, 8, 8,10,10, 8, 9, 9,11,11, 8, 8, 9,
+	10,11,10,11,11,13,13,10,10,11,12,13, 7, 8, 8,10,
+	10, 8, 9, 9,11,11, 8, 9, 9,11,11,10,11,11,13,13,
+	10,11,11,13,12, 9,10,10,12,12,10,11,11,13,13,10,
+	10,11,12,13,12,13,13,14,14,12,12,13,13,14, 9,10,
+	10,12,12,10,11,11,13,13,10,11,11,13,13,12,13,13,
+	15,14,12,13,13,14,13, 8, 9, 9,11,11, 9,10,10,12,
+	12, 9,10,10,12,12,12,12,12,14,13,11,12,12,14,14,
 	 9,10,10,12,12,10,11,11,13,13,10,11,11,13,13,12,
-	13,13,14,15,12,12,13,14,14, 9,10,10,12,12, 9,11,
-	10,13,12,10,11,11,12,13,12,13,12,14,13,12,12,13,
-	14,14,11,12,12,14,14,12,12,12,14,14,12,13,13,14,
-	14,13,13,14,14,16,14,14,14,15,15,11,12,12,14,14,
-	11,12,11,14,13,12,12,13,14,14,13,14,12,15,13,14,
-	14,14,15,16, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
-	10,12,12,11,12,12,14,13,11,12,12,13,14, 9,10,10,
-	12,12,10,11,10,13,12, 9,10,11,12,13,12,13,12,14,
+	13,13,14,15,12,13,13,14,15, 9,10,10,12,12,10,11,
+	10,13,12,10,11,11,13,13,12,13,12,15,14,12,13,13,
+	14,15,11,12,12,14,14,12,13,13,14,14,12,13,13,15,
+	14,14,14,14,14,16,14,14,15,16,16,11,12,12,14,14,
+	11,12,12,14,14,12,13,13,14,15,13,14,13,16,14,14,
+	14,14,16,16, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
+	10,12,12,11,12,12,14,13,11,12,12,14,14, 9,10,10,
+	12,12,10,11,11,13,13,10,10,11,12,13,12,13,13,15,
 	14,12,12,13,13,14, 9,10,10,12,12,10,11,11,13,13,
-	10,11,11,13,13,12,12,12,14,14,12,13,12,15,14,11,
-	12,11,14,13,12,13,12,14,14,11,11,12,13,14,13,14,
-	14,16,15,13,12,14,13,15,11,12,12,13,14,12,13,13,
-	14,14,12,13,12,14,14,14,14,14,15,16,13,14,13,15,
+	10,11,11,13,13,12,13,13,14,14,12,13,13,15,14,11,
+	12,12,14,13,12,13,13,15,14,11,12,12,13,14,14,15,
+	14,16,15,13,13,14,13,16,11,12,12,14,14,12,13,13,
+	14,15,12,13,12,15,14,14,14,14,16,15,14,15,13,16,
 	14,
 };
 
@@ -7819,9 +9160,9 @@
 static 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, 9,10, 7, 7, 7,
+	 8, 8,10,10, 6, 6, 6, 7, 7, 8, 8,10,10, 7, 7, 7,
 	 8, 8, 9, 9,11,10, 7, 7, 7, 8, 8, 9, 9,10,11, 9,
-	 9, 9,10,10,11,10,12,12, 9, 9, 9,10,10,10,11,12,
+	 9, 9,10,10,11,10,12,11, 9, 9, 9, 9,10,11,11,11,
 	12,
 };
 
@@ -7875,23 +9216,23 @@
 static 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, 5, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,
-	11,11,12, 6, 6, 6, 7, 7, 8, 7, 9, 9, 9, 9,10,10,
-	11,11,12,12, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9, 9,10,
-	10,11,11,12,12, 7, 7, 7, 8, 7, 9, 8, 9, 9,10, 9,
-	11,10,11,11,12,12, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9,
-	10,10,10,11,11,12,12, 8, 8, 8, 9, 9, 9, 9,10,10,
-	10,10,11,11,11,11,12,12, 8, 8, 8, 8, 9, 9, 9,10,
-	10,10,10,11,11,11,12,12,12, 9, 9, 9, 9, 9,10, 9,
-	10,10,11,10,11,11,12,12,12,12, 9, 9, 9, 9, 9, 9,
-	10,10,10,11,11,11,11,12,12,12,13,10,10,10,10,10,
-	11,10,11,11,11,11,12,12,12,12,12,13,10,10,10,10,
-	10,10,11,11,11,11,11,12,12,12,12,13,12,11,11,11,
-	11,11,11,11,12,12,12,12,12,12,12,13,13,13,11,11,
-	11,11,11,11,11,12,12,12,12,12,12,13,12,13,13,11,
-	12,12,12,12,12,12,12,12,12,12,13,13,13,13,13,13,
-	12,12,12,12,12,12,12,12,12,12,13,13,13,13,13,13,
-	13,
+	12,12, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,
+	11,12,12, 6, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,
+	11,11,12,12, 6, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,
+	10,11,11,12,12, 7, 7, 7, 8, 8, 9, 8,10, 9,10, 9,
+	11,10,12,11,13,12, 7, 7, 7, 8, 8, 8, 9, 9,10, 9,
+	10,10,11,11,12,12,13, 8, 8, 8, 9, 9, 9, 9,10,10,
+	11,10,11,11,12,12,13,13, 8, 8, 8, 9, 9, 9,10,10,
+	10,10,11,11,11,12,12,12,13, 8, 9, 9, 9, 9,10, 9,
+	11,10,11,11,12,11,13,12,13,13, 8, 9, 9, 9, 9, 9,
+	10,10,11,11,11,11,12,12,13,13,13,10,10,10,10,10,
+	11,10,11,11,12,11,13,12,13,13,14,13,10,10,10,10,
+	10,10,11,11,11,11,12,12,13,13,13,13,14,11,11,11,
+	11,11,12,11,12,12,13,12,13,13,14,13,14,14,11,11,
+	11,11,11,11,12,12,12,12,13,13,13,13,14,14,14,11,
+	12,12,12,12,13,12,13,12,13,13,14,13,14,14,14,14,
+	11,12,12,12,12,12,12,13,13,13,13,13,14,14,14,14,
+	14,
 };
 
 static float _vq_quantthresh__44u8_p4_0[] = {
@@ -7930,12 +9271,12 @@
 };
 
 static long _vq_lengthlist__44u8_p5_0[] = {
-	 1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 8, 7, 7, 8, 9, 7,
-	 9, 9, 5, 7, 8, 7, 9, 9, 7, 9, 8, 5, 7, 7, 8, 9,
-	 9, 7, 9, 9, 7, 9, 9, 8, 9,11, 9,11,11, 7, 9, 9,
-	 9,11,10, 9,11,11, 5, 7, 8, 7, 9, 9, 8, 9, 9, 7,
-	 9, 9, 9,11,11, 9,10,11, 7, 9, 9, 9,11,11, 8,11,
-	 9,
+	 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,
+	 9,11,10, 9,11,12, 5, 8, 8, 8,10,10, 8,10,10, 7,
+	10,10, 9,11,11, 9,10,11, 7,10,10, 9,11,11,10,12,
+	10,
 };
 
 static float _vq_quantthresh__44u8_p5_0[] = {
@@ -7979,14 +9320,14 @@
 };
 
 static long _vq_lengthlist__44u8_p5_1[] = {
-	 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 8, 5, 6, 6, 6, 6,
-	 7, 7, 7, 7, 8, 8, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8,
-	 8, 6, 6, 6, 7, 7, 7, 7, 8, 7, 8, 8, 6, 6, 6, 7,
-	 7, 7, 7, 7, 8, 8, 8, 7, 7, 7, 7, 7, 8, 8, 8, 8,
-	 8, 8, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 7, 7, 7,
-	 7, 7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 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,
+	 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,
+	 7, 7, 7, 8, 8, 8, 8, 7, 7, 7, 7, 7, 8, 8, 8, 8,
+	 8, 8, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 7, 8, 7,
+	 8, 8, 8, 8, 8, 8, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 8, 8,
+	 8, 8, 8, 8, 8, 8, 8, 9, 9,
 };
 
 static float _vq_quantthresh__44u8_p5_1[] = {
@@ -8034,17 +9375,17 @@
 };
 
 static long _vq_lengthlist__44u8_p6_0[] = {
-	 1, 4, 4, 7, 7, 8, 8, 8, 8, 9,10,10,10, 5, 6, 6,
-	 7, 7, 8, 8, 9, 9,10,10,11,11, 5, 6, 6, 7, 7, 8,
-	 9, 9, 9,10,10,11,11, 7, 7, 7, 8, 8, 9, 9,10,10,
-	11,11,11,11, 7, 7, 7, 8, 8, 9, 9,10,10,10,11,11,
-	11, 8, 9, 9, 9, 9,10,10,10,10,11,11,12,12, 8, 9,
-	 9, 9, 9,10,10,10,11,11,11,12,12, 8, 9, 9,10,10,
-	11,10,11,11,12,12,12,12, 9, 9, 9,10,10,11,11,11,
-	11,12,12,12,12,10,10,10,11,11,11,11,12,12,12,12,
-	13,13,10,10,10,11,11,11,11,12,12,12,12,13,13,11,
-	11,11,12,12,12,12,12,12,13,13,13,13,11,11,11,12,
-	12,12,12,12,12,13,13,13,13,
+	 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,
+	 9,10,10,10, 6, 7, 7, 8, 8, 8, 8, 9, 8,10, 9,11,
+	10, 7, 8, 8, 8, 8, 8, 9, 9, 9,10,10,11,11, 7, 8,
+	 8, 8, 8, 9, 8, 9, 9,10,10,11,11, 8, 8, 8, 9, 9,
+	 9, 9, 9,10,10,10,11,11, 8, 8, 8, 9, 9, 9, 9,10,
+	 9,10,10,11,11, 9, 9, 9, 9,10,10,10,10,10,10,11,
+	11,12, 9, 9, 9,10, 9,10,10,10,10,11,10,12,11,10,
+	10,10,10,10,11,11,11,11,11,12,12,12,10,10,10,10,
+	11,11,11,11,11,12,11,12,12,
 };
 
 static float _vq_quantthresh__44u8_p6_0[] = {
@@ -8131,17 +9472,17 @@
 };
 
 static long _vq_lengthlist__44u8_p7_0[] = {
-	 1, 4, 4, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 4, 6, 6,
-	 8, 8, 9, 8, 9, 9,10,10,11,11, 4, 6, 6, 8, 8, 8,
-	 9, 9, 9,10,10,11,11, 7, 8, 8, 9, 9,10,10,10,10,
-	11,11,12,12, 7, 8, 8, 9, 9,10,10,10,10,11,11,12,
-	12, 8, 9, 9,10,10,10,10,11,11,12,12,13,13, 8, 9,
-	 9,10,10,10,11,11,11,12,13,13,13, 9, 9, 9,10,10,
+	 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,
+	11,11,12,12, 6, 7, 7, 8, 8, 9, 9,10,10,11,12,13,
+	12, 7, 8, 8, 9, 9,10,10,11,11,12,12,13,13, 8, 8,
+	 8, 9, 9,10,10,11,11,12,12,13,13, 9, 9, 9,10,10,
 	11,11,12,12,13,13,14,14, 9, 9, 9,10,10,11,11,12,
-	12,13,13,14,14,10,10,10,11,11,12,12,13,13,14,14,
-	14,14,10,10,11,11,12,12,12,13,13,13,14,14,15,11,
-	11,11,12,12,13,13,14,14,14,14,16,15,11,11,11,12,
-	12,13,13,14,14,14,14,16,15,
+	12,13,13,14,14,10,11,11,12,11,13,12,13,13,14,14,
+	15,15,10,11,11,11,12,12,13,13,14,14,14,15,15,11,
+	12,12,13,13,14,13,15,14,15,15,16,15,11,11,12,13,
+	13,13,14,14,14,15,15,15,16,
 };
 
 static float _vq_quantthresh__44u8_p7_0[] = {
@@ -8190,9 +9531,9 @@
 	 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,
-	 7, 7, 7, 7, 7, 8, 8, 7, 7, 7, 7, 7, 7, 7, 8, 8,
+	 7, 7, 7, 7, 7, 7, 8, 7, 7, 7, 7, 7, 7, 7, 8, 8,
 	 8, 8, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 7, 7, 7,
-	 7, 7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 8, 8, 8,
+	 8, 7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 8, 8, 8,
 	 8, 8, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7,
 	 7, 8, 8, 8, 8, 8, 8, 8, 8,
 };
@@ -8244,21 +9585,21 @@
 };
 
 static long _vq_lengthlist__44u8_p8_0[] = {
-	 1, 4, 4, 7, 7, 8, 8, 8, 7, 9, 8,10,10,11,11, 4,
-	 6, 6, 8, 8,10,10, 9, 9,10,10,11,10,12,12, 4, 6,
-	 6, 8, 8, 9,10, 9, 9,10,10,11,11,11,12, 7, 8, 8,
-	10,10,11,11,11,10,11,11,13,12,13,12, 7, 8, 8,10,
-	10,11,11,10,11,11,11,12,12,13,13, 8,10, 9,11,11,
-	12,12,11,11,12,12,13,13,14,14, 8, 9, 9,11,11,12,
-	12,11,11,12,12,14,13,13,13, 8, 9, 9,11,10,12,11,
-	12,12,13,13,14,13,14,13, 8, 9, 9,11,11,11,12,12,
-	12,13,13,13,14,14,14, 9,10,10,12,11,12,12,13,13,
-	14,14,15,13,14,14, 9,10,10,11,12,12,12,13,13,14,
-	14,15,14,14,14,10,11,11,12,12,13,13,14,13,14,14,
-	15,14,15,15,10,11,11,12,12,13,13,13,14,14,14,14,
-	15,16,15,11,12,12,13,12,14,14,14,13,15,14,16,15,
-	16,15,11,12,12,13,13,13,14,14,15,15,15,15,16,15,
-	15,
+	 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,
+	10,10,11,11,11,10,12,11,12,12,13,11, 7, 8, 8,10,
+	10,11,11,10,10,11,11,12,12,13,13, 8,10,10,11,11,
+	12,11,12,11,13,12,13,12,14,13, 8,10, 9,11,11,12,
+	12,12,12,12,12,13,13,14,13, 8, 9, 9,11,10,12,11,
+	13,12,13,13,14,13,14,13, 8, 9, 9,10,11,12,12,12,
+	12,13,13,14,15,14,14, 9,10,10,12,11,13,12,13,13,
+	14,13,14,14,14,14, 9,10,10,12,12,12,12,13,13,14,
+	14,14,15,14,14,10,11,11,13,12,13,12,14,14,14,14,
+	14,14,15,15,10,11,11,12,12,13,13,14,14,14,15,15,
+	14,16,15,11,12,12,13,12,14,14,14,13,15,14,15,15,
+	15,17,11,12,12,13,13,14,14,14,15,15,14,15,15,14,
+	17,
 };
 
 static float _vq_quantthresh__44u8_p8_0[] = {
@@ -8315,32 +9656,32 @@
 
 static 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, 7, 7, 7, 8, 8, 8, 8, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 6, 7, 6, 7, 7, 8,
-	 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 7,
+	 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,
+	 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 7,
 	 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 7, 7, 7, 8, 8, 8, 8, 9, 8, 9, 9, 9,
+	 9, 9, 9, 9, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 9,10, 9,10, 8, 8,
-	 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9,10, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	10, 9,10,10, 9,10, 9,10, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9,10,10, 9,10,10, 9,10, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,
-	10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9,10, 9,10,10,10,10,10,10,10,10, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9,10, 9, 9,10,10,10,10,10,10,10,10,
-	10, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,
-	10,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9,10,10,
-	10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10, 9,10, 8, 8,
+	 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,
+	10, 9,10, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,
+	10,10,10,10,10,10,10,10, 8, 9, 8, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9,10,10,10,10, 9,10,10, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,10,10,
+	10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,
+	10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9,10, 9,
+	10,10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,
-	10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9,
-	10,10, 9,10,10,10,10,10,10,10,10,10,10,10,10, 9,
+	10, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9,10,10,10,
+	10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9,
+	 9, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
 	 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,
+	10,10,10,10,10, 9, 9, 9,10, 9,10,10,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9,10,
+	 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9,
+	 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,
+	10,10,10,10, 9, 9, 9,10, 9,10, 9,10,10,10,10,10,
 	10,10,10,10,10,10,10,10,10,
 };
 
@@ -8387,11 +9728,11 @@
 };
 
 static long _vq_lengthlist__44u8_p9_0[] = {
-	 1, 4, 4, 9, 9, 9, 9, 9, 9, 5, 9, 9, 8, 8, 8, 8,
-	 8, 8, 4, 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, 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,
+	 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,
+	 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, 8, 8, 8,
 	 8,
 };
 
@@ -8445,29 +9786,29 @@
 };
 
 static long _vq_lengthlist__44u8_p9_1[] = {
-	 1, 4, 4, 7, 7, 8, 8, 7, 8, 9, 9,10,10,11,11,12,
-	12,12,12, 4, 7, 6, 9, 9, 9, 9, 9, 8, 9, 9,11,10,
-	12,11,13,12,13,14, 4, 6, 6, 9, 9, 9, 9, 8, 9, 9,
-	10,10,11,12,12,12,12,13,12, 7, 9, 8,11,10,10,10,
-	10,10,11,11,12,11,14,12,13,14,14,13, 7, 8, 9,10,
-	10,10,10,10,10,11,11,12,13,13,13,14,15,15,13, 8,
-	 9, 9,11,11,11,11,11,12,13,12,14,14,14,14,14,14,
-	15,13, 8, 9, 9,10,11,11,11,12,12,13,12,13,14,13,
-	15,14,15,15,15, 8, 9, 9,10,10,12,11,13,12,13,13,
-	14,14,13,15,14,15,14,14, 8, 9, 9,10,11,12,12,13,
-	13,14,14,14,14,15,15,15,12,14,14, 9,11,10,11,11,
-	14,12,13,14,15,14,14,14,14,15,15,15,15,15, 9,10,
-	11,11,12,12,13,13,14,14,14,14,15,15,14,15,15,15,
-	15,10,11,11,12,12,14,14,13,14,14,15,15,15,15,15,
-	15,15,15,15,10,11,11,12,13,13,13,14,14,15,15,14,
-	14,15,15,15,15,14,15,11,12,13,15,13,14,15,15,15,
-	15,14,15,15,15,15,15,15,15,15,11,12,12,14,14,14,
-	13,14,15,15,14,15,15,15,15,15,15,15,15,13,13,14,
-	13,13,14,14,15,14,15,15,15,15,15,15,15,15,15,15,
-	11,14,13,14,14,15,14,14,15,15,15,15,15,15,15,15,
-	15,15,15,12,12,13,14,13,13,14,15,14,15,15,15,15,
-	15,15,15,15,15,15,13,13,14,14,13,15,14,14,15,15,
-	14,15,15,15,15,15,15,15,15,
+	 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,
+	10,11,10,11,11,11,12,11,12, 7, 9, 8,11,11,11,11,
+	10,10,11,11,12,12,12,12,12,12,14,13, 7, 8, 9,10,
+	11,11,11,10,10,11,11,11,11,12,12,14,12,13,14, 8,
+	 9, 9,11,11,11,11,11,11,12,12,14,12,15,14,14,14,
+	15,14, 8, 9, 9,11,11,11,11,12,11,12,12,13,13,13,
+	13,13,13,14,14, 8, 9, 9,11,10,12,11,12,12,13,13,
+	13,13,15,14,14,14,16,16, 8, 9, 9,10,11,11,12,12,
+	12,13,13,13,14,14,14,15,16,15,15, 9,10,10,11,12,
+	12,13,13,13,14,14,16,14,14,16,16,16,16,15, 9,10,
+	10,11,11,12,13,13,14,15,14,16,14,15,16,16,16,16,
+	15,10,11,11,12,13,13,14,15,15,15,15,15,16,15,16,
+	15,16,15,15,10,11,11,13,13,14,13,13,15,14,15,15,
+	16,15,15,15,16,15,16,10,12,12,14,14,14,14,14,16,
+	16,15,15,15,16,16,16,16,16,16,11,12,12,14,14,14,
+	14,15,15,16,15,16,15,16,15,16,16,16,16,12,12,13,
+	14,14,15,16,16,16,16,16,16,15,16,16,16,16,16,16,
+	12,13,13,14,14,14,14,15,16,15,16,16,16,16,16,16,
+	16,16,16,12,13,14,14,14,16,15,16,15,16,16,16,16,
+	16,16,16,16,16,16,12,14,13,14,15,15,15,16,15,16,
+	16,15,16,16,16,16,16,16,16,
 };
 
 static float _vq_quantthresh__44u8_p9_1[] = {
@@ -8553,8 +9894,8 @@
 };
 
 static long _vq_lengthlist__44u8_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,
+	 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,
 };
@@ -8597,13 +9938,13 @@
 };
 
 static long _huff_lengthlist__44u9__long[] = {
-	 3, 9,13,13,14,14,13,14,14,13, 5, 5, 9,10,12,13,
-	13,14,14,14, 9, 5, 6, 6, 8,11,12,14,14,14,11, 7,
-	 5, 3, 5, 8,10,12,13,12,12,10, 7, 4, 3, 5, 8,10,
-	12,13,10,12, 9, 7, 4, 4, 6, 8,11,13,12,12,11, 9,
-	 7, 5, 6, 7, 9,13,12,12,12,11, 8, 7, 6, 6, 8,12,
-	12,12,13,12,10, 9, 7, 7, 8,11,11,13,15,15,14,12,
-	10, 9, 9,10,
+	 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,
+	12,12,12,12, 9, 7, 5, 4, 6, 8,10,13,13,12,11, 9,
+	 7, 5, 5, 6, 9,12,14,12,12,10, 8, 6, 6, 6, 7,11,
+	13,12,14,13,10, 8, 7, 7, 7,10,11,11,12,13,12,11,
+	10, 8, 8, 9,
 };
 
 static static_codebook _huff_book__44u9__long = {
@@ -8618,13 +9959,13 @@
 };
 
 static long _huff_lengthlist__44u9__short[] = {
-	10,17,18,18,18,18,18,18,18,18, 5, 8,12,13,14,13,
-	16,17,16,17, 5, 6, 8, 8,10, 9,12,16,16,17, 5, 6,
-	 7, 5, 6, 9,12,15,16,16, 7, 6, 6, 4, 5, 7, 9,14,
-	15,17,10, 8, 8, 6, 6, 3, 5, 9,13,18,14,11,11,10,
-	 6, 3, 4, 7,13,17,15,16,16,10, 5, 6, 4, 4, 9,13,
-	18,18,18,11, 6, 8, 5, 6,10,15,18,18,18,14,10,11,
-	 9,10,16,18,
+	 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,
+	17,16, 7, 6, 7, 6, 6, 8, 9,10,14,16,11, 8, 8, 7,
+	 6, 6, 3, 4,10,15,14,12,12,10, 5, 6, 3, 3, 8,13,
+	15,17,15,11, 6, 8, 6, 6, 9,14,17,15,15,12, 8,10,
+	 9, 9,12,15,
 };
 
 static static_codebook _huff_book__44u9__short = {
@@ -8645,11 +9986,11 @@
 };
 
 static long _vq_lengthlist__44u9_p1_0[] = {
-	 1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 8, 9, 9, 7,
+	 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,10, 7, 9, 9,
-	 9,11,10, 9,10,11, 5, 7, 7, 7, 9, 9, 7, 9, 9, 7,
-	 9, 9, 9,11,11, 9,10,11, 8, 9, 9, 9,10,10, 9,11,
+	 9, 7, 9, 9, 8, 9, 9, 9,10,11, 9,11,11, 7, 9, 9,
+	 9,11,10, 9,11,11, 5, 7, 7, 7, 9, 9, 8, 9,10, 7,
+	 9, 9, 9,11,11, 9,10,11, 7, 9,10, 9,11,11, 9,11,
 	10,
 };
 
@@ -8688,46 +10029,46 @@
 };
 
 static long _vq_lengthlist__44u9_p2_0[] = {
-	 3, 6, 5, 8, 8, 6, 7, 7, 9, 9, 6, 7, 7, 9, 9, 8,
-	 9, 9,11,10, 8, 9, 9,10,11, 6, 7, 7, 9, 9, 7, 8,
+	 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,
-	11,11, 6, 7, 7, 9, 9, 7, 8, 7,10, 9, 7, 8, 8,10,
+	11,11, 6, 7, 7, 9, 9, 7, 8, 8,10, 9, 7, 8, 8,10,
 	10, 9,10, 9,11,11, 9,10,10,11,11, 8, 9, 9,11,11,
-	 9,10,10,12,11, 9,10,10,11,11,11,12,12,13,13,11,
+	 9,10,10,12,11, 9,10,10,11,12,11,11,11,13,13,11,
 	11,11,12,13, 8, 9, 9,11,11, 9,10,10,11,11, 9,10,
-	10,12,12,11,11,11,13,12,11,11,11,13,13, 6, 7, 7,
-	 9, 9, 7, 8, 8,10, 9, 7, 8, 8, 9,10, 9,10,10,11,
-	11, 9,10,10,11,11, 7, 8, 8,10,10, 8, 9, 9,10,10,
-	 8, 9, 9,10,10,10,10,10,12,12,10,10,10,11,12, 7,
-	 8, 8,10,10, 8, 9, 8,10,10, 8, 9, 9,10,10, 9,10,
-	10,12,11,10,10,10,12,12, 9,10,10,12,11,10,10,10,
-	12,12,10,10,10,12,12,12,12,12,12,13,11,12,12,13,
-	13, 9,10,10,11,11, 9,10,10,12,11,10,10,10,12,12,
-	11,12,11,13,12,12,12,12,13,13, 6, 7, 7, 9, 9, 7,
-	 8, 8,10, 9, 7, 8, 8, 9,10, 9,10,10,12,11, 9,10,
-	10,11,11, 7, 8, 8,10, 9, 8, 9, 9,11,10, 8, 8, 9,
-	10,10,10,10,10,12,12,10,10,10,11,12, 7, 8, 8,10,
-	10, 8, 9, 9,10,10, 8, 9, 9,10,10,10,10,10,12,12,
-	10,10,10,12,12, 9,10,10,11,11,10,11,10,12,12, 9,
-	10,10,11,12,11,12,12,13,13,11,11,12,11,13, 9,10,
-	10,11,12,10,10,10,12,12,10,10,10,12,12,11,12,12,
-	13,13,12,12,12,13,13, 8, 9, 9,11,11, 9,10,10,12,
-	11, 9,10,10,11,12,11,12,12,13,13,11,11,12,13,13,
-	 9,10,10,12,12,10,10,10,12,12,10,11,10,12,12,12,
-	12,12,13,13,12,12,12,13,13, 9,10,10,12,11,10,10,
-	10,12,11,10,10,10,12,12,11,12,12,13,13,12,12,12,
-	13,14,11,12,12,13,13,11,12,12,13,13,11,12,12,13,
-	13,13,13,14,13,15,13,13,13,14,14,11,11,11,13,13,
-	11,12,11,13,13,11,12,12,13,13,12,13,12,14,12,13,
-	13,13,15,14, 8, 9, 9,11,11, 9,10,10,11,11, 9,10,
+	10,12,11,11,12,11,13,12,11,11,12,13,13, 6, 7, 7,
+	 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,10, 9,10,10,12,
+	11, 9,10,10,11,12, 7, 8, 8,10,10, 8, 9, 9,11,11,
+	 8, 9, 9,10,10,10,11,11,12,12,10,10,11,12,12, 7,
+	 8, 8,10,10, 8, 9, 8,10,10, 8, 9, 9,10,10,10,11,
+	10,12,11,10,10,11,12,12, 9,10,10,11,12,10,11,11,
+	12,12,10,11,10,12,12,12,12,12,13,13,11,12,12,13,
+	13, 9,10,10,11,11, 9,10,10,12,12,10,11,11,12,13,
+	11,12,11,13,12,12,12,12,13,14, 6, 7, 7, 9, 9, 7,
+	 8, 8,10,10, 7, 8, 8,10,10, 9,10,10,11,11, 9,10,
+	10,11,12, 7, 8, 8,10,10, 8, 9, 9,11,10, 8, 8, 9,
+	10,10,10,11,10,12,12,10,10,11,11,12, 7, 8, 8,10,
+	10, 8, 9, 9,10,10, 8, 9, 9,10,10,10,11,10,12,12,
+	10,11,10,12,12, 9,10,10,12,11,10,11,11,12,12, 9,
+	10,10,12,12,12,12,12,13,13,11,11,12,12,14, 9,10,
+	10,11,12,10,11,11,12,12,10,11,11,12,12,11,12,12,
+	14,14,12,12,12,13,13, 8, 9, 9,11,11, 9,10,10,12,
+	11, 9,10,10,12,12,11,12,11,13,13,11,11,12,13,13,
+	 9,10,10,12,12,10,11,11,12,12,10,11,11,12,12,12,
+	12,12,14,14,12,12,12,13,13, 9,10,10,12,11,10,11,
+	10,12,12,10,11,11,12,12,11,12,12,14,13,12,12,12,
+	13,14,11,12,11,13,13,11,12,12,13,13,12,12,12,14,
+	14,13,13,13,13,15,13,13,14,15,15,11,11,11,13,13,
+	11,12,11,13,13,11,12,12,13,13,12,13,12,15,13,13,
+	13,14,14,15, 8, 9, 9,11,11, 9,10,10,11,12, 9,10,
 	10,11,12,11,12,11,13,13,11,12,12,13,13, 9,10,10,
-	11,11,10,11,10,12,12, 9,10,10,12,12,12,12,12,13,
-	13,11,11,12,12,13, 9,10,10,12,12,10,10,11,12,12,
-	10,11,10,12,12,11,12,12,13,13,12,12,12,13,13,11,
-	11,11,13,13,11,12,12,13,13,11,11,12,13,13,13,13,
-	13,14,14,12,12,13,12,14,11,11,12,13,13,12,12,12,
-	14,13,11,12,12,13,13,13,13,13,14,14,13,13,13,14,
-	13,
+	11,12,10,11,10,12,12,10,10,11,12,13,12,12,12,14,
+	13,11,12,12,13,14, 9,10,10,12,12,10,11,11,12,12,
+	10,11,11,12,12,12,12,12,14,13,12,12,12,14,13,11,
+	11,11,13,13,11,12,12,14,13,11,11,12,13,13,13,13,
+	13,15,14,12,12,13,13,15,11,12,12,13,13,12,12,12,
+	13,14,11,12,12,13,13,13,13,14,14,15,13,13,13,14,
+	14,
 };
 
 static float _vq_quantthresh__44u9_p2_0[] = {
@@ -8769,11 +10110,11 @@
 };
 
 static long _vq_lengthlist__44u9_p3_0[] = {
-	 3, 4, 4, 5, 5, 7, 7, 9, 8, 4, 5, 5, 6, 6, 7, 7,
-	 9, 9, 4, 5, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 6,
-	 8, 7, 9, 9, 5, 6, 6, 6, 7, 7, 8, 9, 9, 7, 7, 7,
-	 8, 7, 9, 8,10,10, 7, 7, 7, 7, 8, 8, 9,10,10, 9,
-	 9, 9, 9, 9,10,10,11,11, 9, 9, 9, 9, 9,10,10,11,
+	 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,
+	 8, 8, 9, 9,10,10, 7, 7, 7, 8, 8, 9, 9,10,10, 8,
+	 9, 9,10, 9,10,10,11,11, 8, 9, 9, 9,10,10,10,11,
 	11,
 };
 
@@ -8826,23 +10167,23 @@
 
 static 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,10, 9,11,10,
-	12,11, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9,10,10,
-	11,11,11, 6, 6, 6, 7, 6, 7, 7, 8, 8, 9, 9,10,10,
-	11,11,12,12, 6, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9,10,
-	10,11,11,12,12, 7, 7, 7, 7, 7, 8, 8, 9, 8, 9, 9,
-	10,10,11,11,12,12, 7, 7, 7, 7, 7, 8, 8, 8, 9, 9,
-	 9,10,10,11,11,12,12, 8, 8, 8, 8, 8, 9, 8, 9, 9,
-	10,10,11,10,12,11,12,12, 8, 8, 8, 8, 8, 8, 9, 9,
-	 9,10,10,10,11,11,12,12,13, 8, 8, 8, 9, 9, 9, 9,
-	10,10,11,10,11,11,12,12,13,12, 8, 8, 9, 9, 9, 9,
-	 9,10,10,10,11,11,11,12,12,12,13, 9,10, 9,10,10,
+	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,
+	10,11,11, 6, 6, 6, 7, 6, 7, 7, 8, 8, 9, 9,10,10,
+	11,11,12,11, 6, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9,10,
+	10,11,11,11,12, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,
+	10,10,11,11,12,12, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9,
+	 9,10,10,11,11,12,12, 8, 8, 8, 8, 8, 9, 8,10, 9,
+	10,10,11,10,12,11,13,12, 8, 8, 8, 8, 8, 9, 9, 9,
+	10,10,10,10,11,11,12,12,12, 8, 8, 8, 9, 9, 9, 9,
+	10,10,11,10,12,11,12,12,13,12, 8, 8, 8, 9, 9, 9,
+	 9,10,10,10,11,11,11,12,12,12,13, 9, 9, 9,10,10,
 	10,10,11,10,11,11,12,11,13,12,13,13, 9, 9,10,10,
 	10,10,10,10,11,11,11,11,12,12,13,13,13,10,11,10,
 	11,11,11,11,12,11,12,12,13,12,13,13,14,13,10,10,
-	11,11,11,11,11,11,12,12,12,12,13,13,13,13,14,11,
-	12,11,12,12,12,12,12,12,13,13,13,13,14,13,14,14,
-	11,11,12,12,12,12,12,12,12,12,13,13,13,13,14,14,
+	10,11,11,11,11,11,12,12,12,12,13,13,13,13,14,11,
+	11,11,12,11,12,12,12,12,13,13,13,13,14,13,14,14,
+	11,11,11,11,12,12,12,12,12,12,13,13,13,13,14,14,
 	14,
 };
 
@@ -8882,12 +10223,12 @@
 };
 
 static long _vq_lengthlist__44u9_p5_0[] = {
-	 1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 8, 7, 7, 8, 9, 7,
-	 8, 9, 5, 7, 8, 7, 9, 8, 7, 9, 8, 5, 8, 8, 8, 9,
-	 9, 7, 9, 9, 7, 9, 9, 8, 9,11, 9,11,10, 7, 9, 9,
-	 9,11, 9, 9,10,11, 5, 7, 8, 7, 9, 9, 8, 9, 9, 7,
-	 9, 9, 9,11,10, 9, 9,11, 7, 9, 9, 9,10,11, 8,11,
-	 9,
+	 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,
+	 9,11,10, 9,11,12, 5, 8, 8, 8,10,10, 8,10,10, 7,
+	10,10, 9,12,11, 9,10,11, 7,10,10, 9,11,11,10,12,
+	10,
 };
 
 static float _vq_quantthresh__44u9_p5_0[] = {
@@ -8931,14 +10272,14 @@
 };
 
 static long _vq_lengthlist__44u9_p5_1[] = {
-	 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6,
-	 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7,
-	 7, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 7, 7,
-	 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8,
-	 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 7, 7, 7,
-	 7, 7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 8, 8,
-	 8, 8, 8, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 7, 7,
-	 7, 7, 7, 8, 8, 8, 8, 8, 8,
+	 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,
+	 7, 7, 7, 7, 7, 8, 8, 7, 7, 7, 7, 7, 8, 7, 8, 8,
+	 8, 8, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 7, 7, 7,
+	 8, 7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 8, 8, 8, 8,
+	 8, 8, 8, 7, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 7, 8,
+	 8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
 static float _vq_quantthresh__44u9_p5_1[] = {
@@ -8986,17 +10327,17 @@
 };
 
 static long _vq_lengthlist__44u9_p6_0[] = {
-	 2, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 4, 5, 5,
-	 7, 7, 8, 8, 8, 8,10,10,11,11, 4, 5, 5, 7, 7, 8,
-	 8, 8, 8,10,10,11,11, 6, 7, 7, 8, 7, 8, 8, 9, 9,
-	10,10,11,11, 6, 7, 7, 8, 7, 8, 8, 9, 9,10,10,11,
-	11, 7, 8, 8, 8, 8, 9, 9, 9,10,11,11,12,12, 7, 8,
-	 8, 8, 8, 9, 9,10, 9,11,11,12,12, 8, 9, 8, 9, 9,
-	10,10,10,10,11,11,12,12, 8, 8, 8, 9, 9,10, 9,10,
-	10,11,11,12,12, 9,10,10,10,10,11,11,11,11,12,12,
-	13,13, 9,10,10,10,10,11,11,11,11,12,12,13,12,10,
-	11,11,11,11,12,12,12,12,12,12,13,13,10,11,11,11,
-	11,12,12,12,12,13,12,13,13,
+	 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,
+	10,10,10,10, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,10,
+	10, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,11, 7, 8,
+	 8, 8, 8, 9, 9, 9, 9,10,10,11,11, 8, 8, 8, 9, 9,
+	 9, 9, 9,10,10,10,11,11, 8, 8, 8, 9, 9, 9, 9,10,
+	 9,10,10,11,11, 9, 9, 9,10,10,10,10,10,11,11,11,
+	11,12, 9, 9, 9,10,10,10,10,10,10,11,10,12,11,10,
+	10,10,10,10,11,11,11,11,11,12,12,12,10,10,10,10,
+	10,11,11,11,11,12,11,12,12,
 };
 
 static float _vq_quantthresh__44u9_p6_0[] = {
@@ -9083,17 +10424,17 @@
 };
 
 static long _vq_lengthlist__44u9_p7_0[] = {
-	 1, 5, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 5, 6, 6,
+	 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,
-	11,11,12,12, 7, 7, 7, 8, 8, 9, 9,10,10,11,11,12,
-	12, 8, 8, 8, 9, 9,10,10,11,10,12,12,13,12, 8, 8,
-	 8, 9, 9,10,10,11,11,12,12,12,13, 9, 9, 9,10,10,
-	11,11,12,11,13,13,13,14, 9, 9, 9,10,10,11,11,11,
-	12,13,12,13,13,10,10,10,11,11,12,12,13,12,13,13,
-	14,14,10,10,10,11,11,11,12,12,12,13,13,14,14,11,
-	11,11,12,12,13,13,13,13,14,14,15,14,11,11,11,12,
-	12,13,13,13,14,14,15,15,15,
+	11,11,12,12, 6, 7, 7, 8, 8, 9, 9,10,10,11,11,12,
+	12, 8, 8, 8, 9, 9,10,10,11,11,12,12,13,13, 8, 8,
+	 8, 9, 9,10,10,11,11,12,12,13,13, 9, 9, 9,10,10,
+	11,11,12,12,13,13,13,13, 9, 9, 9,10,10,11,11,12,
+	12,13,13,14,14,10,10,10,11,11,12,12,13,13,14,13,
+	15,14,10,10,10,11,11,12,12,13,13,14,14,14,14,11,
+	11,12,12,12,13,13,14,14,14,14,15,15,11,11,12,12,
+	12,13,13,14,14,14,15,15,15,
 };
 
 static float _vq_quantthresh__44u9_p7_0[] = {
@@ -9141,12 +10482,12 @@
 static 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,
 	 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,
-	 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,
+	 7, 7, 7, 7, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 	 7, 8, 8, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 8, 7, 7,
-	 7, 7, 7, 7, 7, 7, 8, 8, 8,
+	 7, 7, 7, 7, 7, 8, 8, 8, 8,
 };
 
 static float _vq_quantthresh__44u9_p7_1[] = {
@@ -9196,21 +10537,21 @@
 };
 
 static long _vq_lengthlist__44u9_p8_0[] = {
-	 1, 4, 4, 7, 7, 8, 8, 8, 7, 9, 9,10,10,11,11, 4,
-	 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,10,12,11, 4, 6,
+	 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,
-	10,10,11,11,11,10,11,11,12,12,13,12, 7, 8, 8,10,
-	10,11,11,10,10,11,12,12,12,13,13, 8,10, 9,11,11,
-	12,12,11,12,12,12,13,13,14,14, 8, 9, 9,11,11,12,
-	12,11,12,12,13,13,13,14,14, 8, 9, 9,10,10,11,11,
-	13,12,13,13,14,14,15,14, 8, 9, 9,10,10,11,12,12,
-	13,13,13,14,14,14,15, 9,10,10,11,11,13,12,13,13,
-	14,14,15,15,15,15, 9,10,10,11,12,12,12,13,13,14,
-	15,14,15,15,15,10,11,11,12,12,13,13,14,14,15,15,
-	15,16,16,15,10,11,11,12,12,13,14,14,14,15,14,15,
-	16,16,17,11,12,12,13,13,14,14,15,14,16,15,15,16,
-	16,16,11,12,12,13,13,14,14,14,15,15,15,16,16,17,
-	16,
+	10,10,11,11,10,10,11,11,12,12,13,12, 7, 8, 8,10,
+	10,11,11,10,10,11,11,12,12,12,13, 8,10, 9,11,11,
+	12,12,11,11,12,12,13,13,14,13, 8, 9, 9,11,11,12,
+	12,11,12,12,12,13,13,14,13, 8, 9, 9,10,10,12,11,
+	13,12,13,13,14,13,15,14, 8, 9, 9,10,10,11,12,12,
+	12,13,13,13,14,14,14, 9,10,10,12,11,13,12,13,13,
+	14,13,14,14,14,15, 9,10,10,11,12,12,12,13,13,14,
+	14,14,15,15,15,10,11,11,12,12,13,13,14,14,14,14,
+	15,14,16,15,10,11,11,12,12,13,13,13,14,14,14,14,
+	14,15,16,11,12,12,13,13,14,13,14,14,15,14,15,16,
+	16,16,11,12,12,13,13,14,13,14,14,15,15,15,16,15,
+	15,
 };
 
 static float _vq_quantthresh__44u9_p8_0[] = {
@@ -9267,32 +10608,32 @@
 
 static 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, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 6, 7, 7, 7, 7, 8,
+	 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,
 	 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 7,
-	 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 7, 7, 8, 8, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 9, 8, 8,
-	 8, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,
-	 9, 9, 9, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9,10,10,10,10, 8, 8, 8, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9,10, 9, 9,10,10, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 9,10,
-	10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	10,10,10, 9,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9,10, 9,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10, 8, 8,
+	 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9,10,10, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	10, 9,10, 9,10,10,10,10, 8, 8, 8, 9, 9, 9, 9, 9,
+	 9, 9, 9, 9, 9,10,10, 9,10,10,10,10,10, 9, 9, 9,
+	 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,10,10,
+	10,10, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,
+	10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9,10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9,
 	 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,
-	10, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,
-	10,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+	10, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,10,10,
+	10,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9,10,10,
 	10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9,
-	 9,10, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	 9, 9, 9, 9, 9, 9, 9, 9,10,10, 9,10,10,10,10,10,
-	10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9,
-	 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	 9, 9, 9, 9,10, 9, 9,10,10,10,10,10,10,10,10,10,
+	10,10,10,10,10, 9, 9, 9,10, 9,10, 9,10,10,10,10,
+	10,10,10,10,10,10,10,10,10,10, 9, 9, 9,10, 9,10,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9,
 	 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,10,10,10, 9, 9, 9, 9, 9, 9,10,10, 9,10,10,10,
+	10,10,10,10, 9, 9, 9,10,10,10,10,10,10,10,10,10,
 	10,10,10,10,10,10,10,10,10,
 };
 
@@ -9345,21 +10686,21 @@
 };
 
 static long _vq_lengthlist__44u9_p9_0[] = {
-	 1, 5, 5,10,10,10,10,10,10,10,10,10,10,10,10, 5,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10, 5,10,
+	 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,
+	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,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,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,11,11,
+	11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
 	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, 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, 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, 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, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9,
+	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+	10,
 };
 
 static float _vq_quantthresh__44u9_p9_0[] = {
@@ -9413,29 +10754,29 @@
 };
 
 static long _vq_lengthlist__44u9_p9_1[] = {
-	 1, 4, 4, 7, 7, 8, 8, 7, 7, 9, 9,10,10,12,11,12,
-	11,12,12, 4, 7, 6, 9, 9, 9, 9, 9, 9,10, 9,11, 9,
-	11,11,13,12,14,12, 4, 6, 6, 9, 9, 9, 9, 8, 9,10,
-	10,11,11,12,12,12,13,13,13, 7, 9, 8,11,11,11,11,
-	10,10,11,11,12,12,14,13,14,14,15,13, 7, 9, 9,10,
-	10,10,10,10,10,11,11,12,13,13,13,14,14,15,13, 8,
-	 9, 9,12,10,11,11,12,11,12,12,13,13,14,14,15,16,
-	15,14, 8, 9, 9,10,11,12,11,11,12,13,12,14,14,13,
-	15,16,15,14,16, 7, 9, 9,10,10,12,11,12,13,16,13,
-	14,16,14,15,15,15,15,15, 7, 9, 9,10,11,11,12,12,
-	13,14,16,14,14,16,16,14,14,14,15, 9,10,11,12,12,
-	12,13,13,13,16,15,16,15,14,15,15,15,16,16, 9,10,
-	11,12,13,13,14,13,14,15,14,14,16,16,16,16,16,16,
-	16,10,11,11,13,13,15,13,15,13,14,16,16,16,16,16,
-	16,15,14,16,11,11,12,12,13,13,15,13,15,14,15,16,
-	16,16,16,16,16,16,16,12,13,13,13,13,15,14,15,16,
-	16,16,16,14,16,16,16,16,16,16,13,12,12,14,14,13,
-	15,14,16,15,16,16,16,16,16,16,16,16,15,12,12,13,
-	13,14,16,15,16,15,16,16,16,16,16,16,16,16,16,16,
-	12,13,13,14,15,14,14,16,16,15,16,16,16,16,16,16,
-	15,16,16,13,14,14,13,14,14,15,16,15,16,16,16,16,
-	16,16,16,16,15,16,12,13,13,14,14,14,14,16,16,16,
-	16,16,16,15,16,16,16,16,16,
+	 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,
+	10,11,11,11,12,12,12,12,12, 7, 9, 8,11,10,10,10,
+	11,10,11,11,12,12,13,12,13,13,13,13, 7, 8, 9,10,
+	10,11,11,10,10,11,11,11,12,13,13,13,13,14,14, 8,
+	 9, 9,11,11,12,11,12,12,13,12,12,13,13,14,15,14,
+	14,14, 8, 9, 9,10,11,11,11,12,12,13,12,13,13,14,
+	14,14,15,14,16, 8, 9, 9,11,10,12,12,12,12,15,13,
+	13,13,17,14,15,15,15,14, 8, 9, 9,10,11,11,12,13,
+	12,13,13,13,14,15,14,14,14,16,15, 9,11,10,12,12,
+	13,13,13,13,14,14,16,15,14,14,14,15,15,17, 9,10,
+	10,11,11,13,13,13,14,14,13,15,14,15,14,15,16,15,
+	16,10,11,11,12,12,13,14,15,14,15,14,14,15,17,16,
+	15,15,17,17,10,12,11,13,12,14,14,13,14,15,15,15,
+	15,16,17,17,15,17,16,11,12,12,14,13,15,14,15,16,
+	17,15,17,15,17,15,15,16,17,15,11,11,12,14,14,14,
+	14,14,15,15,16,15,17,17,17,16,17,16,15,12,12,13,
+	14,14,14,15,14,15,15,16,16,17,16,17,15,17,17,16,
+	12,14,12,14,14,15,15,15,14,14,16,16,16,15,16,16,
+	15,17,15,12,13,13,14,15,14,15,17,15,17,16,17,17,
+	17,16,17,16,17,17,12,13,13,14,16,15,15,15,16,15,
+	17,17,15,17,15,17,16,16,17,
 };
 
 static float _vq_quantthresh__44u9_p9_1[] = {
@@ -9521,8 +10862,8 @@
 };
 
 static long _vq_lengthlist__44u9_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,
+	 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,
 };
@@ -9564,89 +10905,107 @@
 	0
 };
 
-static long _vq_quantlist__8u0__p1_0[] = {
+static 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 = {
+	2, 64,
+	_huff_lengthlist__44un1__long,
+	0, 0, 0, 0, 0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
+};
+
+static long _vq_quantlist__44un1__p1_0[] = {
 	1,
 	0,
 	2,
 };
 
-static 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,
-	10,13,12,10,13,13, 5, 9, 8, 8,11,11, 8,11,11, 7,
-	11,11, 9,13,13,10,12,13, 7,11,11,10,13,13,10,13,
-	11,
+static 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,
+	10,13,11,11,13,14, 4, 8, 9, 8,11,11, 8,11,12, 7,
+	11,11,11,14,13,10,11,13, 8,11,12,11,13,13,10,14,
+	12,
 };
 
-static float _vq_quantthresh__8u0__p1_0[] = {
+static float _vq_quantthresh__44un1__p1_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__8u0__p1_0[] = {
+static long _vq_quantmap__44un1__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 encode_aux_threshmatch _vq_auxt__44un1__p1_0 = {
+	_vq_quantthresh__44un1__p1_0,
+	_vq_quantmap__44un1__p1_0,
 	3,
 	3
 };
 
-static static_codebook _8u0__p1_0 = {
+static static_codebook _44un1__p1_0 = {
 	4, 81,
-	_vq_lengthlist__8u0__p1_0,
+	_vq_lengthlist__44un1__p1_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__8u0__p1_0,
+	_vq_quantlist__44un1__p1_0,
 	NULL,
-	&_vq_auxt__8u0__p1_0,
+	&_vq_auxt__44un1__p1_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u0__p2_0[] = {
+static long _vq_quantlist__44un1__p2_0[] = {
 	1,
 	0,
 	2,
 };
 
-static 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,
-	 8,10, 8, 8,10,10, 5, 7, 7, 7, 8, 8, 7, 8, 9, 6,
-	 8, 8, 8,10,10, 8, 8,10, 6, 8, 9, 8,10,10, 7,10,
+static 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,
+	 7,10, 8, 9,10,10, 5, 7, 7, 7, 8, 8, 7, 8, 9, 6,
+	 8, 8, 9,10,10, 7, 8,10, 6, 8, 9, 9,10,10, 8,10,
 	 8,
 };
 
-static float _vq_quantthresh__8u0__p2_0[] = {
+static float _vq_quantthresh__44un1__p2_0[] = {
 	-0.5, 0.5, 
 };
 
-static long _vq_quantmap__8u0__p2_0[] = {
+static long _vq_quantmap__44un1__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 encode_aux_threshmatch _vq_auxt__44un1__p2_0 = {
+	_vq_quantthresh__44un1__p2_0,
+	_vq_quantmap__44un1__p2_0,
 	3,
 	3
 };
 
-static static_codebook _8u0__p2_0 = {
+static static_codebook _44un1__p2_0 = {
 	4, 81,
-	_vq_lengthlist__8u0__p2_0,
+	_vq_lengthlist__44un1__p2_0,
 	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__8u0__p2_0,
+	_vq_quantlist__44un1__p2_0,
 	NULL,
-	&_vq_auxt__8u0__p2_0,
+	&_vq_auxt__44un1__p2_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u0__p3_0[] = {
+static long _vq_quantlist__44un1__p3_0[] = {
 	2,
 	1,
 	3,
@@ -9654,76 +11013,76 @@
 	4,
 };
 
-static 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,
-	12,13, 6, 8, 8,10,10, 8,10,10,11,11, 8,10,10,11,
-	11, 9,10,11,12,12,10,11,11,12,12, 8,11,11,14,13,
-	10,12,11,15,13,10,12,11,14,14,12,13,12,16,14,12,
-	14,12,16,15, 8,11,11,13,14,10,11,12,13,15,10,11,
-	12,13,15,11,12,13,14,15,12,12,14,14,16, 5, 8, 8,
-	11,11, 9,11,11,12,12, 8,10,11,12,12,11,12,12,15,
-	14,11,12,12,14,14, 7,11,10,13,12,10,11,12,13,14,
-	10,12,12,14,13,12,13,13,14,15,12,13,13,15,15, 7,
-	10,11,12,13,10,12,11,14,13,10,12,13,13,15,12,13,
-	12,14,14,11,13,13,15,16, 9,12,12,15,14,11,13,13,
-	15,16,11,13,13,16,16,13,14,15,15,15,12,14,15,17,
-	16, 9,12,12,14,15,11,13,13,15,16,11,13,13,16,18,
-	13,14,14,17,16,13,15,15,17,18, 5, 8, 9,11,11, 8,
-	11,11,12,12, 8,10,11,12,12,11,12,12,14,14,11,12,
-	12,14,15, 7,11,10,12,13,10,12,12,14,13,10,11,12,
-	13,14,11,13,13,15,14,12,13,13,14,15, 7,10,11,13,
-	13,10,12,12,13,14,10,12,12,13,13,11,13,13,16,16,
-	12,13,13,15,14, 9,12,12,16,15,10,13,13,15,15,11,
-	13,13,17,15,12,15,15,18,17,13,14,14,15,16, 9,12,
-	12,15,15,11,13,13,15,16,11,13,13,15,15,12,15,15,
-	16,16,13,15,14,17,15, 7,11,11,15,15,10,13,13,16,
-	15,10,13,13,15,16,14,15,15,17,19,13,15,14,15,18,
-	 9,12,12,16,16,11,13,14,17,16,11,13,13,17,16,15,
-	15,16,17,19,13,15,16, 0,18, 9,12,12,16,15,11,14,
-	13,17,17,11,13,14,16,16,15,16,16,19,18,13,15,15,
-	17,19,11,14,14,19,16,12,14,15, 0,18,12,16,15,18,
-	17,15,15,18,16,19,14,15,17,19,19,11,14,14,18,19,
-	13,15,14,19,19,12,16,15,18,17,15,17,15, 0,16,14,
-	17,16,19, 0, 7,11,11,14,14,10,12,12,15,15,10,13,
-	13,16,15,13,15,15,17, 0,14,15,15,16,19, 9,12,12,
-	16,16,11,14,14,16,16,11,13,13,16,16,14,17,16,19,
-	 0,14,18,17,17,19, 9,12,12,15,16,11,13,13,15,17,
-	12,14,13,19,16,13,15,15,17,19,15,17,16,17,19,11,
-	14,14,19,16,12,15,15,19,17,13,14,15,17,19,14,16,
-	17,19,19,16,15,16,17,19,11,15,14,16,16,12,15,15,
-	19, 0,12,14,15,19,19,14,16,16, 0,18,15,19,14,18,
-	16,
+static 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,
+	12,13, 6, 8, 8,10,10, 8,10, 9,11,11, 8,10,10,11,
+	11,10,11,11,13,12,10,11,11,13,12, 9,11,11,15,13,
+	10,12,11,15,13,10,11,11,15,14,12,14,13,16,15,12,
+	13,13,17,16, 9,11,11,13,15,10,11,12,14,15,10,11,
+	12,14,15,12,13,13,15,16,12,13,13,16,16, 5, 8, 8,
+	11,11, 8,10,10,12,12, 8,10,10,12,12,11,12,12,14,
+	14,11,12,12,14,14, 8,11,10,13,12,10,11,12,12,13,
+	10,12,12,13,13,12,12,13,13,15,11,12,13,15,14, 7,
+	10,10,12,12, 9,12,11,13,12,10,12,12,13,14,12,13,
+	12,15,13,11,13,12,14,15,10,12,12,16,14,11,12,12,
+	16,15,11,13,12,17,16,13,13,15,15,17,13,15,15,20,
+	17,10,12,12,14,16,11,12,12,15,15,11,13,13,15,18,
+	13,14,13,15,15,13,15,14,16,16, 5, 8, 8,11,11, 8,
+	10,10,12,12, 8,10,10,12,12,11,12,12,14,14,11,12,
+	12,14,15, 7,10,10,13,12,10,12,12,14,13, 9,10,12,
+	12,13,11,13,13,15,15,11,12,13,13,15, 8,10,10,12,
+	13,10,12,12,13,13,10,12,11,13,13,11,13,12,15,15,
+	12,13,12,15,13,10,12,12,16,14,11,12,12,16,15,10,
+	12,12,16,14,14,15,14,18,16,13,13,14,15,16,10,12,
+	12,14,16,11,13,13,16,16,11,13,12,14,16,13,15,15,
+	18,18,13,15,13,16,14, 8,11,11,16,16,10,13,13,17,
+	16,10,12,12,16,15,14,16,15,20,17,13,14,14,17,17,
+	 9,12,12,16,16,11,13,14,16,17,11,13,13,16,16,15,
+	15,19,18, 0,14,15,15,18,18, 9,12,12,17,16,11,13,
+	12,17,16,11,12,13,15,17,15,16,15, 0,19,14,15,14,
+	19,18,12,14,14, 0,16,13,14,14,19,18,13,15,16,17,
+	16,15,15,17,18, 0,14,16,16,19, 0,12,14,14,16,18,
+	13,15,13,17,18,13,15,14,17,18,15,18,14,18,18,16,
+	17,16, 0,17, 8,11,11,15,15,10,12,12,16,16,10,13,
+	13,16,16,13,15,14,17,17,14,15,17,17,18, 9,12,12,
+	16,15,11,13,13,16,16,11,12,13,17,17,14,14,15,17,
+	17,14,15,16, 0,18, 9,12,12,16,17,11,13,13,16,17,
+	11,14,13,18,17,14,16,14,17,17,15,17,17,18,18,12,
+	14,14, 0,16,13,15,15,19, 0,12,13,15, 0, 0,14,17,
+	16,19, 0,16,15,18,18, 0,12,14,14,17, 0,13,14,14,
+	17, 0,13,15,14, 0,18,15,16,16, 0,18,15,18,15, 0,
+	17,
 };
 
-static float _vq_quantthresh__8u0__p3_0[] = {
+static float _vq_quantthresh__44un1__p3_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8u0__p3_0[] = {
+static long _vq_quantmap__44un1__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 encode_aux_threshmatch _vq_auxt__44un1__p3_0 = {
+	_vq_quantthresh__44un1__p3_0,
+	_vq_quantmap__44un1__p3_0,
 	5,
 	5
 };
 
-static static_codebook _8u0__p3_0 = {
+static static_codebook _44un1__p3_0 = {
 	4, 625,
-	_vq_lengthlist__8u0__p3_0,
+	_vq_lengthlist__44un1__p3_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8u0__p3_0,
+	_vq_quantlist__44un1__p3_0,
 	NULL,
-	&_vq_auxt__8u0__p3_0,
+	&_vq_auxt__44un1__p3_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u0__p4_0[] = {
+static long _vq_quantlist__44un1__p4_0[] = {
 	2,
 	1,
 	3,
@@ -9731,76 +11090,76 @@
 	4,
 };
 
-static 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,
-	11,12, 6, 7, 7,10,10, 7, 8, 8,10,10, 7, 8, 7,10,
-	10, 9,10,10,12,11,10,10,10,11,10, 9,10,10,12,11,
-	10,10,10,13,11, 9,10,10,12,12,11,11,12,12,13,11,
-	11,11,12,13, 9,10,10,12,12,10,10,11,12,12,10,10,
-	11,12,12,11,11,11,13,13,11,12,12,13,13, 5, 7, 7,
-	10,10, 7, 8, 8,10,10, 7, 8, 8,10,10,10,11,11,12,
-	12,10,11,10,12,12, 7, 8, 8,11,11, 7, 8, 9,10,11,
-	 8, 9, 9,11,11,11,10,11,10,12,10,11,11,12,13, 7,
-	 8, 8,10,11, 8, 9, 8,12,10, 8, 9, 9,11,12,10,11,
-	10,13,11,10,11,11,13,12, 9,11,10,13,12,10,10,11,
-	12,12,10,11,11,13,13,12,10,13,11,14,11,12,12,15,
-	13, 9,11,11,13,13,10,11,11,13,12,10,11,11,12,14,
-	12,13,11,14,12,12,12,12,14,14, 5, 7, 7,10,10, 7,
-	 8, 8,10,10, 7, 8, 8,11,10,10,11,11,12,12,10,11,
-	10,12,12, 7, 8, 8,10,11, 8, 9, 9,12,11, 8, 8, 9,
-	10,11,10,11,11,12,13,11,10,11,11,13, 6, 8, 8,10,
-	11, 8, 9, 9,11,11, 7, 9, 7,11,10,10,11,11,12,12,
-	10,11,10,13,10, 9,11,10,13,12,10,12,11,13,13,10,
-	10,11,12,13,11,12,13,15,14,11,11,13,12,13, 9,10,
-	11,12,13,10,11,11,12,13,10,11,10,13,12,12,13,13,
-	13,14,12,12,11,14,11, 8,10,10,12,13,10,11,11,13,
-	13,10,11,10,13,13,12,13,14,15,14,12,12,12,14,13,
-	 9,10,10,13,12,10,10,12,13,13,10,11,11,15,12,12,
-	12,13,15,14,12,13,13,15,13, 9,10,11,12,13,10,12,
-	10,13,12,10,11,11,12,13,12,14,12,15,13,12,12,12,
-	15,14,11,12,11,14,13,11,11,12,14,14,12,13,13,14,
-	13,13,11,15,11,15,14,14,14,16,15,11,12,12,13,14,
-	11,13,11,14,14,12,12,13,14,15,12,14,12,15,12,13,
-	15,14,16,15, 8,10,10,12,12,10,10,10,12,13,10,11,
-	11,13,13,12,12,12,13,14,13,13,13,15,15, 9,10,10,
-	12,12,10,11,11,13,12,10,10,11,13,13,12,12,12,14,
-	14,12,12,13,15,14, 9,10,10,13,12,10,10,12,12,13,
-	10,11,10,13,13,12,13,13,14,14,12,13,12,14,13,11,
-	12,12,14,13,12,13,12,14,14,10,12,12,14,14,14,14,
-	14,16,14,13,12,14,12,15,10,12,12,14,15,12,13,13,
-	14,16,11,12,11,15,14,13,14,14,14,15,13,14,11,14,
+static 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,
+	11,13, 6, 7, 7,10,10, 7, 8, 7,11,10, 7, 8, 7,10,
+	10,10,11, 9,13,11,10,11,10,13,11,10,10,10,14,13,
+	10,11,11,14,13,10,10,11,13,14,12,12,13,15,15,12,
+	12,13,13,14,10,10,10,12,13,10,11,10,13,13,10,11,
+	11,13,13,12,13,12,14,13,12,13,13,14,13, 5, 7, 7,
+	10,10, 7, 8, 8,11,10, 7, 8, 8,10,10,11,11,11,13,
+	13,10,11,11,12,12, 7, 8, 8,11,11, 7, 8, 9,10,12,
+	 8, 9, 9,11,11,11,10,12,11,14,11,11,12,13,13, 6,
+	 8, 8,10,11, 7, 9, 7,12,10, 8, 9,10,11,12,10,12,
+	10,14,11,11,12,11,13,13,10,11,11,14,14,10,10,11,
+	13,14,11,12,12,15,13,12,11,14,12,16,12,13,14,15,
+	16,10,10,11,13,14,10,11,10,14,12,11,12,12,13,14,
+	12,13,11,15,12,14,14,14,15,15, 5, 7, 7,10,10, 7,
+	 8, 8,10,10, 7, 8, 8,10,11,10,11,10,12,12,10,11,
+	11,12,13, 6, 8, 8,11,11, 8, 9, 9,12,11, 7, 7, 9,
+	10,12,11,11,11,12,13,11,10,12,11,15, 7, 8, 8,11,
+	11, 8, 9, 9,11,11, 7, 9, 8,12,10,11,12,11,13,12,
+	11,12,10,15,11,10,11,10,14,12,11,12,11,14,13,10,
+	10,11,13,14,13,13,13,17,15,12,11,14,12,15,10,10,
+	11,13,14,11,12,12,14,14,10,11,10,14,13,13,14,13,
+	16,17,12,14,11,16,12, 9,10,10,14,13,10,11,10,14,
+	14,10,11,11,13,13,13,14,14,16,15,12,13,13,14,14,
+	 9,11,10,14,13,10,10,12,13,14,11,12,11,14,13,13,
+	14,14,14,15,13,14,14,15,15, 9,10,11,13,14,10,11,
+	10,15,13,11,11,12,12,15,13,14,12,15,14,13,13,14,
+	14,15,12,13,12,16,14,11,11,12,15,14,13,15,13,16,
+	14,13,12,15,12,17,15,16,15,16,16,12,12,13,13,15,
+	11,13,11,15,14,13,13,14,15,17,13,14,12, 0,13,14,
+	15,14,15, 0, 9,10,10,13,13,10,11,11,13,13,10,11,
+	11,13,13,12,13,12,14,14,13,14,14,15,17, 9,10,10,
+	13,13,11,12,11,15,12,10,10,11,13,16,13,14,13,15,
+	14,13,13,14,15,16,10,10,11,13,14,11,11,12,13,14,
+	10,12,11,14,14,13,13,13,14,15,13,15,13,16,15,12,
+	13,12,15,13,12,15,13,15,15,11,11,13,14,15,15,15,
+	15,15,17,13,12,14,13,17,12,12,14,14,15,13,13,14,
+	14,16,11,13,11,16,15,14,16,16,17, 0,14,13,11,16,
 	12,
 };
 
-static float _vq_quantthresh__8u0__p4_0[] = {
+static float _vq_quantthresh__44un1__p4_0[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8u0__p4_0[] = {
+static long _vq_quantmap__44un1__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 encode_aux_threshmatch _vq_auxt__44un1__p4_0 = {
+	_vq_quantthresh__44un1__p4_0,
+	_vq_quantmap__44un1__p4_0,
 	5,
 	5
 };
 
-static static_codebook _8u0__p4_0 = {
+static static_codebook _44un1__p4_0 = {
 	4, 625,
-	_vq_lengthlist__8u0__p4_0,
+	_vq_lengthlist__44un1__p4_0,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8u0__p4_0,
+	_vq_quantlist__44un1__p4_0,
 	NULL,
-	&_vq_auxt__8u0__p4_0,
+	&_vq_auxt__44un1__p4_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u0__p5_0[] = {
+static long _vq_quantlist__44un1__p5_0[] = {
 	4,
 	3,
 	5,
@@ -9812,43 +11171,43 @@
 	8,
 };
 
-static 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,
-	 9, 9,10,10,12,11, 7, 8, 8, 9, 9,10,10,11,11, 9,
-	10,10,11,11,11,12,12,12, 9,10,10,11,11,12,12,12,
+static 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,
+	 9, 9,10,10,11,11, 8, 8, 8, 9, 9,10,10,11,11, 9,
+	10,10,11,10,11,11,12,12, 9,10,10,10,11,11,11,12,
 	12,
 };
 
-static float _vq_quantthresh__8u0__p5_0[] = {
+static 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__8u0__p5_0[] = {
+static long _vq_quantmap__44un1__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 encode_aux_threshmatch _vq_auxt__44un1__p5_0 = {
+	_vq_quantthresh__44un1__p5_0,
+	_vq_quantmap__44un1__p5_0,
 	9,
 	9
 };
 
-static static_codebook _8u0__p5_0 = {
+static static_codebook _44un1__p5_0 = {
 	2, 81,
-	_vq_lengthlist__8u0__p5_0,
+	_vq_lengthlist__44un1__p5_0,
 	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__8u0__p5_0,
+	_vq_quantlist__44un1__p5_0,
 	NULL,
-	&_vq_auxt__8u0__p5_0,
+	&_vq_auxt__44un1__p5_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u0__p6_0[] = {
+static long _vq_quantlist__44un1__p6_0[] = {
 	6,
 	5,
 	7,
@@ -9864,49 +11223,49 @@
 	12,
 };
 
-static 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,
-	14,14,17,16, 7, 9, 9,11,11,13,12,13,13,14,14,17,
-	 0, 9,11,11,12,13,14,14,14,13,15,14,17,17, 9,11,
-	11,12,12,14,14,13,14,14,15, 0, 0,11,12,12,15,14,
-	15,14,15,14,15,16,17, 0,11,12,13,13,13,14,14,15,
-	14,15,15, 0, 0,12,14,14,15,15,14,16,15,15,17,16,
-	 0,18,13,14,14,15,14,15,14,15,16,17,16, 0, 0,17,
-	17,18, 0,16,18,16, 0, 0, 0,17, 0, 0,16, 0, 0,16,
-	16, 0,15, 0,17, 0, 0, 0, 0,
+static 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,
+	13,13,16,17, 7, 8, 8, 9, 9,10,10,12,12,12,13,15,
+	15, 9,10,10,10,10,11,11,12,12,13,13,15,16, 9, 9,
+	 9,10,10,11,11,13,12,13,13,17,17,10,11,11,11,12,
+	12,12,13,13,14,15, 0,18,10,11,11,12,12,12,13,14,
+	13,14,14,17,16,11,12,12,13,13,14,14,14,14,15,16,
+	17,16,11,12,12,13,13,14,14,14,14,15,15,17,17,14,
+	15,15,16,16,16,17,17,16, 0,17, 0,18,14,15,15,16,
+	16, 0,15,18,18, 0,16, 0, 0,
 };
 
-static float _vq_quantthresh__8u0__p6_0[] = {
+static 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__8u0__p6_0[] = {
+static 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__8u0__p6_0 = {
-	_vq_quantthresh__8u0__p6_0,
-	_vq_quantmap__8u0__p6_0,
+static encode_aux_threshmatch _vq_auxt__44un1__p6_0 = {
+	_vq_quantthresh__44un1__p6_0,
+	_vq_quantmap__44un1__p6_0,
 	13,
 	13
 };
 
-static static_codebook _8u0__p6_0 = {
+static static_codebook _44un1__p6_0 = {
 	2, 169,
-	_vq_lengthlist__8u0__p6_0,
+	_vq_lengthlist__44un1__p6_0,
 	1, -526516224, 1616117760, 4, 0,
-	_vq_quantlist__8u0__p6_0,
+	_vq_quantlist__44un1__p6_0,
 	NULL,
-	&_vq_auxt__8u0__p6_0,
+	&_vq_auxt__44un1__p6_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u0__p6_1[] = {
+static long _vq_quantlist__44un1__p6_1[] = {
 	2,
 	1,
 	3,
@@ -9914,989 +11273,240 @@
 	4,
 };
 
-static 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 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__8u0__p6_1[] = {
+static float _vq_quantthresh__44un1__p6_1[] = {
 	-1.5, -0.5, 0.5, 1.5, 
 };
 
-static long _vq_quantmap__8u0__p6_1[] = {
+static long _vq_quantmap__44un1__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 encode_aux_threshmatch _vq_auxt__44un1__p6_1 = {
+	_vq_quantthresh__44un1__p6_1,
+	_vq_quantmap__44un1__p6_1,
 	5,
 	5
 };
 
-static static_codebook _8u0__p6_1 = {
+static static_codebook _44un1__p6_1 = {
 	2, 25,
-	_vq_lengthlist__8u0__p6_1,
+	_vq_lengthlist__44un1__p6_1,
 	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8u0__p6_1,
+	_vq_quantlist__44un1__p6_1,
 	NULL,
-	&_vq_auxt__8u0__p6_1,
+	&_vq_auxt__44un1__p6_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u0__p7_0[] = {
+static long _vq_quantlist__44un1__p7_0[] = {
+	2,
 	1,
+	3,
 	0,
-	2,
-};
-
-static 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,
-	 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,
-	 7,
-};
-
-static float _vq_quantthresh__8u0__p7_0[] = {
-	-157.5, 157.5, 
-};
-
-static 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,
-	3,
-	3
-};
-
-static static_codebook _8u0__p7_0 = {
-	4, 81,
-	_vq_lengthlist__8u0__p7_0,
-	1, -518803456, 1628680192, 2, 0,
-	_vq_quantlist__8u0__p7_0,
-	NULL,
-	&_vq_auxt__8u0__p7_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__8u0__p7_1[] = {
-	7,
-	6,
-	8,
-	5,
-	9,
 	4,
-	10,
-	3,
-	11,
-	2,
-	12,
-	1,
-	13,
-	0,
-	14,
 };
 
-static 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,
-	11, 8,11,11,11,11,11,11,11,11,11,11, 5, 6, 6, 9,
-	10,11,10,11,11,11,11,11,11,11,11, 7,10,10,11,11,
-	11,11,11,11,11,11,11,11,11,11, 7,11, 8,11,11,11,
+static 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,
+	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,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,11,11,11,11,11,11,11,11,11,11, 8,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,11,11,11,10,10,10,10,10,
+	11,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,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,
+	11,11,11,11,11,11,11,11,11,11, 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,10,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,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,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,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,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,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,
+	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,11,11,11,11,11,11,
 	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,10,10,10,10,10,10,10,10,10,10,10,10,10,
 	10,
 };
 
-static 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 float _vq_quantthresh__44un1__p7_0[] = {
+	-253.5, -84.5, 84.5, 253.5, 
 };
 
-static 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,
-	15,
-	15
-};
-
-static static_codebook _8u0__p7_1 = {
-	2, 225,
-	_vq_lengthlist__8u0__p7_1,
-	1, -520986624, 1620377600, 4, 0,
-	_vq_quantlist__8u0__p7_1,
-	NULL,
-	&_vq_auxt__8u0__p7_1,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__8u0__p7_2[] = {
-	10,
-	9,
-	11,
-	8,
-	12,
-	7,
-	13,
-	6,
-	14,
-	5,
-	15,
-	4,
-	16,
-	3,
-	17,
-	2,
-	18,
-	1,
-	19,
-	0,
-	20,
-};
-
-static 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,
-	10,11,10,11,12,11,10,11,11,11,11,11,11,12,10, 8,
-	 9, 9,10, 9,10,10, 9,10,10,10,10,10, 9,10,10,10,
-	10, 9,10,10, 9, 9, 9, 9,10,10, 9, 9,10,10,11,10,
-	 9,12,10,11,10, 9,10,10,10, 8, 9, 9,10, 9,10, 9,
-	 9,10,10, 9,10, 9,11,10,10,10,10,10, 9,10, 8, 8,
-	 9, 9,10, 9,11, 9, 8, 9, 9,10,11,10,10,10,11,12,
-	 9, 9,11, 8, 9, 8,11,10,11,10,10, 9,11,10,10,10,
-	10,10,10,10,11,11,11,11, 8, 9, 9, 9,10,10,10,11,
-	11,12,11,12,11,10,10,10,12,11,11,11,10, 8,10, 9,
-	11,10,10,11,12,10,11,12,11,11,12,11,12,12,10,11,
-	11,10, 9, 9,10,11,12,10,10,10,11,10,11,11,10,12,
-	12,10,11,10,11,12,10, 9,10,10,11,10,11,11,11,11,
-	11,12,11,11,11, 9,11,10,11,10,11,10, 9, 9,10,11,
-	11,11,10,10,11,12,12,11,12,11,11,11,12,12,12,12,
-	11, 9,11,11,12,10,11,11,11,11,11,11,12,11,11,12,
-	11,11,11,10,11,11, 9,11,10,11,11,11,10,10,10,11,
-	11,11,12,10,11,10,11,11,11,11,12, 9,11,10,11,11,
-	10,10,11,11, 9,11,11,12,10,10,10,10,10,11,11,10,
-	 9,10,11,11,12,11,10,10,12,11,11,12,11,12,11,11,
-	10,10,11,11,10,12,11,10,11,10,11,10,10,10,11,11,
-	10,10,11,11,11,11,10,10,10,12,11,11,11,11,10, 9,
-	10,11,11,11,12,11,11,11,12,10,11,11,11, 9,10,11,
-	11,11,11,11,11,10,10,11,11,12,11,10,11,12,11,10,
-	10,11, 9,10,11,11,11,11,11,10,11,11,10,12,11,11,
-	11,12,11,11,11,10,10,11,11,
-};
-
-static 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[] = {
-	   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,
-	21,
-	21
-};
-
-static static_codebook _8u0__p7_2 = {
-	2, 441,
-	_vq_lengthlist__8u0__p7_2,
-	1, -529268736, 1611661312, 5, 0,
-	_vq_quantlist__8u0__p7_2,
-	NULL,
-	&_vq_auxt__8u0__p7_2,
-	NULL,
-	0
-};
-
-static 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 = {
-	2, 64,
-	_huff_lengthlist__8u0__single,
-	0, 0, 0, 0, 0,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__8u1__p1_0[] = {
-	1,
-	0,
-	2,
-};
-
-static 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,
-	 9,12,11,10,12,12, 5, 8, 8, 8,10,10, 8,10,10, 7,
-	10,10,10,12,12, 9,11,12, 7,10,10,10,12,12, 9,12,
-	10,
-};
-
-static float _vq_quantthresh__8u1__p1_0[] = {
-	-0.5, 0.5, 
-};
-
-static 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,
-	3,
-	3
-};
-
-static static_codebook _8u1__p1_0 = {
-	4, 81,
-	_vq_lengthlist__8u1__p1_0,
-	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__8u1__p1_0,
-	NULL,
-	&_vq_auxt__8u1__p1_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__8u1__p2_0[] = {
-	1,
-	0,
-	2,
-};
-
-static 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,
-	 7, 9, 7, 8, 9, 9, 5, 6, 6, 6, 7, 7, 7, 8, 8, 6,
-	 8, 7, 8, 9, 9, 7, 7, 9, 6, 7, 8, 8, 9, 9, 7, 9,
-	 7,
-};
-
-static float _vq_quantthresh__8u1__p2_0[] = {
-	-0.5, 0.5, 
-};
-
-static 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,
-	3,
-	3
-};
-
-static static_codebook _8u1__p2_0 = {
-	4, 81,
-	_vq_lengthlist__8u1__p2_0,
-	1, -535822336, 1611661312, 2, 0,
-	_vq_quantlist__8u1__p2_0,
-	NULL,
-	&_vq_auxt__8u1__p2_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__8u1__p3_0[] = {
-	2,
-	1,
-	3,
-	0,
-	4,
-};
-
-static 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,
-	12,13, 6, 8, 8,10,10, 8,10, 9,11,11, 8,10, 9,11,
-	11,10,11,11,12,12,10,11,11,12,12, 9,11,11,14,13,
-	10,12,11,14,14,10,12,11,14,13,12,13,13,15,14,12,
-	13,13,15,14, 8,11,11,13,14,10,11,12,13,15,10,11,
-	12,14,14,12,13,13,14,15,12,13,13,14,15, 5, 8, 8,
-	11,11, 8,10,10,12,12, 8,10,10,12,12,11,12,12,14,
-	13,11,12,12,13,14, 8,10,10,12,12, 9,11,12,13,14,
-	10,12,12,13,13,12,12,13,14,14,11,13,13,15,15, 7,
-	10,10,12,12, 9,12,11,14,12,10,11,12,13,14,12,13,
-	12,14,14,12,13,13,15,16,10,12,12,15,14,11,12,13,
-	15,15,11,13,13,15,16,14,14,15,15,16,13,14,15,17,
-	15, 9,12,12,14,15,11,13,12,15,15,11,13,13,15,15,
-	13,14,13,15,14,13,14,14,17, 0, 5, 8, 8,11,11, 8,
-	10,10,12,12, 8,10,10,12,12,11,12,12,14,14,11,12,
-	12,14,14, 7,10,10,12,12,10,12,12,13,13, 9,11,12,
-	12,13,11,12,13,15,15,11,12,13,14,15, 8,10,10,12,
-	12,10,12,11,13,13,10,12,11,13,13,11,13,13,15,14,
-	12,13,12,15,13, 9,12,12,14,14,11,13,13,16,15,11,
-	12,13,16,15,13,14,15,16,16,13,13,15,15,16,10,12,
-	12,15,14,11,13,13,14,16,11,13,13,15,16,13,15,15,
-	16,17,13,15,14,16,15, 8,11,11,14,15,10,12,12,15,
-	15,10,12,12,15,16,14,15,15,16,17,13,14,14,16,16,
-	 9,12,12,15,15,11,13,14,15,17,11,13,13,15,16,14,
-	15,16,19,17,13,15,15, 0,17, 9,12,12,15,15,11,14,
-	13,16,15,11,13,13,15,16,15,15,15,18,17,13,15,15,
-	17,17,11,15,14,18,16,12,14,15,17,17,12,15,15,18,
-	18,15,15,16,15,19,14,16,16, 0, 0,11,14,14,16,17,
-	12,15,14,18,17,12,15,15,18,18,15,17,15,18,16,14,
-	16,16,18,18, 7,11,11,14,14,10,12,12,15,15,10,12,
-	13,15,15,13,14,15,16,16,14,15,15,18,18, 9,12,12,
-	15,15,11,13,13,16,15,11,12,13,16,16,14,15,15,17,
-	16,15,16,16,17,17, 9,12,12,15,15,11,13,13,15,17,
-	11,14,13,16,15,13,15,15,17,17,15,15,15,18,17,11,
-	14,14,17,15,12,14,15,17,18,13,13,15,17,17,14,16,
-	16,19,18,16,15,17,17, 0,11,14,14,17,17,12,15,15,
-	18, 0,12,15,14,18,16,14,17,17,19, 0,16,18,15, 0,
-	16,
-};
-
-static float _vq_quantthresh__8u1__p3_0[] = {
-	-1.5, -0.5, 0.5, 1.5, 
-};
-
-static long _vq_quantmap__8u1__p3_0[] = {
+static long _vq_quantmap__44un1__p7_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 encode_aux_threshmatch _vq_auxt__44un1__p7_0 = {
+	_vq_quantthresh__44un1__p7_0,
+	_vq_quantmap__44un1__p7_0,
 	5,
 	5
 };
 
-static static_codebook _8u1__p3_0 = {
+static static_codebook _44un1__p7_0 = {
 	4, 625,
-	_vq_lengthlist__8u1__p3_0,
-	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8u1__p3_0,
+	_vq_lengthlist__44un1__p7_0,
+	1, -518709248, 1626677248, 3, 0,
+	_vq_quantlist__44un1__p7_0,
 	NULL,
-	&_vq_auxt__8u1__p3_0,
+	&_vq_auxt__44un1__p7_0,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u1__p4_0[] = {
-	2,
-	1,
-	3,
-	0,
-	4,
-};
-
-static 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,
-	10,12, 6, 7, 7, 9, 9, 7, 8, 7,10, 9, 7, 8, 7,10,
-	 9, 9,10, 9,12,11,10,10, 9,12,10, 9,10,10,12,11,
-	 9,10,10,12,11, 9,10,10,12,12,11,11,12,12,13,11,
-	11,12,12,13, 9, 9,10,12,11, 9,10,10,12,12,10,10,
-	10,12,12,11,12,11,13,12,11,12,11,13,12, 6, 7, 7,
-	 9, 9, 7, 8, 8,10,10, 7, 8, 7,10, 9,10,10,10,12,
-	12,10,10,10,12,11, 7, 8, 7,10,10, 7, 7, 9,10,11,
-	 8, 9, 9,11,10,10,10,11,10,12,10,10,11,12,12, 7,
-	 8, 8,10,10, 7, 9, 8,11,10, 8, 8, 9,11,11,10,11,
-	10,12,11,10,11,11,12,12, 9,10,10,12,12, 9,10,10,
-	12,12,10,11,11,13,12,11,10,12,10,14,12,12,12,13,
-	14, 9,10,10,12,12, 9,11,10,12,12,10,11,11,12,12,
-	11,12,11,14,12,12,12,12,14,14, 5, 7, 7, 9, 9, 7,
-	 7, 7, 9,10, 7, 8, 8,10,10,10,10,10,11,11,10,10,
-	10,12,12, 7, 8, 8,10,10, 8, 9, 8,11,10, 7, 8, 9,
-	10,11,10,10,10,11,12,10,10,11,11,13, 6, 7, 8,10,
-	10, 8, 9, 9,10,10, 7, 9, 7,11,10,10,11,10,12,12,
-	10,11,10,12,10, 9,10,10,12,12,10,11,11,13,12, 9,
-	10,10,12,12,12,12,12,14,13,11,11,12,11,14, 9,10,
-	10,11,12,10,11,11,12,13, 9,10,10,12,12,12,12,12,
-	14,13,11,12,10,14,11, 9, 9,10,11,12, 9,10,10,12,
-	12, 9,10,10,12,12,12,12,12,14,14,11,12,12,13,12,
-	 9,10, 9,12,12, 9,10,11,12,13,10,11,10,13,11,12,
-	12,13,13,14,12,12,12,13,13, 9,10,10,12,12,10,11,
-	10,13,12,10,10,11,12,13,12,13,12,14,13,12,12,12,
-	13,14,11,12,11,14,13,10,10,11,13,13,12,12,12,14,
-	13,12,10,14,10,15,13,14,14,14,14,11,11,12,13,14,
-	10,12,11,13,13,12,12,12,13,15,12,13,11,15,12,13,
-	13,14,14,14, 9,10, 9,12,12, 9,10,10,12,12,10,10,
-	10,12,12,11,11,12,12,13,12,12,12,14,14, 9,10,10,
-	12,12,10,11,10,13,12,10,10,11,12,13,12,12,12,14,
-	13,12,12,13,13,14, 9,10,10,12,13,10,10,11,11,12,
-	 9,11,10,13,12,12,12,12,13,14,12,13,12,14,13,11,
-	12,11,13,13,12,13,12,14,13,10,11,12,13,13,13,13,
-	13,14,15,12,11,14,12,14,11,11,12,12,13,12,12,12,
-	13,14,10,12,10,14,13,13,13,13,14,15,12,14,11,15,
-	10,
-};
-
-static float _vq_quantthresh__8u1__p4_0[] = {
-	-1.5, -0.5, 0.5, 1.5, 
-};
-
-static 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 long _vq_quantlist__44un1__p7_1[] = {
+	6,
 	5,
-	5
-};
-
-static static_codebook _8u1__p4_0 = {
-	4, 625,
-	_vq_lengthlist__8u1__p4_0,
-	1, -533725184, 1611661312, 3, 0,
-	_vq_quantlist__8u1__p4_0,
-	NULL,
-	&_vq_auxt__8u1__p4_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__8u1__p5_0[] = {
+	7,
 	4,
+	8,
 	3,
-	5,
-	2,
-	6,
-	1,
-	7,
-	0,
-	8,
-};
-
-static 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,
-	 9, 9,10,10,12,11, 8, 8, 8, 9, 9,10,10,11,11, 9,
-	10,10,11,11,11,11,13,12, 9,10,10,11,11,12,12,12,
-	13,
-};
-
-static 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[] = {
-	    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,
 	9,
-	9
-};
-
-static static_codebook _8u1__p5_0 = {
-	2, 81,
-	_vq_lengthlist__8u1__p5_0,
-	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__8u1__p5_0,
-	NULL,
-	&_vq_auxt__8u1__p5_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__8u1__p6_0[] = {
-	4,
-	3,
-	5,
 	2,
-	6,
-	1,
-	7,
-	0,
-	8,
-};
-
-static 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,
-	 8, 8, 8, 9,10,10, 7, 7, 7, 8, 8, 9, 8,10,10, 9,
-	 9, 9, 9, 9,10,10,10,10, 9, 9, 9, 9, 9,10,10,10,
 	10,
-};
-
-static 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[] = {
-	    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,
-	9,
-	9
-};
-
-static static_codebook _8u1__p6_0 = {
-	2, 81,
-	_vq_lengthlist__8u1__p6_0,
-	1, -531628032, 1611661312, 4, 0,
-	_vq_quantlist__8u1__p6_0,
-	NULL,
-	&_vq_auxt__8u1__p6_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__8u1__p7_0[] = {
 	1,
+	11,
 	0,
-	2,
+	12,
 };
 
-static 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,
-	10,13,12,10,13,13, 4,10,10, 9,12,12, 9,12,12, 7,
-	12,12,10,13,13,10,12,13, 7,11,12,10,13,13,10,13,
-	11,
+static 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,
+	11,11,11,11, 7, 8, 8, 8, 9, 9, 9,10,10,10,11,11,
+	12, 7, 8, 8, 9, 9,10,11,11,12,11,12,11,11, 7, 8,
+	 8, 9, 9,10,10,11,11,11,12,12,11, 8,10,10,10,10,
+	11,11,14,11,12,12,12,13, 9,10,10,10,10,12,11,14,
+	11,14,11,12,13,10,11,11,11,11,13,11,14,14,13,13,
+	13,14,11,11,11,12,11,12,12,12,13,14,14,13,14,12,
+	11,12,12,12,12,13,13,13,14,13,14,14,11,12,12,14,
+	12,13,13,12,13,13,14,14,14,
 };
 
-static float _vq_quantthresh__8u1__p7_0[] = {
-	-5.5, 5.5, 
+static 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__8u1__p7_0[] = {
-	    1,    0,    2,
+static 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__8u1__p7_0 = {
-	_vq_quantthresh__8u1__p7_0,
-	_vq_quantmap__8u1__p7_0,
-	3,
-	3
+static encode_aux_threshmatch _vq_auxt__44un1__p7_1 = {
+	_vq_quantthresh__44un1__p7_1,
+	_vq_quantmap__44un1__p7_1,
+	13,
+	13
 };
 
-static static_codebook _8u1__p7_0 = {
-	4, 81,
-	_vq_lengthlist__8u1__p7_0,
-	1, -529137664, 1618345984, 2, 0,
-	_vq_quantlist__8u1__p7_0,
+static static_codebook _44un1__p7_1 = {
+	2, 169,
+	_vq_lengthlist__44un1__p7_1,
+	1, -523010048, 1618608128, 4, 0,
+	_vq_quantlist__44un1__p7_1,
 	NULL,
-	&_vq_auxt__8u1__p7_0,
+	&_vq_auxt__44un1__p7_1,
 	NULL,
 	0
 };
 
-static long _vq_quantlist__8u1__p7_1[] = {
+static long _vq_quantlist__44un1__p7_2[] = {
+	6,
 	5,
+	7,
 	4,
-	6,
+	8,
 	3,
-	7,
-	2,
-	8,
-	1,
 	9,
-	0,
-	10,
-};
-
-static 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,
-	 8, 8, 8, 9, 9, 9, 9, 8, 8, 8, 8, 8, 9, 9, 9, 9,
-	 9, 9, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 8, 9, 9,
-	 9, 9, 9, 9,10,10,10,10, 8, 9, 9, 9, 9, 9, 9,10,
-	10,10,10, 8, 9, 9, 9, 9, 9, 9,10,10,10,10, 8, 9,
-	 9, 9, 9, 9, 9,10,10,10,10,
-};
-
-static 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[] = {
-	    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,
-	11,
-	11
-};
-
-static static_codebook _8u1__p7_1 = {
-	2, 121,
-	_vq_lengthlist__8u1__p7_1,
-	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__8u1__p7_1,
-	NULL,
-	&_vq_auxt__8u1__p7_1,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__8u1__p8_0[] = {
-	5,
-	4,
-	6,
-	3,
-	7,
 	2,
-	8,
-	1,
-	9,
-	0,
 	10,
-};
-
-static 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,
-	 9,11,11,12,12,13,13, 8, 9, 9,11,11,12,12,13,13,
-	14,14, 8, 9, 9,11,11,12,12,13,13,14,14, 9,11,11,
-	12,12,13,13,14,14,15,15, 9,11,11,12,12,13,13,14,
-	14,15,14,11,12,12,13,13,14,14,15,15,16,16,11,12,
-	12,13,13,14,14,15,15,15,15,
-};
-
-static 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[] = {
-	    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,
-	11,
-	11
-};
-
-static static_codebook _8u1__p8_0 = {
-	2, 121,
-	_vq_lengthlist__8u1__p8_0,
-	1, -524582912, 1618345984, 4, 0,
-	_vq_quantlist__8u1__p8_0,
-	NULL,
-	&_vq_auxt__8u1__p8_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__8u1__p8_1[] = {
-	5,
-	4,
-	6,
-	3,
-	7,
-	2,
-	8,
 	1,
-	9,
-	0,
-	10,
-};
-
-static 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,
-	 7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8,
-	 8, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-	 8, 8, 8, 8, 9, 8, 9, 9, 7, 8, 8, 8, 8, 8, 8, 9,
-	 8, 9, 9, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 8, 8,
-	 8, 8, 8, 8, 8, 9, 9, 9, 9,
-};
-
-static 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[] = {
-	    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,
 	11,
-	11
-};
-
-static static_codebook _8u1__p8_1 = {
-	2, 121,
-	_vq_lengthlist__8u1__p8_1,
-	1, -531365888, 1611661312, 4, 0,
-	_vq_quantlist__8u1__p8_1,
-	NULL,
-	&_vq_auxt__8u1__p8_1,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__8u1__p9_0[] = {
-	7,
-	6,
-	8,
-	5,
-	9,
-	4,
-	10,
-	3,
-	11,
-	2,
-	12,
-	1,
-	13,
 	0,
-	14,
-};
-
-static 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,
-	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,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,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,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,10,10,10,10,10,10,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,
-};
-
-static 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[] = {
-	   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,
-	15,
-	15
-};
-
-static static_codebook _8u1__p9_0 = {
-	2, 225,
-	_vq_lengthlist__8u1__p9_0,
-	1, -514071552, 1627381760, 4, 0,
-	_vq_quantlist__8u1__p9_0,
-	NULL,
-	&_vq_auxt__8u1__p9_0,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__8u1__p9_1[] = {
-	7,
-	6,
-	8,
-	5,
-	9,
-	4,
-	10,
-	3,
-	11,
-	2,
 	12,
-	1,
-	13,
-	0,
-	14,
 };
 
-static 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,
-	12,12,11,12,10,10,11,10,12,11,11,11, 7, 9, 9,11,
-	11,13,12, 9, 9,11,10,11,11,12,11, 9,10,10,12,12,
-	14,14,10,10,11,12,12,11,11,11, 9,10,11,11,13,14,
-	13,10,11,11,11,12,11,12,12, 7, 8, 8,10, 9,11,10,
-	11,12,12,11,12,14,12,13, 7, 8, 8, 9,10,10,11,12,
-	12,12,11,12,12,12,13, 9, 9, 9,11,11,13,12,12,12,
-	12,11,12,12,13,12, 8,10,10,11,10,11,12,12,12,12,
-	12,12,14,12,12, 9,11,11,11,12,12,12,12,13,13,12,
-	12,13,13,12,10,11,11,12,11,12,12,12,11,12,13,12,
-	12,12,13,11,11,12,12,12,13,12,12,11,12,13,13,12,
-	12,13,12,11,12,12,13,13,12,13,12,13,13,13,13,14,
-	13,
+static 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,
+	 9, 9, 9, 9, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9,
+	 9, 7, 8, 8, 8, 8, 9, 8, 9, 9,10, 9, 9,10, 7, 8,
+	 8, 8, 8, 9, 9, 9, 9, 9, 9,10,10, 8, 9, 9, 9, 9,
+	 9, 9, 9, 9,10,10, 9,10, 8, 9, 9, 9, 9, 9, 9, 9,
+	 9, 9, 9,10,10, 9, 9, 9,10, 9, 9,10, 9, 9,10,10,
+	10,10, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10, 9,
+	 9, 9,10, 9, 9,10,10, 9,10,10,10,10, 9, 9, 9,10,
+	 9, 9, 9,10,10,10,10,10,10,
 };
 
-static 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 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__8u1__p9_1[] = {
-	   13,   11,    9,    7,    5,    3,    1,    0,
-	    2,    4,    6,    8,   10,   12,   14,
+static 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__8u1__p9_1 = {
-	_vq_quantthresh__8u1__p9_1,
-	_vq_quantmap__8u1__p9_1,
-	15,
-	15
-};
-
-static static_codebook _8u1__p9_1 = {
-	2, 225,
-	_vq_lengthlist__8u1__p9_1,
-	1, -522338304, 1620115456, 4, 0,
-	_vq_quantlist__8u1__p9_1,
-	NULL,
-	&_vq_auxt__8u1__p9_1,
-	NULL,
-	0
-};
-
-static long _vq_quantlist__8u1__p9_2[] = {
-	8,
-	7,
-	9,
-	6,
-	10,
-	5,
-	11,
-	4,
-	12,
-	3,
+static encode_aux_threshmatch _vq_auxt__44un1__p7_2 = {
+	_vq_quantthresh__44un1__p7_2,
+	_vq_quantmap__44un1__p7_2,
 	13,
-	2,
-	14,
-	1,
-	15,
-	0,
-	16,
+	13
 };
 
-static 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,
-	 9, 9, 9, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
-	 9,10,10, 9, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9,
-	 9, 9, 9,10,10, 8, 8, 8, 9, 9, 9, 9,10,10,10, 9,
-	10,10,10,10,10,10, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9,
-	10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9,10,
-	10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9,10,10,10,
-	10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9,10,
-	10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9,10,
-	10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9,10,
-	10,10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9,
-	 9,10,10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9,
-	10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9,10,
-	 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,10, 9,
-	10, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	 9, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-	10,
-};
-
-static 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[] = {
-	   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,
-	17,
-	17
-};
-
-static static_codebook _8u1__p9_2 = {
-	2, 289,
-	_vq_lengthlist__8u1__p9_2,
-	1, -529530880, 1611661312, 5, 0,
-	_vq_quantlist__8u1__p9_2,
+static static_codebook _44un1__p7_2 = {
+	2, 169,
+	_vq_lengthlist__44un1__p7_2,
+	1, -531103744, 1611661312, 4, 0,
+	_vq_quantlist__44un1__p7_2,
 	NULL,
-	&_vq_auxt__8u1__p9_2,
+	&_vq_auxt__44un1__p7_2,
 	NULL,
 	0
 };
 
-static 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,
-	11,15, 7, 5, 8, 6, 7, 5, 7, 6, 9,13,13, 9, 9, 8,
-	 6, 6, 5, 5, 9,14, 8, 6, 8, 6, 6, 4, 5, 3, 5,13,
-	 9, 9,11, 8,10, 7, 8, 4, 5,12,11,16,17,15,17,12,
-	13, 8, 8,15,
+static 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__8u1__single = {
-	2, 100,
-	_huff_lengthlist__8u1__single,
+static static_codebook _huff_book__44un1__short = {
+	2, 64,
+	_huff_lengthlist__44un1__short,
 	0, 0, 0, 0, 0,
 	NULL,
 	NULL,


Property changes on: branches/vorbis-aotuv/lib/books/uncoupled/res_books_uncoupled.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/codebook.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/codebook.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/codec_internal.h
===================================================================
--- branches/vorbis-aotuv/lib/codec_internal.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/codec_internal.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: libvorbis codec headers
- last mod: $Id: codec_internal.h,v 1.17 2003/08/18 05:34:01 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 


Property changes on: branches/vorbis-aotuv/lib/codec_internal.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/envelope.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/envelope.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/floor0.c
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/floor1.c
===================================================================
--- branches/vorbis-aotuv/lib/floor1.c	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/floor1.c	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: floor backend 1 implementation
- last mod: $Id: floor1.c,v 1.26 2003/02/15 07:10:07 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -757,7 +757,8 @@
 }
 
 
-int floor1_encode(vorbis_block *vb,vorbis_look_floor1 *look,
+int floor1_encode(oggpack_buffer *opb,vorbis_block *vb,
+		  vorbis_look_floor1 *look,
 		  int *post,int *ilogmask){
 
   long i,j;
@@ -840,13 +841,13 @@
     
     /* we have everything we need. pack it out */
     /* mark nontrivial floor */
-    oggpack_write(&vb->opb,1,1);
+    oggpack_write(opb,1,1);
       
     /* beginning/end post */
     look->frames++;
     look->postbits+=ilog(look->quant_q-1)*2;
-    oggpack_write(&vb->opb,out[0],ilog(look->quant_q-1));
-    oggpack_write(&vb->opb,out[1],ilog(look->quant_q-1));
+    oggpack_write(opb,out[0],ilog(look->quant_q-1));
+    oggpack_write(opb,out[1],ilog(look->quant_q-1));
       
       
     /* partition by partition */
@@ -884,7 +885,7 @@
 	}
 	/* write it */
 	look->phrasebits+=
-	  vorbis_book_encode(books+info->class_book[class],cval,&vb->opb);
+	  vorbis_book_encode(books+info->class_book[class],cval,opb);
 	
 #ifdef TRAIN_FLOOR1
 	{
@@ -906,7 +907,7 @@
 	  /* hack to allow training with 'bad' books */
 	  if(out[j+k]<(books+book)->entries)
 	    look->postbits+=vorbis_book_encode(books+book,
-					       out[j+k],&vb->opb);
+					       out[j+k],opb);
 	  /*else
 	    fprintf(stderr,"+!");*/
 	  
@@ -951,7 +952,7 @@
       return(1);
     }
   }else{
-    oggpack_write(&vb->opb,0,1);
+    oggpack_write(opb,0,1);
     memset(ilogmask,0,vb->pcmend/2*sizeof(*ilogmask));
     seq++;
     return(0);


Property changes on: branches/vorbis-aotuv/lib/floor1.c
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/highlevel.h
===================================================================
--- branches/vorbis-aotuv/lib/highlevel.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/highlevel.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: highlevel encoder setup struct seperated out for vorbisenc clarity
- last mod: $Id: highlevel.h,v 1.4 2002/07/01 11:20:11 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -33,12 +33,11 @@
 
   int    managed;
   long   bitrate_min;
-  long   bitrate_av_lo;
-  long   bitrate_av_hi;
+  long   bitrate_av;
+  double bitrate_av_damp;
   long   bitrate_max;
-  double bitrate_limit_window;
-  double bitrate_av_window;
-  double bitrate_av_window_center;
+  long   bitrate_reservoir;
+  double bitrate_reservoir_bias;
   
   int impulse_block_p;
   int noise_normalize_p;


Property changes on: branches/vorbis-aotuv/lib/highlevel.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/info.c
===================================================================
--- branches/vorbis-aotuv/lib/info.c	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/info.c	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: maintain the info structure, info <-> header packets
- last mod: $Id: info.c,v 1.62 2003/09/10 01:10:18 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -416,7 +416,7 @@
 }
 
 static int _vorbis_pack_comment(oggpack_buffer *opb,vorbis_comment *vc){
-  char temp[]="AO; aoTuV b2 [20040420]  (based on Xiph.Org's 1.0.1)";
+  char temp[]="Xiph.Org libVorbis I 20040629";
   int bytes = strlen(temp);
 
   /* preamble */  


Property changes on: branches/vorbis-aotuv/lib/info.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/lookup.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/lookup.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/lookup_data.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/lookups.pl
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/lpc.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/lpc.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/lsp.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/lsp.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/mapping0.c
===================================================================
--- branches/vorbis-aotuv/lib/mapping0.c	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/mapping0.c	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.60 2003/09/01 23:05:49 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -235,7 +235,8 @@
 extern int *floor1_interpolate_fit(vorbis_block *vb,vorbis_look_floor *look,
 				   int *A,int *B,
 				   int del);
-extern int floor1_encode(vorbis_block *vb,vorbis_look_floor *look,
+extern int floor1_encode(oggpack_buffer *opb,vorbis_block *vb,
+			 vorbis_look_floor *look,
 			 int *post,int *ilogmask);
 
 
@@ -273,7 +274,20 @@
 
     gmdct[i]=_vorbis_block_alloc(vb,n/2*sizeof(**gmdct));
 
-    scale_dB=todB(&scale);
+    scale_dB=todB(&scale) + .345; /* + .345 is a hack; the original
+                                     todB estimation used on IEEE 754
+                                     compliant machines had a bug that
+                                     returned dB values about a third
+                                     of a decibel too high.  The bug
+                                     was harmless because tunings
+                                     implicitly took that into
+                                     account.  However, fixing the bug
+                                     in the estimator requires
+                                     changing all the tunings as well.
+                                     For now, it's easier to sync
+                                     things back up here, and
+                                     recalibrate the tunings in the
+                                     next major model upgrade. */
 
 #if 0
     if(vi->channels==2)
@@ -300,11 +314,38 @@
     
     /* FFT yields more accurate tonal estimation (not phase sensitive) */
     drft_forward(&b->fft_look[vb->W],pcm);
-    logfft[0]=scale_dB+todB(pcm);
+    logfft[0]=scale_dB+todB(pcm)  + .345; /* + .345 is a hack; the
+                                     original todB estimation used on
+                                     IEEE 754 compliant machines had a
+                                     bug that returned dB values about
+                                     a third of a decibel too high.
+                                     The bug was harmless because
+                                     tunings implicitly took that into
+                                     account.  However, fixing the bug
+                                     in the estimator requires
+                                     changing all the tunings as well.
+                                     For now, it's easier to sync
+                                     things back up here, and
+                                     recalibrate the tunings in the
+                                     next major model upgrade. */
     local_ampmax[i]=logfft[0];
     for(j=1;j<n-1;j+=2){
       float temp=pcm[j]*pcm[j]+pcm[j+1]*pcm[j+1];
-      temp=logfft[(j+1)>>1]=scale_dB+.5f*todB(&temp);
+      temp=logfft[(j+1)>>1]=scale_dB+.5f*todB(&temp)  + .345; /* +
+                                     .345 is a hack; the original todB
+                                     estimation used on IEEE 754
+                                     compliant machines had a bug that
+                                     returned dB values about a third
+                                     of a decibel too high.  The bug
+                                     was harmless because tunings
+                                     implicitly took that into
+                                     account.  However, fixing the bug
+                                     in the estimator requires
+                                     changing all the tunings as well.
+                                     For now, it's easier to sync
+                                     things back up here, and
+                                     recalibrate the tunings in the
+                                     next major model upgrade. */
       if(temp>local_ampmax[i])local_ampmax[i]=temp;
     }
 
@@ -312,11 +353,13 @@
     if(local_ampmax[i]>global_ampmax)global_ampmax=local_ampmax[i];
 
 #if 0
-    if(vi->channels==2)
-      if(i==0)
+    if(vi->channels==2){
+      if(i==0){
 	_analysis_output("fftL",seq,logfft,n/2,1,0,0);
-      else
+      }else{
 	_analysis_output("fftR",seq,logfft,n/2,1,0,0);
+      }
+    }
 #endif
 
   }
@@ -344,7 +387,20 @@
       memset(floor_posts[i],0,sizeof(**floor_posts)*PACKETBLOBS);
       
       for(j=0;j<n/2;j++)
-	logmdct[j]=todB(mdct+j);
+	logmdct[j]=todB(mdct+j)  + .345; /* + .345 is a hack; the original
+                                     todB estimation used on IEEE 754
+                                     compliant machines had a bug that
+                                     returned dB values about a third
+                                     of a decibel too high.  The bug
+                                     was harmless because tunings
+                                     implicitly took that into
+                                     account.  However, fixing the bug
+                                     in the estimator requires
+                                     changing all the tunings as well.
+                                     For now, it's easier to sync
+                                     things back up here, and
+                                     recalibrate the tunings in the
+                                     next major model upgrade. */
 
 #if 0
       if(vi->channels==2){
@@ -399,16 +455,32 @@
 	 masking.  We then do a floor1-specific line fit.  If we're
 	 performing bitrate management, the line fit is performed
 	 multiple times for up/down tweakage on demand. */
-      
-      _vp_offset_and_mix(psy_look,
-			 noise,
-			 tone,
-			 1,
-			 logmask,
-			 mdct,
-			 logmdct);
 
 #if 0
+      {
+      float aotuv[psy_look->n];
+#endif
+
+	_vp_offset_and_mix(psy_look,
+			   noise,
+			   tone,
+			   1,
+			   logmask,
+			   mdct,
+			   logmdct);
+	
+#if 0
+	if(vi->channels==2){
+	  if(i==0)
+	    _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);
+	}
+      }
+#endif
+
+
+#if 0
       if(vi->channels==2){
 	if(i==0)
 	  _analysis_output("mask1L",seq,logmask,n/2,1,0,0);
@@ -528,11 +600,11 @@
 					psy_look,
 					info,
 					mag_memo);    
-      
+
       hf_reduction(&ci->psy_g_param,
-					psy_look,
-					info,
-					mag_memo);
+		   psy_look,
+		   info,
+		   mag_memo);
     }
 
     memset(sortindex,0,sizeof(*sortindex)*vi->channels);
@@ -547,16 +619,17 @@
     for(k=(vorbis_bitrate_managed(vb)?0:PACKETBLOBS/2);
 	k<=(vorbis_bitrate_managed(vb)?PACKETBLOBS-1:PACKETBLOBS/2);
 	k++){
+      oggpack_buffer *opb=vbi->packetblob[k];
 
       /* start out our new packet blob with packet type and mode */
       /* Encode the packet type */
-      oggpack_write(&vb->opb,0,1);
+      oggpack_write(opb,0,1);
       /* Encode the modenumber */
       /* Encode frame mode, pre,post windowsize, then dispatch */
-      oggpack_write(&vb->opb,modenumber,b->modebits);
+      oggpack_write(opb,modenumber,b->modebits);
       if(vb->W){
-	oggpack_write(&vb->opb,vb->lW,1);
-	oggpack_write(&vb->opb,vb->nW,1);
+	oggpack_write(opb,vb->lW,1);
+	oggpack_write(opb,vb->nW,1);
       }
 
       /* encode floor, compute masking curve, sep out residue */
@@ -567,7 +640,7 @@
 	int   *ilogmask=ilogmaskch[i]=
 	  _vorbis_block_alloc(vb,n/2*sizeof(**gmdct));
       
-	nonzero[i]=floor1_encode(vb,b->flr[info->floorsubmap[submap]],
+	nonzero[i]=floor1_encode(opb,vb,b->flr[info->floorsubmap[submap]],
 				 floor_posts[i][k],
 				 ilogmask);
 #if 0
@@ -640,14 +713,11 @@
 	  class(vb,b->residue[resnum],couple_bundle,zerobundle,ch_in_bundle);
 	
 	_residue_P[ci->residue_type[resnum]]->
-	  forward(vb,b->residue[resnum],
+	  forward(opb,vb,b->residue[resnum],
 		  couple_bundle,NULL,zerobundle,ch_in_bundle,classifications);
       }
       
-      /* ok, done encoding.  Mark this protopacket and prepare next. */
-      oggpack_writealign(&vb->opb);
-      vbi->packetblob_markers[k]=oggpack_bytes(&vb->opb);
-      
+      /* ok, done encoding.  Next protopacket. */
     }
     
   }


Property changes on: branches/vorbis-aotuv/lib/mapping0.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/masking.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/mdct.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/mdct.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/misc.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/misc.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/modes
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in



Property changes on: branches/vorbis-aotuv/lib/modes/.cvsignore
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/modes/Makefile.am
===================================================================
--- branches/vorbis-aotuv/lib/modes/Makefile.am	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/modes/Makefile.am	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 EXTRA_DIST = floor_all.h psych_44.h residue_44.h setup_11.h setup_32.h \
 	     setup_8.h psych_11.h psych_8.h residue_44u.h setup_16.h \
 	     setup_44.h setup_X.h psych_16.h residue_16.h residue_8.h \


Property changes on: branches/vorbis-aotuv/lib/modes/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/modes/floor_all.h
===================================================================
--- branches/vorbis-aotuv/lib/modes/floor_all.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/modes/floor_all.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: key floor settings
- last mod: $Id: floor_all.h,v 1.1 2002/07/11 06:41:04 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -85,20 +85,12 @@
   &_huff_book_line_128x17_3sub2,
   &_huff_book_line_128x17_3sub3, 
 };
-static static_codebook *_floor_512x17_books[]={
-  &_huff_book_line_512x17_class1,
-  &_huff_book_line_512x17_class2,
-  &_huff_book_line_512x17_class3,
-  
-  &_huff_book_line_512x17_0sub0,
-  &_huff_book_line_512x17_1sub0,
-  &_huff_book_line_512x17_1sub1,
-  &_huff_book_line_512x17_2sub1,
-  &_huff_book_line_512x17_2sub2,
-  &_huff_book_line_512x17_2sub3, 
-  &_huff_book_line_512x17_3sub1,
-  &_huff_book_line_512x17_3sub2,
-  &_huff_book_line_512x17_3sub3, 
+static static_codebook *_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[]={
   &_huff_book_line_1024x27_class1,
@@ -118,7 +110,41 @@
   &_huff_book_line_1024x27_4sub2,
   &_huff_book_line_1024x27_4sub3,
 };
+static static_codebook *_floor_2048x27_books[]={
+  &_huff_book_line_2048x27_class1,
+  &_huff_book_line_2048x27_class2,
+  &_huff_book_line_2048x27_class3,
+  &_huff_book_line_2048x27_class4,
+  
+  &_huff_book_line_2048x27_0sub0,
+  &_huff_book_line_2048x27_1sub0,
+  &_huff_book_line_2048x27_1sub1,
+  &_huff_book_line_2048x27_2sub0,
+  &_huff_book_line_2048x27_2sub1,
+  &_huff_book_line_2048x27_3sub1,
+  &_huff_book_line_2048x27_3sub2,
+  &_huff_book_line_2048x27_3sub3,
+  &_huff_book_line_2048x27_4sub1,
+  &_huff_book_line_2048x27_4sub2,
+  &_huff_book_line_2048x27_4sub3,
+};
 
+static static_codebook *_floor_512x17_books[]={
+  &_huff_book_line_512x17_class1,
+  &_huff_book_line_512x17_class2,
+  &_huff_book_line_512x17_class3,
+  
+  &_huff_book_line_512x17_0sub0,
+  &_huff_book_line_512x17_1sub0,
+  &_huff_book_line_512x17_1sub1,
+  &_huff_book_line_512x17_2sub1,
+  &_huff_book_line_512x17_2sub2,
+  &_huff_book_line_512x17_2sub3, 
+  &_huff_book_line_512x17_3sub1,
+  &_huff_book_line_512x17_3sub2,
+  &_huff_book_line_512x17_3sub3, 
+};
+
 static static_codebook **_floor_books[10]={
   _floor_128x4_books,
   _floor_256x4_books,
@@ -126,9 +152,9 @@
   _floor_256x7_books,
   _floor_128x11_books,
   _floor_128x17_books,
-  _floor_128x17_books,
+  _floor_256x4low_books,
   _floor_1024x27_books,
-  _floor_1024x27_books,
+  _floor_2048x27_books,
   _floor_512x17_books,
 };
 
@@ -165,7 +191,6 @@
     
     60,30,500,   1.,18.,  -1
   },
-
   /* 128 x 11 */
   {
     4,{0,1,2,3},{2,3,3,3},{0,1,2,2},{-1,0,1,2},
@@ -175,24 +200,21 @@
     
      60,30,500,   1,18.,  -1
   },
-    
   /* 128 x 17 */
   {
     6,{0,1,1,2,3,3},{2,3,3,3},{0,1,2,2},{-1,0,1,2},
     {{3},{4,5},{-1,6,7,8},{-1,9,10,11}},
     2,{0,128,  12,46,  4,8,16,  23,33,70,  2,6,10,  14,19,28,  39,58,90},
-
+    
     60,30,500,    1,18.,  -1 
   },
-  
-  /* 1024 x 17 */
+  /* 256 x 4 (low bitrate version) */
   {
-    6,{0,1,1,2,3,3},{2,3,3,3},{0,1,2,2},{-1,0,1,2},
-    {{3},{4,5},{-1,6,7,8},{-1,9,10,11}},
-    2,{0,1024,  93,372,  33,65,130,  186,260,556,  
-       14,46,79,  111,158,220,  312,464,720},
-    
-    60,30,500,    1,18.,  -1 /* lowpass! */
+    1,{0},{4},{2},{0},
+    {{1,2,3,4}},
+    4,{0,256, 66,16,32,140},
+
+    60,30,500,   1.,18.,  -1
   },
   /* 1024 x 27 */
   {


Property changes on: branches/vorbis-aotuv/lib/modes/floor_all.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/modes/psych_11.h
===================================================================
--- branches/vorbis-aotuv/lib/modes/psych_11.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/modes/psych_11.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: 11kHz settings 
- last mod: $Id: psych_11.h,v 1.1 2002/07/10 03:04:22 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -20,7 +20,7 @@
 static att3 _psy_tone_masteratt_11[3]={
   {{ 30,  25,  12},  0,   0},  /* 0 */
   {{ 30,  25,  12},  0,   0},  /* 0 */
-  {{ 20,   0, -14},  0,  1.}, /* 0 */
+  {{ 20,   0, -14},  0,   0}, /* 0 */
 };
 
 static vp_adjblock _vp_tonemask_adj_11[3]={


Property changes on: branches/vorbis-aotuv/lib/modes/psych_11.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/modes/psych_16.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/modes/psych_44.h
===================================================================
--- branches/vorbis-aotuv/lib/modes/psych_44.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/modes/psych_44.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: key psychoacoustic settings for 44.1/48kHz
- last mod: $Id: psych_44.h,v 1.29 2003/09/02 07:32:17 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -62,7 +62,7 @@
     24,25,26,27,28,29,30, 31,     /* 31dB */
     32,33,34,35,36,37,38, 39,     /* 39dB */
   }},
-  /* mode_Z nominal short*/
+  /* mode_Z nominal short */
   {{
      0, 1, 2, 3, 4, 5, 6,  6,     /* 7dB */
      7, 7, 7, 7, 6, 6, 6,  7,     /* 15dB */
@@ -106,204 +106,160 @@
 
 /* tonal masking curve level adjustments *************************/
 
-// low-mode added
-static vp_adjblock _vp_tonemask_adj_longblock_low[3]={
-  /* adjust for mode zero */
-   /* 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}}, /* 0(-2) */
-   {{ -3, -8,-13,-15,-12,-12,-11,-11,-11,-11,-11, -1, -1, -1, -1,  0,  0}}, /* 1(-1) */
-   {{ -4,-10,-14,-16,-15,-14,-13,-12,-12,-12,-11, -1, -1, -1, -1, -1,  0}}, /* 2(-0) */
-};
-static vp_adjblock _vp_tonemask_adj_otherblock_low[3]={
-  /* adjust for mode zero */
-   /* 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}}, /* 0(-2) */
-   {{ -3, -8,-13,-15,-11,-11,-10,-10,-10,-10,-10,  0,  0,  0,  0,  0,  0}}, /* 1(-1) */
-   {{ -4,-10,-14,-16,-14,-13,-11,-11,-10,-10,-10,  0,  0,  0,  0,  0,  0}}, /* 2(-0) */
-};
+static vp_adjblock _vp_tonemask_adj_longblock[12]={
 
-static vp_adjblock _vp_tonemask_adj_longblock[11]={
-  /* adjust for mode zero */
-  /* 63     125     250     500     1     2     4     8    16 */
    /* 63     125     250     500       1       2       4       8      16 */
-//  {{-15,-15,-15,-15,-10, -8, -4,-2, 0, 0, 0,10, 0, 0, 0, 0, 0}}, /* 0 */
+
+   {{ -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 *
+
+/* {{-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 */
+
+/* {{-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,-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 */
+
+/* {{-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 */
+
+/* {{-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 */
+
+/* {{-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 */
+
+/* {{-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 */
+
+/* {{-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 */
+
+/* {{-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 */
+
+/* {{-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 */
 };
-static vp_adjblock _vp_tonemask_adj_otherblock[11]={
-  /* adjust for mode zero */
-  /* 63     125     250     500       1     2     4     8    16 */
+
+static vp_adjblock _vp_tonemask_adj_otherblock[12]={
    /* 63     125     250     500       1       2       4       8      16 */
-//  {{-20,-20,-20,-20,-14,-12,-10, -8, -4, 0, 0,10, 0, 0, 0, 0, 0}}, /* 0 */
+
+   {{ -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 */
+
+/* {{-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 */
+
+/* {{-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 */
+
+/* {{-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 */
+
+/* {{-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 */
+
+/* {{-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 */
+
+/* {{-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 */
+
+/* {{-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 */
+
+/* {{-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 */
+
+/* {{-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 */
+
+/* {{-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 */
 };
 
-// noise bias low-bitrate (impulse,padding,trans)
- // q-2 added
-static noise3 _psy_noisebias_trans_low[3]={
+/* noise bias (transition block) */
+static noise3 _psy_noisebias_trans[12]={
   /*  63     125     250     500      1k       2k      4k      8k     16k*/
-  /* 0 */
-//  {{{-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,  4,  8,  8, 15},
-//    {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},
-    /* 0(-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}}},
-  /* 1 */
-//  {{{-15,-15,-15,-15,-15,-10, -5,  0,  2,  2,  6,  6,  6,  8, 10, 12, 15},
-//    {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2,  0,  0,  0,  2,  4,  10},
-//    {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -4, -4, -4,  -2}}},
-    /* 1(-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, 12},
-    {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},
-    /* 2(-0) */
-  {{{-15,-15,-15,-15,-15,-10, -5,  0,  2,  2,  6,  6,  6,  8, 10, 12, 15},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2,  0,  0,  0,  2,  3,   6},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -4, -4, -4,  -2}}},
-};
-// noise bias low-bitrate (long)
- // q-2 added
-static noise3 _psy_noisebias_long_low[3]={
-    /*63     125     250     500      1k       2k      4k      8k     16k*/
-  /* 0 */
-//  {{{-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}}},
-    /* 0(-2) */
-  {{{-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}}},
-  /* 1 */
-//  {{{-10,-10,-10,-10,-10,-10, -8, -8,  0,  2,  4,  4,  5,  5,  5,  8,  10},
-//    {-20,-20,-20,-20,-20,-20,-20,-14, -8, -2,  0,  0,  0,  0,  2,  4,  10},
-//    {-20,-20,-20,-20,-20,-20,-20,-14, -6, -6, -6, -6, -6, -4, -4, -4, -2}}},
-    /* 1(-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,  1,  3,  5,  10},
-    {-20,-20,-20,-20,-20,-20,-20,-10, -6, -6, -6, -6, -6, -4, -4, -4, -2}}},
-    /* 2(-0) */
-  {{{-10,-10,-10,-10,-10,-10, -8, -8,  0,  2,  4,  4,  5,  5,  5,  8,  10},
-    {-20,-20,-20,-20,-20,-20,-20,-14, -8, -2,  0,  0,  0,  0,  2,  3,  6},
-    {-20,-20,-20,-20,-20,-20,-20,-14, -6, -6, -6, -6, -6, -4, -4, -4, -2}}},
-};
-
-
-// noise bias (transition block)
-static noise3 _psy_noisebias_trans[11]={
-  /*  63     125     250     500      1k       2k      4k      8k     16k*/
-  /* 0 (1.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,-10, -4, -2, -2,  0,  0,  2,  4,  10},
-//    {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -4, -4, -4,  -2}}},
-  /* 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}}},
+  /* 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},
-//    {-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}}},
+  /* 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},
-//    {-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,  9},
+  /* 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},
     {-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},
-//    {-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}}},
+  /* 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,-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},
-//    {-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}}},
+  /* 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,-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},
-//    {-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}}},
+  /* 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},
-//    {-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}}},
+  /* 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},
-//    {-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,-22,-20,-15,-10, -8, -2,  0,  0,  0,  1,  2,  3,  7},
+  /* 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},
-//    {-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}}},
-  {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -4, -4, -4, -4, -4, -2,  2}, 
+  /* 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},
-//    {-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}}},
-  {{{-30,-30,-30,-30,-30,-30,-30,-28,-20,-12,-10,-10,-10,-10,-10, -8, -6},
+  /* 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}}},
   /* 10 */
@@ -312,63 +268,60 @@
     {-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40}}},
 };
 
-// noise bias (long block)
-static noise3 _psy_noisebias_long[11]={
-    /*63     125     250     500      1k       2k      4k      8k     16k*/
-  /* 0 (1.0) */
-//  {{{-10,-10,-10,-10,-10,-10, -8,  2,  2,  2,  4,  4,  5,  5,  5,  8,  10},
-//    {-20,-20,-20,-20,-20,-20,-10, -6, -4, -2, -2, -2,  0,  0,  2,  4,  10},
-//    {-20,-20,-20,-20,-20,-20,-20,-10, -6, -6, -6, -6, -6, -4, -4, -4, -2}}},
+/*  noise bias (long block) */
+static noise3 _psy_noisebias_long[12]={
+  /*63     125     250     500      1k       2k      4k      8k     16k*/
+  /* -1 */
+  {{{-10,-10,-10,-10,-10, -4,  0,  0,  0,  6,  6,  6,  6, 10, 10, 12,  20},
+    {-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}}},
+
   /* 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,  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},
     {-20,-20,-20,-20,-20,-20,-20,-14, -8, -6, -6, -6, -6, -4, -4, -4, -2}}},
-  /* 1 (1.0) */
-//  {{{-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, -8, -8, -8, -8, -8, -6, -6, -6, -4}}},
   /* 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,  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},
     {-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, -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},
     {-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,  3,  3,  4,  4,  7},
+  /*  {{{-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,-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,-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}}},
@@ -390,13 +343,18 @@
     {-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40}}},
 };
 
-// noise bias (impulse block)
-static noise3 _psy_noisebias_impulse[11]={
+/* noise bias (impulse block) */
+static noise3 _psy_noisebias_impulse[12]={
   /*  63     125     250     500      1k      2k      4k      8k     16k*/
+  /* -1 */
+  {{{-10,-10,-10,-10,-10, -4,  0,  0,  4,  8,  8,  8,  8, 10, 12, 14, 20},
+    {-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}}},
+
   /* 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,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},
@@ -420,31 +378,31 @@
   {{{-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 */
-//  {{{-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}}},
-  {{{-24,-24,-24,-24,-24,-22,-14,-10, -6, -1, -1, -1, -1,  3,  3,  5, 10},
+  /* 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}}},
   /* 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}}},
-  {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -4, -4, -4, -4, -4, -2,  0},
+  /*  {{{-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}}},
   /* 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}}},
-  {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -4, -4, -4, -4, -4, -2,  0},
+  /*  {{{-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}}},
   /* 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},
     {-40,-40,-40,-40,-40,-40,-40,-32,-30,-30,-30,-30,-30,-30,-30,-24,-20}}},
@@ -454,9 +412,15 @@
     {-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40}}},
 };
 
-// noise bias (padding block)
-static noise3 _psy_noisebias_padding[11]={
+/* noise bias (padding block) */
+static noise3 _psy_noisebias_padding[12]={
   /*  63     125     250     500      1k       2k      4k      8k     16k*/
+  
+  /* -1 */
+  {{{-10,-10,-10,-10,-10, -4,  0,  0,  4,  8,  8,  8,  8, 10, 12, 14, 20},
+    {-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}}},
+
   /* 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},
@@ -466,9 +430,9 @@
     {-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, -8, -8, -8, -8, -8, -6, -4, -2}}},
@@ -514,53 +478,39 @@
   {10,10,100},
 };
 
-
-static int _psy_tone_suppress[11]={
-  -20,-20,-20,-20,-24,-30,-40,-40,-45,-45,-45,
+static int _psy_tone_suppress[12]={
+  -20,-20,-20,-20,-20,-24,-30,-40,-40,-45,-45,-45,
 };
-// low-mode added
-static int _psy_tone_suppress_low[3]={
-  -20,-20,-20
- };
-static int _psy_tone_0dB[11]={
-  90,95,95,95,95,105,105,105,105,105,105,
+static int _psy_tone_0dB[12]={
+  90,90,95,95,95,95,105,105,105,105,105,105,
 };
-// low-mode added
-static int _psy_tone_0dB_low[3]={
-  90,90,90
+static int _psy_noise_suppress[12]={
+  -20,-20,-24,-24,-24,-24,-30,-40,-40,-45,-45,-45,
 };
 
-static int _psy_noise_suppress[11]={
-  -20,-24,-24,-24,-24,-30,-40,-40,-45,-45,-45,
-};
-// low-mode added
-static int _psy_noise_suppress_low[3]={
- -20,-20,-20
-};
-
 static vorbis_info_psy _psy_info_template={
-  // blockflag 
+  /* blockflag */
   -1,
-  // ath_adjatt, ath_maxatt
+  /* ath_adjatt, ath_maxatt */
   -140.,-140.,
   /* tonemask att boost/decay,suppr,curves */
   {0.f,0.f,0.f},     0.,0.,    -40.f, {0.},  
   
   /*noisemaskp,supp, low/high window, low/hi guard, minimum */
   1,          -0.f,           .5f, .5f,         0,0,0,
-  // noiseoffset*3, noisecompand, max_curve_dB
+  /* noiseoffset*3, noisecompand, max_curve_dB */
   {{-1},{-1},{-1}},{-1},105.f,
-  // noise normalization - channel_p, point_p, start, partition, thresh.
+  /* noise normalization - channel_p, point_p, start, partition, thresh. */
   0,0,-1,-1,0.,
 };
 
 /* ath ****************/
 
-static int _psy_ath_floater[11]={
-  -100,-100,-100,-100,-100,-105,-105,-105,-105,-110,-120,
+static int _psy_ath_floater[12]={
+  -100,-100,-100,-100,-100,-100,-105,-105,-105,-105,-110,-120,
 };
-static int _psy_ath_abs[11]={
-  -130,-130,-130,-140,-140,-140,-140,-140,-140,-140,-150,
+static int _psy_ath_abs[12]={
+  -130,-130,-130,-130,-140,-140,-140,-140,-140,-140,-140,-150,
 };
 
 /* stereo setup.  These don't map directly to quality level, there's
@@ -572,64 +522,36 @@
 /* various stereo possibilities */
 
 /* stereo mode by base quality level */
-// q-2 added
-static adj_stereo _psy_stereo_modes_44_low[3]={
-    /*  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,  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(-2) OLD  */
-//  {{  4,  4,  4,  4,  4,  4,  4,  4,  3,  2,  1,  0,  0,  0,  0},
-//   {  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  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         0(-2)  */
+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},
    {  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}},
-    /*  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,  5,  5,  6,  6,  6,  6,  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         1(-1)  */
-  {{  4,  4,  4,  4,  4,  4,  4,  3,  2,  2,  1,  0,  0,  0,  0},
-   {  8,  8,  8,  8,  6,  6,  5,  5,  5,  5,  5,  5,  5,  4,  3},
-   {  1,  2,  3,  4,  4,  4,  4,  4,  4,  5,  6,  7,  8,  8,  8},
-   { 11,11.5, 12,12.5, 13,13.5, 14, 99, 99, 99, 99, 99, 99, 99, 99}},
-  /*  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14         2(<-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,  5,  5,  6,  6,  6,  6,  6,  7,  8,  8,  8},
-//   { 12,12.5, 13,13.5, 14,14.5, 15, 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,  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}},
-};
 
-static adj_stereo _psy_stereo_modes_44[11]={
-  /*  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},
-//   { 12,12.5, 13,13.5, 14,14.5, 15, 99, 99, 99, 99, 99, 99, 99, 99}},
-  {{  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         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},
+   { 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,  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},
    { 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},
    {  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}},
+
+
   /*  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,  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},
@@ -645,37 +567,37 @@
    {  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},
+      {  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,  2,  2,  2,  2,  2,  2,  0,  0,  0,  0},
-   {  7,  7,  8,  8,  8, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12},
+   {  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,  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,  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,  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},
@@ -693,19 +615,12 @@
 };
 
 /* tone master attenuation by base quality mode and bitrate tweak */
-// q-2 added
-static att3 _psy_tone_masteratt_44_low[3]={
-//  {{ 34,  20,   8},  0, 1.25}, /* 0 */
-//  {{ 34,  20,   8}, -2, 1.25}, /* 1 */
-  {{ 35,  21,   9},  0, 1.25}, /* 0 */
-  {{ 34,  20,   8},  0, 1.25}, /* 1 */
-  {{ 34,  20,   8}, -2, 1.25}, /* 2 */
-};
-static att3 _psy_tone_masteratt_44[11]={
+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 */
-  {{ 23,  12,   2},  0,    0}, /* 1 */
-//  {{ 20,  10,  -2},  0,    0}, /* 2 */
+  /*  {{ 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 */
   {{ 20,   9,  -4},  0,    0}, /* 4 */
@@ -718,51 +633,34 @@
 };
 
 /* lowpass by mode **************/
-// q-2 added
-static double _psy_lowpass_44_low[3]={
-//  15.1,15.1,
-  13.9, 15.1, 15.1
+static double _psy_lowpass_44[12]={
+  /*  15.1,15.8,16.5,17.9,20.5,48.,999.,999.,999.,999.,999. */
+  13.9,15.1,15.8,16.5,17.2,18.9,20.1,48.,999.,999.,999.,999.
 };
-static double _psy_lowpass_44[11]={
-//  15.1,15.8,16.5,17.9,20.5,48.,999.,999.,999.,999.,999.
-  15.1,15.8,16.5,17.2,18.9,20.1,48.,999.,999.,999.,999.
-};
 
 /* noise normalization **********/
 
-static int _noise_start_short_44[10]={
-//  16,16,16,16,32,32,9999,9999,9999,9999
-  16,16,16,32,9999,9999,9999,9999,9999,9999
+static int _noise_start_short_44[11]={
+  /*  16,16,16,16,32,32,9999,9999,9999,9999 */
+  32,16,16,16,32,9999,9999,9999,9999,9999,9999
 };
-static int _noise_start_long_44[10]={
-//  128,128,128,256,512,512,9999,9999,9999,9999
-  128,128,256,512,9999,9999,9999,9999,9999,9999
+static int _noise_start_long_44[11]={
+  /*  128,128,128,256,512,512,9999,9999,9999,9999 */
+  256,128,128,256,512,9999,9999,9999,9999,9999,9999
 };
 
-static int _noise_part_short_44[10]={
-    8,8,8,8,8,8,8,8,8,8
+static int _noise_part_short_44[11]={
+    8,8,8,8,8,8,8,8,8,8,8
 };
-static int _noise_part_long_44[10]={
-    32,32,32,32,32,32,32,32,32,32
+static int _noise_part_long_44[11]={
+    32,32,32,32,32,32,32,32,32,32,32
 };
 
-static double _noise_thresh_44[10]={
-//  .2,.2,.3,.4,.5,.5,9999.,9999.,9999.,9999.,
-   .2,.2,.4,.6,9999.,9999.,9999.,9999.,9999.,9999.,
+static double _noise_thresh_44[11]={
+  /*  .2,.2,.3,.4,.5,.5,9999.,9999.,9999.,9999., */
+   .2,.2,.2,.4,.6,9999.,9999.,9999.,9999.,9999.,9999.,
 };
-// 2 >> 3
-static double _noise_thresh_44_2[3]={
- .5,.5,.5,
-};
-// low-mode added
-static double _noise_thresh_44_low[3]={
- .2,.2,.2,
-};
 
-// q-2 added
-static int _noise_start_short_44_low[3]={
-  32,32,32
+static double _noise_thresh_5only[2]={
+ .5,.5,
 };
-static int _noise_start_long_44_low[3]={
-  256,256,256
-};


Property changes on: branches/vorbis-aotuv/lib/modes/psych_44.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/modes/psych_8.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/modes/residue_16.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/modes/residue_44.h
===================================================================
--- branches/vorbis-aotuv/lib/modes/residue_44.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/modes/residue_44.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: toplevel residue templates for 32/44.1/48kHz
- last mod: $Id: residue_44.h,v 1.16 2002/07/11 06:41:04 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -21,6 +21,15 @@
 
 /***** residue backends *********************************************/
 
+static vorbis_info_residue0 _residue_44_low={
+  0,-1, -1, 9,-1,
+  /*  0     1     2     3     4     5     6     7  */
+  {0},
+  {-1},
+  {  .5,  1.5,  2.5,  2.5,  4.5,  8.5,  16.5, 32.5},
+  {  .5,   .5,   .5,  999., 4.5,  8.5,  16.5, 32.5},
+};
+
 static vorbis_info_residue0 _residue_44_mid={
   0,-1, -1, 10,-1,
   /*  0     1     2     3     4     5     6     7     8  */
@@ -39,38 +48,57 @@
   {  .5,  1.5,  2.5,  3.5,  4.5,  8.5, 16.5, 71.5,157.5},
 };
 
+static 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},
+    {&_44cn1_s_p6_0,&_44cn1_s_p6_1},{&_44cn1_s_p7_0,&_44cn1_s_p7_1},
+    {&_44cn1_s_p8_0,&_44cn1_s_p8_1,&_44cn1_s_p8_2}
+   }
+};
+static 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},
+    {&_44cn1_sm_p6_0,&_44cn1_sm_p6_1},{&_44cn1_sm_p7_0,&_44cn1_sm_p7_1},
+    {&_44cn1_sm_p8_0,&_44cn1_sm_p8_1,&_44cn1_sm_p8_2}
+   }
+};
+
 static 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},{0,0,&_44c0_s_p6_0},
-    {&_44c0_s_p7_0,&_44c0_s_p7_1},{&_44c0_s_p8_0,&_44c0_s_p8_1},
-    {&_44c0_s_p9_0,&_44c0_s_p9_1,&_44c0_s_p9_2}
+    {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},
+    {&_44c0_s_p6_0,&_44c0_s_p6_1},{&_44c0_s_p7_0,&_44c0_s_p7_1},
+    {&_44c0_s_p8_0,&_44c0_s_p8_1,&_44c0_s_p8_2}
    }
 };
 static 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},{0,0,&_44c0_sm_p6_0},
-    {&_44c0_sm_p7_0,&_44c0_sm_p7_1},{&_44c0_sm_p8_0,&_44c0_sm_p8_1},
-    {&_44c0_sm_p9_0,&_44c0_sm_p9_1,&_44c0_sm_p9_2}
+    {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},
+    {&_44c0_sm_p6_0,&_44c0_sm_p6_1},{&_44c0_sm_p7_0,&_44c0_sm_p7_1},
+    {&_44c0_sm_p8_0,&_44c0_sm_p8_1,&_44c0_sm_p8_2}
    }
 };
+
 static 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},{0,0,&_44c1_s_p6_0},
-    {&_44c1_s_p7_0,&_44c1_s_p7_1},{&_44c1_s_p8_0,&_44c1_s_p8_1},
-    {&_44c1_s_p9_0,&_44c1_s_p9_1,&_44c1_s_p9_2}
+    {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},
+    {&_44c1_s_p6_0,&_44c1_s_p6_1},{&_44c1_s_p7_0,&_44c1_s_p7_1},
+    {&_44c1_s_p8_0,&_44c1_s_p8_1,&_44c1_s_p8_2}
    }
 };
 static 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},{0,0,&_44c1_sm_p6_0},
-    {&_44c1_sm_p7_0,&_44c1_sm_p7_1},{&_44c1_sm_p8_0,&_44c1_sm_p8_1},
-    {&_44c1_sm_p9_0,&_44c1_sm_p9_1,&_44c1_sm_p9_2}
+    {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},
+    {&_44c1_sm_p6_0,&_44c1_sm_p6_1},{&_44c1_sm_p7_0,&_44c1_sm_p7_1},
+    {&_44c1_sm_p8_0,&_44c1_sm_p8_1,&_44c1_sm_p8_2}
    }
 };
+
 static static_bookblock _resbook_44s_2={
   {
     {0},{0,0,&_44c2_s_p1_0},{0,0,&_44c2_s_p2_0},{0,0,&_44c2_s_p3_0},
@@ -148,25 +176,34 @@
    }
 };
 
+static 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},
 
+  {2,0,  &_residue_44_low,
+   &_huff_book__44cn1_s_long,&_huff_book__44cn1_sm_long,
+   &_resbook_44s_n1,&_resbook_44sm_n1}
+};
 static vorbis_residue_template _res_44s_0[]={
-  {2,0,  &_residue_44_mid,
+  {2,0,  &_residue_44_low,
    &_huff_book__44c0_s_short,&_huff_book__44c0_sm_short,
    &_resbook_44s_0,&_resbook_44sm_0},
 
-  {2,0,  &_residue_44_mid,
+  {2,0,  &_residue_44_low,
    &_huff_book__44c0_s_long,&_huff_book__44c0_sm_long,
    &_resbook_44s_0,&_resbook_44sm_0}
 };
 static vorbis_residue_template _res_44s_1[]={
-  {2,0,  &_residue_44_mid,
+  {2,0,  &_residue_44_low,
    &_huff_book__44c1_s_short,&_huff_book__44c1_sm_short,
    &_resbook_44s_1,&_resbook_44sm_1},
 
-  {2,0,  &_residue_44_mid,
+  {2,0,  &_residue_44_low,
    &_huff_book__44c1_s_long,&_huff_book__44c1_sm_long,
    &_resbook_44s_1,&_resbook_44sm_1}
 };
+
 static vorbis_residue_template _res_44s_2[]={
   {2,0,  &_residue_44_mid,
    &_huff_book__44c2_s_short,&_huff_book__44c2_s_short,
@@ -241,6 +278,7 @@
 };
 
 static vorbis_mapping_template _mapres_template_44_stereo[]={
+  { _map_nominal, _res_44s_n1 }, /* -1 */
   { _map_nominal, _res_44s_0 }, /* 0 */
   { _map_nominal, _res_44s_1 }, /* 1 */
   { _map_nominal, _res_44s_2 }, /* 2 */
@@ -253,8 +291,4 @@
   { _map_nominal, _res_44s_9 }, /* 9 */
 };
 
-// low-mode added
-static vorbis_mapping_template _mapres_template_44_stereo_low[]={
-  { _map_nominal, _res_44s_0 }, /* 0(-2) */
-  { _map_nominal, _res_44s_0 }, /* 1(-1) */
-};
+


Property changes on: branches/vorbis-aotuv/lib/modes/residue_44.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/modes/residue_44u.h
===================================================================
--- branches/vorbis-aotuv/lib/modes/residue_44u.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/modes/residue_44u.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: toplevel residue templates for 32/44.1/48kHz uncoupled
- last mod: $Id: residue_44u.h,v 1.3 2002/07/11 06:41:04 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -56,6 +56,18 @@
   {1, {0,0}, {1}, {1}, 0,{0},{0}}
 };
 
+static static_bookblock _resbook_44u_n1={
+  {
+    {0},
+    {0,0,&_44un1__p1_0},
+    {0,0,&_44un1__p2_0},
+    {0,0,&_44un1__p3_0},
+    {0,0,&_44un1__p4_0},
+    {0,0,&_44un1__p5_0},
+    {&_44un1__p6_0,&_44un1__p6_1},
+    {&_44un1__p7_0,&_44un1__p7_1,&_44un1__p7_2}
+   }
+};
 static static_bookblock _resbook_44u_0={
   {
     {0},
@@ -187,6 +199,15 @@
    }
 };
 
+static 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},
+
+  {1,0,  &_residue_44_low_un,
+   &_huff_book__44un1__long,&_huff_book__44un1__long,
+   &_resbook_44u_n1,&_resbook_44u_n1}
+};
 static vorbis_residue_template _res_44u_0[]={
   {1,0,  &_residue_44_low_un,
    &_huff_book__44u0__short,&_huff_book__44u0__short,
@@ -283,6 +304,7 @@
 };
 
 static vorbis_mapping_template _mapres_template_44_uncoupled[]={
+  { _map_nominal_u, _res_44u_n1 }, /* -1 */
   { _map_nominal_u, _res_44u_0 }, /* 0 */
   { _map_nominal_u, _res_44u_1 }, /* 1 */
   { _map_nominal_u, _res_44u_2 }, /* 2 */
@@ -294,9 +316,3 @@
   { _map_nominal_u, _res_44u_8 }, /* 8 */
   { _map_nominal_u, _res_44u_9 }, /* 9 */
 };
-
-// low-mode added
-static vorbis_mapping_template _mapres_template_44_uncoupled_low[]={
-  { _map_nominal_u, _res_44u_0 }, /* 0(-2) */
-  { _map_nominal_u, _res_44u_0 }, /* 1(-1) */
-};


Property changes on: branches/vorbis-aotuv/lib/modes/residue_44u.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/modes/residue_8.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/modes/setup_11.h
===================================================================
--- branches/vorbis-aotuv/lib/modes/setup_11.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/modes/setup_11.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: 11kHz settings 
- last mod: $Id: setup_11.h,v 1.2 2002/07/11 06:41:04 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -22,7 +22,7 @@
 };
 
 static int _floor_mapping_11[2]={
-  1,1,
+  6,6,
 };
 
 static double rate_mapping_11[3]={


Property changes on: branches/vorbis-aotuv/lib/modes/setup_11.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/modes/setup_16.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/modes/setup_22.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/modes/setup_32.h
===================================================================
--- branches/vorbis-aotuv/lib/modes/setup_32.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/modes/setup_32.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,40 +11,26 @@
  ********************************************************************
 
  function: toplevel settings for 32kHz
- last mod: $Id: setup_32.h,v 1.4 2002/07/13 06:12:49 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
-static double rate_mapping_32[11]={
-  28000.,35000.,45000.,56000.,60000.,
+static double rate_mapping_32[12]={
+  18000.,28000.,35000.,45000.,56000.,60000.,
   75000.,90000.,100000.,115000.,150000.,190000.,
 };
 
-static double rate_mapping_32_un[11]={
-  42000.,52000.,64000.,72000.,78000.,
+static double rate_mapping_32_un[12]={
+  30000.,42000.,52000.,64000.,72000.,78000.,
   86000.,92000.,110000.,120000.,140000.,190000.,
 };
 
-static double rate_mapping_32_low[3]={
-//  20000.,28000.
-  18000.,22000.,28000.
+static double _psy_lowpass_32[12]={
+  12.3,13.,13.,14.,15.,99.,99.,99.,99.,99.,99.,99.
 };
 
-static double rate_mapping_32_un_low[3]={
-//  24000.,42000.,
-  30000.,32000.,42000.
-};
-
-static double _psy_lowpass_32_low[3]={
-//  13.,13.,
-  12.3,13.,13.
-};
-static double _psy_lowpass_32[11]={
-  13.,13.,14.,15.,99.,99.,99.,99.,99.,99.,99.
-};
-
 ve_setup_data_template ve_setup_32_stereo={
-  10,
+  11,
   rate_mapping_32,
   quality_mapping_44,
   2,
@@ -95,7 +81,7 @@
 };
 
 ve_setup_data_template ve_setup_32_uncoupled={
-  10,
+  11,
   rate_mapping_32_un,
   quality_mapping_44,
   -1,
@@ -126,7 +112,7 @@
 
   {_noise_start_short_44,_noise_start_long_44},
   {_noise_part_short_44,_noise_part_long_44},
-  _noise_thresh_44_2,
+  _noise_thresh_44,
 
   _psy_ath_floater,
   _psy_ath_abs,
@@ -144,127 +130,3 @@
 
   _mapres_template_44_uncoupled
 };
-
-ve_setup_data_template ve_setup_32_stereo_low={
-//  1,
-  2,
-  rate_mapping_32_low,
-  quality_mapping_44_stereo_low,
-  2,
-  26000,
-  40000,
-  
-  blocksize_short_44_low,
-  blocksize_long_44_low,
-
-  _psy_tone_masteratt_44_low,
-//  _psy_tone_0dB,
-  _psy_tone_0dB_low,
-//  _psy_tone_suppress,
-  _psy_tone_suppress_low,
-
-//  _vp_tonemask_adj_otherblock,
-//  _vp_tonemask_adj_longblock,
-//  _vp_tonemask_adj_otherblock,
-  _vp_tonemask_adj_otherblock_low,
-  _vp_tonemask_adj_longblock_low,
-  _vp_tonemask_adj_otherblock_low,
-
-  _psy_noiseguards_44,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_long_low,
-//  _psy_noise_suppress,
-  _psy_noise_suppress_low,
-  
-  _psy_compand_44,
-//  _psy_compand_short_mapping,
-  _psy_compand_short_mapping_low,
-//  _psy_compand_long_mapping,
-  _psy_compand_long_mapping_low,
-
-  {_noise_start_short_44_low,_noise_start_long_44_low},
-  {_noise_part_short_44,_noise_part_long_44},
-//  _noise_thresh_44,
-   _noise_thresh_44_low,
-
-  _psy_ath_floater,
-  _psy_ath_abs,
-  
-  _psy_lowpass_32_low,
-
-  _psy_global_44,
-  _global_mapping_44,
-  _psy_stereo_modes_44_low,
-
-  _floor_books,
-  _floor,
-  _floor_short_mapping_44_low,
-  _floor_long_mapping_44_low,
-
-//  _mapres_template_44_stereo
-  _mapres_template_44_stereo_low
-};
-
-
-ve_setup_data_template ve_setup_32_uncoupled_low={
-//  1,
-  2,
-  rate_mapping_32_un_low,
-  quality_mapping_44_stereo_low,
-  -1,
-  26000,
-  40000,
-  
-  blocksize_short_44_low,
-  blocksize_long_44_low,
-
-  _psy_tone_masteratt_44_low,
-//  _psy_tone_0dB,
-  _psy_tone_0dB_low,
-//  _psy_tone_suppress,
-  _psy_tone_suppress_low,
-
-//  _vp_tonemask_adj_otherblock,
-//  _vp_tonemask_adj_longblock,
-//  _vp_tonemask_adj_otherblock,
-  _vp_tonemask_adj_otherblock_low,
-  _vp_tonemask_adj_longblock_low,
-  _vp_tonemask_adj_otherblock_low,
-
-  _psy_noiseguards_44,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_long_low,
-//  _psy_noise_suppress,
-  _psy_noise_suppress_low,
-  
-  _psy_compand_44,
-//  _psy_compand_short_mapping,
-  _psy_compand_short_mapping_low,
-//  _psy_compand_long_mapping,
-  _psy_compand_long_mapping_low,
-
-  {_noise_start_short_44_low,_noise_start_long_44_low},
-  {_noise_part_short_44,_noise_part_long_44},
-  _noise_thresh_44_2,
-
-  _psy_ath_floater,
-  _psy_ath_abs,
-  
-  _psy_lowpass_32_low,
-
-  _psy_global_44,
-  _global_mapping_44,
-  NULL,
-
-  _floor_books,
-  _floor,
-  _floor_short_mapping_44_low,
-  _floor_long_mapping_44_low,
-
-//  _mapres_template_44_uncoupled
-  _mapres_template_44_uncoupled_low
-};


Property changes on: branches/vorbis-aotuv/lib/modes/setup_32.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/modes/setup_44.h
===================================================================
--- branches/vorbis-aotuv/lib/modes/setup_44.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/modes/setup_44.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: toplevel settings for 44.1/48kHz
- last mod: $Id: setup_44.h,v 1.9 2002/07/11 08:57:29 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -19,87 +19,43 @@
 #include "modes/residue_44.h"
 #include "modes/psych_44.h"
 
-// nominal bitrate (per ch.)
- // q-2 , q-1 , q-0
-static double rate_mapping_44_stereo_low[3]={
-//  22500.,32000.
-  20000.,24000.,32000.
-};
- // q0`q10
-static double rate_mapping_44_stereo[11]={
-  32000.,40000.,48000.,56000.,64000.,
+static double rate_mapping_44_stereo[12]={
+  22500.,32000.,40000.,48000.,56000.,64000.,
   80000.,96000.,112000.,128000.,160000.,250001.
 };
 
-
-static double quality_mapping_44_stereo_low[3]={
-//  -.1,.0,
-  -.2,-.1,.0,
+static double quality_mapping_44[12]={
+  -.1,.0,.1,.2,.3,.4,.5,.6,.7,.8,.9,1.0
 };
-static double quality_mapping_44[11]={
-  .0,.1,.2,.3,.4,.5,.6,.7,.8,.9,1.0
-};
 
-
-// q-2 added
-static int blocksize_short_44_low[2]={
-  512,512
+static int blocksize_short_44[11]={
+  512,256,256,256,256,256,256,256,256,256,256
 };
-static int blocksize_long_44_low[2]={
-  4096,4096
+static int blocksize_long_44[11]={
+  4096,2048,2048,2048,2048,2048,2048,2048,2048,2048,2048
 };
 
-static int blocksize_short_44[10]={
-  256,256,256,256,256,256,256,256,256,256
+static double _psy_compand_short_mapping[12]={
+  0.5, 1., 1., 1.3, 1.6, 2., 2., 2., 2., 2., 2., 2.
 };
-static int blocksize_long_44[10]={
-  2048,2048,2048,2048,2048,2048,2048,2048,2048,2048
+static double _psy_compand_long_mapping[12]={
+  3.5, 4., 4., 4.3, 4.6, 5., 5., 5., 5., 5., 5., 5.
 };
 
-// noise compand level
-static double _psy_compand_short_mapping[11]={
-  1., 1., 1.3, 1.6, 2., 2., 2., 2., 2., 2., 2.
+static double _global_mapping_44[12]={
+  /* 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.
 };
-static double _psy_compand_long_mapping[11]={
-  4., 4., 4.3, 4.6, 5., 5., 5., 5., 5., 5., 5.
-};
-// low-mode added
-static double _psy_compand_short_mapping_low[3]={
-  0.5, 1., 1.
-};
-static double _psy_compand_long_mapping_low[3]={
-  3.5, 4., 4.
-};
 
-// precho mapping (_psy_global)
-static double _global_mapping_44[11]={
-// 1., 1., 1.5, 2., 2., 2.5, 2.7, 3.0, 3.5, 4., 4.
- 1., 1., 1.5, 2., 2., 2.5, 2.7, 3.0, 3.7, 4., 4.
+static int _floor_short_mapping_44[11]={
+  1,0,0,2,2,4,5,5,5,5,5
 };
-static double _global_mapping_44_low[3]={
-//  0., 1.,
-  0., 0., 1.,
+static int _floor_long_mapping_44[11]={
+  8,7,7,7,7,7,7,7,7,7,7
 };
 
-// The floor number defined by floor_all.h 
-// q-2 added
-static int _floor_short_mapping_44_low[2]={
-  1,1
-};
-static int _floor_long_mapping_44_low[2]={
-  8,8
-};
-
-static int _floor_short_mapping_44[10]={
-  0,0,2,2,4,5,5,5,5,5
-};
-static int _floor_long_mapping_44[10]={
-  7,7,7,7,7,7,7,7,7,7
-};
-
-// definition
 ve_setup_data_template ve_setup_44_stereo={
-  10,
+  11,
   rate_mapping_44_stereo,
   quality_mapping_44,
   2,
@@ -149,65 +105,3 @@
   _mapres_template_44_stereo
 };
 
-ve_setup_data_template ve_setup_44_stereo_low={
-//  1,
-  2,
-  rate_mapping_44_stereo_low,
-  quality_mapping_44_stereo_low,
-  2,
-  40000,
-  50000,
-  
-  blocksize_short_44_low,
-  blocksize_long_44_low,
-
-  _psy_tone_masteratt_44_low,
-//  _psy_tone_0dB,
-  _psy_tone_0dB_low,
-//  _psy_tone_suppress,
-  _psy_tone_suppress_low,
-
-//  _vp_tonemask_adj_otherblock,
-//  _vp_tonemask_adj_longblock,
-//  _vp_tonemask_adj_otherblock,
-  _vp_tonemask_adj_otherblock_low,
-  _vp_tonemask_adj_longblock_low,
-  _vp_tonemask_adj_otherblock_low,
-
-  _psy_noiseguards_44,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_long_low,
-//  _psy_noise_suppress,
-  _psy_noise_suppress_low,
-  
-  _psy_compand_44,
-//  _psy_compand_short_mapping,
-  _psy_compand_short_mapping_low,
-//  _psy_compand_long_mapping,
-  _psy_compand_long_mapping_low,
-
-  {_noise_start_short_44_low,_noise_start_long_44_low},
-  {_noise_part_short_44,_noise_part_long_44},
-//  _noise_thresh_44,
-   _noise_thresh_44_low,
-
-  _psy_ath_floater,
-  _psy_ath_abs,
-  
-  _psy_lowpass_44_low,
-
-  _psy_global_44,
-  _global_mapping_44_low,
-  _psy_stereo_modes_44_low,
-
-  _floor_books,
-  _floor,
-  _floor_short_mapping_44_low,
-  _floor_long_mapping_44_low,
-
-//  _mapres_template_44_stereo
-  _mapres_template_44_stereo_low
-};
-


Property changes on: branches/vorbis-aotuv/lib/modes/setup_44.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/modes/setup_44u.h
===================================================================
--- branches/vorbis-aotuv/lib/modes/setup_44u.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/modes/setup_44u.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,24 +11,19 @@
  ********************************************************************
 
  function: toplevel settings for 44.1/48kHz uncoupled modes
- last mod: $Id: setup_44u.h,v 1.3 2002/07/11 06:41:05 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
 #include "modes/residue_44u.h"
 
-static double rate_mapping_44_un[11]={
-  48000.,60000.,70000.,80000.,86000.,
+static double rate_mapping_44_un[12]={
+  32000.,48000.,60000.,70000.,80000.,86000.,
   96000.,110000.,120000.,140000.,160000.,240001.
 };
 
-static double rate_mapping_44_un_low[3]={
-//  32000.,48000.
-  32000.,36000.,48000.
-};
-
 ve_setup_data_template ve_setup_44_uncoupled={
-  10,
+  11,
   rate_mapping_44_un,
   quality_mapping_44,
   -1,
@@ -59,7 +54,7 @@
 
   {_noise_start_short_44,_noise_start_long_44},
   {_noise_part_short_44,_noise_part_long_44},
-  _noise_thresh_44_2,
+  _noise_thresh_44,
 
   _psy_ath_floater,
   _psy_ath_abs,
@@ -77,65 +72,3 @@
 
   _mapres_template_44_uncoupled
 };
-
-ve_setup_data_template ve_setup_44_uncoupled_low={
-//  1,
-  2,
-  rate_mapping_44_un_low,
-  quality_mapping_44_stereo_low,
-  -1,
-  40000,
-  50000,
-  
-  blocksize_short_44_low,
-  blocksize_long_44_low,
-
-  _psy_tone_masteratt_44_low,
-//  _psy_tone_0dB,
-  _psy_tone_0dB_low,
-//  _psy_tone_suppress,
-  _psy_tone_suppress_low,
-
-//  _vp_tonemask_adj_otherblock,
-//  _vp_tonemask_adj_longblock,
-//  _vp_tonemask_adj_otherblock,
-  _vp_tonemask_adj_otherblock_low,
-  _vp_tonemask_adj_longblock_low,
-  _vp_tonemask_adj_otherblock_low,
-
-  _psy_noiseguards_44,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_long_low,
-//  _psy_noise_suppress,
-  _psy_noise_suppress_low,
-  
-  _psy_compand_44,
-//  _psy_compand_short_mapping,
-  _psy_compand_short_mapping_low,
-//  _psy_compand_long_mapping,
-  _psy_compand_long_mapping_low,
-
-  {_noise_start_short_44_low,_noise_start_long_44_low},
-  {_noise_part_short_44,_noise_part_long_44},
-//  _noise_thresh_44,
-   _noise_thresh_44_low,
-
-  _psy_ath_floater,
-  _psy_ath_abs,
-  
-  _psy_lowpass_44_low,
-
-  _psy_global_44,
-  _global_mapping_44_low,
-  NULL,
-
-  _floor_books,
-  _floor,
-  _floor_short_mapping_44_low,
-  _floor_long_mapping_44_low,
-
-//  _mapres_template_44_uncoupled
-  _mapres_template_44_uncoupled_low
-};


Property changes on: branches/vorbis-aotuv/lib/modes/setup_44u.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/modes/setup_8.h
===================================================================
--- branches/vorbis-aotuv/lib/modes/setup_8.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/modes/setup_8.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: 8kHz settings 
- last mod: $Id: setup_8.h,v 1.2 2002/07/11 06:41:05 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -23,7 +23,7 @@
 };
 
 static int _floor_mapping_8[2]={
-  1,1,
+  6,6,
 };
 
 static double rate_mapping_8[3]={
@@ -74,7 +74,7 @@
 
   {_noise_start_8,_noise_start_8},
   {_noise_part_8,_noise_part_8},
-  _noise_thresh_44_2,
+  _noise_thresh_5only,
 
   _psy_ath_floater_8,
   _psy_ath_abs_8,
@@ -125,7 +125,7 @@
 
   {_noise_start_8,_noise_start_8},
   {_noise_part_8,_noise_part_8},
-  _noise_thresh_44_2,
+  _noise_thresh_5only,
 
   _psy_ath_floater_8,
   _psy_ath_abs_8,


Property changes on: branches/vorbis-aotuv/lib/modes/setup_8.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/modes/setup_X.h
===================================================================
--- branches/vorbis-aotuv/lib/modes/setup_X.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/modes/setup_X.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,17 +11,17 @@
  ********************************************************************
 
  function: catch-all toplevel settings for q modes only
- last mod: $Id: setup_X.h,v 1.3 2002/07/11 06:41:05 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
-static double rate_mapping_X[11]={
-  -1.,-1.,-1.,-1.,-1.,
+static double rate_mapping_X[12]={
+  -1.,-1.,-1.,-1.,-1.,-1.,
   -1.,-1.,-1.,-1.,-1.,-1.
 };
 
 ve_setup_data_template ve_setup_X_stereo={
-  10,
+  11,
   rate_mapping_X,
   quality_mapping_44,
   2,
@@ -72,7 +72,7 @@
 };
 
 ve_setup_data_template ve_setup_X_uncoupled={
-  10,
+  11,
   rate_mapping_X,
   quality_mapping_44,
   -1,
@@ -103,7 +103,7 @@
 
   {_noise_start_short_44,_noise_start_long_44},
   {_noise_part_short_44,_noise_part_long_44},
-  _noise_thresh_44_2,
+  _noise_thresh_44,
 
   _psy_ath_floater,
   _psy_ath_abs,
@@ -122,132 +122,6 @@
   _mapres_template_44_uncoupled
 };
 
-ve_setup_data_template ve_setup_X_stereo_low={
-//  1,
-  2,
-  rate_mapping_X,
-  quality_mapping_44_stereo_low,
-  2,
-  50000,
-  200000,
-  
-  blocksize_short_44_low,
-  blocksize_long_44_low,
-
-  _psy_tone_masteratt_44_low,
-//  _psy_tone_0dB,
-  _psy_tone_0dB_low,
-//  _psy_tone_suppress,
-  _psy_tone_suppress_low,
-
-  _vp_tonemask_adj_otherblock,
-  _vp_tonemask_adj_longblock,
-  _vp_tonemask_adj_otherblock,
-//  _vp_tonemask_adj_otherblock_low,
-//  _vp_tonemask_adj_longblock_low,
-//  _vp_tonemask_adj_otherblock_low,
-
-  _psy_noiseguards_44,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_long_low,
-//  _psy_noise_suppress,
-  _psy_noise_suppress_low,
-  
-  _psy_compand_44,
-//  _psy_compand_short_mapping,
-  _psy_compand_short_mapping_low,
-//  _psy_compand_long_mapping,
-  _psy_compand_long_mapping_low,
-
-  {_noise_start_short_44_low,_noise_start_long_44_low},
-  {_noise_part_short_44,_noise_part_long_44},
-//  _noise_thresh_44,
-   _noise_thresh_44_low,
-
-  _psy_ath_floater,
-  _psy_ath_abs,
-  
-  _psy_lowpass_44_low,
-
-  _psy_global_44,
-  _global_mapping_44,
-// (not _global_mapping_44_low)
-  _psy_stereo_modes_44_low,
-
-  _floor_books,
-  _floor,
-  _floor_short_mapping_44_low,
-  _floor_long_mapping_44_low,
-
-//  _mapres_template_44_stereo
-  _mapres_template_44_stereo_low
-};
-
-
-ve_setup_data_template ve_setup_X_uncoupled_low={
-//  1,
-  2,
-  rate_mapping_X,
-  quality_mapping_44_stereo_low,
-  -1,
-  50000,
-  200000,
-  
-  blocksize_short_44_low,
-  blocksize_long_44_low,
-
-  _psy_tone_masteratt_44_low,
-//  _psy_tone_0dB,
-  _psy_tone_0dB_low,
-//  _psy_tone_suppress,
-  _psy_tone_suppress_low,
-
-//  _vp_tonemask_adj_otherblock,
-//  _vp_tonemask_adj_longblock,
-//  _vp_tonemask_adj_otherblock,
-  _vp_tonemask_adj_otherblock_low,
-  _vp_tonemask_adj_longblock_low,
-  _vp_tonemask_adj_otherblock_low,
-
-  _psy_noiseguards_44,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_long_low,
-//  _psy_noise_suppress,
-  _psy_noise_suppress_low,
-  
-  _psy_compand_44,
-//  _psy_compand_short_mapping,
-  _psy_compand_short_mapping_low,
-//  _psy_compand_long_mapping,
-  _psy_compand_long_mapping_low,
-
-  {_noise_start_short_44_low,_noise_start_long_44_low},
-  {_noise_part_short_44,_noise_part_long_44},
-  _noise_thresh_44_2,
-
-  _psy_ath_floater,
-  _psy_ath_abs,
-  
-  _psy_lowpass_44_low,
-
-  _psy_global_44,
-  _global_mapping_44,
-// (not _global_mapping_44_low)
-  NULL,
-
-  _floor_books,
-  _floor,
-  _floor_short_mapping_44_low,
-  _floor_long_mapping_44_low,
-
-//  _mapres_template_44_uncoupled
-  _mapres_template_44_uncoupled_low
-};
-
 ve_setup_data_template ve_setup_XX_stereo={
   2,
   rate_mapping_X,
@@ -280,7 +154,7 @@
 
   {_noise_start_8,_noise_start_8},
   {_noise_part_8,_noise_part_8},
-  _noise_thresh_44_2,
+  _noise_thresh_5only,
 
   _psy_ath_floater_8,
   _psy_ath_abs_8,
@@ -331,7 +205,7 @@
 
   {_noise_start_8,_noise_start_8},
   {_noise_part_8,_noise_part_8},
-  _noise_thresh_44_2,
+  _noise_thresh_5only,
 
   _psy_ath_floater_8,
   _psy_ath_abs_8,


Property changes on: branches/vorbis-aotuv/lib/modes/setup_X.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/os.h
===================================================================
--- branches/vorbis-aotuv/lib/os.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/os.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -13,10 +13,14 @@
  ********************************************************************
 
  function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os.h,v 1.33 2003/09/02 05:11:53 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <math.h>
 #include <ogg/os_types.h>
 
@@ -41,13 +45,18 @@
 #  define M_PI (3.1415926536f)
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__SYMBIAN32__)
 #  include <malloc.h>
 #  define rint(x)   (floor((x)+0.5f)) 
 #  define NO_FLOAT_MATH_LIB
 #  define FAST_HYPOT(a, b) sqrt((a)*(a) + (b)*(b))
 #endif
 
+#if defined(__SYMBIAN32__) && defined(__WINS__)
+void *_alloca(size_t size);
+#  define alloca _alloca
+#endif
+
 #ifndef FAST_HYPOT
 #  define FAST_HYPOT hypot
 #endif


Property changes on: branches/vorbis-aotuv/lib/os.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/psy.c
===================================================================
--- branches/vorbis-aotuv/lib/psy.c	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/psy.c	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.81 2002/10/21 07:00:11 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -284,12 +284,12 @@
   p->n=n;
   p->rate=rate;
 
-  /* This is used by @ M1&M2 */
+  /* 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 */
-
+  
   /* set up the lookups for a given blocksize and sample rate */
 
   for(i=0,j=0;i<MAX_ATH-1;i++){
@@ -855,45 +855,54 @@
 			float *logmask,
 			float *mdct,
 			float *logmdct){
-
   int i,n=p->n;
-  float de, coeffi, cx=1.0, cy=1.0;
+  float de, coeffi, cx;/* AoTuV */
   float toneatt=p->vi->tone_masteratt[offset_select];
-  
+
   cx = p->m_val;
-  if(offset_select != 1) cx = 0;
   
   for(i=0;i<n;i++){
     float val= noise[i]+p->noiseoffset[offset_select][i];
     if(val>p->vi->noisemaxsupp)val=p->vi->noisemaxsupp;
     logmask[i]=max(val,tone[i]+toneatt);
-    
-	/** @ M1 **
-	   The following codes improve a noise problem.  
-	   A fundamental idea uses the value of masking and carries out
-	    the relative compensation of the MDCT. 
-	   However, this code is not perfect and all noise problems cannot be solved. 
-	   by Aoyumi @ 2004/04/18
-	*/
-    if(logmask[i] != (tone[i]+toneatt)){
-    	// partial masking value is used here.
-    	coeffi = -17.2*cy;
-    	val = val - logmdct[i];
-		if(val > coeffi){
-			de = 1.0-((val-coeffi)*0.005*cx);
-			if(de < 0) de = 0.0001;
-		}else de = 1.0-((val-coeffi)*0.0003*cx);
-		mdct[i] *= de;
-	}else{
-		// A masking value is used here.
-		coeffi = -57*cy;
-		val = logmask[i];
-		if(val > coeffi){
-			de = 1.0-((val-coeffi)*0.005*cx);
-			if(de < 0) de = 0.0001;
-		}else de = 1.0-((val-coeffi)*0.0003*cx);
-		mdct[i] *= de;
-	}
+
+
+    /* AoTuV */
+    /** @ M1 **
+	The following codes improve a noise problem.  
+	A fundamental idea uses the value of masking and carries out
+	the relative compensation of the MDCT. 
+	However, this code is not perfect and all noise problems cannot be solved. 
+	by Aoyumi @ 2004/04/18
+    */
+
+    if(offset_select == 1) {
+      coeffi = -17.2;       /* coeffi is a -17.2dB threshold */
+      val = val - logmdct[i];  /* val == mdct line value relative to floor in dB */
+      
+      if(val > coeffi){
+	/* mdct value is > -17.2 dB below floor */
+	
+	de = 1.0-((val-coeffi)*0.005*cx);
+	/* 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;
+      }else
+	/* mdct value is <= -17.2 dB below floor */
+	
+	de = 1.0-((val-coeffi)*0.0003*cx);
+      /* 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;
+      
+    }
   }
 }
 
@@ -1001,6 +1010,7 @@
     for(;j<n;j++)
       ret[i][j]=round_hypot(mdctM[j],mdctA[j]);
   }
+
   return(ret);
 }
 
@@ -1147,10 +1157,10 @@
       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]];
-
+       /* 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;j<p->n;j+=partition){
 	float acc=0.f;
 
@@ -1161,6 +1171,7 @@
 	    if((l>=limit && fabs(rM[l])<postpoint && fabs(rA[l])<postpoint) ||
 	       (fabs(rM[l])<prepoint && fabs(rA[l])<prepoint)){
 
+
 	      precomputed_couple_point(mag_memo[i][l],
 				       floorM[l],floorA[l],
 				       qM+l,qA+l);
@@ -1189,22 +1200,25 @@
   }
 }
 
+/* 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
 */
+
 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; i<vi->coupling_steps; i++){
-		for(j=start; j<limit; j++){}
-		for(; j<n; j++) mdct[i][j] *= (1.0 - de*((float)(j-limit) / (float)(n-limit)));
-	}
+                      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; i<vi->coupling_steps; i++){
+    /* for(j=start; j<limit; j++){} // ???*/
+    for(j=limit; j<n; j++) 
+      mdct[i][j] *= (1.0 - de*((float)(j-limit) / (float)(n-limit)));
+  }
 }


Property changes on: branches/vorbis-aotuv/lib/psy.c
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/psy.h
===================================================================
--- branches/vorbis-aotuv/lib/psy.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/psy.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: random psychoacoustics (not including preecho)
- last mod: $Id: psy.h,v 1.32 2002/07/13 06:12:47 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -111,6 +111,7 @@
   long  rate; /* cache it */
 
   float m_val; /* Masking compensation value */
+
 } vorbis_look_psy;
 
 extern void   _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,
@@ -176,9 +177,10 @@
 				      float **mags);
 
 extern void hf_reduction(vorbis_info_psy_global *g,
-				vorbis_look_psy *p,
-				vorbis_info_mapping0 *vi,
-				float **mdct);
+			 vorbis_look_psy *p,
+			 vorbis_info_mapping0 *vi,
+			 float **mdct);
 
+
 #endif
 


Property changes on: branches/vorbis-aotuv/lib/psy.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/psytune.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/registry.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/registry.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/res0.c
===================================================================
--- branches/vorbis-aotuv/lib/res0.c	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/res0.c	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: residue backend 0, 1 and 2 implementation
- last mod: $Id: res0.c,v 1.49 2003/01/18 08:28:37 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -31,7 +31,7 @@
 #include "misc.h"
 #include "os.h"
 
-#ifdef TRAIN_RES
+#if defined(TRAIN_RES) || defined (TRAIN_RESAUX)
 #include <stdio.h>
 #endif 
 
@@ -51,7 +51,7 @@
   long      phrasebits;
   long      frames;
 
-#ifdef TRAIN_RES
+#if defined(TRAIN_RES) || defined(TRAIN_RESAUX)
   int        train_seq;
   long      *training_data[8][64];
   float      training_max[8][64];
@@ -100,6 +100,7 @@
 	      look->training_min[k][j],look->training_max[k][j]);*/
 
 	    _ogg_free(look->training_data[k][j]);
+	    look->training_data[k][j]=NULL;
 	  }
 	/*fprintf(stderr,"\n");*/
       }
@@ -255,7 +256,7 @@
 	if(info->secondstages[j]&(1<<k)){
 	  look->partbooks[j][k]=ci->fullbooks+info->booklist[acc++];
 #ifdef TRAIN_RES
-	  look->training_data[k][j]=calloc(look->partbooks[j][k]->entries,
+	  look->training_data[k][j]=_ogg_calloc(look->partbooks[j][k]->entries,
 					   sizeof(***look->training_data));
 #endif
 	}
@@ -276,7 +277,7 @@
       look->decodemap[j][k]=deco;
     }
   }
-#ifdef TRAIN_RES
+#if defined(TRAIN_RES) || defined (TRAIN_RESAUX)
   {
     static int train_seq=0;
     look->train_seq=train_seq++;
@@ -308,7 +309,7 @@
 	if(val<tt->quantthresh[i])break;
       
     }
-    
+
     best=(best*tt->quantvals)+tt->quantmap[i];
   }
   /* regular lattices are easy :-) */
@@ -446,7 +447,7 @@
   int partvals=n/samples_per_partition;
   long **partword=_vorbis_block_alloc(vb,sizeof(*partword));
 
-#ifdef TRAIN_RES
+#if defined(TRAIN_RES) || defined (TRAIN_RESAUX)
   FILE *of;
   char buffer[80];
 #endif
@@ -487,7 +488,8 @@
   return(partword);
 }
 
-static int _01forward(vorbis_block *vb,vorbis_look_residue *vl,
+static int _01forward(oggpack_buffer *opb,
+		      vorbis_block *vb,vorbis_look_residue *vl,
 		      float **in,int ch,
 		      long **partword,
 		      int (*encode)(oggpack_buffer *,float *,int,
@@ -540,7 +542,7 @@
 
 	  /* training hack */
 	  if(val<look->phrasebook->entries)
-	    look->phrasebits+=vorbis_book_encode(look->phrasebook,val,&vb->opb);
+	    look->phrasebits+=vorbis_book_encode(look->phrasebook,val,opb);
 #if 0 /*def TRAIN_RES*/
 	  else
 	    fprintf(stderr,"!");
@@ -575,7 +577,7 @@
 	      }
 #endif
 	      
-	      ret=encode(&vb->opb,in[j]+offset,samples_per_partition,
+	      ret=encode(opb,in[j]+offset,samples_per_partition,
 			 statebook,accumulator);
 
 	      look->postbits+=ret;
@@ -719,7 +721,7 @@
     return(0);
 }
 
-int res1_forward(vorbis_block *vb,vorbis_look_residue *vl,
+int res1_forward(oggpack_buffer *opb,vorbis_block *vb,vorbis_look_residue *vl,
 		 float **in,float **out,int *nonzero,int ch,
 		 long **partword){
   int i,j,used=0,n=vb->pcmend/2;
@@ -732,7 +734,7 @@
     }
 
   if(used){
-    int ret=_01forward(vb,vl,in,used,partword,_encodepart);
+    int ret=_01forward(opb,vb,vl,in,used,partword,_encodepart);
     if(out){
       used=0;
       for(i=0;i<ch;i++)
@@ -786,7 +788,8 @@
 /* res2 is slightly more different; all the channels are interleaved
    into a single vector and encoded. */
 
-int res2_forward(vorbis_block *vb,vorbis_look_residue *vl,
+int res2_forward(oggpack_buffer *opb,
+		 vorbis_block *vb,vorbis_look_residue *vl,
 		 float **in,float **out,int *nonzero,int ch,
 		 long **partword){
   long i,j,k,n=vb->pcmend/2,used=0;
@@ -803,7 +806,7 @@
   }
   
   if(used){
-    int ret=_01forward(vb,vl,&work,1,partword,_encodepart);
+    int ret=_01forward(opb,vb,vl,&work,1,partword,_encodepart);
     /* update the sofar vector */
     if(out){
       for(i=0;i<ch;i++){


Property changes on: branches/vorbis-aotuv/lib/res0.c
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/scales.h
===================================================================
--- branches/vorbis-aotuv/lib/scales.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/scales.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: linear scale -> dB, Bark and Mel scales
- last mod: $Id: scales.h,v 1.26 2002/07/11 06:40:50 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -37,13 +37,9 @@
   return(*x);
 }
 
+/* Segher was off (too high) by ~ .3 decibel.  Center the conversion correctly. */
 static float todB(const float *x){
-  float calc;
-  ogg_int32_t *i=(ogg_int32_t *)x;
-  calc = ((*i) & 0x7fffffff);
-  calc *= 7.1771144e-7f;
-  calc += -764.27118f;
-  return calc;
+  return (float)((*(ogg_int32_t *)x)&0x7fffffff) * 7.17711438e-7f -764.6161886f;
 }
 
 #define todB_nn(x) todB(x)


Property changes on: branches/vorbis-aotuv/lib/scales.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/sharedbook.c
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/smallft.c
===================================================================
--- branches/vorbis-aotuv/lib/smallft.c	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/smallft.c	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: *unnormalized* fft transform
- last mod: $Id: smallft.c,v 1.17 2002/07/11 06:40:50 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -32,6 +32,7 @@
 #include <string.h>
 #include <math.h>
 #include "smallft.h"
+#include "os.h"
 #include "misc.h"
 
 static void drfti1(int n, float *wa, int *ifac){


Property changes on: branches/vorbis-aotuv/lib/smallft.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/smallft.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/synthesis.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/tone.c
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/vorbisenc.c
===================================================================
--- branches/vorbis-aotuv/lib/vorbisenc.c	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/vorbisenc.c	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: simple programmatic interface for encoder mode setup
- last mod: $Id: vorbisenc.c,v 1.47 2002/07/11 06:40:50 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -162,14 +162,10 @@
 
 static ve_setup_data_template *setup_list[]={
   &ve_setup_44_stereo,
-  &ve_setup_44_stereo_low,
   &ve_setup_44_uncoupled,
-  &ve_setup_44_uncoupled_low,
 
   &ve_setup_32_stereo,
-  &ve_setup_32_stereo_low,
   &ve_setup_32_uncoupled,
-  &ve_setup_32_uncoupled_low,
 
   &ve_setup_22_stereo,
   &ve_setup_22_uncoupled,
@@ -183,8 +179,6 @@
 
   &ve_setup_X_stereo,
   &ve_setup_X_uncoupled,
-  &ve_setup_X_stereo_low,
-  &ve_setup_X_uncoupled_low,
   &ve_setup_XX_stereo,
   &ve_setup_XX_uncoupled,
   0
@@ -659,6 +653,7 @@
 	  float del=(req-low)/(high-low);
 	  hi->base_setting=j+del;
 	}
+
 	return;
       }
     }
@@ -829,21 +824,30 @@
   vorbis_encode_map_n_res_setup(vi,hi->base_setting,setup->maps);
 
   /* set bitrate readonlies and management */
-  vi->bitrate_nominal=setting_to_approx_bitrate(vi);
+  if(hi->bitrate_av>0)
+    vi->bitrate_nominal=hi->bitrate_av;
+  else{
+    vi->bitrate_nominal=setting_to_approx_bitrate(vi);
+  }
+
   vi->bitrate_lower=hi->bitrate_min;
   vi->bitrate_upper=hi->bitrate_max;
-  vi->bitrate_window=hi->bitrate_limit_window;
+  if(hi->bitrate_av)
+    vi->bitrate_window=(double)hi->bitrate_reservoir/hi->bitrate_av;
+  else
+    vi->bitrate_window=0.;
 
   if(hi->managed){
-    ci->bi.queue_avg_time=hi->bitrate_av_window;
-    ci->bi.queue_avg_center=hi->bitrate_av_window_center;
-    ci->bi.queue_minmax_time=hi->bitrate_limit_window;
-    ci->bi.queue_hardmin=hi->bitrate_min;
-    ci->bi.queue_hardmax=hi->bitrate_max;
-    ci->bi.queue_avgmin=hi->bitrate_av_lo;
-    ci->bi.queue_avgmax=hi->bitrate_av_hi;
-    ci->bi.avgfloat_downslew_max=-999999.f;
-    ci->bi.avgfloat_upslew_max=999999.f;
+    ci->bi.avg_rate=hi->bitrate_av;
+    ci->bi.min_rate=hi->bitrate_min;
+    ci->bi.max_rate=hi->bitrate_max;
+
+    ci->bi.reservoir_bits=hi->bitrate_reservoir;
+    ci->bi.reservoir_bias=
+      hi->bitrate_reservoir_bias;
+    
+    ci->bi.slew_damp=hi->bitrate_av_damp;
+
   }
 
   return(0);
@@ -902,7 +906,7 @@
   codec_setup_info *ci=vi->codec_setup;
   highlevel_encode_setup *hi=&ci->hi;
 
-  quality+=.00001;
+  quality+=.0000001;
   if(quality>=1.)quality=.9999;
 
   get_setup_template(vi,channels,rate,quality,0);
@@ -946,7 +950,10 @@
 
   if(nominal_bitrate<=0.){
     if(max_bitrate>0.){
-      nominal_bitrate=max_bitrate*.875;
+      if(min_bitrate>0.)
+	nominal_bitrate=(max_bitrate+min_bitrate)*.5;
+      else
+	nominal_bitrate=max_bitrate*.875;
     }else{
       if(min_bitrate>0.){
 	nominal_bitrate=min_bitrate;
@@ -966,15 +973,13 @@
   }
 
   /* initialize management with sane defaults */
-      /* initialize management with sane defaults */
   hi->managed=1;
-  hi->bitrate_av_window=4.;
-  hi->bitrate_av_window_center=.5;
-  hi->bitrate_limit_window=2.;
   hi->bitrate_min=min_bitrate;
   hi->bitrate_max=max_bitrate;
-  hi->bitrate_av_lo=tnominal;
-  hi->bitrate_av_hi=tnominal;
+  hi->bitrate_av=tnominal;
+  hi->bitrate_av_damp=1.5f; /* full range in no less than 1.5 second */
+  hi->bitrate_reservoir=nominal_bitrate*2;
+  hi->bitrate_reservoir_bias=.1; /* bias toward hoarding bits */
 
   return(ret);
 
@@ -1010,8 +1015,10 @@
     int setp=(number&0xf); /* a read request has a low nibble of 0 */
 
     if(setp && hi->set_in_stone)return(OV_EINVAL);
-
+    
     switch(number){
+      
+    /* now deprecated *****************/
     case OV_ECTL_RATEMANAGE_GET:
       {
 	
@@ -1019,17 +1026,18 @@
 	  (struct ovectl_ratemanage_arg *)arg;
 	
 	ai->management_active=hi->managed;
-	ai->bitrate_av_window=hi->bitrate_av_window;
-	ai->bitrate_av_window_center=hi->bitrate_av_window_center;
-	ai->bitrate_hard_window=hi->bitrate_limit_window;
+	ai->bitrate_hard_window=ai->bitrate_av_window=
+	  (double)hi->bitrate_reservoir/vi->rate;
+	ai->bitrate_av_window_center=1.;
 	ai->bitrate_hard_min=hi->bitrate_min;
 	ai->bitrate_hard_max=hi->bitrate_max;
-	ai->bitrate_av_lo=hi->bitrate_av_lo;
-	ai->bitrate_av_hi=hi->bitrate_av_hi;
+	ai->bitrate_av_lo=hi->bitrate_av;
+	ai->bitrate_av_hi=hi->bitrate_av;
 	
       }
       return(0);
     
+    /* now deprecated *****************/
     case OV_ECTL_RATEMANAGE_SET:
       {
 	struct ovectl_ratemanage_arg *ai=
@@ -1044,33 +1052,19 @@
       }
       return 0;
 
+    /* now deprecated *****************/
     case OV_ECTL_RATEMANAGE_AVG:
       {
 	struct ovectl_ratemanage_arg *ai=
 	  (struct ovectl_ratemanage_arg *)arg;
 	if(ai==NULL){
-	  hi->bitrate_av_lo=0;
-	  hi->bitrate_av_hi=0;
-	  hi->bitrate_av_window=0;
+	  hi->bitrate_av=0;
 	}else{
-	  hi->bitrate_av_window=ai->bitrate_av_window;
-	  hi->bitrate_av_window_center=ai->bitrate_av_window_center;
-	  hi->bitrate_av_lo=ai->bitrate_av_lo;
-	  hi->bitrate_av_hi=ai->bitrate_av_hi;
+	  hi->bitrate_av=(ai->bitrate_av_lo+ai->bitrate_av_hi)*.5;
 	}
-
-	if(hi->bitrate_av_window<.25)hi->bitrate_av_window=.25;
-	if(hi->bitrate_av_window>10.)hi->bitrate_av_window=10.;
-	if(hi->bitrate_av_window_center<0.)hi->bitrate_av_window=0.;
-	if(hi->bitrate_av_window_center>1.)hi->bitrate_av_window=1.;
-	
-	if( ( (hi->bitrate_av_lo<=0 && hi->bitrate_av_hi<=0)||
-	      (hi->bitrate_av_window<=0) ) &&
-	    ( (hi->bitrate_min<=0 && hi->bitrate_max<=0)||
-	      (hi->bitrate_limit_window<=0) ))
-	  hi->managed=0;
       }
       return(0);
+    /* now deprecated *****************/
     case OV_ECTL_RATEMANAGE_HARD:
       {
 	struct ovectl_ratemanage_arg *ai=
@@ -1078,23 +1072,79 @@
 	if(ai==NULL){
 	  hi->bitrate_min=0;
 	  hi->bitrate_max=0;
-	  hi->bitrate_limit_window=0;
 	}else{
-	  hi->bitrate_limit_window=ai->bitrate_hard_window;
 	  hi->bitrate_min=ai->bitrate_hard_min;
 	  hi->bitrate_max=ai->bitrate_hard_max;
+	  hi->bitrate_reservoir=ai->bitrate_hard_window*
+	    (hi->bitrate_max+hi->bitrate_min)*.5;
 	}
-	if(hi->bitrate_limit_window<0.)hi->bitrate_limit_window=0.;
-	if(hi->bitrate_limit_window>10.)hi->bitrate_limit_window=10.;
+	if(hi->bitrate_reservoir<128.)
+	  hi->bitrate_reservoir=128.;
+      }   
+      return(0);
+
+      /* replacement ratemanage interface */
+    case OV_ECTL_RATEMANAGE2_GET:
+      {
+	struct ovectl_ratemanage2_arg *ai=
+	  (struct ovectl_ratemanage2_arg *)arg;
+	if(ai==NULL)return OV_EINVAL;
 	
-	if( ( (hi->bitrate_av_lo<=0 && hi->bitrate_av_hi<=0)||
-	      (hi->bitrate_av_window<=0) ) &&
-	    ( (hi->bitrate_min<=0 && hi->bitrate_max<=0)||
-	      (hi->bitrate_limit_window<=0) ))
+	ai->management_active=hi->managed;
+	ai->bitrate_limit_min_kbps=hi->bitrate_min;
+	ai->bitrate_limit_max_kbps=hi->bitrate_max;
+	ai->bitrate_average_kbps=hi->bitrate_av;
+	ai->bitrate_average_damping=hi->bitrate_av_damp;
+	ai->bitrate_limit_reservoir_bits=hi->bitrate_reservoir;
+	ai->bitrate_limit_reservoir_bias=hi->bitrate_reservoir_bias;
+      }
+      return (0);
+    case OV_ECTL_RATEMANAGE2_SET:
+      {
+	struct ovectl_ratemanage2_arg *ai=
+	  (struct ovectl_ratemanage2_arg *)arg;
+	if(ai==NULL){
 	  hi->managed=0;
+	}else{
+	  /* sanity check; only catch invariant violations */
+	  if(ai->bitrate_limit_min_kbps>0 &&
+	     ai->bitrate_average_kbps>0 &&
+	     ai->bitrate_limit_min_kbps>ai->bitrate_average_kbps)
+	    return OV_EINVAL;
+
+	  if(ai->bitrate_limit_max_kbps>0 &&
+	     ai->bitrate_average_kbps>0 &&
+	     ai->bitrate_limit_max_kbps<ai->bitrate_average_kbps)
+	    return OV_EINVAL;
+
+	  if(ai->bitrate_limit_min_kbps>0 &&
+	     ai->bitrate_limit_max_kbps>0 &&
+	     ai->bitrate_limit_min_kbps>ai->bitrate_limit_max_kbps)
+	    return OV_EINVAL;
+
+	  if(ai->bitrate_average_damping <= 0.)
+	    return OV_EINVAL;
+
+	  if(ai->bitrate_limit_reservoir_bits < 0)
+	    return OV_EINVAL;
+
+	  if(ai->bitrate_limit_reservoir_bias < 0.)
+	    return OV_EINVAL;
+
+	  if(ai->bitrate_limit_reservoir_bias > 1.)
+	    return OV_EINVAL;
+
+	  hi->managed=ai->management_active;
+	  hi->bitrate_min=ai->bitrate_limit_min_kbps;
+	  hi->bitrate_max=ai->bitrate_limit_max_kbps;
+	  hi->bitrate_av=ai->bitrate_average_kbps;
+	  hi->bitrate_av_damp=ai->bitrate_average_damping;
+	  hi->bitrate_reservoir=ai->bitrate_limit_reservoir_bits;
+	  hi->bitrate_reservoir_bias=ai->bitrate_limit_reservoir_bias;
+	}
       }
-      return(0);
-
+      return 0;
+      
     case OV_ECTL_LOWPASS_GET:
       {
 	double *farg=(double *)arg;


Property changes on: branches/vorbis-aotuv/lib/vorbisenc.c
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/lib/vorbisfile.c
===================================================================
--- branches/vorbis-aotuv/lib/vorbisfile.c	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/lib/vorbisfile.c	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: stdio-based convenience library for opening/seeking/decoding
- last mod: $Id: vorbisfile.c,v 1.75 2003/09/16 20:28:14 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -542,7 +542,7 @@
     }
 
     if(vf->ready_state>=OPENED){
-      int ret;
+      ogg_int64_t ret;
       if(!readp)return(0);
       if((ret=_get_next_page(vf,&og,-1))<0){
 	return(OV_EOF); /* eof. 


Property changes on: branches/vorbis-aotuv/lib/vorbisfile.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/window.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/lib/window.h
___________________________________________________________________
Name: svn:keywords
   + Id

Deleted: branches/vorbis-aotuv/libvorbis.spec
===================================================================
--- branches/vorbis-aotuv/libvorbis.spec	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/libvorbis.spec	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,114 +0,0 @@
-Name:		libvorbis
-Version:	1.0.1
-Release:	1
-Summary:	The Vorbis General Audio Compression Codec
-
-Group:		System Environment/Libraries
-License:	BSD
-URL:		http://www.xiph.org/
-Vendor:		Xiph.org Foundation <team at xiph.org>
-Source:		http://www.xiph.org/pub/ogg/vorbis/download/%{name}-%{version}.tar.gz
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-root
-
-# We're forced to use an epoch since both Red Hat and Ximian use it in their
-# rc packages
-Epoch:          2
-# Dirty trick to tell rpm that this package actually provides what the
-# last rc and beta was offering
-Provides:       %{name} = %{epoch}:1.0rc3-%{release}
-Provides:       %{name} = %{epoch}:1.0beta4-%{release}
-
-Requires:	libogg >= 1.1
-BuildRequires:	libogg-devel >= 1.1
-
-%description
-Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
-general-purpose compressed audio format for audio and music at fixed 
-and variable bitrates from 16 to 128 kbps/channel.
-
-%package devel
-Summary: 	Vorbis Library Development
-Group: 		Development/Libraries
-Requires:	libogg-devel >= 1.1
-Requires:	libvorbis = %{version}
-# Dirty trick to tell rpm that this package actually provides what the
-# last rc and beta was offering
-Provides:       %{name}-devel = %{epoch}:1.0rc3-%{release}
-Provides:       %{name}-devel = %{epoch}:1.0beta4-%{release}
-
-%description devel
-The libvorbis-devel package contains the header files, static libraries 
-and documentation needed to develop applications with libvorbis.
-
-%prep
-%setup -q -n %{name}-%{version}
-
-%build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --enable-static
-make
-
-%install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-make DESTDIR=$RPM_BUILD_ROOT install
-
-%clean 
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%files
-%defattr(-,root,root)
-%doc COPYING
-%doc AUTHORS
-%doc README
-%{_libdir}/libvorbis.so.*
-%{_libdir}/libvorbisfile.so.*
-%{_libdir}/libvorbisenc.so.*
-
-%files devel
-%doc doc/*.html
-%doc doc/*.png
-%doc doc/*.txt
-%doc doc/vorbisfile
-%doc doc/vorbisenc
-%{_datadir}/aclocal/vorbis.m4
-%{_includedir}/vorbis/codec.h
-%{_includedir}/vorbis/vorbisfile.h
-%{_includedir}/vorbis/vorbisenc.h
-%{_libdir}/libvorbis.a
-%{_libdir}/libvorbis.la
-%{_libdir}/libvorbis.so
-%{_libdir}/libvorbisfile.a
-%{_libdir}/libvorbisfile.la
-%{_libdir}/libvorbisfile.so
-%{_libdir}/libvorbisenc.a
-%{_libdir}/libvorbisenc.la
-%{_libdir}/libvorbisenc.so
-%{_libdir}/pkgconfig/vorbis.pc
-%{_libdir}/pkgconfig/vorbisfile.pc
-%{_libdir}/pkgconfig/vorbisenc.pc
-
-%changelog
-* Tue Oct 07 2003 Warren Dukes <shank at xiph.org>
-- update for 1.0.1 release
-
-* Sun Jul 14 2002 Thomas Vander Stichele <thomas at apestaart.org>
-- Added BuildRequires:
-- updated for 1.0 release
-
-* Sat May 25 2002 Michael Smith <msmith at icecast.org>
-- Fixed requires, copyright string.
-* Sun Dec 31 2001 Jack Moffitt <jack at xiph.org>
-- Updated for rc3 release.
-
-* Sun Oct 07 2001 Jack Moffitt <jack at xiph.org>
-- Updated for configurable prefixes
-
-* Sat Oct 21 2000 Jack Moffitt <jack at icecast.org>
-- initial spec file created

Copied: branches/vorbis-aotuv/libvorbis.spec.in (from rev 12024, tags/vorbis/libvorbis-1.1.0/libvorbis.spec.in)


Property changes on: branches/vorbis-aotuv/macos/compat/strdup.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/macos/compat/sys/types.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/macos/decoder_example.mcp
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/macos/encoder_example.mcp
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/macos/libvorbis.mcp
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/macos/libvorbis.mcp.exp
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/macos/libvorbisenc.mcp
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/macos/libvorbisenc.mcp.exp
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/macos/libvorbisfile.mcp
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/macos/libvorbisfile.mcp.exp
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/macos/vorbis.mcp
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/macosx/English.lproj/InfoPlist.strings
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/macosx/vorbis.pbproj/project.pbxproj
___________________________________________________________________
Name: svn:keywords
   + Id

Copied: branches/vorbis-aotuv/symbian (from rev 12024, tags/vorbis/libvorbis-1.1.0/symbian)

Deleted: branches/vorbis-aotuv/symbian/bld.inf
===================================================================
--- tags/vorbis/libvorbis-1.1.0/symbian/bld.inf	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/symbian/bld.inf	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,35 +0,0 @@
-/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
-   Organisation (CSIRO) Australia
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   - Neither the name of CSIRO Australia nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-PRJ_MMPFILES
-
-vorbis.mmp

Copied: branches/vorbis-aotuv/symbian/bld.inf (from rev 12024, tags/vorbis/libvorbis-1.1.0/symbian/bld.inf)

Deleted: branches/vorbis-aotuv/symbian/config.h
===================================================================
--- tags/vorbis/libvorbis-1.1.0/symbian/config.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/symbian/config.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,54 +0,0 @@
-/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
-   Organisation (CSIRO) Australia
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   - Neither the name of CSIRO Australia nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#ifdef __WINS__
-
-/* Disable some warnings */
-
-#pragma warning(disable: 4100) /* unreferenced formal parameter */
-#pragma warning(disable: 4127) /* conditional expression is constant */
-#pragma warning(disable: 4189) /* local variable is initialized but not referenced */
-#pragma warning(disable: 4244) /* conversion from '...' to '...', possible loss of data */
-#pragma warning(disable: 4305) /* truncation from '...' to '...' */
-#pragma warning(disable: 4505) /* unreferenced local function has been removed */
-#pragma warning(disable: 4514) /* unreferenced inline function has been removed */
-#pragma warning(disable: 4702) /* unreachable code */
-#pragma warning(disable: 4701) /* local variable may be be used without having been initialized */
-#pragma warning(disable: 4706) /* assignment within conditional expression */
-#pragma warning(disable: 4761) /* integral size mismatch in argument: conversion supplied */
-
-#endif
-
-#endif /* ! CONFIG_H */

Copied: branches/vorbis-aotuv/symbian/config.h (from rev 12024, tags/vorbis/libvorbis-1.1.0/symbian/config.h)

Deleted: branches/vorbis-aotuv/symbian/vorbis.mmp
===================================================================
--- tags/vorbis/libvorbis-1.1.0/symbian/vorbis.mmp	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/symbian/vorbis.mmp	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,43 +0,0 @@
-/*
-   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
-   Organisation (CSIRO) Australia
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   - Neither the name of CSIRO Australia nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-TARGET        vorbis.lib
-TARGETTYPE    lib
-UID           0
-MACRO         HAVE_CONFIG_H
-SOURCEPATH    ..\lib
-SOURCE        analysis.c barkmel.c bitrate.c block.c codebook.c envelope.c floor0.c floor1.c info.c
-SOURCE        lookup.c lpc.c lsp.c mapping0.c mdct.c psy.c registry.c res0.c sharedbook.c
-SOURCE        smallft.c synthesis.c vorbisfile.c window.c
-
-USERINCLUDE   . ..\include
-SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\include ..\..\ogg\include ..\..\ogg\symbian

Copied: branches/vorbis-aotuv/symbian/vorbis.mmp (from rev 12024, tags/vorbis/libvorbis-1.1.0/symbian/vorbis.mmp)

Modified: branches/vorbis-aotuv/todo.txt
===================================================================
--- branches/vorbis-aotuv/todo.txt	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/todo.txt	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,4 +1,4 @@
-Development hit list for 1.0:
+Open project list for further development:
 
 libvorbis:
 
@@ -19,4 +19,4 @@
 other:
 
 command line suite
-'crashme'
\ No newline at end of file
+'crashme'


Property changes on: branches/vorbis-aotuv/todo.txt
___________________________________________________________________
Name: svn:keywords
   + Id

Copied: branches/vorbis-aotuv/vorbis-uninstalled.pc.in (from rev 12024, tags/vorbis/libvorbis-1.1.0/vorbis-uninstalled.pc.in)

Modified: branches/vorbis-aotuv/vorbis.m4
===================================================================
--- branches/vorbis-aotuv/vorbis.m4	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vorbis.m4	2006-11-05 14:40:48 UTC (rev 12025)
@@ -6,7 +6,7 @@
 dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
 dnl
-AC_DEFUN(XIPH_PATH_VORBIS,
+AC_DEFUN([XIPH_PATH_VORBIS],
 [dnl 
 dnl Get the cflags and libraries
 dnl


Property changes on: branches/vorbis-aotuv/vorbis.m4
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vorbis.pc.in
___________________________________________________________________
Name: svn:keywords
   + Id

Copied: branches/vorbis-aotuv/vorbisenc-uninstalled.pc.in (from rev 12024, tags/vorbis/libvorbis-1.1.0/vorbisenc-uninstalled.pc.in)


Property changes on: branches/vorbis-aotuv/vorbisenc.pc.in
___________________________________________________________________
Name: svn:keywords
   + Id

Copied: branches/vorbis-aotuv/vorbisfile-uninstalled.pc.in (from rev 12024, tags/vorbis/libvorbis-1.1.0/vorbisfile-uninstalled.pc.in)


Property changes on: branches/vorbis-aotuv/vorbisfile.pc.in
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile
.deps



Property changes on: branches/vorbis-aotuv/vq/.cvsignore
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/16.vqs
===================================================================
--- branches/vorbis-aotuv/vq/16.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/16.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,8 @@
-cp 16c0_s/resaux_0.vqd _16c0_s_single.vqd
-cp 16c1_s/resaux_0.vqd _16c1_s_short.vqd
-cp 16c2_s/resaux_0.vqd _16c2_s_short.vqd
-cp 16c1_s/resaux_1.vqd _16c1_s_long.vqd
-cp 16c2_s/resaux_1.vqd _16c2_s_long.vqd
 
 GO
 
 >_16c0_s noninterleaved
-haux _16c0_s_single.vqd 0,64,2
+haux 16c0_s/resaux_0.vqd _16c0_s_single 0,64,2 10
 	
 :_p1_0 16c0_s/res_part1_pass2.vqd, 8, nonseq cull, 0 +- 1
 :_p2_0 16c0_s/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
@@ -28,10 +23,10 @@
 :_p9_2 16c0_s/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10
 
 >_16c1s_s noninterleaved
-haux _16c1_s_short.vqd 0,64,2
+haux 16c1_s/resaux_0.vqd _16c1_s_short 0,64,2 10
 
 >_16c1_s noninterleaved
-haux _16c1_s_long.vqd 0,64,2
+haux 16c1_s/resaux_1.vqd _16c1_s_long 0,64,2 10
 	
 :_p1_0 16c1_s/res_part1_pass2.vqd, 8, nonseq cull, 0 +- 1
 :_p2_0 16c1_s/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
@@ -52,9 +47,9 @@
 :_p9_2 16c1_s/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10
 
 >_16c2s_s noninterleaved
-haux _16c2_s_short.vqd 0,64,2
+haux 16c2_s/resaux_0.vqd _16c2_s_short 0,64,2 10
 >_16c2_s noninterleaved
-haux _16c2_s_long.vqd 0,64,2
+haux 16c2_s/resaux_1.vqd _16c2_s_long 0,64,2 10
         
 :_p1_0 16c2_s/res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1
 :_p2_0 16c2_s/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2


Property changes on: branches/vorbis-aotuv/vq/16.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/16u.vqs
===================================================================
--- branches/vorbis-aotuv/vq/16u.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/16u.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,8 @@
-cp 16u0/resaux_0.vqd _16u0__single.vqd
-cp 16u1/resaux_0.vqd _16u1__short.vqd
-cp 16u2/resaux_0.vqd _16u2__short.vqd
-cp 16u1/resaux_1.vqd _16u1__long.vqd
-cp 16u2/resaux_1.vqd _16u2__long.vqd
 
 GO
 
 >_16u0_ noninterleaved
-haux _16u0__single.vqd 0,64,2
+haux 16u0/resaux_0.vqd _16u0__single 0,64,2 8
 	
 :_p1_0 16u0/res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1 
 :_p2_0 16u0/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 
@@ -24,9 +19,9 @@
 
 	
 >_16u1s_ noninterleaved
-haux _16u1__short.vqd 0,64,2
+haux 16u1/resaux_0.vqd _16u1__short 0,64,2 10
 >_16u1_ noninterleaved
-haux _16u1__long.vqd 0,64,2
+haux 16u1/resaux_1.vqd _16u1__long 0,64,2 10
 	
 :_p1_0 16u1/res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1 
 :_p2_0 16u1/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 
@@ -46,10 +41,10 @@
 :_p9_2 16u1/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
 
 >_16u2s noninterleaved
-haux _16u2__short.vqd 0,16,2
+haux 16u2/resaux_0.vqd _16u2__short 0,16,2 10
 
 >_16u2 noninterleaved
-haux _16u2__long.vqd 0,64,2
+haux 16u2/resaux_1.vqd _16u2__long 0,64,2 10
         
 :_p1_0 16u2/res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1
 :_p2_0 16u2/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2


Property changes on: branches/vorbis-aotuv/vq/16u.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Copied: branches/vorbis-aotuv/vq/44c-1.vqs (from rev 12024, tags/vorbis/libvorbis-1.1.0/vq/44c-1.vqs)

Modified: branches/vorbis-aotuv/vq/44c0.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44c0.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44c0.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,74 +1,65 @@
-cp 44c0_s/resaux_0.vqd _44c0_s_short.vqd
-cp 44c0_s/resaux_1.vqd _44c0_s_long.vqd
-cp 44c0_sm/resaux_0.vqd _44c0_sm_short.vqd
-cp 44c0_sm/resaux_1.vqd _44c0_sm_long.vqd
-
 GO
 
 >_44c0s_s noninterleaved
-haux _44c0_s_short.vqd 0,16,2
+haux 44c0_s/resaux_0.vqd _44c0_s_short 0,16,2 9
 
 >_44c0_s noninterleaved
-haux _44c0_s_long.vqd 0,64,2
+haux 44c0_s/resaux_1.vqd _44c0_s_long 0,64,2 9
 	
-#     0   1   1   2   2   4   8  16  32   +      
-#         0  99   0  99   4   8  16  32   +
+#     0   1   2   2   4   8  16  32   +      
+#         0   0  99   4   8  16  32   +
 
-#     0   1   2   3   4   5   6   7   8   9
-# 1                               .   .   .
-# 2                               .   .   .
-# 4       .   .   .   .   .   .           .
+#     0   1   2   3   4   5   6   7   8
+# 1                           .   .   .
+# 2                           .   .   .
+# 4       .   .   .   .   .           .
  
 :_p1_0 44c0_s/res_part1_pass2.vqd, 8, nonseq cull, 0 +- 1
 :_p2_0 44c0_s/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p3_0 44c0_s/res_part3_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p3_0 44c0_s/res_part3_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
 :_p4_0 44c0_s/res_part4_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p5_0 44c0_s/res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p6_0 44c0_s/res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_p5_0 44c0_s/res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
 
 
-:_p7_0 44c0_s/res_part7_pass0.vqd, 4, nonseq cull, 0 +- 11
-:_p7_1 44c0_s/res_part7_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 
+:_p6_0 44c0_s/res_part6_pass0.vqd, 4, nonseq cull, 0 +- 11
+:_p6_1 44c0_s/res_part6_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 
 
-:_p8_0 44c0_s/res_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
-:_p8_1 44c0_s/res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
+:_p7_0 44c0_s/res_part7_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
+:_p7_1 44c0_s/res_part7_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
 
-:_p9_0 44c0_s/res_part9_pass0.vqd, 4, nonseq, 0 +- 221 442
-:_p9_1 44c0_s/res_part9_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 
-:_p9_2 44c0_s/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
+:_p8_0 44c0_s/res_part8_pass0.vqd, 4, nonseq, 0 +- 221 442
+:_p8_1 44c0_s/res_part8_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 
+:_p8_2 44c0_s/res_part8_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
 
 
 >_44c0s_sm noninterleaved
-haux _44c0_sm_short.vqd 0,16,2
+haux 44c0_sm/resaux_0.vqd _44c0_sm_short 0,16,2 9
 
 >_44c0_sm noninterleaved
-haux _44c0_sm_long.vqd 0,64,2
+haux 44c0_sm/resaux_1.vqd _44c0_sm_long 0,64,2 9
 	
-#     0   1   1   2   2   4   8  16  32   +      
-#         0  99   0  99   4   8  16  32   +
+#     0   1   2   2   4   8  16  32   +      
+#         0   0  99   4   8  16  32   +
 
-#     0   1   2   3   4   5   6   7   8   9
-# 1                               .   .   .
-# 2                               .   .   .
-# 4       .   .   .   .   .   .           .
+#     0   1   2   3   4   5   6   7   8
+# 1                           .   .   .
+# 2                           .   .   .
+# 4       .   .   .   .   .           .
  
 :_p1_0 44c0_sm/res_part1_pass2.vqd, 8, nonseq cull, 0 +- 1
 :_p2_0 44c0_sm/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p3_0 44c0_sm/res_part3_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p3_0 44c0_sm/res_part3_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
 :_p4_0 44c0_sm/res_part4_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p5_0 44c0_sm/res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p6_0 44c0_sm/res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_p5_0 44c0_sm/res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
 
 
-:_p7_0 44c0_sm/res_part7_pass0.vqd, 4, nonseq cull, 0 +- 11
-:_p7_1 44c0_sm/res_part7_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 
+:_p6_0 44c0_sm/res_part6_pass0.vqd, 4, nonseq cull, 0 +- 11
+:_p6_1 44c0_sm/res_part6_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 
 
-:_p8_0 44c0_sm/res_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
-:_p8_1 44c0_sm/res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
+:_p7_0 44c0_sm/res_part7_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
+:_p7_1 44c0_sm/res_part7_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
 
-:_p9_0 44c0_sm/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884
-:_p9_1 44c0_sm/res_part9_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 
-:_p9_2 44c0_sm/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
+:_p8_0 44c0_sm/res_part8_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884
+:_p8_1 44c0_sm/res_part8_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 
+:_p8_2 44c0_sm/res_part8_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
 
-
-


Property changes on: branches/vorbis-aotuv/vq/44c0.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44c1.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44c1.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44c1.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,75 +1,66 @@
-cp 44c1_s/resaux_0.vqd _44c1_s_short.vqd
-cp 44c1_s/resaux_1.vqd _44c1_s_long.vqd
-cp 44c1_sm/resaux_0.vqd _44c1_sm_short.vqd
-cp 44c1_sm/resaux_1.vqd _44c1_sm_long.vqd
 
 GO
 
 >_44c1s_s noninterleaved
-haux _44c1_s_short.vqd 0,16,2
+haux 44c1_s/resaux_0.vqd _44c1_s_short 0,16,2 9
 
 >_44c1_s noninterleaved
-haux _44c1_s_long.vqd 0,64,2
+haux 44c1_s/resaux_1.vqd _44c1_s_long 0,64,2 9
 	
-#iter 0
+#     0   1   2   2   4   8  16  32   +      
+#         0   0  99   4   8  16  32   +
 
-#     0   1   1   2   2   4   8  16  32   +      
-#         0  99   0  99   4   8  16  32   +
-
-#     0   1   2   3   4   5   6   7   8   9
-# 1                               .   .   .
-# 2                               .   .   .
-# 4       .   .   .   .   .   .           .
+#     0   1   2   3   4   5   6   7   8
+# 1                           .   .   .
+# 2                           .   .   .
+# 4       .   .   .   .   .           .
  
 :_p1_0 44c1_s/res_part1_pass2.vqd, 8, nonseq cull, 0 +- 1
 :_p2_0 44c1_s/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p3_0 44c1_s/res_part3_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p3_0 44c1_s/res_part3_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
 :_p4_0 44c1_s/res_part4_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p5_0 44c1_s/res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p6_0 44c1_s/res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_p5_0 44c1_s/res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
 
 
-:_p7_0 44c1_s/res_part7_pass0.vqd, 4, nonseq cull, 0 +- 11
-:_p7_1 44c1_s/res_part7_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 
+:_p6_0 44c1_s/res_part6_pass0.vqd, 4, nonseq cull, 0 +- 11
+:_p6_1 44c1_s/res_part6_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 
 
-:_p8_0 44c1_s/res_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
-:_p8_1 44c1_s/res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
+:_p7_0 44c1_s/res_part7_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
+:_p7_1 44c1_s/res_part7_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
 
-:_p9_0 44c1_s/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1105 1326
-:_p9_1 44c1_s/res_part9_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 
-:_p9_2 44c1_s/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
+:_p8_0 44c1_s/res_part8_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1105 1326
+:_p8_1 44c1_s/res_part8_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 
+:_p8_2 44c1_s/res_part8_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
 
 
 >_44c1s_sm noninterleaved
-haux _44c1_sm_short.vqd 0,16,2
+haux 44c1_sm/resaux_0.vqd _44c1_sm_short 0,16,2 9
 
 >_44c1_sm noninterleaved
-haux _44c1_sm_long.vqd 0,64,2
+haux 44c1_sm/resaux_1.vqd _44c1_sm_long 0,64,2 9
 	
-#iter 0
+#     0   1   2   2   4   8  16  32   +      
+#         0   0  99   4   8  16  32   +
 
-#     0   1   1   2   2   4   8  16  32   +      
-#         0  99   0  99   4   8  16  32   +
-
-#     0   1   2   3   4   5   6   7   8   9
-# 1                               .   .   .
-# 2                               .   .   .
-# 4       .   .   .   .   .   .           .
+#     0   1   2   3   4   5   6   7   8
+# 1                           .   .   .
+# 2                           .   .   .
+# 4       .   .   .   .   .           .
  
 :_p1_0 44c1_sm/res_part1_pass2.vqd, 8, nonseq cull, 0 +- 1
 :_p2_0 44c1_sm/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p3_0 44c1_sm/res_part3_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p3_0 44c1_sm/res_part3_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
 :_p4_0 44c1_sm/res_part4_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p5_0 44c1_sm/res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p6_0 44c1_sm/res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_p5_0 44c1_sm/res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
 
 
-:_p7_0 44c1_sm/res_part7_pass0.vqd, 4, nonseq cull, 0 +- 11
-:_p7_1 44c1_sm/res_part7_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 
+:_p6_0 44c1_sm/res_part6_pass0.vqd, 4, nonseq cull, 0 +- 11
+:_p6_1 44c1_sm/res_part6_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 
 
-:_p8_0 44c1_sm/res_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
-:_p8_1 44c1_sm/res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
+:_p7_0 44c1_sm/res_part7_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
+:_p7_1 44c1_sm/res_part7_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
 
-:_p9_0 44c1_sm/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1105 1326
-:_p9_1 44c1_sm/res_part9_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 
-:_p9_2 44c1_sm/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
+:_p8_0 44c1_sm/res_part8_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1105 1326
+:_p8_1 44c1_sm/res_part8_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 
+:_p8_2 44c1_sm/res_part8_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
+


Property changes on: branches/vorbis-aotuv/vq/44c1.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44c2.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44c2.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44c2.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,14 +1,10 @@
-cp 44c2_s/resaux_0.vqd _44c2_s_short.vqd
-cp 44c2_s/resaux_1.vqd _44c2_s_long.vqd
-
-
 GO
 
 >_44c2s_s noninterleaved
-haux _44c2_s_short.vqd 0,16,2
+haux 44c2_s/resaux_0.vqd _44c2_s_short 0,16,2 10
 
 >_44c2_s noninterleaved
-haux _44c2_s_long.vqd 0,64,2
+haux 44c2_s/resaux_1.vqd _44c2_s_long 0,64,2 10
 	
 #iter 0
 


Property changes on: branches/vorbis-aotuv/vq/44c2.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44c3.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44c3.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44c3.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,11 @@
-cp 44c3_s/resaux_0.vqd _44c3_s_short.vqd
-cp 44c3_s/resaux_1.vqd _44c3_s_long.vqd
 
 GO
 
 >_44c3s_s noninterleaved
-haux _44c3_s_short.vqd 0,16,2
+haux 44c3_s/resaux_0.vqd _44c3_s_short 0,16,2 10
 
 >_44c3_s noninterleaved
-haux _44c3_s_long.vqd 0,64,2
+haux 44c3_s/resaux_1.vqd _44c3_s_long 0,64,2 10
 	
 #iter 0
 


Property changes on: branches/vorbis-aotuv/vq/44c3.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44c4.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44c4.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44c4.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,11 @@
-cp 44c4_s/resaux_0.vqd _44c4_s_short.vqd
-cp 44c4_s/resaux_1.vqd _44c4_s_long.vqd
 
 GO
 
 >_44c4s_s noninterleaved
-haux _44c4_s_short.vqd 0,16,2
+haux 44c4_s/resaux_0.vqd _44c4_s_short 0,16,2 10
 
 >_44c4_s noninterleaved
-haux _44c4_s_long.vqd 0,64,2
+haux 44c4_s/resaux_1.vqd _44c4_s_long 0,64,2 10
 	
 #iter 0
 


Property changes on: branches/vorbis-aotuv/vq/44c4.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44c5.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44c5.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44c5.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,11 @@
-cp 44c5_s/resaux_0.vqd _44c5_s_short.vqd
-cp 44c5_s/resaux_1.vqd _44c5_s_long.vqd
 
 GO
 
 >_44c5s_s noninterleaved
-haux _44c5_s_short.vqd 0,16,2
+haux 44c5_s/resaux_0.vqd _44c5_s_short 0,16,2 10
 
 >_44c5_s noninterleaved
-haux _44c5_s_long.vqd 0,64,2
+haux 44c5_s/resaux_1.vqd _44c5_s_long 0,64,2 10
 	
 #iter 0
 


Property changes on: branches/vorbis-aotuv/vq/44c5.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44c6.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44c6.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44c6.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,10 @@
-cp 44c6_s/resaux_0.vqd _44c6_s_short.vqd
-cp 44c6_s/resaux_1.vqd _44c6_s_long.vqd
-
 GO
 
 >_44c6s_s noninterleaved
-haux _44c6_s_short.vqd 0,16,2
+haux 44c6_s/resaux_0.vqd _44c6_s_short 0,16,2 10
 
 >_44c6_s noninterleaved
-haux _44c6_s_long.vqd 0,64,2
+haux 44c6_s/resaux_1.vqd _44c6_s_long 0,64,2 10
 	
 
 #     0   1   2   4   8  16  32  71 157   +      


Property changes on: branches/vorbis-aotuv/vq/44c6.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44c7.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44c7.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44c7.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,11 @@
-cp 44c7_s/resaux_0.vqd _44c7_s_short.vqd
-cp 44c7_s/resaux_1.vqd _44c7_s_long.vqd
 
 GO
 
 >_44c7s_s noninterleaved
-haux _44c7_s_short.vqd 0,16,2
+haux 44c7_s/resaux_0.vqd _44c7_s_short 0,16,2 10
 
 >_44c7_s noninterleaved
-haux _44c7_s_long.vqd 0,64,2
+haux 44c7_s/resaux_1.vqd _44c7_s_long 0,64,2 10
 	
 
 #     0   1   2   4   8  16  32  71 157   +      


Property changes on: branches/vorbis-aotuv/vq/44c7.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44c8.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44c8.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44c8.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,11 @@
-cp 44c8_s/resaux_0.vqd _44c8_s_short.vqd
-cp 44c8_s/resaux_1.vqd _44c8_s_long.vqd
 
 GO
 
 >_44c8s_s noninterleaved
-haux _44c8_s_short.vqd 0,16,2
+haux 44c8_s/resaux_0.vqd _44c8_s_short 0,16,2 10
 
 >_44c8_s noninterleaved
-haux _44c8_s_long.vqd 0,64,2
+haux44c8_s/resaux_1.vqd  _44c8_s_long 0,64,2 10
 	
 
 #     0   1   2   4   8  16  32  71 157   +      


Property changes on: branches/vorbis-aotuv/vq/44c8.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44c9.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44c9.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44c9.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,10 @@
-cp 44c9_s/resaux_0.vqd _44c9_s_short.vqd
-cp 44c9_s/resaux_1.vqd _44c9_s_long.vqd
-
 GO
 
 >_44c9s_s noninterleaved
-haux _44c9_s_short.vqd 0,16,2
+haux 44c9_s/resaux_0.vqd _44c9_s_short 0,16,2 10
 
 >_44c9_s noninterleaved
-haux _44c9_s_long.vqd 0,64,2
+haux 44c9_s/resaux_1.vqd _44c9_s_long 0,64,2 10
 	
 
 #     0   1   2   4   8  16  32  71 157   +      


Property changes on: branches/vorbis-aotuv/vq/44c9.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44u0.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44u0.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44u0.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,10 @@
-cp 44u0/resaux_0.vqd _44u0__short.vqd
-cp 44u0/resaux_1.vqd _44u0__long.vqd
-
 GO
 
 >_44u0_ noninterleaved
-haux _44u0__short.vqd 0,16,2
+haux 44u0/resaux_0.vqd _44u0__short 0,16,2 8
 
 >_44u0_ noninterleaved
-haux _44u0__long.vqd 0,64,2
+haux 44u0/resaux_1.vqd _44u0__long 0,64,2 8
 	
 #iter 0
 


Property changes on: branches/vorbis-aotuv/vq/44u0.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44u1.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44u1.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44u1.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,10 @@
-cp 44u1/resaux_0.vqd _44u1__short.vqd
-cp 44u1/resaux_1.vqd _44u1__long.vqd
-
 GO
 
 >_44u1_ noninterleaved
-haux _44u1__short.vqd 0,16,2
+haux 44u1/resaux_0.vqd _44u1__short 0,16,2 8
 
 >_44u1_ noninterleaved
-haux _44u1__long.vqd 0,64,2
+haux 44u1/resaux_1.vqd _44u1__long 0,64,2 8
 	
 #iter 0
 


Property changes on: branches/vorbis-aotuv/vq/44u1.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44u2.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44u2.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44u2.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,10 @@
-cp 44u2/resaux_0.vqd _44u2__short.vqd
-cp 44u2/resaux_1.vqd _44u2__long.vqd
-
 GO
 
 >_44u2_ noninterleaved
-haux _44u2__short.vqd 0,16,2
+haux 44u2/resaux_0.vqd _44u2__short 0,16,2 8
 
 >_44u2_ noninterleaved
-haux _44u2__long.vqd 0,64,2
+haux 44u2/resaux_1.vqd _44u2__long 0,64,2 8
 	
 #iter 0
 


Property changes on: branches/vorbis-aotuv/vq/44u2.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44u3.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44u3.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44u3.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,11 @@
-cp 44u3/resaux_0.vqd _44u3__short.vqd
-cp 44u3/resaux_1.vqd _44u3__long.vqd
 
 GO
 
 >_44u3_ noninterleaved
-haux _44u3__short.vqd 0,16,2
+haux 44u3/resaux_0.vqd _44u3__short 0,16,2 8
 
 >_44u3_ noninterleaved
-haux _44u3__long.vqd 0,64,2
+haux 44u3/resaux_1.vqd _44u3__long 0,64,2 8
 	
 #iter 0
 


Property changes on: branches/vorbis-aotuv/vq/44u3.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44u4.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44u4.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44u4.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,11 @@
-cp 44u4/resaux_0.vqd _44u4__short.vqd
-cp 44u4/resaux_1.vqd _44u4__long.vqd
 
 GO
 
 >_44u4_ noninterleaved
-haux _44u4__short.vqd 0,16,2
+haux 44u4/resaux_0.vqd _44u4__short 0,16,2 8
 
 >_44u4_ noninterleaved
-haux _44u4__long.vqd 0,64,2
+haux 44u4/resaux_1.vqd _44u4__long 0,64,2 8
 	
 #iter 0
 


Property changes on: branches/vorbis-aotuv/vq/44u4.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44u5.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44u5.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44u5.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,11 @@
-cp 44u5/resaux_0.vqd _44u5__short.vqd
-cp 44u5/resaux_1.vqd _44u5__long.vqd
 
 GO
 
 >_44u5_ noninterleaved
-haux _44u5__short.vqd 0,16,2
+haux 44u5/resaux_0.vqd _44u5__short 0,16,2 10
 
 >_44u5_ noninterleaved
-haux _44u5__long.vqd 0,64,2
+haux 44u5/resaux_1.vqd _44u5__long 0,64,2 10
 	
 #iter 0
 


Property changes on: branches/vorbis-aotuv/vq/44u5.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44u6.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44u6.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44u6.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,11 @@
-cp 44u6/resaux_0.vqd _44u6__short.vqd
-cp 44u6/resaux_1.vqd _44u6__long.vqd
 
 GO
 
 >_44u6_ noninterleaved
-haux _44u6__short.vqd 0,16,2
+haux 44u6/resaux_0.vqd _44u6__short 0,16,2 10
 
 >_44u6_ noninterleaved
-haux _44u6__long.vqd 0,64,2
+haux 44u6/resaux_1.vqd _44u6__long 0,64,2 10
 	
 #iter 0
 


Property changes on: branches/vorbis-aotuv/vq/44u6.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44u7.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44u7.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44u7.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,10 @@
-cp 44u7/resaux_0.vqd _44u7__short.vqd
-cp 44u7/resaux_1.vqd _44u7__long.vqd
-
 GO
 
 >_44u7_ noninterleaved
-haux _44u7__short.vqd 0,16,2
+haux 44u7/resaux_0.vqd _44u7__short 0,16,2 10
 
 >_44u7_ noninterleaved
-haux _44u7__long.vqd 0,64,2
+haux 44u7/resaux_1.vqd _44u7__long 0,64,2 10
 	
 #iter 0
 


Property changes on: branches/vorbis-aotuv/vq/44u7.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44u8.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44u8.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44u8.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,10 @@
-cp 44u8/resaux_0.vqd _44u8__short.vqd
-cp 44u8/resaux_1.vqd _44u8__long.vqd
-
 GO
 
 >_44u8s noninterleaved
-haux _44u8__short.vqd 0,16,2
+haux 44u8/resaux_0.vqd _44u8__short 0,16,2 10
 
 >_44u8 noninterleaved
-haux _44u8__long.vqd 0,64,2
+haux 44u8/resaux_1.vqd _44u8__long 0,64,2 10
 	
 
 #     0   1   2   4   8  16  32  71 157   +      


Property changes on: branches/vorbis-aotuv/vq/44u8.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/44u9.vqs
===================================================================
--- branches/vorbis-aotuv/vq/44u9.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/44u9.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,13 +1,11 @@
-cp 44u9/resaux_0.vqd _44u9__short.vqd
-cp 44u9/resaux_1.vqd _44u9__long.vqd
 
 GO
 
 >_44u9s noninterleaved
-haux _44u9__short.vqd 0,16,2
+haux 44u9/resaux_0.vqd _44u9__short 0,16,2 10
 
 >_44u9 noninterleaved
-haux _44u9__long.vqd 0,64,2
+haux 44u9/resaux_1.vqd _44u9__long 0,64,2 10
 	
 
 #     0   1   2   4   8  16  32  71 157   +      


Property changes on: branches/vorbis-aotuv/vq/44u9.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/8.vqs
===================================================================
--- branches/vorbis-aotuv/vq/8.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/8.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,10 +1,7 @@
-cp 8c0_s/resaux_0.vqd _8c0_s_single.vqd
-cp 8c1_s/resaux_0.vqd _8c1_s_single.vqd
-
 GO
 
 >_8c0_s noninterleaved
-haux _8c0_s_single.vqd 0,64,2
+haux 8c0_s/resaux_0.vqd _8c0_s_single 0,64,2 10
 	
 :_p1_0 8c0_s/res_part1_pass2.vqd, 8, nonseq cull, 0 +- 1
 :_p2_0 8c0_s/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
@@ -25,7 +22,7 @@
 :_p9_2 8c0_s/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10
 
 >_8c1_s noninterleaved
-haux _8c1_s_single.vqd 0,64,2
+haux 8c1_s/resaux_0.vqd _8c1_s_single 0,64,2 10
 	
 :_p1_0 8c1_s/res_part1_pass2.vqd, 8, nonseq cull, 0 +- 1
 :_p2_0 8c1_s/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2


Property changes on: branches/vorbis-aotuv/vq/8.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/8u.vqs
===================================================================
--- branches/vorbis-aotuv/vq/8u.vqs	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/8u.vqs	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,10 +1,8 @@
-cp 8u0/resaux_0.vqd _8u0__single.vqd
-cp 8u1/resaux_0.vqd _8u1__single.vqd
 
 GO
 
 >_8u0_ noninterleaved
-haux _8u0__single.vqd 0,64,2
+haux 8u0/resaux_0.vqd _8u0__single 0,64,2 8
 	
 
 :_p1_0 8u0/res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1 
@@ -22,7 +20,7 @@
 
 	
 >_8u1_ noninterleaved
-haux _8u1__single.vqd 0,64,2
+haux 8u1/resaux_0.vqd _8u1__single 0,64,2 10
 	
 :_p1_0 8u1/res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1 
 :_p2_0 8u1/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 


Property changes on: branches/vorbis-aotuv/vq/8u.vqs
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/Makefile.am
===================================================================
--- branches/vorbis-aotuv/vq/Makefile.am	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/Makefile.am	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,14 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 INCLUDES = -I../lib -I$(top_srcdir)/include @OGG_CFLAGS@
 
 EXTRA_PROGRAMS = latticebuild latticepare latticehint\
 	latticetune huffbuild distribution
 CLEANFILES = $(EXTRA_PROGRAMS)
 
-LDFLAGS = -static
+AM_LDFLAGS = -static
 LDADD = ../lib/libvorbis.la
 
 latticebuild_SOURCES = latticebuild.c vqgen.c bookutil.c\


Property changes on: branches/vorbis-aotuv/vq/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/auxpartition.pl
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/bookutil.c
===================================================================
--- branches/vorbis-aotuv/vq/bookutil.c	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/bookutil.c	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: utility functions for loading .vqh and .vqd files
- last mod: $Id: bookutil.c,v 1.27 2002/06/28 22:19:56 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -446,13 +446,13 @@
     
     /* find the two nodes to join */
     for(j=0;j<vals;j++)
-      if(least==-1 || hist[j]<least){
+      if(least==-1 || hist[j]<=least){
 	least=hist[j];
 	first=membership[j];
       }
     least=-1;
     for(j=0;j<vals;j++)
-      if((least==-1 || hist[j]<least) && membership[j]!=first){
+      if((least==-1 || hist[j]<=least) && membership[j]!=first){
 	least=hist[j];
 	second=membership[j];
       }


Property changes on: branches/vorbis-aotuv/vq/bookutil.c
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/vq/bookutil.h
===================================================================
--- branches/vorbis-aotuv/vq/bookutil.h	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/bookutil.h	2006-11-05 14:40:48 UTC (rev 12025)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: utility functions for loading .vqh and .vqd files
- last mod: $Id: bookutil.h,v 1.12 2001/12/20 01:00:39 segher Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <sys/time.h>
 
-#include "codebook.h"
+#include "localcodebook.h"
 
 extern char     *get_line(FILE *in);
 extern char     *setup_line(FILE *in);


Property changes on: branches/vorbis-aotuv/vq/bookutil.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/build.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/cascade.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/distribution.c
___________________________________________________________________
Name: svn:keywords
   + Id

Copied: branches/vorbis-aotuv/vq/floor_11.vqs (from rev 12024, tags/vorbis/libvorbis-1.1.0/vq/floor_11.vqs)

Copied: branches/vorbis-aotuv/vq/floor_22.vqs (from rev 12024, tags/vorbis/libvorbis-1.1.0/vq/floor_22.vqs)

Copied: branches/vorbis-aotuv/vq/floor_44.vqs (from rev 12024, tags/vorbis/libvorbis-1.1.0/vq/floor_44.vqs)


Property changes on: branches/vorbis-aotuv/vq/genericdata.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/huffbuild.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/latticebuild.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/latticehint.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/latticepare.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/latticetune.c
___________________________________________________________________
Name: svn:keywords
   + Id

Copied: branches/vorbis-aotuv/vq/localcodebook.h (from rev 12024, tags/vorbis/libvorbis-1.1.0/vq/localcodebook.h)


Property changes on: branches/vorbis-aotuv/vq/lspdata.c
___________________________________________________________________
Name: svn:keywords
   + Id

Copied: branches/vorbis-aotuv/vq/make_floor_books.pl (from rev 12024, tags/vorbis/libvorbis-1.1.0/vq/make_floor_books.pl)

Modified: branches/vorbis-aotuv/vq/make_residue_books.pl
===================================================================
--- branches/vorbis-aotuv/vq/make_residue_books.pl	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/vq/make_residue_books.pl	2006-11-05 14:40:48 UTC (rev 12025)
@@ -7,7 +7,7 @@
 #eg:
 
 # >res0_128_128 interleaved
-# haux res0_96_128aux.vqd 0,4,2
+# haux 44c0_s/resaux_0.vqd res0_96_128aux 0,4,2 9
 # :1 res0_128_128_1.vqd, 4, nonseq cull, 0 +- 1
 # :2 res0_128_128_2.vqd, 4, nonseq, 0 +- 1(.7) 2
 # :3 res0_128_128_3.vqd, 4, nonseq, 0 +- 1(.7) 3 5
@@ -44,15 +44,34 @@
 	next;
     }
 
-    # haux res0_96_128aux.vqd 0,4,2
+    # haux 44c0_s/resaux_0.vqd res0_96_128aux 0,4,2 9
     if($line=~m/^h(.*)/){
 	# build a huffman book (no mapping) 
-	my($name,$datafile,$arg)=split(' ',$1);
+	my($name,$datafile,$bookname,$interval,$range)=split(' ',$1);
  
-	my $command="huffbuild $datafile $arg";
-	print ">>> $command\n";
-	die "Couldn't build huffbook.\n\tcommand:$command\n" 
-	    if syst($command);
+	# check the desired subdir to see if the data file exists
+	if(-e $datafile){
+	    my $command="cp $datafile $bookname.tmp";
+	    print ">>> $command\n";
+	    die "Couldn't access partition data file.\n\tcommand:$command\n" 
+		if syst($command);
+
+	    my $command="huffbuild $bookname.tmp $interval";
+	    print ">>> $command\n";
+	    die "Couldn't build huffbook.\n\tcommand:$command\n" 
+		if syst($command);
+
+	    my $command="rm $bookname.tmp";
+	    print ">>> $command\n";
+	    die "Couldn't remove temporary file.\n\tcommand:$command\n" 
+		if syst($command);
+	}else{
+	    my $command="huffbuild $bookname.tmp 0-$range";
+	    print ">>> $command\n";
+	    die "Couldn't build huffbook.\n\tcommand:$command\n" 
+		if syst($command);
+
+	}
 	next;
     }
 


Property changes on: branches/vorbis-aotuv/vq/make_residue_books.pl
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/metrics.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/residue_entropy
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/residuedata.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/residuesplit.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/run.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/train.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/vqext.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/vqgen.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/vqgen.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/vqsplit.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/vq/vqsplit.h
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/win32
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile



Property changes on: branches/vorbis-aotuv/win32/.cvsignore
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/win32/Makefile.am
===================================================================
--- branches/vorbis-aotuv/win32/Makefile.am	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/win32/Makefile.am	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,8 +1,5 @@
 ## Process this with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
-
 EXTRA_DIST = vorbis.def vorbis_dynamic.dsp vorbis_static.dsp\
 	vorbisfile.def vorbisfile_dynamic.dsp vorbisfile_static.dsp\
 	vorbisenc.def vorbisenc_dynamic.dsp vorbisenc_static.dsp\


Property changes on: branches/vorbis-aotuv/win32/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/win32/build_vorbis_dynamic.bat
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/win32/build_vorbis_dynamic_debug.bat
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/win32/build_vorbis_static.bat
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/win32/build_vorbis_static_debug.bat
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/win32/build_vorbisenc_dynamic.bat
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/win32/build_vorbisenc_dynamic_debug.bat
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/win32/build_vorbisenc_static.bat
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/win32/build_vorbisenc_static_debug.bat
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/win32/build_vorbisfile_dynamic.bat
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/win32/build_vorbisfile_dynamic_debug.bat
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/win32/build_vorbisfile_static.bat
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/win32/build_vorbisfile_static_debug.bat
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/win32/vorbis.def
===================================================================
--- branches/vorbis-aotuv/win32/vorbis.def	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/win32/vorbis.def	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,5 +1,5 @@
 ;
-; $Id: vorbis.def,v 1.14 2003/11/16 17:23:55 oddsock Exp $
+; $Id$
 ; 
 LIBRARY
 EXPORTS


Property changes on: branches/vorbis-aotuv/win32/vorbis.def
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/vorbis-aotuv/win32/vorbis.dsw
===================================================================
--- branches/vorbis-aotuv/win32/vorbis.dsw	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/win32/vorbis.dsw	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,101 +1,101 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "vorbis_dynamic"=.\vorbis_dynamic.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "vorbis_static"=.\vorbis_static.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "vorbisenc_dynamic"=.\vorbisenc_dynamic.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name vorbis_dynamic
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "vorbisenc_static"=.\vorbisenc_static.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name vorbis_static
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "vorbisfile_dynamic"=.\vorbisfile_dynamic.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name vorbis_dynamic
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "vorbisfile_static"=.\vorbisfile_static.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name vorbis_static
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "vorbis_dynamic"=.\vorbis_dynamic.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "vorbis_static"=.\vorbis_static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "vorbisenc_dynamic"=.\vorbisenc_dynamic.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name vorbis_dynamic
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "vorbisenc_static"=.\vorbisenc_static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name vorbis_static
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "vorbisfile_dynamic"=.\vorbisfile_dynamic.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name vorbis_dynamic
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "vorbisfile_static"=.\vorbisfile_static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name vorbis_static
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+


Property changes on: branches/vorbis-aotuv/win32/vorbis.dsw
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + CRLF


Property changes on: branches/vorbis-aotuv/win32/vorbis_dynamic.dsp
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + CRLF


Property changes on: branches/vorbis-aotuv/win32/vorbis_static.dsp
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + CRLF

Modified: branches/vorbis-aotuv/win32/vorbisenc.def
===================================================================
--- branches/vorbis-aotuv/win32/vorbisenc.def	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/win32/vorbisenc.def	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,5 +1,5 @@
 ;
-; $Id: vorbisenc.def,v 1.4 2003/10/01 22:27:26 giles Exp $
+; $Id$
 ;
 LIBRARY
 


Property changes on: branches/vorbis-aotuv/win32/vorbisenc.def
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/win32/vorbisenc_dynamic.dsp
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + CRLF


Property changes on: branches/vorbis-aotuv/win32/vorbisenc_static.dsp
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + CRLF

Modified: branches/vorbis-aotuv/win32/vorbisfile.def
===================================================================
--- branches/vorbis-aotuv/win32/vorbisfile.def	2006-11-05 13:46:51 UTC (rev 12024)
+++ branches/vorbis-aotuv/win32/vorbisfile.def	2006-11-05 14:40:48 UTC (rev 12025)
@@ -1,7 +1,7 @@
 ;
 ; vorbisfile.def
 ;
-; last modified: $Id: vorbisfile.def,v 1.6 2003/10/01 22:27:26 giles Exp $
+; last modified: $Id$
 ;
 LIBRARY
 EXPORTS


Property changes on: branches/vorbis-aotuv/win32/vorbisfile.def
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: branches/vorbis-aotuv/win32/vorbisfile_dynamic.dsp
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + CRLF


Property changes on: branches/vorbis-aotuv/win32/vorbisfile_static.dsp
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + CRLF



More information about the commits mailing list