summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMonty <xiphmont@xiph.org>2001-08-13 01:37:17 +0000
committerMonty <xiphmont@xiph.org>2001-08-13 01:37:17 +0000
commitd59cea578a9f2b9961218e1440026715371836d8 (patch)
tree2040cd8a12d5eaa342ba09a09e54ed1239f67f00 /lib
parentf9e9af66a421be8bbdb5e0132dddc2b83174feff (diff)
downloadlibvorbis-git-d59cea578a9f2b9961218e1440026715371836d8.tar.gz
Bringing rc2 (minus the modes it needs) onto mainline.
Monty svn path=/trunk/vorbis/; revision=1815
Diffstat (limited to 'lib')
-rw-r--r--lib/analysis.c9
-rw-r--r--lib/backends.h18
-rw-r--r--lib/barkmel.c4
-rw-r--r--lib/block.c19
-rw-r--r--lib/books/Makefile202
-rw-r--r--lib/books/Makefile.in202
-rw-r--r--lib/books/line_1024x31_0sub0.vqh37
-rw-r--r--lib/books/line_1024x31_0sub1.vqh40
-rw-r--r--lib/books/line_1024x31_1sub0.vqh37
-rw-r--r--lib/books/line_1024x31_1sub1.vqh40
-rw-r--r--lib/books/line_1024x31_2sub1.vqh37
-rw-r--r--lib/books/line_1024x31_2sub2.vqh38
-rw-r--r--lib/books/line_1024x31_2sub3.vqh40
-rw-r--r--lib/books/line_1024x31_3sub1.vqh37
-rw-r--r--lib/books/line_1024x31_3sub2.vqh38
-rw-r--r--lib/books/line_1024x31_3sub3.vqh40
-rw-r--r--lib/books/line_1024x31_class0.vqh37
-rw-r--r--lib/books/line_1024x31_class1.vqh37
-rw-r--r--lib/books/line_1024x31_class2.vqh40
-rw-r--r--lib/books/line_1024x31_class3.vqh40
-rw-r--r--lib/books/line_128x7_0sub0.vqh40
-rw-r--r--lib/books/line_128x7_1sub1.vqh37
-rw-r--r--lib/books/line_128x7_1sub2.vqh38
-rw-r--r--lib/books/line_128x7_1sub3.vqh40
-rw-r--r--lib/books/line_128x7_2sub1.vqh37
-rw-r--r--lib/books/line_128x7_2sub2.vqh38
-rw-r--r--lib/books/line_128x7_2sub3.vqh40
-rw-r--r--lib/books/line_128x7_class1.vqh40
-rw-r--r--lib/books/line_128x7_class2.vqh40
-rw-r--r--lib/books/res0_128_1024_1.vqh63
-rw-r--r--lib/books/res0_128_1024_2.vqh63
-rw-r--r--lib/books/res0_128_1024_3.vqh99
-rw-r--r--lib/books/res0_128_1024_4.vqh99
-rw-r--r--lib/books/res0_128_1024_5.vqh80
-rw-r--r--lib/books/res0_128_1024_6.vqh80
-rw-r--r--lib/books/res0_128_1024_7.vqh124
-rw-r--r--lib/books/res0_128_1024_8.vqh110
-rw-r--r--lib/books/res0_128_1024_9.vqh501
-rw-r--r--lib/books/res0_128_1024aux.vqh43
-rw-r--r--lib/books/res0_128_128_1.vqh63
-rw-r--r--lib/books/res0_128_128_2.vqh65
-rw-r--r--lib/books/res0_128_128_3.vqh152
-rw-r--r--lib/books/res0_128_128_4.vqh123
-rw-r--r--lib/books/res0_128_128_5.vqh448
-rw-r--r--lib/books/res0_128_128aux.vqh50
-rw-r--r--lib/books/res0_160_1024_1.vqh63
-rw-r--r--lib/books/res0_160_1024_2.vqh63
-rw-r--r--lib/books/res0_160_1024_3.vqh99
-rw-r--r--lib/books/res0_160_1024_4.vqh99
-rw-r--r--lib/books/res0_160_1024_5.vqh80
-rw-r--r--lib/books/res0_160_1024_6.vqh80
-rw-r--r--lib/books/res0_160_1024_7.vqh142
-rw-r--r--lib/books/res0_160_1024_8.vqh133
-rw-r--r--lib/books/res0_160_1024_9.vqh632
-rw-r--r--lib/books/res0_160_1024aux.vqh43
-rw-r--r--lib/books/res0_160_128_1.vqh63
-rw-r--r--lib/books/res0_160_128_2.vqh65
-rw-r--r--lib/books/res0_160_128_3.vqh152
-rw-r--r--lib/books/res0_160_128_4.vqh123
-rw-r--r--lib/books/res0_160_128_5.vqh448
-rw-r--r--lib/books/res0_160_128aux.vqh50
-rw-r--r--lib/books/res0_192_1024_1.vqh63
-rw-r--r--lib/books/res0_192_1024_2.vqh63
-rw-r--r--lib/books/res0_192_1024_3.vqh99
-rw-r--r--lib/books/res0_192_1024_4.vqh99
-rw-r--r--lib/books/res0_192_1024_5.vqh80
-rw-r--r--lib/books/res0_192_1024_6.vqh80
-rw-r--r--lib/books/res0_192_1024_7.vqh236
-rw-r--r--lib/books/res0_192_1024_8.vqh160
-rw-r--r--lib/books/res0_192_1024_9.vqh790
-rw-r--r--lib/books/res0_192_1024aux.vqh43
-rw-r--r--lib/books/res0_192_128_1.vqh63
-rw-r--r--lib/books/res0_192_128_2.vqh65
-rw-r--r--lib/books/res0_192_128_3.vqh265
-rw-r--r--lib/books/res0_192_128_4.vqh160
-rw-r--r--lib/books/res0_192_128_5.vqh448
-rw-r--r--lib/books/res0_192_128aux.vqh117
-rw-r--r--lib/books/res0_256_1024_1.vqh99
-rw-r--r--lib/books/res0_256_1024_2.vqh70
-rw-r--r--lib/books/res0_256_1024_3.vqh107
-rw-r--r--lib/books/res0_256_1024_4.vqh107
-rw-r--r--lib/books/res0_256_1024_5.vqh210
-rw-r--r--lib/books/res0_256_1024_6.vqh565
-rw-r--r--lib/books/res0_256_1024_7.vqh816
-rw-r--r--lib/books/res0_256_1024aux.vqh40
-rw-r--r--lib/books/res0_256_128_1.vqh63
-rw-r--r--lib/books/res0_256_128_2.vqh99
-rw-r--r--lib/books/res0_256_128_3.vqh80
-rw-r--r--lib/books/res0_256_128_4.vqh565
-rw-r--r--lib/books/res0_256_128_5.vqh580
-rw-r--r--lib/books/res0_256_128aux.vqh39
-rw-r--r--lib/books/res0_350_1024_7.vqh868
-rw-r--r--lib/books/res0_96_1024_1.vqh63
-rw-r--r--lib/books/res0_96_1024_2.vqh63
-rw-r--r--lib/books/res0_96_1024_3.vqh187
-rw-r--r--lib/books/res0_96_1024_4.vqh99
-rw-r--r--lib/books/res0_96_1024_5.vqh70
-rw-r--r--lib/books/res0_96_1024_6.vqh70
-rw-r--r--lib/books/res0_96_1024_7.vqh86
-rw-r--r--lib/books/res0_96_1024_8.vqh124
-rw-r--r--lib/books/res0_96_1024_9.vqh131
-rw-r--r--lib/books/res0_96_1024aux.vqh99
-rw-r--r--lib/books/res0_96_128_1.vqh63
-rw-r--r--lib/books/res0_96_128_2.vqh63
-rw-r--r--lib/books/res0_96_128_3.vqh70
-rw-r--r--lib/books/res0_96_128_4.vqh100
-rw-r--r--lib/books/res0_96_128_5.vqh102
-rw-r--r--lib/books/res0_96_128aux.vqh50
-rw-r--r--lib/books/res_Zc_1.vqh94
-rw-r--r--lib/books/res_Zc_1024aux.vqh43
-rw-r--r--lib/books/res_Zc_128aux.vqh99
-rw-r--r--lib/books/res_Zc_2.vqh300
-rw-r--r--lib/books/res_Zc_3.vqh248
-rw-r--r--lib/books/res_Zc_4.vqh89
-rw-r--r--lib/books/res_Zc_5.vqh89
-rw-r--r--lib/books/res_Zc_6.vqh129
-rw-r--r--lib/books/res_Zc_7.vqh119
-rw-r--r--lib/books/res_Zc_8.vqh1234
-rw-r--r--lib/books/res_Zc_9.vqh99
-rw-r--r--lib/books/res_Zc_9a.vqh115
-rw-r--r--lib/books/res_Zc_9b.vqh63
-rw-r--r--lib/codebook.c4
-rw-r--r--lib/codec_internal.h77
-rw-r--r--lib/envelope.c20
-rw-r--r--lib/floor0.c24
-rw-r--r--lib/floor1.c188
-rw-r--r--lib/info.c5
-rw-r--r--lib/mapping0.c366
-rw-r--r--lib/modes/maskadj_Z.h94
-rw-r--r--lib/modes/mode_44c_Z.h315
-rw-r--r--lib/modes/mode_A.h529
-rw-r--r--lib/modes/mode_B.h584
-rw-r--r--lib/modes/mode_C.h590
-rw-r--r--lib/modes/mode_D.h579
-rw-r--r--lib/modes/mode_E.h506
-rw-r--r--lib/modes/mode_Za.h406
-rw-r--r--lib/modes/mode_Zb.h410
-rw-r--r--lib/modes/mode_Zc.h451
-rw-r--r--lib/modes/modes.h9
-rw-r--r--lib/os.h5
-rw-r--r--lib/psy.c833
-rw-r--r--lib/psy.h116
-rw-r--r--lib/psytune.c399
-rw-r--r--lib/registry.c3
-rw-r--r--lib/registry.h4
-rw-r--r--lib/res0.c363
-rw-r--r--lib/sharedbook.c4
-rw-r--r--lib/synthesis.c5
-rw-r--r--lib/time0.c3
-rw-r--r--lib/vorbisenc.c25
150 files changed, 9052 insertions, 15005 deletions
diff --git a/lib/analysis.c b/lib/analysis.c
index 382052fc..700bc3bd 100644
--- a/lib/analysis.c
+++ b/lib/analysis.c
@@ -7,11 +7,11 @@
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
* by the XIPHOPHORUS Company http://www.xiph.org/ *
-
+ * *
********************************************************************
function: single-block PCM analysis mode dispatch
- last mod: $Id: analysis.c,v 1.45 2001/08/07 13:04:41 msmith Exp $
+ last mod: $Id: analysis.c,v 1.46 2001/08/13 01:36:56 xiphmont Exp $
********************************************************************/
@@ -20,10 +20,13 @@
#include <math.h>
#include <ogg/ogg.h>
#include "vorbis/codec.h"
+#include "codec_internal.h"
#include "registry.h"
#include "scales.h"
#include "os.h"
+int analysis_noisy=1;
+
/* decides between modes, dispatches to the appropriate mapping. */
int vorbis_analysis(vorbis_block *vb,ogg_packet *op){
vorbis_dsp_state *vd=vb->vd;
@@ -108,7 +111,7 @@ void _analysis_output_always(char *base,int i,float *v,int n,int bark,int dB){
void _analysis_output(char *base,int i,float *v,int n,int bark,int dB){
#ifdef ANALYSIS
- _analysis_output_always(base,i,v,n,bark,dB);
+ if(analysis_noisy)_analysis_output_always(base,i,v,n,bark,dB);
#endif
}
diff --git a/lib/backends.h b/lib/backends.h
index e4199d5f..6a800485 100644
--- a/lib/backends.h
+++ b/lib/backends.h
@@ -12,7 +12,7 @@
function: libvorbis backend and mapping structures; needed for
static mode headers
- last mod: $Id: backends.h,v 1.9 2001/06/15 23:31:00 xiphmont Exp $
+ last mod: $Id: backends.h,v 1.10 2001/08/13 01:36:56 xiphmont Exp $
********************************************************************/
@@ -61,9 +61,9 @@ typedef struct{
void (*free_info) (vorbis_info_floor *);
void (*free_look) (vorbis_look_floor *);
int (*forward) (struct vorbis_block *,vorbis_look_floor *,
+ float *, const float *, /* in */
const float *, const float *, /* in */
- const float *, const float *, /* in */
- float *, float *); /* out */
+ float *); /* out */
void *(*inverse1) (struct vorbis_block *,vorbis_look_floor *);
int (*inverse2) (struct vorbis_block *,vorbis_look_floor *,
void *buffer,float *);
@@ -114,6 +114,8 @@ typedef struct{
int unusedminsize;
int unusedmin_n;
+ int n;
+
} vorbis_info_floor1;
/* Residue backend generic *****************************************/
@@ -125,8 +127,10 @@ typedef struct{
vorbis_info_residue *(*copy_info)(vorbis_info_residue *);
void (*free_info) (vorbis_info_residue *);
void (*free_look) (vorbis_look_residue *);
- int (*forward) (struct vorbis_block *,vorbis_look_residue *,
+ long **(*class) (struct vorbis_block *,vorbis_look_residue *,
float **,int *,int);
+ int (*forward) (struct vorbis_block *,vorbis_look_residue *,
+ float **,float **,int *,int,int,long **);
int (*inverse) (struct vorbis_block *,vorbis_look_residue *,
float **,int *,int);
} vorbis_func_residue;
@@ -148,7 +152,7 @@ typedef struct vorbis_info_residue0{
float ampmax[64]; /* book amp threshholds*/
int subgrp[64]; /* book heuristic subgroup size */
int blimit[64]; /* subgroup position limits */
-
+ int passlimit[32]; /* iteration limit per couple/quant pass */
} vorbis_info_residue0;
/* Mapping backend generic *****************************************/
@@ -172,7 +176,9 @@ typedef struct vorbis_info_mapping0{
int timesubmap[16]; /* [mux] */
int floorsubmap[16]; /* [mux] submap to floors */
int residuesubmap[16]; /* [mux] submap to residue */
- int psysubmap[16]; /* [mux]; encode only */
+
+ int psy[2]; /* by blocktype; impulse/padding for short,
+ transition/normal for long */
int coupling_steps;
int coupling_mag[256];
diff --git a/lib/barkmel.c b/lib/barkmel.c
index d458614d..cf9dd4da 100644
--- a/lib/barkmel.c
+++ b/lib/barkmel.c
@@ -11,7 +11,7 @@
********************************************************************
function: bark scale utility
- last mod: $Id: barkmel.c,v 1.7 2001/06/15 21:15:39 xiphmont Exp $
+ last mod: $Id: barkmel.c,v 1.8 2001/08/13 01:36:56 xiphmont Exp $
********************************************************************/
@@ -54,7 +54,7 @@ int main(){
{
float i;
int j;
- for(i=0.,j=0;i<28;i+=1.,j++){
+ for(i=0.,j=0;i<28;i+=1,j++){
fprintf(stderr,"(%d) bark=%f %gHz (%d of 128)\n",
j,i,fromBARK(i),(int)(fromBARK(i)/22050.*128.));
}
diff --git a/lib/block.c b/lib/block.c
index 0bba4140..a5b8bfe5 100644
--- a/lib/block.c
+++ b/lib/block.c
@@ -11,7 +11,7 @@
********************************************************************
function: PCM data vector blocking, windowing and dis/reassembly
- last mod: $Id: block.c,v 1.48 2001/05/27 06:43:59 xiphmont Exp $
+ last mod: $Id: block.c,v 1.49 2001/08/13 01:36:56 xiphmont Exp $
Handle windowing, overlap-add, etc of the PCM vectors. This is made
more amusing by Vorbis' current two allowed block sizes.
@@ -174,7 +174,6 @@ static int _vds_shared_init(vorbis_dsp_state *v,vorbis_info *vi,int encp){
v->vi=vi;
b->modebits=ilog2(ci->modes);
- b->ampmax=-9999;
b->transform[0]=_ogg_calloc(VI_TRANSFORMB,sizeof(vorbis_look_transform *));
b->transform[1]=_ogg_calloc(VI_TRANSFORMB,sizeof(vorbis_look_transform *));
@@ -263,11 +262,11 @@ int vorbis_analysis_init(vorbis_dsp_state *v,vorbis_info *vi){
_vds_shared_init(v,vi,1);
b=v->backend_state;
+ b->psy_g_look=_vp_global_look(vi);
/* Initialize the envelope state storage */
b->ve=_ogg_calloc(1,sizeof(envelope_lookup));
_ve_envelope_init(b->ve,vi);
-
return(0);
}
@@ -307,6 +306,7 @@ void vorbis_dsp_clear(vorbis_dsp_state *v){
_ogg_free(b->transform[1][0]);
_ogg_free(b->transform[1]);
}
+ if(b->psy_g_look)_vp_global_free(b->psy_g_look);
}
@@ -406,6 +406,7 @@ static void _preextrapolate_helper(vorbis_dsp_state *v){
int vorbis_analysis_wrote(vorbis_dsp_state *v, int vals){
vorbis_info *vi=v->vi;
codec_setup_info *ci=vi->codec_setup;
+ /*backend_lookup_state *b=v->backend_state;*/
if(vals<=0){
int order=32;
@@ -472,6 +473,8 @@ int vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb){
vorbis_info *vi=v->vi;
codec_setup_info *ci=vi->codec_setup;
backend_lookup_state *b=v->backend_state;
+ vorbis_look_psy_global *g=b->psy_g_look;
+ vorbis_info_psy_global *gi=ci->psy_g_param;
long beginW=v->centerW-ci->blocksizes[v->W]/2,centerNext;
/* check to see if we're started... */
@@ -542,9 +545,10 @@ int vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb){
vorbis_block_internal *vbi=(vorbis_block_internal *)vb->internal;
/* this tracks 'strongest peak' for later psychoacoustics */
- if(vbi->ampmax>b->ampmax)b->ampmax=vbi->ampmax;
- b->ampmax=_vp_ampmax_decay(b->ampmax,v);
- vbi->ampmax=b->ampmax;
+ /* moved to the global psy state; clean this mess up */
+ if(vbi->ampmax>g->ampmax)g->ampmax=vbi->ampmax;
+ g->ampmax=_vp_ampmax_decay(g->ampmax,v);
+ vbi->ampmax=g->ampmax;
vb->pcm=_vorbis_block_alloc(vb,sizeof(float *)*vi->channels);
vbi->pcmdelay=_vorbis_block_alloc(vb,sizeof(float *)*vi->channels);
@@ -576,7 +580,7 @@ int vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb){
/* advance storage vectors and clean up */
{
- int new_centerNext=ci->blocksizes[1]/2+ci->delaycache;
+ int new_centerNext=ci->blocksizes[1]/2+gi->delaycache;
int movementW=centerNext-new_centerNext;
if(movementW>0){
@@ -614,7 +618,6 @@ int vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb){
}
int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi){
- codec_setup_info *ci=vi->codec_setup;
_vds_shared_init(v,vi,0);
v->pcm_returned=-1;
diff --git a/lib/books/Makefile b/lib/books/Makefile
new file mode 100644
index 00000000..3d244038
--- /dev/null
+++ b/lib/books/Makefile
@@ -0,0 +1,202 @@
+# Generated automatically from Makefile.in by configure.
+# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = /bin/sh
+
+srcdir = .
+top_srcdir = ../..
+prefix = /usr/local
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/libvorbis
+pkglibdir = $(libdir)/libvorbis
+pkgincludedir = $(includedir)/libvorbis
+
+top_builddir = ../..
+
+ACLOCAL = aclocal
+AUTOCONF = autoconf
+AUTOMAKE = automake
+AUTOHEADER = autoheader
+
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+transform = s,x,x,
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = powerpc-unknown-linux-gnu
+host_triplet = powerpc-unknown-linux-gnu
+AS = @AS@
+CC = gcc
+CPP = gcc -E
+DEBUG = -g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char
+DLLTOOL = @DLLTOOL@
+ECHO = echo
+EXEEXT =
+LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LN_S = ln -s
+MAKEINFO = makeinfo
+OBJDUMP = @OBJDUMP@
+OBJEXT = o
+OGG_CFLAGS = -I/include
+OGG_LIBS = -L/lib -logg
+PACKAGE = libvorbis
+PROFILE = -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char
+RANLIB = ranlib
+STRIP = strip
+VERSION = 1.0beta4
+VE_LIB_AGE = 0
+VE_LIB_CURRENT = 0
+VE_LIB_REVISION = 1
+VF_LIB_AGE = 0
+VF_LIB_CURRENT = 0
+VF_LIB_REVISION = 1
+V_LIB_AGE = 0
+V_LIB_CURRENT = 0
+V_LIB_REVISION = 1
+pthread_lib = -lpthread
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = lsp12_0.vqh lsp12_1.vqh lsp30_0.vqh lsp30_1.vqh lsp9_0.vqh lsp9_1.vqh res0_128_1024_1.vqh res0_128_1024_2.vqh res0_128_1024_3.vqh res0_128_1024_4.vqh res0_128_1024_5.vqh res0_128_1024_6.vqh res0_128_1024_7.vqh res0_128_1024_8.vqh res0_128_1024_9.vqh res0_128_1024aux.vqh res0_128_128_1.vqh res0_128_128_2.vqh res0_128_128_3.vqh res0_128_128_4.vqh res0_128_128_5.vqh res0_128_128aux.vqh res0_160_1024_1.vqh res0_160_1024_2.vqh res0_160_1024_3.vqh res0_160_1024_4.vqh res0_160_1024_5.vqh res0_160_1024_6.vqh res0_160_1024_7.vqh res0_160_1024_8.vqh res0_160_1024_9.vqh res0_160_1024aux.vqh res0_160_128_1.vqh res0_160_128_2.vqh res0_160_128_3.vqh res0_160_128_4.vqh res0_160_128_5.vqh res0_160_128aux.vqh res0_192_1024_1.vqh res0_192_1024_2.vqh res0_192_1024_3.vqh res0_192_1024_4.vqh res0_192_1024_5.vqh res0_192_1024_6.vqh res0_192_1024_7.vqh res0_192_1024_8.vqh res0_192_1024_9.vqh res0_192_1024aux.vqh res0_192_128_1.vqh res0_192_128_2.vqh res0_192_128_3.vqh res0_192_128_4.vqh res0_192_128_5.vqh res0_192_128aux.vqh res0_256_1024_1.vqh res0_256_1024_2.vqh res0_256_1024_3.vqh res0_256_1024_4.vqh res0_256_1024_5.vqh res0_256_1024_6.vqh res0_256_1024_7.vqh res0_256_1024aux.vqh res0_256_128_1.vqh res0_256_128_2.vqh res0_256_128_3.vqh res0_256_128_4.vqh res0_256_128_5.vqh res0_256_128aux.vqh res0_96_1024_1.vqh res0_96_1024_2.vqh res0_96_1024_3.vqh res0_96_1024_4.vqh res0_96_1024_5.vqh res0_96_1024_6.vqh res0_96_1024_7.vqh res0_96_1024_8.vqh res0_96_1024_9.vqh res0_96_1024aux.vqh res0_96_128_1.vqh res0_96_128_2.vqh res0_96_128_3.vqh res0_96_128_4.vqh res0_96_128_5.vqh res0_96_128aux.vqh res0_350_1024_7.vqh
+
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES =
+DIST_COMMON = Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/books/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = lib/books
+
+distdir: $(DISTFILES)
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(top_distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign lib/books/Makefile
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$d/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am: clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am: distclean-generic clean-am
+ -rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am: maintainer-clean-generic distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/lib/books/Makefile.in b/lib/books/Makefile.in
new file mode 100644
index 00000000..7d2b905d
--- /dev/null
+++ b/lib/books/Makefile.in
@@ -0,0 +1,202 @@
+# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AS = @AS@
+CC = @CC@
+CPP = @CPP@
+DEBUG = @DEBUG@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+EXEEXT = @EXEEXT@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+MAKEINFO = @MAKEINFO@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+PACKAGE = @PACKAGE@
+PROFILE = @PROFILE@
+RANLIB = @RANLIB@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VE_LIB_AGE = @VE_LIB_AGE@
+VE_LIB_CURRENT = @VE_LIB_CURRENT@
+VE_LIB_REVISION = @VE_LIB_REVISION@
+VF_LIB_AGE = @VF_LIB_AGE@
+VF_LIB_CURRENT = @VF_LIB_CURRENT@
+VF_LIB_REVISION = @VF_LIB_REVISION@
+V_LIB_AGE = @V_LIB_AGE@
+V_LIB_CURRENT = @V_LIB_CURRENT@
+V_LIB_REVISION = @V_LIB_REVISION@
+pthread_lib = @pthread_lib@
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = lsp12_0.vqh lsp12_1.vqh lsp30_0.vqh lsp30_1.vqh lsp9_0.vqh lsp9_1.vqh res0_128_1024_1.vqh res0_128_1024_2.vqh res0_128_1024_3.vqh res0_128_1024_4.vqh res0_128_1024_5.vqh res0_128_1024_6.vqh res0_128_1024_7.vqh res0_128_1024_8.vqh res0_128_1024_9.vqh res0_128_1024aux.vqh res0_128_128_1.vqh res0_128_128_2.vqh res0_128_128_3.vqh res0_128_128_4.vqh res0_128_128_5.vqh res0_128_128aux.vqh res0_160_1024_1.vqh res0_160_1024_2.vqh res0_160_1024_3.vqh res0_160_1024_4.vqh res0_160_1024_5.vqh res0_160_1024_6.vqh res0_160_1024_7.vqh res0_160_1024_8.vqh res0_160_1024_9.vqh res0_160_1024aux.vqh res0_160_128_1.vqh res0_160_128_2.vqh res0_160_128_3.vqh res0_160_128_4.vqh res0_160_128_5.vqh res0_160_128aux.vqh res0_192_1024_1.vqh res0_192_1024_2.vqh res0_192_1024_3.vqh res0_192_1024_4.vqh res0_192_1024_5.vqh res0_192_1024_6.vqh res0_192_1024_7.vqh res0_192_1024_8.vqh res0_192_1024_9.vqh res0_192_1024aux.vqh res0_192_128_1.vqh res0_192_128_2.vqh res0_192_128_3.vqh res0_192_128_4.vqh res0_192_128_5.vqh res0_192_128aux.vqh res0_256_1024_1.vqh res0_256_1024_2.vqh res0_256_1024_3.vqh res0_256_1024_4.vqh res0_256_1024_5.vqh res0_256_1024_6.vqh res0_256_1024_7.vqh res0_256_1024aux.vqh res0_256_128_1.vqh res0_256_128_2.vqh res0_256_128_3.vqh res0_256_128_4.vqh res0_256_128_5.vqh res0_256_128aux.vqh res0_96_1024_1.vqh res0_96_1024_2.vqh res0_96_1024_3.vqh res0_96_1024_4.vqh res0_96_1024_5.vqh res0_96_1024_6.vqh res0_96_1024_7.vqh res0_96_1024_8.vqh res0_96_1024_9.vqh res0_96_1024aux.vqh res0_96_128_1.vqh res0_96_128_2.vqh res0_96_128_3.vqh res0_96_128_4.vqh res0_96_128_5.vqh res0_96_128aux.vqh res0_350_1024_7.vqh
+
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES =
+DIST_COMMON = Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/books/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = lib/books
+
+distdir: $(DISTFILES)
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(top_distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign lib/books/Makefile
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$d/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am: clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am: distclean-generic clean-am
+ -rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am: maintainer-clean-generic distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/lib/books/line_1024x31_0sub0.vqh b/lib/books/line_1024x31_0sub0.vqh
new file mode 100644
index 00000000..07595fc7
--- /dev/null
+++ b/lib/books/line_1024x31_0sub0.vqh
@@ -0,0 +1,37 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_1024x31_0sub0_VQH_
+#define _V_line_1024x31_0sub0_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_1024x31_0sub0[] = {
+ 4, 3, 4, 4, 3, 4, 4, 4, 4, 4, 4, 5, 4, 5, 5, 5,
+};
+
+static static_codebook _huff_book_line_1024x31_0sub0 = {
+ 1, 16,
+ _huff_lengthlist_line_1024x31_0sub0,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_1024x31_0sub1.vqh b/lib/books/line_1024x31_0sub1.vqh
new file mode 100644
index 00000000..23b17001
--- /dev/null
+++ b/lib/books/line_1024x31_0sub1.vqh
@@ -0,0 +1,40 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_1024x31_0sub1_VQH_
+#define _V_line_1024x31_0sub1_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_1024x31_0sub1[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 3, 3, 3, 3, 4, 4, 4, 4, 5, 4, 5, 5, 5, 6, 7, 7,
+ 7, 7, 9,10, 9,12, 9,12, 9,12,11,12,12,12,12,12,
+ 12,12,12,12,12,12,12,12,12,12,12,12,12,12,11,11,
+};
+
+static static_codebook _huff_book_line_1024x31_0sub1 = {
+ 1, 64,
+ _huff_lengthlist_line_1024x31_0sub1,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_1024x31_1sub0.vqh b/lib/books/line_1024x31_1sub0.vqh
new file mode 100644
index 00000000..bcbe5a11
--- /dev/null
+++ b/lib/books/line_1024x31_1sub0.vqh
@@ -0,0 +1,37 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_1024x31_1sub0_VQH_
+#define _V_line_1024x31_1sub0_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_1024x31_1sub0[] = {
+ 2, 4, 4, 4, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6,
+};
+
+static static_codebook _huff_book_line_1024x31_1sub0 = {
+ 1, 16,
+ _huff_lengthlist_line_1024x31_1sub0,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_1024x31_1sub1.vqh b/lib/books/line_1024x31_1sub1.vqh
new file mode 100644
index 00000000..8a91cfbd
--- /dev/null
+++ b/lib/books/line_1024x31_1sub1.vqh
@@ -0,0 +1,40 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_1024x31_1sub1_VQH_
+#define _V_line_1024x31_1sub1_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_1024x31_1sub1[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 8,
+ 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,10,10,10,10,10,10,10,
+};
+
+static static_codebook _huff_book_line_1024x31_1sub1 = {
+ 1, 64,
+ _huff_lengthlist_line_1024x31_1sub1,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_1024x31_2sub1.vqh b/lib/books/line_1024x31_2sub1.vqh
new file mode 100644
index 00000000..c89989ca
--- /dev/null
+++ b/lib/books/line_1024x31_2sub1.vqh
@@ -0,0 +1,37 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_1024x31_2sub1_VQH_
+#define _V_line_1024x31_2sub1_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_1024x31_2sub1[] = {
+ 0, 3, 4, 2, 3, 3, 3, 3, 4,
+};
+
+static static_codebook _huff_book_line_1024x31_2sub1 = {
+ 1, 9,
+ _huff_lengthlist_line_1024x31_2sub1,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_1024x31_2sub2.vqh b/lib/books/line_1024x31_2sub2.vqh
new file mode 100644
index 00000000..96755592
--- /dev/null
+++ b/lib/books/line_1024x31_2sub2.vqh
@@ -0,0 +1,38 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_1024x31_2sub2_VQH_
+#define _V_line_1024x31_2sub2_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_1024x31_2sub2[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 3, 5, 4, 6,
+ 4, 7, 4, 8, 4, 9, 5, 9, 5,
+};
+
+static static_codebook _huff_book_line_1024x31_2sub2 = {
+ 1, 25,
+ _huff_lengthlist_line_1024x31_2sub2,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_1024x31_2sub3.vqh b/lib/books/line_1024x31_2sub3.vqh
new file mode 100644
index 00000000..aa8341a0
--- /dev/null
+++ b/lib/books/line_1024x31_2sub3.vqh
@@ -0,0 +1,40 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_1024x31_2sub3_VQH_
+#define _V_line_1024x31_2sub3_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_1024x31_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, 8, 1, 8, 3, 8, 3, 8,
+ 4, 8, 6, 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,
+};
+
+static static_codebook _huff_book_line_1024x31_2sub3 = {
+ 1, 64,
+ _huff_lengthlist_line_1024x31_2sub3,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_1024x31_3sub1.vqh b/lib/books/line_1024x31_3sub1.vqh
new file mode 100644
index 00000000..0e474fbe
--- /dev/null
+++ b/lib/books/line_1024x31_3sub1.vqh
@@ -0,0 +1,37 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_1024x31_3sub1_VQH_
+#define _V_line_1024x31_3sub1_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_1024x31_3sub1[] = {
+ 0, 2, 3, 3, 3, 3, 4, 3, 4,
+};
+
+static static_codebook _huff_book_line_1024x31_3sub1 = {
+ 1, 9,
+ _huff_lengthlist_line_1024x31_3sub1,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_1024x31_3sub2.vqh b/lib/books/line_1024x31_3sub2.vqh
new file mode 100644
index 00000000..a28e561a
--- /dev/null
+++ b/lib/books/line_1024x31_3sub2.vqh
@@ -0,0 +1,38 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_1024x31_3sub2_VQH_
+#define _V_line_1024x31_3sub2_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_1024x31_3sub2[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 2, 4, 3, 5, 4,
+ 6, 6, 7, 6, 8, 6, 9, 6, 9,
+};
+
+static static_codebook _huff_book_line_1024x31_3sub2 = {
+ 1, 25,
+ _huff_lengthlist_line_1024x31_3sub2,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_1024x31_3sub3.vqh b/lib/books/line_1024x31_3sub3.vqh
new file mode 100644
index 00000000..5a7c26f9
--- /dev/null
+++ b/lib/books/line_1024x31_3sub3.vqh
@@ -0,0 +1,40 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_1024x31_3sub3_VQH_
+#define _V_line_1024x31_3sub3_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_1024x31_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, 6, 2, 5, 3, 5, 4,
+ 5, 5, 6, 8, 5, 9, 5, 9, 4, 8, 4, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+};
+
+static static_codebook _huff_book_line_1024x31_3sub3 = {
+ 1, 64,
+ _huff_lengthlist_line_1024x31_3sub3,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_1024x31_class0.vqh b/lib/books/line_1024x31_class0.vqh
new file mode 100644
index 00000000..d416d60e
--- /dev/null
+++ b/lib/books/line_1024x31_class0.vqh
@@ -0,0 +1,37 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_1024x31_class0_VQH_
+#define _V_line_1024x31_class0_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_1024x31_class0[] = {
+ 1, 3, 3, 4, 3, 5, 6, 6,
+};
+
+static static_codebook _huff_book_line_1024x31_class0 = {
+ 1, 8,
+ _huff_lengthlist_line_1024x31_class0,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_1024x31_class1.vqh b/lib/books/line_1024x31_class1.vqh
new file mode 100644
index 00000000..f2ca4a89
--- /dev/null
+++ b/lib/books/line_1024x31_class1.vqh
@@ -0,0 +1,37 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_1024x31_class1_VQH_
+#define _V_line_1024x31_class1_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_1024x31_class1[] = {
+ 1, 2, 4, 4, 7, 7,10,12, 4, 5, 7, 8,10,10,12,11,
+};
+
+static static_codebook _huff_book_line_1024x31_class1 = {
+ 1, 16,
+ _huff_lengthlist_line_1024x31_class1,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_1024x31_class2.vqh b/lib/books/line_1024x31_class2.vqh
new file mode 100644
index 00000000..521aaf1e
--- /dev/null
+++ b/lib/books/line_1024x31_class2.vqh
@@ -0,0 +1,40 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_1024x31_class2_VQH_
+#define _V_line_1024x31_class2_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_1024x31_class2[] = {
+ 1, 2, 4,10, 8, 5, 6,10,11, 8, 7,15,16,16,13,16,
+ 7, 4, 6,12, 8, 6, 7,11,13,10,12,16,16,16,16,16,
+ 12, 9,10,14,11, 9,11,15,16,12,13,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_1024x31_class2 = {
+ 1, 64,
+ _huff_lengthlist_line_1024x31_class2,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_1024x31_class3.vqh b/lib/books/line_1024x31_class3.vqh
new file mode 100644
index 00000000..daa06835
--- /dev/null
+++ b/lib/books/line_1024x31_class3.vqh
@@ -0,0 +1,40 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_1024x31_class3_VQH_
+#define _V_line_1024x31_class3_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_1024x31_class3[] = {
+ 1, 3, 5,11, 6, 4, 5,14, 9, 6, 9,14,14,14,14,14,
+ 6, 4, 6, 8, 7, 5, 6,10, 8, 6, 8,11,14,14,14,14,
+ 11, 8, 8, 9,10, 7, 7,10,12, 9,10,14,14,14,14,14,
+ 14,14,12, 8,14,14,14,12,14,14,14,14,14,14,14,14,
+};
+
+static static_codebook _huff_book_line_1024x31_class3 = {
+ 1, 64,
+ _huff_lengthlist_line_1024x31_class3,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_128x7_0sub0.vqh b/lib/books/line_128x7_0sub0.vqh
new file mode 100644
index 00000000..2f41d067
--- /dev/null
+++ b/lib/books/line_128x7_0sub0.vqh
@@ -0,0 +1,40 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_128x7_0sub0_VQH_
+#define _V_line_128x7_0sub0_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_128x7_0sub0[] = {
+ 4, 4, 4, 5, 4, 5, 4, 5, 4, 5, 5, 6, 4, 6, 5, 6,
+ 5, 6, 5, 7, 5, 7, 5, 8, 5, 9, 5,10, 5,11, 6,11,
+ 6,13, 7,13, 7,13, 7,13, 8,13, 8,13, 9,13, 9,12,
+ 13,13,11,13,11,12,13,13,13,13,13,13,13,13,13,13,
+};
+
+static static_codebook _huff_book_line_128x7_0sub0 = {
+ 1, 64,
+ _huff_lengthlist_line_128x7_0sub0,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_128x7_1sub1.vqh b/lib/books/line_128x7_1sub1.vqh
new file mode 100644
index 00000000..52e0e72e
--- /dev/null
+++ b/lib/books/line_128x7_1sub1.vqh
@@ -0,0 +1,37 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_128x7_1sub1_VQH_
+#define _V_line_128x7_1sub1_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_128x7_1sub1[] = {
+ 0, 3, 3, 3, 3, 3, 3, 3, 3,
+};
+
+static static_codebook _huff_book_line_128x7_1sub1 = {
+ 1, 9,
+ _huff_lengthlist_line_128x7_1sub1,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_128x7_1sub2.vqh b/lib/books/line_128x7_1sub2.vqh
new file mode 100644
index 00000000..6c5793f3
--- /dev/null
+++ b/lib/books/line_128x7_1sub2.vqh
@@ -0,0 +1,38 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_128x7_1sub2_VQH_
+#define _V_line_128x7_1sub2_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_128x7_1sub2[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 4, 4, 4,
+ 4, 5, 4, 5, 5, 5, 5, 6, 6,
+};
+
+static static_codebook _huff_book_line_128x7_1sub2 = {
+ 1, 25,
+ _huff_lengthlist_line_128x7_1sub2,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_128x7_1sub3.vqh b/lib/books/line_128x7_1sub3.vqh
new file mode 100644
index 00000000..457cd754
--- /dev/null
+++ b/lib/books/line_128x7_1sub3.vqh
@@ -0,0 +1,40 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_128x7_1sub3_VQH_
+#define _V_line_128x7_1sub3_VQH_
+#include "codebook.h"
+
+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, 3, 2, 5, 3, 5, 3, 8,
+ 4, 8, 5, 8, 6, 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,
+};
+
+static static_codebook _huff_book_line_128x7_1sub3 = {
+ 1, 64,
+ _huff_lengthlist_line_128x7_1sub3,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_128x7_2sub1.vqh b/lib/books/line_128x7_2sub1.vqh
new file mode 100644
index 00000000..461c78d8
--- /dev/null
+++ b/lib/books/line_128x7_2sub1.vqh
@@ -0,0 +1,37 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_128x7_2sub1_VQH_
+#define _V_line_128x7_2sub1_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_128x7_2sub1[] = {
+ 0, 3, 3, 2, 3, 3, 4, 3, 4,
+};
+
+static static_codebook _huff_book_line_128x7_2sub1 = {
+ 1, 9,
+ _huff_lengthlist_line_128x7_2sub1,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_128x7_2sub2.vqh b/lib/books/line_128x7_2sub2.vqh
new file mode 100644
index 00000000..8fe3039f
--- /dev/null
+++ b/lib/books/line_128x7_2sub2.vqh
@@ -0,0 +1,38 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_128x7_2sub2_VQH_
+#define _V_line_128x7_2sub2_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_128x7_2sub2[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 3, 5, 3, 5, 3,
+ 6, 4, 7, 4, 8, 4, 9, 5, 9,
+};
+
+static static_codebook _huff_book_line_128x7_2sub2 = {
+ 1, 25,
+ _huff_lengthlist_line_128x7_2sub2,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_128x7_2sub3.vqh b/lib/books/line_128x7_2sub3.vqh
new file mode 100644
index 00000000..132a8caa
--- /dev/null
+++ b/lib/books/line_128x7_2sub3.vqh
@@ -0,0 +1,40 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_128x7_2sub3_VQH_
+#define _V_line_128x7_2sub3_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_128x7_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, 2, 7, 2, 8, 3, 7, 3,
+ 7, 4, 8, 4, 9, 5, 8, 7, 8, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+};
+
+static static_codebook _huff_book_line_128x7_2sub3 = {
+ 1, 64,
+ _huff_lengthlist_line_128x7_2sub3,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_128x7_class1.vqh b/lib/books/line_128x7_class1.vqh
new file mode 100644
index 00000000..af52b62a
--- /dev/null
+++ b/lib/books/line_128x7_class1.vqh
@@ -0,0 +1,40 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_128x7_class1_VQH_
+#define _V_line_128x7_class1_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_128x7_class1[] = {
+ 2, 4, 3,10, 9, 6, 6,13,13,13,10,13,13,13,13,13,
+ 6, 3, 3, 7, 9, 7, 6,13,13,13,11,13,13,13,13,13,
+ 7, 4, 4, 8, 8, 6, 4,12,13,13,11,13,13,13,13,13,
+ 13,12, 9,12,13,11,10,12,13,13,13,13,13,12,12,12,
+};
+
+static static_codebook _huff_book_line_128x7_class1 = {
+ 1, 64,
+ _huff_lengthlist_line_128x7_class1,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/line_128x7_class2.vqh b/lib/books/line_128x7_class2.vqh
new file mode 100644
index 00000000..b0f10298
--- /dev/null
+++ b/lib/books/line_128x7_class2.vqh
@@ -0,0 +1,40 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_line_128x7_class2_VQH_
+#define _V_line_128x7_class2_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_line_128x7_class2[] = {
+ 7, 6, 6,10, 7, 4, 5, 7, 9, 6, 6, 9,13,13,13,13,
+ 7, 5, 5, 8, 5, 3, 3, 6, 7, 4, 5, 8,13,13,10,12,
+ 10, 7, 6, 8, 7, 4, 3, 5, 8, 5, 5, 8,13,11,10,13,
+ 13,11,11,13,11, 8,10,13,12, 9,11,13,13,13,13,13,
+};
+
+static static_codebook _huff_book_line_128x7_class2 = {
+ 1, 64,
+ _huff_lengthlist_line_128x7_class2,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/res0_128_1024_1.vqh b/lib/books/res0_128_1024_1.vqh
deleted file mode 100644
index 2bbc639a..00000000
--- a/lib/books/res0_128_1024_1.vqh
+++ /dev/null
@@ -1,63 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_128_1024_1_VQH_
-#define _V_res0_128_1024_1_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_128_1024_1[] = {
- 1,
- 0,
- 2,
-};
-
-static long _vq_lengthlist_res0_128_1024_1[] = {
- 1, 4, 4, 5, 8, 7, 4, 7, 7, 5, 8, 8, 8,11,11, 8,
- 11,11, 5, 8, 7, 8,11,11, 8,11,11, 5, 8, 8, 8,11,
- 11, 8,11,11, 8,12,11,11,15,15,12,15,15, 8,11,11,
- 11,15,15,11,15,15, 4, 8, 8, 8,11,11, 8,11,11, 8,
- 11,11,11,15,15,11,15,15, 8,11,11,11,15,15,11,15,
- 15,
-};
-
-static float _vq_quantthresh_res0_128_1024_1[] = {
- -0.5, 0.5,
-};
-
-static long _vq_quantmap_res0_128_1024_1[] = {
- 1, 0, 2,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_128_1024_1 = {
- _vq_quantthresh_res0_128_1024_1,
- _vq_quantmap_res0_128_1024_1,
- 3,
- 3
-};
-
-static static_codebook _vq_book_res0_128_1024_1 = {
- 4, 81,
- _vq_lengthlist_res0_128_1024_1,
- 1, -535822336, 1611661312, 2, 0,
- _vq_quantlist_res0_128_1024_1,
- NULL,
- &_vq_auxt_res0_128_1024_1,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_128_1024_2.vqh b/lib/books/res0_128_1024_2.vqh
deleted file mode 100644
index 262c6a02..00000000
--- a/lib/books/res0_128_1024_2.vqh
+++ /dev/null
@@ -1,63 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_128_1024_2_VQH_
-#define _V_res0_128_1024_2_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_128_1024_2[] = {
- 1,
- 0,
- 2,
-};
-
-static long _vq_lengthlist_res0_128_1024_2[] = {
- 3, 4, 4, 5, 6, 6, 4, 6, 6, 5, 6, 6, 6, 8, 8, 6,
- 8, 8, 4, 6, 6, 6, 8, 8, 6, 8, 8, 5, 7, 6, 7, 8,
- 8, 6, 8, 8, 6, 8, 8, 8,10,10, 8,10,10, 6, 8, 8,
- 8,10,10, 8,10,10, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6,
- 8, 8, 8,10,10, 8,10,10, 6, 8, 8, 8,10,10, 8,10,
- 10,
-};
-
-static float _vq_quantthresh_res0_128_1024_2[] = {
- -0.5, 0.5,
-};
-
-static long _vq_quantmap_res0_128_1024_2[] = {
- 1, 0, 2,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_128_1024_2 = {
- _vq_quantthresh_res0_128_1024_2,
- _vq_quantmap_res0_128_1024_2,
- 3,
- 3
-};
-
-static static_codebook _vq_book_res0_128_1024_2 = {
- 4, 81,
- _vq_lengthlist_res0_128_1024_2,
- 1, -535822336, 1611661312, 2, 0,
- _vq_quantlist_res0_128_1024_2,
- NULL,
- &_vq_auxt_res0_128_1024_2,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_128_1024_3.vqh b/lib/books/res0_128_1024_3.vqh
deleted file mode 100644
index e00fabfa..00000000
--- a/lib/books/res0_128_1024_3.vqh
+++ /dev/null
@@ -1,99 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_128_1024_3_VQH_
-#define _V_res0_128_1024_3_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_128_1024_3[] = {
- 2,
- 1,
- 3,
- 0,
- 4,
-};
-
-static long _vq_lengthlist_res0_128_1024_3[] = {
- 2, 4, 4, 7, 7, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 7,
- 10,10,14,13, 7,10,10,14,14, 5, 7, 7, 9, 9, 7, 9,
- 9,12,12, 7, 9, 9,12,12,10,12,12,16,16,10,12,12,
- 16,17, 4, 7, 7, 9, 9, 7, 9, 9,12,12, 7, 9, 9,12,
- 12,10,12,12,17,16,10,12,12,16,16, 7,10, 9,13,13,
- 10,12,12,16,16,10,12,12,17,16,14,17,17,21,21,14,
- 16,17,21,22, 7,10,10,13,13,10,12,12,16,16,10,12,
- 12,16,17,14,17,16,19,20,14,16,16,19,21, 5, 7, 7,
- 10, 9, 7, 9, 9,12,12, 7, 9, 9,12,12,10,12,12,16,
- 17,10,12,12,17,16, 7, 9, 9,12,12, 9,12,12,14,14,
- 9,12,11,15,15,12,15,15,17,19,12,14,15,18,18, 7,
- 9, 9,12,12, 9,12,11,14,14, 9,12,12,14,14,12,15,
- 14,19,18,12,14,14,18,19,10,12,12,16,17,12,14,15,
- 18,19,12,15,15,18,19,17,17,19,19,22,17,19,19,20,
- 20,10,12,12,17,16,12,14,15,18,19,12,15,15,19,18,
- 16,18,17,21,20,17,19,19,20,21, 5, 7, 7, 9, 9, 7,
- 9, 9,12,12, 7, 9, 9,12,12,10,12,12,17,17,10,12,
- 12,17,16, 7, 9, 9,12,12, 9,12,12,14,14, 9,11,12,
- 14,14,12,14,15,19,19,12,14,14,18,18, 7, 9, 9,12,
- 12, 9,11,12,14,14, 9,12,11,14,14,12,14,15,18,20,
- 12,15,14,19,18,10,12,12,16,16,12,15,15,20,18,12,
- 14,14,19,19,16,19,19,21,20,16,18,20,21,20,10,12,
- 12,17,17,12,14,15,19,19,12,14,14,19,19,17,19,18,
- 20,21,16,19,17,20,20, 7,10,10,13,13,10,12,12,17,
- 17,10,12,12,17,17,13,16,17,21,21,13,16,17,20,20,
- 10,12,12,17,17,12,15,15,19,18,12,15,15,19,20,16,
- 19,18,20,21,17,19,18,20,21,10,12,12,17,16,12,15,
- 15,20,18,12,15,15,19,19,16,19,18,21,21,16,18,18,
- 21,21,14,17,17,20,19,17,18,18,21,21,17,18,19,21,
- 20,19,19,20,21,21,20,20,20,21,21,14,17,17,19,21,
- 16,19,18,21,19,17,19,19,21,20,21,20,19,21,20,20,
- 21,20,20,21, 7,10,10,13,13,10,12,12,17,17,10,12,
- 12,17,16,13,17,17,20,20,13,17,17,20,21,10,12,12,
- 16,17,12,15,15,19,18,12,15,15,21,18,17,19,18,21,
- 21,17,19,19,20,21,10,12,12,17,16,12,15,14,19,19,
- 12,15,14,20,19,16,19,18,20,21,17,19,18,21,20,14,
- 17,16,19,20,17,19,19,20,21,16,18,19,20,21,20,20,
- 21,21,21,20,21,21,21,21,14,17,17,19,21,17,19,19,
- 21,21,16,18,17,21,21,20,21,21,21,21,19,21,20,21,
- 21,
-};
-
-static float _vq_quantthresh_res0_128_1024_3[] = {
- -1.5, -0.5, 0.5, 1.5,
-};
-
-static long _vq_quantmap_res0_128_1024_3[] = {
- 3, 1, 0, 2, 4,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_128_1024_3 = {
- _vq_quantthresh_res0_128_1024_3,
- _vq_quantmap_res0_128_1024_3,
- 5,
- 5
-};
-
-static static_codebook _vq_book_res0_128_1024_3 = {
- 4, 625,
- _vq_lengthlist_res0_128_1024_3,
- 1, -533725184, 1611661312, 3, 0,
- _vq_quantlist_res0_128_1024_3,
- NULL,
- &_vq_auxt_res0_128_1024_3,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_128_1024_4.vqh b/lib/books/res0_128_1024_4.vqh
deleted file mode 100644
index 3111f744..00000000
--- a/lib/books/res0_128_1024_4.vqh
+++ /dev/null
@@ -1,99 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_128_1024_4_VQH_
-#define _V_res0_128_1024_4_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_128_1024_4[] = {
- 2,
- 1,
- 3,
- 0,
- 4,
-};
-
-static long _vq_lengthlist_res0_128_1024_4[] = {
- 5, 6, 6, 8, 8, 6, 6, 6, 9, 9, 6, 6, 6, 9, 9, 8,
- 9, 9,11,11, 8, 9, 9,11,11, 6, 6, 6, 9, 9, 6, 7,
- 7,10,10, 6, 7, 7,10,10, 9,10,10,12,13, 9,10,10,
- 13,13, 6, 6, 6, 9, 9, 6, 7, 7,10,10, 6, 7, 7,10,
- 10, 9,10,10,13,12, 9,10,10,13,12, 8, 9, 9,12,12,
- 9,10,10,13,13, 9,10,10,13,13,12,13,13,15,15,12,
- 13,13,15,15, 8, 9, 9,12,12, 9,10,10,13,13, 9,10,
- 10,13,13,12,13,13,15,15,12,13,13,15,15, 6, 7, 7,
- 9, 9, 7, 8, 8,10,10, 6, 7, 8,10,10, 9,10,10,13,
- 13, 9,10,10,13,13, 6, 8, 7,10,10, 7, 8, 9,11,11,
- 7, 9, 9,11,11,10,11,11,14,14,10,11,11,14,13, 6,
- 8, 8,10,10, 7, 9, 8,11,11, 7, 9, 9,11,11,10,11,
- 11,14,14,10,11,11,14,14, 9,10,10,13,13,10,11,11,
- 14,14,10,11,11,14,14,13,13,14,15,17,13,14,14,17,
- 17, 9,10,10,13,14,10,11,11,15,14,10,11,11,14,14,
- 13,14,14,16,15,13,14,14,17,17, 6, 7, 7, 9, 9, 7,
- 7, 7,10,10, 7, 8, 7,10,10, 9,10,10,13,13, 9,10,
- 10,13,13, 6, 8, 7,10,10, 7, 9, 8,11,11, 7, 9, 9,
- 11,11,10,11,11,14,14,10,11,11,14,14, 6, 7, 8,10,
- 10, 7, 9, 9,11,11, 7, 9, 8,11,11,10,11,11,14,14,
- 10,11,11,14,14, 9,10,10,13,13,10,11,11,14,14,10,
- 11,11,14,14,13,14,14,16,16,13,14,15,16,16, 9,10,
- 10,13,13,10,11,11,14,14,10,11,11,14,14,13,14,14,
- 16,16,13,14,14,17,15, 8, 9,10,12,12, 9,11,11,14,
- 13, 9,10,10,13,13,12,14,14,16,16,12,14,13,16,16,
- 9,10,10,13,13,10,11,12,14,14,10,12,12,15,14,14,
- 14,15,16,17,14,14,15,17,17, 9,10,11,13,14,10,12,
- 11,14,14,10,11,12,14,14,13,15,15,17,16,13,14,15,
- 16,17,12,13,13,16,16,13,14,14,17,16,13,15,15,17,
- 17,15,16,17,18,18,17,17,17,18,20,12,14,13,16,16,
- 13,15,14,17,16,13,14,14,16,16,15,16,16,19,16,15,
- 17,17,18,19, 8, 9, 9,12,12, 9,10,10,13,13, 9,11,
- 10,14,13,12,14,13,16,16,12,13,14,16,15, 9,10,10,
- 14,13,10,12,11,15,14,10,11,12,15,15,13,14,14,17,
- 17,14,14,15,16,19, 9,10,10,13,14,10,11,12,14,15,
- 10,12,11,15,14,13,14,15,17,17,14,15,14,17,16,12,
- 14,13,16,16,13,15,14,17,17,13,14,14,16,17,16,16,
- 16,20,18,15,16,16,17,18,12,13,14,16,17,13,15,14,
- 18,17,13,14,14,16,17,16,17,16,20,19,15,18,16,20,
- 18,
-};
-
-static float _vq_quantthresh_res0_128_1024_4[] = {
- -1.5, -0.5, 0.5, 1.5,
-};
-
-static long _vq_quantmap_res0_128_1024_4[] = {
- 3, 1, 0, 2, 4,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_128_1024_4 = {
- _vq_quantthresh_res0_128_1024_4,
- _vq_quantmap_res0_128_1024_4,
- 5,
- 5
-};
-
-static static_codebook _vq_book_res0_128_1024_4 = {
- 4, 625,
- _vq_lengthlist_res0_128_1024_4,
- 1, -533725184, 1611661312, 3, 0,
- _vq_quantlist_res0_128_1024_4,
- NULL,
- &_vq_auxt_res0_128_1024_4,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_128_1024_5.vqh b/lib/books/res0_128_1024_5.vqh
deleted file mode 100644
index d529b911..00000000
--- a/lib/books/res0_128_1024_5.vqh
+++ /dev/null
@@ -1,80 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_128_1024_5_VQH_
-#define _V_res0_128_1024_5_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_128_1024_5[] = {
- 6,
- 5,
- 7,
- 4,
- 8,
- 3,
- 9,
- 2,
- 10,
- 1,
- 11,
- 0,
- 12,
-};
-
-static long _vq_lengthlist_res0_128_1024_5[] = {
- 1, 4, 4, 6, 6, 6, 6, 8, 8, 9, 9,10,10, 4, 6, 6,
- 9, 9, 9, 9,11,11,12,12,13,13, 4, 6, 6, 9, 9, 9,
- 9,11,11,12,12,13,13, 6, 9, 9,12,11,12,12,14,14,
- 15,14,15,16, 6, 9, 9,12,11,12,12,13,13,14,15,16,
- 16, 6, 9, 9,12,12,14,14,15,15,16,17,16,17, 7, 9,
- 9,12,12,14,14,15,15,16,16,16,16, 8,11,11,14,14,
- 15,15,16,16,17,17,18,18, 8,11,11,14,14,15,15,16,
- 16,16,18,17,18, 9,12,12,15,15,16,16,17,17,18,17,
- 19,18, 9,13,13,15,15,16,16,17,16,17,17,19,18,10,
- 14,14,16,17,17,17,18,18,18,18,19,19,10,14,14,16,
- 16,17,17,18,18,21,21,20,19,
-};
-
-static float _vq_quantthresh_res0_128_1024_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,
-};
-
-static long _vq_quantmap_res0_128_1024_5[] = {
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_128_1024_5 = {
- _vq_quantthresh_res0_128_1024_5,
- _vq_quantmap_res0_128_1024_5,
- 13,
- 13
-};
-
-static static_codebook _vq_book_res0_128_1024_5 = {
- 2, 169,
- _vq_lengthlist_res0_128_1024_5,
- 1, -531103744, 1611661312, 4, 0,
- _vq_quantlist_res0_128_1024_5,
- NULL,
- &_vq_auxt_res0_128_1024_5,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_128_1024_6.vqh b/lib/books/res0_128_1024_6.vqh
deleted file mode 100644
index c0aff00f..00000000
--- a/lib/books/res0_128_1024_6.vqh
+++ /dev/null
@@ -1,80 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_128_1024_6_VQH_
-#define _V_res0_128_1024_6_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_128_1024_6[] = {
- 6,
- 5,
- 7,
- 4,
- 8,
- 3,
- 9,
- 2,
- 10,
- 1,
- 11,
- 0,
- 12,
-};
-
-static long _vq_lengthlist_res0_128_1024_6[] = {
- 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 4, 5, 5,
- 6, 6, 7, 7, 8, 8, 9, 9,10,10, 4, 5, 5, 6, 6, 7,
- 7, 8, 8, 9, 9,10,10, 6, 6, 6, 7, 7, 9, 9,10,10,
- 11,11,12,12, 5, 6, 6, 7, 7, 9, 9,10,10,11,11,12,
- 12, 7, 7, 7, 9, 9,10,10,11,11,12,12,13,13, 7, 7,
- 7, 9, 9,10,10,11,11,12,12,13,13, 8, 9, 9,10,10,
- 11,11,13,12,13,13,14,14, 8, 9, 9,10,10,11,11,12,
- 12,13,13,14,14, 9,10,10,11,11,12,13,13,13,14,14,
- 14,14, 9,10,10,11,11,12,12,13,13,14,14,15,14,10,
- 11,11,12,12,13,13,14,14,15,14,15,15,10,11,11,12,
- 12,13,13,14,14,15,15,15,15,
-};
-
-static float _vq_quantthresh_res0_128_1024_6[] = {
- -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_res0_128_1024_6[] = {
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_128_1024_6 = {
- _vq_quantthresh_res0_128_1024_6,
- _vq_quantmap_res0_128_1024_6,
- 13,
- 13
-};
-
-static static_codebook _vq_book_res0_128_1024_6 = {
- 2, 169,
- _vq_lengthlist_res0_128_1024_6,
- 1, -531103744, 1611661312, 4, 0,
- _vq_quantlist_res0_128_1024_6,
- NULL,
- &_vq_auxt_res0_128_1024_6,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_128_1024_7.vqh b/lib/books/res0_128_1024_7.vqh
deleted file mode 100644
index 32de71cb..00000000
--- a/lib/books/res0_128_1024_7.vqh
+++ /dev/null
@@ -1,124 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_128_1024_7_VQH_
-#define _V_res0_128_1024_7_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_128_1024_7[] = {
- 12,
- 11,
- 13,
- 10,
- 14,
- 9,
- 15,
- 8,
- 16,
- 7,
- 17,
- 6,
- 18,
- 5,
- 19,
- 4,
- 20,
- 3,
- 21,
- 2,
- 22,
- 1,
- 23,
- 0,
- 24,
-};
-
-static long _vq_lengthlist_res0_128_1024_7[] = {
- 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8,
- 8, 9, 9, 9, 9, 9, 9,10,10, 4, 6, 6, 7, 7, 8, 8,
- 9, 9, 9, 9,10,10, 9, 9,10,10,10,10,11,11,11,11,
- 12,12, 4, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10, 9,
- 9,10,10,10,10,11,11,11,11,12,12, 6, 7, 7, 9, 9,
- 9, 9,10,10,11,11,11,11,11,11,11,11,12,12,12,12,
- 13,13,13,13, 6, 7, 7, 8, 8, 9, 9,10,10,11,10,11,
- 11,11,11,11,11,12,12,12,12,13,13,13,13, 7, 8, 8,
- 9,10,10,10,11,11,11,12,12,12,12,12,12,12,13,13,
- 13,13,13,13,14,14, 7, 8, 8,10,10,10,10,11,11,11,
- 12,12,12,12,12,12,12,13,13,13,13,14,13,14,14, 8,
- 9, 9,10,10,11,11,12,12,13,12,13,13,13,13,13,13,
- 14,14,14,14,14,14,15,15, 8, 9, 9,10,10,11,11,12,
- 12,12,12,13,13,13,13,13,13,13,14,14,14,14,14,15,
- 15, 8,10,10,11,11,12,12,13,13,13,13,13,13,13,14,
- 14,14,15,14,14,15,15,15,15,15, 8,10,10,11,11,12,
- 12,13,13,13,13,13,13,13,13,14,14,14,14,14,15,15,
- 15,16,15, 9,10,10,11,12,12,12,13,13,14,14,14,14,
- 14,14,14,14,15,15,15,15,15,16,16,16, 9,10,10,12,
- 11,13,12,13,13,14,14,14,14,14,14,14,14,15,14,15,
- 15,16,15,16,16, 8,10,10,12,12,12,13,13,13,14,14,
- 14,14,14,14,15,15,15,15,15,16,16,16,16,17, 8,10,
- 10,12,11,12,12,13,13,14,14,14,14,14,14,15,15,15,
- 15,15,15,16,16,16,16, 9,11,11,12,12,13,13,14,13,
- 14,14,15,14,15,15,15,15,15,16,16,16,16,16,17,16,
- 9,11,11,12,12,13,13,14,14,14,14,14,14,15,14,15,
- 15,15,15,16,16,16,16,17,17, 9,11,11,13,13,14,14,
- 14,14,15,14,15,15,15,15,15,15,16,16,16,16,16,17,
- 17,17, 9,11,11,12,13,13,13,14,14,14,15,15,15,15,
- 15,15,16,17,16,16,17,16,16,17,17,10,12,11,13,13,
- 14,14,14,15,15,15,15,15,15,16,16,17,16,16,16,17,
- 17,17,17,18,10,12,12,13,13,14,14,15,14,15,15,15,
- 15,16,16,17,16,16,16,16,17,17,18,17,17,10,12,12,
- 14,13,15,15,15,15,16,15,16,16,16,16,17,16,17,16,
- 16,16,17,17,17,17,10,12,12,14,14,15,15,15,15,16,
- 15,16,16,17,16,16,17,17,16,17,17,16,17,18,18,11,
- 12,13,14,14,15,15,15,15,16,15,16,16,17,16,17,17,
- 18,17,18,18,18,17,18,18,11,13,13,14,14,14,15,15,
- 16,16,16,16,16,16,16,17,16,17,16,17,17,18,17,17,
- 18,
-};
-
-static float _vq_quantthresh_res0_128_1024_7[] = {
- -11.5, -10.5, -9.5, -8.5, -7.5, -6.5, -5.5, -4.5,
- -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5,
- 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 11.5,
-};
-
-static long _vq_quantmap_res0_128_1024_7[] = {
- 23, 21, 19, 17, 15, 13, 11, 9,
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8, 10, 12, 14, 16, 18, 20, 22,
- 24,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_128_1024_7 = {
- _vq_quantthresh_res0_128_1024_7,
- _vq_quantmap_res0_128_1024_7,
- 25,
- 25
-};
-
-static static_codebook _vq_book_res0_128_1024_7 = {
- 2, 625,
- _vq_lengthlist_res0_128_1024_7,
- 1, -529006592, 1611661312, 5, 0,
- _vq_quantlist_res0_128_1024_7,
- NULL,
- &_vq_auxt_res0_128_1024_7,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_128_1024_8.vqh b/lib/books/res0_128_1024_8.vqh
deleted file mode 100644
index 0c454093..00000000
--- a/lib/books/res0_128_1024_8.vqh
+++ /dev/null
@@ -1,110 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_128_1024_8_VQH_
-#define _V_res0_128_1024_8_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_128_1024_8[] = {
- 21,
- 20,
- 22,
- 19,
- 23,
- 18,
- 24,
- 17,
- 25,
- 16,
- 26,
- 15,
- 27,
- 14,
- 28,
- 13,
- 29,
- 12,
- 30,
- 11,
- 31,
- 10,
- 32,
- 9,
- 33,
- 8,
- 34,
- 7,
- 35,
- 6,
- 36,
- 5,
- 37,
- 4,
- 38,
- 3,
- 39,
- 2,
- 40,
- 1,
- 41,
- 0,
- 42,
-};
-
-static long _vq_lengthlist_res0_128_1024_8[] = {
- 2, 3, 3, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6,
- 6, 7, 7, 7, 7, 7, 7, 8, 8, 7, 7, 7, 7, 8, 8, 8,
- 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
-};
-
-static float _vq_quantthresh_res0_128_1024_8[] = {
- -20.5, -19.5, -18.5, -17.5, -16.5, -15.5, -14.5, -13.5,
- -12.5, -11.5, -10.5, -9.5, -8.5, -7.5, -6.5, -5.5,
- -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5,
- 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5,
- 11.5, 12.5, 13.5, 14.5, 15.5, 16.5, 17.5, 18.5,
- 19.5, 20.5,
-};
-
-static long _vq_quantmap_res0_128_1024_8[] = {
- 41, 39, 37, 35, 33, 31, 29, 27,
- 25, 23, 21, 19, 17, 15, 13, 11,
- 9, 7, 5, 3, 1, 0, 2, 4,
- 6, 8, 10, 12, 14, 16, 18, 20,
- 22, 24, 26, 28, 30, 32, 34, 36,
- 38, 40, 42,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_128_1024_8 = {
- _vq_quantthresh_res0_128_1024_8,
- _vq_quantmap_res0_128_1024_8,
- 43,
- 43
-};
-
-static static_codebook _vq_book_res0_128_1024_8 = {
- 1, 43,
- _vq_lengthlist_res0_128_1024_8,
- 1, -527106048, 1611661312, 6, 0,
- _vq_quantlist_res0_128_1024_8,
- NULL,
- &_vq_auxt_res0_128_1024_8,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_128_1024_9.vqh b/lib/books/res0_128_1024_9.vqh
deleted file mode 100644
index 963cf0ce..00000000
--- a/lib/books/res0_128_1024_9.vqh
+++ /dev/null
@@ -1,501 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_128_1024_9_VQH_
-#define _V_res0_128_1024_9_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_128_1024_9[] = {
- 170,
- 169,
- 171,
- 168,
- 172,
- 167,
- 173,
- 166,
- 174,
- 165,
- 175,
- 164,
- 176,
- 163,
- 177,
- 162,
- 178,
- 161,
- 179,
- 160,
- 180,
- 159,
- 181,
- 158,
- 182,
- 157,
- 183,
- 156,
- 184,
- 155,
- 185,
- 154,
- 186,
- 153,
- 187,
- 152,
- 188,
- 151,
- 189,
- 150,
- 190,
- 149,
- 191,
- 148,
- 192,
- 147,
- 193,
- 146,
- 194,
- 145,
- 195,
- 144,
- 196,
- 143,
- 197,
- 142,
- 198,
- 141,
- 199,
- 140,
- 200,
- 139,
- 201,
- 138,
- 202,
- 137,
- 203,
- 136,
- 204,
- 135,
- 205,
- 134,
- 206,
- 133,
- 207,
- 132,
- 208,
- 131,
- 209,
- 130,
- 210,
- 129,
- 211,
- 128,
- 212,
- 127,
- 213,
- 126,
- 214,
- 125,
- 215,
- 124,
- 216,
- 123,
- 217,
- 122,
- 218,
- 121,
- 219,
- 120,
- 220,
- 119,
- 221,
- 118,
- 222,
- 117,
- 223,
- 116,
- 224,
- 115,
- 225,
- 114,
- 226,
- 113,
- 227,
- 112,
- 228,
- 111,
- 229,
- 110,
- 230,
- 109,
- 231,
- 108,
- 232,
- 107,
- 233,
- 106,
- 234,
- 105,
- 235,
- 104,
- 236,
- 103,
- 237,
- 102,
- 238,
- 101,
- 239,
- 100,
- 240,
- 99,
- 241,
- 98,
- 242,
- 97,
- 243,
- 96,
- 244,
- 95,
- 245,
- 94,
- 246,
- 93,
- 247,
- 92,
- 248,
- 91,
- 249,
- 90,
- 250,
- 89,
- 251,
- 88,
- 252,
- 87,
- 253,
- 86,
- 254,
- 85,
- 255,
- 84,
- 256,
- 83,
- 257,
- 82,
- 258,
- 81,
- 259,
- 80,
- 260,
- 79,
- 261,
- 78,
- 262,
- 77,
- 263,
- 76,
- 264,
- 75,
- 265,
- 74,
- 266,
- 73,
- 267,
- 72,
- 268,
- 71,
- 269,
- 70,
- 270,
- 69,
- 271,
- 68,
- 272,
- 67,
- 273,
- 66,
- 274,
- 65,
- 275,
- 64,
- 276,
- 63,
- 277,
- 62,
- 278,
- 61,
- 279,
- 60,
- 280,
- 59,
- 281,
- 58,
- 282,
- 57,
- 283,
- 56,
- 284,
- 55,
- 285,
- 54,
- 286,
- 53,
- 287,
- 52,
- 288,
- 51,
- 289,
- 50,
- 290,
- 49,
- 291,
- 48,
- 292,
- 47,
- 293,
- 46,
- 294,
- 45,
- 295,
- 44,
- 296,
- 43,
- 297,
- 42,
- 298,
- 41,
- 299,
- 40,
- 300,
- 39,
- 301,
- 38,
- 302,
- 37,
- 303,
- 36,
- 304,
- 35,
- 305,
- 34,
- 306,
- 33,
- 307,
- 32,
- 308,
- 31,
- 309,
- 30,
- 310,
- 29,
- 311,
- 28,
- 312,
- 27,
- 313,
- 26,
- 314,
- 25,
- 315,
- 24,
- 316,
- 23,
- 317,
- 22,
- 318,
- 21,
- 319,
- 20,
- 320,
- 19,
- 321,
- 18,
- 322,
- 17,
- 323,
- 16,
- 324,
- 15,
- 325,
- 14,
- 326,
- 13,
- 327,
- 12,
- 328,
- 11,
- 329,
- 10,
- 330,
- 9,
- 331,
- 8,
- 332,
- 7,
- 333,
- 6,
- 334,
- 5,
- 335,
- 4,
- 336,
- 3,
- 337,
- 2,
- 338,
- 1,
- 339,
- 0,
- 340,
-};
-
-static long _vq_lengthlist_res0_128_1024_9[] = {
- 3, 3, 3, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6,
- 6, 6, 6, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 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,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,11,10,11,11,11,11,11,11,11,11,11,
- 11,11,11,12,11,12,12,12,12,12,12,12,12,12,12,12,
- 12,12,12,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,14,14,13,14,13,14,14,14,14,
- 14,14,14,14,14,14,14,14,15,15,15,14,15,15,15,15,
- 15,15,15,15,15,15,15,15,16,15,15,15,15,15,15,15,
- 15,15,15,16,16,16,16,16,16,16,17,16,16,17,17,16,
- 16,16,16,16,16,16,16,16,16,16,17,17,17,17,17,18,
- 17,17,17,17,18,17,18,18,17,17,18,17,17,19,20,18,
- 19,18,18,17,18,17,18,17,18,18,19,18,18,18,19,19,
- 18,19,19,20,18,19,19,18,19,19,17,19,19,19,20,19,
- 20,20,20,20,19,19,19,19,20,20,19,19,20,18,20,19,
- 20,20,19,19,20,20,19,20,19,20,20,20,19,20,20,19,
- 20,18,20,20,20,20,20,20,20,20,20,19,20,20,20,19,
- 20,20,20,20,20,20,19,20,19,20,20,20,20,20,20,20,
- 19,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
- 20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
- 20,19,19,20,20,
-};
-
-static float _vq_quantthresh_res0_128_1024_9[] = {
- -169.5, -168.5, -167.5, -166.5, -165.5, -164.5, -163.5, -162.5,
- -161.5, -160.5, -159.5, -158.5, -157.5, -156.5, -155.5, -154.5,
- -153.5, -152.5, -151.5, -150.5, -149.5, -148.5, -147.5, -146.5,
- -145.5, -144.5, -143.5, -142.5, -141.5, -140.5, -139.5, -138.5,
- -137.5, -136.5, -135.5, -134.5, -133.5, -132.5, -131.5, -130.5,
- -129.5, -128.5, -127.5, -126.5, -125.5, -124.5, -123.5, -122.5,
- -121.5, -120.5, -119.5, -118.5, -117.5, -116.5, -115.5, -114.5,
- -113.5, -112.5, -111.5, -110.5, -109.5, -108.5, -107.5, -106.5,
- -105.5, -104.5, -103.5, -102.5, -101.5, -100.5, -99.5, -98.5,
- -97.5, -96.5, -95.5, -94.5, -93.5, -92.5, -91.5, -90.5,
- -89.5, -88.5, -87.5, -86.5, -85.5, -84.5, -83.5, -82.5,
- -81.5, -80.5, -79.5, -78.5, -77.5, -76.5, -75.5, -74.5,
- -73.5, -72.5, -71.5, -70.5, -69.5, -68.5, -67.5, -66.5,
- -65.5, -64.5, -63.5, -62.5, -61.5, -60.5, -59.5, -58.5,
- -57.5, -56.5, -55.5, -54.5, -53.5, -52.5, -51.5, -50.5,
- -49.5, -48.5, -47.5, -46.5, -45.5, -44.5, -43.5, -42.5,
- -41.5, -40.5, -39.5, -38.5, -37.5, -36.5, -35.5, -34.5,
- -33.5, -32.5, -31.5, -30.5, -29.5, -28.5, -27.5, -26.5,
- -25.5, -24.5, -23.5, -22.5, -21.5, -20.5, -19.5, -18.5,
- -17.5, -16.5, -15.5, -14.5, -13.5, -12.5, -11.5, -10.5,
- -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5,
- -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5,
- 6.5, 7.5, 8.5, 9.5, 10.5, 11.5, 12.5, 13.5,
- 14.5, 15.5, 16.5, 17.5, 18.5, 19.5, 20.5, 21.5,
- 22.5, 23.5, 24.5, 25.5, 26.5, 27.5, 28.5, 29.5,
- 30.5, 31.5, 32.5, 33.5, 34.5, 35.5, 36.5, 37.5,
- 38.5, 39.5, 40.5, 41.5, 42.5, 43.5, 44.5, 45.5,
- 46.5, 47.5, 48.5, 49.5, 50.5, 51.5, 52.5, 53.5,
- 54.5, 55.5, 56.5, 57.5, 58.5, 59.5, 60.5, 61.5,
- 62.5, 63.5, 64.5, 65.5, 66.5, 67.5, 68.5, 69.5,
- 70.5, 71.5, 72.5, 73.5, 74.5, 75.5, 76.5, 77.5,
- 78.5, 79.5, 80.5, 81.5, 82.5, 83.5, 84.5, 85.5,
- 86.5, 87.5, 88.5, 89.5, 90.5, 91.5, 92.5, 93.5,
- 94.5, 95.5, 96.5, 97.5, 98.5, 99.5, 100.5, 101.5,
- 102.5, 103.5, 104.5, 105.5, 106.5, 107.5, 108.5, 109.5,
- 110.5, 111.5, 112.5, 113.5, 114.5, 115.5, 116.5, 117.5,
- 118.5, 119.5, 120.5, 121.5, 122.5, 123.5, 124.5, 125.5,
- 126.5, 127.5, 128.5, 129.5, 130.5, 131.5, 132.5, 133.5,
- 134.5, 135.5, 136.5, 137.5, 138.5, 139.5, 140.5, 141.5,
- 142.5, 143.5, 144.5, 145.5, 146.5, 147.5, 148.5, 149.5,
- 150.5, 151.5, 152.5, 153.5, 154.5, 155.5, 156.5, 157.5,
- 158.5, 159.5, 160.5, 161.5, 162.5, 163.5, 164.5, 165.5,
- 166.5, 167.5, 168.5, 169.5,
-};
-
-static long _vq_quantmap_res0_128_1024_9[] = {
- 339, 337, 335, 333, 331, 329, 327, 325,
- 323, 321, 319, 317, 315, 313, 311, 309,
- 307, 305, 303, 301, 299, 297, 295, 293,
- 291, 289, 287, 285, 283, 281, 279, 277,
- 275, 273, 271, 269, 267, 265, 263, 261,
- 259, 257, 255, 253, 251, 249, 247, 245,
- 243, 241, 239, 237, 235, 233, 231, 229,
- 227, 225, 223, 221, 219, 217, 215, 213,
- 211, 209, 207, 205, 203, 201, 199, 197,
- 195, 193, 191, 189, 187, 185, 183, 181,
- 179, 177, 175, 173, 171, 169, 167, 165,
- 163, 161, 159, 157, 155, 153, 151, 149,
- 147, 145, 143, 141, 139, 137, 135, 133,
- 131, 129, 127, 125, 123, 121, 119, 117,
- 115, 113, 111, 109, 107, 105, 103, 101,
- 99, 97, 95, 93, 91, 89, 87, 85,
- 83, 81, 79, 77, 75, 73, 71, 69,
- 67, 65, 63, 61, 59, 57, 55, 53,
- 51, 49, 47, 45, 43, 41, 39, 37,
- 35, 33, 31, 29, 27, 25, 23, 21,
- 19, 17, 15, 13, 11, 9, 7, 5,
- 3, 1, 0, 2, 4, 6, 8, 10,
- 12, 14, 16, 18, 20, 22, 24, 26,
- 28, 30, 32, 34, 36, 38, 40, 42,
- 44, 46, 48, 50, 52, 54, 56, 58,
- 60, 62, 64, 66, 68, 70, 72, 74,
- 76, 78, 80, 82, 84, 86, 88, 90,
- 92, 94, 96, 98, 100, 102, 104, 106,
- 108, 110, 112, 114, 116, 118, 120, 122,
- 124, 126, 128, 130, 132, 134, 136, 138,
- 140, 142, 144, 146, 148, 150, 152, 154,
- 156, 158, 160, 162, 164, 166, 168, 170,
- 172, 174, 176, 178, 180, 182, 184, 186,
- 188, 190, 192, 194, 196, 198, 200, 202,
- 204, 206, 208, 210, 212, 214, 216, 218,
- 220, 222, 224, 226, 228, 230, 232, 234,
- 236, 238, 240, 242, 244, 246, 248, 250,
- 252, 254, 256, 258, 260, 262, 264, 266,
- 268, 270, 272, 274, 276, 278, 280, 282,
- 284, 286, 288, 290, 292, 294, 296, 298,
- 300, 302, 304, 306, 308, 310, 312, 314,
- 316, 318, 320, 322, 324, 326, 328, 330,
- 332, 334, 336, 338, 340,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_128_1024_9 = {
- _vq_quantthresh_res0_128_1024_9,
- _vq_quantmap_res0_128_1024_9,
- 341,
- 341
-};
-
-static static_codebook _vq_book_res0_128_1024_9 = {
- 1, 341,
- _vq_lengthlist_res0_128_1024_9,
- 1, -520798208, 1611661312, 9, 0,
- _vq_quantlist_res0_128_1024_9,
- NULL,
- &_vq_auxt_res0_128_1024_9,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_128_1024aux.vqh b/lib/books/res0_128_1024aux.vqh
deleted file mode 100644
index b84f1590..00000000
--- a/lib/books/res0_128_1024aux.vqh
+++ /dev/null
@@ -1,43 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- * *
- ********************************************************************
-
- function: static codebook autogenerated by huff/huffbuld
-
- ********************************************************************/
-
-#ifndef _V_res0_128_1024aux_VQH_
-#define _V_res0_128_1024aux_VQH_
-#include "codebook.h"
-
-static long _huff_lengthlist_res0_128_1024aux[] = {
- 3, 6,10, 9,12, 9,15,12,15,20, 5, 3, 4, 5, 7, 6,
- 12,11,12,15, 9, 4, 4, 5, 6, 8,11,13,16,17, 8, 4,
- 5, 5, 7, 6,11,10,13,16,12, 7, 6, 7, 8, 9,10,12,
- 16,20, 8, 6, 7, 6, 9, 6,10, 9,12,19,14,10, 9, 8,
- 7, 7, 8, 9,12,18, 9, 9,10, 8, 9, 6, 8, 7, 9,15,
- 11,11,12,10,10, 8, 7, 6, 8,13,12,12,13,12,11,10,
- 6, 6, 7,12,
-};
-
-static static_codebook _huff_book_res0_128_1024aux = {
- 2, 100,
- _huff_lengthlist_res0_128_1024aux,
- 0, 0, 0, 0, 0,
- NULL,
- NULL,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_128_128_1.vqh b/lib/books/res0_128_128_1.vqh
deleted file mode 100644
index 931c5351..00000000
--- a/lib/books/res0_128_128_1.vqh
+++ /dev/null
@@ -1,63 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_128_128_1_VQH_
-#define _V_res0_128_128_1_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_128_128_1[] = {
- 1,
- 0,
- 2,
-};
-
-static long _vq_lengthlist_res0_128_128_1[] = {
- 3, 4, 4, 4, 6, 6, 4, 6, 6, 5, 6, 6, 6, 8, 8, 6,
- 8, 8, 5, 6, 6, 6, 8, 8, 6, 8, 8, 5, 6, 6, 7, 8,
- 8, 6, 8, 8, 7, 8, 8, 8, 9,10, 8,10, 9, 6, 8, 8,
- 8,10, 9, 8, 9,10, 5, 6, 6, 6, 8, 8, 7, 8, 8, 6,
- 8, 8, 8,10, 9, 8, 9,10, 6, 8, 8, 8, 9,10, 8,10,
- 9,
-};
-
-static float _vq_quantthresh_res0_128_128_1[] = {
- -0.5, 0.5,
-};
-
-static long _vq_quantmap_res0_128_128_1[] = {
- 1, 0, 2,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_128_128_1 = {
- _vq_quantthresh_res0_128_128_1,
- _vq_quantmap_res0_128_128_1,
- 3,
- 3
-};
-
-static static_codebook _vq_book_res0_128_128_1 = {
- 4, 81,
- _vq_lengthlist_res0_128_128_1,
- 1, -535822336, 1611661312, 2, 0,
- _vq_quantlist_res0_128_128_1,
- NULL,
- &_vq_auxt_res0_128_128_1,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_128_128_2.vqh b/lib/books/res0_128_128_2.vqh
deleted file mode 100644
index cbe0aa8a..00000000
--- a/lib/books/res0_128_128_2.vqh
+++ /dev/null
@@ -1,65 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_128_128_2_VQH_
-#define _V_res0_128_128_2_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_128_128_2[] = {
- 3,
- 2,
- 4,
- 1,
- 5,
- 0,
- 6,
-};
-
-static long _vq_lengthlist_res0_128_128_2[] = {
- 2, 3, 3, 6, 6, 9, 9, 3, 5, 5, 7, 7,10,10, 3, 5,
- 5, 7, 7,10,10, 6, 8, 8,11,11,14,14, 6, 8, 8,12,
- 12,14,14, 9,11,11,15,14,16,16, 9,11,11,15,15,15,
- 15,
-};
-
-static float _vq_quantthresh_res0_128_128_2[] = {
- -2.5, -1.5, -0.5, 0.5, 1.5, 2.5,
-};
-
-static long _vq_quantmap_res0_128_128_2[] = {
- 5, 3, 1, 0, 2, 4, 6,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_128_128_2 = {
- _vq_quantthresh_res0_128_128_2,
- _vq_quantmap_res0_128_128_2,
- 7,
- 7
-};
-
-static static_codebook _vq_book_res0_128_128_2 = {
- 2, 49,
- _vq_lengthlist_res0_128_128_2,
- 1, -533200896, 1611661312, 3, 0,
- _vq_quantlist_res0_128_128_2,
- NULL,
- &_vq_auxt_res0_128_128_2,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_128_128_3.vqh b/lib/books/res0_128_128_3.vqh
deleted file mode 100644
index 1e41aa8a..00000000
--- a/lib/books/res0_128_128_3.vqh
+++ /dev/null
@@ -1,152 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_128_128_3_VQH_
-#define _V_res0_128_128_3_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_128_128_3[] = {
- 15,
- 14,
- 16,
- 13,
- 17,
- 12,
- 18,
- 11,
- 19,
- 10,
- 20,
- 9,
- 21,
- 8,
- 22,
- 7,
- 23,
- 6,
- 24,
- 5,
- 25,
- 4,
- 26,
- 3,
- 27,
- 2,
- 28,
- 1,
- 29,
- 0,
- 30,
-};
-
-static long _vq_lengthlist_res0_128_128_3[] = {
- 3, 4, 4, 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 9, 8, 9, 9,10, 9,10,10,11,10, 4,
- 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 9, 8, 9,
- 9, 8, 9, 9, 9, 9, 9, 9,10, 9,10,10,11,10, 4, 5,
- 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 8,
- 9, 9, 9, 9, 9,10, 9,10, 9,10,10,11,10, 7, 7, 7,
- 9, 9, 9, 9,10,10,10,10,10,11,10,11,10,11,10,10,
- 11,11,11,11,11,11,12,12,12,12,13,12, 7, 7, 7, 9,
- 8, 9, 9,10,10,10,10,10,10,10,11,10,11,10,10,11,
- 11,11,11,11,11,11,11,12,12,13,13, 9, 9, 9,10,10,
- 11,11,11,12,11,12,12,12,11,12,12,12,12,12,12,12,
- 12,12,13,13,13,13,13,13,14,14, 8, 9, 9,10,10,11,
- 11,11,12,12,12,12,12,12,12,12,12,12,12,12,12,13,
- 13,13,12,13,13,13,13,14,14, 9,10,10,11,12,13,12,
- 13,13,13,13,13,14,13,14,13,14,13,14,13,13,14,14,
- 15,14,15,14,15,14,15,16, 9,10,10,11,11,12,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,14,14,14,
- 14,15,14,15,14,15,15,10,11,11,12,13,13,13,14,14,
- 14,15,14,14,14,14,14,14,14,15,14,14,14,15,15,16,
- 15,17,16,16,15,15,10,11,11,13,13,13,13,13,14,13,
- 14,14,14,14,14,15,14,15,14,15,14,15,14,15,16,16,
- 15,16,15,15,16,11,12,12,13,14,14,14,15,14,14,15,
- 15,15,15,15,15,15,15,14,16,15,16,16,16,16,16,15,
- 17,15,16,17,11,12,12,14,13,14,15,14,15,14,15,14,
- 15,16,16,15,15,15,15,16,15,16,16,18,15,17,15,17,
- 15,18,16,12,13,13,14,14,14,15,15,16,16,15,15,16,
- 15,16,16,16,15,15,16,16,17,16,17,16,17,15,17,17,
- 17,18,12,13,12,15,14,15,14,17,15,16,16,16,16,16,
- 16,15,15,16,15,16,16,16,15,16,15,17,17,18,16,16,
- 18,13,14,13,14,14,15,15,16,16,15,16,16,16,16,17,
- 16,16,16,17,16,16,16,16,17,16,17,18,18,17,17,18,
- 14,13,13,15,15,15,15,17,15,16,18,15,17,16,17,15,
- 16,16,16,17,16,16,16,16,15,17,17,18,18,17,17,13,
- 14,14,16,16,18,16,16,16,16,18,18,17,16,18,16,16,
- 16,16,17,16,16,16,18,16,17,17,16,17,17,18,13,14,
- 14,15,15,17,16,17,16,17,16,18,17,16,16,16,17,17,
- 17,16,17,16,16,17,17,18,16,17,18,18,17,15,15,15,
- 16,15,18,17,18,17,16,18,16,17,16,16,18,17,18,17,
- 18,16,18,17,18,18,18,18,18,17,18,18,13,15,15,16,
- 16,16,16,17,16,17,17,17,16,16,17,16,16,17,18,17,
- 17,16,17,18,17,18,17,18,17,18,18,16,14,15,16,16,
- 17,17,17,16,16,17,18,18,18,18,16,17,18,18,18,17,
- 18,17,18,18,18,18,17,18,18,18,15,15,15,16,16,18,
- 18,17,18,18,18,18,18,16,18,16,18,16,18,18,16,17,
- 17,18,17,18,16,18,18,17,18,15,15,15,16,16,17,17,
- 16,17,18,16,18,17,18,18,17,18,17,18,18,16,18,18,
- 18,18,17,18,17,18,18,18,17,15,15,16,16,17,18,16,
- 17,18,18,18,18,18,18,17,18,18,18,17,18,18,16,18,
- 18,17,18,18,18,18,17,16,16,16,18,18,17,18,17,17,
- 18,18,18,18,18,18,18,18,16,18,18,18,18,17,18,18,
- 18,18,18,18,18,18,16,15,16,15,18,18,16,18,18,18,
- 16,17,18,18,16,18,17,17,16,18,17,17,18,18,16,18,
- 18,18,18,18,17,17,16,18,18,18,16,17,18,18,18,18,
- 17,18,18,18,18,18,18,17,18,17,18,17,18,17,18,18,
- 18,18,18,18,15,17,16,17,18,18,18,18,18,18,18,18,
- 18,17,16,18,18,17,18,17,17,18,18,18,18,18,18,18,
- 18,18,18,16,16,17,17,18,17,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,16,17,18,17,16,18,17,16,18,18,18,18,18,18,
- 18,18,18,18,18,18,18,18,18,18,18,18,17,18,18,18,
- 18,
-};
-
-static float _vq_quantthresh_res0_128_128_3[] = {
- -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, -7.5,
- -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5,
- 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5,
- 9.5, 10.5, 11.5, 12.5, 13.5, 14.5,
-};
-
-static long _vq_quantmap_res0_128_128_3[] = {
- 29, 27, 25, 23, 21, 19, 17, 15,
- 13, 11, 9, 7, 5, 3, 1, 0,
- 2, 4, 6, 8, 10, 12, 14, 16,
- 18, 20, 22, 24, 26, 28, 30,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_128_128_3 = {
- _vq_quantthresh_res0_128_128_3,
- _vq_quantmap_res0_128_128_3,
- 31,
- 31
-};
-
-static static_codebook _vq_book_res0_128_128_3 = {
- 2, 961,
- _vq_lengthlist_res0_128_128_3,
- 1, -528613376, 1611661312, 5, 0,
- _vq_quantlist_res0_128_128_3,
- NULL,
- &_vq_auxt_res0_128_128_3,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_128_128_4.vqh b/lib/books/res0_128_128_4.vqh
deleted file mode 100644
index 335a6990..00000000
--- a/lib/books/res0_128_128_4.vqh
+++ /dev/null
@@ -1,123 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_128_128_4_VQH_
-#define _V_res0_128_128_4_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_128_128_4[] = {
- 26,
- 25,
- 27,
- 24,
- 28,
- 23,
- 29,
- 22,
- 30,
- 21,
- 31,
- 20,
- 32,
- 19,
- 33,
- 18,
- 34,
- 17,
- 35,
- 16,
- 36,
- 15,
- 37,
- 14,
- 38,
- 13,
- 39,
- 12,
- 40,
- 11,
- 41,
- 10,
- 42,
- 9,
- 43,
- 8,
- 44,
- 7,
- 45,
- 6,
- 46,
- 5,
- 47,
- 4,
- 48,
- 3,
- 49,
- 2,
- 50,
- 1,
- 51,
- 0,
- 52,
-};
-
-static long _vq_lengthlist_res0_128_128_4[] = {
- 2, 2, 2, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 7, 8,
- 8, 9, 8,10, 9,10,10,11,10,11,11,12,12,12,12, 7,
- 7, 8, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,10,10,10,10,
- 11,10,11,10,11,
-};
-
-static float _vq_quantthresh_res0_128_128_4[] = {
- -25.5, -24.5, -23.5, -22.5, -21.5, -20.5, -19.5, -18.5,
- -17.5, -16.5, -15.5, -14.5, -13.5, -12.5, -11.5, -10.5,
- -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5,
- -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5,
- 6.5, 7.5, 8.5, 9.5, 10.5, 11.5, 12.5, 13.5,
- 14.5, 15.5, 16.5, 17.5, 18.5, 19.5, 20.5, 21.5,
- 22.5, 23.5, 24.5, 25.5,
-};
-
-static long _vq_quantmap_res0_128_128_4[] = {
- 51, 49, 47, 45, 43, 41, 39, 37,
- 35, 33, 31, 29, 27, 25, 23, 21,
- 19, 17, 15, 13, 11, 9, 7, 5,
- 3, 1, 0, 2, 4, 6, 8, 10,
- 12, 14, 16, 18, 20, 22, 24, 26,
- 28, 30, 32, 34, 36, 38, 40, 42,
- 44, 46, 48, 50, 52,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_128_128_4 = {
- _vq_quantthresh_res0_128_128_4,
- _vq_quantmap_res0_128_128_4,
- 53,
- 53
-};
-
-static static_codebook _vq_book_res0_128_128_4 = {
- 1, 53,
- _vq_lengthlist_res0_128_128_4,
- 1, -526778368, 1611661312, 6, 0,
- _vq_quantlist_res0_128_128_4,
- NULL,
- &_vq_auxt_res0_128_128_4,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_128_128_5.vqh b/lib/books/res0_128_128_5.vqh
deleted file mode 100644
index b204f317..00000000
--- a/lib/books/res0_128_128_5.vqh
+++ /dev/null
@@ -1,448 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_128_128_5_VQH_
-#define _V_res0_128_128_5_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_128_128_5[] = {
- 150,
- 149,
- 151,
- 148,
- 152,
- 147,
- 153,
- 146,
- 154,
- 145,
- 155,
- 144,
- 156,
- 143,
- 157,
- 142,
- 158,
- 141,
- 159,
- 140,
- 160,
- 139,
- 161,
- 138,
- 162,
- 137,
- 163,
- 136,
- 164,
- 135,
- 165,
- 134,
- 166,
- 133,
- 167,
- 132,
- 168,
- 131,
- 169,
- 130,
- 170,
- 129,
- 171,
- 128,
- 172,
- 127,
- 173,
- 126,
- 174,
- 125,
- 175,
- 124,
- 176,
- 123,
- 177,
- 122,
- 178,
- 121,
- 179,
- 120,
- 180,
- 119,
- 181,
- 118,
- 182,
- 117,
- 183,
- 116,
- 184,
- 115,
- 185,
- 114,
- 186,
- 113,
- 187,
- 112,
- 188,
- 111,
- 189,
- 110,
- 190,
- 109,
- 191,
- 108,
- 192,
- 107,
- 193,
- 106,
- 194,
- 105,
- 195,
- 104,
- 196,
- 103,
- 197,
- 102,
- 198,
- 101,
- 199,
- 100,
- 200,
- 99,
- 201,
- 98,
- 202,
- 97,
- 203,
- 96,
- 204,
- 95,
- 205,
- 94,
- 206,
- 93,
- 207,
- 92,
- 208,
- 91,
- 209,
- 90,
- 210,
- 89,
- 211,
- 88,
- 212,
- 87,
- 213,
- 86,
- 214,
- 85,
- 215,
- 84,
- 216,
- 83,
- 217,
- 82,
- 218,
- 81,
- 219,
- 80,
- 220,
- 79,
- 221,
- 78,
- 222,
- 77,
- 223,
- 76,
- 224,
- 75,
- 225,
- 74,
- 226,
- 73,
- 227,
- 72,
- 228,
- 71,
- 229,
- 70,
- 230,
- 69,
- 231,
- 68,
- 232,
- 67,
- 233,
- 66,
- 234,
- 65,
- 235,
- 64,
- 236,
- 63,
- 237,
- 62,
- 238,
- 61,
- 239,
- 60,
- 240,
- 59,
- 241,
- 58,
- 242,
- 57,
- 243,
- 56,
- 244,
- 55,
- 245,
- 54,
- 246,
- 53,
- 247,
- 52,
- 248,
- 51,
- 249,
- 50,
- 250,
- 49,
- 251,
- 48,
- 252,
- 47,
- 253,
- 46,
- 254,
- 45,
- 255,
- 44,
- 256,
- 43,
- 257,
- 42,
- 258,
- 41,
- 259,
- 40,
- 260,
- 39,
- 261,
- 38,
- 262,
- 37,
- 263,
- 36,
- 264,
- 35,
- 265,
- 34,
- 266,
- 33,
- 267,
- 32,
- 268,
- 31,
- 269,
- 30,
- 270,
- 29,
- 271,
- 28,
- 272,
- 27,
- 273,
- 26,
- 274,
- 25,
- 275,
- 24,
- 276,
- 23,
- 277,
- 22,
- 278,
- 21,
- 279,
- 20,
- 280,
- 19,
- 281,
- 18,
- 282,
- 17,
- 283,
- 16,
- 284,
- 15,
- 285,
- 14,
- 286,
- 13,
- 287,
- 12,
- 288,
- 11,
- 289,
- 10,
- 290,
- 9,
- 291,
- 8,
- 292,
- 7,
- 293,
- 6,
- 294,
- 5,
- 295,
- 4,
- 296,
- 3,
- 297,
- 2,
- 298,
- 1,
- 299,
- 0,
- 300,
-};
-
-static long _vq_lengthlist_res0_128_128_5[] = {
- 2, 3, 2, 4, 4, 5, 5, 6, 6, 7, 6, 7, 8, 8, 8, 9,
- 9, 9, 9,11,12,11,11,10,13,11,11,12,12,10,13,13,
- 13,13,13,13,12,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13, 7, 8, 8,10, 8, 9, 9, 9, 8, 9, 9,
- 10, 9,10, 8,10, 9,11, 9,11, 9,10, 9,11,11,11,10,
- 11,10,12,10,11,11,12,10,11,10,12,10,11,11,12,11,
- 11,11,10,12,11,12,12,12,13,11,13,12,13,12,13,13,
- 10,12,13,13,13,13,11,13,12,11,13,12,12,12,13,12,
- 13,12,13,13,12,12,13,12,13,13,12,12,13,13,13,11,
- 13,13,12,12,13,12,13,12,12,13,13,13,13,11,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,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,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,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,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,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,
-};
-
-static float _vq_quantthresh_res0_128_128_5[] = {
- -149.5, -148.5, -147.5, -146.5, -145.5, -144.5, -143.5, -142.5,
- -141.5, -140.5, -139.5, -138.5, -137.5, -136.5, -135.5, -134.5,
- -133.5, -132.5, -131.5, -130.5, -129.5, -128.5, -127.5, -126.5,
- -125.5, -124.5, -123.5, -122.5, -121.5, -120.5, -119.5, -118.5,
- -117.5, -116.5, -115.5, -114.5, -113.5, -112.5, -111.5, -110.5,
- -109.5, -108.5, -107.5, -106.5, -105.5, -104.5, -103.5, -102.5,
- -101.5, -100.5, -99.5, -98.5, -97.5, -96.5, -95.5, -94.5,
- -93.5, -92.5, -91.5, -90.5, -89.5, -88.5, -87.5, -86.5,
- -85.5, -84.5, -83.5, -82.5, -81.5, -80.5, -79.5, -78.5,
- -77.5, -76.5, -75.5, -74.5, -73.5, -72.5, -71.5, -70.5,
- -69.5, -68.5, -67.5, -66.5, -65.5, -64.5, -63.5, -62.5,
- -61.5, -60.5, -59.5, -58.5, -57.5, -56.5, -55.5, -54.5,
- -53.5, -52.5, -51.5, -50.5, -49.5, -48.5, -47.5, -46.5,
- -45.5, -44.5, -43.5, -42.5, -41.5, -40.5, -39.5, -38.5,
- -37.5, -36.5, -35.5, -34.5, -33.5, -32.5, -31.5, -30.5,
- -29.5, -28.5, -27.5, -26.5, -25.5, -24.5, -23.5, -22.5,
- -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, -15.5, -14.5,
- -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, -7.5, -6.5,
- -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5,
- 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5,
- 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 16.5, 17.5,
- 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 24.5, 25.5,
- 26.5, 27.5, 28.5, 29.5, 30.5, 31.5, 32.5, 33.5,
- 34.5, 35.5, 36.5, 37.5, 38.5, 39.5, 40.5, 41.5,
- 42.5, 43.5, 44.5, 45.5, 46.5, 47.5, 48.5, 49.5,
- 50.5, 51.5, 52.5, 53.5, 54.5, 55.5, 56.5, 57.5,
- 58.5, 59.5, 60.5, 61.5, 62.5, 63.5, 64.5, 65.5,
- 66.5, 67.5, 68.5, 69.5, 70.5, 71.5, 72.5, 73.5,
- 74.5, 75.5, 76.5, 77.5, 78.5, 79.5, 80.5, 81.5,
- 82.5, 83.5, 84.5, 85.5, 86.5, 87.5, 88.5, 89.5,
- 90.5, 91.5, 92.5, 93.5, 94.5, 95.5, 96.5, 97.5,
- 98.5, 99.5, 100.5, 101.5, 102.5, 103.5, 104.5, 105.5,
- 106.5, 107.5, 108.5, 109.5, 110.5, 111.5, 112.5, 113.5,
- 114.5, 115.5, 116.5, 117.5, 118.5, 119.5, 120.5, 121.5,
- 122.5, 123.5, 124.5, 125.5, 126.5, 127.5, 128.5, 129.5,
- 130.5, 131.5, 132.5, 133.5, 134.5, 135.5, 136.5, 137.5,
- 138.5, 139.5, 140.5, 141.5, 142.5, 143.5, 144.5, 145.5,
- 146.5, 147.5, 148.5, 149.5,
-};
-
-static long _vq_quantmap_res0_128_128_5[] = {
- 299, 297, 295, 293, 291, 289, 287, 285,
- 283, 281, 279, 277, 275, 273, 271, 269,
- 267, 265, 263, 261, 259, 257, 255, 253,
- 251, 249, 247, 245, 243, 241, 239, 237,
- 235, 233, 231, 229, 227, 225, 223, 221,
- 219, 217, 215, 213, 211, 209, 207, 205,
- 203, 201, 199, 197, 195, 193, 191, 189,
- 187, 185, 183, 181, 179, 177, 175, 173,
- 171, 169, 167, 165, 163, 161, 159, 157,
- 155, 153, 151, 149, 147, 145, 143, 141,
- 139, 137, 135, 133, 131, 129, 127, 125,
- 123, 121, 119, 117, 115, 113, 111, 109,
- 107, 105, 103, 101, 99, 97, 95, 93,
- 91, 89, 87, 85, 83, 81, 79, 77,
- 75, 73, 71, 69, 67, 65, 63, 61,
- 59, 57, 55, 53, 51, 49, 47, 45,
- 43, 41, 39, 37, 35, 33, 31, 29,
- 27, 25, 23, 21, 19, 17, 15, 13,
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12, 14, 16, 18,
- 20, 22, 24, 26, 28, 30, 32, 34,
- 36, 38, 40, 42, 44, 46, 48, 50,
- 52, 54, 56, 58, 60, 62, 64, 66,
- 68, 70, 72, 74, 76, 78, 80, 82,
- 84, 86, 88, 90, 92, 94, 96, 98,
- 100, 102, 104, 106, 108, 110, 112, 114,
- 116, 118, 120, 122, 124, 126, 128, 130,
- 132, 134, 136, 138, 140, 142, 144, 146,
- 148, 150, 152, 154, 156, 158, 160, 162,
- 164, 166, 168, 170, 172, 174, 176, 178,
- 180, 182, 184, 186, 188, 190, 192, 194,
- 196, 198, 200, 202, 204, 206, 208, 210,
- 212, 214, 216, 218, 220, 222, 224, 226,
- 228, 230, 232, 234, 236, 238, 240, 242,
- 244, 246, 248, 250, 252, 254, 256, 258,
- 260, 262, 264, 266, 268, 270, 272, 274,
- 276, 278, 280, 282, 284, 286, 288, 290,
- 292, 294, 296, 298, 300,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_128_128_5 = {
- _vq_quantthresh_res0_128_128_5,
- _vq_quantmap_res0_128_128_5,
- 301,
- 301
-};
-
-static static_codebook _vq_book_res0_128_128_5 = {
- 1, 301,
- _vq_lengthlist_res0_128_128_5,
- 1, -520962048, 1611661312, 9, 0,
- _vq_quantlist_res0_128_128_5,
- NULL,
- &_vq_auxt_res0_128_128_5,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_128_128aux.vqh b/lib/books/res0_128_128aux.vqh
deleted file mode 100644
index 621f4abb..00000000
--- a/lib/books/res0_128_128aux.vqh
+++ /dev/null
@@ -1,50 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- * *
- ********************************************************************
-
- function: static codebook autogenerated by huff/huffbuld
-
- ********************************************************************/
-
-#ifndef _V_res0_128_128aux_VQH_
-#define _V_res0_128_128aux_VQH_
-#include "codebook.h"
-
-static long _huff_lengthlist_res0_128_128aux[] = {
- 13,16,16,16,16,16,12,11,13,14,16,16,11,11,13,13,
- 16,16,10,13,14,14,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,10,10,12,14,16,16, 5, 3, 7,13,16,16,
- 6, 5, 9,14,16,16,10,12,14,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16, 8, 9,11,11,16,16, 4, 3,
- 8,13,16,16, 7, 6,10,14,16,16,11,13,16,16,16,16,
- 16,16,16,16,16,16,16,16,16,16,16,16,10,10,12,15,
- 16,16, 9, 2, 4, 9,16,16,11, 3, 5, 9,16,16,13, 8,
- 9,13,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
- 13,15,16,16,16,16,15, 5, 7,12,16,16,16, 6, 7,12,
- 16,16,15,11,12,15,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16,16,16,16, 8,10,15,16,16,
- 16,10,10,15,16,16,16,14,16,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16,
-};
-
-static static_codebook _huff_book_res0_128_128aux = {
- 3, 216,
- _huff_lengthlist_res0_128_128aux,
- 0, 0, 0, 0, 0,
- NULL,
- NULL,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_160_1024_1.vqh b/lib/books/res0_160_1024_1.vqh
deleted file mode 100644
index d201982d..00000000
--- a/lib/books/res0_160_1024_1.vqh
+++ /dev/null
@@ -1,63 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_160_1024_1_VQH_
-#define _V_res0_160_1024_1_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_160_1024_1[] = {
- 1,
- 0,
- 2,
-};
-
-static long _vq_lengthlist_res0_160_1024_1[] = {
- 1, 4, 4, 4, 7, 7, 4, 7, 7, 5, 8, 8, 8,11,11, 8,
- 11,11, 5, 8, 8, 8,11,11, 8,11,11, 5, 8, 8, 8,11,
- 11, 8,11,11, 8,12,11,11,15,15,11,15,15, 8,11,11,
- 11,15,15,11,15,15, 5, 8, 8, 8,11,11, 8,11,11, 8,
- 11,11,12,15,15,11,15,15, 8,11,11,11,15,15,11,15,
- 15,
-};
-
-static float _vq_quantthresh_res0_160_1024_1[] = {
- -0.5, 0.5,
-};
-
-static long _vq_quantmap_res0_160_1024_1[] = {
- 1, 0, 2,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_160_1024_1 = {
- _vq_quantthresh_res0_160_1024_1,
- _vq_quantmap_res0_160_1024_1,
- 3,
- 3
-};
-
-static static_codebook _vq_book_res0_160_1024_1 = {
- 4, 81,
- _vq_lengthlist_res0_160_1024_1,
- 1, -535822336, 1611661312, 2, 0,
- _vq_quantlist_res0_160_1024_1,
- NULL,
- &_vq_auxt_res0_160_1024_1,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_160_1024_2.vqh b/lib/books/res0_160_1024_2.vqh
deleted file mode 100644
index 35db9939..00000000
--- a/lib/books/res0_160_1024_2.vqh
+++ /dev/null
@@ -1,63 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_160_1024_2_VQH_
-#define _V_res0_160_1024_2_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_160_1024_2[] = {
- 1,
- 0,
- 2,
-};
-
-static long _vq_lengthlist_res0_160_1024_2[] = {
- 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 7, 8, 6,
- 8, 7, 5, 6, 6, 6, 8, 7, 6, 8, 7, 5, 6, 6, 6, 8,
- 8, 6, 8, 7, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 8,
- 8, 9, 9, 8, 9, 9, 5, 6, 6, 6, 8, 7, 6, 8, 8, 6,
- 8, 8, 8, 9, 9, 8, 9, 9, 6, 7, 8, 8, 9, 9, 7, 9,
- 9,
-};
-
-static float _vq_quantthresh_res0_160_1024_2[] = {
- -0.5, 0.5,
-};
-
-static long _vq_quantmap_res0_160_1024_2[] = {
- 1, 0, 2,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_160_1024_2 = {
- _vq_quantthresh_res0_160_1024_2,
- _vq_quantmap_res0_160_1024_2,
- 3,
- 3
-};
-
-static static_codebook _vq_book_res0_160_1024_2 = {
- 4, 81,
- _vq_lengthlist_res0_160_1024_2,
- 1, -535822336, 1611661312, 2, 0,
- _vq_quantlist_res0_160_1024_2,
- NULL,
- &_vq_auxt_res0_160_1024_2,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_160_1024_3.vqh b/lib/books/res0_160_1024_3.vqh
deleted file mode 100644
index a0a67f55..00000000
--- a/lib/books/res0_160_1024_3.vqh
+++ /dev/null
@@ -1,99 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_160_1024_3_VQH_
-#define _V_res0_160_1024_3_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_160_1024_3[] = {
- 2,
- 1,
- 3,
- 0,
- 4,
-};
-
-static long _vq_lengthlist_res0_160_1024_3[] = {
- 3, 5, 5, 7, 7, 5, 6, 6, 9, 9, 5, 6, 6, 9, 9, 7,
- 9, 9,13,12, 7, 9, 9,13,12, 5, 7, 7, 9, 9, 7, 8,
- 8,11,11, 7, 8, 8,11,11, 9,11,11,14,15, 9,11,11,
- 14,14, 5, 6, 6, 9, 9, 7, 8, 8,11,11, 6, 8, 8,11,
- 11, 9,11,11,15,14, 9,11,11,14,14, 7, 9, 9,13,12,
- 9,11,11,15,15, 9,11,11,15,15,13,15,15,18,18,13,
- 15,15,19,18, 7, 9, 9,12,13, 9,11,11,14,14, 9,11,
- 11,15,15,13,15,15,18,18,13,15,15,18,18, 5, 7, 7,
- 9, 9, 7, 8, 8,11,11, 7, 8, 8,11,11, 9,11,11,15,
- 15, 9,11,11,15,15, 7, 8, 8,11,11, 8,10,10,13,13,
- 8,10,10,13,13,11,13,13,16,17,11,13,13,17,16, 6,
- 8, 8,11,11, 8,10,10,13,13, 8,10,10,13,13,11,13,
- 13,17,16,11,13,13,17,17, 9,11,11,15,15,11,13,13,
- 17,17,11,13,13,17,17,15,17,16,20,20,15,17,17,21,
- 22, 9,11,11,15,15,11,13,13,16,16,11,13,13,17,17,
- 15,17,16,19,18,15,17,17,19,20, 5, 7, 6, 9, 9, 7,
- 8, 8,11,11, 7, 8, 8,11,11, 9,11,11,15,15, 9,11,
- 11,15,15, 7, 8, 8,11,11, 8,10,10,13,13, 8,10,10,
- 13,13,11,13,13,17,16,11,13,13,16,17, 6, 8, 8,11,
- 11, 8,10,10,13,13, 8,10,10,13,13,11,13,13,16,17,
- 11,13,13,16,16, 9,11,11,15,15,11,13,13,17,17,11,
- 13,13,17,17,15,17,17,19,20,15,16,17,20,20, 9,11,
- 11,15,15,11,13,13,16,16,11,13,13,17,17,15,17,17,
- 20,19,15,17,16,19,19, 7, 9, 9,13,13, 9,11,11,15,
- 15, 9,11,11,15,15,13,15,15,18,19,13,15,15,19,18,
- 9,11,11,15,15,11,13,13,16,16,11,13,13,16,16,15,
- 16,16,20,20,15,17,17,20,20, 9,11,11,15,15,11,13,
- 13,17,17,11,13,13,17,17,15,16,16,22,20,15,17,17,
- 20,20,13,15,15,18,18,14,17,17,20,20,15,17,16,21,
- 19,18,19,21,21,20,18,21,20,21,21,13,15,15,19,19,
- 15,17,16,19,19,15,17,17,20,20,18,21,19,20,21,19,
- 21,20,21,21, 7, 9, 9,13,13, 9,11,11,15,15, 9,11,
- 11,15,15,13,15,15,18,19,13,15,15,18,19, 9,11,11,
- 15,15,11,13,13,17,17,11,13,13,16,17,15,17,17,20,
- 19,15,17,17,19,20, 9,11,11,15,15,11,13,13,17,17,
- 11,13,13,17,16,15,16,16,20,20,15,17,17,21,20,13,
- 15,15,18,18,15,17,17,20,20,15,16,16,21,20,18,20,
- 19,21,21,18,19,21,20,21,13,15,15,18,18,15,16,16,
- 19,20,15,17,16,21,21,18,21,20,21,21,18,19,19,20,
- 20,
-};
-
-static float _vq_quantthresh_res0_160_1024_3[] = {
- -1.5, -0.5, 0.5, 1.5,
-};
-
-static long _vq_quantmap_res0_160_1024_3[] = {
- 3, 1, 0, 2, 4,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_160_1024_3 = {
- _vq_quantthresh_res0_160_1024_3,
- _vq_quantmap_res0_160_1024_3,
- 5,
- 5
-};
-
-static static_codebook _vq_book_res0_160_1024_3 = {
- 4, 625,
- _vq_lengthlist_res0_160_1024_3,
- 1, -533725184, 1611661312, 3, 0,
- _vq_quantlist_res0_160_1024_3,
- NULL,
- &_vq_auxt_res0_160_1024_3,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_160_1024_4.vqh b/lib/books/res0_160_1024_4.vqh
deleted file mode 100644
index c0bd3901..00000000
--- a/lib/books/res0_160_1024_4.vqh
+++ /dev/null
@@ -1,99 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_160_1024_4_VQH_
-#define _V_res0_160_1024_4_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_160_1024_4[] = {
- 2,
- 1,
- 3,
- 0,
- 4,
-};
-
-static long _vq_lengthlist_res0_160_1024_4[] = {
- 5, 6, 6, 8, 8, 6, 7, 7, 9, 9, 6, 7, 6, 9, 9, 8,
- 9, 9,11,11, 8, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 7,
- 7, 9,10, 7, 7, 7, 9,10, 9,10,10,12,12, 9,10,10,
- 12,12, 6, 7, 7, 9, 9, 7, 7, 7,10, 9, 6, 7, 7,10,
- 9, 9,10,10,12,12, 9,10, 9,12,12, 8, 9, 9,11,11,
- 9,10,10,12,12, 9,10,10,12,12,11,12,12,14,14,11,
- 12,12,14,14, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
- 10,12,12,11,12,12,14,14,11,12,12,15,14, 6, 7, 7,
- 9, 9, 7, 7, 7,10,10, 7, 7, 7,10,10, 9,10,10,12,
- 12, 9,10,10,12,12, 7, 7, 7,10,10, 7, 8, 8,10,10,
- 7, 8, 8,10,10,10,10,11,13,13,10,11,10,13,13, 7,
- 7, 7,10,10, 7, 8, 8,11,10, 7, 8, 8,10,10,10,10,
- 10,13,13,10,10,10,13,13, 9,10,10,12,12,10,10,10,
- 13,13,10,11,10,13,13,12,13,13,15,16,12,13,13,15,
- 16, 9,10,10,12,12,10,10,10,13,13,10,10,11,13,13,
- 12,13,13,16,15,12,13,13,15,16, 6, 7, 7, 9, 9, 7,
- 7, 7,10,10, 7, 7, 7,10,10, 9,10,10,12,12, 9,10,
- 10,12,12, 7, 7, 7,10,10, 7, 8, 8,10,10, 7, 8, 8,
- 10,10,10,11,10,13,13,10,10,10,13,13, 7, 7, 7,10,
- 10, 7, 8, 8,10,10, 7, 8, 8,10,10,10,10,10,13,13,
- 10,10,10,13,13, 9,10,10,12,12,10,11,11,13,13,10,
- 10,10,13,13,12,13,13,16,15,12,13,13,15,15, 9,10,
- 10,12,12,10,10,11,13,13, 9,10,10,13,13,12,13,13,
- 15,15,12,13,13,16,15, 8, 9, 9,11,11, 9,10,10,12,
- 12, 9,10,10,12,12,11,12,12,15,15,11,12,12,15,15,
- 9,10,10,12,12,10,10,11,13,13,10,11,11,13,13,12,
- 13,13,15,16,12,13,13,16,15, 9,10,10,12,12,10,11,
- 10,13,13,10,11,11,13,13,12,13,13,16,15,12,13,13,
- 16,16,11,12,12,15,15,12,13,13,15,15,12,13,13,16,
- 15,14,15,16,17,17,15,16,15,18,18,11,12,12,15,15,
- 12,13,13,16,15,12,13,13,16,16,14,16,15,18,17,15,
- 15,15,18,18, 8, 9, 9,11,11, 9,10,10,12,12, 9,10,
- 10,12,12,11,12,12,15,15,11,12,12,15,15, 9,10,10,
- 12,12,10,11,10,13,13,10,10,11,13,13,12,13,13,15,
- 16,12,13,13,16,16, 9,10,10,12,12,10,10,11,13,13,
- 10,10,10,13,13,12,13,13,16,16,12,13,13,15,16,11,
- 12,12,15,15,12,13,13,16,16,12,13,13,15,15,15,15,
- 15,18,18,15,15,15,17,17,11,12,12,14,15,12,13,13,
- 16,16,12,13,13,15,15,15,15,15,18,18,14,15,15,18,
- 16,
-};
-
-static float _vq_quantthresh_res0_160_1024_4[] = {
- -1.5, -0.5, 0.5, 1.5,
-};
-
-static long _vq_quantmap_res0_160_1024_4[] = {
- 3, 1, 0, 2, 4,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_160_1024_4 = {
- _vq_quantthresh_res0_160_1024_4,
- _vq_quantmap_res0_160_1024_4,
- 5,
- 5
-};
-
-static static_codebook _vq_book_res0_160_1024_4 = {
- 4, 625,
- _vq_lengthlist_res0_160_1024_4,
- 1, -533725184, 1611661312, 3, 0,
- _vq_quantlist_res0_160_1024_4,
- NULL,
- &_vq_auxt_res0_160_1024_4,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_160_1024_5.vqh b/lib/books/res0_160_1024_5.vqh
deleted file mode 100644
index 3b429e77..00000000
--- a/lib/books/res0_160_1024_5.vqh
+++ /dev/null
@@ -1,80 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_160_1024_5_VQH_
-#define _V_res0_160_1024_5_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_160_1024_5[] = {
- 6,
- 5,
- 7,
- 4,
- 8,
- 3,
- 9,
- 2,
- 10,
- 1,
- 11,
- 0,
- 12,
-};
-
-static long _vq_lengthlist_res0_160_1024_5[] = {
- 2, 3, 3, 6, 6, 7, 7, 8, 8,10, 9,11,11, 4, 5, 5,
- 8, 8, 8, 8,11,11,12,12,14,13, 3, 5, 5, 8, 8, 8,
- 8,11,11,12,12,13,13, 6, 8, 8,10,10,11,11,13,13,
- 15,15,16,16, 6, 8, 8,10,10,11,11,13,13,15,15,16,
- 16, 7, 9, 9,11,11,13,13,15,15,16,16,17,17, 7, 9,
- 9,11,11,13,13,15,15,16,17,17,17, 8,11,11,13,13,
- 15,15,16,16,18,18,19,19, 8,11,11,13,13,15,15,16,
- 16,18,18,19,19,10,13,12,15,15,16,16,18,17,19,18,
- 20,21,10,12,12,15,15,16,17,17,17,18,19,19,19,11,
- 14,14,16,16,18,18,19,19,20,19,21,20,11,14,14,16,
- 16,17,17,19,18,20,19,21,21,
-};
-
-static float _vq_quantthresh_res0_160_1024_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,
-};
-
-static long _vq_quantmap_res0_160_1024_5[] = {
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_160_1024_5 = {
- _vq_quantthresh_res0_160_1024_5,
- _vq_quantmap_res0_160_1024_5,
- 13,
- 13
-};
-
-static static_codebook _vq_book_res0_160_1024_5 = {
- 2, 169,
- _vq_lengthlist_res0_160_1024_5,
- 1, -531103744, 1611661312, 4, 0,
- _vq_quantlist_res0_160_1024_5,
- NULL,
- &_vq_auxt_res0_160_1024_5,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_160_1024_6.vqh b/lib/books/res0_160_1024_6.vqh
deleted file mode 100644
index 09e374c3..00000000
--- a/lib/books/res0_160_1024_6.vqh
+++ /dev/null
@@ -1,80 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_160_1024_6_VQH_
-#define _V_res0_160_1024_6_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_160_1024_6[] = {
- 6,
- 5,
- 7,
- 4,
- 8,
- 3,
- 9,
- 2,
- 10,
- 1,
- 11,
- 0,
- 12,
-};
-
-static long _vq_lengthlist_res0_160_1024_6[] = {
- 3, 4, 4, 5, 5, 6, 7, 8, 8, 9, 9,10,10, 4, 5, 4,
- 6, 6, 7, 7, 9, 9,10,10,11,11, 4, 5, 4, 6, 6, 7,
- 7, 9, 9,10,10,11,11, 5, 6, 6, 8, 8, 9, 9,10,10,
- 12,12,13,13, 5, 6, 6, 8, 8, 9, 9,10,10,12,11,13,
- 13, 7, 8, 8, 9, 9,11,11,12,12,13,13,14,14, 7, 8,
- 8, 9, 9,10,11,12,12,13,13,14,14, 8, 9, 9,11,11,
- 12,12,13,13,14,14,15,15, 8, 9, 9,11,11,12,12,13,
- 13,14,14,15,15, 9,10,10,12,12,13,13,14,14,15,15,
- 16,16, 9,10,10,12,12,13,13,14,14,15,15,16,16,10,
- 12,12,13,13,14,15,15,15,16,16,17,17,10,12,11,13,
- 13,14,14,15,15,16,16,17,17,
-};
-
-static float _vq_quantthresh_res0_160_1024_6[] = {
- -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_res0_160_1024_6[] = {
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_160_1024_6 = {
- _vq_quantthresh_res0_160_1024_6,
- _vq_quantmap_res0_160_1024_6,
- 13,
- 13
-};
-
-static static_codebook _vq_book_res0_160_1024_6 = {
- 2, 169,
- _vq_lengthlist_res0_160_1024_6,
- 1, -531103744, 1611661312, 4, 0,
- _vq_quantlist_res0_160_1024_6,
- NULL,
- &_vq_auxt_res0_160_1024_6,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_160_1024_7.vqh b/lib/books/res0_160_1024_7.vqh
deleted file mode 100644
index 15c32504..00000000
--- a/lib/books/res0_160_1024_7.vqh
+++ /dev/null
@@ -1,142 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_160_1024_7_VQH_
-#define _V_res0_160_1024_7_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_160_1024_7[] = {
- 14,
- 13,
- 15,
- 12,
- 16,
- 11,
- 17,
- 10,
- 18,
- 9,
- 19,
- 8,
- 20,
- 7,
- 21,
- 6,
- 22,
- 5,
- 23,
- 4,
- 24,
- 3,
- 25,
- 2,
- 26,
- 1,
- 27,
- 0,
- 28,
-};
-
-static long _vq_lengthlist_res0_160_1024_7[] = {
- 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8,
- 8, 9, 9, 9, 9,10,10,10,10,10,10,10,10, 4, 6, 6,
- 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10,10,10,11,10,
- 11,11,11,11,12,11,12,12,12,12, 4, 6, 6, 7, 7, 8,
- 8, 9, 9, 9, 9,10,10,10,10,10,10,10,10,11,11,11,
- 11,11,11,12,12,12,12, 6, 7, 7, 9, 9, 9, 9,10,10,
- 11,11,11,11,11,11,12,12,12,12,12,12,13,13,13,13,
- 13,13,14,14, 6, 7, 7, 9, 9, 9, 9,10,10,11,11,11,
- 11,11,11,11,12,12,12,12,12,13,13,13,13,13,13,14,
- 13, 7, 8, 8, 9,10,10,10,11,11,12,12,12,12,12,12,
- 13,13,13,13,13,13,14,14,14,14,14,14,14,14, 7, 8,
- 8,10, 9,10,10,11,11,12,12,12,12,12,12,13,13,13,
- 13,13,13,14,14,14,14,14,14,14,15, 8, 9, 9,10,10,
- 11,11,12,12,12,12,13,13,13,13,13,13,14,14,14,14,
- 15,14,15,15,15,15,15,15, 8, 9, 9,10,10,11,11,12,
- 12,12,12,13,13,13,13,13,13,14,14,14,14,14,14,15,
- 15,15,15,15,15, 8,10,10,11,11,12,12,12,12,13,13,
- 13,13,13,14,14,14,14,14,15,15,15,15,15,15,15,15,
- 16,16, 8,10,10,11,11,12,12,12,12,13,13,14,13,14,
- 14,14,14,14,14,15,14,15,15,15,15,15,15,16,15, 9,
- 10,10,12,12,12,12,13,13,14,14,14,14,14,14,14,15,
- 15,15,15,15,16,16,15,16,16,16,16,16, 9,10,10,12,
- 12,12,12,13,13,14,14,14,14,14,14,15,15,15,15,15,
- 16,16,15,16,15,16,16,17,16, 8,10,10,12,11,12,12,
- 13,13,14,14,14,14,15,15,15,15,16,15,16,16,16,16,
- 16,16,16,16,16,17, 9,10,10,12,11,13,12,13,13,14,
- 14,14,14,15,15,15,15,15,16,15,16,16,16,16,16,17,
- 16,17,17, 9,11,11,12,12,13,13,14,14,14,14,15,15,
- 15,15,15,15,15,16,16,16,17,16,17,16,17,16,17,17,
- 9,11,11,12,12,13,13,14,13,14,14,15,15,15,15,15,
- 16,16,15,16,16,17,17,16,17,17,17,17,17, 9,11,11,
- 13,12,13,13,14,14,15,15,15,15,16,16,16,16,16,16,
- 17,16,16,17,17,16,17,17,17,18, 9,11,11,12,13,14,
- 13,14,14,15,14,15,15,15,15,16,16,16,16,17,17,16,
- 17,16,17,18,17,18,17,10,11,12,13,13,14,14,15,15,
- 15,15,15,16,16,16,17,16,17,17,17,17,17,17,18,18,
- 17,18,18,18,10,12,11,13,13,14,14,15,14,15,15,16,
- 16,16,16,16,16,16,16,17,16,17,17,17,17,17,17,18,
- 18,10,12,12,13,13,14,14,15,15,15,16,16,16,16,16,
- 17,17,16,17,17,17,17,17,17,17,18,18,18,18,10,12,
- 12,13,13,14,14,15,15,16,15,16,16,16,16,17,17,17,
- 17,17,17,17,17,17,17,17,18,18,18,11,12,12,14,14,
- 15,15,15,15,16,16,16,16,17,17,17,17,17,17,17,17,
- 19,17,17,18,19,18,17,19,11,12,12,14,14,15,14,16,
- 15,16,15,16,16,16,17,17,16,18,17,17,17,18,17,18,
- 18,18,18,18,18,11,13,13,14,14,15,15,16,15,16,16,
- 16,16,17,17,17,17,17,17,17,18,17,17,18,17,19,18,
- 18,18,11,13,13,14,14,15,15,15,16,16,16,17,17,17,
- 17,17,17,17,17,18,18,18,17,18,18,18,17,19,19,11,
- 13,13,14,14,15,15,16,16,17,16,17,16,18,17,17,17,
- 17,17,17,17,19,18,19,18,18,18,18,19,11,13,13,15,
- 15,15,15,16,16,16,17,17,17,17,17,18,17,17,18,17,
- 18,18,17,18,19,18,18,18,18,
-};
-
-static float _vq_quantthresh_res0_160_1024_7[] = {
- -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, -7.5, -6.5,
- -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5,
- 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5,
- 10.5, 11.5, 12.5, 13.5,
-};
-
-static long _vq_quantmap_res0_160_1024_7[] = {
- 27, 25, 23, 21, 19, 17, 15, 13,
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12, 14, 16, 18,
- 20, 22, 24, 26, 28,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_160_1024_7 = {
- _vq_quantthresh_res0_160_1024_7,
- _vq_quantmap_res0_160_1024_7,
- 29,
- 29
-};
-
-static static_codebook _vq_book_res0_160_1024_7 = {
- 2, 841,
- _vq_lengthlist_res0_160_1024_7,
- 1, -528744448, 1611661312, 5, 0,
- _vq_quantlist_res0_160_1024_7,
- NULL,
- &_vq_auxt_res0_160_1024_7,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_160_1024_8.vqh b/lib/books/res0_160_1024_8.vqh
deleted file mode 100644
index 022c12a1..00000000
--- a/lib/books/res0_160_1024_8.vqh
+++ /dev/null
@@ -1,133 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_160_1024_8_VQH_
-#define _V_res0_160_1024_8_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_160_1024_8[] = {
- 30,
- 29,
- 31,
- 28,
- 32,
- 27,
- 33,
- 26,
- 34,
- 25,
- 35,
- 24,
- 36,
- 23,
- 37,
- 22,
- 38,
- 21,
- 39,
- 20,
- 40,
- 19,
- 41,
- 18,
- 42,
- 17,
- 43,
- 16,
- 44,
- 15,
- 45,
- 14,
- 46,
- 13,
- 47,
- 12,
- 48,
- 11,
- 49,
- 10,
- 50,
- 9,
- 51,
- 8,
- 52,
- 7,
- 53,
- 6,
- 54,
- 5,
- 55,
- 4,
- 56,
- 3,
- 57,
- 2,
- 58,
- 1,
- 59,
- 0,
- 60,
-};
-
-static long _vq_lengthlist_res0_160_1024_8[] = {
- 2, 3, 3, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 7,
- 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 7, 8,
- 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,
- 10,10,10,10,10,10,10,10,10,11,11,11,11,
-};
-
-static float _vq_quantthresh_res0_160_1024_8[] = {
- -29.5, -28.5, -27.5, -26.5, -25.5, -24.5, -23.5, -22.5,
- -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, -15.5, -14.5,
- -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, -7.5, -6.5,
- -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5,
- 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5,
- 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 16.5, 17.5,
- 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 24.5, 25.5,
- 26.5, 27.5, 28.5, 29.5,
-};
-
-static long _vq_quantmap_res0_160_1024_8[] = {
- 59, 57, 55, 53, 51, 49, 47, 45,
- 43, 41, 39, 37, 35, 33, 31, 29,
- 27, 25, 23, 21, 19, 17, 15, 13,
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12, 14, 16, 18,
- 20, 22, 24, 26, 28, 30, 32, 34,
- 36, 38, 40, 42, 44, 46, 48, 50,
- 52, 54, 56, 58, 60,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_160_1024_8 = {
- _vq_quantthresh_res0_160_1024_8,
- _vq_quantmap_res0_160_1024_8,
- 61,
- 61
-};
-
-static static_codebook _vq_book_res0_160_1024_8 = {
- 1, 61,
- _vq_lengthlist_res0_160_1024_8,
- 1, -526516224, 1611661312, 6, 0,
- _vq_quantlist_res0_160_1024_8,
- NULL,
- &_vq_auxt_res0_160_1024_8,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_160_1024_9.vqh b/lib/books/res0_160_1024_9.vqh
deleted file mode 100644
index 6aa78674..00000000
--- a/lib/books/res0_160_1024_9.vqh
+++ /dev/null
@@ -1,632 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_160_1024_9_VQH_
-#define _V_res0_160_1024_9_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_160_1024_9[] = {
- 220,
- 219,
- 221,
- 218,
- 222,
- 217,
- 223,
- 216,
- 224,
- 215,
- 225,
- 214,
- 226,
- 213,
- 227,
- 212,
- 228,
- 211,
- 229,
- 210,
- 230,
- 209,
- 231,
- 208,
- 232,
- 207,
- 233,
- 206,
- 234,
- 205,
- 235,
- 204,
- 236,
- 203,
- 237,
- 202,
- 238,
- 201,
- 239,
- 200,
- 240,
- 199,
- 241,
- 198,
- 242,
- 197,
- 243,
- 196,
- 244,
- 195,
- 245,
- 194,
- 246,
- 193,
- 247,
- 192,
- 248,
- 191,
- 249,
- 190,
- 250,
- 189,
- 251,
- 188,
- 252,
- 187,
- 253,
- 186,
- 254,
- 185,
- 255,
- 184,
- 256,
- 183,
- 257,
- 182,
- 258,
- 181,
- 259,
- 180,
- 260,
- 179,
- 261,
- 178,
- 262,
- 177,
- 263,
- 176,
- 264,
- 175,
- 265,
- 174,
- 266,
- 173,
- 267,
- 172,
- 268,
- 171,
- 269,
- 170,
- 270,
- 169,
- 271,
- 168,
- 272,
- 167,
- 273,
- 166,
- 274,
- 165,
- 275,
- 164,
- 276,
- 163,
- 277,
- 162,
- 278,
- 161,
- 279,
- 160,
- 280,
- 159,
- 281,
- 158,
- 282,
- 157,
- 283,
- 156,
- 284,
- 155,
- 285,
- 154,
- 286,
- 153,
- 287,
- 152,
- 288,
- 151,
- 289,
- 150,
- 290,
- 149,
- 291,
- 148,
- 292,
- 147,
- 293,
- 146,
- 294,
- 145,
- 295,
- 144,
- 296,
- 143,
- 297,
- 142,
- 298,
- 141,
- 299,
- 140,
- 300,
- 139,
- 301,
- 138,
- 302,
- 137,
- 303,
- 136,
- 304,
- 135,
- 305,
- 134,
- 306,
- 133,
- 307,
- 132,
- 308,
- 131,
- 309,
- 130,
- 310,
- 129,
- 311,
- 128,
- 312,
- 127,
- 313,
- 126,
- 314,
- 125,
- 315,
- 124,
- 316,
- 123,
- 317,
- 122,
- 318,
- 121,
- 319,
- 120,
- 320,
- 119,
- 321,
- 118,
- 322,
- 117,
- 323,
- 116,
- 324,
- 115,
- 325,
- 114,
- 326,
- 113,
- 327,
- 112,
- 328,
- 111,
- 329,
- 110,
- 330,
- 109,
- 331,
- 108,
- 332,
- 107,
- 333,
- 106,
- 334,
- 105,
- 335,
- 104,
- 336,
- 103,
- 337,
- 102,
- 338,
- 101,
- 339,
- 100,
- 340,
- 99,
- 341,
- 98,
- 342,
- 97,
- 343,
- 96,
- 344,
- 95,
- 345,
- 94,
- 346,
- 93,
- 347,
- 92,
- 348,
- 91,
- 349,
- 90,
- 350,
- 89,
- 351,
- 88,
- 352,
- 87,
- 353,
- 86,
- 354,
- 85,
- 355,
- 84,
- 356,
- 83,
- 357,
- 82,
- 358,
- 81,
- 359,
- 80,
- 360,
- 79,
- 361,
- 78,
- 362,
- 77,
- 363,
- 76,
- 364,
- 75,
- 365,
- 74,
- 366,
- 73,
- 367,
- 72,
- 368,
- 71,
- 369,
- 70,
- 370,
- 69,
- 371,
- 68,
- 372,
- 67,
- 373,
- 66,
- 374,
- 65,
- 375,
- 64,
- 376,
- 63,
- 377,
- 62,
- 378,
- 61,
- 379,
- 60,
- 380,
- 59,
- 381,
- 58,
- 382,
- 57,
- 383,
- 56,
- 384,
- 55,
- 385,
- 54,
- 386,
- 53,
- 387,
- 52,
- 388,
- 51,
- 389,
- 50,
- 390,
- 49,
- 391,
- 48,
- 392,
- 47,
- 393,
- 46,
- 394,
- 45,
- 395,
- 44,
- 396,
- 43,
- 397,
- 42,
- 398,
- 41,
- 399,
- 40,
- 400,
- 39,
- 401,
- 38,
- 402,
- 37,
- 403,
- 36,
- 404,
- 35,
- 405,
- 34,
- 406,
- 33,
- 407,
- 32,
- 408,
- 31,
- 409,
- 30,
- 410,
- 29,
- 411,
- 28,
- 412,
- 27,
- 413,
- 26,
- 414,
- 25,
- 415,
- 24,
- 416,
- 23,
- 417,
- 22,
- 418,
- 21,
- 419,
- 20,
- 420,
- 19,
- 421,
- 18,
- 422,
- 17,
- 423,
- 16,
- 424,
- 15,
- 425,
- 14,
- 426,
- 13,
- 427,
- 12,
- 428,
- 11,
- 429,
- 10,
- 430,
- 9,
- 431,
- 8,
- 432,
- 7,
- 433,
- 6,
- 434,
- 5,
- 435,
- 4,
- 436,
- 3,
- 437,
- 2,
- 438,
- 1,
- 439,
- 0,
- 440,
-};
-
-static long _vq_lengthlist_res0_160_1024_9[] = {
- 3, 4, 4, 4, 4, 5, 5, 5, 5, 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, 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,10,10,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,12,12,11,12,12,12,
- 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,14,14,14,14,13,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,15,14,15,14,14,14,14,
- 14,14,14,15,15,15,15,14,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,17,15,16,15,
- 16,15,16,16,16,16,15,16,16,16,16,16,16,16,16,16,
- 16,16,17,16,17,17,16,16,17,17,17,16,16,17,16,17,
- 17,17,17,17,17,17,17,17,17,17,17,18,17,17,17,18,
- 17,18,19,17,18,17,20,18,18,18,18,18,18,18,17,18,
- 19,18,19,18,19,17,18,19,19,18,18,18,18,18,19,18,
- 19,19,18,19,18,20,19,19,19,20,19,18,18,18,19,20,
- 19,20,20,19,21,21,20,21,19,21,20,21,20,19,20,19,
- 19,20,19,20,20,19,21,21,19,21,19,21,20,20,20,19,
- 19,20,21,21,20,21,20,20,20,21,21,21,21,21,21,21,
- 21,21,20,21,21,20,21,21,21,21,21,21,21,20,19,21,
- 21,20,21,20,21,21,20,21,21,20,21,21,21,21,21,21,
- 21,21,21,21,20,21,21,21,21,21,21,21,21,21,21,21,
- 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
- 21,21,21,21,20,21,21,21,21,21,21,21,21,21,21,20,
- 21,21,21,21,21,21,21,21,20,
-};
-
-static float _vq_quantthresh_res0_160_1024_9[] = {
- -219.5, -218.5, -217.5, -216.5, -215.5, -214.5, -213.5, -212.5,
- -211.5, -210.5, -209.5, -208.5, -207.5, -206.5, -205.5, -204.5,
- -203.5, -202.5, -201.5, -200.5, -199.5, -198.5, -197.5, -196.5,
- -195.5, -194.5, -193.5, -192.5, -191.5, -190.5, -189.5, -188.5,
- -187.5, -186.5, -185.5, -184.5, -183.5, -182.5, -181.5, -180.5,
- -179.5, -178.5, -177.5, -176.5, -175.5, -174.5, -173.5, -172.5,
- -171.5, -170.5, -169.5, -168.5, -167.5, -166.5, -165.5, -164.5,
- -163.5, -162.5, -161.5, -160.5, -159.5, -158.5, -157.5, -156.5,
- -155.5, -154.5, -153.5, -152.5, -151.5, -150.5, -149.5, -148.5,
- -147.5, -146.5, -145.5, -144.5, -143.5, -142.5, -141.5, -140.5,
- -139.5, -138.5, -137.5, -136.5, -135.5, -134.5, -133.5, -132.5,
- -131.5, -130.5, -129.5, -128.5, -127.5, -126.5, -125.5, -124.5,
- -123.5, -122.5, -121.5, -120.5, -119.5, -118.5, -117.5, -116.5,
- -115.5, -114.5, -113.5, -112.5, -111.5, -110.5, -109.5, -108.5,
- -107.5, -106.5, -105.5, -104.5, -103.5, -102.5, -101.5, -100.5,
- -99.5, -98.5, -97.5, -96.5, -95.5, -94.5, -93.5, -92.5,
- -91.5, -90.5, -89.5, -88.5, -87.5, -86.5, -85.5, -84.5,
- -83.5, -82.5, -81.5, -80.5, -79.5, -78.5, -77.5, -76.5,
- -75.5, -74.5, -73.5, -72.5, -71.5, -70.5, -69.5, -68.5,
- -67.5, -66.5, -65.5, -64.5, -63.5, -62.5, -61.5, -60.5,
- -59.5, -58.5, -57.5, -56.5, -55.5, -54.5, -53.5, -52.5,
- -51.5, -50.5, -49.5, -48.5, -47.5, -46.5, -45.5, -44.5,
- -43.5, -42.5, -41.5, -40.5, -39.5, -38.5, -37.5, -36.5,
- -35.5, -34.5, -33.5, -32.5, -31.5, -30.5, -29.5, -28.5,
- -27.5, -26.5, -25.5, -24.5, -23.5, -22.5, -21.5, -20.5,
- -19.5, -18.5, -17.5, -16.5, -15.5, -14.5, -13.5, -12.5,
- -11.5, -10.5, -9.5, -8.5, -7.5, -6.5, -5.5, -4.5,
- -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5,
- 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 11.5,
- 12.5, 13.5, 14.5, 15.5, 16.5, 17.5, 18.5, 19.5,
- 20.5, 21.5, 22.5, 23.5, 24.5, 25.5, 26.5, 27.5,
- 28.5, 29.5, 30.5, 31.5, 32.5, 33.5, 34.5, 35.5,
- 36.5, 37.5, 38.5, 39.5, 40.5, 41.5, 42.5, 43.5,
- 44.5, 45.5, 46.5, 47.5, 48.5, 49.5, 50.5, 51.5,
- 52.5, 53.5, 54.5, 55.5, 56.5, 57.5, 58.5, 59.5,
- 60.5, 61.5, 62.5, 63.5, 64.5, 65.5, 66.5, 67.5,
- 68.5, 69.5, 70.5, 71.5, 72.5, 73.5, 74.5, 75.5,
- 76.5, 77.5, 78.5, 79.5, 80.5, 81.5, 82.5, 83.5,
- 84.5, 85.5, 86.5, 87.5, 88.5, 89.5, 90.5, 91.5,
- 92.5, 93.5, 94.5, 95.5, 96.5, 97.5, 98.5, 99.5,
- 100.5, 101.5, 102.5, 103.5, 104.5, 105.5, 106.5, 107.5,
- 108.5, 109.5, 110.5, 111.5, 112.5, 113.5, 114.5, 115.5,
- 116.5, 117.5, 118.5, 119.5, 120.5, 121.5, 122.5, 123.5,
- 124.5, 125.5, 126.5, 127.5, 128.5, 129.5, 130.5, 131.5,
- 132.5, 133.5, 134.5, 135.5, 136.5, 137.5, 138.5, 139.5,
- 140.5, 141.5, 142.5, 143.5, 144.5, 145.5, 146.5, 147.5,
- 148.5, 149.5, 150.5, 151.5, 152.5, 153.5, 154.5, 155.5,
- 156.5, 157.5, 158.5, 159.5, 160.5, 161.5, 162.5, 163.5,
- 164.5, 165.5, 166.5, 167.5, 168.5, 169.5, 170.5, 171.5,
- 172.5, 173.5, 174.5, 175.5, 176.5, 177.5, 178.5, 179.5,
- 180.5, 181.5, 182.5, 183.5, 184.5, 185.5, 186.5, 187.5,
- 188.5, 189.5, 190.5, 191.5, 192.5, 193.5, 194.5, 195.5,
- 196.5, 197.5, 198.5, 199.5, 200.5, 201.5, 202.5, 203.5,
- 204.5, 205.5, 206.5, 207.5, 208.5, 209.5, 210.5, 211.5,
- 212.5, 213.5, 214.5, 215.5, 216.5, 217.5, 218.5, 219.5,
-};
-
-static long _vq_quantmap_res0_160_1024_9[] = {
- 439, 437, 435, 433, 431, 429, 427, 425,
- 423, 421, 419, 417, 415, 413, 411, 409,
- 407, 405, 403, 401, 399, 397, 395, 393,
- 391, 389, 387, 385, 383, 381, 379, 377,
- 375, 373, 371, 369, 367, 365, 363, 361,
- 359, 357, 355, 353, 351, 349, 347, 345,
- 343, 341, 339, 337, 335, 333, 331, 329,
- 327, 325, 323, 321, 319, 317, 315, 313,
- 311, 309, 307, 305, 303, 301, 299, 297,
- 295, 293, 291, 289, 287, 285, 283, 281,
- 279, 277, 275, 273, 271, 269, 267, 265,
- 263, 261, 259, 257, 255, 253, 251, 249,
- 247, 245, 243, 241, 239, 237, 235, 233,
- 231, 229, 227, 225, 223, 221, 219, 217,
- 215, 213, 211, 209, 207, 205, 203, 201,
- 199, 197, 195, 193, 191, 189, 187, 185,
- 183, 181, 179, 177, 175, 173, 171, 169,
- 167, 165, 163, 161, 159, 157, 155, 153,
- 151, 149, 147, 145, 143, 141, 139, 137,
- 135, 133, 131, 129, 127, 125, 123, 121,
- 119, 117, 115, 113, 111, 109, 107, 105,
- 103, 101, 99, 97, 95, 93, 91, 89,
- 87, 85, 83, 81, 79, 77, 75, 73,
- 71, 69, 67, 65, 63, 61, 59, 57,
- 55, 53, 51, 49, 47, 45, 43, 41,
- 39, 37, 35, 33, 31, 29, 27, 25,
- 23, 21, 19, 17, 15, 13, 11, 9,
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8, 10, 12, 14, 16, 18, 20, 22,
- 24, 26, 28, 30, 32, 34, 36, 38,
- 40, 42, 44, 46, 48, 50, 52, 54,
- 56, 58, 60, 62, 64, 66, 68, 70,
- 72, 74, 76, 78, 80, 82, 84, 86,
- 88, 90, 92, 94, 96, 98, 100, 102,
- 104, 106, 108, 110, 112, 114, 116, 118,
- 120, 122, 124, 126, 128, 130, 132, 134,
- 136, 138, 140, 142, 144, 146, 148, 150,
- 152, 154, 156, 158, 160, 162, 164, 166,
- 168, 170, 172, 174, 176, 178, 180, 182,
- 184, 186, 188, 190, 192, 194, 196, 198,
- 200, 202, 204, 206, 208, 210, 212, 214,
- 216, 218, 220, 222, 224, 226, 228, 230,
- 232, 234, 236, 238, 240, 242, 244, 246,
- 248, 250, 252, 254, 256, 258, 260, 262,
- 264, 266, 268, 270, 272, 274, 276, 278,
- 280, 282, 284, 286, 288, 290, 292, 294,
- 296, 298, 300, 302, 304, 306, 308, 310,
- 312, 314, 316, 318, 320, 322, 324, 326,
- 328, 330, 332, 334, 336, 338, 340, 342,
- 344, 346, 348, 350, 352, 354, 356, 358,
- 360, 362, 364, 366, 368, 370, 372, 374,
- 376, 378, 380, 382, 384, 386, 388, 390,
- 392, 394, 396, 398, 400, 402, 404, 406,
- 408, 410, 412, 414, 416, 418, 420, 422,
- 424, 426, 428, 430, 432, 434, 436, 438,
- 440,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_160_1024_9 = {
- _vq_quantthresh_res0_160_1024_9,
- _vq_quantmap_res0_160_1024_9,
- 441,
- 441
-};
-
-static static_codebook _vq_book_res0_160_1024_9 = {
- 1, 441,
- _vq_lengthlist_res0_160_1024_9,
- 1, -520388608, 1611661312, 9, 0,
- _vq_quantlist_res0_160_1024_9,
- NULL,
- &_vq_auxt_res0_160_1024_9,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_160_1024aux.vqh b/lib/books/res0_160_1024aux.vqh
deleted file mode 100644
index 2941c4ce..00000000
--- a/lib/books/res0_160_1024aux.vqh
+++ /dev/null
@@ -1,43 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- * *
- ********************************************************************
-
- function: static codebook autogenerated by huff/huffbuld
-
- ********************************************************************/
-
-#ifndef _V_res0_160_1024aux_VQH_
-#define _V_res0_160_1024aux_VQH_
-#include "codebook.h"
-
-static long _huff_lengthlist_res0_160_1024aux[] = {
- 3, 7,12,11,15,10,14,11,14,19, 5, 4, 7, 7, 8, 8,
- 9,10,12,19,10, 6, 5, 5, 6, 7, 8,12,14,18, 9, 6,
- 5, 4, 5, 6, 6, 9,12,17,13, 8, 5, 5, 5, 6, 7,11,
- 14,18, 9, 7, 7, 5, 6, 5, 6, 7,11,18,13, 8, 7, 6,
- 6, 6, 6, 8,10,17,10, 9,10, 8, 9, 6, 6, 6, 8,14,
- 10,10,12,10,11, 8, 7, 6, 7,12,13,12,13,11,13,10,
- 7, 6, 6,12,
-};
-
-static static_codebook _huff_book_res0_160_1024aux = {
- 2, 100,
- _huff_lengthlist_res0_160_1024aux,
- 0, 0, 0, 0, 0,
- NULL,
- NULL,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_160_128_1.vqh b/lib/books/res0_160_128_1.vqh
deleted file mode 100644
index d5c5b05b..00000000
--- a/lib/books/res0_160_128_1.vqh
+++ /dev/null
@@ -1,63 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_160_128_1_VQH_
-#define _V_res0_160_128_1_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_160_128_1[] = {
- 1,
- 0,
- 2,
-};
-
-static long _vq_lengthlist_res0_160_128_1[] = {
- 3, 4, 4, 5, 6, 6, 4, 6, 6, 5, 6, 6, 6, 7, 8, 6,
- 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 7, 5, 6, 6, 7, 8,
- 8, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 8,
- 8, 9, 9, 8, 9, 9, 5, 6, 6, 6, 8, 8, 7, 8, 8, 6,
- 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 8, 8, 9, 9, 8, 9,
- 9,
-};
-
-static float _vq_quantthresh_res0_160_128_1[] = {
- -0.5, 0.5,
-};
-
-static long _vq_quantmap_res0_160_128_1[] = {
- 1, 0, 2,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_160_128_1 = {
- _vq_quantthresh_res0_160_128_1,
- _vq_quantmap_res0_160_128_1,
- 3,
- 3
-};
-
-static static_codebook _vq_book_res0_160_128_1 = {
- 4, 81,
- _vq_lengthlist_res0_160_128_1,
- 1, -535822336, 1611661312, 2, 0,
- _vq_quantlist_res0_160_128_1,
- NULL,
- &_vq_auxt_res0_160_128_1,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_160_128_2.vqh b/lib/books/res0_160_128_2.vqh
deleted file mode 100644
index c4a9f7be..00000000
--- a/lib/books/res0_160_128_2.vqh
+++ /dev/null
@@ -1,65 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_160_128_2_VQH_
-#define _V_res0_160_128_2_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_160_128_2[] = {
- 3,
- 2,
- 4,
- 1,
- 5,
- 0,
- 6,
-};
-
-static long _vq_lengthlist_res0_160_128_2[] = {
- 2, 3, 3, 5, 5, 8, 8, 4, 5, 5, 7, 7,10, 9, 3, 5,
- 5, 7, 7, 9, 9, 6, 7, 7,10,10,13,13, 6, 7, 7,10,
- 10,13,13, 8,10,10,14,13,16,17, 8,10,10,13,13,15,
- 17,
-};
-
-static float _vq_quantthresh_res0_160_128_2[] = {
- -2.5, -1.5, -0.5, 0.5, 1.5, 2.5,
-};
-
-static long _vq_quantmap_res0_160_128_2[] = {
- 5, 3, 1, 0, 2, 4, 6,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_160_128_2 = {
- _vq_quantthresh_res0_160_128_2,
- _vq_quantmap_res0_160_128_2,
- 7,
- 7
-};
-
-static static_codebook _vq_book_res0_160_128_2 = {
- 2, 49,
- _vq_lengthlist_res0_160_128_2,
- 1, -533200896, 1611661312, 3, 0,
- _vq_quantlist_res0_160_128_2,
- NULL,
- &_vq_auxt_res0_160_128_2,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_160_128_3.vqh b/lib/books/res0_160_128_3.vqh
deleted file mode 100644
index e7ee2f6b..00000000
--- a/lib/books/res0_160_128_3.vqh
+++ /dev/null
@@ -1,152 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_160_128_3_VQH_
-#define _V_res0_160_128_3_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_160_128_3[] = {
- 15,
- 14,
- 16,
- 13,
- 17,
- 12,
- 18,
- 11,
- 19,
- 10,
- 20,
- 9,
- 21,
- 8,
- 22,
- 7,
- 23,
- 6,
- 24,
- 5,
- 25,
- 4,
- 26,
- 3,
- 27,
- 2,
- 28,
- 1,
- 29,
- 0,
- 30,
-};
-
-static long _vq_lengthlist_res0_160_128_3[] = {
- 3, 4, 4, 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,
- 9, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 4,
- 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 9, 8, 9, 9, 9,
- 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 4, 5,
- 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 9, 8, 9, 8, 9, 9,
- 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 7, 7, 7,
- 9, 9,10,10,10,10,10,11,10,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11, 7, 7, 7, 9,
- 9,10, 9,10,10,10,10,10,10,10,11,11,11,11,11,11,
- 12,11,11,11,11,11,11,11,11,11,11, 8, 9, 9,10,10,
- 11,11,11,11,12,12,12,12,12,13,12,12,12,13,13,13,
- 12,12,12,13,12,13,12,13,12,13, 8, 9, 9,11,10,11,
- 11,12,12,12,12,12,12,12,12,12,13,12,13,12,13,12,
- 12,12,12,12,12,13,13,13,12, 8,10,10,12,11,12,12,
- 13,14,13,14,14,14,14,14,13,14,14,14,13,15,13,14,
- 13,13,13,14,14,13,14,14, 8,10,10,11,11,12,13,13,
- 13,13,13,13,14,13,14,13,14,13,15,14,13,14,14,13,
- 14,14,14,13,14,14,13,10,11,11,12,13,13,14,13,14,
- 14,14,14,13,14,16,14,15,14,15,14,15,14,15,14,15,
- 15,15,14,14,15,15,10,11,11,13,12,13,13,13,14,14,
- 14,14,14,14,15,14,15,14,15,15,15,15,15,14,14,15,
- 14,15,15,17,14,11,12,12,14,13,13,14,14,15,14,14,
- 15,15,15,15,15,15,16,16,15,16,16,15,15,15,15,15,
- 15,14,15,15,11,12,12,13,13,14,15,15,15,15,15,15,
- 16,15,15,15,15,15,16,15,15,15,15,15,16,16,15,17,
- 15,17,16,11,13,13,15,15,15,14,14,16,15,16,15,16,
- 15,16,14,17,15,16,15,17,15,15,16,16,16,16,15,16,
- 17,17,11,12,12,14,14,14,15,16,15,16,15,16,16,15,
- 16,16,17,15,16,15,17,16,15,16,15,17,16,16,15,16,
- 16,12,13,13,15,15,14,16,16,15,16,15,16,16,16,16,
- 16,16,16,16,17,16,15,17,16,16,16,16,17,16,17,17,
- 12,14,13,15,15,15,14,17,16,16,16,15,16,17,16,16,
- 17,16,15,15,16,16,16,16,16,16,16,17,16,16,16,13,
- 14,14,16,15,17,16,16,17,15,16,15,17,16,17,17,17,
- 16,16,16,16,16,16,16,16,17,16,17,16,17,17,13,15,
- 14,15,15,17,16,17,17,17,16,16,16,16,17,16,16,17,
- 16,15,17,16,17,17,16,16,16,16,16,17,17,13,15,14,
- 16,16,17,16,17,16,16,16,15,17,17,17,16,16,16,17,
- 17,17,16,16,16,17,16,15,17,16,17,16,13,14,13,16,
- 16,16,16,17,16,16,16,16,16,16,16,17,17,17,17,16,
- 17,17,17,16,17,17,16,16,16,17,16,14,14,15,16,15,
- 16,16,17,17,16,17,17,16,16,17,17,17,17,16,16,17,
- 16,17,17,17,16,17,17,17,17,17,13,14,14,17,16,16,
- 17,16,16,16,17,17,17,15,16,16,17,16,17,16,16,16,
- 17,16,16,17,17,17,15,16,16,14,15,15,17,16,16,17,
- 17,17,17,17,16,16,16,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,14,15,14,17,16,16,17,17,
- 17,16,17,17,17,17,17,17,17,17,17,17,17,16,17,17,
- 17,16,17,17,17,16,16,15,16,15,16,16,17,17,16,16,
- 17,17,17,17,17,17,17,17,15,17,17,16,17,17,16,17,
- 17,17,17,17,17,17,15,15,16,16,17,16,16,17,16,17,
- 17,17,17,17,17,17,17,17,17,17,17,16,15,17,17,17,
- 17,17,16,17,17,15,16,15,16,17,16,17,17,17,17,17,
- 17,17,17,16,17,16,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,15,16,16,15,16,17,16,16,17,17,17,17,
- 16,17,16,16,17,16,17,17,17,16,16,17,16,16,16,17,
- 16,17,17,15,17,16,16,17,16,16,17,17,17,17,17,17,
- 16,17,17,17,17,17,17,17,17,17,17,17,17,16,17,16,
- 17,16,15,16,16,17,16,17,16,17,17,17,17,17,16,16,
- 17,16,17,16,16,17,17,16,16,17,17,17,16,17,17,17,
- 17,
-};
-
-static float _vq_quantthresh_res0_160_128_3[] = {
- -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, -7.5,
- -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5,
- 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5,
- 9.5, 10.5, 11.5, 12.5, 13.5, 14.5,
-};
-
-static long _vq_quantmap_res0_160_128_3[] = {
- 29, 27, 25, 23, 21, 19, 17, 15,
- 13, 11, 9, 7, 5, 3, 1, 0,
- 2, 4, 6, 8, 10, 12, 14, 16,
- 18, 20, 22, 24, 26, 28, 30,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_160_128_3 = {
- _vq_quantthresh_res0_160_128_3,
- _vq_quantmap_res0_160_128_3,
- 31,
- 31
-};
-
-static static_codebook _vq_book_res0_160_128_3 = {
- 2, 961,
- _vq_lengthlist_res0_160_128_3,
- 1, -528613376, 1611661312, 5, 0,
- _vq_quantlist_res0_160_128_3,
- NULL,
- &_vq_auxt_res0_160_128_3,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_160_128_4.vqh b/lib/books/res0_160_128_4.vqh
deleted file mode 100644
index e3c1d3d8..00000000
--- a/lib/books/res0_160_128_4.vqh
+++ /dev/null
@@ -1,123 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_160_128_4_VQH_
-#define _V_res0_160_128_4_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_160_128_4[] = {
- 26,
- 25,
- 27,
- 24,
- 28,
- 23,
- 29,
- 22,
- 30,
- 21,
- 31,
- 20,
- 32,
- 19,
- 33,
- 18,
- 34,
- 17,
- 35,
- 16,
- 36,
- 15,
- 37,
- 14,
- 38,
- 13,
- 39,
- 12,
- 40,
- 11,
- 41,
- 10,
- 42,
- 9,
- 43,
- 8,
- 44,
- 7,
- 45,
- 6,
- 46,
- 5,
- 47,
- 4,
- 48,
- 3,
- 49,
- 2,
- 50,
- 1,
- 51,
- 0,
- 52,
-};
-
-static long _vq_lengthlist_res0_160_128_4[] = {
- 2, 2, 2, 5, 5, 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, 8,
- 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9, 7,
- 7, 8, 7, 8, 8, 8, 8, 9, 8, 9, 8, 9, 9,10, 9,10,
- 10,10,10,10,10,
-};
-
-static float _vq_quantthresh_res0_160_128_4[] = {
- -25.5, -24.5, -23.5, -22.5, -21.5, -20.5, -19.5, -18.5,
- -17.5, -16.5, -15.5, -14.5, -13.5, -12.5, -11.5, -10.5,
- -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5,
- -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5,
- 6.5, 7.5, 8.5, 9.5, 10.5, 11.5, 12.5, 13.5,
- 14.5, 15.5, 16.5, 17.5, 18.5, 19.5, 20.5, 21.5,
- 22.5, 23.5, 24.5, 25.5,
-};
-
-static long _vq_quantmap_res0_160_128_4[] = {
- 51, 49, 47, 45, 43, 41, 39, 37,
- 35, 33, 31, 29, 27, 25, 23, 21,
- 19, 17, 15, 13, 11, 9, 7, 5,
- 3, 1, 0, 2, 4, 6, 8, 10,
- 12, 14, 16, 18, 20, 22, 24, 26,
- 28, 30, 32, 34, 36, 38, 40, 42,
- 44, 46, 48, 50, 52,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_160_128_4 = {
- _vq_quantthresh_res0_160_128_4,
- _vq_quantmap_res0_160_128_4,
- 53,
- 53
-};
-
-static static_codebook _vq_book_res0_160_128_4 = {
- 1, 53,
- _vq_lengthlist_res0_160_128_4,
- 1, -526778368, 1611661312, 6, 0,
- _vq_quantlist_res0_160_128_4,
- NULL,
- &_vq_auxt_res0_160_128_4,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_160_128_5.vqh b/lib/books/res0_160_128_5.vqh
deleted file mode 100644
index 64522eb9..00000000
--- a/lib/books/res0_160_128_5.vqh
+++ /dev/null
@@ -1,448 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_160_128_5_VQH_
-#define _V_res0_160_128_5_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_160_128_5[] = {
- 150,
- 149,
- 151,
- 148,
- 152,
- 147,
- 153,
- 146,
- 154,
- 145,
- 155,
- 144,
- 156,
- 143,
- 157,
- 142,
- 158,
- 141,
- 159,
- 140,
- 160,
- 139,
- 161,
- 138,
- 162,
- 137,
- 163,
- 136,
- 164,
- 135,
- 165,
- 134,
- 166,
- 133,
- 167,
- 132,
- 168,
- 131,
- 169,
- 130,
- 170,
- 129,
- 171,
- 128,
- 172,
- 127,
- 173,
- 126,
- 174,
- 125,
- 175,
- 124,
- 176,
- 123,
- 177,
- 122,
- 178,
- 121,
- 179,
- 120,
- 180,
- 119,
- 181,
- 118,
- 182,
- 117,
- 183,
- 116,
- 184,
- 115,
- 185,
- 114,
- 186,
- 113,
- 187,
- 112,
- 188,
- 111,
- 189,
- 110,
- 190,
- 109,
- 191,
- 108,
- 192,
- 107,
- 193,
- 106,
- 194,
- 105,
- 195,
- 104,
- 196,
- 103,
- 197,
- 102,
- 198,
- 101,
- 199,
- 100,
- 200,
- 99,
- 201,
- 98,
- 202,
- 97,
- 203,
- 96,
- 204,
- 95,
- 205,
- 94,
- 206,
- 93,
- 207,
- 92,
- 208,
- 91,
- 209,
- 90,
- 210,
- 89,
- 211,
- 88,
- 212,
- 87,
- 213,
- 86,
- 214,
- 85,
- 215,
- 84,
- 216,
- 83,
- 217,
- 82,
- 218,
- 81,
- 219,
- 80,
- 220,
- 79,
- 221,
- 78,
- 222,
- 77,
- 223,
- 76,
- 224,
- 75,
- 225,
- 74,
- 226,
- 73,
- 227,
- 72,
- 228,
- 71,
- 229,
- 70,
- 230,
- 69,
- 231,
- 68,
- 232,
- 67,
- 233,
- 66,
- 234,
- 65,
- 235,
- 64,
- 236,
- 63,
- 237,
- 62,
- 238,
- 61,
- 239,
- 60,
- 240,
- 59,
- 241,
- 58,
- 242,
- 57,
- 243,
- 56,
- 244,
- 55,
- 245,
- 54,
- 246,
- 53,
- 247,
- 52,
- 248,
- 51,
- 249,
- 50,
- 250,
- 49,
- 251,
- 48,
- 252,
- 47,
- 253,
- 46,
- 254,
- 45,
- 255,
- 44,
- 256,
- 43,
- 257,
- 42,
- 258,
- 41,
- 259,
- 40,
- 260,
- 39,
- 261,
- 38,
- 262,
- 37,
- 263,
- 36,
- 264,
- 35,
- 265,
- 34,
- 266,
- 33,
- 267,
- 32,
- 268,
- 31,
- 269,
- 30,
- 270,
- 29,
- 271,
- 28,
- 272,
- 27,
- 273,
- 26,
- 274,
- 25,
- 275,
- 24,
- 276,
- 23,
- 277,
- 22,
- 278,
- 21,
- 279,
- 20,
- 280,
- 19,
- 281,
- 18,
- 282,
- 17,
- 283,
- 16,
- 284,
- 15,
- 285,
- 14,
- 286,
- 13,
- 287,
- 12,
- 288,
- 11,
- 289,
- 10,
- 290,
- 9,
- 291,
- 8,
- 292,
- 7,
- 293,
- 6,
- 294,
- 5,
- 295,
- 4,
- 296,
- 3,
- 297,
- 2,
- 298,
- 1,
- 299,
- 0,
- 300,
-};
-
-static long _vq_lengthlist_res0_160_128_5[] = {
- 2, 2, 3, 4, 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 8,
- 8, 8, 8, 9, 8, 9, 8, 9, 9,10,10,11, 9,12,11,12,
- 11,13,12,13,12,13,13,12,13,15,13,15,14,14,13,15,
- 15,14,15,14,14, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9,
- 10, 9,10, 9,10, 9,11,10,11,10,11,10,11,10,11,10,
- 11,11,11,10,12,11,13,10,11,11,12,11,11,11,12,12,
- 13,11,12,12,12,12,12,12,13,12,13,13,13,12,13,12,
- 13,13,15,12,13,13,14,12,13,13,13,13,14,12,14,14,
- 15,13,15,13,13,13,15,12,15,13,14,13,15,15,14,13,
- 15,14,15,15,14,14,13,13,13,15,15,15,13,14,15,13,
- 14,15,15,13,13,15,15,14,15,14,14,15,14,14,15,14,
- 15,15,15,14,13,15,14,15,15,15,15,15,14,14,15,14,
- 15,15,14,14,15,15,15,14,15,15,15,14,15,15,15,15,
- 14,15,15,15,15,15,13,15,15,15,14,15,15,15,15,15,
- 15,15,15,14,15,13,15,14,15,15,15,15,15,14,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,14,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,14,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,14,13,
-};
-
-static float _vq_quantthresh_res0_160_128_5[] = {
- -149.5, -148.5, -147.5, -146.5, -145.5, -144.5, -143.5, -142.5,
- -141.5, -140.5, -139.5, -138.5, -137.5, -136.5, -135.5, -134.5,
- -133.5, -132.5, -131.5, -130.5, -129.5, -128.5, -127.5, -126.5,
- -125.5, -124.5, -123.5, -122.5, -121.5, -120.5, -119.5, -118.5,
- -117.5, -116.5, -115.5, -114.5, -113.5, -112.5, -111.5, -110.5,
- -109.5, -108.5, -107.5, -106.5, -105.5, -104.5, -103.5, -102.5,
- -101.5, -100.5, -99.5, -98.5, -97.5, -96.5, -95.5, -94.5,
- -93.5, -92.5, -91.5, -90.5, -89.5, -88.5, -87.5, -86.5,
- -85.5, -84.5, -83.5, -82.5, -81.5, -80.5, -79.5, -78.5,
- -77.5, -76.5, -75.5, -74.5, -73.5, -72.5, -71.5, -70.5,
- -69.5, -68.5, -67.5, -66.5, -65.5, -64.5, -63.5, -62.5,
- -61.5, -60.5, -59.5, -58.5, -57.5, -56.5, -55.5, -54.5,
- -53.5, -52.5, -51.5, -50.5, -49.5, -48.5, -47.5, -46.5,
- -45.5, -44.5, -43.5, -42.5, -41.5, -40.5, -39.5, -38.5,
- -37.5, -36.5, -35.5, -34.5, -33.5, -32.5, -31.5, -30.5,
- -29.5, -28.5, -27.5, -26.5, -25.5, -24.5, -23.5, -22.5,
- -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, -15.5, -14.5,
- -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, -7.5, -6.5,
- -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5,
- 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5,
- 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 16.5, 17.5,
- 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 24.5, 25.5,
- 26.5, 27.5, 28.5, 29.5, 30.5, 31.5, 32.5, 33.5,
- 34.5, 35.5, 36.5, 37.5, 38.5, 39.5, 40.5, 41.5,
- 42.5, 43.5, 44.5, 45.5, 46.5, 47.5, 48.5, 49.5,
- 50.5, 51.5, 52.5, 53.5, 54.5, 55.5, 56.5, 57.5,
- 58.5, 59.5, 60.5, 61.5, 62.5, 63.5, 64.5, 65.5,
- 66.5, 67.5, 68.5, 69.5, 70.5, 71.5, 72.5, 73.5,
- 74.5, 75.5, 76.5, 77.5, 78.5, 79.5, 80.5, 81.5,
- 82.5, 83.5, 84.5, 85.5, 86.5, 87.5, 88.5, 89.5,
- 90.5, 91.5, 92.5, 93.5, 94.5, 95.5, 96.5, 97.5,
- 98.5, 99.5, 100.5, 101.5, 102.5, 103.5, 104.5, 105.5,
- 106.5, 107.5, 108.5, 109.5, 110.5, 111.5, 112.5, 113.5,
- 114.5, 115.5, 116.5, 117.5, 118.5, 119.5, 120.5, 121.5,
- 122.5, 123.5, 124.5, 125.5, 126.5, 127.5, 128.5, 129.5,
- 130.5, 131.5, 132.5, 133.5, 134.5, 135.5, 136.5, 137.5,
- 138.5, 139.5, 140.5, 141.5, 142.5, 143.5, 144.5, 145.5,
- 146.5, 147.5, 148.5, 149.5,
-};
-
-static long _vq_quantmap_res0_160_128_5[] = {
- 299, 297, 295, 293, 291, 289, 287, 285,
- 283, 281, 279, 277, 275, 273, 271, 269,
- 267, 265, 263, 261, 259, 257, 255, 253,
- 251, 249, 247, 245, 243, 241, 239, 237,
- 235, 233, 231, 229, 227, 225, 223, 221,
- 219, 217, 215, 213, 211, 209, 207, 205,
- 203, 201, 199, 197, 195, 193, 191, 189,
- 187, 185, 183, 181, 179, 177, 175, 173,
- 171, 169, 167, 165, 163, 161, 159, 157,
- 155, 153, 151, 149, 147, 145, 143, 141,
- 139, 137, 135, 133, 131, 129, 127, 125,
- 123, 121, 119, 117, 115, 113, 111, 109,
- 107, 105, 103, 101, 99, 97, 95, 93,
- 91, 89, 87, 85, 83, 81, 79, 77,
- 75, 73, 71, 69, 67, 65, 63, 61,
- 59, 57, 55, 53, 51, 49, 47, 45,
- 43, 41, 39, 37, 35, 33, 31, 29,
- 27, 25, 23, 21, 19, 17, 15, 13,
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12, 14, 16, 18,
- 20, 22, 24, 26, 28, 30, 32, 34,
- 36, 38, 40, 42, 44, 46, 48, 50,
- 52, 54, 56, 58, 60, 62, 64, 66,
- 68, 70, 72, 74, 76, 78, 80, 82,
- 84, 86, 88, 90, 92, 94, 96, 98,
- 100, 102, 104, 106, 108, 110, 112, 114,
- 116, 118, 120, 122, 124, 126, 128, 130,
- 132, 134, 136, 138, 140, 142, 144, 146,
- 148, 150, 152, 154, 156, 158, 160, 162,
- 164, 166, 168, 170, 172, 174, 176, 178,
- 180, 182, 184, 186, 188, 190, 192, 194,
- 196, 198, 200, 202, 204, 206, 208, 210,
- 212, 214, 216, 218, 220, 222, 224, 226,
- 228, 230, 232, 234, 236, 238, 240, 242,
- 244, 246, 248, 250, 252, 254, 256, 258,
- 260, 262, 264, 266, 268, 270, 272, 274,
- 276, 278, 280, 282, 284, 286, 288, 290,
- 292, 294, 296, 298, 300,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_160_128_5 = {
- _vq_quantthresh_res0_160_128_5,
- _vq_quantmap_res0_160_128_5,
- 301,
- 301
-};
-
-static static_codebook _vq_book_res0_160_128_5 = {
- 1, 301,
- _vq_lengthlist_res0_160_128_5,
- 1, -520962048, 1611661312, 9, 0,
- _vq_quantlist_res0_160_128_5,
- NULL,
- &_vq_auxt_res0_160_128_5,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_160_128aux.vqh b/lib/books/res0_160_128aux.vqh
deleted file mode 100644
index 199f20c6..00000000
--- a/lib/books/res0_160_128aux.vqh
+++ /dev/null
@@ -1,50 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- * *
- ********************************************************************
-
- function: static codebook autogenerated by huff/huffbuld
-
- ********************************************************************/
-
-#ifndef _V_res0_160_128aux_VQH_
-#define _V_res0_160_128aux_VQH_
-#include "codebook.h"
-
-static long _huff_lengthlist_res0_160_128aux[] = {
- 13,16,16,16,16,16,15,14,15,16,16,16,14,12,14,14,
- 15,16,10,12,14,13,16,16,15,16,15,16,16,16,16,16,
- 16,16,16,16,12,13,14,16,16,16, 8, 4, 7,13,16,16,
- 7, 4, 7,12,16,16, 9, 9,11,13,16,16,14,16,16,16,
- 16,16,15,16,16,16,16,16,10,10,13,11,16,16, 5, 3,
- 7,11,16,16, 5, 3, 7,13,16,16, 9, 9,12,14,16,16,
- 15,16,16,16,16,16,16,16,16,16,16,16,10,10,11,12,
- 16,16, 8, 3, 4,10,16,16, 8, 4, 5, 9,16,16,12, 8,
- 9,12,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
- 14,13,15,16,16,16,13, 4, 5,10,16,16,14, 4, 6,10,
- 16,16,15, 9,10,13,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,14,16,16,16,16,16,14, 7, 8,12,16,16,
- 16, 7, 8,12,16,16,16,13,13,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16,
-};
-
-static static_codebook _huff_book_res0_160_128aux = {
- 3, 216,
- _huff_lengthlist_res0_160_128aux,
- 0, 0, 0, 0, 0,
- NULL,
- NULL,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_192_1024_1.vqh b/lib/books/res0_192_1024_1.vqh
deleted file mode 100644
index a79db190..00000000
--- a/lib/books/res0_192_1024_1.vqh
+++ /dev/null
@@ -1,63 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_192_1024_1_VQH_
-#define _V_res0_192_1024_1_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_192_1024_1[] = {
- 1,
- 0,
- 2,
-};
-
-static long _vq_lengthlist_res0_192_1024_1[] = {
- 1, 4, 4, 4, 8, 8, 4, 8, 8, 5, 8, 8, 8,12,12, 8,
- 12,12, 4, 8, 8, 8,12,12, 8,12,12, 5, 8, 8, 9,12,
- 12, 8,12,12, 9,12,12,12,16,16,12,17,16, 9,12,12,
- 12,16,16,12,17,16, 5, 8, 8, 8,12,12, 8,12,12, 9,
- 12,12,13,16,16,12,16,16, 8,12,12,13,16,16,12,16,
- 15,
-};
-
-static float _vq_quantthresh_res0_192_1024_1[] = {
- -0.5, 0.5,
-};
-
-static long _vq_quantmap_res0_192_1024_1[] = {
- 1, 0, 2,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_192_1024_1 = {
- _vq_quantthresh_res0_192_1024_1,
- _vq_quantmap_res0_192_1024_1,
- 3,
- 3
-};
-
-static static_codebook _vq_book_res0_192_1024_1 = {
- 4, 81,
- _vq_lengthlist_res0_192_1024_1,
- 1, -535822336, 1611661312, 2, 0,
- _vq_quantlist_res0_192_1024_1,
- NULL,
- &_vq_auxt_res0_192_1024_1,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_192_1024_2.vqh b/lib/books/res0_192_1024_2.vqh
deleted file mode 100644
index 61a2391e..00000000
--- a/lib/books/res0_192_1024_2.vqh
+++ /dev/null
@@ -1,63 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_192_1024_2_VQH_
-#define _V_res0_192_1024_2_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_192_1024_2[] = {
- 1,
- 0,
- 2,
-};
-
-static long _vq_lengthlist_res0_192_1024_2[] = {
- 3, 4, 4, 5, 6, 6, 4, 6, 6, 5, 6, 6, 6, 8, 8, 6,
- 8, 8, 5, 6, 6, 6, 8, 8, 6, 8, 8, 5, 6, 6, 6, 8,
- 8, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 8,
- 8, 9, 9, 8, 9, 9, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6,
- 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 8, 8, 9, 9, 8, 9,
- 9,
-};
-
-static float _vq_quantthresh_res0_192_1024_2[] = {
- -0.5, 0.5,
-};
-
-static long _vq_quantmap_res0_192_1024_2[] = {
- 1, 0, 2,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_192_1024_2 = {
- _vq_quantthresh_res0_192_1024_2,
- _vq_quantmap_res0_192_1024_2,
- 3,
- 3
-};
-
-static static_codebook _vq_book_res0_192_1024_2 = {
- 4, 81,
- _vq_lengthlist_res0_192_1024_2,
- 1, -535822336, 1611661312, 2, 0,
- _vq_quantlist_res0_192_1024_2,
- NULL,
- &_vq_auxt_res0_192_1024_2,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_192_1024_3.vqh b/lib/books/res0_192_1024_3.vqh
deleted file mode 100644
index 617ba81c..00000000
--- a/lib/books/res0_192_1024_3.vqh
+++ /dev/null
@@ -1,99 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_192_1024_3_VQH_
-#define _V_res0_192_1024_3_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_192_1024_3[] = {
- 2,
- 1,
- 3,
- 0,
- 4,
-};
-
-static long _vq_lengthlist_res0_192_1024_3[] = {
- 3, 5, 5, 7, 7, 5, 6, 6, 9, 9, 5, 6, 6, 9, 9, 7,
- 9, 9,12,12, 7, 9, 9,12,12, 5, 7, 6, 9, 9, 7, 8,
- 8,10,10, 7, 8, 8,10,10, 9,11,11,14,14, 9,11,11,
- 14,14, 5, 6, 6, 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,
- 10, 9,11,11,14,13, 9,11,11,14,14, 8, 9, 9,12,12,
- 9,11,11,14,14, 9,11,11,14,14,13,14,14,17,18,13,
- 14,14,17,18, 8, 9, 9,12,12, 9,11,11,14,14, 9,11,
- 11,14,14,12,14,14,17,17,12,14,14,17,18, 5, 7, 7,
- 9, 9, 7, 8, 8,11,11, 7, 8, 8,10,11, 9,11,11,14,
- 14, 9,11,11,14,14, 7, 8, 8,11,11, 8, 9,10,12,12,
- 8,10, 9,12,12,11,12,12,15,15,11,12,12,15,16, 7,
- 8, 8,11,11, 8,10, 9,12,12, 8, 9, 9,12,12,11,12,
- 12,15,15,11,12,12,16,16, 9,11,11,14,14,11,12,13,
- 16,15,11,12,12,16,16,14,16,15,20,19,14,16,15,19,
- 18, 9,11,11,14,14,11,12,12,16,16,11,12,13,15,16,
- 14,16,15,19,18,14,16,16,19,19, 5, 7, 7, 9, 9, 7,
- 8, 8,10,10, 7, 8, 8,10,11, 9,11,11,14,14, 9,11,
- 11,14,14, 7, 8, 8,11,10, 8,10, 9,12,12, 8, 9, 9,
- 12,12,11,12,12,15,15,11,12,12,15,15, 7, 8, 8,11,
- 10, 8, 9,10,12,12, 8, 9, 9,12,12,11,12,12,16,16,
- 11,12,12,16,15, 9,11,11,14,14,11,12,12,15,15,11,
- 12,12,16,15,14,16,15,19,18,14,15,16,19,18, 9,11,
- 11,14,14,11,12,13,16,15,11,12,12,16,15,14,16,16,
- 19,19,14,16,15,19,18, 7, 9, 9,12,12, 9,11,11,14,
- 14, 9,11,11,14,14,12,14,14,17,17,12,14,14,17,17,
- 9,11,11,14,14,11,12,12,16,15,11,12,12,16,15,14,
- 15,16,19,19,14,17,15,21,19, 9,11,11,14,14,11,12,
- 12,16,15,11,12,12,15,16,14,16,16,19,18,14,16,16,
- 19,18,12,14,14,17,18,14,15,16,19,18,14,16,16,19,
- 18,18,19,18,20,20,17,19,19,20,21,12,14,14,17,17,
- 14,15,15,21,18,14,16,16,18,18,17,18,19,20,21,18,
- 20,18,21,21, 7, 9, 9,12,12, 9,11,11,14,14, 9,11,
- 11,14,14,12,14,14,17,17,12,14,14,17,18, 9,11,11,
- 14,14,11,12,12,16,16,11,12,12,15,16,14,16,15,19,
- 19,14,15,15,18,19, 9,11,11,14,14,11,12,12,16,15,
- 11,12,12,15,15,14,16,16,18,19,14,16,15,18,19,12,
- 14,14,17,17,14,16,15,18,20,14,16,16,18,18,16,18,
- 19,21,21,18,17,19,21,21,12,14,14,17,17,14,16,16,
- 18,20,14,16,15,18,18,17,18,20,19,21,17,18,19,21,
- 20,
-};
-
-static float _vq_quantthresh_res0_192_1024_3[] = {
- -1.5, -0.5, 0.5, 1.5,
-};
-
-static long _vq_quantmap_res0_192_1024_3[] = {
- 3, 1, 0, 2, 4,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_192_1024_3 = {
- _vq_quantthresh_res0_192_1024_3,
- _vq_quantmap_res0_192_1024_3,
- 5,
- 5
-};
-
-static static_codebook _vq_book_res0_192_1024_3 = {
- 4, 625,
- _vq_lengthlist_res0_192_1024_3,
- 1, -533725184, 1611661312, 3, 0,
- _vq_quantlist_res0_192_1024_3,
- NULL,
- &_vq_auxt_res0_192_1024_3,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_192_1024_4.vqh b/lib/books/res0_192_1024_4.vqh
deleted file mode 100644
index fccbd292..00000000
--- a/lib/books/res0_192_1024_4.vqh
+++ /dev/null
@@ -1,99 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_192_1024_4_VQH_
-#define _V_res0_192_1024_4_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_192_1024_4[] = {
- 2,
- 1,
- 3,
- 0,
- 4,
-};
-
-static long _vq_lengthlist_res0_192_1024_4[] = {
- 6, 7, 7, 8, 8, 7, 7, 7, 9, 9, 7, 7, 7, 9, 9, 8,
- 9, 9,10,10, 8, 9, 9,10,10, 7, 7, 7, 9, 9, 7, 7,
- 7, 9, 9, 7, 7, 7, 9, 9, 9, 9, 9,11,11, 9, 9, 9,
- 11,11, 7, 7, 7, 9, 9, 7, 7, 7, 9, 9, 7, 7, 7, 9,
- 9, 9, 9, 9,11,11, 9, 9, 9,11,11, 8, 9, 9,11,11,
- 9, 9, 9,11,11, 9, 9, 9,11,11,11,11,11,13,13,11,
- 11,11,13,13, 8, 9, 9,11,11, 9, 9, 9,11,11, 9, 9,
- 9,11,11,11,11,11,13,13,11,11,11,13,13, 7, 7, 7,
- 9, 9, 7, 8, 8, 9, 9, 7, 7, 7, 9, 9, 9, 9, 9,11,
- 11, 9, 9, 9,11,11, 7, 8, 7, 9, 9, 8, 8, 8,10,10,
- 8, 8, 8,10,10, 9,10,10,12,12, 9,10,10,12,12, 7,
- 8, 8, 9, 9, 7, 8, 8,10,10, 8, 8, 8,10,10, 9,10,
- 10,12,12, 9,10,10,12,12, 9, 9, 9,11,11, 9,10,10,
- 12,12, 9,10,10,12,12,11,12,12,13,14,11,12,12,14,
- 14, 9, 9, 9,11,11, 9,10,10,12,12, 9,10,10,12,12,
- 11,12,12,14,13,11,12,12,13,14, 7, 7, 7, 9, 9, 7,
- 7, 7, 9, 9, 7, 8, 7, 9, 9, 9, 9, 9,11,11, 9, 9,
- 9,11,11, 7, 8, 7, 9, 9, 8, 8, 8,10,10, 8, 8, 8,
- 10,10, 9,10,10,12,12, 9,10,10,12,12, 7, 7, 7, 9,
- 9, 7, 8, 8,10,10, 7, 8, 8,10,10, 9,10,10,12,12,
- 9,10,10,12,11, 9, 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, 9,
- 9,11,11, 9,10,10,12,12, 9,10,10,12,12,11,12,12,
- 14,14,11,12,12,14,13, 8, 9, 9,11,11, 9, 9, 9,11,
- 11, 9, 9, 9,11,11,11,11,11,13,13,11,11,11,13,13,
- 9, 9, 9,11,11, 9,10,10,12,12, 9,10,10,12,12,11,
- 12,12,14,14,11,12,12,14,14, 9, 9, 9,11,11, 9,10,
- 10,12,12, 9,10,10,12,12,11,12,12,14,14,11,12,12,
- 14,14,11,11,11,13,13,11,12,12,14,14,11,12,12,14,
- 13,13,13,14,15,15,13,14,14,15,16,11,11,11,13,13,
- 11,12,12,14,14,11,12,12,13,14,13,14,13,15,15,13,
- 14,14,15,15, 8, 9, 9,11,11, 9, 9, 9,11,11, 9, 9,
- 9,11,11,11,11,11,13,13,11,11,11,13,13, 9, 9, 9,
- 11,11, 9,10,10,12,12, 9,10,10,12,12,11,12,12,14,
- 14,11,12,12,14,14, 9, 9, 9,11,11, 9,10,10,12,12,
- 9,10,10,12,12,11,12,12,14,14,11,12,12,14,14,11,
- 11,11,13,13,11,12,12,14,14,11,12,12,14,14,13,14,
- 14,16,16,13,13,14,15,15,10,11,11,13,13,11,12,12,
- 14,14,11,12,12,14,13,13,14,14,15,15,13,14,13,16,
- 15,
-};
-
-static float _vq_quantthresh_res0_192_1024_4[] = {
- -1.5, -0.5, 0.5, 1.5,
-};
-
-static long _vq_quantmap_res0_192_1024_4[] = {
- 3, 1, 0, 2, 4,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_192_1024_4 = {
- _vq_quantthresh_res0_192_1024_4,
- _vq_quantmap_res0_192_1024_4,
- 5,
- 5
-};
-
-static static_codebook _vq_book_res0_192_1024_4 = {
- 4, 625,
- _vq_lengthlist_res0_192_1024_4,
- 1, -533725184, 1611661312, 3, 0,
- _vq_quantlist_res0_192_1024_4,
- NULL,
- &_vq_auxt_res0_192_1024_4,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_192_1024_5.vqh b/lib/books/res0_192_1024_5.vqh
deleted file mode 100644
index 3ac3341b..00000000
--- a/lib/books/res0_192_1024_5.vqh
+++ /dev/null
@@ -1,80 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_192_1024_5_VQH_
-#define _V_res0_192_1024_5_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_192_1024_5[] = {
- 6,
- 5,
- 7,
- 4,
- 8,
- 3,
- 9,
- 2,
- 10,
- 1,
- 11,
- 0,
- 12,
-};
-
-static long _vq_lengthlist_res0_192_1024_5[] = {
- 2, 3, 3, 5, 5, 7, 7, 9, 9,10,10,11,11, 4, 5, 5,
- 7, 7, 8, 8,11,11,12,12,14,14, 4, 5, 5, 7, 7, 8,
- 8,11,11,13,12,14,14, 6, 7, 7, 9, 9,11,11,13,13,
- 15,15,16,16, 6, 7, 7, 9, 9,11,11,13,13,15,15,16,
- 16, 7, 9, 8,11,11,13,13,15,15,16,16,17,18, 7, 8,
- 8,11,11,13,13,15,15,17,17,18,18, 9,11,11,13,13,
- 15,15,17,17,18,18,18,18, 9,11,11,13,13,15,15,17,
- 17,18,18,18,19,10,13,13,15,15,17,16,17,18,18,18,
- 19,21,10,13,13,15,15,17,17,17,18,18,20,19,20,11,
- 14,14,16,16,18,18,19,18,18,18,19,21,12,14,14,16,
- 16,18,18,19,18,19,20,20,20,
-};
-
-static float _vq_quantthresh_res0_192_1024_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,
-};
-
-static long _vq_quantmap_res0_192_1024_5[] = {
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_192_1024_5 = {
- _vq_quantthresh_res0_192_1024_5,
- _vq_quantmap_res0_192_1024_5,
- 13,
- 13
-};
-
-static static_codebook _vq_book_res0_192_1024_5 = {
- 2, 169,
- _vq_lengthlist_res0_192_1024_5,
- 1, -531103744, 1611661312, 4, 0,
- _vq_quantlist_res0_192_1024_5,
- NULL,
- &_vq_auxt_res0_192_1024_5,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_192_1024_6.vqh b/lib/books/res0_192_1024_6.vqh
deleted file mode 100644
index 9c1a861c..00000000
--- a/lib/books/res0_192_1024_6.vqh
+++ /dev/null
@@ -1,80 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_192_1024_6_VQH_
-#define _V_res0_192_1024_6_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_192_1024_6[] = {
- 6,
- 5,
- 7,
- 4,
- 8,
- 3,
- 9,
- 2,
- 10,
- 1,
- 11,
- 0,
- 12,
-};
-
-static long _vq_lengthlist_res0_192_1024_6[] = {
- 4, 4, 4, 5, 5, 7, 7, 8, 8, 9, 9,10,10, 4, 5, 4,
- 6, 6, 7, 7, 9, 9,10,10,11,11, 4, 4, 4, 6, 6, 7,
- 7, 9, 9,10,10,11,11, 5, 6, 6, 7, 7, 9, 8,10,10,
- 11,11,12,12, 5, 6, 6, 7, 7, 9, 9,10,10,11,11,12,
- 12, 7, 7, 7, 9, 9,10,10,11,11,12,12,14,14, 7, 7,
- 7, 9, 9,10,10,11,11,12,12,14,14, 8, 9, 9,10,10,
- 11,11,12,13,14,14,15,15, 8, 9, 9,10,10,11,11,13,
- 13,13,14,15,15,10,10,10,11,12,13,13,14,14,15,15,
- 16,15,10,10,10,11,11,13,13,14,14,15,15,16,16,11,
- 11,11,13,13,14,14,15,15,16,16,17,17,11,11,11,13,
- 13,14,14,15,15,16,16,16,16,
-};
-
-static float _vq_quantthresh_res0_192_1024_6[] = {
- -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_res0_192_1024_6[] = {
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_192_1024_6 = {
- _vq_quantthresh_res0_192_1024_6,
- _vq_quantmap_res0_192_1024_6,
- 13,
- 13
-};
-
-static static_codebook _vq_book_res0_192_1024_6 = {
- 2, 169,
- _vq_lengthlist_res0_192_1024_6,
- 1, -531103744, 1611661312, 4, 0,
- _vq_quantlist_res0_192_1024_6,
- NULL,
- &_vq_auxt_res0_192_1024_6,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_192_1024_7.vqh b/lib/books/res0_192_1024_7.vqh
deleted file mode 100644
index 39ef0fa2..00000000
--- a/lib/books/res0_192_1024_7.vqh
+++ /dev/null
@@ -1,236 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_192_1024_7_VQH_
-#define _V_res0_192_1024_7_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_192_1024_7[] = {
- 22,
- 21,
- 23,
- 20,
- 24,
- 19,
- 25,
- 18,
- 26,
- 17,
- 27,
- 16,
- 28,
- 15,
- 29,
- 14,
- 30,
- 13,
- 31,
- 12,
- 32,
- 11,
- 33,
- 10,
- 34,
- 9,
- 35,
- 8,
- 36,
- 7,
- 37,
- 6,
- 38,
- 5,
- 39,
- 4,
- 40,
- 3,
- 41,
- 2,
- 42,
- 1,
- 43,
- 0,
- 44,
-};
-
-static long _vq_lengthlist_res0_192_1024_7[] = {
- 3, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9,
- 9, 9, 9,10,10,10,10,10,10,10,10,11,11,11,11,11,
- 11,11,11,11,12,12,12,12,12,12,12,12,12, 5, 5, 5,
- 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,
- 11,11,11,11,11,11,12,12,12,12,12,12,12,12,13,13,
- 13,13,13,13,13,13,14,14,14,14, 4, 5, 5, 7, 7, 8,
- 8, 8, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,11,11,11,
- 11,11,11,12,12,12,12,12,12,12,12,13,13,13,13,13,
- 13,13,13,14,13,14,14, 6, 7, 7, 8, 8, 9, 9, 9, 9,
- 10,10,10,11,11,11,11,11,12,12,12,12,12,12,13,13,
- 13,13,13,13,13,13,14,14,14,14,14,14,14,14,14,14,
- 15,15,15,15, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,
- 10,11,11,11,11,12,12,12,12,12,12,13,13,13,13,13,
- 13,13,13,14,14,14,14,14,14,14,14,15,15,15,15,15,
- 15, 7, 8, 8, 9, 9,10,10,10,10,11,11,11,11,11,11,
- 12,12,12,12,13,13,13,13,13,13,14,14,14,14,14,14,
- 15,14,15,15,15,15,15,15,16,15,16,16,16,16, 7, 8,
- 8, 9, 9,10, 9,10,10,11,11,11,11,11,11,12,12,12,
- 12,13,13,13,13,13,13,14,14,14,14,14,14,15,15,15,
- 15,15,15,15,15,15,15,16,16,16,16, 8, 8, 8,10, 9,
- 10,10,11,11,12,12,12,12,12,12,13,13,13,13,14,14,
- 14,14,14,14,14,14,15,15,15,15,15,15,15,15,16,15,
- 16,16,16,16,16,16,16,16, 8, 8, 8, 9,10,10,10,11,
- 11,12,12,12,12,12,12,13,13,13,13,13,14,14,14,14,
- 14,14,14,15,15,15,15,15,15,15,15,15,16,16,16,16,
- 16,17,17,17,16, 8, 9, 9,10,10,11,11,12,12,12,12,
- 13,13,13,13,13,13,14,14,14,14,14,14,15,15,15,15,
- 15,15,15,16,16,16,16,16,16,16,16,16,16,17,17,17,
- 17,17, 8, 9, 9,10,10,11,11,12,12,12,12,13,13,13,
- 13,13,13,14,14,14,14,14,14,15,15,15,15,15,15,16,
- 15,16,16,16,16,16,16,17,16,17,17,17,17,17,17, 9,
- 10,10,11,11,11,11,12,12,13,13,13,13,13,13,14,14,
- 14,14,15,14,15,15,15,15,15,15,16,15,16,16,16,16,
- 16,16,17,17,17,16,17,17,17,17,18,17, 9,10,10,11,
- 11,12,12,12,12,13,13,13,13,13,14,14,14,14,14,14,
- 15,15,15,15,15,15,15,16,16,16,16,16,16,16,16,17,
- 16,16,17,17,17,17,17,17,17, 9,10,10,11,11,12,12,
- 12,12,13,13,13,13,14,14,14,14,15,15,15,15,15,15,
- 15,16,16,16,16,16,16,16,16,17,17,17,17,17,18,17,
- 17,17,17,17,17,17, 9,10,10,11,11,12,12,12,12,13,
- 13,13,14,14,14,14,14,15,15,15,15,15,15,16,16,16,
- 16,16,16,16,16,16,17,17,17,17,17,17,17,17,17,18,
- 18,18,18, 9,10,10,11,11,12,12,13,13,13,13,14,14,
- 14,14,15,15,15,15,15,15,16,16,16,16,16,17,16,16,
- 17,16,17,17,17,17,17,17,18,18,18,17,18,18,18,18,
- 9,10,10,11,11,12,12,13,13,13,13,14,14,14,15,15,
- 15,15,15,15,15,16,16,16,16,16,16,17,16,17,17,17,
- 17,17,17,17,18,17,18,18,18,18,18,18,18,10,11,11,
- 12,12,13,13,13,13,14,14,14,14,15,15,15,15,15,15,
- 16,16,16,16,16,16,16,16,17,17,17,17,17,17,17,18,
- 18,17,18,18,18,18,18,18,18,19,10,11,11,12,12,13,
- 13,13,13,14,14,14,14,15,15,15,15,16,15,16,16,16,
- 16,16,16,17,17,17,17,17,17,17,17,18,17,18,17,18,
- 18,18,18,18,18,18,18,10,11,11,12,12,13,13,14,14,
- 15,14,15,15,15,15,15,16,16,16,16,16,16,16,17,16,
- 17,17,17,17,17,17,18,17,17,18,18,18,18,18,19,19,
- 18,19,19,19,10,11,11,12,12,13,13,14,14,14,14,15,
- 15,15,15,15,15,16,16,16,16,16,16,17,17,17,17,17,
- 17,17,17,17,17,18,18,17,18,18,18,18,18,18,18,19,
- 18,10,11,11,13,13,14,14,14,14,15,15,15,15,15,15,
- 16,16,17,16,16,17,17,17,17,17,17,17,18,17,18,17,
- 18,18,18,18,18,18,18,18,19,19,18,18,19,19,10,12,
- 11,13,13,14,13,14,14,15,15,15,15,16,16,16,16,16,
- 16,16,17,16,16,17,17,17,17,18,17,17,18,17,18,18,
- 18,18,18,18,19,19,18,19,19,19,18,11,12,12,13,13,
- 14,14,15,14,15,15,16,15,16,16,16,16,17,17,17,17,
- 17,17,17,18,17,17,18,18,18,18,18,18,19,18,19,20,
- 18,18,18,19,19,19,19,19,11,12,12,13,13,14,14,15,
- 15,15,15,15,15,16,16,16,16,17,17,17,17,17,17,17,
- 17,18,17,17,17,18,18,18,18,17,18,18,18,19,19,19,
- 19,19,19,19,19,11,12,12,14,13,14,14,15,15,15,15,
- 16,16,16,16,17,17,17,17,17,17,17,18,17,18,17,18,
- 18,18,18,18,19,18,19,19,19,18,18,19,19,19,19,19,
- 19,19,11,12,12,13,13,14,14,15,15,15,15,16,16,16,
- 16,17,17,17,17,17,17,17,17,17,18,18,17,18,18,19,
- 18,18,19,19,18,19,19,19,19,19,19,19,19,19,19,11,
- 12,12,14,14,14,15,15,15,16,15,16,17,16,17,16,17,
- 17,17,17,17,17,17,18,18,17,18,18,18,19,18,19,19,
- 19,18,20,19,18,18,19,19,21,19,20,19,11,13,12,14,
- 14,15,14,16,15,16,16,16,16,17,16,17,17,17,17,17,
- 17,17,18,18,18,18,18,18,18,19,19,19,18,19,19,19,
- 18,20,19,19,18,19,19,19,20,12,13,13,14,14,15,15,
- 16,16,16,16,16,16,16,17,17,18,17,17,18,18,17,18,
- 18,18,18,18,19,18,18,19,19,18,19,19,19,19,19,19,
- 19,20,20,21,20,20,12,13,13,14,14,15,15,15,16,16,
- 16,16,16,17,17,17,17,17,17,18,18,18,18,18,18,18,
- 17,19,18,18,19,19,19,19,19,19,19,19,19,19,20,19,
- 19,21,21,12,13,13,14,14,15,15,16,16,17,16,16,17,
- 17,17,18,17,18,18,17,18,19,18,18,19,19,19,18,18,
- 19,19,19,19,19,18,20,19,19,20,20,20,19,19,19,19,
- 12,13,13,14,14,15,15,16,16,16,17,16,17,17,17,18,
- 17,18,17,18,18,18,18,18,18,18,18,18,18,18,19,18,
- 19,19,19,19,19,20,21,19,19,20,19,19,21,12,13,13,
- 15,15,15,16,16,16,17,17,17,17,17,17,18,17,18,18,
- 18,19,18,18,19,18,19,19,19,18,18,19,19,19,19,20,
- 21,20,20,20,21,19,20,20,20,21,12,13,13,15,15,16,
- 15,16,16,17,17,17,17,17,17,18,18,18,18,19,18,18,
- 19,19,18,19,18,19,18,19,19,19,20,20,19,19,21,19,
- 21,20,19,19,20,20,20,12,14,14,15,15,16,16,16,16,
- 17,17,17,17,17,18,18,18,18,18,18,19,19,18,18,19,
- 19,19,19,19,19,19,19,20,19,19,19,19,19,20,19,19,
- 21,20,20,19,12,14,14,15,15,16,16,17,16,17,17,17,
- 17,18,18,17,17,18,18,19,18,19,18,18,19,19,19,18,
- 19,20,19,19,19,19,19,21,19,20,20,20,20,20,19,21,
- 21,13,14,14,15,15,16,16,17,17,17,17,18,18,18,18,
- 18,18,19,19,19,19,18,19,19,19,19,20,19,19,20,19,
- 19,20,20,20,19,19,20,19,20,20,20,19,20,21,13,14,
- 14,15,15,16,16,17,17,17,18,18,18,18,18,18,18,18,
- 18,19,18,19,19,19,20,19,18,19,19,20,20,20,19,20,
- 20,19,19,20,19,21,21,21,22,20,21,13,14,14,15,15,
- 16,16,17,17,18,17,18,18,18,18,19,18,19,18,19,18,
- 19,19,20,19,19,19,19,19,20,20,19,19,19,19,22,20,
- 19,20,21,20,21,20,20,20,13,14,14,15,15,16,16,17,
- 17,17,17,18,18,19,18,18,18,18,18,19,18,19,18,19,
- 19,19,19,20,20,20,19,20,20,20,20,20,20,21,22,21,
- 20,19,20,21,22,13,14,14,15,16,17,16,17,17,17,18,
- 18,19,18,18,19,19,18,19,20,20,20,19,19,19,19,20,
- 21,20,20,20,21,19,21,21,21,21,20,20,21,21,20,22,
- 20,20,13,14,14,16,16,17,17,17,17,17,17,19,18,18,
- 18,19,19,19,19,19,19,19,19,20,19,20,20,20,20,19,
- 19,19,19,20,20,20,20,20,19,20,20,21,21,21,22,13,
- 15,15,16,16,17,17,17,17,18,18,18,19,20,18,19,19,
- 19,20,19,19,19,19,19,20,19,21,20,21,20,20,21,20,
- 19,20,21,20,21,21,20,21,20,20,21,21,13,15,15,16,
- 16,17,17,18,17,18,19,18,18,19,18,19,19,19,19,18,
- 20,20,19,20,20,20,20,20,21,19,19,19,20,20,20,20,
- 20,20,19,20,20,21,21,21,19,
-};
-
-static float _vq_quantthresh_res0_192_1024_7[] = {
- -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, -15.5, -14.5,
- -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, -7.5, -6.5,
- -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5,
- 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5,
- 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 16.5, 17.5,
- 18.5, 19.5, 20.5, 21.5,
-};
-
-static long _vq_quantmap_res0_192_1024_7[] = {
- 43, 41, 39, 37, 35, 33, 31, 29,
- 27, 25, 23, 21, 19, 17, 15, 13,
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12, 14, 16, 18,
- 20, 22, 24, 26, 28, 30, 32, 34,
- 36, 38, 40, 42, 44,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_192_1024_7 = {
- _vq_quantthresh_res0_192_1024_7,
- _vq_quantmap_res0_192_1024_7,
- 45,
- 45
-};
-
-static static_codebook _vq_book_res0_192_1024_7 = {
- 2, 2025,
- _vq_lengthlist_res0_192_1024_7,
- 1, -527040512, 1611661312, 6, 0,
- _vq_quantlist_res0_192_1024_7,
- NULL,
- &_vq_auxt_res0_192_1024_7,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_192_1024_8.vqh b/lib/books/res0_192_1024_8.vqh
deleted file mode 100644
index 968804b7..00000000
--- a/lib/books/res0_192_1024_8.vqh
+++ /dev/null
@@ -1,160 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_192_1024_8_VQH_
-#define _V_res0_192_1024_8_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_192_1024_8[] = {
- 40,
- 39,
- 41,
- 38,
- 42,
- 37,
- 43,
- 36,
- 44,
- 35,
- 45,
- 34,
- 46,
- 33,
- 47,
- 32,
- 48,
- 31,
- 49,
- 30,
- 50,
- 29,
- 51,
- 28,
- 52,
- 27,
- 53,
- 26,
- 54,
- 25,
- 55,
- 24,
- 56,
- 23,
- 57,
- 22,
- 58,
- 21,
- 59,
- 20,
- 60,
- 19,
- 61,
- 18,
- 62,
- 17,
- 63,
- 16,
- 64,
- 15,
- 65,
- 14,
- 66,
- 13,
- 67,
- 12,
- 68,
- 11,
- 69,
- 10,
- 70,
- 9,
- 71,
- 8,
- 72,
- 7,
- 73,
- 6,
- 74,
- 5,
- 75,
- 4,
- 76,
- 3,
- 77,
- 2,
- 78,
- 1,
- 79,
- 0,
- 80,
-};
-
-static long _vq_lengthlist_res0_192_1024_8[] = {
- 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 9,
- 8, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,10,
- 10,10,10,10,10,10,10,11,11,11,11,11,11,11,11,11,
- 11,
-};
-
-static float _vq_quantthresh_res0_192_1024_8[] = {
- -39.5, -38.5, -37.5, -36.5, -35.5, -34.5, -33.5, -32.5,
- -31.5, -30.5, -29.5, -28.5, -27.5, -26.5, -25.5, -24.5,
- -23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5,
- -15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5,
- -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5,
- 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5,
- 8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 14.5, 15.5,
- 16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5,
- 24.5, 25.5, 26.5, 27.5, 28.5, 29.5, 30.5, 31.5,
- 32.5, 33.5, 34.5, 35.5, 36.5, 37.5, 38.5, 39.5,
-};
-
-static long _vq_quantmap_res0_192_1024_8[] = {
- 79, 77, 75, 73, 71, 69, 67, 65,
- 63, 61, 59, 57, 55, 53, 51, 49,
- 47, 45, 43, 41, 39, 37, 35, 33,
- 31, 29, 27, 25, 23, 21, 19, 17,
- 15, 13, 11, 9, 7, 5, 3, 1,
- 0, 2, 4, 6, 8, 10, 12, 14,
- 16, 18, 20, 22, 24, 26, 28, 30,
- 32, 34, 36, 38, 40, 42, 44, 46,
- 48, 50, 52, 54, 56, 58, 60, 62,
- 64, 66, 68, 70, 72, 74, 76, 78,
- 80,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_192_1024_8 = {
- _vq_quantthresh_res0_192_1024_8,
- _vq_quantmap_res0_192_1024_8,
- 81,
- 81
-};
-
-static static_codebook _vq_book_res0_192_1024_8 = {
- 1, 81,
- _vq_lengthlist_res0_192_1024_8,
- 1, -525074432, 1611661312, 7, 0,
- _vq_quantlist_res0_192_1024_8,
- NULL,
- &_vq_auxt_res0_192_1024_8,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_192_1024_9.vqh b/lib/books/res0_192_1024_9.vqh
deleted file mode 100644
index 28101f63..00000000
--- a/lib/books/res0_192_1024_9.vqh
+++ /dev/null
@@ -1,790 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_192_1024_9_VQH_
-#define _V_res0_192_1024_9_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_192_1024_9[] = {
- 280,
- 279,
- 281,
- 278,
- 282,
- 277,
- 283,
- 276,
- 284,
- 275,
- 285,
- 274,
- 286,
- 273,
- 287,
- 272,
- 288,
- 271,
- 289,
- 270,
- 290,
- 269,
- 291,
- 268,
- 292,
- 267,
- 293,
- 266,
- 294,
- 265,
- 295,
- 264,
- 296,
- 263,
- 297,
- 262,
- 298,
- 261,
- 299,
- 260,
- 300,
- 259,
- 301,
- 258,
- 302,
- 257,
- 303,
- 256,
- 304,
- 255,
- 305,
- 254,
- 306,
- 253,
- 307,
- 252,
- 308,
- 251,
- 309,
- 250,
- 310,
- 249,
- 311,
- 248,
- 312,
- 247,
- 313,
- 246,
- 314,
- 245,
- 315,
- 244,
- 316,
- 243,
- 317,
- 242,
- 318,
- 241,
- 319,
- 240,
- 320,
- 239,
- 321,
- 238,
- 322,
- 237,
- 323,
- 236,
- 324,
- 235,
- 325,
- 234,
- 326,
- 233,
- 327,
- 232,
- 328,
- 231,
- 329,
- 230,
- 330,
- 229,
- 331,
- 228,
- 332,
- 227,
- 333,
- 226,
- 334,
- 225,
- 335,
- 224,
- 336,
- 223,
- 337,
- 222,
- 338,
- 221,
- 339,
- 220,
- 340,
- 219,
- 341,
- 218,
- 342,
- 217,
- 343,
- 216,
- 344,
- 215,
- 345,
- 214,
- 346,
- 213,
- 347,
- 212,
- 348,
- 211,
- 349,
- 210,
- 350,
- 209,
- 351,
- 208,
- 352,
- 207,
- 353,
- 206,
- 354,
- 205,
- 355,
- 204,
- 356,
- 203,
- 357,
- 202,
- 358,
- 201,
- 359,
- 200,
- 360,
- 199,
- 361,
- 198,
- 362,
- 197,
- 363,
- 196,
- 364,
- 195,
- 365,
- 194,
- 366,
- 193,
- 367,
- 192,
- 368,
- 191,
- 369,
- 190,
- 370,
- 189,
- 371,
- 188,
- 372,
- 187,
- 373,
- 186,
- 374,
- 185,
- 375,
- 184,
- 376,
- 183,
- 377,
- 182,
- 378,
- 181,
- 379,
- 180,
- 380,
- 179,
- 381,
- 178,
- 382,
- 177,
- 383,
- 176,
- 384,
- 175,
- 385,
- 174,
- 386,
- 173,
- 387,
- 172,
- 388,
- 171,
- 389,
- 170,
- 390,
- 169,
- 391,
- 168,
- 392,
- 167,
- 393,
- 166,
- 394,
- 165,
- 395,
- 164,
- 396,
- 163,
- 397,
- 162,
- 398,
- 161,
- 399,
- 160,
- 400,
- 159,
- 401,
- 158,
- 402,
- 157,
- 403,
- 156,
- 404,
- 155,
- 405,
- 154,
- 406,
- 153,
- 407,
- 152,
- 408,
- 151,
- 409,
- 150,
- 410,
- 149,
- 411,
- 148,
- 412,
- 147,
- 413,
- 146,
- 414,
- 145,
- 415,
- 144,
- 416,
- 143,
- 417,
- 142,
- 418,
- 141,
- 419,
- 140,
- 420,
- 139,
- 421,
- 138,
- 422,
- 137,
- 423,
- 136,
- 424,
- 135,
- 425,
- 134,
- 426,
- 133,
- 427,
- 132,
- 428,
- 131,
- 429,
- 130,
- 430,
- 129,
- 431,
- 128,
- 432,
- 127,
- 433,
- 126,
- 434,
- 125,
- 435,
- 124,
- 436,
- 123,
- 437,
- 122,
- 438,
- 121,
- 439,
- 120,
- 440,
- 119,
- 441,
- 118,
- 442,
- 117,
- 443,
- 116,
- 444,
- 115,
- 445,
- 114,
- 446,
- 113,
- 447,
- 112,
- 448,
- 111,
- 449,
- 110,
- 450,
- 109,
- 451,
- 108,
- 452,
- 107,
- 453,
- 106,
- 454,
- 105,
- 455,
- 104,
- 456,
- 103,
- 457,
- 102,
- 458,
- 101,
- 459,
- 100,
- 460,
- 99,
- 461,
- 98,
- 462,
- 97,
- 463,
- 96,
- 464,
- 95,
- 465,
- 94,
- 466,
- 93,
- 467,
- 92,
- 468,
- 91,
- 469,
- 90,
- 470,
- 89,
- 471,
- 88,
- 472,
- 87,
- 473,
- 86,
- 474,
- 85,
- 475,
- 84,
- 476,
- 83,
- 477,
- 82,
- 478,
- 81,
- 479,
- 80,
- 480,
- 79,
- 481,
- 78,
- 482,
- 77,
- 483,
- 76,
- 484,
- 75,
- 485,
- 74,
- 486,
- 73,
- 487,
- 72,
- 488,
- 71,
- 489,
- 70,
- 490,
- 69,
- 491,
- 68,
- 492,
- 67,
- 493,
- 66,
- 494,
- 65,
- 495,
- 64,
- 496,
- 63,
- 497,
- 62,
- 498,
- 61,
- 499,
- 60,
- 500,
- 59,
- 501,
- 58,
- 502,
- 57,
- 503,
- 56,
- 504,
- 55,
- 505,
- 54,
- 506,
- 53,
- 507,
- 52,
- 508,
- 51,
- 509,
- 50,
- 510,
- 49,
- 511,
- 48,
- 512,
- 47,
- 513,
- 46,
- 514,
- 45,
- 515,
- 44,
- 516,
- 43,
- 517,
- 42,
- 518,
- 41,
- 519,
- 40,
- 520,
- 39,
- 521,
- 38,
- 522,
- 37,
- 523,
- 36,
- 524,
- 35,
- 525,
- 34,
- 526,
- 33,
- 527,
- 32,
- 528,
- 31,
- 529,
- 30,
- 530,
- 29,
- 531,
- 28,
- 532,
- 27,
- 533,
- 26,
- 534,
- 25,
- 535,
- 24,
- 536,
- 23,
- 537,
- 22,
- 538,
- 21,
- 539,
- 20,
- 540,
- 19,
- 541,
- 18,
- 542,
- 17,
- 543,
- 16,
- 544,
- 15,
- 545,
- 14,
- 546,
- 13,
- 547,
- 12,
- 548,
- 11,
- 549,
- 10,
- 550,
- 9,
- 551,
- 8,
- 552,
- 7,
- 553,
- 6,
- 554,
- 5,
- 555,
- 4,
- 556,
- 3,
- 557,
- 2,
- 558,
- 1,
- 559,
- 0,
- 560,
-};
-
-static long _vq_lengthlist_res0_192_1024_9[] = {
- 3, 4, 4, 4, 4, 5, 5, 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, 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,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,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,
- 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,13,13,13,12,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,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,14,
- 14,14,14,14,14,14,14,14,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,15,15,15,16,15,16,15,16,15,16,16,15,16,15,16,
- 16,15,16,16,16,16,16,15,16,16,16,16,16,17,16,16,
- 16,17,16,16,15,17,17,16,17,16,16,16,17,16,17,17,
- 16,17,16,16,16,16,18,16,17,17,17,16,16,17,17,17,
- 17,17,17,16,17,18,17,18,17,17,18,18,17,17,17,17,
- 17,18,18,17,17,18,17,17,18,18,19,17,18,17,18,18,
- 18,18,18,18,18,18,18,18,18,19,18,18,18,18,18,19,
- 18,20,18,19,19,18,18,19,19,18,19,19,18,20,19,19,
- 19,18,19,19,18,19,18,20,19,20,20,18,19,18,20,20,
- 19,19,18,20,19,19,20,20,19,20,19,20,20,19,18,19,
- 19,19,20,19,18,20,20,18,19,18,19,19,20,20,20,19,
- 19,20,20,19,19,19,20,20,20,20,19,19,20,20,20,20,
- 19,20,20,20,19,20,19,20,20,19,19,19,20,19,20,19,
- 20,20,20,20,19,20,19,20,20,20,20,20,20,20,20,20,
- 20,19,20,20,20,19,20,20,20,20,20,20,20,19,20,19,
- 20,20,20,20,20,20,20,20,19,20,19,20,20,20,20,20,
- 20,19,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
- 20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
- 20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
- 20,20,20,20,20,20,20,20,19,20,20,20,20,20,20,20,
- 20,
-};
-
-static float _vq_quantthresh_res0_192_1024_9[] = {
- -279.5, -278.5, -277.5, -276.5, -275.5, -274.5, -273.5, -272.5,
- -271.5, -270.5, -269.5, -268.5, -267.5, -266.5, -265.5, -264.5,
- -263.5, -262.5, -261.5, -260.5, -259.5, -258.5, -257.5, -256.5,
- -255.5, -254.5, -253.5, -252.5, -251.5, -250.5, -249.5, -248.5,
- -247.5, -246.5, -245.5, -244.5, -243.5, -242.5, -241.5, -240.5,
- -239.5, -238.5, -237.5, -236.5, -235.5, -234.5, -233.5, -232.5,
- -231.5, -230.5, -229.5, -228.5, -227.5, -226.5, -225.5, -224.5,
- -223.5, -222.5, -221.5, -220.5, -219.5, -218.5, -217.5, -216.5,
- -215.5, -214.5, -213.5, -212.5, -211.5, -210.5, -209.5, -208.5,
- -207.5, -206.5, -205.5, -204.5, -203.5, -202.5, -201.5, -200.5,
- -199.5, -198.5, -197.5, -196.5, -195.5, -194.5, -193.5, -192.5,
- -191.5, -190.5, -189.5, -188.5, -187.5, -186.5, -185.5, -184.5,
- -183.5, -182.5, -181.5, -180.5, -179.5, -178.5, -177.5, -176.5,
- -175.5, -174.5, -173.5, -172.5, -171.5, -170.5, -169.5, -168.5,
- -167.5, -166.5, -165.5, -164.5, -163.5, -162.5, -161.5, -160.5,
- -159.5, -158.5, -157.5, -156.5, -155.5, -154.5, -153.5, -152.5,
- -151.5, -150.5, -149.5, -148.5, -147.5, -146.5, -145.5, -144.5,
- -143.5, -142.5, -141.5, -140.5, -139.5, -138.5, -137.5, -136.5,
- -135.5, -134.5, -133.5, -132.5, -131.5, -130.5, -129.5, -128.5,
- -127.5, -126.5, -125.5, -124.5, -123.5, -122.5, -121.5, -120.5,
- -119.5, -118.5, -117.5, -116.5, -115.5, -114.5, -113.5, -112.5,
- -111.5, -110.5, -109.5, -108.5, -107.5, -106.5, -105.5, -104.5,
- -103.5, -102.5, -101.5, -100.5, -99.5, -98.5, -97.5, -96.5,
- -95.5, -94.5, -93.5, -92.5, -91.5, -90.5, -89.5, -88.5,
- -87.5, -86.5, -85.5, -84.5, -83.5, -82.5, -81.5, -80.5,
- -79.5, -78.5, -77.5, -76.5, -75.5, -74.5, -73.5, -72.5,
- -71.5, -70.5, -69.5, -68.5, -67.5, -66.5, -65.5, -64.5,
- -63.5, -62.5, -61.5, -60.5, -59.5, -58.5, -57.5, -56.5,
- -55.5, -54.5, -53.5, -52.5, -51.5, -50.5, -49.5, -48.5,
- -47.5, -46.5, -45.5, -44.5, -43.5, -42.5, -41.5, -40.5,
- -39.5, -38.5, -37.5, -36.5, -35.5, -34.5, -33.5, -32.5,
- -31.5, -30.5, -29.5, -28.5, -27.5, -26.5, -25.5, -24.5,
- -23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5,
- -15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5,
- -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5,
- 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5,
- 8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 14.5, 15.5,
- 16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5,
- 24.5, 25.5, 26.5, 27.5, 28.5, 29.5, 30.5, 31.5,
- 32.5, 33.5, 34.5, 35.5, 36.5, 37.5, 38.5, 39.5,
- 40.5, 41.5, 42.5, 43.5, 44.5, 45.5, 46.5, 47.5,
- 48.5, 49.5, 50.5, 51.5, 52.5, 53.5, 54.5, 55.5,
- 56.5, 57.5, 58.5, 59.5, 60.5, 61.5, 62.5, 63.5,
- 64.5, 65.5, 66.5, 67.5, 68.5, 69.5, 70.5, 71.5,
- 72.5, 73.5, 74.5, 75.5, 76.5, 77.5, 78.5, 79.5,
- 80.5, 81.5, 82.5, 83.5, 84.5, 85.5, 86.5, 87.5,
- 88.5, 89.5, 90.5, 91.5, 92.5, 93.5, 94.5, 95.5,
- 96.5, 97.5, 98.5, 99.5, 100.5, 101.5, 102.5, 103.5,
- 104.5, 105.5, 106.5, 107.5, 108.5, 109.5, 110.5, 111.5,
- 112.5, 113.5, 114.5, 115.5, 116.5, 117.5, 118.5, 119.5,
- 120.5, 121.5, 122.5, 123.5, 124.5, 125.5, 126.5, 127.5,
- 128.5, 129.5, 130.5, 131.5, 132.5, 133.5, 134.5, 135.5,
- 136.5, 137.5, 138.5, 139.5, 140.5, 141.5, 142.5, 143.5,
- 144.5, 145.5, 146.5, 147.5, 148.5, 149.5, 150.5, 151.5,
- 152.5, 153.5, 154.5, 155.5, 156.5, 157.5, 158.5, 159.5,
- 160.5, 161.5, 162.5, 163.5, 164.5, 165.5, 166.5, 167.5,
- 168.5, 169.5, 170.5, 171.5, 172.5, 173.5, 174.5, 175.5,
- 176.5, 177.5, 178.5, 179.5, 180.5, 181.5, 182.5, 183.5,
- 184.5, 185.5, 186.5, 187.5, 188.5, 189.5, 190.5, 191.5,
- 192.5, 193.5, 194.5, 195.5, 196.5, 197.5, 198.5, 199.5,
- 200.5, 201.5, 202.5, 203.5, 204.5, 205.5, 206.5, 207.5,
- 208.5, 209.5, 210.5, 211.5, 212.5, 213.5, 214.5, 215.5,
- 216.5, 217.5, 218.5, 219.5, 220.5, 221.5, 222.5, 223.5,
- 224.5, 225.5, 226.5, 227.5, 228.5, 229.5, 230.5, 231.5,
- 232.5, 233.5, 234.5, 235.5, 236.5, 237.5, 238.5, 239.5,
- 240.5, 241.5, 242.5, 243.5, 244.5, 245.5, 246.5, 247.5,
- 248.5, 249.5, 250.5, 251.5, 252.5, 253.5, 254.5, 255.5,
- 256.5, 257.5, 258.5, 259.5, 260.5, 261.5, 262.5, 263.5,
- 264.5, 265.5, 266.5, 267.5, 268.5, 269.5, 270.5, 271.5,
- 272.5, 273.5, 274.5, 275.5, 276.5, 277.5, 278.5, 279.5,
-};
-
-static long _vq_quantmap_res0_192_1024_9[] = {
- 559, 557, 555, 553, 551, 549, 547, 545,
- 543, 541, 539, 537, 535, 533, 531, 529,
- 527, 525, 523, 521, 519, 517, 515, 513,
- 511, 509, 507, 505, 503, 501, 499, 497,
- 495, 493, 491, 489, 487, 485, 483, 481,
- 479, 477, 475, 473, 471, 469, 467, 465,
- 463, 461, 459, 457, 455, 453, 451, 449,
- 447, 445, 443, 441, 439, 437, 435, 433,
- 431, 429, 427, 425, 423, 421, 419, 417,
- 415, 413, 411, 409, 407, 405, 403, 401,
- 399, 397, 395, 393, 391, 389, 387, 385,
- 383, 381, 379, 377, 375, 373, 371, 369,
- 367, 365, 363, 361, 359, 357, 355, 353,
- 351, 349, 347, 345, 343, 341, 339, 337,
- 335, 333, 331, 329, 327, 325, 323, 321,
- 319, 317, 315, 313, 311, 309, 307, 305,
- 303, 301, 299, 297, 295, 293, 291, 289,
- 287, 285, 283, 281, 279, 277, 275, 273,
- 271, 269, 267, 265, 263, 261, 259, 257,
- 255, 253, 251, 249, 247, 245, 243, 241,
- 239, 237, 235, 233, 231, 229, 227, 225,
- 223, 221, 219, 217, 215, 213, 211, 209,
- 207, 205, 203, 201, 199, 197, 195, 193,
- 191, 189, 187, 185, 183, 181, 179, 177,
- 175, 173, 171, 169, 167, 165, 163, 161,
- 159, 157, 155, 153, 151, 149, 147, 145,
- 143, 141, 139, 137, 135, 133, 131, 129,
- 127, 125, 123, 121, 119, 117, 115, 113,
- 111, 109, 107, 105, 103, 101, 99, 97,
- 95, 93, 91, 89, 87, 85, 83, 81,
- 79, 77, 75, 73, 71, 69, 67, 65,
- 63, 61, 59, 57, 55, 53, 51, 49,
- 47, 45, 43, 41, 39, 37, 35, 33,
- 31, 29, 27, 25, 23, 21, 19, 17,
- 15, 13, 11, 9, 7, 5, 3, 1,
- 0, 2, 4, 6, 8, 10, 12, 14,
- 16, 18, 20, 22, 24, 26, 28, 30,
- 32, 34, 36, 38, 40, 42, 44, 46,
- 48, 50, 52, 54, 56, 58, 60, 62,
- 64, 66, 68, 70, 72, 74, 76, 78,
- 80, 82, 84, 86, 88, 90, 92, 94,
- 96, 98, 100, 102, 104, 106, 108, 110,
- 112, 114, 116, 118, 120, 122, 124, 126,
- 128, 130, 132, 134, 136, 138, 140, 142,
- 144, 146, 148, 150, 152, 154, 156, 158,
- 160, 162, 164, 166, 168, 170, 172, 174,
- 176, 178, 180, 182, 184, 186, 188, 190,
- 192, 194, 196, 198, 200, 202, 204, 206,
- 208, 210, 212, 214, 216, 218, 220, 222,
- 224, 226, 228, 230, 232, 234, 236, 238,
- 240, 242, 244, 246, 248, 250, 252, 254,
- 256, 258, 260, 262, 264, 266, 268, 270,
- 272, 274, 276, 278, 280, 282, 284, 286,
- 288, 290, 292, 294, 296, 298, 300, 302,
- 304, 306, 308, 310, 312, 314, 316, 318,
- 320, 322, 324, 326, 328, 330, 332, 334,
- 336, 338, 340, 342, 344, 346, 348, 350,
- 352, 354, 356, 358, 360, 362, 364, 366,
- 368, 370, 372, 374, 376, 378, 380, 382,
- 384, 386, 388, 390, 392, 394, 396, 398,
- 400, 402, 404, 406, 408, 410, 412, 414,
- 416, 418, 420, 422, 424, 426, 428, 430,
- 432, 434, 436, 438, 440, 442, 444, 446,
- 448, 450, 452, 454, 456, 458, 460, 462,
- 464, 466, 468, 470, 472, 474, 476, 478,
- 480, 482, 484, 486, 488, 490, 492, 494,
- 496, 498, 500, 502, 504, 506, 508, 510,
- 512, 514, 516, 518, 520, 522, 524, 526,
- 528, 530, 532, 534, 536, 538, 540, 542,
- 544, 546, 548, 550, 552, 554, 556, 558,
- 560,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_192_1024_9 = {
- _vq_quantthresh_res0_192_1024_9,
- _vq_quantmap_res0_192_1024_9,
- 561,
- 561
-};
-
-static static_codebook _vq_book_res0_192_1024_9 = {
- 1, 561,
- _vq_lengthlist_res0_192_1024_9,
- 1, -518946816, 1611661312, 10, 0,
- _vq_quantlist_res0_192_1024_9,
- NULL,
- &_vq_auxt_res0_192_1024_9,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_192_1024aux.vqh b/lib/books/res0_192_1024aux.vqh
deleted file mode 100644
index 5f4c88e5..00000000
--- a/lib/books/res0_192_1024aux.vqh
+++ /dev/null
@@ -1,43 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- * *
- ********************************************************************
-
- function: static codebook autogenerated by huff/huffbuld
-
- ********************************************************************/
-
-#ifndef _V_res0_192_1024aux_VQH_
-#define _V_res0_192_1024aux_VQH_
-#include "codebook.h"
-
-static long _huff_lengthlist_res0_192_1024aux[] = {
- 3, 7,12,11,17,10,15,11,15,21, 5, 5, 8, 8,11, 9,
- 10,10,13,21, 9, 6, 6, 7, 8, 8, 8,11,15,21, 9, 6,
- 6, 6, 6, 6, 6, 9,13,19,14,10, 7, 6, 5, 5, 5,10,
- 16,21,10, 8, 7, 6, 5, 5, 5, 7,12,19,14, 9, 7, 6,
- 5, 5, 4, 6,11,19, 9, 9, 9, 8, 8, 6, 5, 4, 7,13,
- 11,11,13,11,12, 9, 7, 5, 7,13,12,12,13,11,13,10,
- 8, 5, 8,13,
-};
-
-static static_codebook _huff_book_res0_192_1024aux = {
- 2, 100,
- _huff_lengthlist_res0_192_1024aux,
- 0, 0, 0, 0, 0,
- NULL,
- NULL,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_192_128_1.vqh b/lib/books/res0_192_128_1.vqh
deleted file mode 100644
index 075b97f8..00000000
--- a/lib/books/res0_192_128_1.vqh
+++ /dev/null
@@ -1,63 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_192_128_1_VQH_
-#define _V_res0_192_128_1_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_192_128_1[] = {
- 1,
- 0,
- 2,
-};
-
-static long _vq_lengthlist_res0_192_128_1[] = {
- 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 6, 7, 7, 8, 6,
- 7, 8, 5, 6, 7, 6, 8, 7, 6, 8, 7, 5, 7, 7, 7, 8,
- 8, 7, 8, 8, 7, 8, 8, 8, 8, 9, 8, 9, 9, 7, 8, 8,
- 8, 9, 8, 8, 9, 9, 5, 7, 7, 7, 8, 8, 7, 8, 8, 7,
- 8, 8, 8, 9, 9, 8, 8, 9, 7, 8, 8, 8, 9, 9, 8, 9,
- 8,
-};
-
-static float _vq_quantthresh_res0_192_128_1[] = {
- -0.5, 0.5,
-};
-
-static long _vq_quantmap_res0_192_128_1[] = {
- 1, 0, 2,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_192_128_1 = {
- _vq_quantthresh_res0_192_128_1,
- _vq_quantmap_res0_192_128_1,
- 3,
- 3
-};
-
-static static_codebook _vq_book_res0_192_128_1 = {
- 4, 81,
- _vq_lengthlist_res0_192_128_1,
- 1, -535822336, 1611661312, 2, 0,
- _vq_quantlist_res0_192_128_1,
- NULL,
- &_vq_auxt_res0_192_128_1,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_192_128_2.vqh b/lib/books/res0_192_128_2.vqh
deleted file mode 100644
index 0665fe15..00000000
--- a/lib/books/res0_192_128_2.vqh
+++ /dev/null
@@ -1,65 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_192_128_2_VQH_
-#define _V_res0_192_128_2_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_192_128_2[] = {
- 3,
- 2,
- 4,
- 1,
- 5,
- 0,
- 6,
-};
-
-static long _vq_lengthlist_res0_192_128_2[] = {
- 3, 3, 3, 5, 5, 8, 8, 4, 4, 4, 6, 6, 9, 9, 4, 4,
- 4, 6, 6, 9, 9, 6, 7, 6, 9, 9,12,12, 5, 7, 7, 9,
- 9,12,12, 8,10, 9,12,12,15,15, 8,10, 9,12,13,15,
- 15,
-};
-
-static float _vq_quantthresh_res0_192_128_2[] = {
- -2.5, -1.5, -0.5, 0.5, 1.5, 2.5,
-};
-
-static long _vq_quantmap_res0_192_128_2[] = {
- 5, 3, 1, 0, 2, 4, 6,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_192_128_2 = {
- _vq_quantthresh_res0_192_128_2,
- _vq_quantmap_res0_192_128_2,
- 7,
- 7
-};
-
-static static_codebook _vq_book_res0_192_128_2 = {
- 2, 49,
- _vq_lengthlist_res0_192_128_2,
- 1, -533200896, 1611661312, 3, 0,
- _vq_quantlist_res0_192_128_2,
- NULL,
- &_vq_auxt_res0_192_128_2,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_192_128_3.vqh b/lib/books/res0_192_128_3.vqh
deleted file mode 100644
index 2bd3c4e3..00000000
--- a/lib/books/res0_192_128_3.vqh
+++ /dev/null
@@ -1,265 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_192_128_3_VQH_
-#define _V_res0_192_128_3_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_192_128_3[] = {
- 24,
- 23,
- 25,
- 22,
- 26,
- 21,
- 27,
- 20,
- 28,
- 19,
- 29,
- 18,
- 30,
- 17,
- 31,
- 16,
- 32,
- 15,
- 33,
- 14,
- 34,
- 13,
- 35,
- 12,
- 36,
- 11,
- 37,
- 10,
- 38,
- 9,
- 39,
- 8,
- 40,
- 7,
- 41,
- 6,
- 42,
- 5,
- 43,
- 4,
- 44,
- 3,
- 45,
- 2,
- 46,
- 1,
- 47,
- 0,
- 48,
-};
-
-static long _vq_lengthlist_res0_192_128_3[] = {
- 4, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9,
- 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,11,
- 10,11,11,11,11,12,11,12,11,12,12,13,12,13,12,13,
- 12, 5, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 9,
- 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,
- 11,10,11,10,11,10,11,11,12,12,12,12,12,12,13,12,
- 13,13, 5, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9,
- 9, 9, 9, 9, 9, 9, 9, 9,10, 9,10,10,10,10,10,10,
- 10,11,10,11,10,11,11,11,11,12,11,12,12,12,12,13,
- 12,13,13, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9,10,10,
- 10,10,10,10,10,11,10,11,10,11,11,11,11,11,11,11,
- 11,11,11,11,12,11,12,11,13,12,13,12,14,13,14,13,
- 14,13,14,14, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9,10,
- 10,10,10,10,10,10,10,10,11,10,11,11,11,11,11,11,
- 11,11,11,12,11,12,11,12,12,13,12,13,12,13,13,13,
- 13,14,13,15,14, 8, 8, 8, 9, 9,10,10,10,10,11,11,
- 11,11,11,11,11,12,11,12,11,12,12,12,11,12,12,12,
- 12,12,12,12,13,12,13,12,14,13,13,13,15,13,14,13,
- 15,14,15,14,15,15, 8, 8, 8, 9, 9,10,10,11,10,10,
- 11,11,11,11,11,11,11,12,12,11,12,12,12,12,12,12,
- 12,12,12,12,12,12,12,13,12,13,13,13,13,14,13,14,
- 14,14,14,15,15,15,15, 8, 9, 9,10,10,11,11,11,11,
- 12,12,12,12,12,12,12,12,12,13,12,13,12,13,12,13,
- 12,12,13,12,13,13,13,13,14,14,15,14,14,14,15,14,
- 14,15,14,14,16,15,15,16, 8, 9, 9,10,10,11,11,11,
- 12,12,12,12,12,12,13,12,13,12,12,12,13,12,12,12,
- 13,13,13,13,12,13,13,13,13,14,13,14,13,15,14,15,
- 14,16,15,16,15,16,15,15,15, 9,10,10,11,11,12,12,
- 12,13,12,13,13,13,13,13,13,14,12,14,13,14,13,14,
- 14,13,13,13,14,14,13,14,13,14,14,13,15,14,15,14,
- 16,15,15,15,16,15,16,15,16,16, 9,10,10,11,11,12,
- 12,12,12,12,12,13,13,13,13,14,13,13,13,13,13,13,
- 13,13,13,14,14,14,14,14,14,14,14,15,14,15,14,15,
- 14,15,15,16,15,16,15,16,16,16,16,10,11,11,12,12,
- 13,13,13,13,13,14,14,13,14,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,15,14,15,15,15,14,15,15,
- 16,15,17,15,16,16,17,16,17,16,16,17,10,11,11,12,
- 12,13,13,13,13,13,13,14,13,13,13,14,14,13,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,15,15,14,16,
- 14,16,15,15,15,17,15,17,15,17,16,17,17,11,12,11,
- 13,13,13,13,13,14,13,14,14,14,14,15,14,15,14,14,
- 14,15,14,15,14,14,14,15,14,15,15,14,15,15,15,15,
- 16,16,17,15,16,17,16,16,17,16,17,16,18,17,11,12,
- 11,12,13,13,14,14,14,14,13,14,15,15,14,15,15,14,
- 14,14,15,14,15,15,15,14,14,15,15,17,15,15,16,15,
- 16,16,15,16,15,17,15,17,16,17,16,18,17,17,17,12,
- 12,12,13,14,14,14,14,14,14,15,14,15,15,15,15,15,
- 14,15,15,15,14,15,15,15,15,16,15,16,16,15,15,16,
- 17,15,18,15,16,16,16,16,17,17,16,17,16,17,18,18,
- 12,12,12,13,13,14,14,14,14,14,14,14,16,15,15,16,
- 15,16,15,15,15,16,15,16,15,16,15,16,15,17,15,17,
- 16,15,16,17,16,18,16,17,17,17,16,17,17,17,18,16,
- 16,12,13,13,14,13,15,14,15,15,15,16,16,15,15,16,
- 15,16,15,16,16,15,16,17,15,16,16,16,17,16,18,16,
- 17,16,17,17,17,17,17,16,17,17,18,17,18,18,18,18,
- 16,17,12,12,12,14,13,14,15,14,15,15,15,15,15,15,
- 15,15,16,14,15,16,16,16,15,16,15,16,17,16,16,15,
- 16,16,17,16,16,16,16,17,16,17,17,16,16,17,17,17,
- 17,17,17,13,13,13,15,14,15,15,16,16,16,16,16,16,
- 15,17,15,16,15,16,15,16,15,17,15,16,16,17,16,16,
- 16,16,18,16,18,17,17,17,17,16,18,18,18,17,18,16,
- 17,17,18,18,13,13,13,14,14,16,15,16,15,16,16,16,
- 16,16,15,15,16,15,16,16,15,16,16,16,17,16,16,16,
- 16,16,16,17,17,17,16,17,16,17,17,18,17,18,16,18,
- 18,17,17,18,18,13,14,13,15,15,15,16,15,16,16,16,
- 15,17,16,17,15,16,16,17,16,17,16,16,17,16,18,15,
- 16,17,17,16,16,17,18,16,17,16,17,17,17,18,18,17,
- 17,17,17,18,18,18,13,14,13,15,15,15,15,16,15,16,
- 16,16,16,16,16,16,16,16,16,17,17,17,16,17,16,17,
- 16,17,16,17,16,18,16,17,16,17,16,18,17,18,17,17,
- 17,18,17,17,18,18,18,13,14,14,16,15,15,16,16,16,
- 16,17,17,15,16,17,16,16,15,17,16,17,17,16,16,16,
- 16,17,16,17,17,17,18,17,16,17,17,17,18,17,17,17,
- 18,17,18,18,17,18,18,18,13,14,14,15,16,15,14,16,
- 16,16,17,17,16,17,16,18,16,16,16,17,16,17,18,17,
- 15,17,17,17,17,18,16,16,16,18,17,17,18,17,17,18,
- 17,17,17,18,18,18,17,17,17,13,15,14,16,15,15,16,
- 17,15,16,17,16,15,17,17,16,17,17,17,15,16,18,17,
- 17,17,16,17,17,18,17,16,17,17,17,17,18,17,17,17,
- 18,17,18,18,17,18,18,18,18,18,15,14,15,16,15,16,
- 15,16,17,16,16,16,17,17,18,16,17,16,17,17,16,16,
- 16,17,16,17,16,18,17,17,18,18,18,17,17,18,17,17,
- 17,17,17,17,18,17,17,18,18,17,18,14,15,15,15,16,
- 16,16,16,16,16,17,16,18,17,16,16,16,16,17,18,17,
- 17,18,17,17,17,17,17,17,17,17,18,18,18,17,18,18,
- 17,17,18,18,18,17,18,17,18,18,17,18,14,15,15,16,
- 16,16,15,16,18,16,16,16,17,17,16,17,17,17,17,17,
- 17,16,18,18,17,17,16,18,17,18,17,17,17,17,17,17,
- 17,18,17,18,18,17,17,18,18,18,17,18,18,14,15,15,
- 16,16,16,17,17,17,16,16,17,17,17,17,17,17,17,18,
- 18,18,16,17,17,18,17,17,18,17,17,17,18,18,18,18,
- 18,16,18,18,18,18,18,18,18,18,18,18,18,18,15,16,
- 16,16,16,16,16,17,16,16,16,17,18,16,18,17,17,17,
- 17,16,18,16,17,18,16,17,16,17,16,18,18,18,17,17,
- 17,18,17,18,17,18,18,17,18,18,18,18,18,17,18,16,
- 16,15,16,17,16,16,17,17,16,17,17,18,18,18,16,18,
- 17,18,17,17,17,17,18,18,17,17,17,17,18,18,18,17,
- 17,17,17,17,17,18,18,18,18,18,18,18,17,18,18,18,
- 14,15,15,16,15,15,17,17,16,15,17,17,16,16,18,17,
- 17,17,17,17,16,17,17,17,17,16,17,17,18,18,17,17,
- 18,18,17,17,17,18,17,18,17,17,17,18,18,18,18,18,
- 18,15,16,15,17,17,18,17,16,18,17,16,17,17,18,17,
- 17,17,18,17,16,18,18,17,18,17,17,16,17,17,17,18,
- 18,17,18,18,18,18,18,18,18,18,17,18,18,18,18,18,
- 17,18,15,15,17,16,17,17,17,16,16,18,17,17,18,18,
- 17,17,18,17,17,18,18,17,17,17,18,17,17,18,16,18,
- 18,17,18,18,18,18,18,18,18,18,17,18,18,18,18,18,
- 17,18,18,16,17,16,16,16,16,17,18,17,17,17,17,18,
- 17,18,16,18,18,18,18,18,18,17,18,18,17,18,18,17,
- 18,18,18,17,17,18,18,18,17,18,18,17,18,18,18,18,
- 18,18,18,18,16,16,17,16,16,17,18,18,17,16,17,17,
- 18,17,17,17,18,16,18,17,17,18,17,17,17,18,18,18,
- 17,17,17,17,18,17,17,18,17,18,17,18,18,18,18,18,
- 18,18,18,18,18,16,16,16,17,17,17,17,17,18,18,18,
- 17,17,18,18,17,17,18,18,18,18,18,18,18,17,18,18,
- 17,18,17,18,17,18,18,17,18,18,18,18,18,18,18,18,
- 18,18,18,18,18,18,16,17,17,17,17,16,16,18,16,18,
- 17,18,18,18,18,18,18,17,17,17,18,17,18,18,17,18,
- 18,17,17,17,18,18,18,18,18,18,17,18,17,18,18,18,
- 18,18,18,18,18,18,18,17,16,17,16,18,18,17,18,18,
- 18,18,18,18,18,18,18,18,18,17,18,18,18,18,18,18,
- 18,18,18,18,18,18,18,18,18,18,18,17,18,18,18,16,
- 18,18,18,17,18,18,18,18,16,18,18,18,16,18,17,16,
- 17,17,18,18,18,16,18,18,18,18,18,17,18,18,18,18,
- 18,17,18,18,18,18,18,17,18,17,17,18,18,18,18,18,
- 17,18,18,18,18,18,18,18,18,17,17,17,17,17,17,18,
- 18,18,18,17,18,18,18,18,18,17,18,18,18,18,18,18,
- 18,17,18,17,17,17,18,17,18,18,18,18,17,17,18,18,
- 18,18,18,18,18,18,18,18,18,18,16,16,17,18,17,17,
- 18,17,17,18,17,18,17,18,17,18,18,18,18,18,17,17,
- 18,18,18,17,17,17,17,18,17,18,18,18,17,18,18,18,
- 17,18,18,18,18,18,18,18,18,17,18,17,17,18,18,17,
- 17,18,17,17,18,18,17,17,18,17,18,18,18,18,18,18,
- 18,18,18,17,18,18,18,18,18,18,18,18,18,18,18,18,
- 18,17,18,17,18,18,18,18,18,18,18,18,16,17,17,16,
- 18,17,17,18,18,18,18,17,18,18,18,18,18,18,18,18,
- 18,18,17,18,18,18,18,17,18,18,18,18,18,18,18,18,
- 18,18,18,18,18,18,17,18,18,18,18,18,18,17,17,18,
- 18,17,18,17,18,17,17,18,17,18,18,18,18,18,18,17,
- 18,18,18,18,18,18,18,18,18,17,18,18,18,18,18,18,
- 18,18,18,18,18,18,18,18,18,18,18,18,18,18,16,18,
- 17,18,17,18,18,17,17,18,18,17,18,18,17,18,18,17,
- 17,18,17,18,18,18,18,18,18,18,18,18,18,18,18,18,
- 17,18,18,18,17,18,18,18,18,18,18,18,18,18,18,17,
- 17,18,18,18,17,17,17,17,18,18,18,18,18,18,17,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,18,18,18,18,18,18,18,18,
- 16,17,17,17,18,18,18,18,17,18,18,18,18,17,18,18,
- 18,18,18,18,18,17,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,18,
- 18,
-};
-
-static float _vq_quantthresh_res0_192_128_3[] = {
- -23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5,
- -15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5,
- -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5,
- 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5,
- 8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 14.5, 15.5,
- 16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5,
-};
-
-static long _vq_quantmap_res0_192_128_3[] = {
- 47, 45, 43, 41, 39, 37, 35, 33,
- 31, 29, 27, 25, 23, 21, 19, 17,
- 15, 13, 11, 9, 7, 5, 3, 1,
- 0, 2, 4, 6, 8, 10, 12, 14,
- 16, 18, 20, 22, 24, 26, 28, 30,
- 32, 34, 36, 38, 40, 42, 44, 46,
- 48,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_192_128_3 = {
- _vq_quantthresh_res0_192_128_3,
- _vq_quantmap_res0_192_128_3,
- 49,
- 49
-};
-
-static static_codebook _vq_book_res0_192_128_3 = {
- 2, 2401,
- _vq_lengthlist_res0_192_128_3,
- 1, -526909440, 1611661312, 6, 0,
- _vq_quantlist_res0_192_128_3,
- NULL,
- &_vq_auxt_res0_192_128_3,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_192_128_4.vqh b/lib/books/res0_192_128_4.vqh
deleted file mode 100644
index 8b439f82..00000000
--- a/lib/books/res0_192_128_4.vqh
+++ /dev/null
@@ -1,160 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_192_128_4_VQH_
-#define _V_res0_192_128_4_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_192_128_4[] = {
- 40,
- 39,
- 41,
- 38,
- 42,
- 37,
- 43,
- 36,
- 44,
- 35,
- 45,
- 34,
- 46,
- 33,
- 47,
- 32,
- 48,
- 31,
- 49,
- 30,
- 50,
- 29,
- 51,
- 28,
- 52,
- 27,
- 53,
- 26,
- 54,
- 25,
- 55,
- 24,
- 56,
- 23,
- 57,
- 22,
- 58,
- 21,
- 59,
- 20,
- 60,
- 19,
- 61,
- 18,
- 62,
- 17,
- 63,
- 16,
- 64,
- 15,
- 65,
- 14,
- 66,
- 13,
- 67,
- 12,
- 68,
- 11,
- 69,
- 10,
- 70,
- 9,
- 71,
- 8,
- 72,
- 7,
- 73,
- 6,
- 74,
- 5,
- 75,
- 4,
- 76,
- 3,
- 77,
- 2,
- 78,
- 1,
- 79,
- 0,
- 80,
-};
-
-static long _vq_lengthlist_res0_192_128_4[] = {
- 2, 3, 3, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 7, 7,
- 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 8, 9, 9, 9, 9,10,
- 10,11,10,11,10,11,11,11,11,12,12,13,11,12,12,13,
- 12, 7, 7, 8, 8, 8, 8, 8, 8, 8, 9, 8, 9, 8, 9, 9,
- 9, 9,10, 9,10, 9,10, 9,11,10,11, 9,10,10,11,10,
- 11,
-};
-
-static float _vq_quantthresh_res0_192_128_4[] = {
- -39.5, -38.5, -37.5, -36.5, -35.5, -34.5, -33.5, -32.5,
- -31.5, -30.5, -29.5, -28.5, -27.5, -26.5, -25.5, -24.5,
- -23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5,
- -15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5,
- -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5,
- 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5,
- 8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 14.5, 15.5,
- 16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5,
- 24.5, 25.5, 26.5, 27.5, 28.5, 29.5, 30.5, 31.5,
- 32.5, 33.5, 34.5, 35.5, 36.5, 37.5, 38.5, 39.5,
-};
-
-static long _vq_quantmap_res0_192_128_4[] = {
- 79, 77, 75, 73, 71, 69, 67, 65,
- 63, 61, 59, 57, 55, 53, 51, 49,
- 47, 45, 43, 41, 39, 37, 35, 33,
- 31, 29, 27, 25, 23, 21, 19, 17,
- 15, 13, 11, 9, 7, 5, 3, 1,
- 0, 2, 4, 6, 8, 10, 12, 14,
- 16, 18, 20, 22, 24, 26, 28, 30,
- 32, 34, 36, 38, 40, 42, 44, 46,
- 48, 50, 52, 54, 56, 58, 60, 62,
- 64, 66, 68, 70, 72, 74, 76, 78,
- 80,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_192_128_4 = {
- _vq_quantthresh_res0_192_128_4,
- _vq_quantmap_res0_192_128_4,
- 81,
- 81
-};
-
-static static_codebook _vq_book_res0_192_128_4 = {
- 1, 81,
- _vq_lengthlist_res0_192_128_4,
- 1, -525074432, 1611661312, 7, 0,
- _vq_quantlist_res0_192_128_4,
- NULL,
- &_vq_auxt_res0_192_128_4,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_192_128_5.vqh b/lib/books/res0_192_128_5.vqh
deleted file mode 100644
index 952a812b..00000000
--- a/lib/books/res0_192_128_5.vqh
+++ /dev/null
@@ -1,448 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_192_128_5_VQH_
-#define _V_res0_192_128_5_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_192_128_5[] = {
- 150,
- 149,
- 151,
- 148,
- 152,
- 147,
- 153,
- 146,
- 154,
- 145,
- 155,
- 144,
- 156,
- 143,
- 157,
- 142,
- 158,
- 141,
- 159,
- 140,
- 160,
- 139,
- 161,
- 138,
- 162,
- 137,
- 163,
- 136,
- 164,
- 135,
- 165,
- 134,
- 166,
- 133,
- 167,
- 132,
- 168,
- 131,
- 169,
- 130,
- 170,
- 129,
- 171,
- 128,
- 172,
- 127,
- 173,
- 126,
- 174,
- 125,
- 175,
- 124,
- 176,
- 123,
- 177,
- 122,
- 178,
- 121,
- 179,
- 120,
- 180,
- 119,
- 181,
- 118,
- 182,
- 117,
- 183,
- 116,
- 184,
- 115,
- 185,
- 114,
- 186,
- 113,
- 187,
- 112,
- 188,
- 111,
- 189,
- 110,
- 190,
- 109,
- 191,
- 108,
- 192,
- 107,
- 193,
- 106,
- 194,
- 105,
- 195,
- 104,
- 196,
- 103,
- 197,
- 102,
- 198,
- 101,
- 199,
- 100,
- 200,
- 99,
- 201,
- 98,
- 202,
- 97,
- 203,
- 96,
- 204,
- 95,
- 205,
- 94,
- 206,
- 93,
- 207,
- 92,
- 208,
- 91,
- 209,
- 90,
- 210,
- 89,
- 211,
- 88,
- 212,
- 87,
- 213,
- 86,
- 214,
- 85,
- 215,
- 84,
- 216,
- 83,
- 217,
- 82,
- 218,
- 81,
- 219,
- 80,
- 220,
- 79,
- 221,
- 78,
- 222,
- 77,
- 223,
- 76,
- 224,
- 75,
- 225,
- 74,
- 226,
- 73,
- 227,
- 72,
- 228,
- 71,
- 229,
- 70,
- 230,
- 69,
- 231,
- 68,
- 232,
- 67,
- 233,
- 66,
- 234,
- 65,
- 235,
- 64,
- 236,
- 63,
- 237,
- 62,
- 238,
- 61,
- 239,
- 60,
- 240,
- 59,
- 241,
- 58,
- 242,
- 57,
- 243,
- 56,
- 244,
- 55,
- 245,
- 54,
- 246,
- 53,
- 247,
- 52,
- 248,
- 51,
- 249,
- 50,
- 250,
- 49,
- 251,
- 48,
- 252,
- 47,
- 253,
- 46,
- 254,
- 45,
- 255,
- 44,
- 256,
- 43,
- 257,
- 42,
- 258,
- 41,
- 259,
- 40,
- 260,
- 39,
- 261,
- 38,
- 262,
- 37,
- 263,
- 36,
- 264,
- 35,
- 265,
- 34,
- 266,
- 33,
- 267,
- 32,
- 268,
- 31,
- 269,
- 30,
- 270,
- 29,
- 271,
- 28,
- 272,
- 27,
- 273,
- 26,
- 274,
- 25,
- 275,
- 24,
- 276,
- 23,
- 277,
- 22,
- 278,
- 21,
- 279,
- 20,
- 280,
- 19,
- 281,
- 18,
- 282,
- 17,
- 283,
- 16,
- 284,
- 15,
- 285,
- 14,
- 286,
- 13,
- 287,
- 12,
- 288,
- 11,
- 289,
- 10,
- 290,
- 9,
- 291,
- 8,
- 292,
- 7,
- 293,
- 6,
- 294,
- 5,
- 295,
- 4,
- 296,
- 3,
- 297,
- 2,
- 298,
- 1,
- 299,
- 0,
- 300,
-};
-
-static long _vq_lengthlist_res0_192_128_5[] = {
- 3, 3, 2, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 6, 7,
- 7, 7, 8, 8, 8, 9, 8, 9, 9, 9, 9, 9,11, 9,10,10,
- 11,10,11,12,10,11,11,10,11,11,11,11,13,12,11,10,
- 12,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,13,13,13,13,13,
- 13, 8, 9, 8, 9, 8, 9, 8, 9, 9, 9,10,10,10,10,10,
- 10, 9,10, 9,10, 9,10, 9,12, 9,11,10,11,10,11,10,
- 10,10,11,12,12,10,10,11,11, 9,12,10,12,10,11,11,
- 13,11,12,11,12,11,12,11,13,12,11,11,12,11,11,10,
- 12,12,12,10,12,13,13,12,13,12,13,13,13,13,13,11,
- 11,13,12,13,13,12,12,13,11,11,12,12,13,11,11,12,
- 12,11,13,13,13,12,13,13,12,13,12,12,13,13,12,13,
- 13,12,13,12,13,13,13,12,13,13,13,13,13,13,13,13,
- 12,13,13,11,12,13,12,13,13,13,12,13,12,13,13,13,
- 13,13,13,13,13,13,13,11,13,13,13,13,13,12,13,13,
- 13,13,13,13,13,13,13,12,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,12,13,13,13,13,
- 13,13,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,12,12,
-};
-
-static float _vq_quantthresh_res0_192_128_5[] = {
- -149.5, -148.5, -147.5, -146.5, -145.5, -144.5, -143.5, -142.5,
- -141.5, -140.5, -139.5, -138.5, -137.5, -136.5, -135.5, -134.5,
- -133.5, -132.5, -131.5, -130.5, -129.5, -128.5, -127.5, -126.5,
- -125.5, -124.5, -123.5, -122.5, -121.5, -120.5, -119.5, -118.5,
- -117.5, -116.5, -115.5, -114.5, -113.5, -112.5, -111.5, -110.5,
- -109.5, -108.5, -107.5, -106.5, -105.5, -104.5, -103.5, -102.5,
- -101.5, -100.5, -99.5, -98.5, -97.5, -96.5, -95.5, -94.5,
- -93.5, -92.5, -91.5, -90.5, -89.5, -88.5, -87.5, -86.5,
- -85.5, -84.5, -83.5, -82.5, -81.5, -80.5, -79.5, -78.5,
- -77.5, -76.5, -75.5, -74.5, -73.5, -72.5, -71.5, -70.5,
- -69.5, -68.5, -67.5, -66.5, -65.5, -64.5, -63.5, -62.5,
- -61.5, -60.5, -59.5, -58.5, -57.5, -56.5, -55.5, -54.5,
- -53.5, -52.5, -51.5, -50.5, -49.5, -48.5, -47.5, -46.5,
- -45.5, -44.5, -43.5, -42.5, -41.5, -40.5, -39.5, -38.5,
- -37.5, -36.5, -35.5, -34.5, -33.5, -32.5, -31.5, -30.5,
- -29.5, -28.5, -27.5, -26.5, -25.5, -24.5, -23.5, -22.5,
- -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, -15.5, -14.5,
- -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, -7.5, -6.5,
- -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5,
- 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5,
- 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 16.5, 17.5,
- 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 24.5, 25.5,
- 26.5, 27.5, 28.5, 29.5, 30.5, 31.5, 32.5, 33.5,
- 34.5, 35.5, 36.5, 37.5, 38.5, 39.5, 40.5, 41.5,
- 42.5, 43.5, 44.5, 45.5, 46.5, 47.5, 48.5, 49.5,
- 50.5, 51.5, 52.5, 53.5, 54.5, 55.5, 56.5, 57.5,
- 58.5, 59.5, 60.5, 61.5, 62.5, 63.5, 64.5, 65.5,
- 66.5, 67.5, 68.5, 69.5, 70.5, 71.5, 72.5, 73.5,
- 74.5, 75.5, 76.5, 77.5, 78.5, 79.5, 80.5, 81.5,
- 82.5, 83.5, 84.5, 85.5, 86.5, 87.5, 88.5, 89.5,
- 90.5, 91.5, 92.5, 93.5, 94.5, 95.5, 96.5, 97.5,
- 98.5, 99.5, 100.5, 101.5, 102.5, 103.5, 104.5, 105.5,
- 106.5, 107.5, 108.5, 109.5, 110.5, 111.5, 112.5, 113.5,
- 114.5, 115.5, 116.5, 117.5, 118.5, 119.5, 120.5, 121.5,
- 122.5, 123.5, 124.5, 125.5, 126.5, 127.5, 128.5, 129.5,
- 130.5, 131.5, 132.5, 133.5, 134.5, 135.5, 136.5, 137.5,
- 138.5, 139.5, 140.5, 141.5, 142.5, 143.5, 144.5, 145.5,
- 146.5, 147.5, 148.5, 149.5,
-};
-
-static long _vq_quantmap_res0_192_128_5[] = {
- 299, 297, 295, 293, 291, 289, 287, 285,
- 283, 281, 279, 277, 275, 273, 271, 269,
- 267, 265, 263, 261, 259, 257, 255, 253,
- 251, 249, 247, 245, 243, 241, 239, 237,
- 235, 233, 231, 229, 227, 225, 223, 221,
- 219, 217, 215, 213, 211, 209, 207, 205,
- 203, 201, 199, 197, 195, 193, 191, 189,
- 187, 185, 183, 181, 179, 177, 175, 173,
- 171, 169, 167, 165, 163, 161, 159, 157,
- 155, 153, 151, 149, 147, 145, 143, 141,
- 139, 137, 135, 133, 131, 129, 127, 125,
- 123, 121, 119, 117, 115, 113, 111, 109,
- 107, 105, 103, 101, 99, 97, 95, 93,
- 91, 89, 87, 85, 83, 81, 79, 77,
- 75, 73, 71, 69, 67, 65, 63, 61,
- 59, 57, 55, 53, 51, 49, 47, 45,
- 43, 41, 39, 37, 35, 33, 31, 29,
- 27, 25, 23, 21, 19, 17, 15, 13,
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12, 14, 16, 18,
- 20, 22, 24, 26, 28, 30, 32, 34,
- 36, 38, 40, 42, 44, 46, 48, 50,
- 52, 54, 56, 58, 60, 62, 64, 66,
- 68, 70, 72, 74, 76, 78, 80, 82,
- 84, 86, 88, 90, 92, 94, 96, 98,
- 100, 102, 104, 106, 108, 110, 112, 114,
- 116, 118, 120, 122, 124, 126, 128, 130,
- 132, 134, 136, 138, 140, 142, 144, 146,
- 148, 150, 152, 154, 156, 158, 160, 162,
- 164, 166, 168, 170, 172, 174, 176, 178,
- 180, 182, 184, 186, 188, 190, 192, 194,
- 196, 198, 200, 202, 204, 206, 208, 210,
- 212, 214, 216, 218, 220, 222, 224, 226,
- 228, 230, 232, 234, 236, 238, 240, 242,
- 244, 246, 248, 250, 252, 254, 256, 258,
- 260, 262, 264, 266, 268, 270, 272, 274,
- 276, 278, 280, 282, 284, 286, 288, 290,
- 292, 294, 296, 298, 300,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_192_128_5 = {
- _vq_quantthresh_res0_192_128_5,
- _vq_quantmap_res0_192_128_5,
- 301,
- 301
-};
-
-static static_codebook _vq_book_res0_192_128_5 = {
- 1, 301,
- _vq_lengthlist_res0_192_128_5,
- 1, -520962048, 1611661312, 9, 0,
- _vq_quantlist_res0_192_128_5,
- NULL,
- &_vq_auxt_res0_192_128_5,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_192_128aux.vqh b/lib/books/res0_192_128aux.vqh
deleted file mode 100644
index fa3ec0c8..00000000
--- a/lib/books/res0_192_128aux.vqh
+++ /dev/null
@@ -1,117 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- * *
- ********************************************************************
-
- function: static codebook autogenerated by huff/huffbuld
-
- ********************************************************************/
-
-#ifndef _V_res0_192_128aux_VQH_
-#define _V_res0_192_128aux_VQH_
-#include "codebook.h"
-
-static long _huff_lengthlist_res0_192_128aux[] = {
- 10,16,16,16,16,16,12,16,16,16,16,16,15,16,16,16,
- 16,16,13,16,16,16,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,10,14,16,16,16,16,12,15,16,16,16,16,
- 14,16,16,16,16,16,14,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16,12,16,16,16,16,16,13,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,10,16,16,16,
- 16,16,12,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,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,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16, 5,12,14,16,16,16, 9,12,
- 16,16,16,16,13,14,16,16,16,16,12,16,16,16,16,16,
- 16,16,16,16,16,16,16,16,16,16,16,16, 4, 9,12,13,
- 16,16, 5, 5, 9,11,16,16,10, 8, 9,16,16,16,13,15,
- 15,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
- 8,12,16,13,16,16, 7, 7,10,13,16,16,11, 9, 9,14,
- 16,16,14,14,15,15,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,11,16,16,16,16,16,15,13,14,16,16,16,
- 16,16,14,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,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,16,16,16,16,
- 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
- 5,11,14,16,16,16, 9,11,16,16,16,16,15,13,14,16,
- 16,16,16,16,15,16,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,16, 4, 8,11,13,16,16, 4, 4, 9,10,16,16,
- 10, 8, 9,16,16,16,16,14,15,15,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16, 7,11,15,12,16,16, 6, 6,
- 9,11,16,16,10, 8, 9,14,16,16,14,15,14,15,16,16,
- 16,16,16,16,16,16,16,16,16,16,16,16,11,14,16,16,
- 16,16,13,13,14,16,16,16,13,13,15,14,16,16,14,14,
- 13,14,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,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,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16, 8,12,16,16,16,16,11,12,
- 15,15,16,16,16,15,16,16,16,16,16,15,16,16,16,16,
- 16,16,16,16,16,16,16,16,16,16,16,16, 7,12,15,15,
- 16,16, 9, 7, 7,11,16,16,12, 7, 6, 9,16,16,14,11,
- 9,11,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
- 10,14,16,15,16,16,10, 6, 4, 8,16,16,12, 4, 3, 6,
- 16,16,12, 8, 6, 8,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,12,14,14,13,16,16,14, 9, 7, 8,14,16,
- 14, 7, 5, 7,16,16,14, 9, 7, 8,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,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,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,
- 14,14,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,16,16,16,16,15,16,16,16,16,14,11,10,15,16,16,
- 16,11, 9,13,16,16,15,13,12,14,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, 9,
- 8,11,16,16,14, 8, 6, 9,16,16,15,12,10,11,16,16,
- 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,12,10,13,16,16,16,10, 8,11,16,16,15,14,
- 11,12,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,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,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,16,16,16,16,16,16,16,16,16,15,16,16,
- 16,16,16,13,13,16,16,16,16,14,12,14,16,16,16,16,
- 15,15,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,12,10,14,16,16,16,10, 9,11,
- 16,16,16,13,12,15,16,16,16,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,16,16,16,16,15,13,16,16,16,
- 16,15,11,13,16,16,16,16,13,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,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,16,16,
- 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-};
-
-static static_codebook _huff_book_res0_192_128aux = {
- 4, 1296,
- _huff_lengthlist_res0_192_128aux,
- 0, 0, 0, 0, 0,
- NULL,
- NULL,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_256_1024_1.vqh b/lib/books/res0_256_1024_1.vqh
deleted file mode 100644
index e2d502d5..00000000
--- a/lib/books/res0_256_1024_1.vqh
+++ /dev/null
@@ -1,99 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_256_1024_1_VQH_
-#define _V_res0_256_1024_1_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_256_1024_1[] = {
- 2,
- 1,
- 3,
- 0,
- 4,
-};
-
-static long _vq_lengthlist_res0_256_1024_1[] = {
- 2, 4, 4, 8, 8, 5, 7, 7,10,10, 5, 7, 7,10,10, 9,
- 10,10,12,12, 9,10,10,12,12, 5, 7, 7,10,10, 7, 8,
- 8,11,11, 7, 8, 8,11,11,10,11,11,13,13,10,11,11,
- 13,13, 5, 7, 7,10,10, 7, 8, 8,11,11, 7, 8, 8,11,
- 11,10,11,11,13,13,10,11,11,13,13, 9,10,10,12,12,
- 10,11,11,13,13,10,11,11,13,13,13,13,13,15,15,13,
- 13,14,15,15, 9,10,10,12,12,10,11,11,13,13,10,11,
- 11,13,13,13,14,13,15,15,13,13,13,15,15, 5, 7, 7,
- 10,10, 7, 9, 9,11,11, 7, 9, 8,11,11,10,11,11,13,
- 13,10,11,11,13,13, 7, 9, 9,11,11, 9,10,10,12,12,
- 9,10,10,12,12,11,12,12,14,14,11,12,12,14,14, 7,
- 9, 9,11,11, 9,10,10,12,12, 9,10,10,12,12,11,12,
- 12,14,14,11,12,12,14,14,10,11,11,13,13,11,12,12,
- 14,14,11,12,12,14,14,13,14,14,15,16,14,14,14,16,
- 16,10,11,11,13,13,11,12,12,14,14,11,12,12,14,14,
- 14,14,14,16,15,14,14,14,15,15, 5, 7, 7,10,10, 7,
- 8, 8,11,11, 7, 9, 9,11,11,10,11,11,13,13,10,11,
- 11,13,13, 7, 9, 9,11,11, 9,10,10,12,12, 9,10,10,
- 12,12,11,12,12,14,14,11,12,12,14,14, 7, 9, 9,11,
- 11, 9,10,10,12,12, 9,10,10,12,12,11,12,12,14,14,
- 11,12,12,14,14,10,11,11,13,13,11,12,12,14,14,11,
- 12,12,14,14,14,14,14,16,16,13,14,14,15,16,10,11,
- 11,13,13,11,12,12,14,14,11,12,12,14,14,14,14,14,
- 16,16,13,14,14,16,15, 9,10,10,13,13,10,11,11,14,
- 13,10,11,11,14,13,13,14,14,15,15,13,14,14,15,15,
- 10,11,11,14,13,11,12,12,14,14,11,12,12,14,14,14,
- 14,15,16,16,14,14,14,16,16,10,11,11,14,13,11,12,
- 12,14,14,11,12,12,14,14,14,14,14,16,16,14,14,14,
- 16,15,13,14,13,15,15,13,14,14,16,16,13,14,14,16,
- 16,15,16,16,16,17,15,16,16,17,17,13,14,14,15,15,
- 13,14,14,16,15,14,14,14,16,16,15,16,16,17,16,15,
- 16,16,17,17, 9,10,10,13,13,10,11,11,13,14,10,11,
- 11,13,13,13,14,14,15,15,13,13,14,15,15,10,11,11,
- 13,14,11,12,12,14,14,11,12,12,14,14,14,14,14,16,
- 16,14,14,14,15,16,10,11,11,13,13,11,12,12,14,14,
- 11,12,12,14,14,14,14,14,16,16,13,14,14,16,16,13,
- 14,13,15,15,14,14,14,16,16,13,14,14,16,16,15,16,
- 16,18,18,15,15,16,17,17,13,14,14,15,15,14,14,14,
- 16,16,13,14,14,16,16,16,16,16,17,17,16,16,15,17,
- 16,
-};
-
-static float _vq_quantthresh_res0_256_1024_1[] = {
- -1.5, -0.5, 0.5, 1.5,
-};
-
-static long _vq_quantmap_res0_256_1024_1[] = {
- 3, 1, 0, 2, 4,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_256_1024_1 = {
- _vq_quantthresh_res0_256_1024_1,
- _vq_quantmap_res0_256_1024_1,
- 5,
- 5
-};
-
-static static_codebook _vq_book_res0_256_1024_1 = {
- 4, 625,
- _vq_lengthlist_res0_256_1024_1,
- 1, -533725184, 1611661312, 3, 0,
- _vq_quantlist_res0_256_1024_1,
- NULL,
- &_vq_auxt_res0_256_1024_1,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_256_1024_2.vqh b/lib/books/res0_256_1024_2.vqh
deleted file mode 100644
index b1026ccb..00000000
--- a/lib/books/res0_256_1024_2.vqh
+++ /dev/null
@@ -1,70 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_256_1024_2_VQH_
-#define _V_res0_256_1024_2_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_256_1024_2[] = {
- 4,
- 3,
- 5,
- 2,
- 6,
- 1,
- 7,
- 0,
- 8,
-};
-
-static long _vq_lengthlist_res0_256_1024_2[] = {
- 3, 4, 4, 5, 5, 6, 6, 8, 8, 4, 5, 5, 6, 6, 7, 7,
- 8, 8, 4, 5, 5, 6, 6, 7, 7, 8, 8, 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, 6, 7, 7, 8, 8, 9, 9,10,10, 8,
- 9, 9, 9, 9,11,11,12,12, 8, 9, 9, 9, 9,10,10,12,
- 12,
-};
-
-static float _vq_quantthresh_res0_256_1024_2[] = {
- -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5,
-};
-
-static long _vq_quantmap_res0_256_1024_2[] = {
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_256_1024_2 = {
- _vq_quantthresh_res0_256_1024_2,
- _vq_quantmap_res0_256_1024_2,
- 9,
- 9
-};
-
-static static_codebook _vq_book_res0_256_1024_2 = {
- 2, 81,
- _vq_lengthlist_res0_256_1024_2,
- 1, -531628032, 1611661312, 4, 0,
- _vq_quantlist_res0_256_1024_2,
- NULL,
- &_vq_auxt_res0_256_1024_2,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_256_1024_3.vqh b/lib/books/res0_256_1024_3.vqh
deleted file mode 100644
index fa0116b4..00000000
--- a/lib/books/res0_256_1024_3.vqh
+++ /dev/null
@@ -1,107 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_256_1024_3_VQH_
-#define _V_res0_256_1024_3_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_256_1024_3[] = {
- 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_res0_256_1024_3[] = {
- 3, 4, 4, 6, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,
- 11,11,11,12,12, 5, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,
- 10,10,11,11,12,12,13,13,13,13, 4, 5, 5, 6, 6, 7,
- 7, 8, 8, 9, 9,10,10,11,11,12,12,13,13,13,13, 6,
- 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11,12,12,13,13,
- 14,14,15,15, 6, 6, 6, 7, 7, 8, 8, 9, 9, 9,10,11,
- 11,12,12,13,13,14,14,15,15, 7, 7, 7, 8, 8, 9, 9,
- 10,10,11,11,12,12,13,13,15,15,15,15,16,16, 7, 7,
- 7, 8, 8, 9, 9,10,10,11,11,12,12,13,13,15,15,15,
- 15,16,16, 8, 8, 8, 9, 9,10,10,11,11,12,12,13,13,
- 14,15,15,15,17,16,17,17, 8, 8, 8, 9, 9,10,10,11,
- 11,12,12,13,13,14,14,15,15,16,16,17,17, 8, 9, 9,
- 10,10,11,11,12,12,13,13,14,15,16,15,16,16,17,17,
- 17,17, 8, 9, 9,10,10,11,11,12,12,13,13,14,14,16,
- 15,17,17,17,17,18,18, 9,10,10,11,11,12,12,13,13,
- 14,14,16,16,16,17,17,17,18,18,18,18, 9,10,10,11,
- 11,12,12,13,13,14,14,15,16,16,16,17,17,18,18,19,
- 18,10,11,11,12,12,14,13,15,14,16,16,17,17,17,17,
- 18,18,18,18,18,18,10,11,11,12,12,14,13,15,14,16,
- 16,16,16,17,18,18,17,18,18,18,19,11,12,12,13,14,
- 15,15,16,16,16,17,17,17,18,18,18,18,19,19,19,19,
- 11,12,12,14,14,15,15,16,16,17,17,17,17,18,18,19,
- 18,18,18,18,19,11,13,13,14,15,16,16,17,17,17,17,
- 17,18,18,19,18,18,19,19,20,19,12,13,13,15,14,16,
- 16,16,17,17,17,18,18,18,19,19,18,19,19,20,20,12,
- 14,14,15,15,16,17,18,17,18,18,18,19,18,18,19,19,
- 19,19,19,20,12,14,14,15,15,16,16,17,17,17,17,18,
- 19,18,18,19,19,20,19,19,20,
-};
-
-static float _vq_quantthresh_res0_256_1024_3[] = {
- -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_res0_256_1024_3[] = {
- 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_res0_256_1024_3 = {
- _vq_quantthresh_res0_256_1024_3,
- _vq_quantmap_res0_256_1024_3,
- 21,
- 21
-};
-
-static static_codebook _vq_book_res0_256_1024_3 = {
- 2, 441,
- _vq_lengthlist_res0_256_1024_3,
- 1, -529268736, 1611661312, 5, 0,
- _vq_quantlist_res0_256_1024_3,
- NULL,
- &_vq_auxt_res0_256_1024_3,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_256_1024_4.vqh b/lib/books/res0_256_1024_4.vqh
deleted file mode 100644
index 1dad6656..00000000
--- a/lib/books/res0_256_1024_4.vqh
+++ /dev/null
@@ -1,107 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_256_1024_4_VQH_
-#define _V_res0_256_1024_4_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_256_1024_4[] = {
- 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_res0_256_1024_4[] = {
- 6, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,
- 10,11,11,11,11, 6, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8,
- 9, 9, 9, 9,10,10,11,11,12,12, 6, 6, 6, 6, 6, 7,
- 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11,11,12, 6,
- 6, 6, 7, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11,11,
- 11,11,12,12, 6, 6, 6, 6, 7, 7, 7, 8, 8, 8, 8, 9,
- 9,10,10,11,11,11,11,12,12, 7, 7, 7, 7, 7, 7, 7,
- 8, 8, 9, 9, 9, 9,10,10,11,11,12,12,12,12, 7, 7,
- 7, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11,12,
- 12,12,12, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,10,
- 11,11,12,12,12,12,13,13, 7, 7, 7, 8, 8, 8, 8, 9,
- 9, 9, 9,10,10,11,11,12,12,12,12,13,13, 8, 8, 8,
- 8, 8, 9, 9, 9, 9,10,10,11,11,11,11,12,12,13,13,
- 13,14, 8, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,11,11,
- 11,12,12,13,13,13,13, 9, 9, 9, 9, 9,10,10,10,10,
- 11,11,11,11,12,12,13,13,13,13,14,14, 9, 9, 9, 9,
- 9,10,10,10,10,11,11,11,11,12,12,13,13,13,13,14,
- 14, 9,10,10,10,10,10,10,11,11,12,11,12,12,13,13,
- 13,13,14,14,15,15, 9,10,10,10,10,10,10,11,11,12,
- 11,12,12,13,13,13,13,14,14,15,15,10,10,10,11,11,
- 11,11,12,12,12,12,13,13,13,13,14,14,14,14,15,15,
- 10,10,10,11,11,11,11,12,12,12,12,13,13,13,13,14,
- 14,15,14,15,15,11,11,11,12,12,12,12,13,12,13,13,
- 14,13,14,14,15,14,15,15,15,16,11,11,11,12,12,12,
- 12,13,12,13,13,14,14,14,14,15,14,15,15,16,16,12,
- 12,12,12,12,13,13,13,13,14,14,14,14,15,15,15,15,
- 16,16,16,16,12,12,12,12,12,13,13,13,13,14,14,14,
- 14,15,15,15,15,15,16,16,16,
-};
-
-static float _vq_quantthresh_res0_256_1024_4[] = {
- -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_res0_256_1024_4[] = {
- 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_res0_256_1024_4 = {
- _vq_quantthresh_res0_256_1024_4,
- _vq_quantmap_res0_256_1024_4,
- 21,
- 21
-};
-
-static static_codebook _vq_book_res0_256_1024_4 = {
- 2, 441,
- _vq_lengthlist_res0_256_1024_4,
- 1, -529268736, 1611661312, 5, 0,
- _vq_quantlist_res0_256_1024_4,
- NULL,
- &_vq_auxt_res0_256_1024_4,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_256_1024_5.vqh b/lib/books/res0_256_1024_5.vqh
deleted file mode 100644
index 09dfa780..00000000
--- a/lib/books/res0_256_1024_5.vqh
+++ /dev/null
@@ -1,210 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_256_1024_5_VQH_
-#define _V_res0_256_1024_5_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_256_1024_5[] = {
- 20,
- 19,
- 21,
- 18,
- 22,
- 17,
- 23,
- 16,
- 24,
- 15,
- 25,
- 14,
- 26,
- 13,
- 27,
- 12,
- 28,
- 11,
- 29,
- 10,
- 30,
- 9,
- 31,
- 8,
- 32,
- 7,
- 33,
- 6,
- 34,
- 5,
- 35,
- 4,
- 36,
- 3,
- 37,
- 2,
- 38,
- 1,
- 39,
- 0,
- 40,
-};
-
-static long _vq_lengthlist_res0_256_1024_5[] = {
- 4, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9,
- 9, 9, 9,10,10, 9, 9,10,10,10,10,10,10,11,11,11,
- 11,11,11,11,11,12,12,12,12, 5, 6, 6, 7, 7, 8, 8,
- 8, 8, 8, 8, 9, 9, 9, 9,10,10,10,10,10,10,10,10,
- 10,10,11,11,11,11,11,11,12,12,12,12,12,12,13,13,
- 13,13, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9,
- 9,10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,
- 11,12,12,12,12,12,12,12,12,13,13, 6, 7, 7, 8, 8,
- 8, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,11,11,
- 11,11,11,11,11,11,12,12,12,12,12,13,13,13,13,13,
- 13,13,14,14, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
- 9,10,10,10,10,10,10,11,11,11,11,11,11,11,11,12,
- 12,12,12,12,12,13,13,13,13,13,13,14,14, 7, 8, 8,
- 8, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,11,11,
- 11,11,11,11,12,12,12,12,12,12,13,13,13,13,13,13,
- 14,14,14,14,14,14, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
- 9,10,10,10,10,10,10,11,11,11,11,11,11,12,12,12,
- 12,12,12,13,13,13,13,13,13,14,14,14,14,14,14, 8,
- 8, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,11,10,11,11,
- 11,11,12,12,12,12,12,12,12,12,13,13,13,13,13,13,
- 14,14,14,14,15,14,15,15, 8, 8, 8, 9, 9, 9, 9, 9,
- 9,10,10,10,10,11,11,11,11,11,11,12,12,12,12,12,
- 12,12,12,13,13,13,13,13,13,14,14,14,14,14,14,15,
- 15, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,11,10,11,11,
- 11,11,12,12,12,12,12,12,12,12,13,13,13,13,14,13,
- 14,14,14,14,14,15,15,15,15,15, 8, 9, 9, 9, 9, 9,
- 9,10,10,10,10,10,11,11,11,11,11,12,12,12,12,12,
- 12,12,12,13,13,13,13,14,13,14,14,14,14,15,15,15,
- 15,15,15, 9, 9, 9, 9, 9,10,10,10,10,11,11,11,11,
- 11,11,12,12,12,12,12,12,12,12,13,13,13,13,13,14,
- 14,14,14,14,15,15,15,15,15,15,16,15, 9, 9, 9, 9,
- 9,10,10,10,10,11,11,11,11,11,11,12,12,12,12,12,
- 12,12,12,13,13,13,13,14,14,14,14,14,14,15,14,15,
- 15,15,15,15,15, 9, 9, 9,10,10,10,10,11,11,11,11,
- 11,11,12,12,12,12,12,12,13,13,13,13,13,13,13,13,
- 14,14,14,14,15,15,15,15,15,15,16,16,16,16, 9, 9,
- 9,10,10,10,10,11,11,11,11,11,11,12,12,12,12,12,
- 12,13,13,13,13,13,13,14,14,14,14,14,14,15,14,15,
- 15,15,15,15,16,16,16, 9,10,10,10,10,11,11,11,11,
- 11,11,12,12,12,12,12,12,13,13,13,13,13,13,14,13,
- 14,14,14,14,15,15,15,15,15,15,15,16,16,16,16,16,
- 9,10,10,10,10,11,11,11,11,11,11,12,12,12,12,12,
- 12,13,13,13,13,13,13,13,14,14,14,14,14,15,14,15,
- 15,15,15,16,16,16,16,16,16,10,10,10,11,11,11,11,
- 11,11,12,12,12,12,13,12,13,13,13,13,14,13,13,14,
- 14,14,14,14,15,15,15,15,15,15,15,15,16,16,16,16,
- 16,16,10,10,10,11,11,11,11,11,11,12,12,12,12,12,
- 12,13,13,13,13,13,13,13,13,14,14,14,14,14,15,15,
- 15,15,15,16,15,16,16,16,16,17,17,10,11,11,11,11,
- 11,11,12,12,12,12,12,12,13,13,13,13,13,13,14,14,
- 14,14,14,14,15,15,15,15,15,15,16,16,16,16,16,16,
- 17,16,17,17,10,11,11,11,11,11,11,12,12,12,12,12,
- 12,13,13,13,13,14,13,14,14,14,14,14,14,15,15,15,
- 15,15,15,15,16,16,16,16,16,16,16,16,17,10,10,10,
- 11,11,11,11,12,12,12,12,12,12,13,13,13,13,14,13,
- 14,14,14,14,15,15,15,15,15,15,16,16,16,16,16,16,
- 17,16,17,17,18,17,10,10,10,11,11,11,11,12,12,12,
- 12,13,12,13,13,13,13,14,14,14,14,14,14,15,15,15,
- 15,15,15,16,16,16,16,16,16,17,17,17,17,17,17,10,
- 11,11,11,11,12,12,12,12,13,13,13,13,13,13,14,14,
- 14,14,14,14,15,15,15,15,15,15,16,15,16,16,16,16,
- 16,16,17,17,17,17,17,18,10,11,11,11,11,12,12,12,
- 12,13,13,13,13,13,13,14,14,14,14,14,14,15,15,15,
- 15,16,15,16,16,16,16,16,17,17,16,17,17,17,17,17,
- 17,10,11,11,12,12,12,12,13,13,13,13,13,13,14,14,
- 14,14,14,14,15,14,15,15,15,16,15,16,16,16,16,16,
- 17,17,17,17,17,17,17,18,17,18,10,11,11,12,12,12,
- 12,13,13,13,13,13,13,14,14,14,14,14,14,15,15,15,
- 15,15,15,16,16,16,16,16,16,17,17,17,17,17,17,17,
- 18,18,18,11,12,12,12,12,13,13,13,13,14,13,14,14,
- 14,14,14,14,15,15,15,15,16,15,16,16,16,16,16,16,
- 16,17,17,17,17,17,17,17,18,18,18,18,11,12,12,12,
- 12,13,13,13,13,13,13,14,14,14,14,14,15,15,15,15,
- 15,15,15,16,16,16,16,16,16,17,17,17,17,17,17,17,
- 18,18,17,18,18,11,12,12,13,13,13,13,13,13,14,14,
- 14,14,15,15,15,15,15,15,15,15,16,16,16,16,16,16,
- 17,16,17,17,18,17,18,17,17,18,18,18,18,18,11,12,
- 12,13,13,13,13,13,14,14,14,14,14,15,15,15,15,15,
- 15,15,15,16,16,16,16,16,16,17,17,17,17,17,17,17,
- 17,17,18,19,18,18,18,11,12,12,13,13,14,14,14,14,
- 14,14,15,14,15,15,15,15,15,16,16,16,16,16,17,17,
- 17,16,17,17,17,17,18,18,17,18,18,18,18,18,18,18,
- 11,12,12,13,13,14,13,14,14,14,14,14,15,15,15,15,
- 15,16,16,16,16,16,16,16,16,16,17,17,17,17,18,18,
- 17,18,18,19,18,18,19,19,18,12,13,13,13,13,14,14,
- 14,14,14,14,15,15,15,15,16,16,16,16,16,16,16,16,
- 17,17,17,18,18,17,17,17,18,18,18,18,18,18,18,19,
- 18,18,12,13,13,13,13,14,14,14,14,15,15,15,15,16,
- 15,16,16,16,16,16,16,16,17,17,17,17,17,17,17,18,
- 18,18,19,18,18,18,19,18,19,19,19,12,13,13,14,14,
- 14,14,15,15,15,15,15,15,16,16,16,16,16,16,16,17,
- 16,17,17,17,17,18,17,17,17,18,18,18,18,18,19,19,
- 18,18,18,18,12,13,13,14,14,14,14,15,15,15,15,15,
- 15,16,16,16,16,16,16,16,17,17,17,17,17,17,18,17,
- 17,18,18,18,18,18,18,18,18,19,18,19,19,12,13,13,
- 14,14,15,15,15,15,15,15,16,16,16,16,16,16,17,16,
- 17,17,17,17,17,18,18,18,18,18,18,17,18,18,19,19,
- 19,18,19,18,19,18,12,13,13,14,14,15,15,15,15,15,
- 16,16,16,16,16,16,16,17,17,17,16,17,17,17,17,17,
- 18,18,17,18,19,18,18,19,18,19,19,19,18,19,18,13,
- 14,14,14,15,15,15,15,16,16,16,16,16,17,16,17,17,
- 17,17,17,17,18,17,17,18,18,18,18,18,18,19,18,18,
- 19,18,19,20,19,19,20,19,13,14,14,14,14,15,15,15,
- 15,16,16,16,16,16,16,16,17,17,17,17,17,17,17,18,
- 18,18,17,19,18,18,19,19,18,18,19,19,19,19,18,19,
- 19,
-};
-
-static float _vq_quantthresh_res0_256_1024_5[] = {
- -19.5, -18.5, -17.5, -16.5, -15.5, -14.5, -13.5, -12.5,
- -11.5, -10.5, -9.5, -8.5, -7.5, -6.5, -5.5, -4.5,
- -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5,
- 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 11.5,
- 12.5, 13.5, 14.5, 15.5, 16.5, 17.5, 18.5, 19.5,
-};
-
-static long _vq_quantmap_res0_256_1024_5[] = {
- 39, 37, 35, 33, 31, 29, 27, 25,
- 23, 21, 19, 17, 15, 13, 11, 9,
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8, 10, 12, 14, 16, 18, 20, 22,
- 24, 26, 28, 30, 32, 34, 36, 38,
- 40,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_256_1024_5 = {
- _vq_quantthresh_res0_256_1024_5,
- _vq_quantmap_res0_256_1024_5,
- 41,
- 41
-};
-
-static static_codebook _vq_book_res0_256_1024_5 = {
- 2, 1681,
- _vq_lengthlist_res0_256_1024_5,
- 1, -527171584, 1611661312, 6, 0,
- _vq_quantlist_res0_256_1024_5,
- NULL,
- &_vq_auxt_res0_256_1024_5,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_256_1024_6.vqh b/lib/books/res0_256_1024_6.vqh
deleted file mode 100644
index bfd61a2e..00000000
--- a/lib/books/res0_256_1024_6.vqh
+++ /dev/null
@@ -1,565 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_256_1024_6_VQH_
-#define _V_res0_256_1024_6_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_256_1024_6[] = {
- 40,
- 39,
- 41,
- 38,
- 42,
- 37,
- 43,
- 36,
- 44,
- 35,
- 45,
- 34,
- 46,
- 33,
- 47,
- 32,
- 48,
- 31,
- 49,
- 30,
- 50,
- 29,
- 51,
- 28,
- 52,
- 27,
- 53,
- 26,
- 54,
- 25,
- 55,
- 24,
- 56,
- 23,
- 57,
- 22,
- 58,
- 21,
- 59,
- 20,
- 60,
- 19,
- 61,
- 18,
- 62,
- 17,
- 63,
- 16,
- 64,
- 15,
- 65,
- 14,
- 66,
- 13,
- 67,
- 12,
- 68,
- 11,
- 69,
- 10,
- 70,
- 9,
- 71,
- 8,
- 72,
- 7,
- 73,
- 6,
- 74,
- 5,
- 75,
- 4,
- 76,
- 3,
- 77,
- 2,
- 78,
- 1,
- 79,
- 0,
- 80,
-};
-
-static long _vq_lengthlist_res0_256_1024_6[] = {
- 4, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9,
- 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,
- 10,10,10,10,11,11,11,11,11,10,10,10,10,10,10,11,
- 10,11,11,11,11,11,11,11,11,11,11,12,12,12,12,12,
- 12,12,12,13,13,13,13,13,13,13,13,13,13,14,13,14,
- 14, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
- 9,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,
- 11,11,11,11,12,11,12,12,12,12,11,11,11,11,11,11,
- 12,12,12,12,12,12,12,12,12,12,13,13,13,13,13,13,
- 13,13,13,13,14,14,14,14,14,14,14,14,14,14,15,14,
- 15,14, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
- 9, 9, 9,10,10,10,10,10,10,10,10,10,11,11,11,11,
- 11,11,11,11,11,11,11,12,11,12,12,11,11,11,11,11,
- 11,12,11,12,12,12,12,12,12,12,12,13,13,13,13,13,
- 13,13,13,13,13,14,14,14,14,14,14,14,14,14,14,14,
- 14,15,15, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9,10,10,
- 10,10,10,10,10,10,10,11,11,11,11,11,11,11,11,11,
- 12,12,12,12,12,12,12,12,12,12,13,13,12,12,12,12,
- 12,12,12,12,13,12,13,13,13,13,13,13,13,13,13,13,
- 14,14,14,14,14,14,14,14,15,14,15,14,15,14,15,15,
- 15,15,15,15, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9,10,
- 10,10,10,10,10,10,10,11,11,11,11,11,11,11,11,11,
- 11,12,11,12,12,12,12,12,12,12,12,12,12,12,12,12,
- 12,12,12,12,12,12,12,13,13,13,13,13,13,13,13,13,
- 13,14,14,14,14,14,14,14,14,14,14,15,15,15,15,15,
- 14,15,15,15,16, 8, 8, 8, 9, 9, 9, 9, 9, 9,10,10,
- 10,10,10,10,11,11,11,11,11,11,11,11,11,11,12,12,
- 12,12,12,12,12,12,12,12,13,12,13,13,13,13,12,12,
- 12,12,13,13,13,13,13,13,13,13,13,13,14,14,14,14,
- 14,14,14,14,14,14,15,15,14,15,15,15,15,15,15,15,
- 15,15,16,15,16,15, 8, 8, 8, 9, 9, 9, 9, 9, 9,10,
- 10,10,10,10,10,11,11,11,11,11,11,11,11,11,11,12,
- 12,12,12,12,12,12,12,12,12,13,12,13,13,13,13,12,
- 12,13,12,13,13,13,13,13,13,13,13,13,13,14,14,14,
- 14,14,14,14,14,14,14,15,14,15,15,15,15,15,15,15,
- 15,15,15,16,16,15,15, 8, 9, 9, 9, 9,10,10,10,10,
- 10,10,11,10,11,11,11,11,11,11,11,11,12,12,12,12,
- 12,12,12,12,13,12,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,14,13,14,14,14,14,14,14,
- 14,14,14,14,15,15,15,15,15,15,16,15,15,15,15,15,
- 16,15,16,16,16,16,16,16, 8, 9, 9, 9, 9,10,10,10,
- 10,10,10,10,11,11,11,11,11,11,11,11,12,12,12,12,
- 12,12,12,12,12,12,12,12,12,13,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,14,13,14,14,14,14,14,
- 14,14,15,14,14,15,15,15,15,15,15,15,15,15,15,15,
- 15,16,15,15,16,16,16,16,16, 9, 9, 9,10,10,10,10,
- 10,10,11,11,11,11,11,11,11,11,11,11,12,12,12,12,
- 12,12,12,12,13,12,13,13,13,13,13,13,13,13,13,13,
- 14,14,13,13,13,13,13,13,14,14,14,14,14,14,14,14,
- 15,14,15,14,15,15,15,15,15,15,15,15,16,15,16,16,
- 16,16,16,16,16,16,16,16,16,16, 9, 9, 9,10,10,10,
- 10,10,10,11,11,11,11,11,11,11,11,12,12,12,12,12,
- 12,12,12,12,12,13,13,13,13,13,13,13,13,13,13,13,
- 14,14,14,13,13,13,13,14,13,13,14,14,14,14,14,14,
- 14,14,14,15,14,15,15,15,15,15,15,15,15,16,15,16,
- 16,16,15,16,16,16,16,16,16,16,16, 9, 9, 9,10,10,
- 10,10,11,11,11,11,11,11,11,11,12,12,12,12,12,12,
- 12,12,12,12,13,13,13,13,13,13,13,13,13,13,14,13,
- 14,14,14,14,13,14,14,14,14,14,14,14,14,14,14,14,
- 14,15,15,15,15,15,15,15,15,15,15,15,16,16,16,16,
- 16,16,16,16,16,16,16,17,17,17,17,16, 9, 9, 9,10,
- 10,10,10,11,11,11,11,11,11,11,11,12,12,12,12,12,
- 12,12,12,12,12,13,13,13,13,13,13,13,13,13,13,14,
- 14,14,14,14,14,13,13,14,13,14,14,14,14,14,14,14,
- 14,15,14,15,15,15,15,15,15,15,16,15,16,16,16,16,
- 15,17,16,16,16,17,16,17,16,17,16,17,16, 9,10,10,
- 10,10,11,11,11,11,11,11,11,11,12,12,12,12,12,12,
- 12,12,13,13,13,13,13,13,13,13,13,13,14,13,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,16,16,16,16,16,
- 16,16,16,17,16,16,17,17,16,16,16,17,18,17, 9,10,
- 10,10,10,11,11,11,11,11,11,11,11,12,12,12,12,12,
- 12,12,12,13,13,13,13,13,13,13,13,13,13,13,14,13,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,15,
- 15,15,15,15,15,15,15,15,15,15,15,16,15,16,16,16,
- 16,16,16,17,16,16,16,16,16,17,16,17,16,17,16,10,
- 10,10,11,11,11,11,11,11,11,12,12,12,12,12,12,12,
- 13,12,13,13,13,13,13,13,13,13,13,13,14,14,14,14,
- 14,14,14,14,14,14,15,14,14,14,14,14,14,14,15,15,
- 15,15,15,15,15,15,15,15,15,15,16,16,16,16,16,16,
- 16,16,16,16,17,17,16,16,17,17,17,17,18,18,17,17,
- 10,10,10,10,11,11,11,11,11,11,12,12,12,12,12,12,
- 12,13,12,13,13,13,13,13,13,13,13,14,13,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
- 14,14,15,15,15,15,15,15,15,16,16,15,15,16,16,16,
- 16,16,16,16,16,17,17,17,17,16,17,17,17,17,17,17,
- 17,10,10,10,11,11,11,11,12,12,12,12,12,12,12,12,
- 12,12,13,13,13,13,13,13,13,13,14,14,14,14,14,14,
- 14,14,14,14,14,14,15,14,15,15,14,14,15,14,15,15,
- 15,15,15,15,15,15,15,16,16,16,15,16,16,16,16,16,
- 17,16,17,16,16,17,16,17,17,17,17,17,17,17,17,17,
- 18,17,10,10,10,11,11,11,11,11,12,12,12,12,12,12,
- 12,13,13,13,13,13,13,13,13,13,13,13,13,14,14,14,
- 14,14,14,14,14,14,14,14,14,15,15,14,14,14,14,15,
- 15,15,15,15,15,15,15,16,16,16,15,16,15,16,15,16,
- 16,16,16,16,17,16,16,17,16,18,17,16,17,17,17,17,
- 17,17,17,10,11,11,11,11,11,12,12,12,12,12,12,12,
- 13,13,13,13,13,13,13,13,13,13,14,13,14,14,14,14,
- 14,14,14,14,14,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,16,16,16,16,16,16,16,16,
- 16,16,18,17,17,16,17,17,17,18,18,18,18,17,18,18,
- 18,19,17,17,10,11,11,11,11,12,12,12,12,12,12,12,
- 12,13,13,13,13,13,13,13,13,13,13,14,14,14,14,14,
- 14,14,14,14,14,15,15,15,15,15,15,15,15,14,15,15,
- 14,15,15,15,15,15,15,16,16,16,16,16,16,16,16,17,
- 16,16,16,16,17,17,17,17,17,17,16,17,17,17,17,17,
- 17,18,18,18,17,10,11,11,11,11,12,12,12,12,12,12,
- 13,13,13,13,13,13,13,13,14,14,14,14,14,14,14,14,
- 14,14,14,15,15,15,15,14,15,15,15,15,16,15,15,15,
- 15,15,15,15,15,15,16,16,16,16,16,16,16,16,16,16,
- 17,16,16,16,17,17,17,18,17,17,17,17,17,17,18,17,
- 19,17,18,18,17,18,10,11,11,11,11,12,12,12,12,12,
- 12,13,13,13,13,13,13,13,13,13,13,14,14,14,14,14,
- 14,14,14,14,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,15,15,15,16,16,16,16,16,16,16,16,
- 16,16,16,16,16,16,16,18,17,17,17,17,18,17,17,17,
- 18,18,18,17,18,18,18,11,11,11,12,12,12,12,12,12,
- 13,13,13,13,13,13,13,13,13,13,14,14,14,14,14,14,
- 14,14,14,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,16,16,16,16,16,16,16,16,16,16,16,16,
- 17,17,17,16,16,17,17,17,18,17,17,17,18,17,18,17,
- 17,18,18,18,18,18,18,18,11,11,11,12,12,12,12,12,
- 12,13,13,13,13,13,13,13,13,14,13,14,14,14,14,14,
- 14,14,14,15,14,15,15,15,15,15,15,15,15,15,15,16,
- 16,15,15,15,15,16,16,16,16,15,16,16,16,16,15,16,
- 16,16,17,18,16,17,17,18,17,18,16,17,17,17,17,17,
- 17,18,19,18,17,18,18,18,18,11,11,11,12,12,12,12,
- 13,13,13,13,13,13,14,13,14,14,14,14,14,14,14,14,
- 14,15,14,14,15,15,15,15,15,15,15,15,16,15,15,15,
- 16,16,15,15,15,15,16,16,16,15,16,16,16,16,16,16,
- 17,16,17,16,17,17,17,17,18,17,17,17,17,18,17,17,
- 17,18,17,18,18,18,18,18,18,18,11,11,11,12,12,12,
- 12,13,13,13,13,13,13,13,14,14,14,14,14,14,14,14,
- 14,14,15,15,15,15,15,15,15,15,15,16,15,16,16,16,
- 16,16,15,15,15,15,15,16,15,16,16,16,16,16,17,16,
- 17,17,17,17,17,17,17,18,17,18,17,17,18,18,17,18,
- 17,18,18,18,17,17,17,17,18,18,18,11,12,12,12,12,
- 13,13,13,13,13,13,13,14,14,14,14,14,14,14,15,14,
- 15,14,15,15,15,15,15,15,15,15,15,15,15,15,16,16,
- 16,16,16,16,15,15,16,16,16,16,16,17,16,16,16,16,
- 17,16,17,16,17,17,17,17,17,17,17,18,18,18,18,18,
- 19,18,18,18,19,18,19,18,18,17,18,18,11,12,12,12,
- 12,12,13,13,13,13,13,14,14,14,13,14,14,14,14,14,
- 15,14,14,15,15,15,15,15,15,15,15,15,15,16,15,16,
- 16,16,16,16,16,16,16,16,16,16,16,17,16,16,16,17,
- 16,17,16,17,16,17,17,17,17,18,17,17,17,18,17,18,
- 18,18,17,19,18,17,18,18,19,18,18,18,18,11,12,12,
- 13,12,13,13,13,13,13,14,14,14,14,14,14,14,14,14,
- 14,15,15,15,15,15,15,15,15,15,16,15,15,16,15,16,
- 16,16,16,16,16,17,16,16,16,16,16,17,17,17,16,17,
- 16,17,17,17,17,17,17,17,17,17,17,18,18,17,18,18,
- 18,18,19,18,19,18,19,20,18,19,18,19,18,19,11,12,
- 12,13,13,13,13,13,13,13,13,14,14,14,14,14,14,14,
- 14,15,14,14,15,15,15,15,15,15,15,15,15,16,16,16,
- 15,16,16,16,16,16,16,16,15,16,16,16,16,16,16,16,
- 16,17,16,17,17,17,17,17,17,18,18,18,17,17,18,17,
- 17,17,17,18,18,18,18,17,18,18,19,18,18,18,18,11,
- 12,12,13,13,13,13,13,13,14,14,14,14,14,14,14,15,
- 15,14,15,15,15,15,15,15,16,15,15,15,16,16,16,16,
- 15,16,16,16,16,16,16,16,16,16,16,17,16,17,16,17,
- 17,16,17,17,17,17,17,17,17,18,17,18,18,17,17,17,
- 18,18,18,18,18,18,19,18,18,19,19,18,19,18,19,19,
- 11,12,12,13,13,13,13,13,14,14,14,14,14,14,14,15,
- 14,14,15,15,14,15,15,15,15,15,16,16,16,16,16,15,
- 16,16,16,16,16,17,16,16,16,16,16,16,16,17,17,17,
- 17,16,16,17,16,17,17,18,17,17,17,18,18,18,18,18,
- 17,18,18,18,17,19,19,18,18,18,18,18,18,19,19,19,
- 18,12,12,12,13,13,13,13,14,14,14,14,14,14,14,14,
- 15,14,15,15,15,15,15,16,15,15,16,15,16,15,16,16,
- 16,15,16,16,16,16,16,17,17,16,16,16,16,16,17,16,
- 16,17,17,17,17,17,17,17,17,17,18,17,18,18,18,18,
- 18,17,18,18,19,18,18,18,18,18,19,19,19,19,19,19,
- 19,19,12,12,12,13,13,13,13,14,13,14,14,14,14,14,
- 14,14,14,15,15,15,15,15,15,15,15,16,15,16,16,16,
- 16,16,16,16,16,16,17,16,16,17,16,16,17,17,16,16,
- 17,17,17,17,17,17,17,17,18,18,17,17,17,18,18,18,
- 18,18,18,18,18,18,18,18,18,19,18,19,19,18,18,18,
- 20,20,18,12,13,13,13,13,14,13,14,14,14,14,14,14,
- 15,15,15,15,15,15,15,15,15,15,16,15,16,16,16,16,
- 16,17,16,16,16,16,17,16,17,17,17,17,17,16,16,17,
- 17,17,17,16,17,17,17,18,18,18,17,18,18,17,18,18,
- 18,18,19,19,19,18,19,18,18,18,21,18,19,19,18,19,
- 19,19,20,20,12,13,13,13,13,13,14,14,14,14,14,15,
- 14,15,15,15,15,15,15,15,15,16,15,16,15,16,16,16,
- 16,16,16,16,16,16,16,16,17,16,16,17,17,16,16,17,
- 17,17,16,17,17,17,17,17,18,17,18,18,18,17,17,17,
- 17,18,18,18,17,19,18,19,19,19,19,19,19,18,19,18,
- 18,19,18,19,20,12,13,13,14,13,14,14,14,14,14,14,
- 14,15,15,15,15,15,15,15,16,16,16,16,16,16,16,16,
- 16,16,17,16,17,16,17,16,17,17,17,17,17,18,17,16,
- 17,17,17,17,17,17,18,17,17,18,18,18,18,18,17,17,
- 18,18,19,18,19,17,18,19,18,18,18,19,20,19,19,19,
- 18,19,18,19,18,19,12,13,13,13,13,14,14,14,14,14,
- 14,15,15,15,15,15,15,15,16,16,16,16,15,16,16,17,
- 16,16,16,17,16,17,16,16,17,17,17,17,17,17,18,16,
- 16,17,16,17,17,17,17,17,17,18,17,18,18,18,18,17,
- 18,18,18,19,17,19,19,18,19,18,18,19,19,19,19,19,
- 18,20,19,19,19,19,19,12,13,13,14,14,14,14,15,14,
- 15,15,15,15,15,15,15,15,15,16,16,16,15,15,16,16,
- 16,16,16,17,17,17,17,16,17,17,17,17,18,17,17,17,
- 17,17,18,17,17,17,17,17,18,18,17,18,18,18,18,18,
- 18,18,19,18,18,18,18,18,20,19,19,18,21,18,19,20,
- 19,19,19,19,19,19,19,19,13,13,13,14,14,14,14,14,
- 14,15,15,15,15,15,15,15,16,15,15,16,16,16,16,16,
- 16,16,16,16,16,17,17,17,17,17,16,17,17,17,17,17,
- 17,17,16,17,17,17,17,17,17,17,18,17,18,18,18,18,
- 19,18,19,18,18,18,18,18,18,19,18,18,19,19,19,19,
- 19,20,18,19,19,20,19,20,20,11,12,12,13,13,13,13,
- 13,14,14,14,14,14,14,15,15,15,15,15,15,15,16,15,
- 15,15,16,15,16,16,16,16,16,17,16,16,17,17,17,17,
- 17,17,16,17,17,17,17,17,18,18,18,17,18,18,18,18,
- 18,18,18,18,19,18,18,19,20,19,18,19,19,18,18,19,
- 19,18,19,19,19,19,21,21,19,18,11,12,12,13,13,13,
- 13,14,14,14,14,15,14,15,15,15,15,15,15,15,15,15,
- 15,15,15,16,16,16,16,16,15,16,16,17,16,16,16,17,
- 17,17,16,17,17,17,17,17,18,18,18,18,17,18,18,18,
- 18,18,18,18,18,18,18,18,18,19,18,18,18,18,18,18,
- 19,20,19,19,18,19,19,19,20,19,19,11,12,12,13,13,
- 13,13,14,14,14,14,14,15,14,15,15,15,15,15,15,16,
- 16,16,16,16,16,16,16,16,16,16,16,17,16,17,17,16,
- 17,17,17,18,17,18,18,17,17,17,18,19,18,18,17,18,
- 18,18,21,18,18,17,19,19,18,18,18,19,20,18,18,18,
- 19,19,19,18,18,20,21,19,18,19,19,20,11,12,12,13,
- 13,14,13,14,14,14,14,14,14,15,15,15,15,15,15,15,
- 16,16,16,16,16,16,16,16,16,16,16,18,16,17,16,17,
- 16,17,17,17,17,18,17,18,17,18,18,18,18,18,18,17,
- 18,17,18,18,18,18,17,20,18,18,18,19,19,19,18,18,
- 19,19,19,19,19,19,19,19,19,18,19,19,20,12,13,13,
- 13,13,14,14,14,14,15,15,15,15,15,15,15,15,15,16,
- 16,15,16,16,16,15,16,16,16,17,17,16,17,16,17,17,
- 18,17,17,17,17,17,17,17,18,17,18,18,18,18,18,18,
- 18,17,19,20,18,18,18,18,19,18,19,20,19,19,19,20,
- 19,19,19,19,18,19,20,20,19,19,19,21,19,19,12,12,
- 13,13,13,14,14,14,14,14,14,15,15,15,15,15,15,15,
- 15,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,
- 17,16,17,17,17,17,17,17,17,17,18,17,17,17,18,19,
- 18,18,18,19,18,18,17,19,18,19,18,19,19,19,19,19,
- 21,19,20,19,19,19,19,19,21,19,20,20,20,19,21,12,
- 13,13,13,13,14,14,14,14,15,15,15,15,15,15,15,15,
- 16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,17,
- 18,17,18,17,17,17,18,17,18,18,18,17,19,18,18,19,
- 18,18,18,19,18,18,18,20,19,18,19,18,19,19,19,19,
- 19,20,20,18,19,20,20,21,19,19,19,19,19,21,20,21,
- 12,13,13,14,14,14,14,14,14,14,15,15,15,15,15,16,
- 15,15,16,16,16,16,16,16,16,17,16,17,16,17,17,16,
- 17,17,18,17,18,17,18,17,18,17,17,18,18,18,17,18,
- 18,18,18,18,17,19,19,18,18,19,19,18,19,19,19,18,
- 19,21,19,18,20,19,19,19,21,19,20,19,20,19,20,21,
- 21,12,13,13,14,14,14,15,15,15,15,15,15,15,16,16,
- 16,16,16,16,16,16,16,16,17,16,17,17,18,17,17,17,
- 17,17,18,17,18,18,18,17,18,18,17,18,18,18,18,19,
- 19,19,18,19,18,18,18,19,18,18,19,18,19,19,19,19,
- 19,20,20,20,19,21,19,20,20,19,20,19,19,20,19,19,
- 20,21,12,13,13,14,14,14,14,15,15,15,15,16,15,15,
- 15,16,15,16,16,17,16,16,16,17,16,17,17,16,17,17,
- 17,17,17,17,17,17,17,18,18,17,18,18,18,18,17,18,
- 18,18,19,20,19,19,18,19,19,18,19,19,19,19,19,19,
- 20,19,19,19,21,19,18,20,19,19,19,20,19,20,20,21,
- 21,19,20,12,13,14,14,14,14,15,15,15,15,15,16,16,
- 16,16,16,16,17,16,16,17,17,16,17,17,17,16,17,17,
- 17,17,18,18,18,17,18,18,18,17,18,18,20,18,17,19,
- 19,19,19,19,18,18,19,18,18,18,20,19,18,19,19,19,
- 19,18,19,19,18,19,19,18,21,19,20,19,19,21,19,20,
- 19,20,21,20,12,13,13,14,14,15,14,15,15,15,16,16,
- 15,16,16,16,16,16,16,17,16,16,16,17,16,17,17,18,
- 17,17,17,18,17,18,18,17,18,18,18,19,18,18,18,19,
- 19,18,19,18,19,17,19,18,19,19,19,18,21,19,21,18,
- 18,19,19,19,19,21,20,19,19,19,19,19,19,19,20,20,
- 19,20,20,21,19,13,14,14,14,14,15,15,15,16,15,15,
- 16,16,16,16,16,16,16,17,17,17,17,17,17,17,17,17,
- 17,17,18,17,18,18,18,18,18,18,18,18,18,19,18,18,
- 18,19,17,18,20,18,18,19,19,19,20,20,19,19,19,19,
- 19,19,19,21,19,20,21,19,19,19,21,19,19,19,19,20,
- 19,19,19,21,20,19,13,14,14,14,14,15,15,15,15,15,
- 16,16,16,16,17,16,16,17,16,17,17,17,17,18,17,18,
- 17,17,17,18,17,18,17,18,17,18,18,18,18,19,19,18,
- 18,19,19,20,19,20,19,19,18,18,19,19,19,19,19,18,
- 19,20,19,19,19,19,20,19,21,19,20,19,20,19,20,20,
- 21,21,21,20,19,20,20,13,14,14,15,15,15,15,15,15,
- 16,16,16,16,17,17,16,17,17,17,17,18,17,17,18,17,
- 17,18,18,18,18,18,18,19,18,17,18,18,18,18,19,19,
- 19,19,19,19,19,18,19,19,19,18,20,19,20,19,19,20,
- 20,19,18,20,20,21,19,19,19,20,19,20,19,20,21,19,
- 20,21,20,20,21,19,19,21,13,14,14,14,14,15,15,16,
- 16,16,16,16,16,16,16,17,17,18,17,17,18,17,17,18,
- 18,18,18,19,18,18,18,18,18,18,18,18,18,18,18,18,
- 19,19,18,19,19,18,19,19,19,21,18,21,18,20,19,19,
- 19,21,20,20,18,20,19,20,21,21,19,19,20,20,20,20,
- 21,19,19,21,21,19,21,21,21,13,14,14,15,15,15,16,
- 15,16,16,16,16,17,17,17,18,17,17,17,17,18,18,17,
- 18,17,17,17,19,18,18,18,18,18,18,19,18,20,19,19,
- 19,19,18,19,19,21,20,18,18,19,18,18,21,18,19,19,
- 20,19,19,19,19,19,21,21,21,21,20,19,20,19,21,21,
- 19,21,21,20,19,20,19,20,21,20,13,14,14,15,15,15,
- 16,16,16,16,16,16,17,17,16,17,16,17,17,17,18,18,
- 17,18,17,18,17,18,18,18,18,19,18,18,18,17,18,19,
- 19,18,18,21,18,18,18,19,21,19,19,19,19,19,20,18,
- 19,19,20,19,19,19,19,19,20,21,20,20,20,19,19,19,
- 21,19,21,21,19,21,19,20,21,20,20,13,15,14,15,15,
- 15,16,16,16,17,17,17,17,18,17,17,18,17,17,17,17,
- 17,17,19,18,18,18,18,18,18,18,18,18,18,19,18,19,
- 19,20,20,19,19,20,20,19,20,19,19,19,20,19,19,20,
- 19,20,20,21,20,20,19,19,19,20,20,21,19,21,21,21,
- 19,20,19,19,19,21,20,19,21,20,20,21,13,14,14,15,
- 15,16,16,16,16,16,16,17,17,17,17,17,18,17,17,18,
- 18,18,18,18,18,19,18,18,18,20,19,18,18,19,18,18,
- 19,19,19,19,18,18,21,18,19,19,19,21,19,19,19,21,
- 20,20,21,19,21,21,21,19,20,21,19,19,20,20,20,20,
- 21,20,20,20,20,20,21,20,21,20,21,19,21,14,15,15,
- 15,16,16,16,17,16,17,17,17,18,18,17,17,17,17,18,
- 17,18,18,18,19,18,18,18,18,18,18,18,20,18,19,19,
- 19,19,19,19,19,19,19,19,20,20,20,21,20,19,19,20,
- 21,19,19,19,21,19,20,20,20,19,20,20,20,20,21,19,
- 20,20,21,20,19,21,21,21,21,21,20,19,21,20,14,15,
- 15,15,15,16,16,16,17,17,16,17,17,18,17,17,17,18,
- 18,19,18,18,18,18,18,19,19,18,19,18,19,18,19,19,
- 19,19,19,20,19,19,19,20,19,19,19,19,18,19,20,19,
- 19,19,20,20,20,21,19,19,19,20,20,21,21,20,19,20,
- 20,20,20,19,21,20,20,19,21,19,21,21,20,21,20,14,
- 15,15,16,16,17,16,17,16,17,17,17,17,17,18,18,19,
- 17,18,17,18,19,18,18,19,19,18,19,18,18,19,20,18,
- 21,19,19,18,19,20,18,19,20,20,19,19,19,19,20,20,
- 19,20,21,20,21,19,20,19,20,20,20,21,21,19,19,21,
- 21,20,21,20,21,21,20,20,21,19,21,21,21,19,19,20,
- 14,15,15,16,15,16,16,17,17,17,17,17,18,18,18,18,
- 18,18,17,17,19,19,19,18,19,19,19,19,19,19,19,19,
- 18,19,19,18,19,19,19,19,20,20,20,19,21,20,19,20,
- 19,20,19,19,20,20,21,18,20,19,20,21,19,20,20,21,
- 21,21,19,19,20,20,19,19,20,21,20,21,21,21,21,21,
- 21,14,15,15,16,16,16,17,17,18,17,17,18,17,18,17,
- 18,18,18,17,18,18,18,19,20,18,19,19,19,18,18,19,
- 20,19,19,19,20,19,21,21,19,20,20,19,19,18,21,20,
- 21,19,20,20,19,19,20,21,20,20,20,20,21,20,20,19,
- 18,21,19,20,21,20,20,20,20,21,20,21,20,21,19,21,
- 21,20,14,15,15,16,16,16,18,17,17,17,17,17,18,18,
- 18,18,18,18,18,18,19,18,19,18,18,19,19,18,19,19,
- 18,20,19,19,18,19,20,19,20,19,19,19,19,20,19,19,
- 20,21,20,21,19,20,19,19,20,20,20,20,19,20,20,20,
- 21,19,20,21,21,21,21,21,21,20,20,21,21,21,21,20,
- 21,20,20,14,16,16,16,16,17,17,17,17,17,17,18,18,
- 18,18,18,19,18,18,18,18,18,18,19,18,19,18,19,19,
- 19,19,19,20,19,19,21,20,19,19,20,20,20,19,19,21,
- 20,19,21,21,19,21,20,19,20,20,21,20,21,21,20,21,
- 20,21,21,21,20,21,21,21,20,21,21,20,20,21,21,21,
- 20,21,20,21,15,16,15,17,17,18,17,17,18,17,18,19,
- 18,18,17,18,20,18,18,18,18,18,19,20,19,18,19,21,
- 20,20,19,19,20,21,19,20,19,19,18,21,19,19,20,20,
- 21,19,19,20,19,20,20,21,20,20,20,20,21,21,20,21,
- 21,20,21,20,20,21,19,21,19,19,21,21,21,19,21,20,
- 21,21,21,21,20,15,16,16,17,17,17,17,18,17,18,18,
- 18,18,18,18,18,19,19,19,19,21,18,19,19,19,19,19,
- 19,19,20,19,20,19,21,21,19,19,20,19,21,19,21,19,
- 20,19,19,21,21,19,20,20,21,21,20,21,20,19,20,20,
- 21,21,21,21,20,19,21,20,20,20,21,19,21,21,21,21,
- 21,21,21,20,20,21,15,16,16,17,17,17,17,17,18,18,
- 19,18,18,18,21,18,19,19,19,20,18,20,20,19,19,18,
- 18,18,21,21,19,20,19,20,19,19,19,21,20,20,21,20,
- 19,19,20,21,19,19,21,20,20,21,19,20,21,20,21,21,
- 20,20,20,21,21,19,21,20,20,21,20,21,19,21,21,21,
- 20,21,20,21,20,21,20,15,16,17,17,18,17,18,18,18,
- 18,18,17,18,19,19,19,18,19,18,19,19,19,20,21,19,
- 19,19,20,19,20,19,20,20,20,19,20,19,19,21,21,19,
- 20,21,21,20,21,19,21,20,21,21,20,21,21,19,20,21,
- 21,21,20,19,21,21,21,21,21,21,21,21,20,21,21,21,
- 21,21,21,19,20,21,21,20,15,16,17,17,18,18,18,18,
- 18,18,18,18,19,18,19,19,19,19,19,19,20,19,19,20,
- 19,20,19,21,19,20,19,19,19,20,21,19,21,21,19,20,
- 19,20,21,20,20,21,21,21,20,20,20,21,21,20,19,20,
- 21,20,19,20,21,21,21,21,21,21,21,21,21,21,21,20,
- 21,21,19,21,20,20,21,21,21,15,16,17,17,18,18,18,
- 20,18,19,18,20,19,18,19,19,18,19,19,19,19,20,19,
- 19,19,20,19,19,20,19,21,19,19,21,20,20,19,20,20,
- 21,19,19,20,21,21,21,21,20,19,19,21,20,21,20,20,
- 21,21,21,21,21,21,21,21,21,21,21,21,21,21,20,21,
- 21,21,21,21,21,20,21,21,19,21,16,17,17,18,18,18,
- 18,18,20,18,19,18,19,18,19,18,19,20,21,21,21,19,
- 21,19,20,21,20,19,20,21,19,19,21,20,21,19,21,20,
- 21,21,20,21,19,19,19,19,21,20,20,20,21,19,21,19,
- 21,20,19,21,21,21,21,21,21,21,21,21,20,21,21,21,
- 21,20,21,21,21,21,20,21,21,21,21,16,17,16,18,18,
- 19,18,19,19,19,19,19,18,20,18,19,19,19,21,19,19,
- 19,20,21,21,20,20,19,19,19,19,20,21,19,20,21,20,
- 21,21,19,21,20,20,21,21,19,21,21,21,21,19,21,21,
- 21,21,20,21,20,21,21,20,21,20,20,21,21,21,21,21,
- 20,20,21,21,21,21,21,21,21,21,21,21,16,17,18,18,
- 18,18,18,17,19,19,20,20,19,19,19,20,19,19,18,19,
- 20,20,19,20,21,21,19,20,20,21,19,21,21,21,19,21,
- 20,21,19,20,21,21,19,20,20,19,21,21,21,20,21,21,
- 21,20,20,20,21,21,21,21,21,20,21,21,20,21,21,20,
- 21,20,21,21,21,21,20,21,21,21,21,21,21,16,17,18,
- 19,19,19,19,18,19,19,20,19,19,21,19,19,19,19,20,
- 21,19,20,21,21,19,21,21,19,19,21,21,21,21,21,21,
- 21,21,20,19,21,21,21,20,21,20,19,21,21,21,21,21,
- 20,21,21,21,21,21,21,21,21,21,21,20,20,21,21,21,
- 21,21,21,21,21,21,21,21,20,21,20,21,21,21,16,17,
- 17,18,18,18,19,19,21,19,19,19,19,21,21,20,20,19,
- 19,21,20,21,20,20,21,21,21,20,20,21,21,20,21,19,
- 19,19,20,21,20,21,21,21,20,21,21,21,21,21,21,21,
- 21,21,21,20,21,21,21,21,21,19,21,21,21,21,21,21,
- 20,19,21,21,21,21,21,20,21,21,21,21,21,21,21,16,
- 17,18,18,18,19,18,18,19,19,19,19,20,21,20,19,21,
- 21,21,21,20,21,20,20,21,21,21,21,21,20,20,20,21,
- 21,21,21,21,21,21,20,20,20,21,21,21,21,20,20,20,
- 21,20,21,21,20,20,21,21,20,21,21,21,20,21,21,21,
- 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
- 17,18,18,19,18,19,19,18,18,20,19,19,21,19,20,20,
- 21,21,19,20,20,20,19,20,20,21,20,21,21,20,21,21,
- 20,21,20,21,20,21,20,19,21,19,19,20,21,21,21,21,
- 21,21,21,21,20,21,21,21,20,21,20,21,20,21,21,20,
- 21,21,21,21,20,21,21,21,21,21,21,21,21,20,21,21,
- 20,
-};
-
-static float _vq_quantthresh_res0_256_1024_6[] = {
- -39.5, -38.5, -37.5, -36.5, -35.5, -34.5, -33.5, -32.5,
- -31.5, -30.5, -29.5, -28.5, -27.5, -26.5, -25.5, -24.5,
- -23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5,
- -15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5,
- -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5,
- 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5,
- 8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 14.5, 15.5,
- 16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5,
- 24.5, 25.5, 26.5, 27.5, 28.5, 29.5, 30.5, 31.5,
- 32.5, 33.5, 34.5, 35.5, 36.5, 37.5, 38.5, 39.5,
-};
-
-static long _vq_quantmap_res0_256_1024_6[] = {
- 79, 77, 75, 73, 71, 69, 67, 65,
- 63, 61, 59, 57, 55, 53, 51, 49,
- 47, 45, 43, 41, 39, 37, 35, 33,
- 31, 29, 27, 25, 23, 21, 19, 17,
- 15, 13, 11, 9, 7, 5, 3, 1,
- 0, 2, 4, 6, 8, 10, 12, 14,
- 16, 18, 20, 22, 24, 26, 28, 30,
- 32, 34, 36, 38, 40, 42, 44, 46,
- 48, 50, 52, 54, 56, 58, 60, 62,
- 64, 66, 68, 70, 72, 74, 76, 78,
- 80,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_256_1024_6 = {
- _vq_quantthresh_res0_256_1024_6,
- _vq_quantmap_res0_256_1024_6,
- 81,
- 81
-};
-
-static static_codebook _vq_book_res0_256_1024_6 = {
- 2, 6561,
- _vq_lengthlist_res0_256_1024_6,
- 1, -525074432, 1611661312, 7, 0,
- _vq_quantlist_res0_256_1024_6,
- NULL,
- &_vq_auxt_res0_256_1024_6,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_256_1024_7.vqh b/lib/books/res0_256_1024_7.vqh
deleted file mode 100644
index 1440772b..00000000
--- a/lib/books/res0_256_1024_7.vqh
+++ /dev/null
@@ -1,816 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_256_1024_7_VQH_
-#define _V_res0_256_1024_7_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_256_1024_7[] = {
- 290,
- 289,
- 291,
- 288,
- 292,
- 287,
- 293,
- 286,
- 294,
- 285,
- 295,
- 284,
- 296,
- 283,
- 297,
- 282,
- 298,
- 281,
- 299,
- 280,
- 300,
- 279,
- 301,
- 278,
- 302,
- 277,
- 303,
- 276,
- 304,
- 275,
- 305,
- 274,
- 306,
- 273,
- 307,
- 272,
- 308,
- 271,
- 309,
- 270,
- 310,
- 269,
- 311,
- 268,
- 312,
- 267,
- 313,
- 266,
- 314,
- 265,
- 315,
- 264,
- 316,
- 263,
- 317,
- 262,
- 318,
- 261,
- 319,
- 260,
- 320,
- 259,
- 321,
- 258,
- 322,
- 257,
- 323,
- 256,
- 324,
- 255,
- 325,
- 254,
- 326,
- 253,
- 327,
- 252,
- 328,
- 251,
- 329,
- 250,
- 330,
- 249,
- 331,
- 248,
- 332,
- 247,
- 333,
- 246,
- 334,
- 245,
- 335,
- 244,
- 336,
- 243,
- 337,
- 242,
- 338,
- 241,
- 339,
- 240,
- 340,
- 239,
- 341,
- 238,
- 342,
- 237,
- 343,
- 236,
- 344,
- 235,
- 345,
- 234,
- 346,
- 233,
- 347,
- 232,
- 348,
- 231,
- 349,
- 230,
- 350,
- 229,
- 351,
- 228,
- 352,
- 227,
- 353,
- 226,
- 354,
- 225,
- 355,
- 224,
- 356,
- 223,
- 357,
- 222,
- 358,
- 221,
- 359,
- 220,
- 360,
- 219,
- 361,
- 218,
- 362,
- 217,
- 363,
- 216,
- 364,
- 215,
- 365,
- 214,
- 366,
- 213,
- 367,
- 212,
- 368,
- 211,
- 369,
- 210,
- 370,
- 209,
- 371,
- 208,
- 372,
- 207,
- 373,
- 206,
- 374,
- 205,
- 375,
- 204,
- 376,
- 203,
- 377,
- 202,
- 378,
- 201,
- 379,
- 200,
- 380,
- 199,
- 381,
- 198,
- 382,
- 197,
- 383,
- 196,
- 384,
- 195,
- 385,
- 194,
- 386,
- 193,
- 387,
- 192,
- 388,
- 191,
- 389,
- 190,
- 390,
- 189,
- 391,
- 188,
- 392,
- 187,
- 393,
- 186,
- 394,
- 185,
- 395,
- 184,
- 396,
- 183,
- 397,
- 182,
- 398,
- 181,
- 399,
- 180,
- 400,
- 179,
- 401,
- 178,
- 402,
- 177,
- 403,
- 176,
- 404,
- 175,
- 405,
- 174,
- 406,
- 173,
- 407,
- 172,
- 408,
- 171,
- 409,
- 170,
- 410,
- 169,
- 411,
- 168,
- 412,
- 167,
- 413,
- 166,
- 414,
- 165,
- 415,
- 164,
- 416,
- 163,
- 417,
- 162,
- 418,
- 161,
- 419,
- 160,
- 420,
- 159,
- 421,
- 158,
- 422,
- 157,
- 423,
- 156,
- 424,
- 155,
- 425,
- 154,
- 426,
- 153,
- 427,
- 152,
- 428,
- 151,
- 429,
- 150,
- 430,
- 149,
- 431,
- 148,
- 432,
- 147,
- 433,
- 146,
- 434,
- 145,
- 435,
- 144,
- 436,
- 143,
- 437,
- 142,
- 438,
- 141,
- 439,
- 140,
- 440,
- 139,
- 441,
- 138,
- 442,
- 137,
- 443,
- 136,
- 444,
- 135,
- 445,
- 134,
- 446,
- 133,
- 447,
- 132,
- 448,
- 131,
- 449,
- 130,
- 450,
- 129,
- 451,
- 128,
- 452,
- 127,
- 453,
- 126,
- 454,
- 125,
- 455,
- 124,
- 456,
- 123,
- 457,
- 122,
- 458,
- 121,
- 459,
- 120,
- 460,
- 119,
- 461,
- 118,
- 462,
- 117,
- 463,
- 116,
- 464,
- 115,
- 465,
- 114,
- 466,
- 113,
- 467,
- 112,
- 468,
- 111,
- 469,
- 110,
- 470,
- 109,
- 471,
- 108,
- 472,
- 107,
- 473,
- 106,
- 474,
- 105,
- 475,
- 104,
- 476,
- 103,
- 477,
- 102,
- 478,
- 101,
- 479,
- 100,
- 480,
- 99,
- 481,
- 98,
- 482,
- 97,
- 483,
- 96,
- 484,
- 95,
- 485,
- 94,
- 486,
- 93,
- 487,
- 92,
- 488,
- 91,
- 489,
- 90,
- 490,
- 89,
- 491,
- 88,
- 492,
- 87,
- 493,
- 86,
- 494,
- 85,
- 495,
- 84,
- 496,
- 83,
- 497,
- 82,
- 498,
- 81,
- 499,
- 80,
- 500,
- 79,
- 501,
- 78,
- 502,
- 77,
- 503,
- 76,
- 504,
- 75,
- 505,
- 74,
- 506,
- 73,
- 507,
- 72,
- 508,
- 71,
- 509,
- 70,
- 510,
- 69,
- 511,
- 68,
- 512,
- 67,
- 513,
- 66,
- 514,
- 65,
- 515,
- 64,
- 516,
- 63,
- 517,
- 62,
- 518,
- 61,
- 519,
- 60,
- 520,
- 59,
- 521,
- 58,
- 522,
- 57,
- 523,
- 56,
- 524,
- 55,
- 525,
- 54,
- 526,
- 53,
- 527,
- 52,
- 528,
- 51,
- 529,
- 50,
- 530,
- 49,
- 531,
- 48,
- 532,
- 47,
- 533,
- 46,
- 534,
- 45,
- 535,
- 44,
- 536,
- 43,
- 537,
- 42,
- 538,
- 41,
- 539,
- 40,
- 540,
- 39,
- 541,
- 38,
- 542,
- 37,
- 543,
- 36,
- 544,
- 35,
- 545,
- 34,
- 546,
- 33,
- 547,
- 32,
- 548,
- 31,
- 549,
- 30,
- 550,
- 29,
- 551,
- 28,
- 552,
- 27,
- 553,
- 26,
- 554,
- 25,
- 555,
- 24,
- 556,
- 23,
- 557,
- 22,
- 558,
- 21,
- 559,
- 20,
- 560,
- 19,
- 561,
- 18,
- 562,
- 17,
- 563,
- 16,
- 564,
- 15,
- 565,
- 14,
- 566,
- 13,
- 567,
- 12,
- 568,
- 11,
- 569,
- 10,
- 570,
- 9,
- 571,
- 8,
- 572,
- 7,
- 573,
- 6,
- 574,
- 5,
- 575,
- 4,
- 576,
- 3,
- 577,
- 2,
- 578,
- 1,
- 579,
- 0,
- 580,
-};
-
-static long _vq_lengthlist_res0_256_1024_7[] = {
- 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 7, 6, 7, 7, 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, 9, 8, 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,10,10,10,10,10,10,10,10,10,10,
- 10,10,10,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,12,12,
- 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
- 12,12,12,12,12,12,13,13,13,12,13,13,13,13,13,13,
- 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 14,13,13,14,14,14,14,14,13,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,14,14,14,14,15,14,15,
- 14,15,14,15,15,14,15,15,15,15,15,15,15,14,15,15,
- 15,15,15,15,15,15,15,15,15,15,15,15,16,15,15,15,
- 15,15,16,15,15,15,16,16,16,16,16,16,16,16,16,15,
- 16,15,16,16,16,16,16,16,16,16,16,16,16,16,16,17,
- 16,16,16,16,16,16,17,17,17,16,16,16,17,17,17,17,
- 16,16,17,17,16,17,17,17,17,17,17,17,19,16,17,16,
- 17,17,17,17,17,17,18,18,17,17,18,17,18,18,17,18,
- 17,18,18,17,18,18,18,17,18,19,18,17,18,18,19,18,
- 19,18,19,19,18,18,18,19,17,19,18,19,19,19,18,18,
- 20,18,19,20,18,18,18,18,20,18,18,18,20,21,21,19,
- 19,20,19,20,20,20,19,19,19,19,21,21,18,21,18,19,
- 19,20,19,19,20,19,21,20,21,20,19,18,21,21,19,21,
- 19,19,20,19,21,21,20,21,21,20,19,20,19,20,20,20,
- 20,20,19,19,19,21,20,21,21,20,20,21,20,19,20,21,
- 21,20,19,20,21,21,21,20,21,21,21,21,21,20,21,21,
- 20,20,21,21,21,20,20,21,21,21,21,21,20,21,21,21,
- 21,21,21,21,21,21,21,21,21,21,21,19,21,21,21,21,
- 21,21,21,20,21,21,21,21,21,21,20,21,21,21,21,21,
- 21,21,21,21,21,20,21,21,21,21,21,21,21,20,21,20,
- 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
- 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
- 21,21,20,21,21,21,21,21,21,21,21,21,21,21,21,21,
- 21,20,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
- 21,21,21,20,20,
-};
-
-static float _vq_quantthresh_res0_256_1024_7[] = {
- -289.5, -288.5, -287.5, -286.5, -285.5, -284.5, -283.5, -282.5,
- -281.5, -280.5, -279.5, -278.5, -277.5, -276.5, -275.5, -274.5,
- -273.5, -272.5, -271.5, -270.5, -269.5, -268.5, -267.5, -266.5,
- -265.5, -264.5, -263.5, -262.5, -261.5, -260.5, -259.5, -258.5,
- -257.5, -256.5, -255.5, -254.5, -253.5, -252.5, -251.5, -250.5,
- -249.5, -248.5, -247.5, -246.5, -245.5, -244.5, -243.5, -242.5,
- -241.5, -240.5, -239.5, -238.5, -237.5, -236.5, -235.5, -234.5,
- -233.5, -232.5, -231.5, -230.5, -229.5, -228.5, -227.5, -226.5,
- -225.5, -224.5, -223.5, -222.5, -221.5, -220.5, -219.5, -218.5,
- -217.5, -216.5, -215.5, -214.5, -213.5, -212.5, -211.5, -210.5,
- -209.5, -208.5, -207.5, -206.5, -205.5, -204.5, -203.5, -202.5,
- -201.5, -200.5, -199.5, -198.5, -197.5, -196.5, -195.5, -194.5,
- -193.5, -192.5, -191.5, -190.5, -189.5, -188.5, -187.5, -186.5,
- -185.5, -184.5, -183.5, -182.5, -181.5, -180.5, -179.5, -178.5,
- -177.5, -176.5, -175.5, -174.5, -173.5, -172.5, -171.5, -170.5,
- -169.5, -168.5, -167.5, -166.5, -165.5, -164.5, -163.5, -162.5,
- -161.5, -160.5, -159.5, -158.5, -157.5, -156.5, -155.5, -154.5,
- -153.5, -152.5, -151.5, -150.5, -149.5, -148.5, -147.5, -146.5,
- -145.5, -144.5, -143.5, -142.5, -141.5, -140.5, -139.5, -138.5,
- -137.5, -136.5, -135.5, -134.5, -133.5, -132.5, -131.5, -130.5,
- -129.5, -128.5, -127.5, -126.5, -125.5, -124.5, -123.5, -122.5,
- -121.5, -120.5, -119.5, -118.5, -117.5, -116.5, -115.5, -114.5,
- -113.5, -112.5, -111.5, -110.5, -109.5, -108.5, -107.5, -106.5,
- -105.5, -104.5, -103.5, -102.5, -101.5, -100.5, -99.5, -98.5,
- -97.5, -96.5, -95.5, -94.5, -93.5, -92.5, -91.5, -90.5,
- -89.5, -88.5, -87.5, -86.5, -85.5, -84.5, -83.5, -82.5,
- -81.5, -80.5, -79.5, -78.5, -77.5, -76.5, -75.5, -74.5,
- -73.5, -72.5, -71.5, -70.5, -69.5, -68.5, -67.5, -66.5,
- -65.5, -64.5, -63.5, -62.5, -61.5, -60.5, -59.5, -58.5,
- -57.5, -56.5, -55.5, -54.5, -53.5, -52.5, -51.5, -50.5,
- -49.5, -48.5, -47.5, -46.5, -45.5, -44.5, -43.5, -42.5,
- -41.5, -40.5, -39.5, -38.5, -37.5, -36.5, -35.5, -34.5,
- -33.5, -32.5, -31.5, -30.5, -29.5, -28.5, -27.5, -26.5,
- -25.5, -24.5, -23.5, -22.5, -21.5, -20.5, -19.5, -18.5,
- -17.5, -16.5, -15.5, -14.5, -13.5, -12.5, -11.5, -10.5,
- -9.5, -8.5, -7.5, -6.5, -5.5, -4.5, -3.5, -2.5,
- -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5,
- 6.5, 7.5, 8.5, 9.5, 10.5, 11.5, 12.5, 13.5,
- 14.5, 15.5, 16.5, 17.5, 18.5, 19.5, 20.5, 21.5,
- 22.5, 23.5, 24.5, 25.5, 26.5, 27.5, 28.5, 29.5,
- 30.5, 31.5, 32.5, 33.5, 34.5, 35.5, 36.5, 37.5,
- 38.5, 39.5, 40.5, 41.5, 42.5, 43.5, 44.5, 45.5,
- 46.5, 47.5, 48.5, 49.5, 50.5, 51.5, 52.5, 53.5,
- 54.5, 55.5, 56.5, 57.5, 58.5, 59.5, 60.5, 61.5,
- 62.5, 63.5, 64.5, 65.5, 66.5, 67.5, 68.5, 69.5,
- 70.5, 71.5, 72.5, 73.5, 74.5, 75.5, 76.5, 77.5,
- 78.5, 79.5, 80.5, 81.5, 82.5, 83.5, 84.5, 85.5,
- 86.5, 87.5, 88.5, 89.5, 90.5, 91.5, 92.5, 93.5,
- 94.5, 95.5, 96.5, 97.5, 98.5, 99.5, 100.5, 101.5,
- 102.5, 103.5, 104.5, 105.5, 106.5, 107.5, 108.5, 109.5,
- 110.5, 111.5, 112.5, 113.5, 114.5, 115.5, 116.5, 117.5,
- 118.5, 119.5, 120.5, 121.5, 122.5, 123.5, 124.5, 125.5,
- 126.5, 127.5, 128.5, 129.5, 130.5, 131.5, 132.5, 133.5,
- 134.5, 135.5, 136.5, 137.5, 138.5, 139.5, 140.5, 141.5,
- 142.5, 143.5, 144.5, 145.5, 146.5, 147.5, 148.5, 149.5,
- 150.5, 151.5, 152.5, 153.5, 154.5, 155.5, 156.5, 157.5,
- 158.5, 159.5, 160.5, 161.5, 162.5, 163.5, 164.5, 165.5,
- 166.5, 167.5, 168.5, 169.5, 170.5, 171.5, 172.5, 173.5,
- 174.5, 175.5, 176.5, 177.5, 178.5, 179.5, 180.5, 181.5,
- 182.5, 183.5, 184.5, 185.5, 186.5, 187.5, 188.5, 189.5,
- 190.5, 191.5, 192.5, 193.5, 194.5, 195.5, 196.5, 197.5,
- 198.5, 199.5, 200.5, 201.5, 202.5, 203.5, 204.5, 205.5,
- 206.5, 207.5, 208.5, 209.5, 210.5, 211.5, 212.5, 213.5,
- 214.5, 215.5, 216.5, 217.5, 218.5, 219.5, 220.5, 221.5,
- 222.5, 223.5, 224.5, 225.5, 226.5, 227.5, 228.5, 229.5,
- 230.5, 231.5, 232.5, 233.5, 234.5, 235.5, 236.5, 237.5,
- 238.5, 239.5, 240.5, 241.5, 242.5, 243.5, 244.5, 245.5,
- 246.5, 247.5, 248.5, 249.5, 250.5, 251.5, 252.5, 253.5,
- 254.5, 255.5, 256.5, 257.5, 258.5, 259.5, 260.5, 261.5,
- 262.5, 263.5, 264.5, 265.5, 266.5, 267.5, 268.5, 269.5,
- 270.5, 271.5, 272.5, 273.5, 274.5, 275.5, 276.5, 277.5,
- 278.5, 279.5, 280.5, 281.5, 282.5, 283.5, 284.5, 285.5,
- 286.5, 287.5, 288.5, 289.5,
-};
-
-static long _vq_quantmap_res0_256_1024_7[] = {
- 579, 577, 575, 573, 571, 569, 567, 565,
- 563, 561, 559, 557, 555, 553, 551, 549,
- 547, 545, 543, 541, 539, 537, 535, 533,
- 531, 529, 527, 525, 523, 521, 519, 517,
- 515, 513, 511, 509, 507, 505, 503, 501,
- 499, 497, 495, 493, 491, 489, 487, 485,
- 483, 481, 479, 477, 475, 473, 471, 469,
- 467, 465, 463, 461, 459, 457, 455, 453,
- 451, 449, 447, 445, 443, 441, 439, 437,
- 435, 433, 431, 429, 427, 425, 423, 421,
- 419, 417, 415, 413, 411, 409, 407, 405,
- 403, 401, 399, 397, 395, 393, 391, 389,
- 387, 385, 383, 381, 379, 377, 375, 373,
- 371, 369, 367, 365, 363, 361, 359, 357,
- 355, 353, 351, 349, 347, 345, 343, 341,
- 339, 337, 335, 333, 331, 329, 327, 325,
- 323, 321, 319, 317, 315, 313, 311, 309,
- 307, 305, 303, 301, 299, 297, 295, 293,
- 291, 289, 287, 285, 283, 281, 279, 277,
- 275, 273, 271, 269, 267, 265, 263, 261,
- 259, 257, 255, 253, 251, 249, 247, 245,
- 243, 241, 239, 237, 235, 233, 231, 229,
- 227, 225, 223, 221, 219, 217, 215, 213,
- 211, 209, 207, 205, 203, 201, 199, 197,
- 195, 193, 191, 189, 187, 185, 183, 181,
- 179, 177, 175, 173, 171, 169, 167, 165,
- 163, 161, 159, 157, 155, 153, 151, 149,
- 147, 145, 143, 141, 139, 137, 135, 133,
- 131, 129, 127, 125, 123, 121, 119, 117,
- 115, 113, 111, 109, 107, 105, 103, 101,
- 99, 97, 95, 93, 91, 89, 87, 85,
- 83, 81, 79, 77, 75, 73, 71, 69,
- 67, 65, 63, 61, 59, 57, 55, 53,
- 51, 49, 47, 45, 43, 41, 39, 37,
- 35, 33, 31, 29, 27, 25, 23, 21,
- 19, 17, 15, 13, 11, 9, 7, 5,
- 3, 1, 0, 2, 4, 6, 8, 10,
- 12, 14, 16, 18, 20, 22, 24, 26,
- 28, 30, 32, 34, 36, 38, 40, 42,
- 44, 46, 48, 50, 52, 54, 56, 58,
- 60, 62, 64, 66, 68, 70, 72, 74,
- 76, 78, 80, 82, 84, 86, 88, 90,
- 92, 94, 96, 98, 100, 102, 104, 106,
- 108, 110, 112, 114, 116, 118, 120, 122,
- 124, 126, 128, 130, 132, 134, 136, 138,
- 140, 142, 144, 146, 148, 150, 152, 154,
- 156, 158, 160, 162, 164, 166, 168, 170,
- 172, 174, 176, 178, 180, 182, 184, 186,
- 188, 190, 192, 194, 196, 198, 200, 202,
- 204, 206, 208, 210, 212, 214, 216, 218,
- 220, 222, 224, 226, 228, 230, 232, 234,
- 236, 238, 240, 242, 244, 246, 248, 250,
- 252, 254, 256, 258, 260, 262, 264, 266,
- 268, 270, 272, 274, 276, 278, 280, 282,
- 284, 286, 288, 290, 292, 294, 296, 298,
- 300, 302, 304, 306, 308, 310, 312, 314,
- 316, 318, 320, 322, 324, 326, 328, 330,
- 332, 334, 336, 338, 340, 342, 344, 346,
- 348, 350, 352, 354, 356, 358, 360, 362,
- 364, 366, 368, 370, 372, 374, 376, 378,
- 380, 382, 384, 386, 388, 390, 392, 394,
- 396, 398, 400, 402, 404, 406, 408, 410,
- 412, 414, 416, 418, 420, 422, 424, 426,
- 428, 430, 432, 434, 436, 438, 440, 442,
- 444, 446, 448, 450, 452, 454, 456, 458,
- 460, 462, 464, 466, 468, 470, 472, 474,
- 476, 478, 480, 482, 484, 486, 488, 490,
- 492, 494, 496, 498, 500, 502, 504, 506,
- 508, 510, 512, 514, 516, 518, 520, 522,
- 524, 526, 528, 530, 532, 534, 536, 538,
- 540, 542, 544, 546, 548, 550, 552, 554,
- 556, 558, 560, 562, 564, 566, 568, 570,
- 572, 574, 576, 578, 580,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_256_1024_7 = {
- _vq_quantthresh_res0_256_1024_7,
- _vq_quantmap_res0_256_1024_7,
- 581,
- 581
-};
-
-static static_codebook _vq_book_res0_256_1024_7 = {
- 1, 581,
- _vq_lengthlist_res0_256_1024_7,
- 1, -518905856, 1611661312, 10, 0,
- _vq_quantlist_res0_256_1024_7,
- NULL,
- &_vq_auxt_res0_256_1024_7,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_256_1024aux.vqh b/lib/books/res0_256_1024aux.vqh
deleted file mode 100644
index f458bd9c..00000000
--- a/lib/books/res0_256_1024aux.vqh
+++ /dev/null
@@ -1,40 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- * *
- ********************************************************************
-
- function: static codebook autogenerated by huff/huffbuld
-
- ********************************************************************/
-
-#ifndef _V_res0_256_1024aux_VQH_
-#define _V_res0_256_1024aux_VQH_
-#include "codebook.h"
-
-static long _huff_lengthlist_res0_256_1024aux[] = {
- 2, 8,11,11,18,13,15,20, 5, 3, 6, 7,10,10,13,20,
- 10, 5, 4, 5, 7, 9,13,19,10, 6, 4, 4, 6, 7,10,17,
- 17,10, 6, 5, 5, 6,10,17,10, 9, 8, 6, 6, 5, 7,14,
- 11,10,10, 8, 8, 5, 6,12,13,11,10, 9, 8, 6, 7,13,
-};
-
-static static_codebook _huff_book_res0_256_1024aux = {
- 2, 64,
- _huff_lengthlist_res0_256_1024aux,
- 0, 0, 0, 0, 0,
- NULL,
- NULL,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_256_128_1.vqh b/lib/books/res0_256_128_1.vqh
deleted file mode 100644
index 0ecb0954..00000000
--- a/lib/books/res0_256_128_1.vqh
+++ /dev/null
@@ -1,63 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_256_128_1_VQH_
-#define _V_res0_256_128_1_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_256_128_1[] = {
- 1,
- 0,
- 2,
-};
-
-static long _vq_lengthlist_res0_256_128_1[] = {
- 2, 3, 3, 4, 6, 6, 4, 6, 6, 5, 7, 7, 7, 8, 8, 7,
- 8, 8, 5, 7, 7, 7, 8, 8, 7, 8, 8, 6, 7, 8, 8, 9,
- 9, 8, 9, 9, 8, 9, 9, 9, 9,10,10,10,10, 8, 9, 9,
- 9,10, 9, 9,10,10, 6, 7, 7, 8, 8, 9, 8, 9, 9, 8,
- 9, 9,10,10,10, 9, 9,10, 8, 9, 9, 9,10,10, 9,10,
- 9,
-};
-
-static float _vq_quantthresh_res0_256_128_1[] = {
- -0.5, 0.5,
-};
-
-static long _vq_quantmap_res0_256_128_1[] = {
- 1, 0, 2,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_256_128_1 = {
- _vq_quantthresh_res0_256_128_1,
- _vq_quantmap_res0_256_128_1,
- 3,
- 3
-};
-
-static static_codebook _vq_book_res0_256_128_1 = {
- 4, 81,
- _vq_lengthlist_res0_256_128_1,
- 1, -535822336, 1611661312, 2, 0,
- _vq_quantlist_res0_256_128_1,
- NULL,
- &_vq_auxt_res0_256_128_1,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_256_128_2.vqh b/lib/books/res0_256_128_2.vqh
deleted file mode 100644
index 09922690..00000000
--- a/lib/books/res0_256_128_2.vqh
+++ /dev/null
@@ -1,99 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_256_128_2_VQH_
-#define _V_res0_256_128_2_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_256_128_2[] = {
- 2,
- 1,
- 3,
- 0,
- 4,
-};
-
-static long _vq_lengthlist_res0_256_128_2[] = {
- 5, 6, 6, 7, 7, 6, 7, 7, 8, 8, 6, 7, 7, 8, 8, 8,
- 8, 8,10,10, 8, 8, 8,10,10, 7, 7, 7, 8, 8, 7, 7,
- 8, 8, 9, 7, 8, 8, 9, 9, 9, 9, 9,10,10, 9, 9, 9,
- 10,10, 7, 7, 7, 8, 8, 7, 8, 8, 8, 8, 7, 8, 8, 9,
- 9, 9, 9, 9,10,10, 9, 9, 9,10,10, 8, 9, 9,10,10,
- 9, 9, 9,10,10, 9, 9, 9,11,10,10,11,11,12,12,11,
- 10,11,11,12, 8, 9, 9,10,10, 9, 9, 9,10,10, 9, 9,
- 9,10,10,10,11,10,12,12,10,11,11,12,12, 7, 8, 8,
- 9, 9, 8, 8, 8, 9, 9, 8, 8, 8, 9, 9, 9, 9, 9,11,
- 11, 9, 9, 9,10,11, 8, 8, 8, 9, 9, 8, 8, 8, 9,10,
- 8, 8, 8,10, 9,10, 9,10,11,11, 9,10,10,11,11, 8,
- 8, 8, 9, 9, 8, 8, 8,10, 9, 8, 8, 8, 9,10,10,10,
- 9,11,10,10,10, 9,11,11, 9, 9, 9,11,10, 9, 9,10,
- 11,11,10,10,10,11,11,11,11,11,12,13,11,11,11,13,
- 12, 9, 9,10,10,11, 9,10, 9,11,11,10,10,10,11,11,
- 11,11,10,12,11,11,11,11,12,13, 7, 8, 8, 9, 9, 8,
- 8, 8, 9, 9, 8, 8, 8, 9, 9, 9, 9, 9,10,10, 9, 9,
- 9,11,11, 8, 8, 8, 9, 9, 8, 8, 8,10, 9, 8, 8, 8,
- 9, 9, 9,10,10,11,11,10, 9,10,10,11, 8, 8, 8, 9,
- 9, 8, 8, 9, 9,10, 8, 8, 8, 9, 9, 9,10,10,11,10,
- 9,10, 9,11,11,10,10, 9,11,11,10,10,10,11,11, 9,
- 10,10,11,11,11,11,11,12,13,11,11,11,12,13, 9, 9,
- 10,10,11,10, 9,10,11,11, 9,10, 9,11,11,11,11,11,
- 13,12,11,11,10,12,12, 9, 9, 9,11,11,10,10,10,12,
- 11, 9, 9, 9,11,11,10,11,11,13,13,11,11,11,12,12,
- 10,10, 9,11,11, 9,10,10,11,12,10,10,10,11,11,11,
- 11,11,13,13,11,11,11,13,13, 9, 9,10,11,11,10,10,
- 10,11,11, 9,10,10,11,11,11,11,11,13,13,11,11,11,
- 12,12,11,11,11,12,13,11,11,11,13,13,11,11,11,13,
- 12,12,12,13,12,13,13,13,13,14,14,11,11,11,12,12,
- 11,11,10,12,12,11,12,12,13,13,12,13,11,14,12,13,
- 13,13,13,13, 9, 9, 9,11,11, 9, 9, 9,11,11,10,10,
- 10,11,11,10,11,11,12,12,11,11,11,12,12, 9,10, 9,
- 11,11,10,10,10,11,11, 9,10,10,11,11,11,11,11,13,
- 12,11,11,11,12,13, 9, 9,10,11,11,10,10,10,11,11,
- 10,10, 9,11,11,11,11,12,12,13,12,12,11,13,13,11,
- 11,11,12,12,11,12,11,13,13,11,11,11,13,13,13,12,
- 13,14,15,12,12,12,12,15,11,11,11,12,12,11,11,12,
- 12,13,11,11,11,12,12,12,12,13,14,14,12,13,12,14,
- 13,
-};
-
-static float _vq_quantthresh_res0_256_128_2[] = {
- -1.5, -0.5, 0.5, 1.5,
-};
-
-static long _vq_quantmap_res0_256_128_2[] = {
- 3, 1, 0, 2, 4,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_256_128_2 = {
- _vq_quantthresh_res0_256_128_2,
- _vq_quantmap_res0_256_128_2,
- 5,
- 5
-};
-
-static static_codebook _vq_book_res0_256_128_2 = {
- 4, 625,
- _vq_lengthlist_res0_256_128_2,
- 1, -533725184, 1611661312, 3, 0,
- _vq_quantlist_res0_256_128_2,
- NULL,
- &_vq_auxt_res0_256_128_2,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_256_128_3.vqh b/lib/books/res0_256_128_3.vqh
deleted file mode 100644
index 17230958..00000000
--- a/lib/books/res0_256_128_3.vqh
+++ /dev/null
@@ -1,80 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_256_128_3_VQH_
-#define _V_res0_256_128_3_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_256_128_3[] = {
- 6,
- 5,
- 7,
- 4,
- 8,
- 3,
- 9,
- 2,
- 10,
- 1,
- 11,
- 0,
- 12,
-};
-
-static long _vq_lengthlist_res0_256_128_3[] = {
- 4, 4, 4, 5, 5, 6, 6, 7, 7, 9, 9,10,10, 4, 5, 5,
- 6, 6, 7, 7, 8, 8, 9, 9,10,10, 4, 5, 5, 6, 6, 7,
- 6, 8, 8, 9, 9,10,10, 6, 6, 6, 7, 7, 8, 8, 9, 9,
- 10,10,12,11, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,12,
- 11, 6, 7, 7, 8, 8, 9, 9,10,10,12,12,13,13, 6, 7,
- 7, 8, 8, 9, 9,10,10,11,12,13,13, 8, 8, 8, 9, 9,
- 10,10,12,11,13,13,14,14, 8, 8, 8, 9, 9,10,10,12,
- 12,13,13,14,14, 9,10, 9,11,11,12,12,13,13,14,14,
- 15,15, 9, 9, 9,11,11,12,12,13,13,14,14,15,15,10,
- 11,11,12,12,13,13,15,14,16,15,16,16,10,11,11,12,
- 12,13,13,14,14,15,16,16,16,
-};
-
-static float _vq_quantthresh_res0_256_128_3[] = {
- -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_res0_256_128_3[] = {
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_256_128_3 = {
- _vq_quantthresh_res0_256_128_3,
- _vq_quantmap_res0_256_128_3,
- 13,
- 13
-};
-
-static static_codebook _vq_book_res0_256_128_3 = {
- 2, 169,
- _vq_lengthlist_res0_256_128_3,
- 1, -531103744, 1611661312, 4, 0,
- _vq_quantlist_res0_256_128_3,
- NULL,
- &_vq_auxt_res0_256_128_3,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_256_128_4.vqh b/lib/books/res0_256_128_4.vqh
deleted file mode 100644
index 3c09d1ec..00000000
--- a/lib/books/res0_256_128_4.vqh
+++ /dev/null
@@ -1,565 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_256_128_4_VQH_
-#define _V_res0_256_128_4_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_256_128_4[] = {
- 40,
- 39,
- 41,
- 38,
- 42,
- 37,
- 43,
- 36,
- 44,
- 35,
- 45,
- 34,
- 46,
- 33,
- 47,
- 32,
- 48,
- 31,
- 49,
- 30,
- 50,
- 29,
- 51,
- 28,
- 52,
- 27,
- 53,
- 26,
- 54,
- 25,
- 55,
- 24,
- 56,
- 23,
- 57,
- 22,
- 58,
- 21,
- 59,
- 20,
- 60,
- 19,
- 61,
- 18,
- 62,
- 17,
- 63,
- 16,
- 64,
- 15,
- 65,
- 14,
- 66,
- 13,
- 67,
- 12,
- 68,
- 11,
- 69,
- 10,
- 70,
- 9,
- 71,
- 8,
- 72,
- 7,
- 73,
- 6,
- 74,
- 5,
- 75,
- 4,
- 76,
- 3,
- 77,
- 2,
- 78,
- 1,
- 79,
- 0,
- 80,
-};
-
-static long _vq_lengthlist_res0_256_128_4[] = {
- 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 8, 8, 9,
- 9, 9, 9,10,10,10,10,10,10,10,10,11,10,11,11,11,
- 11,11,11,11,11,11,11,12,12,12,12,12,12,13,12,13,
- 12,13,13,13,13,13,14,14,13,14,14,14,14,14,15,15,
- 15,15,15,15,15,16,17,15,18,17,17,17,17,16,17,18,
- 17, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
- 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,
- 10,10,10,11,11,11,11,11,11,11,11,11,12,11,12,11,
- 12,12,12,12,13,12,13,13,13,13,14,13,14,14,14,14,
- 14,14,14,14,15,15,15,15,15,16,15,16,15,15,16,17,
- 15,17, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8,
- 8, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,
- 10,10,10,10,10,11,10,11,11,11,11,11,11,12,12,12,
- 12,12,12,12,12,13,12,13,13,13,13,14,13,14,14,14,
- 13,14,14,14,14,14,15,15,16,14,15,16,16,15,15,16,
- 15,15,16, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,
- 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,11,11,11,
- 11,11,11,11,11,11,11,11,12,11,12,12,12,12,12,12,
- 13,12,13,13,13,12,14,13,13,13,14,14,14,14,15,14,
- 14,15,15,15,15,15,14,15,16,15,16,16,15,16,15,17,
- 16,15,15,17, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9,
- 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,11,10,
- 11,11,11,11,11,11,11,11,11,11,11,12,12,12,12,12,
- 12,13,12,13,12,13,13,13,13,14,13,14,14,14,14,14,
- 14,14,14,15,15,15,15,15,16,15,16,16,16,16,16,17,
- 16,16,16,16,18, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
- 10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,
- 11,11,11,11,12,11,12,12,12,12,12,12,12,12,13,12,
- 13,13,13,12,13,13,14,13,14,13,14,14,14,14,15,14,
- 14,15,15,15,15,15,15,16,14,15,15,15,16,17,16,16,
- 17,16,17,17,16,16, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9,
- 10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,
- 11,11,11,11,11,12,11,12,12,12,12,12,12,12,12,13,
- 12,13,12,13,13,13,13,14,14,14,14,14,14,14,15,14,
- 14,14,14,16,15,15,16,15,16,15,15,16,16,17,16,16,
- 16,17,17,17,19,16,19, 8, 8, 8, 9, 9, 9, 9,10,10,
- 10,10,10,10,10,10,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,12,12,12,12,12,12,12,12,12,12,12,13,12,
- 13,12,13,13,13,13,14,13,14,13,14,14,14,14,15,14,
- 15,14,14,14,15,16,15,15,16,15,16,15,16,16,16,17,
- 17,17,16,19,16,17,16,18, 8, 8, 8, 9, 9, 9, 9,10,
- 10,10,10,10,10,10,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,12,12,12,11,12,12,12,12,12,12,13,13,13,
- 12,13,13,13,13,14,13,14,13,14,14,15,14,14,14,15,
- 14,15,15,14,15,15,15,16,15,16,16,17,16,16,16,16,
- 16,15,18,18,16,17,19,17,19, 9, 9, 9,10,10,10,10,
- 10,10,10,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,13,13,13,13,
- 13,13,13,13,13,13,14,13,14,13,14,14,14,14,15,14,
- 15,15,16,14,16,15,15,15,16,16,16,17,16,16,17,16,
- 16,17,16,16,16,17,18,17,17,17, 9, 9, 9,10,10,10,
- 10,10,10,10,11,11,11,11,11,11,11,11,11,12,11,11,
- 12,11,12,12,12,12,12,12,12,12,12,12,12,13,13,13,
- 13,13,13,13,13,14,13,14,13,14,14,15,14,14,14,15,
- 15,15,15,16,15,15,15,16,17,16,16,15,16,15,17,16,
- 16,16,17,17,19,18,18,17,18,17,19,10, 9, 9,10,10,
- 10,11,11,11,11,11,11,11,11,11,12,12,12,12,12,12,
- 12,12,12,12,12,12,12,13,12,13,13,13,13,13,13,13,
- 13,13,14,13,14,14,14,13,14,14,14,14,15,14,14,14,
- 15,15,15,16,17,15,17,15,16,16,16,16,15,16,18,17,
- 16,18,16,17,17,17,17,17,19,16,17,17,10, 9, 9,10,
- 10,11,10,11,11,11,11,11,11,11,12,12,12,12,12,12,
- 12,12,12,12,12,12,13,12,12,13,12,13,12,13,13,13,
- 13,13,13,13,13,14,13,14,14,14,14,15,14,15,14,15,
- 14,16,15,16,15,15,15,16,16,16,15,15,15,15,17,16,
- 16,17,16,16,16,18,18,16,19,17,17,17,16, 9, 9, 9,
- 10,10,11,11,11,11,12,11,11,12,12,12,12,12,12,13,
- 12,12,13,13,12,13,12,13,13,13,13,13,13,13,13,13,
- 13,13,14,14,14,13,14,14,14,14,14,14,15,15,15,14,
- 16,15,16,15,15,15,16,16,16,16,16,16,16,17,16,17,
- 17,19,16,16,16,18,19,17,17,18,17,19,18,19, 9, 9,
- 9,10,10,11,11,11,11,11,11,12,12,12,12,12,12,12,
- 12,12,12,12,12,13,13,13,13,13,13,13,13,13,13,13,
- 13,13,13,14,13,14,14,14,13,14,14,14,14,15,14,15,
- 15,15,16,16,16,16,16,15,16,16,17,16,16,17,19,16,
- 17,17,17,19,18,17,17,17,17,17,18,18,18,17,18,10,
- 10,10,11,11,11,11,12,12,12,12,12,12,12,13,12,13,
- 12,13,12,13,13,13,13,13,13,13,13,13,13,13,13,13,
- 13,14,14,13,14,13,15,14,15,14,14,14,15,14,15,15,
- 16,15,16,15,17,16,16,17,16,16,16,16,18,16,17,16,
- 18,17,19,17,17,16,18,18,18,17,16,19,17,18,17,19,
- 10,10,10,11,11,11,11,12,12,12,12,12,12,12,12,12,
- 12,13,13,13,13,12,13,13,13,13,13,13,13,13,13,13,
- 13,14,14,14,14,14,14,14,13,14,14,14,14,15,15,15,
- 14,15,15,16,16,16,16,17,15,16,16,19,17,18,16,19,
- 18,16,18,18,17,17,19,16,19,17,19,18,17,18,19,17,
- 18,11,10,11,11,11,12,12,12,12,12,13,13,12,13,13,
- 12,13,13,13,13,13,13,13,13,14,13,14,13,13,13,13,
- 13,14,14,14,14,14,14,14,14,14,15,14,15,16,16,14,
- 16,15,19,15,16,15,16,17,17,17,17,16,18,17,17,19,
- 19,16,19,18,17,17,19,18,18,19,19,18,17,17,17,18,
- 19,19,10,11,11,11,12,12,12,12,12,12,12,12,12,13,
- 13,13,13,13,13,13,13,13,13,13,14,13,13,13,14,14,
- 14,14,14,14,14,14,14,15,14,15,14,15,14,15,15,15,
- 15,15,15,17,15,16,16,16,16,16,16,16,17,16,16,17,
- 18,18,17,17,17,19,17,18,18,18,17,17,17,18,17,19,
- 19,18,19,11,11,11,12,12,12,12,12,13,13,13,13,13,
- 13,13,13,13,13,14,14,13,13,14,14,14,14,14,14,14,
- 14,14,14,14,14,14,14,14,14,15,14,14,15,14,15,14,
- 16,15,16,15,18,15,17,16,18,15,19,17,18,16,19,18,
- 19,17,18,18,17,19,19,18,19,17,19,19,17,19,18,19,
- 17,17,19,19,11,11,11,12,12,12,12,12,12,13,13,13,
- 13,13,13,13,13,13,13,13,14,14,13,14,13,14,14,14,
- 13,14,14,14,14,14,14,15,14,14,14,15,15,15,15,15,
- 16,16,16,19,15,16,16,16,16,17,16,17,16,19,19,16,
- 16,19,16,18,17,18,17,16,18,18,18,18,19,17,18,18,
- 19,18,19,18,19,12,12,11,12,12,13,13,13,13,13,13,
- 13,13,13,14,13,14,14,14,14,14,13,14,14,14,14,14,
- 15,14,14,14,14,14,14,14,14,15,15,15,15,15,16,15,
- 16,15,16,15,16,15,17,15,16,16,17,16,19,17,16,17,
- 19,17,17,17,17,17,19,19,18,19,19,19,18,18,18,19,
- 19,18,19,17,19,19,12,12,12,12,12,13,13,13,13,13,
- 13,13,13,13,14,14,13,14,14,14,14,14,13,14,14,14,
- 14,14,14,14,15,14,15,14,14,15,14,15,14,14,15,15,
- 15,18,14,17,15,16,15,17,15,18,17,16,17,17,16,16,
- 18,16,19,16,16,18,17,18,19,18,18,19,19,17,19,19,
- 18,18,19,17,19,19,19,12,12,12,13,13,13,13,13,14,
- 13,13,13,14,13,14,14,14,14,14,14,14,14,15,15,14,
- 14,14,15,15,15,14,14,14,14,14,15,15,15,15,17,15,
- 16,14,16,15,16,15,16,16,17,16,17,16,17,17,17,16,
- 18,17,19,19,18,18,18,18,17,18,17,19,19,18,19,18,
- 17,19,19,19,17,19,18,19,12,12,12,13,13,13,13,13,
- 13,13,13,14,14,14,14,13,14,14,14,14,14,14,15,14,
- 15,14,14,15,15,15,15,14,14,15,15,15,15,14,15,16,
- 15,16,16,16,15,16,15,17,15,19,15,17,15,17,15,17,
- 18,17,16,17,17,17,17,17,17,19,17,18,17,17,18,19,
- 19,18,19,18,18,19,19,19,17,12,12,12,13,13,13,14,
- 14,14,14,14,14,14,14,15,14,14,14,14,15,14,15,15,
- 14,14,15,15,15,14,14,15,15,15,16,15,15,15,16,15,
- 16,16,16,17,15,16,16,18,16,16,17,17,17,17,16,16,
- 19,17,19,17,19,17,19,18,19,17,17,19,18,18,17,18,
- 17,19,18,18,19,19,17,19,19,19,12,12,12,13,13,13,
- 13,13,13,14,14,14,14,14,14,15,14,14,14,15,14,14,
- 15,14,14,14,15,14,15,15,15,14,14,15,15,15,15,17,
- 16,16,16,16,16,17,15,17,16,16,15,16,16,19,16,18,
- 16,19,17,17,18,17,17,17,17,18,18,17,18,19,18,18,
- 19,18,19,19,18,19,19,18,19,19,19,13,13,13,13,13,
- 14,14,14,14,14,14,14,14,14,14,14,15,14,15,15,14,
- 14,15,15,15,15,15,15,15,14,15,15,16,16,14,15,15,
- 15,16,16,16,17,15,17,17,16,16,16,16,17,17,17,16,
- 19,17,18,17,17,18,17,18,18,18,18,17,19,18,19,19,
- 18,17,19,19,19,19,19,18,19,18,19,17,13,13,13,13,
- 13,13,13,14,14,14,14,14,14,15,15,15,14,15,14,15,
- 15,14,15,14,14,15,15,15,15,15,14,15,16,16,15,15,
- 16,16,15,15,16,16,17,16,16,17,17,17,18,19,16,17,
- 17,19,18,18,17,17,18,19,17,18,19,19,17,17,19,19,
- 19,18,17,19,19,19,19,19,17,19,19,19,19,13,13,13,
- 14,14,14,14,14,14,15,15,14,14,15,14,14,15,14,16,
- 14,15,14,14,15,15,15,15,15,15,15,15,15,16,16,15,
- 15,16,17,16,16,16,16,18,16,17,18,16,17,17,17,16,
- 17,18,17,17,19,17,18,17,17,16,18,19,19,17,19,19,
- 19,19,18,19,18,19,19,19,19,18,19,18,19,18,13,13,
- 13,14,14,14,14,14,15,15,15,15,15,15,15,14,14,14,
- 15,15,14,14,16,15,15,15,15,15,15,16,15,15,15,15,
- 15,16,15,16,16,17,16,16,16,18,15,16,17,19,17,19,
- 16,17,17,17,18,18,19,17,18,18,18,18,18,18,19,19,
- 19,18,18,19,19,19,19,19,19,19,19,19,19,19,18,14,
- 14,13,14,14,14,14,15,15,15,14,14,16,15,15,15,16,
- 16,15,15,15,15,16,15,16,15,15,15,15,15,15,15,15,
- 15,16,16,16,17,17,16,16,17,16,16,18,15,17,16,16,
- 16,16,19,17,19,17,17,19,18,18,19,19,18,18,19,17,
- 19,17,19,19,18,19,19,18,19,18,18,18,19,19,19,18,
- 14,14,13,14,13,14,15,14,15,14,14,14,14,14,14,15,
- 15,15,15,17,15,15,16,15,15,15,15,16,15,16,15,16,
- 16,17,15,16,16,17,16,16,16,16,16,17,18,18,18,17,
- 18,18,17,19,17,18,19,19,17,18,18,17,17,19,17,19,
- 19,18,19,19,19,19,17,19,18,19,18,19,19,19,18,19,
- 19,14,13,13,14,14,14,14,14,15,15,15,15,15,15,15,
- 15,16,15,15,15,16,15,15,15,16,15,16,17,15,16,16,
- 16,17,15,16,17,16,16,16,16,19,16,17,17,16,18,16,
- 18,17,18,17,17,17,17,18,17,17,18,19,19,19,19,18,
- 17,19,19,18,19,19,19,19,19,19,19,19,19,19,19,19,
- 18,19,13,14,14,14,14,14,14,15,14,14,14,15,15,15,
- 15,15,15,16,16,16,16,16,16,15,16,15,15,16,16,16,
- 16,16,17,17,15,17,16,16,16,18,16,19,16,19,17,18,
- 18,18,17,16,19,17,17,18,18,17,16,18,18,19,19,19,
- 17,19,18,18,19,18,19,18,18,18,19,18,19,19,19,19,
- 18,18,19,14,14,14,14,14,16,14,15,15,15,15,14,15,
- 16,15,16,16,15,16,14,15,15,16,15,17,16,16,15,18,
- 15,16,16,16,16,15,17,16,17,18,18,17,17,18,18,19,
- 19,17,18,17,17,19,17,18,18,19,17,19,17,18,19,17,
- 18,19,19,17,18,19,19,19,19,19,19,19,17,19,18,19,
- 19,19,18,19,14,13,14,14,14,14,14,14,16,15,15,15,
- 15,15,15,15,16,15,16,15,16,16,15,16,16,15,16,16,
- 16,15,16,17,16,16,17,16,16,18,19,16,17,17,16,17,
- 18,19,16,17,18,19,18,19,18,19,17,19,18,19,18,19,
- 19,19,19,17,19,18,19,19,18,19,19,18,19,19,19,19,
- 19,19,19,19,19,14,14,14,14,15,16,15,16,15,15,16,
- 16,15,15,15,15,17,16,17,16,15,15,16,15,15,15,16,
- 16,17,16,16,16,16,17,17,17,15,18,17,16,17,19,16,
- 17,19,16,18,19,18,18,19,18,16,18,17,18,17,18,19,
- 19,19,18,18,19,17,19,18,19,19,19,18,19,19,18,19,
- 19,19,19,19,19,19,14,14,14,14,15,14,15,14,15,15,
- 15,16,15,14,15,17,16,16,16,16,16,17,15,16,16,16,
- 16,16,17,16,16,16,17,16,16,17,17,16,15,17,17,18,
- 17,19,18,16,18,19,17,19,17,18,17,19,19,19,17,19,
- 18,19,19,19,19,17,19,19,18,19,19,19,19,18,19,19,
- 19,19,19,19,18,19,19,14,14,14,15,15,15,15,15,15,
- 16,17,15,15,16,15,15,15,15,16,16,18,15,17,16,16,
- 16,16,17,18,19,17,18,16,17,16,17,16,18,17,18,17,
- 19,17,17,19,19,17,17,19,18,17,19,17,19,17,19,19,
- 19,19,19,18,17,19,19,19,19,19,19,19,19,19,19,19,
- 18,19,19,19,19,19,19,19,14,14,15,15,16,15,16,15,
- 15,16,16,16,15,16,16,15,17,16,16,17,16,17,15,17,
- 16,18,16,17,16,16,17,15,16,18,16,17,16,16,17,17,
- 16,18,16,18,16,19,16,18,18,17,18,18,19,17,19,19,
- 19,19,18,19,19,19,18,19,19,19,19,19,19,19,19,19,
- 18,19,19,19,19,19,19,19,19,15,14,14,15,16,16,16,
- 15,15,15,15,15,15,16,15,16,16,17,17,16,16,16,16,
- 16,18,16,16,16,16,18,16,17,16,16,17,18,17,18,19,
- 19,17,17,19,18,18,18,17,19,17,18,19,18,17,19,19,
- 18,18,19,19,19,18,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19,19,18,18,19,19,19,15,14,14,15,15,15,
- 15,16,16,16,16,15,18,15,15,18,16,19,16,16,16,16,
- 17,16,17,17,16,16,16,17,16,18,16,17,16,18,17,18,
- 18,19,16,18,16,19,16,17,17,18,18,18,19,18,18,18,
- 18,19,19,18,18,19,19,19,19,18,19,19,19,19,19,19,
- 19,19,19,18,18,19,19,19,19,19,19,14,15,16,15,16,
- 15,15,16,16,15,16,17,16,16,17,16,17,17,18,17,17,
- 16,17,16,17,18,16,16,15,16,16,19,16,17,16,17,18,
- 18,17,17,17,18,16,18,17,19,17,17,17,18,19,19,19,
- 19,19,19,19,19,19,19,19,19,18,18,18,19,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,15,15,14,15,
- 15,15,15,16,15,15,17,16,16,16,18,17,17,16,16,18,
- 17,16,16,18,17,16,18,16,16,17,16,16,16,19,17,16,
- 18,17,17,19,17,18,18,18,17,19,17,18,18,19,19,19,
- 19,19,18,18,18,18,18,19,19,19,19,19,19,19,19,18,
- 19,19,18,19,19,19,18,19,19,19,19,19,19,15,15,15,
- 16,15,15,16,16,16,16,17,16,17,16,15,16,16,16,17,
- 16,17,17,16,17,16,16,18,16,18,18,17,17,16,17,16,
- 17,16,19,18,16,17,18,18,18,17,18,19,18,18,17,18,
- 18,19,19,19,19,19,19,19,19,19,19,19,18,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,16,15,
- 15,16,14,16,16,16,16,16,16,16,19,15,16,15,16,17,
- 16,16,16,17,16,17,16,17,18,17,17,18,16,19,17,17,
- 17,18,16,19,17,17,17,19,18,19,19,19,17,18,19,19,
- 18,19,19,19,19,19,19,18,19,19,18,19,17,19,19,19,
- 18,19,19,19,19,19,19,19,19,18,19,19,19,19,19,17,
- 15,15,16,16,16,17,15,17,16,16,17,17,17,17,15,16,
- 18,18,17,17,16,15,17,16,16,17,16,17,17,17,18,18,
- 17,18,19,19,19,18,19,19,19,19,18,18,19,18,19,19,
- 18,19,19,17,19,19,19,18,19,18,19,19,19,18,19,19,
- 19,19,18,19,19,19,19,19,19,19,19,19,18,19,19,19,
- 16,16,17,15,16,16,16,17,16,17,17,16,16,17,16,16,
- 16,18,18,17,16,17,17,18,18,17,18,18,17,17,18,19,
- 18,17,17,19,18,17,19,17,19,19,19,18,18,18,18,18,
- 19,19,19,19,18,19,18,18,19,19,19,19,19,18,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,16,15,16,15,15,16,18,17,16,17,17,17,16,19,17,
- 16,18,17,17,16,17,16,18,18,17,16,17,18,19,18,17,
- 18,17,17,19,19,18,18,18,19,18,19,18,19,17,18,18,
- 19,19,19,19,18,19,19,18,19,19,19,19,19,19,18,18,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,16,15,15,16,16,17,17,16,16,17,17,16,18,17,
- 18,18,16,16,17,19,17,18,17,16,17,18,18,16,16,17,
- 17,18,16,19,17,18,17,19,19,17,19,18,18,19,17,19,
- 18,18,18,19,19,19,19,19,19,18,18,17,17,19,19,19,
- 19,19,18,19,19,19,19,19,18,19,19,19,19,19,19,19,
- 19,19,19,19,16,15,17,15,16,15,16,16,17,17,16,17,
- 19,18,16,16,17,17,19,17,18,17,17,18,18,18,18,17,
- 19,18,18,17,19,17,18,17,17,18,19,18,18,19,19,18,
- 17,19,19,17,18,18,19,19,19,19,19,18,19,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19,16,16,16,15,15,16,17,16,16,16,18,16,
- 17,16,17,19,17,16,19,18,19,16,17,18,18,17,19,16,
- 17,19,17,18,18,19,18,19,17,19,18,18,18,19,18,18,
- 18,17,18,19,18,18,19,19,19,19,18,19,17,19,19,19,
- 17,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19,19,17,16,15,15,16,16,18,16,16,16,18,
- 17,16,17,17,19,17,17,17,16,17,18,19,19,18,17,17,
- 17,18,19,18,18,18,17,17,18,16,19,18,19,18,18,17,
- 19,18,19,18,18,17,19,18,17,19,19,19,19,18,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,18,19,19,19,
- 19,19,19,19,19,19,16,16,15,16,16,16,16,17,19,17,
- 17,17,17,19,16,17,17,17,18,17,19,18,19,17,17,19,
- 16,19,18,19,17,17,17,17,18,17,17,19,18,18,19,19,
- 18,17,18,18,18,19,18,18,17,19,19,19,19,19,19,19,
- 18,19,19,19,18,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19,19,19,19,17,15,16,16,19,17,17,19,18,
- 17,18,17,17,18,17,17,16,16,18,19,17,18,19,17,18,
- 17,18,17,18,18,18,19,17,17,17,18,17,18,18,19,19,
- 19,18,19,19,18,18,19,18,19,19,19,19,19,19,19,18,
- 19,19,19,18,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19,19,19,19,19,18,16,16,16,16,18,16,18,
- 17,17,17,16,19,16,18,17,17,16,18,18,19,18,18,17,
- 18,17,18,18,17,18,18,18,19,19,16,19,19,19,18,17,
- 19,18,19,19,19,19,19,18,19,18,19,19,19,19,17,19,
- 19,19,18,19,18,19,19,19,19,19,19,19,19,19,19,19,
- 19,18,19,19,19,19,19,19,19,19,18,16,16,16,17,19,
- 18,19,17,18,18,18,18,17,17,18,18,17,18,19,17,19,
- 17,19,18,18,19,19,19,18,19,19,19,18,19,18,19,18,
- 19,19,19,19,19,19,19,18,19,19,18,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,19,19,19,18,19,19,17,17,16,16,17,18,
- 19,17,18,18,17,19,17,18,18,18,17,17,17,17,18,19,
- 19,19,18,17,19,19,19,16,17,18,17,19,18,18,17,17,
- 17,18,18,18,19,17,18,19,18,19,18,19,19,19,19,19,
- 19,18,19,19,19,19,19,19,17,19,19,19,19,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,17,16,17,17,17,
- 17,19,18,17,17,18,18,19,18,18,19,18,19,19,18,18,
- 19,18,19,18,19,17,18,18,18,18,17,19,19,18,19,19,
- 19,19,17,17,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,18,18,19,19,19,19,19,18,19,19,18,19,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,18,16,17,16,
- 18,18,17,17,19,17,17,18,18,19,19,17,19,17,19,19,
- 19,18,18,19,17,19,17,18,19,17,18,18,19,17,19,18,
- 19,19,19,19,19,19,18,19,18,19,18,19,18,19,19,19,
- 18,19,19,19,18,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,18,19,19,19,19,19,19,19,19,19,17,16,17,
- 18,18,17,19,17,18,17,16,19,19,17,18,17,19,18,17,
- 19,18,19,19,19,18,19,19,19,18,18,19,19,19,19,19,
- 19,17,18,19,18,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,17,19,19,19,19,18,19,18,19,19,19,18,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,18,17,
- 17,18,18,18,18,17,18,18,18,17,18,19,18,19,19,19,
- 19,17,17,17,19,18,18,19,19,19,19,19,18,19,18,19,
- 19,19,19,19,18,18,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19,18,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19,19,19,19,19,18,19,19,19,19,19,19,18,
- 17,17,18,19,18,18,17,18,18,17,18,19,16,18,19,19,
- 19,18,18,18,19,18,19,19,19,19,19,19,19,18,18,19,
- 19,18,17,19,19,19,19,19,19,19,19,18,19,19,19,19,
- 19,19,19,19,19,19,19,17,19,19,19,18,19,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 16,17,16,16,18,18,17,19,19,18,17,17,16,18,19,17,
- 17,19,18,18,19,19,19,19,18,19,18,19,19,18,19,19,
- 18,19,18,19,18,19,18,19,19,19,19,19,18,19,19,19,
- 19,19,19,19,18,19,18,19,19,19,19,19,19,19,19,18,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,18,19,19,
- 19,18,16,18,18,19,17,19,17,18,18,17,19,19,18,19,
- 19,19,19,18,18,19,17,18,19,19,19,18,19,19,19,19,
- 18,17,18,19,19,19,19,19,18,19,19,19,19,18,19,19,
- 19,19,19,18,19,18,19,19,19,19,19,18,19,19,19,18,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,18,17,18,17,19,18,18,19,16,18,18,19,19,17,
- 17,18,19,19,18,19,19,18,18,19,19,19,19,19,19,18,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,18,19,18,19,19,19,19,19,18,19,19,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,17,18,17,18,18,18,17,17,18,18,19,18,19,
- 17,18,19,19,17,17,19,19,17,19,17,18,19,19,18,19,
- 19,19,19,19,19,18,18,19,19,19,19,19,19,19,19,19,
- 19,18,19,18,19,19,19,19,19,19,18,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,17,18,16,16,18,18,17,18,17,19,17,19,
- 19,18,19,19,18,19,19,19,19,19,19,19,18,18,19,19,
- 19,18,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19,19,19,18,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,
- 19,19,19,19,19,18,19,18,19,17,17,17,19,19,18,19,
- 17,19,18,19,19,19,19,19,19,19,19,19,18,19,19,19,
- 18,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,18,19,19,19,18,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,19,19,19,19,19,19,16,19,19,19,17,19,17,19,17,
- 19,19,18,19,19,19,19,19,19,17,19,19,19,18,19,19,
- 19,19,19,19,18,19,18,19,19,19,19,19,19,19,18,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,19,19,19,19,19,19,19,19,
- 19,19,19,19,19,19,19,18,18,19,19,18,18,18,19,17,
- 19,17,19,19,19,19,18,18,18,18,19,19,19,19,18,19,
- 19,19,18,19,19,19,19,18,19,19,19,18,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,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19,19,19,19,19,19,18,19,19,17,19,18,17,
- 19,17,19,19,19,19,19,19,19,19,18,17,19,18,19,19,
- 17,19,19,19,18,19,19,19,18,19,19,19,18,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,18,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,19,19,19,19,18,18,18,18,19,18,
- 17,18,18,18,18,19,19,19,19,18,17,19,19,19,18,19,
- 19,19,18,19,19,19,19,19,19,19,19,18,19,18,19,19,
- 19,19,17,18,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,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,17,18,17,18,19,19,
- 19,19,19,18,19,18,19,19,19,19,18,19,18,19,18,19,
- 18,19,19,19,19,19,19,18,19,19,19,17,19,19,19,19,
- 19,19,19,18,19,19,18,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,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,17,19,18,
- 19,19,19,19,19,19,18,19,19,19,18,17,19,18,18,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,18,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,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,18,19,19,17,
- 19,18,18,19,19,19,18,19,18,19,18,19,18,19,19,19,
- 19,19,19,19,19,19,19,19,19,18,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,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,19,19,18,17,
- 19,19,19,19,18,18,19,19,18,19,19,19,19,18,19,19,
- 19,18,19,19,19,19,18,19,19,19,19,19,19,19,18,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,19,19,19,19,19,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,17,
- 17,19,19,19,19,19,18,19,19,19,19,19,19,19,19,19,
- 19,18,19,19,19,19,18,19,19,19,19,19,19,19,19,19,
- 18,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,19,19,19,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 18,18,18,19,18,19,19,19,19,19,19,18,19,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,19,19,18,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,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,19,19,18,18,19,19,18,18,19,19,19,19,18,19,19,
- 18,19,18,18,19,19,18,19,19,19,19,19,19,19,19,19,
- 19,19,18,19,19,19,19,19,18,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,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,
-};
-
-static float _vq_quantthresh_res0_256_128_4[] = {
- -39.5, -38.5, -37.5, -36.5, -35.5, -34.5, -33.5, -32.5,
- -31.5, -30.5, -29.5, -28.5, -27.5, -26.5, -25.5, -24.5,
- -23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5,
- -15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5,
- -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5,
- 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5,
- 8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 14.5, 15.5,
- 16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5,
- 24.5, 25.5, 26.5, 27.5, 28.5, 29.5, 30.5, 31.5,
- 32.5, 33.5, 34.5, 35.5, 36.5, 37.5, 38.5, 39.5,
-};
-
-static long _vq_quantmap_res0_256_128_4[] = {
- 79, 77, 75, 73, 71, 69, 67, 65,
- 63, 61, 59, 57, 55, 53, 51, 49,
- 47, 45, 43, 41, 39, 37, 35, 33,
- 31, 29, 27, 25, 23, 21, 19, 17,
- 15, 13, 11, 9, 7, 5, 3, 1,
- 0, 2, 4, 6, 8, 10, 12, 14,
- 16, 18, 20, 22, 24, 26, 28, 30,
- 32, 34, 36, 38, 40, 42, 44, 46,
- 48, 50, 52, 54, 56, 58, 60, 62,
- 64, 66, 68, 70, 72, 74, 76, 78,
- 80,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_256_128_4 = {
- _vq_quantthresh_res0_256_128_4,
- _vq_quantmap_res0_256_128_4,
- 81,
- 81
-};
-
-static static_codebook _vq_book_res0_256_128_4 = {
- 2, 6561,
- _vq_lengthlist_res0_256_128_4,
- 1, -525074432, 1611661312, 7, 0,
- _vq_quantlist_res0_256_128_4,
- NULL,
- &_vq_auxt_res0_256_128_4,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_256_128_5.vqh b/lib/books/res0_256_128_5.vqh
deleted file mode 100644
index b98fd652..00000000
--- a/lib/books/res0_256_128_5.vqh
+++ /dev/null
@@ -1,580 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_256_128_5_VQH_
-#define _V_res0_256_128_5_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_256_128_5[] = {
- 200,
- 199,
- 201,
- 198,
- 202,
- 197,
- 203,
- 196,
- 204,
- 195,
- 205,
- 194,
- 206,
- 193,
- 207,
- 192,
- 208,
- 191,
- 209,
- 190,
- 210,
- 189,
- 211,
- 188,
- 212,
- 187,
- 213,
- 186,
- 214,
- 185,
- 215,
- 184,
- 216,
- 183,
- 217,
- 182,
- 218,
- 181,
- 219,
- 180,
- 220,
- 179,
- 221,
- 178,
- 222,
- 177,
- 223,
- 176,
- 224,
- 175,
- 225,
- 174,
- 226,
- 173,
- 227,
- 172,
- 228,
- 171,
- 229,
- 170,
- 230,
- 169,
- 231,
- 168,
- 232,
- 167,
- 233,
- 166,
- 234,
- 165,
- 235,
- 164,
- 236,
- 163,
- 237,
- 162,
- 238,
- 161,
- 239,
- 160,
- 240,
- 159,
- 241,
- 158,
- 242,
- 157,
- 243,
- 156,
- 244,
- 155,
- 245,
- 154,
- 246,
- 153,
- 247,
- 152,
- 248,
- 151,
- 249,
- 150,
- 250,
- 149,
- 251,
- 148,
- 252,
- 147,
- 253,
- 146,
- 254,
- 145,
- 255,
- 144,
- 256,
- 143,
- 257,
- 142,
- 258,
- 141,
- 259,
- 140,
- 260,
- 139,
- 261,
- 138,
- 262,
- 137,
- 263,
- 136,
- 264,
- 135,
- 265,
- 134,
- 266,
- 133,
- 267,
- 132,
- 268,
- 131,
- 269,
- 130,
- 270,
- 129,
- 271,
- 128,
- 272,
- 127,
- 273,
- 126,
- 274,
- 125,
- 275,
- 124,
- 276,
- 123,
- 277,
- 122,
- 278,
- 121,
- 279,
- 120,
- 280,
- 119,
- 281,
- 118,
- 282,
- 117,
- 283,
- 116,
- 284,
- 115,
- 285,
- 114,
- 286,
- 113,
- 287,
- 112,
- 288,
- 111,
- 289,
- 110,
- 290,
- 109,
- 291,
- 108,
- 292,
- 107,
- 293,
- 106,
- 294,
- 105,
- 295,
- 104,
- 296,
- 103,
- 297,
- 102,
- 298,
- 101,
- 299,
- 100,
- 300,
- 99,
- 301,
- 98,
- 302,
- 97,
- 303,
- 96,
- 304,
- 95,
- 305,
- 94,
- 306,
- 93,
- 307,
- 92,
- 308,
- 91,
- 309,
- 90,
- 310,
- 89,
- 311,
- 88,
- 312,
- 87,
- 313,
- 86,
- 314,
- 85,
- 315,
- 84,
- 316,
- 83,
- 317,
- 82,
- 318,
- 81,
- 319,
- 80,
- 320,
- 79,
- 321,
- 78,
- 322,
- 77,
- 323,
- 76,
- 324,
- 75,
- 325,
- 74,
- 326,
- 73,
- 327,
- 72,
- 328,
- 71,
- 329,
- 70,
- 330,
- 69,
- 331,
- 68,
- 332,
- 67,
- 333,
- 66,
- 334,
- 65,
- 335,
- 64,
- 336,
- 63,
- 337,
- 62,
- 338,
- 61,
- 339,
- 60,
- 340,
- 59,
- 341,
- 58,
- 342,
- 57,
- 343,
- 56,
- 344,
- 55,
- 345,
- 54,
- 346,
- 53,
- 347,
- 52,
- 348,
- 51,
- 349,
- 50,
- 350,
- 49,
- 351,
- 48,
- 352,
- 47,
- 353,
- 46,
- 354,
- 45,
- 355,
- 44,
- 356,
- 43,
- 357,
- 42,
- 358,
- 41,
- 359,
- 40,
- 360,
- 39,
- 361,
- 38,
- 362,
- 37,
- 363,
- 36,
- 364,
- 35,
- 365,
- 34,
- 366,
- 33,
- 367,
- 32,
- 368,
- 31,
- 369,
- 30,
- 370,
- 29,
- 371,
- 28,
- 372,
- 27,
- 373,
- 26,
- 374,
- 25,
- 375,
- 24,
- 376,
- 23,
- 377,
- 22,
- 378,
- 21,
- 379,
- 20,
- 380,
- 19,
- 381,
- 18,
- 382,
- 17,
- 383,
- 16,
- 384,
- 15,
- 385,
- 14,
- 386,
- 13,
- 387,
- 12,
- 388,
- 11,
- 389,
- 10,
- 390,
- 9,
- 391,
- 8,
- 392,
- 7,
- 393,
- 6,
- 394,
- 5,
- 395,
- 4,
- 396,
- 3,
- 397,
- 2,
- 398,
- 1,
- 399,
- 0,
- 400,
-};
-
-static long _vq_lengthlist_res0_256_128_5[] = {
- 4, 3, 3, 4, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6,
- 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8,
- 8, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,
- 10,10,10,10,10,10,10,11,12,12,11,11,11,11,11,12,
- 12,13,13,12,13,12,12,12,11,13,12,13,12,13,13,12,
- 13, 8, 9, 8,10, 9, 9, 9, 9, 9,10, 9,10, 9,10, 9,
- 11, 9,10,10,11,10,11,10,11,10,11,11,11,10,12,10,
- 11,10,12,11,12,11,11,11,12,11,12,12,12,11,12,11,
- 12,12,12,13,12,12,12,11,12,11,12,12,14,12,13,12,
- 13,11,13,13,12,12,14,12,14,13,13,12,13,13,13,12,
- 14,12,13,13,14,13,14,13,14,13,13,12,14,14,14,14,
- 13,13,14,13,13,13,13,14,14,12,13,13,14,14,13,13,
- 13,14,14,13,13,14,14,13,13,13,13,13,13,14,13,13,
- 13,14,13,13,13,14,13,14,14,14,14,13,14,13,13,13,
- 13,13,14,14,14,14,14,13,14,13,13,14,14,13,13,13,
- 14,14,14,13,14,14,14,14,14,14,14,14,14,13,14,14,
- 14,14,14,14,14,14,14,14,13,14,13,13,14,14,14,14,
- 14,13,13,14,14,13,14,14,14,14,14,13,14,14,14,14,
- 14,14,14,14,14,13,14,14,14,14,14,13,14,14,14,14,
- 14,13,14,14,14,14,14,14,14,14,14,13,14,14,14,14,
- 14,14,14,14,14,14,14,13,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,13,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_res0_256_128_5[] = {
- -199.5, -198.5, -197.5, -196.5, -195.5, -194.5, -193.5, -192.5,
- -191.5, -190.5, -189.5, -188.5, -187.5, -186.5, -185.5, -184.5,
- -183.5, -182.5, -181.5, -180.5, -179.5, -178.5, -177.5, -176.5,
- -175.5, -174.5, -173.5, -172.5, -171.5, -170.5, -169.5, -168.5,
- -167.5, -166.5, -165.5, -164.5, -163.5, -162.5, -161.5, -160.5,
- -159.5, -158.5, -157.5, -156.5, -155.5, -154.5, -153.5, -152.5,
- -151.5, -150.5, -149.5, -148.5, -147.5, -146.5, -145.5, -144.5,
- -143.5, -142.5, -141.5, -140.5, -139.5, -138.5, -137.5, -136.5,
- -135.5, -134.5, -133.5, -132.5, -131.5, -130.5, -129.5, -128.5,
- -127.5, -126.5, -125.5, -124.5, -123.5, -122.5, -121.5, -120.5,
- -119.5, -118.5, -117.5, -116.5, -115.5, -114.5, -113.5, -112.5,
- -111.5, -110.5, -109.5, -108.5, -107.5, -106.5, -105.5, -104.5,
- -103.5, -102.5, -101.5, -100.5, -99.5, -98.5, -97.5, -96.5,
- -95.5, -94.5, -93.5, -92.5, -91.5, -90.5, -89.5, -88.5,
- -87.5, -86.5, -85.5, -84.5, -83.5, -82.5, -81.5, -80.5,
- -79.5, -78.5, -77.5, -76.5, -75.5, -74.5, -73.5, -72.5,
- -71.5, -70.5, -69.5, -68.5, -67.5, -66.5, -65.5, -64.5,
- -63.5, -62.5, -61.5, -60.5, -59.5, -58.5, -57.5, -56.5,
- -55.5, -54.5, -53.5, -52.5, -51.5, -50.5, -49.5, -48.5,
- -47.5, -46.5, -45.5, -44.5, -43.5, -42.5, -41.5, -40.5,
- -39.5, -38.5, -37.5, -36.5, -35.5, -34.5, -33.5, -32.5,
- -31.5, -30.5, -29.5, -28.5, -27.5, -26.5, -25.5, -24.5,
- -23.5, -22.5, -21.5, -20.5, -19.5, -18.5, -17.5, -16.5,
- -15.5, -14.5, -13.5, -12.5, -11.5, -10.5, -9.5, -8.5,
- -7.5, -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5,
- 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5,
- 8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 14.5, 15.5,
- 16.5, 17.5, 18.5, 19.5, 20.5, 21.5, 22.5, 23.5,
- 24.5, 25.5, 26.5, 27.5, 28.5, 29.5, 30.5, 31.5,
- 32.5, 33.5, 34.5, 35.5, 36.5, 37.5, 38.5, 39.5,
- 40.5, 41.5, 42.5, 43.5, 44.5, 45.5, 46.5, 47.5,
- 48.5, 49.5, 50.5, 51.5, 52.5, 53.5, 54.5, 55.5,
- 56.5, 57.5, 58.5, 59.5, 60.5, 61.5, 62.5, 63.5,
- 64.5, 65.5, 66.5, 67.5, 68.5, 69.5, 70.5, 71.5,
- 72.5, 73.5, 74.5, 75.5, 76.5, 77.5, 78.5, 79.5,
- 80.5, 81.5, 82.5, 83.5, 84.5, 85.5, 86.5, 87.5,
- 88.5, 89.5, 90.5, 91.5, 92.5, 93.5, 94.5, 95.5,
- 96.5, 97.5, 98.5, 99.5, 100.5, 101.5, 102.5, 103.5,
- 104.5, 105.5, 106.5, 107.5, 108.5, 109.5, 110.5, 111.5,
- 112.5, 113.5, 114.5, 115.5, 116.5, 117.5, 118.5, 119.5,
- 120.5, 121.5, 122.5, 123.5, 124.5, 125.5, 126.5, 127.5,
- 128.5, 129.5, 130.5, 131.5, 132.5, 133.5, 134.5, 135.5,
- 136.5, 137.5, 138.5, 139.5, 140.5, 141.5, 142.5, 143.5,
- 144.5, 145.5, 146.5, 147.5, 148.5, 149.5, 150.5, 151.5,
- 152.5, 153.5, 154.5, 155.5, 156.5, 157.5, 158.5, 159.5,
- 160.5, 161.5, 162.5, 163.5, 164.5, 165.5, 166.5, 167.5,
- 168.5, 169.5, 170.5, 171.5, 172.5, 173.5, 174.5, 175.5,
- 176.5, 177.5, 178.5, 179.5, 180.5, 181.5, 182.5, 183.5,
- 184.5, 185.5, 186.5, 187.5, 188.5, 189.5, 190.5, 191.5,
- 192.5, 193.5, 194.5, 195.5, 196.5, 197.5, 198.5, 199.5,
-};
-
-static long _vq_quantmap_res0_256_128_5[] = {
- 399, 397, 395, 393, 391, 389, 387, 385,
- 383, 381, 379, 377, 375, 373, 371, 369,
- 367, 365, 363, 361, 359, 357, 355, 353,
- 351, 349, 347, 345, 343, 341, 339, 337,
- 335, 333, 331, 329, 327, 325, 323, 321,
- 319, 317, 315, 313, 311, 309, 307, 305,
- 303, 301, 299, 297, 295, 293, 291, 289,
- 287, 285, 283, 281, 279, 277, 275, 273,
- 271, 269, 267, 265, 263, 261, 259, 257,
- 255, 253, 251, 249, 247, 245, 243, 241,
- 239, 237, 235, 233, 231, 229, 227, 225,
- 223, 221, 219, 217, 215, 213, 211, 209,
- 207, 205, 203, 201, 199, 197, 195, 193,
- 191, 189, 187, 185, 183, 181, 179, 177,
- 175, 173, 171, 169, 167, 165, 163, 161,
- 159, 157, 155, 153, 151, 149, 147, 145,
- 143, 141, 139, 137, 135, 133, 131, 129,
- 127, 125, 123, 121, 119, 117, 115, 113,
- 111, 109, 107, 105, 103, 101, 99, 97,
- 95, 93, 91, 89, 87, 85, 83, 81,
- 79, 77, 75, 73, 71, 69, 67, 65,
- 63, 61, 59, 57, 55, 53, 51, 49,
- 47, 45, 43, 41, 39, 37, 35, 33,
- 31, 29, 27, 25, 23, 21, 19, 17,
- 15, 13, 11, 9, 7, 5, 3, 1,
- 0, 2, 4, 6, 8, 10, 12, 14,
- 16, 18, 20, 22, 24, 26, 28, 30,
- 32, 34, 36, 38, 40, 42, 44, 46,
- 48, 50, 52, 54, 56, 58, 60, 62,
- 64, 66, 68, 70, 72, 74, 76, 78,
- 80, 82, 84, 86, 88, 90, 92, 94,
- 96, 98, 100, 102, 104, 106, 108, 110,
- 112, 114, 116, 118, 120, 122, 124, 126,
- 128, 130, 132, 134, 136, 138, 140, 142,
- 144, 146, 148, 150, 152, 154, 156, 158,
- 160, 162, 164, 166, 168, 170, 172, 174,
- 176, 178, 180, 182, 184, 186, 188, 190,
- 192, 194, 196, 198, 200, 202, 204, 206,
- 208, 210, 212, 214, 216, 218, 220, 222,
- 224, 226, 228, 230, 232, 234, 236, 238,
- 240, 242, 244, 246, 248, 250, 252, 254,
- 256, 258, 260, 262, 264, 266, 268, 270,
- 272, 274, 276, 278, 280, 282, 284, 286,
- 288, 290, 292, 294, 296, 298, 300, 302,
- 304, 306, 308, 310, 312, 314, 316, 318,
- 320, 322, 324, 326, 328, 330, 332, 334,
- 336, 338, 340, 342, 344, 346, 348, 350,
- 352, 354, 356, 358, 360, 362, 364, 366,
- 368, 370, 372, 374, 376, 378, 380, 382,
- 384, 386, 388, 390, 392, 394, 396, 398,
- 400,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_256_128_5 = {
- _vq_quantthresh_res0_256_128_5,
- _vq_quantmap_res0_256_128_5,
- 401,
- 401
-};
-
-static static_codebook _vq_book_res0_256_128_5 = {
- 1, 401,
- _vq_lengthlist_res0_256_128_5,
- 1, -520552448, 1611661312, 9, 0,
- _vq_quantlist_res0_256_128_5,
- NULL,
- &_vq_auxt_res0_256_128_5,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_256_128aux.vqh b/lib/books/res0_256_128aux.vqh
deleted file mode 100644
index 58315e34..00000000
--- a/lib/books/res0_256_128aux.vqh
+++ /dev/null
@@ -1,39 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- * *
- ********************************************************************
-
- function: static codebook autogenerated by huff/huffbuld
-
- ********************************************************************/
-
-#ifndef _V_res0_256_128aux_VQH_
-#define _V_res0_256_128aux_VQH_
-#include "codebook.h"
-
-static long _huff_lengthlist_res0_256_128aux[] = {
- 4, 8,11,11,11,16, 4, 4, 7, 8,10,15, 7, 5, 5, 4,
- 7,15, 7, 4, 4, 3, 5,16, 9, 7, 5, 2, 4,13,16,12,
- 10, 7, 9,16,
-};
-
-static static_codebook _huff_book_res0_256_128aux = {
- 2, 36,
- _huff_lengthlist_res0_256_128aux,
- 0, 0, 0, 0, 0,
- NULL,
- NULL,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_350_1024_7.vqh b/lib/books/res0_350_1024_7.vqh
deleted file mode 100644
index ac3add60..00000000
--- a/lib/books/res0_350_1024_7.vqh
+++ /dev/null
@@ -1,868 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_350_1024_7_VQH_
-#define _V_res0_350_1024_7_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_350_1024_7[] = {
- 310,
- 309,
- 311,
- 308,
- 312,
- 307,
- 313,
- 306,
- 314,
- 305,
- 315,
- 304,
- 316,
- 303,
- 317,
- 302,
- 318,
- 301,
- 319,
- 300,
- 320,
- 299,
- 321,
- 298,
- 322,
- 297,
- 323,
- 296,
- 324,
- 295,
- 325,
- 294,
- 326,
- 293,
- 327,
- 292,
- 328,
- 291,
- 329,
- 290,
- 330,
- 289,
- 331,
- 288,
- 332,
- 287,
- 333,
- 286,
- 334,
- 285,
- 335,
- 284,
- 336,
- 283,
- 337,
- 282,
- 338,
- 281,
- 339,
- 280,
- 340,
- 279,
- 341,
- 278,
- 342,
- 277,
- 343,
- 276,
- 344,
- 275,
- 345,
- 274,
- 346,
- 273,
- 347,
- 272,
- 348,
- 271,
- 349,
- 270,
- 350,
- 269,
- 351,
- 268,
- 352,
- 267,
- 353,
- 266,
- 354,
- 265,
- 355,
- 264,
- 356,
- 263,
- 357,
- 262,
- 358,
- 261,
- 359,
- 260,
- 360,
- 259,
- 361,
- 258,
- 362,
- 257,
- 363,
- 256,
- 364,
- 255,
- 365,
- 254,
- 366,
- 253,
- 367,
- 252,
- 368,
- 251,
- 369,
- 250,
- 370,
- 249,
- 371,
- 248,
- 372,
- 247,
- 373,
- 246,
- 374,
- 245,
- 375,
- 244,
- 376,
- 243,
- 377,
- 242,
- 378,
- 241,
- 379,
- 240,
- 380,
- 239,
- 381,
- 238,
- 382,
- 237,
- 383,
- 236,
- 384,
- 235,
- 385,
- 234,
- 386,
- 233,
- 387,
- 232,
- 388,
- 231,
- 389,
- 230,
- 390,
- 229,
- 391,
- 228,
- 392,
- 227,
- 393,
- 226,
- 394,
- 225,
- 395,
- 224,
- 396,
- 223,
- 397,
- 222,
- 398,
- 221,
- 399,
- 220,
- 400,
- 219,
- 401,
- 218,
- 402,
- 217,
- 403,
- 216,
- 404,
- 215,
- 405,
- 214,
- 406,
- 213,
- 407,
- 212,
- 408,
- 211,
- 409,
- 210,
- 410,
- 209,
- 411,
- 208,
- 412,
- 207,
- 413,
- 206,
- 414,
- 205,
- 415,
- 204,
- 416,
- 203,
- 417,
- 202,
- 418,
- 201,
- 419,
- 200,
- 420,
- 199,
- 421,
- 198,
- 422,
- 197,
- 423,
- 196,
- 424,
- 195,
- 425,
- 194,
- 426,
- 193,
- 427,
- 192,
- 428,
- 191,
- 429,
- 190,
- 430,
- 189,
- 431,
- 188,
- 432,
- 187,
- 433,
- 186,
- 434,
- 185,
- 435,
- 184,
- 436,
- 183,
- 437,
- 182,
- 438,
- 181,
- 439,
- 180,
- 440,
- 179,
- 441,
- 178,
- 442,
- 177,
- 443,
- 176,
- 444,
- 175,
- 445,
- 174,
- 446,
- 173,
- 447,
- 172,
- 448,
- 171,
- 449,
- 170,
- 450,
- 169,
- 451,
- 168,
- 452,
- 167,
- 453,
- 166,
- 454,
- 165,
- 455,
- 164,
- 456,
- 163,
- 457,
- 162,
- 458,
- 161,
- 459,
- 160,
- 460,
- 159,
- 461,
- 158,
- 462,
- 157,
- 463,
- 156,
- 464,
- 155,
- 465,
- 154,
- 466,
- 153,
- 467,
- 152,
- 468,
- 151,
- 469,
- 150,
- 470,
- 149,
- 471,
- 148,
- 472,
- 147,
- 473,
- 146,
- 474,
- 145,
- 475,
- 144,
- 476,
- 143,
- 477,
- 142,
- 478,
- 141,
- 479,
- 140,
- 480,
- 139,
- 481,
- 138,
- 482,
- 137,
- 483,
- 136,
- 484,
- 135,
- 485,
- 134,
- 486,
- 133,
- 487,
- 132,
- 488,
- 131,
- 489,
- 130,
- 490,
- 129,
- 491,
- 128,
- 492,
- 127,
- 493,
- 126,
- 494,
- 125,
- 495,
- 124,
- 496,
- 123,
- 497,
- 122,
- 498,
- 121,
- 499,
- 120,
- 500,
- 119,
- 501,
- 118,
- 502,
- 117,
- 503,
- 116,
- 504,
- 115,
- 505,
- 114,
- 506,
- 113,
- 507,
- 112,
- 508,
- 111,
- 509,
- 110,
- 510,
- 109,
- 511,
- 108,
- 512,
- 107,
- 513,
- 106,
- 514,
- 105,
- 515,
- 104,
- 516,
- 103,
- 517,
- 102,
- 518,
- 101,
- 519,
- 100,
- 520,
- 99,
- 521,
- 98,
- 522,
- 97,
- 523,
- 96,
- 524,
- 95,
- 525,
- 94,
- 526,
- 93,
- 527,
- 92,
- 528,
- 91,
- 529,
- 90,
- 530,
- 89,
- 531,
- 88,
- 532,
- 87,
- 533,
- 86,
- 534,
- 85,
- 535,
- 84,
- 536,
- 83,
- 537,
- 82,
- 538,
- 81,
- 539,
- 80,
- 540,
- 79,
- 541,
- 78,
- 542,
- 77,
- 543,
- 76,
- 544,
- 75,
- 545,
- 74,
- 546,
- 73,
- 547,
- 72,
- 548,
- 71,
- 549,
- 70,
- 550,
- 69,
- 551,
- 68,
- 552,
- 67,
- 553,
- 66,
- 554,
- 65,
- 555,
- 64,
- 556,
- 63,
- 557,
- 62,
- 558,
- 61,
- 559,
- 60,
- 560,
- 59,
- 561,
- 58,
- 562,
- 57,
- 563,
- 56,
- 564,
- 55,
- 565,
- 54,
- 566,
- 53,
- 567,
- 52,
- 568,
- 51,
- 569,
- 50,
- 570,
- 49,
- 571,
- 48,
- 572,
- 47,
- 573,
- 46,
- 574,
- 45,
- 575,
- 44,
- 576,
- 43,
- 577,
- 42,
- 578,
- 41,
- 579,
- 40,
- 580,
- 39,
- 581,
- 38,
- 582,
- 37,
- 583,
- 36,
- 584,
- 35,
- 585,
- 34,
- 586,
- 33,
- 587,
- 32,
- 588,
- 31,
- 589,
- 30,
- 590,
- 29,
- 591,
- 28,
- 592,
- 27,
- 593,
- 26,
- 594,
- 25,
- 595,
- 24,
- 596,
- 23,
- 597,
- 22,
- 598,
- 21,
- 599,
- 20,
- 600,
- 19,
- 601,
- 18,
- 602,
- 17,
- 603,
- 16,
- 604,
- 15,
- 605,
- 14,
- 606,
- 13,
- 607,
- 12,
- 608,
- 11,
- 609,
- 10,
- 610,
- 9,
- 611,
- 8,
- 612,
- 7,
- 613,
- 6,
- 614,
- 5,
- 615,
- 4,
- 616,
- 3,
- 617,
- 2,
- 618,
- 1,
- 619,
- 0,
- 620,
-};
-
-static long _vq_lengthlist_res0_350_1024_7[] = {
- 3, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 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, 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,10, 9,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,10,11,10,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,13,12,12,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,14,14,13,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,
- 15,14,15,15,15,14,15,15,15,15,15,14,15,15,15,15,
- 15,15,15,15,15,15,15,15,15,15,16,15,15,16,16,16,
- 16,15,15,15,16,16,16,16,16,16,16,16,16,16,15,15,
- 16,16,16,16,16,16,16,16,16,16,16,16,16,17,16,16,
- 16,16,16,16,16,16,16,16,16,16,17,16,16,17,16,17,
- 16,16,17,17,17,17,16,17,18,18,17,17,17,17,16,17,
- 18,18,18,17,18,17,17,17,17,17,17,18,17,17,18,17,
- 17,18,18,19,18,17,19,19,18,17,18,18,17,18,18,18,
- 19,18,18,18,18,18,18,18,19,18,18,18,18,18,18,19,
- 18,18,19,18,18,19,20,18,19,18,18,18,18,18,19,18,
- 19,19,20,20,18,20,18,18,19,20,18,19,21,19,19,19,
- 20,20,20,19,20,19,18,21,20,20,19,20,20,21,21,20,
- 19,21,21,20,20,20,21,21,21,20,20,21,21,20,21,21,
- 21,21,21,21,19,21,20,21,20,21,21,20,20,20,21,21,
- 21,21,21,20,21,21,21,21,21,21,21,21,20,21,20,21,
- 21,21,21,20,21,21,19,21,21,21,21,21,21,21,21,21,
- 21,20,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
- 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
- 21,21,20,20,21,21,21,20,21,21,20,21,21,21,21,21,
- 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
- 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
- 21,21,21,21,21,21,21,21,21,21,21,21,21,20,21,21,
- 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
- 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
- 21,21,21,21,21,21,21,21,20,21,21,21,21,21,21,20,
- 21,21,21,21,21,21,21,21,21,21,20,20,20,
-};
-
-static float _vq_quantthresh_res0_350_1024_7[] = {
- -309.5, -308.5, -307.5, -306.5, -305.5, -304.5, -303.5, -302.5,
- -301.5, -300.5, -299.5, -298.5, -297.5, -296.5, -295.5, -294.5,
- -293.5, -292.5, -291.5, -290.5, -289.5, -288.5, -287.5, -286.5,
- -285.5, -284.5, -283.5, -282.5, -281.5, -280.5, -279.5, -278.5,
- -277.5, -276.5, -275.5, -274.5, -273.5, -272.5, -271.5, -270.5,
- -269.5, -268.5, -267.5, -266.5, -265.5, -264.5, -263.5, -262.5,
- -261.5, -260.5, -259.5, -258.5, -257.5, -256.5, -255.5, -254.5,
- -253.5, -252.5, -251.5, -250.5, -249.5, -248.5, -247.5, -246.5,
- -245.5, -244.5, -243.5, -242.5, -241.5, -240.5, -239.5, -238.5,
- -237.5, -236.5, -235.5, -234.5, -233.5, -232.5, -231.5, -230.5,
- -229.5, -228.5, -227.5, -226.5, -225.5, -224.5, -223.5, -222.5,
- -221.5, -220.5, -219.5, -218.5, -217.5, -216.5, -215.5, -214.5,
- -213.5, -212.5, -211.5, -210.5, -209.5, -208.5, -207.5, -206.5,
- -205.5, -204.5, -203.5, -202.5, -201.5, -200.5, -199.5, -198.5,
- -197.5, -196.5, -195.5, -194.5, -193.5, -192.5, -191.5, -190.5,
- -189.5, -188.5, -187.5, -186.5, -185.5, -184.5, -183.5, -182.5,
- -181.5, -180.5, -179.5, -178.5, -177.5, -176.5, -175.5, -174.5,
- -173.5, -172.5, -171.5, -170.5, -169.5, -168.5, -167.5, -166.5,
- -165.5, -164.5, -163.5, -162.5, -161.5, -160.5, -159.5, -158.5,
- -157.5, -156.5, -155.5, -154.5, -153.5, -152.5, -151.5, -150.5,
- -149.5, -148.5, -147.5, -146.5, -145.5, -144.5, -143.5, -142.5,
- -141.5, -140.5, -139.5, -138.5, -137.5, -136.5, -135.5, -134.5,
- -133.5, -132.5, -131.5, -130.5, -129.5, -128.5, -127.5, -126.5,
- -125.5, -124.5, -123.5, -122.5, -121.5, -120.5, -119.5, -118.5,
- -117.5, -116.5, -115.5, -114.5, -113.5, -112.5, -111.5, -110.5,
- -109.5, -108.5, -107.5, -106.5, -105.5, -104.5, -103.5, -102.5,
- -101.5, -100.5, -99.5, -98.5, -97.5, -96.5, -95.5, -94.5,
- -93.5, -92.5, -91.5, -90.5, -89.5, -88.5, -87.5, -86.5,
- -85.5, -84.5, -83.5, -82.5, -81.5, -80.5, -79.5, -78.5,
- -77.5, -76.5, -75.5, -74.5, -73.5, -72.5, -71.5, -70.5,
- -69.5, -68.5, -67.5, -66.5, -65.5, -64.5, -63.5, -62.5,
- -61.5, -60.5, -59.5, -58.5, -57.5, -56.5, -55.5, -54.5,
- -53.5, -52.5, -51.5, -50.5, -49.5, -48.5, -47.5, -46.5,
- -45.5, -44.5, -43.5, -42.5, -41.5, -40.5, -39.5, -38.5,
- -37.5, -36.5, -35.5, -34.5, -33.5, -32.5, -31.5, -30.5,
- -29.5, -28.5, -27.5, -26.5, -25.5, -24.5, -23.5, -22.5,
- -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, -15.5, -14.5,
- -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, -7.5, -6.5,
- -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5,
- 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5,
- 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 16.5, 17.5,
- 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 24.5, 25.5,
- 26.5, 27.5, 28.5, 29.5, 30.5, 31.5, 32.5, 33.5,
- 34.5, 35.5, 36.5, 37.5, 38.5, 39.5, 40.5, 41.5,
- 42.5, 43.5, 44.5, 45.5, 46.5, 47.5, 48.5, 49.5,
- 50.5, 51.5, 52.5, 53.5, 54.5, 55.5, 56.5, 57.5,
- 58.5, 59.5, 60.5, 61.5, 62.5, 63.5, 64.5, 65.5,
- 66.5, 67.5, 68.5, 69.5, 70.5, 71.5, 72.5, 73.5,
- 74.5, 75.5, 76.5, 77.5, 78.5, 79.5, 80.5, 81.5,
- 82.5, 83.5, 84.5, 85.5, 86.5, 87.5, 88.5, 89.5,
- 90.5, 91.5, 92.5, 93.5, 94.5, 95.5, 96.5, 97.5,
- 98.5, 99.5, 100.5, 101.5, 102.5, 103.5, 104.5, 105.5,
- 106.5, 107.5, 108.5, 109.5, 110.5, 111.5, 112.5, 113.5,
- 114.5, 115.5, 116.5, 117.5, 118.5, 119.5, 120.5, 121.5,
- 122.5, 123.5, 124.5, 125.5, 126.5, 127.5, 128.5, 129.5,
- 130.5, 131.5, 132.5, 133.5, 134.5, 135.5, 136.5, 137.5,
- 138.5, 139.5, 140.5, 141.5, 142.5, 143.5, 144.5, 145.5,
- 146.5, 147.5, 148.5, 149.5, 150.5, 151.5, 152.5, 153.5,
- 154.5, 155.5, 156.5, 157.5, 158.5, 159.5, 160.5, 161.5,
- 162.5, 163.5, 164.5, 165.5, 166.5, 167.5, 168.5, 169.5,
- 170.5, 171.5, 172.5, 173.5, 174.5, 175.5, 176.5, 177.5,
- 178.5, 179.5, 180.5, 181.5, 182.5, 183.5, 184.5, 185.5,
- 186.5, 187.5, 188.5, 189.5, 190.5, 191.5, 192.5, 193.5,
- 194.5, 195.5, 196.5, 197.5, 198.5, 199.5, 200.5, 201.5,
- 202.5, 203.5, 204.5, 205.5, 206.5, 207.5, 208.5, 209.5,
- 210.5, 211.5, 212.5, 213.5, 214.5, 215.5, 216.5, 217.5,
- 218.5, 219.5, 220.5, 221.5, 222.5, 223.5, 224.5, 225.5,
- 226.5, 227.5, 228.5, 229.5, 230.5, 231.5, 232.5, 233.5,
- 234.5, 235.5, 236.5, 237.5, 238.5, 239.5, 240.5, 241.5,
- 242.5, 243.5, 244.5, 245.5, 246.5, 247.5, 248.5, 249.5,
- 250.5, 251.5, 252.5, 253.5, 254.5, 255.5, 256.5, 257.5,
- 258.5, 259.5, 260.5, 261.5, 262.5, 263.5, 264.5, 265.5,
- 266.5, 267.5, 268.5, 269.5, 270.5, 271.5, 272.5, 273.5,
- 274.5, 275.5, 276.5, 277.5, 278.5, 279.5, 280.5, 281.5,
- 282.5, 283.5, 284.5, 285.5, 286.5, 287.5, 288.5, 289.5,
- 290.5, 291.5, 292.5, 293.5, 294.5, 295.5, 296.5, 297.5,
- 298.5, 299.5, 300.5, 301.5, 302.5, 303.5, 304.5, 305.5,
- 306.5, 307.5, 308.5, 309.5,
-};
-
-static long _vq_quantmap_res0_350_1024_7[] = {
- 619, 617, 615, 613, 611, 609, 607, 605,
- 603, 601, 599, 597, 595, 593, 591, 589,
- 587, 585, 583, 581, 579, 577, 575, 573,
- 571, 569, 567, 565, 563, 561, 559, 557,
- 555, 553, 551, 549, 547, 545, 543, 541,
- 539, 537, 535, 533, 531, 529, 527, 525,
- 523, 521, 519, 517, 515, 513, 511, 509,
- 507, 505, 503, 501, 499, 497, 495, 493,
- 491, 489, 487, 485, 483, 481, 479, 477,
- 475, 473, 471, 469, 467, 465, 463, 461,
- 459, 457, 455, 453, 451, 449, 447, 445,
- 443, 441, 439, 437, 435, 433, 431, 429,
- 427, 425, 423, 421, 419, 417, 415, 413,
- 411, 409, 407, 405, 403, 401, 399, 397,
- 395, 393, 391, 389, 387, 385, 383, 381,
- 379, 377, 375, 373, 371, 369, 367, 365,
- 363, 361, 359, 357, 355, 353, 351, 349,
- 347, 345, 343, 341, 339, 337, 335, 333,
- 331, 329, 327, 325, 323, 321, 319, 317,
- 315, 313, 311, 309, 307, 305, 303, 301,
- 299, 297, 295, 293, 291, 289, 287, 285,
- 283, 281, 279, 277, 275, 273, 271, 269,
- 267, 265, 263, 261, 259, 257, 255, 253,
- 251, 249, 247, 245, 243, 241, 239, 237,
- 235, 233, 231, 229, 227, 225, 223, 221,
- 219, 217, 215, 213, 211, 209, 207, 205,
- 203, 201, 199, 197, 195, 193, 191, 189,
- 187, 185, 183, 181, 179, 177, 175, 173,
- 171, 169, 167, 165, 163, 161, 159, 157,
- 155, 153, 151, 149, 147, 145, 143, 141,
- 139, 137, 135, 133, 131, 129, 127, 125,
- 123, 121, 119, 117, 115, 113, 111, 109,
- 107, 105, 103, 101, 99, 97, 95, 93,
- 91, 89, 87, 85, 83, 81, 79, 77,
- 75, 73, 71, 69, 67, 65, 63, 61,
- 59, 57, 55, 53, 51, 49, 47, 45,
- 43, 41, 39, 37, 35, 33, 31, 29,
- 27, 25, 23, 21, 19, 17, 15, 13,
- 11, 9, 7, 5, 3, 1, 0, 2,
- 4, 6, 8, 10, 12, 14, 16, 18,
- 20, 22, 24, 26, 28, 30, 32, 34,
- 36, 38, 40, 42, 44, 46, 48, 50,
- 52, 54, 56, 58, 60, 62, 64, 66,
- 68, 70, 72, 74, 76, 78, 80, 82,
- 84, 86, 88, 90, 92, 94, 96, 98,
- 100, 102, 104, 106, 108, 110, 112, 114,
- 116, 118, 120, 122, 124, 126, 128, 130,
- 132, 134, 136, 138, 140, 142, 144, 146,
- 148, 150, 152, 154, 156, 158, 160, 162,
- 164, 166, 168, 170, 172, 174, 176, 178,
- 180, 182, 184, 186, 188, 190, 192, 194,
- 196, 198, 200, 202, 204, 206, 208, 210,
- 212, 214, 216, 218, 220, 222, 224, 226,
- 228, 230, 232, 234, 236, 238, 240, 242,
- 244, 246, 248, 250, 252, 254, 256, 258,
- 260, 262, 264, 266, 268, 270, 272, 274,
- 276, 278, 280, 282, 284, 286, 288, 290,
- 292, 294, 296, 298, 300, 302, 304, 306,
- 308, 310, 312, 314, 316, 318, 320, 322,
- 324, 326, 328, 330, 332, 334, 336, 338,
- 340, 342, 344, 346, 348, 350, 352, 354,
- 356, 358, 360, 362, 364, 366, 368, 370,
- 372, 374, 376, 378, 380, 382, 384, 386,
- 388, 390, 392, 394, 396, 398, 400, 402,
- 404, 406, 408, 410, 412, 414, 416, 418,
- 420, 422, 424, 426, 428, 430, 432, 434,
- 436, 438, 440, 442, 444, 446, 448, 450,
- 452, 454, 456, 458, 460, 462, 464, 466,
- 468, 470, 472, 474, 476, 478, 480, 482,
- 484, 486, 488, 490, 492, 494, 496, 498,
- 500, 502, 504, 506, 508, 510, 512, 514,
- 516, 518, 520, 522, 524, 526, 528, 530,
- 532, 534, 536, 538, 540, 542, 544, 546,
- 548, 550, 552, 554, 556, 558, 560, 562,
- 564, 566, 568, 570, 572, 574, 576, 578,
- 580, 582, 584, 586, 588, 590, 592, 594,
- 596, 598, 600, 602, 604, 606, 608, 610,
- 612, 614, 616, 618, 620,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_350_1024_7 = {
- _vq_quantthresh_res0_350_1024_7,
- _vq_quantmap_res0_350_1024_7,
- 621,
- 621
-};
-
-static static_codebook _vq_book_res0_350_1024_7 = {
- 1, 621,
- _vq_lengthlist_res0_350_1024_7,
- 1, -518823936, 1611661312, 10, 0,
- _vq_quantlist_res0_350_1024_7,
- NULL,
- &_vq_auxt_res0_350_1024_7,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_96_1024_1.vqh b/lib/books/res0_96_1024_1.vqh
deleted file mode 100644
index d237edac..00000000
--- a/lib/books/res0_96_1024_1.vqh
+++ /dev/null
@@ -1,63 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_96_1024_1_VQH_
-#define _V_res0_96_1024_1_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_96_1024_1[] = {
- 1,
- 0,
- 2,
-};
-
-static long _vq_lengthlist_res0_96_1024_1[] = {
- 1, 4, 4, 5, 8, 7, 4, 7, 7, 5, 8, 8, 8,11,11, 8,
- 10,10, 5, 8, 8, 8,11,10, 8,11,10, 5, 8, 8, 8,11,
- 11, 8,11,11, 8,11,11,11,14,14,11,14,14, 8,11,11,
- 11,14,14,11,14,14, 4, 8, 8, 8,11,11, 8,11,11, 8,
- 11,11,11,14,14,11,14,14, 8,11,10,11,14,14,10,14,
- 14,
-};
-
-static float _vq_quantthresh_res0_96_1024_1[] = {
- -0.5, 0.5,
-};
-
-static long _vq_quantmap_res0_96_1024_1[] = {
- 1, 0, 2,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_96_1024_1 = {
- _vq_quantthresh_res0_96_1024_1,
- _vq_quantmap_res0_96_1024_1,
- 3,
- 3
-};
-
-static static_codebook _vq_book_res0_96_1024_1 = {
- 4, 81,
- _vq_lengthlist_res0_96_1024_1,
- 1, -535822336, 1611661312, 2, 0,
- _vq_quantlist_res0_96_1024_1,
- NULL,
- &_vq_auxt_res0_96_1024_1,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_96_1024_2.vqh b/lib/books/res0_96_1024_2.vqh
deleted file mode 100644
index 0a144176..00000000
--- a/lib/books/res0_96_1024_2.vqh
+++ /dev/null
@@ -1,63 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_96_1024_2_VQH_
-#define _V_res0_96_1024_2_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_96_1024_2[] = {
- 1,
- 0,
- 2,
-};
-
-static long _vq_lengthlist_res0_96_1024_2[] = {
- 3, 5, 4, 5, 6, 6, 4, 6, 6, 5, 6, 6, 6, 7, 8, 6,
- 7, 7, 5, 6, 6, 6, 8, 7, 6, 7, 7, 5, 6, 6, 6, 8,
- 8, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 8,
- 8, 9, 9, 8, 9, 9, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6,
- 8, 8, 8, 9, 9, 7, 9, 9, 6, 8, 8, 8, 9, 9, 7, 9,
- 9,
-};
-
-static float _vq_quantthresh_res0_96_1024_2[] = {
- -0.5, 0.5,
-};
-
-static long _vq_quantmap_res0_96_1024_2[] = {
- 1, 0, 2,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_96_1024_2 = {
- _vq_quantthresh_res0_96_1024_2,
- _vq_quantmap_res0_96_1024_2,
- 3,
- 3
-};
-
-static static_codebook _vq_book_res0_96_1024_2 = {
- 4, 81,
- _vq_lengthlist_res0_96_1024_2,
- 1, -535822336, 1611661312, 2, 0,
- _vq_quantlist_res0_96_1024_2,
- NULL,
- &_vq_auxt_res0_96_1024_2,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_96_1024_3.vqh b/lib/books/res0_96_1024_3.vqh
deleted file mode 100644
index 0b80f637..00000000
--- a/lib/books/res0_96_1024_3.vqh
+++ /dev/null
@@ -1,187 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_96_1024_3_VQH_
-#define _V_res0_96_1024_3_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_96_1024_3[] = {
- 3,
- 2,
- 4,
- 0,
- 6,
-};
-
-static long _vq_lengthlist_res0_96_1024_3[] = {
- 2, 4, 4, 6, 6, 5, 7, 7,10,10, 4, 7, 7,10,10, 7,
- 10,10,15,15, 7,10,10,15,15, 5, 7, 7, 9, 9, 7,10,
- 10,13,12, 7,10,10,12,12,10,13,13,17,18,10,13,13,
- 17,18, 4, 7, 7, 9, 9, 7,10,10,12,12, 7,10,10,12,
- 12,10,13,13,16,18,10,13,13,18,17, 7,10, 9,12,13,
- 10,13,13,17,17,10,13,13,17,17,15,18,21, 0, 0,15,
- 17,17,21, 0, 7, 9, 9,13,13,10,13,13,16,18,10,13,
- 13,17,17,16,19,18, 0, 0,15,18,17, 0, 0, 5, 7, 7,
- 9, 9, 7,10,10,13,13, 7,10,10,13,13,10,13,13,18,
- 17,10,13,13,19,17, 7,10,10,13,13,10,12,13,15,16,
- 10,12,12,15,15,13,15,16,19, 0,13,16,15,19,20, 7,
- 10,10,13,12,10,13,12,16,15,10,12,12,15,16,13,16,
- 15,20,18,13,15,15,19,18,10,13,13,17,17,13,15,16,
- 0,19,13,16,15, 0,20,18,18,20, 0, 0,18,19, 0, 0,
- 0,10,13,13,18,18,13,15,15,19,19,13,16,16,20,19,
- 19,20,19, 0, 0,18,19,20,20, 0, 5, 7, 7, 9, 9, 7,
- 10,10,13,13, 7,10,10,13,13,10,13,13,18,17,10,13,
- 13,18,18, 7,10,10,13,13,10,12,12,16,16,10,12,12,
- 15,16,13,15,15, 0, 0,13,15,15,19, 0, 7,10,10,12,
- 13,10,12,12,15,15,10,12,12,16,15,13,16,15, 0, 0,
- 13,15,15, 0, 0,10,13,13,18,18,13,15,15,20,20,13,
- 16,15,19,19,18,19,19, 0, 0,17,18,20, 0, 0,10,13,
- 13,17,17,13,15,15,19,20,13,15,15,20,18,17,19,20,
- 0, 0,17,20,18,20,19, 7,10,10,13,13,10,13,13,18,
- 18,10,13,13,17,17,14,18,19,20, 0,13,17,18, 0, 0,
- 10,13,13,17,18,13,15,16, 0, 0,13,16,15, 0,20,18,
- 20, 0, 0, 0,18,20, 0, 0, 0,10,13,13,18,18,13,16,
- 15, 0, 0,13,16,15, 0, 0,17,20, 0, 0, 0,17, 0,20,
- 0, 0,15,18,18, 0,20,17,20,19,20, 0,18, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,15,18,18, 0, 0,
- 18, 0,18, 0, 0,17,20, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 7,10,10,13,13,10,13,13,18,18,10,13,
- 13,18,17,14,18,18,20, 0,13,19,18, 0, 0,10,13,13,
- 18,17,13,16,15,20, 0,13,16,16, 0, 0,18, 0,19,20,
- 0,17,19,19, 0, 0,10,13,13,18,17,13,16,15,20, 0,
- 13,15,15,19, 0,18, 0,20,20, 0,18, 0,20, 0, 0,15,
- 18,19,20, 0,18,20,20, 0,20,18, 0,19, 0, 0, 0, 0,
- 0, 0, 0, 0,19, 0,20, 0,15,17,19, 0, 0,18,19,20,
- 0,20,18,19,19, 0, 0, 0, 0, 0, 0, 0, 0, 0,20, 0,
- 0,
-};
-
-static float _vq_quantthresh_res0_96_1024_3[] = {
- -2, -0.5, 0.5, 2,
-};
-
-static long _vq_quantmap_res0_96_1024_3[] = {
- 3, 1, 0, 2, 4,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_96_1024_3 = {
- _vq_quantthresh_res0_96_1024_3,
- _vq_quantmap_res0_96_1024_3,
- 5,
- 5
-};
-
-static long _vq_pigeonmap_res0_96_1024_3[] = {
- 1, 0, 0, 0, 0, 0,
-};
-
-static long _vq_fitlist_res0_96_1024_3[] = {
- 1, 5, 6, 8, 16, 25, 26, 28,
- 30, 31, 33, 40, 41, 43, 76, 80,
- 81, 83, 91, 125, 126, 128, 130, 131,
- 133, 140, 141, 143, 150, 151, 153, 155,
- 156, 158, 165, 166, 168, 200, 201, 203,
- 205, 206, 215, 216, 376, 380, 381, 383,
- 391, 400, 401, 403, 405, 406, 415, 416,
- 451, 455, 456, 458, 0, 7, 15, 27,
- 32, 42, 75, 82, 90, 127, 132, 142,
- 152, 157, 167, 202, 207, 217, 375, 382,
- 390, 402, 407, 450, 457, 2, 17, 77,
- 92, 377, 392, 452, 9, 29, 34, 44,
- 84, 129, 134, 144, 154, 159, 204, 209,
- 384, 404, 4, 19, 79, 379, 454, 3,
- 11, 35, 36, 38, 78, 86, 135, 136,
- 138, 160, 161, 163, 210, 211, 378, 386,
- 410, 411, 10, 37, 85, 137, 162, 212,
- 385, 412, 460, 12, 87, 387, 39, 139,
- 164, 214, 414, 14, 89, 389, 13, 88,
- 388, 21, 45, 46, 48, 96, 145, 146,
- 148, 170, 171, 173, 220, 221, 396, 420,
- 421, 20, 47, 95, 147, 172, 395, 22,
- 97, 397, 49, 149, 174, 24, 23, 98,
- 18, 51, 55, 56, 58, 66, 175, 176,
- 178, 180, 181, 183, 190, 191, 193, 393,
- 426, 430, 431, 441, 50, 57, 65, 177,
- 182, 192, 425, 432, 440, 52, 67, 427,
- 59, 179, 184, 194, 54, 69, 429, 53,
- 61, 185, 186, 188, 428, 436, 60, 187,
- 435, 62, 437, 189, 64, 63, 71, 195,
- 196, 198, 70, 197, 445, 72, 447, 199,
- 74, 73, 68, 101, 105, 106, 108, 116,
- 225, 226, 228, 230, 231, 233, 240, 241,
- 476, 480, 100, 107, 115, 227, 232, 242,
- 475, 482, 102, 117, 477, 109, 229, 234,
- 104, 103, 111, 235, 236, 238, 486, 110,
- 237, 485, 112, 239, 114, 113, 121, 245,
- 246, 248, 120, 247, 122, 314, 322, 362,
- 364, 372, 374, 251, 255, 256, 258, 266,
- 275, 276, 278, 280, 281, 283, 290, 291,
- 326, 330, 331, 333, 341, 250, 257, 265,
- 277, 282, 292, 325, 332, 340, 252, 267,
- 327, 342, 259, 279, 284, 334, 254, 269,
- 329, 253, 261, 285, 286, 288, 328, 336,
- 260, 287, 335, 262, 337, 289, 264, 339,
- 263, 338, 271, 295, 296, 298, 346, 270,
- 297, 345, 272, 347, 274, 273, 268, 301,
- 305, 306, 308, 316, 300, 307, 315, 302,
- 317, 309, 304, 303, 311, 310, 312, 313,
- 321, 320, 351, 355, 356, 358, 366, 350,
- 357, 365, 352, 367, 359, 354, 353, 361,
- 360, 363, 371, 370, 373, 501, 505, 506,
- 508, 516, 525, 526, 528, 530, 531, 533,
- 540, 543, 576, 580, 581, 500, 507, 515,
- 527, 532, 542, 575, 582, 502, 517, 577,
- 509, 529, 584, 504, 503, 511, 535, 536,
- 578, 510, 537, 585, 512, 587, 514, 513,
- 521, 545, 546, 596, 520, 547, 522, 598,
- 572, 518, 551, 555, 556, 558, 550, 557,
- 565, 552, 567, 554, 553, 561, 560, 562,
- 563, 570, 568, 601, 605, 606, 600, 607,
- 602, 609, 611, 610, 612, 622,
-};
-
-static long _vq_fitmap_res0_96_1024_3[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static long _vq_fitlength_res0_96_1024_3[] = {
- 494, 494, 494, 494, 494, 494, 494, 494,
- 494, 494, 494, 494, 494, 494, 494, 494,
-};
-
-static encode_aux_pigeonhole _vq_auxp_res0_96_1024_3 = {
- -3, 1, 6, 2,
- _vq_pigeonmap_res0_96_1024_3,
- 494,
- _vq_fitlist_res0_96_1024_3,
- _vq_fitmap_res0_96_1024_3,
- _vq_fitlength_res0_96_1024_3
-};
-
-static static_codebook _vq_book_res0_96_1024_3 = {
- 4, 625,
- _vq_lengthlist_res0_96_1024_3,
- 1, -533200896, 1611661312, 3, 0,
- _vq_quantlist_res0_96_1024_3,
- NULL,
- &_vq_auxt_res0_96_1024_3,
- &_vq_auxp_res0_96_1024_3,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_96_1024_4.vqh b/lib/books/res0_96_1024_4.vqh
deleted file mode 100644
index 410bbb3b..00000000
--- a/lib/books/res0_96_1024_4.vqh
+++ /dev/null
@@ -1,99 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_96_1024_4_VQH_
-#define _V_res0_96_1024_4_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_96_1024_4[] = {
- 3,
- 2,
- 4,
- 0,
- 6,
-};
-
-static long _vq_lengthlist_res0_96_1024_4[] = {
- 5, 5, 5, 8, 8, 6, 6, 6, 9, 9, 5, 6, 6, 9, 8, 8,
- 9, 9,11,11, 8, 9, 9,11,11, 6, 7, 6, 9, 9, 6, 7,
- 7,10,10, 6, 7, 7,10,10, 9,10,10,12,12, 9,10,10,
- 12,12, 6, 6, 6, 9, 9, 6, 7, 7,10,10, 6, 7, 7,10,
- 10, 9,10,10,12,12, 9,10,10,12,12, 8, 9, 9,12,12,
- 9,10,10,13,13, 9,10,10,12,13,12,13,13,14,14,12,
- 13,13,15,15, 8, 9, 9,12,12, 9,10,10,12,13, 9,10,
- 10,13,13,12,12,12,15,15,12,13,12,15,14, 6, 7, 7,
- 9, 9, 7, 8, 8,10,10, 7, 7, 7,10,10, 9,10,10,12,
- 13, 9,10,10,13,13, 7, 8, 8,10,10, 8, 8, 8,11,11,
- 8, 8, 8,11,10,10,11,11,13,13,10,11,11,13,13, 7,
- 8, 8,10,10, 7, 8, 8,11,11, 7, 8, 8,11,11,10,11,
- 11,13,13,10,11,11,13,13, 9,10,10,13,13,10,11,11,
- 13,13,10,11,11,13,13,13,13,13,15,15,13,14,13,15,
- 15, 9,10,10,13,13,10,11,11,13,13,10,11,11,14,13,
- 13,13,13,16,15,13,13,13,15,15, 6, 7, 7, 9, 9, 7,
- 8, 7,10,10, 7, 7, 8,10,10, 9,10,10,13,12, 9,10,
- 10,12,12, 7, 8, 8,10,10, 8, 8, 8,11,10, 7, 8, 8,
- 11,10,10,11,11,13,13,10,11,11,13,13, 7, 8, 8,10,
- 10, 7, 8, 8,11,11, 7, 8, 8,11,10,10,11,11,13,13,
- 10,11,11,13,12, 9,10,10,13,13,10,11,11,13,13,10,
- 11,11,13,13,13,13,13,15,15,13,13,13,15,15, 9,10,
- 11,13,13,10,11,11,13,13,10,11,11,13,13,13,14,13,
- 15,15,13,13,13,15,15, 8,10, 9,12,12,10,11,11,13,
- 13,10,10,11,13,13,12,13,13,16,15,12,13,13,15,15,
- 9,11,11,13,13,10,11,11,14,14,11,11,11,14,14,13,
- 14,14,15,15,13,14,14,16,15, 9,10,11,13,13,11,11,
- 11,14,14,10,11,11,13,14,13,14,13,16,15,14,14,14,
- 16,15,13,13,13,16,15,13,14,14,16,15,13,14,14,15,
- 16,16,15,15,16,17,16,16,15,17,17,13,13,14,15,16,
- 13,14,14,15,16,13,14,14,15,16,15,15,15,16,17,15,
- 15,15,16,18, 8,10,10,12,12,10,11,11,13,13,10,11,
- 11,13,13,13,13,14,15,15,12,14,13,15,15, 9,11,11,
- 13,13,11,11,11,14,14,10,11,11,14,13,13,14,14,15,
- 15,13,14,14,16,15, 9,11,11,13,13,10,11,11,13,14,
- 11,11,11,13,13,13,14,14,15,16,14,14,14,16,15,13,
- 14,14,15,14,13,14,13,15,16,13,13,14,15,16,16,15,
- 16,17,18,15,15,16,16,17,13,14,13,15,15,13,13,13,
- 16,15,13,14,13,15,16,15,16,15,17,18,15,15,15,18,
- 17,
-};
-
-static float _vq_quantthresh_res0_96_1024_4[] = {
- -2, -0.5, 0.5, 2,
-};
-
-static long _vq_quantmap_res0_96_1024_4[] = {
- 3, 1, 0, 2, 4,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_96_1024_4 = {
- _vq_quantthresh_res0_96_1024_4,
- _vq_quantmap_res0_96_1024_4,
- 5,
- 5
-};
-
-static static_codebook _vq_book_res0_96_1024_4 = {
- 4, 625,
- _vq_lengthlist_res0_96_1024_4,
- 1, -533200896, 1611661312, 3, 0,
- _vq_quantlist_res0_96_1024_4,
- NULL,
- &_vq_auxt_res0_96_1024_4,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_96_1024_5.vqh b/lib/books/res0_96_1024_5.vqh
deleted file mode 100644
index 96d70c38..00000000
--- a/lib/books/res0_96_1024_5.vqh
+++ /dev/null
@@ -1,70 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_96_1024_5_VQH_
-#define _V_res0_96_1024_5_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_96_1024_5[] = {
- 8,
- 7,
- 9,
- 5,
- 11,
- 3,
- 13,
- 0,
- 16,
-};
-
-static long _vq_lengthlist_res0_96_1024_5[] = {
- 1, 4, 4, 6, 6, 6, 6, 7, 7, 4, 6, 6, 9, 9, 9, 9,
- 11,11, 4, 6, 6, 9, 9, 9, 9,11,11, 6, 9, 9,12,11,
- 11,12,13,13, 6, 9, 9,12,12,12,12,13,14, 6, 9, 9,
- 12,12,13,13,15,14, 6, 9, 9,12,12,13,13,15,15, 8,
- 12,12,14,14,15,15,16,17, 8,12,12,14,14,15,16,16,
- 17,
-};
-
-static float _vq_quantthresh_res0_96_1024_5[] = {
- -6.5, -4, -2, -0.5, 0.5, 2, 4, 6.5,
-};
-
-static long _vq_quantmap_res0_96_1024_5[] = {
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_96_1024_5 = {
- _vq_quantthresh_res0_96_1024_5,
- _vq_quantmap_res0_96_1024_5,
- 9,
- 9
-};
-
-static static_codebook _vq_book_res0_96_1024_5 = {
- 2, 81,
- _vq_lengthlist_res0_96_1024_5,
- 1, -529530880, 1611661312, 5, 0,
- _vq_quantlist_res0_96_1024_5,
- NULL,
- &_vq_auxt_res0_96_1024_5,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_96_1024_6.vqh b/lib/books/res0_96_1024_6.vqh
deleted file mode 100644
index 00b37dc0..00000000
--- a/lib/books/res0_96_1024_6.vqh
+++ /dev/null
@@ -1,70 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_96_1024_6_VQH_
-#define _V_res0_96_1024_6_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_96_1024_6[] = {
- 8,
- 7,
- 9,
- 5,
- 11,
- 3,
- 13,
- 0,
- 16,
-};
-
-static long _vq_lengthlist_res0_96_1024_6[] = {
- 3, 4, 4, 5, 5, 6, 6, 7, 7, 4, 5, 4, 6, 6, 7, 7,
- 8, 8, 4, 4, 4, 6, 6, 7, 7, 8, 8, 6, 6, 6, 8, 8,
- 9, 9,10,10, 6, 6, 6, 8, 8, 9, 9,10,10, 7, 8, 8,
- 9, 9,10,10,11,11, 7, 8, 8, 9, 9,10,10,11,11, 8,
- 9, 9,11,10,11,11,12,12, 8, 9, 9,10,11,11,11,12,
- 12,
-};
-
-static float _vq_quantthresh_res0_96_1024_6[] = {
- -6.5, -4, -2, -0.5, 0.5, 2, 4, 6.5,
-};
-
-static long _vq_quantmap_res0_96_1024_6[] = {
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_96_1024_6 = {
- _vq_quantthresh_res0_96_1024_6,
- _vq_quantmap_res0_96_1024_6,
- 9,
- 9
-};
-
-static static_codebook _vq_book_res0_96_1024_6 = {
- 2, 81,
- _vq_lengthlist_res0_96_1024_6,
- 1, -529530880, 1611661312, 5, 0,
- _vq_quantlist_res0_96_1024_6,
- NULL,
- &_vq_auxt_res0_96_1024_6,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_96_1024_7.vqh b/lib/books/res0_96_1024_7.vqh
deleted file mode 100644
index 95c2a9de..00000000
--- a/lib/books/res0_96_1024_7.vqh
+++ /dev/null
@@ -1,86 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_96_1024_7_VQH_
-#define _V_res0_96_1024_7_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_96_1024_7[] = {
- 17,
- 16,
- 18,
- 14,
- 20,
- 12,
- 22,
- 9,
- 25,
- 6,
- 28,
- 3,
- 31,
- 0,
- 34,
-};
-
-static long _vq_lengthlist_res0_96_1024_7[] = {
- 3, 4, 4, 5, 5, 6, 6, 7, 6, 7, 7, 8, 8, 9, 9, 5,
- 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9,10,10, 4, 5,
- 5, 6, 6, 7, 7, 8, 7, 8, 8, 9, 9,10,10, 6, 7, 7,
- 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,11, 6, 7, 7, 8,
- 8, 8, 8, 9, 9, 9, 9,10,10,11,11, 7, 8, 8, 9, 9,
- 9, 9,10, 9,10,10,11,11,12,12, 7, 8, 8, 9, 9, 9,
- 9,10,10,10,10,11,11,12,12, 8, 9, 9,10,10,10,10,
- 11,10,11,11,12,12,13,12, 8, 9, 9,10,10,10,10,11,
- 10,11,11,12,12,13,12, 8, 9, 9,10,10,11,11,11,11,
- 12,12,13,13,13,14, 8, 9, 9,10,10,11,11,11,11,12,
- 12,13,13,14,14,10,11,11,12,12,12,12,13,13,13,13,
- 14,14,15,15,10,11,11,12,12,12,12,13,13,13,14,14,
- 14,15,15,12,13,13,14,14,14,14,14,14,15,15,15,16,
- 16,16,12,13,13,14,13,14,14,14,14,14,15,15,16,16,
- 16,
-};
-
-static float _vq_quantthresh_res0_96_1024_7[] = {
- -15.5, -12.5, -9.5, -6.5, -4, -2, -0.5, 0.5,
- 2, 4, 6.5, 9.5, 12.5, 15.5,
-};
-
-static long _vq_quantmap_res0_96_1024_7[] = {
- 13, 11, 9, 7, 5, 3, 1, 0,
- 2, 4, 6, 8, 10, 12, 14,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_96_1024_7 = {
- _vq_quantthresh_res0_96_1024_7,
- _vq_quantmap_res0_96_1024_7,
- 15,
- 15
-};
-
-static static_codebook _vq_book_res0_96_1024_7 = {
- 2, 225,
- _vq_lengthlist_res0_96_1024_7,
- 1, -527368192, 1611661312, 6, 0,
- _vq_quantlist_res0_96_1024_7,
- NULL,
- &_vq_auxt_res0_96_1024_7,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_96_1024_8.vqh b/lib/books/res0_96_1024_8.vqh
deleted file mode 100644
index 28002ca0..00000000
--- a/lib/books/res0_96_1024_8.vqh
+++ /dev/null
@@ -1,124 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_96_1024_8_VQH_
-#define _V_res0_96_1024_8_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_96_1024_8[] = {
- 35,
- 34,
- 36,
- 32,
- 38,
- 30,
- 40,
- 27,
- 43,
- 24,
- 46,
- 21,
- 49,
- 18,
- 52,
- 15,
- 55,
- 11,
- 59,
- 7,
- 63,
- 4,
- 66,
- 0,
- 70,
-};
-
-static long _vq_lengthlist_res0_96_1024_8[] = {
- 5, 5, 5, 5, 6, 6, 6, 6, 6, 7, 7, 8, 8, 8, 8, 8,
- 8, 9, 9,10,10,10,10,11,11, 6, 6, 6, 6, 6, 6, 6,
- 7, 6, 7, 7, 8, 8, 9, 9, 8, 8, 9, 9,10,10,10,11,
- 11,11, 6, 6, 6, 6, 6, 6, 6, 7, 6, 7, 7, 8, 8, 9,
- 9, 8, 8, 9, 9,10,10,11,10,11,11, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9,10,10,10,11,
- 11,11,11,12, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 9,
- 9, 9, 9, 9, 9,10,10,10,11,11,11,11,12, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,10,10,10,10,10,10,
- 11,11,11,12,12,12, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9,
- 9, 9, 9,10,10,10,10,10,10,11,11,11,12,12,12, 9,
- 9, 9, 8, 9, 9, 9, 9, 9,10, 9,10,10,11,11,10,11,
- 11,11,12,12,12,12,13,13, 9, 9, 9, 9, 9, 9, 9, 9,
- 9,10, 9,10,10,11,11,11,11,11,11,12,12,12,12,12,
- 13,10,10,10,10,10,10,10,10,10,11,11,11,11,12,12,
- 11,11,12,12,13,13,13,14,13,14,10,10,10,10,10,10,
- 10,10,10,11,11,11,11,12,12,11,11,12,12,12,13,13,
- 13,14,14,11,11,11,11,11,11,11,11,11,12,12,13,12,
- 13,13,13,13,13,13,14,14,14,14,14,15,11,11,11,11,
- 11,11,11,11,11,12,12,12,12,13,13,13,13,13,13,14,
- 14,14,14,14,14,13,12,12,13,12,12,12,13,13,13,13,
- 14,14,15,14,14,14,14,14,15,15,15,15,16,16,13,13,
- 12,12,12,12,12,13,13,13,13,14,13,14,14,14,14,14,
- 14,15,15,15,16,16,16,12,13,13,13,14,13,14,14,14,
- 14,14,15,15,15,15,15,16,16,15,17,18,16,18,16,16,
- 12,13,13,13,13,13,13,14,14,14,14,15,15,15,15,15,
- 15,15,15,16,17,17,16,17,16,15,15,15,16,16,16,15,
- 16,16,17,16,17,16,18,17,16,16,17,17,19,18,19,18,
- 18,19,15,16,15,15,15,16,16,15,16,16,16,16,17,16,
- 16,16,16,17,18,17,18,17,18,17,18,16,18,19,18,18,
- 19,19,19,18,19,18,18,19,18,18,19,18,18,19,19,19,
- 19,19,19,19,17,18,17,18,18,19,18,18,18,19,18,18,
- 18,19,18,18,18,18,17,18,19,19,19,19,19,19,19,18,
- 19,19,19,18,19,19,19,19,19,19,19,18,18,19,19,18,
- 19,19,19,19,19,18,19,19,19,18,19,18,19,19,19,19,
- 19,19,18,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,18,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,18,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,19,19,19,
- 19,
-};
-
-static float _vq_quantthresh_res0_96_1024_8[] = {
- -33, -29.5, -26, -22, -18.5, -15.5, -12.5, -9.5,
- -6.5, -4, -2, -0.5, 0.5, 2, 4, 6.5,
- 9.5, 12.5, 15.5, 18.5, 22, 26, 29.5, 33,
-};
-
-static long _vq_quantmap_res0_96_1024_8[] = {
- 23, 21, 19, 17, 15, 13, 11, 9,
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8, 10, 12, 14, 16, 18, 20, 22,
- 24,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_96_1024_8 = {
- _vq_quantthresh_res0_96_1024_8,
- _vq_quantmap_res0_96_1024_8,
- 25,
- 25
-};
-
-static static_codebook _vq_book_res0_96_1024_8 = {
- 2, 625,
- _vq_lengthlist_res0_96_1024_8,
- 1, -525238272, 1611661312, 7, 0,
- _vq_quantlist_res0_96_1024_8,
- NULL,
- &_vq_auxt_res0_96_1024_8,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_96_1024_9.vqh b/lib/books/res0_96_1024_9.vqh
deleted file mode 100644
index 0ad3bffc..00000000
--- a/lib/books/res0_96_1024_9.vqh
+++ /dev/null
@@ -1,131 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_96_1024_9_VQH_
-#define _V_res0_96_1024_9_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_96_1024_9[] = {
- 123,
- 122,
- 124,
- 120,
- 126,
- 118,
- 128,
- 115,
- 131,
- 112,
- 134,
- 109,
- 137,
- 106,
- 140,
- 103,
- 143,
- 99,
- 147,
- 95,
- 151,
- 92,
- 154,
- 88,
- 158,
- 84,
- 162,
- 80,
- 166,
- 76,
- 170,
- 72,
- 174,
- 67,
- 179,
- 62,
- 184,
- 57,
- 189,
- 52,
- 194,
- 51,
- 195,
- 45,
- 201,
- 39,
- 207,
- 33,
- 213,
- 27,
- 219,
- 21,
- 225,
- 15,
- 231,
- 8,
- 238,
- 0,
- 246,
-};
-
-static long _vq_lengthlist_res0_96_1024_9[] = {
- 3, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 7, 7, 8,
- 8, 8, 8, 9, 9,10,10,10,11, 8, 8, 8, 9, 9, 9,10,
- 10,10,10,11,11,12,12,13,13,13,13,13,13,14,15,16,
- 15,16,15,17,16,17,18,17,18,17,17,
-};
-
-static float _vq_quantthresh_res0_96_1024_9[] = {
- -119, -111.5, -105, -99, -93, -87, -81, -75,
- -71.5, -68.5, -63.5, -58.5, -53.5, -49, -45, -41,
- -37, -33, -29.5, -26, -22, -18.5, -15.5, -12.5,
- -9.5, -6.5, -4, -2, -0.5, 0.5, 2, 4,
- 6.5, 9.5, 12.5, 15.5, 18.5, 22, 26, 29.5,
- 33, 37, 41, 45, 49, 53.5, 58.5, 63.5,
- 68.5, 71.5, 75, 81, 87, 93, 99, 105,
- 111.5, 119,
-};
-
-static long _vq_quantmap_res0_96_1024_9[] = {
- 57, 55, 53, 51, 49, 47, 45, 43,
- 41, 39, 37, 35, 33, 31, 29, 27,
- 25, 23, 21, 19, 17, 15, 13, 11,
- 9, 7, 5, 3, 1, 0, 2, 4,
- 6, 8, 10, 12, 14, 16, 18, 20,
- 22, 24, 26, 28, 30, 32, 34, 36,
- 38, 40, 42, 44, 46, 48, 50, 52,
- 54, 56, 58,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_96_1024_9 = {
- _vq_quantthresh_res0_96_1024_9,
- _vq_quantmap_res0_96_1024_9,
- 59,
- 59
-};
-
-static static_codebook _vq_book_res0_96_1024_9 = {
- 1, 59,
- _vq_lengthlist_res0_96_1024_9,
- 1, -522272768, 1611661312, 8, 0,
- _vq_quantlist_res0_96_1024_9,
- NULL,
- &_vq_auxt_res0_96_1024_9,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_96_1024aux.vqh b/lib/books/res0_96_1024aux.vqh
deleted file mode 100644
index b2f98367..00000000
--- a/lib/books/res0_96_1024aux.vqh
+++ /dev/null
@@ -1,99 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- * *
- ********************************************************************
-
- function: static codebook autogenerated by huff/huffbuld
-
- ********************************************************************/
-
-#ifndef _V_res0_96_1024aux_VQH_
-#define _V_res0_96_1024aux_VQH_
-#include "codebook.h"
-
-static long _huff_lengthlist_res0_96_1024aux[] = {
- 5, 7,12,11,14,12,18,17,18,19, 8, 7, 9,11,11,13,
- 18,16,19,19,14,10,11,13,13,18,19,19,19,19,10,11,
- 13,12,14,13,19,18,19,19,14,12,14,15,16,18,18,19,
- 19,19,11,12,16,13,18,13,19,18,19,19,16,17,19,19,
- 19,19,19,19,19,19,14,16,19,19,19,18,19,19,19,19,
- 19,18,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19, 7, 7,10,11,12,13,19,16,19,19, 6, 3,
- 4, 6, 8, 9,14,15,19,19,10, 5, 5, 8, 8,12,16,18,
- 19,19, 9, 6, 7, 7,10,10,15,15,19,19,12, 8, 8,10,
- 11,13,16,18,19,19,10, 8,11, 9,13,10,16,15,18,19,
- 16,14,15,15,17,17,17,18,19,19,14,14,17,15,18,15,
- 18,16,19,19,18,18,19,19,19,19,19,18,19,19,19,19,
- 19,19,19,19,19,19,19,19,12,10,12,14,15,16,19,19,
- 19,19, 9, 4, 5, 8, 9,11,16,17,19,19,11, 5, 4, 8,
- 8,13,16,17,19,19,13, 7, 8, 9,11,12,17,17,19,19,
- 14, 8, 8,10,10,14,16,17,19,19,12,10,11,11,14,13,
- 18,17,19,19,19,14,15,15,16,17,18,19,19,19,12,14,
- 15,15,17,16,19,19,19,19,19,19,18,19,19,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19, 9,10,13,12,
- 15,13,18,17,19,19, 9, 6, 7, 7,10, 9,16,14,18,19,
- 13, 7, 7, 9,10,12,16,17,19,19,11, 7, 9, 7,11, 9,
- 16,14,19,19,14, 9,10,11,12,13,19,19,19,19,11, 9,
- 11, 9,13,10,17,14,19,19,19,14,16,15,18,15,18,19,
- 19,19,13,14,16,13,17,12,18,17,19,19,19,18,19,18,
- 19,19,19,18,19,19,19,19,19,19,19,19,19,19,19,19,
- 14,12,13,14,15,17,19,19,19,19,11, 7, 8, 9,10,11,
- 16,16,19,19,13, 7, 7, 9,10,13,17,17,19,19,14, 8,
- 9, 9,11,11,16,17,19,19,16, 9, 9,11,12,14,17,18,
- 19,19,13,10,11,10,13,12,17,16,19,19,18,14,16,16,
- 17,17,18,19,19,19,15,15,15,14,19,15,19,17,19,19,
- 19,19,19,18,18,18,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19, 9,11,15,13,17,13,18,16,19,19,10, 8,
- 9, 8,11, 9,17,14,19,19,17, 9,10,10,12,13,18,17,
- 19,19,12, 8,10, 8,12, 9,16,14,19,19,16,10,11,11,
- 14,13,17,17,19,19,12, 9,11, 8,12, 9,16,13,19,19,
- 19,14,16,15,17,14,19,18,19,19,14,12,15,12,16,11,
- 18,14,19,19,19,18,19,17,19,17,19,19,19,19,19,19,
- 19,19,19,19,19,19,19,19,12,13,15,15,17,18,19,19,
- 19,19,15,10,10,10,12,12,17,16,19,19,18,11,11,12,
- 13,13,17,15,19,19,13, 9,11, 9,13,11,16,15,19,19,
- 17,11,12,12,10,12,13,12,19,19,12,10,13,10,14,11,
- 15,13,19,19,16,14,16,15,13,13,13,12,18,19,14,13,
- 16,13,16,12,14,12,18,19,18,18,19,18,18,16,16,17,
- 18,19,19,19,19,19,19,19,19,19,19,19,10,13,16,14,
- 19,16,19,16,19,19,13,11,11,11,12,11,15,15,18,19,
- 19,13,12,14,13,14,15,14,18,19,12,10,11,10,12,10,
- 14,14,18,19,16,11,11,12, 8,11, 9,11,18,19,10,10,
- 12, 9,13, 9,11,10,16,19,15,12,12,11, 8, 9, 7, 9,
- 14,19,11,11,14,10,10, 9, 8, 8,13,19,16,18,18,16,
- 17,14,13,13,17,19,19,19,19,19,19,19,19,19,19,19,
- 12,15,17,17,18,18,18,19,19,19,14,13,13,14,13,15,
- 14,19,19,19,19,15,13,16,12,16,14,17,19,19,16,14,
- 14,14,13,14,13,15,19,19,19,14,12,15, 8,13, 9,12,
- 18,19,13,13,16,12,13,11,11,12,19,19,18,14,11,13,
- 7,10, 6, 8,13,19,14,13,13,12, 9,10, 6, 7,13,19,
- 16,19,18,16,14,15,12,12,17,19,19,19,19,19,19,18,
- 19,19,19,19,15,18,18,19,19,19,18,19,19,19,16,16,
- 16,15,15,17,15,18,19,19,19,18,16,18,15,19,14,17,
- 19,19,18,17,16,17,14,16,14,16,19,19,19,18,15,17,
- 11,15,11,14,19,19,18,18,17,17,16,14,14,15,19,19,
- 19,17,14,15, 9,13, 8,10,15,19,19,19,15,16,11,13,
- 9, 9,14,19,19,19,19,19,15,17,14,14,19,19,19,19,
- 19,19,19,19,19,19,19,19,
-};
-
-static static_codebook _huff_book_res0_96_1024aux = {
- 3, 1000,
- _huff_lengthlist_res0_96_1024aux,
- 0, 0, 0, 0, 0,
- NULL,
- NULL,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_96_128_1.vqh b/lib/books/res0_96_128_1.vqh
deleted file mode 100644
index 2a5eff0b..00000000
--- a/lib/books/res0_96_128_1.vqh
+++ /dev/null
@@ -1,63 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_96_128_1_VQH_
-#define _V_res0_96_128_1_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_96_128_1[] = {
- 1,
- 0,
- 2,
-};
-
-static long _vq_lengthlist_res0_96_128_1[] = {
- 2, 4, 4, 4, 7, 6, 4, 6, 6, 4, 7, 7, 7,10,10, 7,
- 9,10, 4, 7, 7, 7,10, 9, 7,10, 9, 4, 7, 7, 7,10,
- 10, 7,10,10, 7,10,10,10,12,13,10,13,13, 7,10,10,
- 9,13,12,10,13,12, 4, 7, 7, 7,10,10, 7,10,10, 7,
- 10,10,10,13,12, 9,11,13, 7,10,10,10,13,13,10,13,
- 12,
-};
-
-static float _vq_quantthresh_res0_96_128_1[] = {
- -0.5, 0.5,
-};
-
-static long _vq_quantmap_res0_96_128_1[] = {
- 1, 0, 2,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_96_128_1 = {
- _vq_quantthresh_res0_96_128_1,
- _vq_quantmap_res0_96_128_1,
- 3,
- 3
-};
-
-static static_codebook _vq_book_res0_96_128_1 = {
- 4, 81,
- _vq_lengthlist_res0_96_128_1,
- 1, -535822336, 1611661312, 2, 0,
- _vq_quantlist_res0_96_128_1,
- NULL,
- &_vq_auxt_res0_96_128_1,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_96_128_2.vqh b/lib/books/res0_96_128_2.vqh
deleted file mode 100644
index 9c2f3261..00000000
--- a/lib/books/res0_96_128_2.vqh
+++ /dev/null
@@ -1,63 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_96_128_2_VQH_
-#define _V_res0_96_128_2_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_96_128_2[] = {
- 1,
- 0,
- 2,
-};
-
-static long _vq_lengthlist_res0_96_128_2[] = {
- 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 6,
- 6, 7, 6, 6, 6, 6, 7, 6, 6, 7, 6, 6, 6, 6, 7, 7,
- 7, 6, 6, 6, 6, 7, 6, 6, 6, 8, 7, 8, 8, 6, 6, 7,
- 6, 8, 7, 7, 7, 8, 6, 6, 6, 6, 6, 6, 6, 7, 7, 6,
- 7, 6, 7, 8, 7, 6, 6, 8, 6, 6, 7, 7, 8, 8, 6, 8,
- 7,
-};
-
-static float _vq_quantthresh_res0_96_128_2[] = {
- -0.5, 0.5,
-};
-
-static long _vq_quantmap_res0_96_128_2[] = {
- 1, 0, 2,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_96_128_2 = {
- _vq_quantthresh_res0_96_128_2,
- _vq_quantmap_res0_96_128_2,
- 3,
- 3
-};
-
-static static_codebook _vq_book_res0_96_128_2 = {
- 4, 81,
- _vq_lengthlist_res0_96_128_2,
- 1, -535822336, 1611661312, 2, 0,
- _vq_quantlist_res0_96_128_2,
- NULL,
- &_vq_auxt_res0_96_128_2,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_96_128_3.vqh b/lib/books/res0_96_128_3.vqh
deleted file mode 100644
index 93a7eef6..00000000
--- a/lib/books/res0_96_128_3.vqh
+++ /dev/null
@@ -1,70 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_96_128_3_VQH_
-#define _V_res0_96_128_3_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_96_128_3[] = {
- 8,
- 7,
- 9,
- 5,
- 11,
- 3,
- 13,
- 0,
- 16,
-};
-
-static long _vq_lengthlist_res0_96_128_3[] = {
- 3, 3, 3, 5, 5, 8, 8, 8, 8, 4, 4, 4, 6, 6, 8, 8,
- 9, 8, 4, 4, 4, 6, 6, 8, 8, 8, 9, 6, 7, 7,10,10,
- 11,11,11,11, 6, 7, 7,10,10,11,11,11,11, 9,10,10,
- 12,13,13,14,13,14, 9,10,10,12,12,13,14,13,13,11,
- 13,12,15,14,15,15,15,16,11,12,12,14,14,15,16,15,
- 15,
-};
-
-static float _vq_quantthresh_res0_96_128_3[] = {
- -6.5, -4, -2, -0.5, 0.5, 2, 4, 6.5,
-};
-
-static long _vq_quantmap_res0_96_128_3[] = {
- 7, 5, 3, 1, 0, 2, 4, 6,
- 8,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_96_128_3 = {
- _vq_quantthresh_res0_96_128_3,
- _vq_quantmap_res0_96_128_3,
- 9,
- 9
-};
-
-static static_codebook _vq_book_res0_96_128_3 = {
- 2, 81,
- _vq_lengthlist_res0_96_128_3,
- 1, -529530880, 1611661312, 5, 0,
- _vq_quantlist_res0_96_128_3,
- NULL,
- &_vq_auxt_res0_96_128_3,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_96_128_4.vqh b/lib/books/res0_96_128_4.vqh
deleted file mode 100644
index aaf035cc..00000000
--- a/lib/books/res0_96_128_4.vqh
+++ /dev/null
@@ -1,100 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_96_128_4_VQH_
-#define _V_res0_96_128_4_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_96_128_4[] = {
- 24,
- 23,
- 25,
- 21,
- 27,
- 19,
- 29,
- 16,
- 32,
- 13,
- 35,
- 10,
- 38,
- 7,
- 41,
- 4,
- 44,
- 0,
- 48,
-};
-
-static long _vq_lengthlist_res0_96_128_4[] = {
- 4, 4, 4, 6, 6, 6, 6, 7, 7, 6, 7, 7, 7, 8, 8, 8,
- 9, 9, 9, 5, 4, 4, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7,
- 8, 8, 9, 9, 9,10, 5, 4, 4, 6, 6, 6, 6, 7, 7, 7,
- 7, 7, 7, 8, 8, 9, 9,10,10, 7, 7, 7, 8, 8, 9, 9,
- 10,10,10,10,10,10,11,11,12,11,12,12, 7, 7, 7, 8,
- 8, 9, 9,10,10, 9,10,10,10,11,11,11,12,12,12, 9,
- 9, 9,10,11,11,11,12,12,12,12,13,13,13,13,14,14,
- 14,15,10, 9, 9,11,10,11,11,12,12,11,12,13,13,13,
- 13,14,14,15,15,11,12,11,12,12,13,13,13,13,13,13,
- 14,14,15,14,15,15,16,17,11,11,11,12,12,13,13,14,
- 14,14,13,14,14,15,14,15,14,15,15,11,12,12,14,14,
- 15,14,15,14,15,15,16,16,14,15,17,17,17,16,11,12,
- 12,13,14,14,14,15,14,15,15,16,15,16,16,17,16,17,
- 17,13,13,15,15,15,16,17,14,16,17,15,16,16,15,17,
- 17,17,17,17,13,14,13,15,15,15,15,16,15,16,16,17,
- 15,16,16,17,17,17,16,14,15,14,16,15,17,16,17,16,
- 16,17,17,17,16,17,16,17,16,17,14,15,14,16,14,17,
- 16,16,17,16,15,17,17,17,17,17,16,17,17,15,17,15,
- 17,15,17,16,17,17,17,17,16,17,17,17,17,17,17,17,
- 15,15,14,15,15,17,17,17,17,16,17,17,16,17,17,17,
- 17,17,17,15,15,16,17,15,17,16,17,16,16,17,17,17,
- 17,17,17,17,17,17,15,15,16,16,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,
-};
-
-static float _vq_quantthresh_res0_96_128_4[] = {
- -22, -18.5, -15.5, -12.5, -9.5, -6.5, -4, -2,
- -0.5, 0.5, 2, 4, 6.5, 9.5, 12.5, 15.5,
- 18.5, 22,
-};
-
-static long _vq_quantmap_res0_96_128_4[] = {
- 17, 15, 13, 11, 9, 7, 5, 3,
- 1, 0, 2, 4, 6, 8, 10, 12,
- 14, 16, 18,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_96_128_4 = {
- _vq_quantthresh_res0_96_128_4,
- _vq_quantmap_res0_96_128_4,
- 19,
- 19
-};
-
-static static_codebook _vq_book_res0_96_128_4 = {
- 2, 361,
- _vq_lengthlist_res0_96_128_4,
- 1, -526909440, 1611661312, 6, 0,
- _vq_quantlist_res0_96_128_4,
- NULL,
- &_vq_auxt_res0_96_128_4,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_96_128_5.vqh b/lib/books/res0_96_128_5.vqh
deleted file mode 100644
index b4ef47af..00000000
--- a/lib/books/res0_96_128_5.vqh
+++ /dev/null
@@ -1,102 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- ********************************************************************
-
- function: static codebook autogenerated by vq/somethingorother
-
- ********************************************************************/
-
-#ifndef _V_res0_96_128_5_VQH_
-#define _V_res0_96_128_5_VQH_
-#include "codebook.h"
-
-static long _vq_quantlist_res0_96_128_5[] = {
- 61,
- 60,
- 62,
- 58,
- 64,
- 56,
- 66,
- 53,
- 69,
- 50,
- 72,
- 47,
- 75,
- 44,
- 78,
- 41,
- 81,
- 37,
- 85,
- 33,
- 89,
- 30,
- 92,
- 26,
- 96,
- 22,
- 100,
- 18,
- 104,
- 14,
- 108,
- 10,
- 112,
- 5,
- 117,
- 0,
- 122,
-};
-
-static long _vq_lengthlist_res0_96_128_5[] = {
- 2, 2, 2, 5, 5, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 9,
- 9,11,10, 6, 6, 7, 7, 9, 8, 9, 9,10,10,11,11,11,
- 11,13,14,12,14,
-};
-
-static float _vq_quantthresh_res0_96_128_5[] = {
- -58.5, -53.5, -49, -45, -41, -37, -33, -29.5,
- -26, -22, -18.5, -15.5, -12.5, -9.5, -6.5, -4,
- -2, -0.5, 0.5, 2, 4, 6.5, 9.5, 12.5,
- 15.5, 18.5, 22, 26, 29.5, 33, 37, 41,
- 45, 49, 53.5, 58.5,
-};
-
-static long _vq_quantmap_res0_96_128_5[] = {
- 35, 33, 31, 29, 27, 25, 23, 21,
- 19, 17, 15, 13, 11, 9, 7, 5,
- 3, 1, 0, 2, 4, 6, 8, 10,
- 12, 14, 16, 18, 20, 22, 24, 26,
- 28, 30, 32, 34, 36,
-};
-
-static encode_aux_threshmatch _vq_auxt_res0_96_128_5 = {
- _vq_quantthresh_res0_96_128_5,
- _vq_quantmap_res0_96_128_5,
- 37,
- 37
-};
-
-static static_codebook _vq_book_res0_96_128_5 = {
- 1, 37,
- _vq_lengthlist_res0_96_128_5,
- 1, -524386304, 1611661312, 7, 0,
- _vq_quantlist_res0_96_128_5,
- NULL,
- &_vq_auxt_res0_96_128_5,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res0_96_128aux.vqh b/lib/books/res0_96_128aux.vqh
deleted file mode 100644
index 2ef5f208..00000000
--- a/lib/books/res0_96_128aux.vqh
+++ /dev/null
@@ -1,50 +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-2001 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
-
- * *
- ********************************************************************
-
- function: static codebook autogenerated by huff/huffbuld
-
- ********************************************************************/
-
-#ifndef _V_res0_96_128aux_VQH_
-#define _V_res0_96_128aux_VQH_
-#include "codebook.h"
-
-static long _huff_lengthlist_res0_96_128aux[] = {
- 5, 7,10,10,15,16, 6, 5, 7, 9,14,16,11, 9,10,12,
- 16,16,10, 9,13,11,14,16,15,14,16,16,16,16,16,16,
- 16,16,16,16, 5, 5, 9,10,13,16, 4, 2, 5, 7,16,16,
- 8, 5, 7,11,16,16, 9, 7,10,10,14,16,15,14,16,16,
- 16,16,16,16,16,16,16,16, 9, 8,12,14,16,16, 7, 4,
- 8,12,16,16,10, 7, 8,15,16,16,12,11,13,14,16,16,
- 16,16,16,16,16,16,16,16,16,16,16,16, 8, 8,13,11,
- 15,16, 7, 6,10,10,16,16,12, 8, 7, 9,16,16,11, 7,
- 6, 7,14,16,16,11,12,10,15,16,16,14,14,16,16,16,
- 11,13,16,16,16,16,12,13,12,12,16,16,15, 6, 5, 6,
- 14,16,12, 5, 4, 4,11,14,15, 9, 9, 8,13,15,16,15,
- 15,15,16,16,16,16,16,16,16,16,16,16,16,14,16,16,
- 16,10, 9,10,16,16,16, 8, 8, 8,16,16,16,13,13,13,
- 16,16,16,16,16,16,16,15,
-};
-
-static static_codebook _huff_book_res0_96_128aux = {
- 3, 216,
- _huff_lengthlist_res0_96_128aux,
- 0, 0, 0, 0, 0,
- NULL,
- NULL,
- NULL,
- 0
-};
-
-
-#endif
diff --git a/lib/books/res_Zc_1.vqh b/lib/books/res_Zc_1.vqh
new file mode 100644
index 00000000..3fe97da8
--- /dev/null
+++ b/lib/books/res_Zc_1.vqh
@@ -0,0 +1,94 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by vq/somethingorother
+
+ ********************************************************************/
+
+#ifndef _V_res_Zc_1_VQH_
+#define _V_res_Zc_1_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Zc_1[] = {
+ 1,
+ 0,
+ 2,
+};
+
+static long _vq_lengthlist_res_Zc_1[] = {
+ 1, 6, 6, 0, 5, 5, 0, 5, 5, 5, 8, 8, 0, 9, 8, 0,
+ 8, 8, 5, 8, 9, 0, 8, 9, 0, 8, 9, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 5, 9, 8, 0, 8, 7, 0, 7, 8, 5, 8, 9,
+ 0, 7, 8, 0, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
+ 9, 8, 0, 8, 7, 0, 8, 7, 5, 8, 9, 0, 7, 8, 0, 7,
+ 8,
+};
+
+static float _vq_quantthresh_res_Zc_1[] = {
+ -0.5, 0.5,
+};
+
+static long _vq_quantmap_res_Zc_1[] = {
+ 1, 0, 2,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Zc_1 = {
+ _vq_quantthresh_res_Zc_1,
+ _vq_quantmap_res_Zc_1,
+ 3,
+ 3
+};
+
+static long _vq_pigeonmap_res_Zc_1[] = {
+ 0, 0,
+};
+
+static long _vq_fitlist_res_Zc_1[] = {
+ 0, 1, 2, 4, 5, 7, 8, 9,
+ 10, 11, 13, 14, 16, 17, 18, 19,
+ 20, 22, 23, 25, 26, 36, 37, 38,
+ 40, 41, 43, 44, 45, 46, 47, 49,
+ 50, 52, 53, 63, 64, 65, 67, 68,
+ 70, 71, 72, 73, 74, 76, 77, 79,
+ 80,
+};
+
+static long _vq_fitmap_res_Zc_1[] = {
+ 0,
+};
+
+static long _vq_fitlength_res_Zc_1[] = {
+ 49,
+};
+
+static encode_aux_pigeonhole _vq_auxp_res_Zc_1 = {
+ -1, 1, 2, 1,
+ _vq_pigeonmap_res_Zc_1,
+ 49,
+ _vq_fitlist_res_Zc_1,
+ _vq_fitmap_res_Zc_1,
+ _vq_fitlength_res_Zc_1
+};
+
+static static_codebook _vq_book_res_Zc_1 = {
+ 4, 81,
+ _vq_lengthlist_res_Zc_1,
+ 1, -535822336, 1611661312, 2, 0,
+ _vq_quantlist_res_Zc_1,
+ NULL,
+ &_vq_auxt_res_Zc_1,
+ &_vq_auxp_res_Zc_1,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/res_Zc_1024aux.vqh b/lib/books/res_Zc_1024aux.vqh
new file mode 100644
index 00000000..99dca15e
--- /dev/null
+++ b/lib/books/res_Zc_1024aux.vqh
@@ -0,0 +1,43 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_res_Zc_1024aux_VQH_
+#define _V_res_Zc_1024aux_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_res_Zc_1024aux[] = {
+ 3, 8, 9,11, 4, 7, 8,11,16,16, 8, 4, 5, 7,16,16,
+ 16,16,14,16, 8, 4, 5, 6,16,16,16,16,12,16, 9, 5,
+ 5, 5,16,16,16,16,10,16, 4,16,16,16, 3, 4, 7,11,
+ 16,16, 6,16,16,16, 4, 4, 8,13,16,16, 9,16,16,16,
+ 7, 8,10,13,16,16,11,16,16,16,11,13,12,14,16,16,
+ 14,11, 9, 6,16,16,16,16, 5,10,16,14,13, 8,16,16,
+ 16,16, 8,15,
+};
+
+static static_codebook _huff_book_res_Zc_1024aux = {
+ 2, 100,
+ _huff_lengthlist_res_Zc_1024aux,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/res_Zc_128aux.vqh b/lib/books/res_Zc_128aux.vqh
new file mode 100644
index 00000000..c8696618
--- /dev/null
+++ b/lib/books/res_Zc_128aux.vqh
@@ -0,0 +1,99 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
+ * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by huff/huffbuld
+
+ ********************************************************************/
+
+#ifndef _V_res_Zc_128aux_VQH_
+#define _V_res_Zc_128aux_VQH_
+#include "codebook.h"
+
+static long _huff_lengthlist_res_Zc_128aux[] = {
+ 4,15,15,15, 6, 8,11,11,15,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, 6,14,14,14, 6, 7,10,12,
+ 14,14, 9,14,14,14, 7, 7,10,13,14,14,13,14,14,14,
+ 11,11,12,13,14,14,13,14,14,14,13,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,13,13,14,14,10,10,11,13,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, 9,14,14,14,
+ 7, 6, 8, 9,14,14, 9,14,14,14, 6, 5, 7, 8,14,14,
+ 10,14,14,14, 7, 7, 8,10,14,14,12,14,14,14,10,10,
+ 11,12,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+ 14,14,14,14,14,14,14,14,11,14,14,14, 9,10,12,13,
+ 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,
+ 9,14,14,14, 7, 7, 9,12,14,14,10,14,14,14, 7, 6,
+ 8,11,14,14,11,14,14,14, 9, 8,10,12,14,14,13,14,
+ 14,14,13,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,12,14,14,14,
+ 10,11,12,13,14,14,14,12,13,13,14,14,14,14,14,14,
+ 14,12,12,14,14,14,14,14,14,14,14,13,13,14,14,14,
+ 14,14,14,14,10,14,14,14, 9, 9,11,12,14,14,13,14,
+ 14,14,10,10,11,14,14,14,13,14,14,14,12,11,14,13,
+ 14,14,13,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,
+ 5,14,14,14, 5, 8,11,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,14,14,14,14,14,14, 5,14,14,14, 4, 6, 9,12,
+ 14,14, 7,14,14,14, 5, 6, 9,12,14,14,10,14,14,14,
+ 9, 9,12,14,14,14,14,14,14,14,14,13,14,14,14,14,
+ 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,
+ 14,14,14,14, 7,14,14,14, 7, 8,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, 6,14,14,14,
+ 5, 6, 9,13,14,14, 7,14,14,14, 5, 5, 9,13,14,14,
+ 11,14,14,14, 9, 9,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,14,14,14,14,14,14,14,11,14,14,14,10,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,14,14,14,14,14,14,14,14,
+ 9,14,14,14, 8, 9,11,14,14,14,10,14,14,14, 8, 8,
+ 10,14,14,14,12,14,14,14,11,10,13,14,14,14,14,14,
+ 14,14,14,14,13,14,14,14,14,14,14,14,14,14,14,14,
+ 14,14,14,14,14,14,14,14,14,14,14,14,13,14,14,14,
+ 12,13,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,13,14,14,14,12,13,14,14,14,14,13,14,
+ 14,14,13,12,13,14,14,14,14,14,14,14,13,12,13,14,
+ 14,14,14,14,14,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,14,14,
+ 12,14,13,13,12,13,14,14,13,14,14, 6, 5, 6,14,14,
+ 14,14,11,14,13, 5, 5, 6,14,14,14,14,10,14,13, 7,
+ 7, 6,14,14,14,14,10,14,13,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,13,14,13,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,11,
+ 10,10,14,14,14,14,14,14,14,10, 9, 9,14,14,14,14,
+ 13,14,14,11,11, 8,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,
+};
+
+static static_codebook _huff_book_res_Zc_128aux = {
+ 3, 1000,
+ _huff_lengthlist_res_Zc_128aux,
+ 0, 0, 0, 0, 0,
+ NULL,
+ NULL,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/res_Zc_2.vqh b/lib/books/res_Zc_2.vqh
new file mode 100644
index 00000000..385e2c37
--- /dev/null
+++ b/lib/books/res_Zc_2.vqh
@@ -0,0 +1,300 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by vq/somethingorother
+
+ ********************************************************************/
+
+#ifndef _V_res_Zc_2_VQH_
+#define _V_res_Zc_2_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Zc_2[] = {
+ 2,
+ 1,
+ 3,
+ 0,
+ 4,
+};
+
+static long _vq_lengthlist_res_Zc_2[] = {
+ 2, 6, 5, 8, 8, 0, 5, 5, 9, 8, 0, 5, 5, 8, 9, 0,
+ 7, 7, 9, 9, 0, 0, 0, 9,10, 6, 8, 8,10,10, 0, 8,
+ 8,11,10, 0, 8, 8,10,10, 0,10, 9,12,11, 0, 0, 0,
+ 11,11, 6, 8, 8,10,10, 0, 8, 9,10,11, 0, 8, 8,10,
+ 10, 0, 9,10,11,11, 0, 0, 0,12,12, 8,10,10,12,12,
+ 0,11,11,13,12, 0,11,11,12,12, 0,14,14,15,14, 0,
+ 0, 0,16,14, 8,10,10,12,12, 0,11,12,12,13, 0,11,
+ 11,12,12, 0,12,13,13,14, 0, 0, 0,15,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, 8,11,11, 0, 8, 7,10,10,
+ 0, 7, 7,10,10, 0, 9, 8,11,11, 0, 0, 0,11,11, 5,
+ 8, 8,11,11, 0, 7, 8,10,11, 0, 8, 7,11,10, 0, 8,
+ 9,11,11, 0, 0, 0,11,11, 8,10,10,12,12, 0,11,10,
+ 12,12, 0,10,10,12,12, 0,13,12,13,13, 0, 0, 0,13,
+ 13, 8,10,10,13,14, 0,10,11,12,13, 0,10,10,12,12,
+ 0,12,13,14,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, 8,11,11, 0, 8, 7,11,10, 0, 7, 7,
+ 11,10, 0, 9, 9,11,11, 0, 0, 0,11,11, 5, 8, 8,11,
+ 12, 0, 7, 8,10,11, 0, 7, 7,10,11, 0, 9, 9,11,11,
+ 0, 0, 0,11,12, 8,11,10,13,12, 0,10,10,13,12, 0,
+ 11,10,13,12, 0,13,12,13,13, 0, 0, 0,14,13, 8,10,
+ 11,12,13, 0,10,11,12,13, 0,10,10,13,12, 0,12,13,
+ 13,13, 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,
+ 7, 9,10,12,13, 0, 9, 8,12,13, 0, 8, 9,12,12, 0,
+ 11,10,13,13, 0, 0, 0,13,13, 7,10, 9,13,13, 0, 9,
+ 9,13,12, 0, 9, 8,14,12, 0,10,11,13,13, 0, 0, 0,
+ 13,12, 9,11,11,15,16, 0,12,10,14,14, 0,10,12,12,
+ 13, 0,13,12,14,14, 0, 0, 0,13,13, 9,12,11,14,14,
+ 0,11,11,13,14, 0,11,10,13,12, 0,13,13,14,14, 0,
+ 0, 0,14,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, 0,13, 0,11,11,13,13, 0,11,11,14,13, 0,13,
+ 13,14,14, 0, 0, 0,15,14,10,11,12,13,14, 0,11,11,
+ 12,14, 0,11,11,13,14, 0,13,13,13,14, 0, 0, 0,14,
+ 15,
+};
+
+static float _vq_quantthresh_res_Zc_2[] = {
+ -1.5, -0.5, 0.5, 1.5,
+};
+
+static long _vq_quantmap_res_Zc_2[] = {
+ 3, 1, 0, 2, 4,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Zc_2 = {
+ _vq_quantthresh_res_Zc_2,
+ _vq_quantmap_res_Zc_2,
+ 5,
+ 5
+};
+
+static long _vq_pigeonmap_res_Zc_2[] = {
+ 1, 0, 0, 0,
+};
+
+static long _vq_fitlist_res_Zc_2[] = {
+ 0, 1, 2, 3, 6, 7, 8, 11,
+ 12, 13, 16, 17, 18, 25, 26, 27,
+ 28, 31, 32, 33, 36, 37, 38, 41,
+ 42, 43, 50, 51, 52, 53, 56, 57,
+ 58, 61, 62, 63, 66, 67, 68, 75,
+ 76, 77, 78, 81, 82, 83, 86, 87,
+ 88, 91, 92, 93, 150, 151, 152, 153,
+ 156, 157, 158, 161, 162, 163, 166, 167,
+ 168, 175, 176, 177, 178, 181, 182, 183,
+ 186, 187, 188, 191, 192, 193, 200, 201,
+ 202, 203, 206, 207, 208, 211, 212, 213,
+ 216, 217, 218, 275, 276, 277, 278, 281,
+ 282, 283, 286, 287, 288, 291, 292, 293,
+ 300, 301, 302, 303, 306, 307, 308, 311,
+ 316, 325, 326, 327, 328, 331, 332, 333,
+ 336, 341, 400, 401, 402, 403, 406, 407,
+ 408, 411, 412, 413, 416, 417, 418, 425,
+ 426, 427, 428, 431, 432, 433, 436, 441,
+ 450, 451, 452, 453, 456, 457, 458, 461,
+ 466, 4, 9, 14, 19, 29, 34, 39,
+ 44, 54, 59, 64, 69, 79, 84, 89,
+ 94, 154, 159, 164, 169, 179, 184, 189,
+ 194, 204, 209, 214, 219, 279, 284, 289,
+ 294, 304, 309, 312, 317, 329, 334, 337,
+ 342, 404, 409, 414, 419, 429, 434, 437,
+ 442, 454, 459, 462, 467, 314, 319, 339,
+ 344, 439, 444, 464, 469, 23, 48, 73,
+ 98, 173, 198, 223, 298, 313, 338, 423,
+ 438, 463, 24, 49, 74, 99, 174, 199,
+ 224, 299, 424, 324, 349, 449, 474, 323,
+ 348, 448, 473, 100, 101, 102, 103, 106,
+ 107, 108, 111, 112, 113, 116, 117, 118,
+ 225, 226, 227, 228, 231, 232, 233, 236,
+ 237, 238, 241, 242, 243, 318, 350, 351,
+ 352, 353, 356, 357, 358, 361, 366, 443,
+ 475, 476, 477, 478, 481, 482, 483, 486,
+ 491, 104, 109, 114, 119, 229, 234, 239,
+ 244, 354, 359, 362, 367, 479, 484, 487,
+ 492, 364, 369, 489, 494, 123, 248, 363,
+ 488, 124, 249, 374, 499, 373, 498, 368,
+ 493, 343, 575, 576, 577, 581, 582, 583,
+ 586, 591, 579, 584, 587, 592, 589, 594,
+ 588, 599, 598, 600, 601, 602, 603, 606,
+ 607, 608, 611, 616, 604, 609, 612, 617,
+ 614, 619, 613, 624, 623, 618, 593, 0,
+ 1, 3, 6, 8, 11, 13, 16, 18,
+ 25, 26, 28, 31, 33, 36, 38, 41,
+ 43, 50, 51, 53, 56, 58, 61, 63,
+ 66, 68, 75, 76, 78, 81, 83, 86,
+ 88, 91, 93, 150, 151, 153, 156, 158,
+ 161, 163, 166, 168, 175, 176, 178, 181,
+ 183, 186, 188, 191, 193, 200, 201, 203,
+ 206, 208, 211, 213, 216, 218, 275, 276,
+ 278, 281, 283, 286, 288, 291, 293, 300,
+ 301, 303, 306, 308, 311, 313, 316, 318,
+ 325, 326, 328, 331, 333, 336, 338, 341,
+ 343, 400, 401, 403, 406, 408, 411, 413,
+ 416, 418, 425, 426, 428, 431, 433, 436,
+ 438, 441, 443, 450, 451, 453, 456, 458,
+ 461, 463, 466, 468, 23, 48, 73, 98,
+ 173, 198, 223, 298, 323, 348, 423, 448,
+ 473, 100, 101, 103, 106, 108, 111, 113,
+ 116, 118, 225, 226, 228, 231, 233, 236,
+ 238, 241, 243, 350, 351, 353, 356, 358,
+ 361, 363, 366, 368, 475, 476, 478, 481,
+ 483, 486, 488, 491, 493, 123, 248, 373,
+ 498, 575, 576, 581, 583, 586, 588, 591,
+ 593, 598, 600, 601, 603, 606, 608, 611,
+ 613, 616, 618, 623, 0, 1, 2, 3,
+ 6, 7, 8, 16, 17, 18, 25, 26,
+ 27, 28, 31, 32, 33, 41, 42, 43,
+ 50, 51, 52, 53, 56, 57, 58, 66,
+ 67, 68, 75, 76, 77, 78, 81, 82,
+ 83, 91, 92, 93, 150, 151, 152, 153,
+ 156, 157, 158, 166, 167, 168, 175, 176,
+ 177, 178, 181, 182, 183, 191, 192, 193,
+ 200, 201, 202, 203, 206, 207, 208, 216,
+ 217, 218, 275, 276, 277, 278, 281, 282,
+ 283, 291, 292, 293, 300, 301, 306, 307,
+ 308, 316, 317, 318, 325, 326, 331, 332,
+ 333, 341, 342, 343, 400, 401, 402, 403,
+ 406, 407, 408, 416, 417, 418, 425, 426,
+ 431, 432, 433, 441, 442, 443, 450, 451,
+ 456, 457, 458, 466, 467, 468, 4, 9,
+ 19, 29, 34, 44, 54, 59, 69, 79,
+ 84, 94, 154, 159, 169, 179, 184, 194,
+ 204, 209, 219, 279, 284, 294, 302, 309,
+ 319, 327, 334, 344, 404, 409, 419, 427,
+ 434, 444, 452, 459, 469, 304, 329, 429,
+ 454, 100, 101, 102, 103, 106, 107, 108,
+ 116, 117, 118, 225, 226, 227, 228, 231,
+ 232, 233, 241, 242, 243, 303, 350, 351,
+ 356, 357, 358, 366, 367, 368, 428, 475,
+ 476, 481, 482, 483, 491, 492, 493, 104,
+ 109, 119, 229, 234, 244, 352, 359, 369,
+ 477, 484, 494, 354, 479, 353, 478, 328,
+ 575, 576, 581, 582, 583, 591, 592, 593,
+ 577, 584, 594, 579, 600, 601, 606, 607,
+ 608, 616, 617, 618, 602, 609, 619, 604,
+ 603, 0, 1, 2, 3, 6, 7, 8,
+ 11, 12, 13, 16, 17, 18, 25, 26,
+ 27, 28, 31, 32, 33, 36, 37, 38,
+ 41, 42, 43, 75, 76, 77, 78, 81,
+ 82, 83, 86, 87, 88, 91, 92, 93,
+ 150, 151, 152, 153, 156, 157, 158, 161,
+ 162, 163, 166, 167, 168, 200, 201, 202,
+ 203, 206, 207, 208, 211, 212, 213, 216,
+ 217, 218, 275, 276, 277, 278, 281, 282,
+ 283, 286, 287, 288, 291, 292, 293, 325,
+ 326, 327, 328, 331, 332, 333, 336, 337,
+ 338, 341, 342, 343, 400, 401, 402, 403,
+ 406, 407, 408, 411, 412, 413, 416, 417,
+ 418, 450, 451, 452, 453, 456, 457, 458,
+ 461, 462, 463, 466, 467, 468, 4, 9,
+ 14, 19, 29, 34, 39, 44, 79, 84,
+ 89, 94, 154, 159, 164, 169, 204, 209,
+ 214, 219, 279, 284, 289, 294, 329, 334,
+ 339, 344, 404, 409, 414, 419, 454, 459,
+ 464, 469, 23, 48, 98, 173, 223, 298,
+ 348, 423, 473, 24, 49, 99, 174, 224,
+ 299, 349, 424, 474, 575, 576, 577, 581,
+ 582, 583, 586, 587, 588, 591, 592, 593,
+ 579, 584, 589, 594, 598, 599, 0, 1,
+ 2, 3, 6, 7, 8, 11, 12, 13,
+ 16, 17, 18, 25, 26, 27, 28, 31,
+ 32, 33, 36, 37, 38, 41, 42, 43,
+ 50, 51, 52, 53, 56, 57, 58, 61,
+ 66, 75, 76, 77, 78, 81, 82, 83,
+ 86, 91, 150, 151, 152, 153, 156, 157,
+ 158, 161, 162, 163, 166, 167, 168, 175,
+ 176, 177, 178, 181, 182, 183, 186, 187,
+ 188, 191, 192, 193, 200, 201, 202, 203,
+ 206, 207, 208, 211, 212, 213, 216, 217,
+ 218, 400, 401, 402, 403, 406, 407, 408,
+ 411, 412, 413, 416, 417, 418, 425, 426,
+ 427, 428, 431, 432, 433, 436, 437, 438,
+ 441, 442, 443, 450, 451, 452, 453, 456,
+ 457, 458, 461, 462, 463, 466, 467, 468,
+ 4, 9, 14, 19, 29, 34, 39, 44,
+ 54, 59, 62, 67, 79, 84, 87, 92,
+ 154, 159, 164, 169, 179, 184, 189, 194,
+ 204, 209, 214, 219, 404, 409, 414, 419,
+ 429, 434, 439, 444, 454, 459, 464, 469,
+ 64, 69, 89, 94, 23, 48, 63, 88,
+ 173, 198, 223, 423, 448, 473, 24, 49,
+ 174, 199, 224, 424, 449, 474, 74, 99,
+ 73, 98, 68, 100, 101, 102, 103, 106,
+ 107, 108, 111, 116, 225, 226, 227, 228,
+ 231, 232, 233, 236, 237, 238, 241, 242,
+ 243, 475, 476, 477, 478, 481, 482, 483,
+ 486, 487, 488, 491, 492, 493, 104, 109,
+ 112, 117, 229, 234, 239, 244, 479, 484,
+ 489, 494, 114, 119, 113, 248, 498, 249,
+ 499, 124, 123, 118, 0, 1, 2, 3,
+ 6, 7, 8, 16, 17, 18, 25, 26,
+ 27, 28, 31, 32, 33, 41, 42, 43,
+ 50, 51, 56, 57, 58, 66, 67, 68,
+ 75, 76, 81, 82, 83, 91, 92, 93,
+ 150, 151, 152, 153, 156, 157, 158, 166,
+ 167, 168, 175, 176, 177, 178, 181, 182,
+ 183, 191, 192, 193, 200, 201, 202, 203,
+ 206, 207, 208, 216, 217, 218, 400, 401,
+ 402, 403, 406, 407, 408, 416, 417, 418,
+ 425, 426, 427, 428, 431, 432, 433, 441,
+ 442, 443, 450, 451, 452, 453, 456, 457,
+ 458, 466, 467, 468, 4, 9, 19, 29,
+ 34, 44, 52, 59, 69, 77, 84, 94,
+ 154, 159, 169, 179, 184, 194, 204, 209,
+ 219, 404, 409, 419, 429, 434, 444, 454,
+ 459, 469, 54, 79, 53, 100, 101, 106,
+ 107, 108, 116, 117, 118, 225, 226, 227,
+ 228, 231, 232, 233, 241, 242, 243, 475,
+ 476, 477, 478, 481, 482, 483, 491, 492,
+ 493, 102, 109, 119, 229, 234, 244, 479,
+ 484, 494, 104, 103,
+};
+
+static long _vq_fitmap_res_Zc_2[] = {
+ 0, 359, 548, 359, 793, 359, 793, 359,
+ 982, 359, 1228, 359, 793, 359, 793, 359,
+};
+
+static long _vq_fitlength_res_Zc_2[] = {
+ 359, 189, 245, 189, 189, 189, 189, 189,
+ 246, 189, 168, 189, 189, 189, 189, 189,
+};
+
+static encode_aux_pigeonhole _vq_auxp_res_Zc_2 = {
+ -2, 1, 4, 2,
+ _vq_pigeonmap_res_Zc_2,
+ 1396,
+ _vq_fitlist_res_Zc_2,
+ _vq_fitmap_res_Zc_2,
+ _vq_fitlength_res_Zc_2
+};
+
+static static_codebook _vq_book_res_Zc_2 = {
+ 4, 625,
+ _vq_lengthlist_res_Zc_2,
+ 1, -533725184, 1611661312, 3, 0,
+ _vq_quantlist_res_Zc_2,
+ NULL,
+ &_vq_auxt_res_Zc_2,
+ &_vq_auxp_res_Zc_2,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/res_Zc_3.vqh b/lib/books/res_Zc_3.vqh
new file mode 100644
index 00000000..b862e0a6
--- /dev/null
+++ b/lib/books/res_Zc_3.vqh
@@ -0,0 +1,248 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by vq/somethingorother
+
+ ********************************************************************/
+
+#ifndef _V_res_Zc_3_VQH_
+#define _V_res_Zc_3_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Zc_3[] = {
+ 7,
+ 6,
+ 8,
+ 5,
+ 9,
+ 4,
+ 10,
+ 3,
+ 11,
+ 2,
+ 12,
+ 1,
+ 13,
+ 0,
+ 14,
+};
+
+static long _vq_lengthlist_res_Zc_3[] = {
+ 1, 5, 5, 7, 7, 8, 8, 9, 9,11,10,12,11,12,13, 0,
+ 4, 4, 7, 7, 8, 8, 9, 9,11,11,11,11,12,12, 0, 4,
+ 4, 7, 7, 8, 8, 9,10,11,11,12,12,12,13, 0, 7, 7,
+ 8, 8, 8, 8,10,10,11,11,12,12,13,13, 0, 0, 0, 8,
+ 8, 9, 9,10,10,11,11,12,12,13,13, 0, 0, 0, 8, 8,
+ 9, 9,10,10,12,11,12,12,13,13, 0, 0, 0, 8, 8, 9,
+ 9,11,10,12,11,13,13,13,14, 0, 0, 0, 9, 9,10,10,
+ 11,11,12,12,12,13,13,14, 0, 0, 0, 0, 0,10,10,12,
+ 11,12,12,13,13,14,14, 0, 0, 0, 0, 0,11,11,11,11,
+ 12,12,13,13,14,14, 0, 0, 0, 0, 0,11,11,12,12,14,
+ 13,15,13,15,15, 0, 0, 0, 0, 0,12,12,12,12,12,13,
+ 13,13,15,14, 0, 0, 0, 0, 0, 0, 0,12,12,14,13,14,
+ 15,15,16, 0, 0, 0, 0, 0, 0, 0,13,12,13,13,14,14,
+ 15,15, 0, 0, 0, 0, 0, 0, 0,13,13,15,14,14,15,16,
+ 15,
+};
+
+static float _vq_quantthresh_res_Zc_3[] = {
+ -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,
+};
+
+static long _vq_quantmap_res_Zc_3[] = {
+ 13, 11, 9, 7, 5, 3, 1, 0,
+ 2, 4, 6, 8, 10, 12, 14,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Zc_3 = {
+ _vq_quantthresh_res_Zc_3,
+ _vq_quantmap_res_Zc_3,
+ 15,
+ 15
+};
+
+static long _vq_pigeonmap_res_Zc_3[] = {
+ 4, 3, 3, 2, 1, 1, 0, 0,
+ 0, 1, 2, 2, 3, 4,
+};
+
+static long _vq_fitlist_res_Zc_3[] = {
+ 0, 1, 2, 3, 16, 17, 18, 31,
+ 46, 4, 19, 32, 47, 6, 21, 34,
+ 49, 33, 36, 64, 63, 66, 94, 1,
+ 3, 5, 7, 16, 18, 20, 22, 33,
+ 35, 48, 50, 0, 31, 46, 2, 4,
+ 6, 8, 17, 19, 21, 23, 34, 36,
+ 49, 51, 37, 63, 65, 32, 38, 64,
+ 66, 67, 93, 95, 68, 94, 96, 3,
+ 5, 7, 9, 18, 20, 22, 24, 35,
+ 37, 50, 52, 4, 6, 8, 10, 19,
+ 21, 23, 25, 36, 38, 51, 53, 12,
+ 27, 40, 55, 33, 39, 65, 67, 34,
+ 66, 68, 42, 70, 63, 69, 95, 97,
+ 64, 96, 98, 72, 100, 7, 9, 11,
+ 13, 22, 24, 26, 28, 39, 41, 54,
+ 56, 5, 20, 37, 52, 8, 10, 12,
+ 14, 23, 25, 27, 29, 40, 42, 55,
+ 57, 43, 69, 71, 35, 67, 38, 44,
+ 70, 72, 73, 99, 101, 65, 97, 68,
+ 74, 100, 102, 9, 11, 13, 24, 26,
+ 28, 41, 43, 56, 58, 10, 12, 14,
+ 25, 27, 29, 42, 44, 57, 59, 39,
+ 71, 73, 40, 72, 74, 69, 101, 103,
+ 70, 102, 104, 16, 46, 47, 48, 78,
+ 17, 49, 79, 19, 51, 81, 109, 0,
+ 1, 18, 2, 4, 21, 31, 32, 33,
+ 63, 64, 65, 93, 94, 95, 34, 66,
+ 96, 18, 20, 46, 48, 50, 52, 78,
+ 80, 82, 108, 110, 16, 19, 21, 47,
+ 49, 51, 53, 79, 81, 83, 109, 111,
+ 3, 5, 22, 1, 4, 6, 17, 23,
+ 33, 35, 63, 65, 67, 93, 95, 97,
+ 125, 31, 34, 36, 64, 66, 68, 94,
+ 96, 98, 126, 20, 22, 48, 50, 52,
+ 54, 78, 80, 82, 84, 110, 112, 21,
+ 23, 49, 51, 53, 55, 79, 81, 83,
+ 85, 111, 113, 25, 57, 87, 115, 5,
+ 7, 18, 24, 6, 8, 19, 10, 27,
+ 35, 37, 63, 65, 67, 69, 93, 95,
+ 97, 99, 125, 127, 36, 38, 64, 66,
+ 68, 70, 94, 96, 98, 100, 126, 128,
+ 40, 72, 102, 130, 24, 26, 52, 54,
+ 56, 58, 82, 84, 86, 88, 114, 116,
+ 22, 50, 80, 112, 25, 27, 53, 55,
+ 57, 59, 83, 85, 87, 89, 115, 117,
+ 9, 11, 28, 7, 20, 10, 12, 23,
+ 29, 39, 41, 67, 69, 71, 73, 97,
+ 99, 101, 103, 129, 131, 37, 65, 95,
+ 127, 40, 42, 68, 70, 72, 74, 98,
+ 100, 102, 104, 130, 132, 26, 28, 54,
+ 56, 58, 84, 86, 88, 116, 118, 27,
+ 29, 55, 57, 59, 85, 87, 89, 117,
+ 119, 11, 13, 24, 12, 14, 25, 41,
+ 43, 69, 71, 73, 99, 101, 103, 131,
+ 133, 42, 44, 70, 72, 74, 100, 102,
+ 104, 132, 134, 16, 46, 47, 48, 78,
+ 79, 80, 108, 109, 110, 17, 49, 81,
+ 111, 31, 63, 93, 94, 95, 125, 32,
+ 64, 96, 126, 155, 156, 128, 158, 48,
+ 50, 78, 80, 82, 108, 110, 112, 140,
+ 46, 49, 51, 79, 81, 83, 109, 111,
+ 113, 141, 63, 65, 93, 95, 97, 125,
+ 127, 155, 64, 66, 94, 96, 98, 126,
+ 128, 156, 157, 158, 50, 52, 78, 80,
+ 82, 84, 108, 110, 112, 114, 140, 142,
+ 51, 53, 79, 81, 83, 85, 109, 111,
+ 113, 115, 141, 143, 55, 87, 117, 145,
+ 65, 67, 93, 95, 97, 99, 125, 127,
+ 129, 155, 157, 66, 68, 94, 96, 98,
+ 100, 126, 128, 130, 156, 158, 70, 102,
+ 132, 160, 159, 187, 188, 162, 190, 54,
+ 56, 82, 84, 86, 88, 112, 114, 116,
+ 118, 144, 146, 52, 80, 110, 142, 55,
+ 57, 83, 85, 87, 89, 113, 115, 117,
+ 119, 145, 147, 69, 71, 97, 99, 101,
+ 103, 127, 129, 131, 133, 159, 161, 67,
+ 95, 125, 157, 70, 72, 98, 100, 102,
+ 104, 128, 130, 132, 134, 160, 162, 163,
+ 189, 191, 155, 187, 158, 164, 190, 192,
+ 56, 58, 84, 86, 88, 114, 116, 118,
+ 146, 148, 57, 59, 85, 87, 89, 115,
+ 117, 119, 147, 149, 71, 73, 99, 101,
+ 103, 129, 131, 133, 161, 163, 72, 74,
+ 100, 102, 104, 130, 132, 134, 162, 164,
+ 159, 191, 193, 160, 192, 194, 78, 108,
+ 109, 110, 140, 170, 79, 111, 141, 171,
+ 143, 173, 46, 47, 93, 94, 95, 125,
+ 155, 156, 157, 187, 96, 126, 158, 188,
+ 108, 110, 140, 142, 170, 172, 78, 109,
+ 111, 141, 143, 171, 173, 80, 112, 79,
+ 81, 113, 125, 155, 157, 187, 93, 126,
+ 156, 158, 188, 110, 112, 140, 142, 144,
+ 170, 172, 174, 202, 111, 113, 141, 143,
+ 145, 171, 173, 175, 203, 115, 147, 177,
+ 205, 80, 82, 108, 114, 81, 83, 109,
+ 85, 117, 125, 127, 155, 157, 159, 187,
+ 189, 217, 126, 128, 156, 158, 160, 188,
+ 190, 218, 130, 162, 192, 220, 114, 116,
+ 142, 144, 146, 148, 172, 174, 176, 178,
+ 204, 206, 112, 140, 170, 202, 115, 117,
+ 143, 145, 147, 149, 173, 175, 177, 179,
+ 205, 207, 84, 86, 118, 82, 110, 85,
+ 87, 113, 119, 129, 131, 157, 159, 161,
+ 163, 187, 189, 191, 193, 219, 221, 127,
+ 155, 217, 130, 132, 158, 160, 162, 164,
+ 188, 190, 192, 194, 220, 222, 116, 118,
+ 144, 146, 148, 174, 176, 178, 206, 208,
+ 117, 119, 145, 147, 149, 175, 177, 179,
+ 207, 209, 86, 88, 114, 87, 89, 115,
+ 131, 133, 159, 161, 163, 189, 191, 193,
+ 221, 223, 132, 134, 160, 162, 164, 190,
+ 192, 194, 222, 224, 108, 109, 110, 140,
+ 170, 171, 172, 202, 111, 141, 173, 203,
+ 93, 125, 155, 156, 157, 187, 217, 94,
+ 126, 158, 188, 218, 140, 170, 172, 202,
+ 108, 141, 171, 173, 203, 125, 155, 157,
+ 187, 189, 217, 219, 126, 156, 158, 188,
+ 190, 218, 220, 140, 142, 170, 172, 174,
+ 202, 204, 141, 143, 171, 173, 175, 203,
+ 205, 145, 177, 207, 155, 157, 187, 189,
+ 217, 219, 156, 158, 188, 190, 218, 220,
+ 160, 192, 222, 144, 146, 172, 174, 176,
+ 178, 202, 204, 206, 208, 142, 170, 145,
+ 147, 173, 175, 177, 179, 203, 205, 207,
+ 209, 159, 161, 187, 189, 191, 193, 217,
+ 219, 221, 223, 157, 160, 162, 188, 190,
+ 192, 194, 218, 220, 222, 224, 146, 148,
+ 174, 176, 178, 204, 206, 208, 147, 149,
+ 175, 177, 179, 205, 207, 209, 161, 163,
+ 189, 191, 193, 219, 221, 223, 162, 164,
+ 190, 192, 194, 220, 222, 224,
+};
+
+static long _vq_fitmap_res_Zc_3[] = {
+ 0, 23, 63, 109, 155, 187, 217, 267,
+ 332, 397, 443, 471, 508, 567, 632, 678,
+ 704, 731, 782, 846, 892, 916, 939, 971,
+ 1014,
+};
+
+static long _vq_fitlength_res_Zc_3[] = {
+ 23, 40, 46, 46, 32, 30, 50, 65,
+ 65, 46, 28, 37, 59, 65, 46, 26,
+ 27, 51, 64, 46, 24, 23, 32, 43,
+ 32,
+};
+
+static encode_aux_pigeonhole _vq_auxp_res_Zc_3 = {
+ -7, 1, 14, 5,
+ _vq_pigeonmap_res_Zc_3,
+ 1046,
+ _vq_fitlist_res_Zc_3,
+ _vq_fitmap_res_Zc_3,
+ _vq_fitlength_res_Zc_3
+};
+
+static static_codebook _vq_book_res_Zc_3 = {
+ 2, 225,
+ _vq_lengthlist_res_Zc_3,
+ 1, -530841600, 1611661312, 4, 0,
+ _vq_quantlist_res_Zc_3,
+ NULL,
+ &_vq_auxt_res_Zc_3,
+ &_vq_auxp_res_Zc_3,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/res_Zc_4.vqh b/lib/books/res_Zc_4.vqh
new file mode 100644
index 00000000..0a0077a6
--- /dev/null
+++ b/lib/books/res_Zc_4.vqh
@@ -0,0 +1,89 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by vq/somethingorother
+
+ ********************************************************************/
+
+#ifndef _V_res_Zc_4_VQH_
+#define _V_res_Zc_4_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Zc_4[] = {
+ 1,
+ 0,
+ 2,
+};
+
+static long _vq_lengthlist_res_Zc_4[] = {
+ 1, 3, 3, 0, 0, 0, 0, 0, 0, 4, 6, 6, 0, 0, 0, 0,
+ 0, 0, 3, 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,
+};
+
+static float _vq_quantthresh_res_Zc_4[] = {
+ -0.5, 0.5,
+};
+
+static long _vq_quantmap_res_Zc_4[] = {
+ 1, 0, 2,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Zc_4 = {
+ _vq_quantthresh_res_Zc_4,
+ _vq_quantmap_res_Zc_4,
+ 3,
+ 3
+};
+
+static long _vq_pigeonmap_res_Zc_4[] = {
+ 0, 0,
+};
+
+static long _vq_fitlist_res_Zc_4[] = {
+ 0, 1, 2, 9, 10, 11, 18, 19,
+ 20,
+};
+
+static long _vq_fitmap_res_Zc_4[] = {
+ 0,
+};
+
+static long _vq_fitlength_res_Zc_4[] = {
+ 9,
+};
+
+static encode_aux_pigeonhole _vq_auxp_res_Zc_4 = {
+ -1, 1, 2, 1,
+ _vq_pigeonmap_res_Zc_4,
+ 9,
+ _vq_fitlist_res_Zc_4,
+ _vq_fitmap_res_Zc_4,
+ _vq_fitlength_res_Zc_4
+};
+
+static static_codebook _vq_book_res_Zc_4 = {
+ 4, 81,
+ _vq_lengthlist_res_Zc_4,
+ 1, -535822336, 1611661312, 2, 0,
+ _vq_quantlist_res_Zc_4,
+ NULL,
+ &_vq_auxt_res_Zc_4,
+ &_vq_auxp_res_Zc_4,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/res_Zc_5.vqh b/lib/books/res_Zc_5.vqh
new file mode 100644
index 00000000..96334f1d
--- /dev/null
+++ b/lib/books/res_Zc_5.vqh
@@ -0,0 +1,89 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by vq/somethingorother
+
+ ********************************************************************/
+
+#ifndef _V_res_Zc_5_VQH_
+#define _V_res_Zc_5_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Zc_5[] = {
+ 1,
+ 0,
+ 2,
+};
+
+static long _vq_lengthlist_res_Zc_5[] = {
+ 1, 4, 3, 0, 0, 0, 0, 0, 0, 4, 5, 5, 0, 0, 0, 0,
+ 0, 0, 3, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 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_res_Zc_5[] = {
+ -0.5, 0.5,
+};
+
+static long _vq_quantmap_res_Zc_5[] = {
+ 1, 0, 2,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Zc_5 = {
+ _vq_quantthresh_res_Zc_5,
+ _vq_quantmap_res_Zc_5,
+ 3,
+ 3
+};
+
+static long _vq_pigeonmap_res_Zc_5[] = {
+ 0, 0,
+};
+
+static long _vq_fitlist_res_Zc_5[] = {
+ 0, 1, 2, 9, 10, 11, 18, 19,
+ 20,
+};
+
+static long _vq_fitmap_res_Zc_5[] = {
+ 0,
+};
+
+static long _vq_fitlength_res_Zc_5[] = {
+ 9,
+};
+
+static encode_aux_pigeonhole _vq_auxp_res_Zc_5 = {
+ -1, 1, 2, 1,
+ _vq_pigeonmap_res_Zc_5,
+ 9,
+ _vq_fitlist_res_Zc_5,
+ _vq_fitmap_res_Zc_5,
+ _vq_fitlength_res_Zc_5
+};
+
+static static_codebook _vq_book_res_Zc_5 = {
+ 4, 81,
+ _vq_lengthlist_res_Zc_5,
+ 1, -535822336, 1611661312, 2, 0,
+ _vq_quantlist_res_Zc_5,
+ NULL,
+ &_vq_auxt_res_Zc_5,
+ &_vq_auxp_res_Zc_5,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/res_Zc_6.vqh b/lib/books/res_Zc_6.vqh
new file mode 100644
index 00000000..c0987ab4
--- /dev/null
+++ b/lib/books/res_Zc_6.vqh
@@ -0,0 +1,129 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by vq/somethingorother
+
+ ********************************************************************/
+
+#ifndef _V_res_Zc_6_VQH_
+#define _V_res_Zc_6_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Zc_6[] = {
+ 2,
+ 1,
+ 3,
+ 0,
+ 4,
+};
+
+static long _vq_lengthlist_res_Zc_6[] = {
+ 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 6, 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, 6,10, 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,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,
+};
+
+static float _vq_quantthresh_res_Zc_6[] = {
+ -1.5, -0.5, 0.5, 1.5,
+};
+
+static long _vq_quantmap_res_Zc_6[] = {
+ 3, 1, 0, 2, 4,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Zc_6 = {
+ _vq_quantthresh_res_Zc_6,
+ _vq_quantmap_res_Zc_6,
+ 5,
+ 5
+};
+
+static long _vq_pigeonmap_res_Zc_6[] = {
+ 1, 0, 0, 0,
+};
+
+static long _vq_fitlist_res_Zc_6[] = {
+ 0, 1, 2, 3, 25, 26, 27, 28,
+ 50, 51, 52, 53, 75, 76, 77, 78,
+ 4, 29, 54, 79, 100, 101, 102, 103,
+ 104,
+};
+
+static long _vq_fitmap_res_Zc_6[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static long _vq_fitlength_res_Zc_6[] = {
+ 25, 25, 25, 25, 25, 25, 25, 25,
+ 25, 25, 25, 25, 25, 25, 25, 25,
+};
+
+static encode_aux_pigeonhole _vq_auxp_res_Zc_6 = {
+ -2, 1, 4, 2,
+ _vq_pigeonmap_res_Zc_6,
+ 25,
+ _vq_fitlist_res_Zc_6,
+ _vq_fitmap_res_Zc_6,
+ _vq_fitlength_res_Zc_6
+};
+
+static static_codebook _vq_book_res_Zc_6 = {
+ 4, 625,
+ _vq_lengthlist_res_Zc_6,
+ 1, -533725184, 1611661312, 3, 0,
+ _vq_quantlist_res_Zc_6,
+ NULL,
+ &_vq_auxt_res_Zc_6,
+ &_vq_auxp_res_Zc_6,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/res_Zc_7.vqh b/lib/books/res_Zc_7.vqh
new file mode 100644
index 00000000..f5a84afd
--- /dev/null
+++ b/lib/books/res_Zc_7.vqh
@@ -0,0 +1,119 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by vq/somethingorother
+
+ ********************************************************************/
+
+#ifndef _V_res_Zc_7_VQH_
+#define _V_res_Zc_7_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Zc_7[] = {
+ 7,
+ 6,
+ 8,
+ 5,
+ 9,
+ 4,
+ 10,
+ 3,
+ 11,
+ 2,
+ 12,
+ 1,
+ 13,
+ 0,
+ 14,
+};
+
+static long _vq_lengthlist_res_Zc_7[] = {
+ 1, 3, 3, 5, 4, 4, 4, 7, 6, 8, 0, 0, 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,
+};
+
+static float _vq_quantthresh_res_Zc_7[] = {
+ -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,
+};
+
+static long _vq_quantmap_res_Zc_7[] = {
+ 13, 11, 9, 7, 5, 3, 1, 0,
+ 2, 4, 6, 8, 10, 12, 14,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Zc_7 = {
+ _vq_quantthresh_res_Zc_7,
+ _vq_quantmap_res_Zc_7,
+ 15,
+ 15
+};
+
+static long _vq_pigeonmap_res_Zc_7[] = {
+ 4, 3, 3, 2, 1, 1, 0, 0,
+ 0, 1, 2, 2, 3, 4,
+};
+
+static long _vq_fitlist_res_Zc_7[] = {
+ 0, 1, 2, 3, 4, 6, 5, 7,
+ 8, 9, 12,
+};
+
+static long _vq_fitmap_res_Zc_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,
+};
+
+static long _vq_fitlength_res_Zc_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,
+};
+
+static encode_aux_pigeonhole _vq_auxp_res_Zc_7 = {
+ -7, 1, 14, 5,
+ _vq_pigeonmap_res_Zc_7,
+ 11,
+ _vq_fitlist_res_Zc_7,
+ _vq_fitmap_res_Zc_7,
+ _vq_fitlength_res_Zc_7
+};
+
+static static_codebook _vq_book_res_Zc_7 = {
+ 2, 225,
+ _vq_lengthlist_res_Zc_7,
+ 1, -530841600, 1611661312, 4, 0,
+ _vq_quantlist_res_Zc_7,
+ NULL,
+ &_vq_auxt_res_Zc_7,
+ &_vq_auxp_res_Zc_7,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/res_Zc_8.vqh b/lib/books/res_Zc_8.vqh
new file mode 100644
index 00000000..4644aad6
--- /dev/null
+++ b/lib/books/res_Zc_8.vqh
@@ -0,0 +1,1234 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by vq/somethingorother
+
+ ********************************************************************/
+
+#ifndef _V_res_Zc_8_VQH_
+#define _V_res_Zc_8_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Zc_8[] = {
+ 22,
+ 21,
+ 23,
+ 20,
+ 24,
+ 19,
+ 25,
+ 18,
+ 26,
+ 17,
+ 27,
+ 16,
+ 28,
+ 15,
+ 29,
+ 14,
+ 30,
+ 13,
+ 31,
+ 12,
+ 32,
+ 11,
+ 33,
+ 10,
+ 34,
+ 9,
+ 35,
+ 8,
+ 36,
+ 7,
+ 37,
+ 6,
+ 38,
+ 5,
+ 39,
+ 4,
+ 40,
+ 3,
+ 41,
+ 2,
+ 42,
+ 1,
+ 43,
+ 0,
+ 44,
+};
+
+static long _vq_lengthlist_res_Zc_8[] = {
+ 3, 5, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 8, 9, 9, 9,
+ 9, 9, 9,10, 9,10,10,10,10,11,10,12,11,12,11,13,
+ 11,13,12,15,14,15,13,15, 0,15,17, 0,16, 0, 5, 5,
+ 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,10,10,
+ 10,10,10,10,11,11,11,11,12,11,12,12,12,12,13,15,
+ 15,14,14,15,15, 0,17, 0, 0,16, 0, 5, 5, 6, 6, 7,
+ 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,
+ 10,10,10,11,10,11,11,11,11,13,12,13,13,13,13,13,
+ 13,14,14,16,16,16, 0, 0, 7, 7, 7, 7, 8, 8, 8, 8,
+ 9, 9, 9,10,10,10,10,10,10,10,10,10,11,10,11,11,
+ 11,11,11,11,12,12,12,12,14,14,13,14,14,14,15,16,
+ 16, 0,16,16, 0, 0, 0, 7, 7, 8, 8, 8, 8, 9, 9, 9,
+ 9,10,10,10,10,10,10,11,10,10,11,11,11,11,11,12,
+ 12,13,12,12,12,13,12,13,13,14,14,14,15,16, 0,16,
+ 16, 0, 0, 0, 8, 8, 8, 8, 9, 9, 9, 9, 9,10,10,10,
+ 11,10,11,11,11,11,11,11,12,12,11,12,12,12,13,13,
+ 12,13,13,14,14,14,15,15,15,15,15, 0,16, 0, 0, 0,
+ 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,10,10,10,10,10,
+ 10,10,11,11,11,11,12,12,12,12,12,12,13,14,12,13,
+ 13,14,13,14,15,16,16,16, 0,16,15, 0, 0, 0, 8, 9,
+ 9, 9, 9, 9,10,10,10,10,10,11,10,10,11,11,12,11,
+ 12,12,12,12,12,13,12,14,12,13,13,14,14,14,15,15,
+ 14, 0,15,15,16,16, 0,16, 0, 0, 0, 0, 0, 9, 8, 9,
+ 9, 9,10,10,10,10,10,10,11,11,11,11,11,11,12,12,
+ 12,12,12,13,12,13,13,14,14,13,14,14,13,14,14,15,
+ 15,16, 0, 0,16, 0, 0, 0, 0, 0, 9, 9, 9, 9,10,10,
+ 11,10,11,10,11,11,11,11,11,11,12,12,13,12,13,13,
+ 13,14,14,13,14,14,14,13,16,15,16,15, 0,15, 0,15,
+ 16, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9,10,10,10,10,11,
+ 11,11,11,11,11,11,11,12,12,12,12,13,13,14,13,14,
+ 14,13,14,14,14,15,14,15,16,16,16, 0,16,16, 0, 0,
+ 0, 0, 0, 0, 9,10,10,10,10,10,10,10,11,11,11,11,
+ 11,11,12,11,12,12,13,12,13,13,14,14,13,14,15,14,
+ 15,14,15,14,15, 0, 0, 0,15,16,16,16, 0, 0, 0, 0,
+ 0, 0, 0,10,10,11,10,10,10,11,11,11,11,11,11,12,
+ 12,12,12,12,13,13,14,13,14,14,14,14,14,13,15,14,
+ 15,16, 0, 0, 0,15,15, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 10,10,10,11,11,11,11,11,12,11,12,12,11,12,12,12,
+ 13,13,13,14,14,14,14,15,15,14,14,15,15,15, 0, 0,
+ 16,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10,10,10,
+ 10,11,11,11,11,11,11,11,11,13,12,12,12,12,13,13,
+ 13,13,14,15,15,14,16,14,15, 0,14,16, 0,16, 0,15,
+ 0,15, 0, 0, 0, 0, 0, 0, 0, 0,11,10,11,10,11,11,
+ 11,11,11,11,11,12,12,12,12,12,13,13,13,12,13,15,
+ 16,13,14,15,16, 0,15,15, 0,16,15, 0, 0,16, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11,11,10,11,11,11,
+ 11,12,11,12,12,12,12,13,12,14,14,15,14,14,14,15,
+ 0,16,15, 0,15,16,15,15,16,16, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,11,11,11,11,11,11,11,11,12,12,
+ 12,12,13,12,13,13,14,13,13,13,15,13,16, 0, 0,15,
+ 15, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0,11,11,11,11,11,11,12,11,12,12,12,12,13,
+ 13,13,13,13,13,14,16,15,14,16,16, 0, 0, 0,16, 0,
+ 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 12,11,12,12,12,12,12,12,12,12,12,13,13,13,13,13,
+ 14,13,14,13,15,15,15,15,15,16,15,16,16,15, 0,16,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,
+ 12,12,12,12,12,12,12,13,12,12,12,13,13,13,14,14,
+ 14,15,15,16,15, 0,16, 0,16,16,16, 0, 0, 0,16, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,
+ 12,12,12,12,12,12,13,13,13,13,14,12,14,14,15,14,
+ 15,15, 0,16,15,15,15,16, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,12,12,12,12,13,13,13,
+ 13,12,12,13,13,13,13,13,14,15,14,15,15,16,15,16,
+ 16, 0,16, 0, 0,16, 0,16, 0,16, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,12,12,13,12,13,12,13,13,13,13,
+ 13,13,13,12,13,14,14,14,14,15,15, 0, 0, 0,16, 0,
+ 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0,13,13,13,12,13,13,12,13,13,12,14,
+ 13,14,14,14,15,16,15,15,15,16,16, 0, 0,16, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,13,13,13,13,13,13,14,13,12,13,13,15,14,14,
+ 14,14,14,15,15,15, 0,15, 0, 0, 0,16, 0, 0, 0, 0,
+ 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,13,
+ 13,13,12,13,14,13,13,13,12,14,13,13,13,14,13,15,
+ 15, 0,16, 0, 0,16, 0,16,15, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,13,13,12,14,
+ 13,16,14,13,13,13,14,14,14,13,14,15,16,15,15, 0,
+ 15,16,15,16,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,13,13,13,13,13,
+ 13,14,14,14,14,14,14,14,14,16,15,15,15,16,15,15,
+ 0, 0, 0, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,13,14,13,13,13,13,14,13,
+ 15,13,13,14,14,14,15,16,15,14, 0,16, 0,15, 0, 0,
+ 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0,13,13,13,14,13,15,15,14,14,14,14,
+ 14,15,15,15,15, 0,15, 0, 0,16, 0,16,16, 0, 0, 0,
+ 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,14,13,13,14,14,14,13,14,14,14,14,14,14,16,
+ 16,16,15,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,13,14,13,13,13,13,14,14,14,15,14,15,14,14,16,
+ 15, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,13,13,
+ 14,14,14,14,14,15,15,15,16,15,14,16,15,16,16, 0,
+ 0, 0, 0,16, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,16,14,13,13,13,
+ 14,15,16,14,15,15, 0, 0,16,15, 0,15,14,16,16,16,
+ 0, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,16,14,14,13,14,14,16,13,
+ 15,14,14,16,15,15,16,16, 0,15, 0, 0, 0, 0, 0, 0,
+ 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0,15,14,15,14,16,13,15,15,14,
+ 16,15, 0, 0,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,13,14,15,14,15,15,14,15,15, 0, 0,16,
+ 0, 0,15,15, 0,15, 0, 0,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,14,13,15,14,14,15,15,15,16,16,16,16,16, 0,16,
+ 16,16, 0, 0,16, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,14,13,
+ 14,15,15,14,16,15,15,15,15,15,15, 0, 0,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,14,13,16,
+ 15,14,15,16,16, 0,15,16,15, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,14,14,15,15,15,15,
+ 16,15,15, 0, 0,16,16,15,16, 0, 0,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,14,14,15,16,15, 0,16,14,16,
+ 15, 0, 0,15,16, 0, 0, 0, 0, 0,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,12,14,13,16,14,14, 0,15, 0,16, 0,16,
+ 16, 0, 0, 0,16, 0, 0, 0,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,14,14,16,16,16,16, 0,16,15, 0,15,16, 0,
+ 0, 0,16, 0, 0,16, 0, 0,16,
+};
+
+static float _vq_quantthresh_res_Zc_8[] = {
+ -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, -15.5, -14.5,
+ -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, -7.5, -6.5,
+ -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5,
+ 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5,
+ 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 16.5, 17.5,
+ 18.5, 19.5, 20.5, 21.5,
+};
+
+static long _vq_quantmap_res_Zc_8[] = {
+ 43, 41, 39, 37, 35, 33, 31, 29,
+ 27, 25, 23, 21, 19, 17, 15, 13,
+ 11, 9, 7, 5, 3, 1, 0, 2,
+ 4, 6, 8, 10, 12, 14, 16, 18,
+ 20, 22, 24, 26, 28, 30, 32, 34,
+ 36, 38, 40, 42, 44,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Zc_8 = {
+ _vq_quantthresh_res_Zc_8,
+ _vq_quantmap_res_Zc_8,
+ 45,
+ 45
+};
+
+static long _vq_pigeonmap_res_Zc_8[] = {
+ 14, 13, 13, 12, 11, 11, 10, 9,
+ 9, 8, 7, 7, 6, 5, 5, 4,
+ 3, 3, 2, 1, 1, 0, 0, 0,
+ 1, 2, 2, 3, 4, 4, 5, 6,
+ 6, 7, 8, 8, 9, 10, 10, 11,
+ 12, 12, 13, 14,
+};
+
+static long _vq_fitlist_res_Zc_8[] = {
+ 0, 1, 2, 3, 46, 47, 48, 91,
+ 136, 4, 49, 92, 137, 6, 51, 94,
+ 139, 93, 96, 184, 183, 186, 274, 5,
+ 7, 50, 52, 95, 138, 140, 8, 53,
+ 141, 97, 185, 98, 187, 273, 275, 188,
+ 276, 9, 54, 142, 10, 55, 143, 12,
+ 57, 100, 145, 99, 102, 190, 189, 277,
+ 278, 192, 280, 7, 9, 11, 13, 52,
+ 54, 56, 58, 99, 101, 144, 146, 5,
+ 50, 97, 142, 8, 10, 12, 14, 53,
+ 55, 57, 59, 100, 102, 145, 147, 103,
+ 189, 191, 95, 187, 98, 104, 190, 192,
+ 193, 279, 281, 185, 277, 188, 194, 280,
+ 282, 15, 60, 148, 16, 61, 149, 18,
+ 63, 106, 151, 105, 108, 196, 195, 283,
+ 284, 198, 286, 13, 15, 17, 19, 58,
+ 60, 62, 64, 105, 107, 150, 152, 11,
+ 56, 103, 148, 14, 16, 18, 20, 59,
+ 61, 63, 65, 106, 108, 151, 153, 109,
+ 195, 197, 101, 193, 104, 110, 196, 198,
+ 199, 285, 287, 191, 283, 194, 200, 286,
+ 288, 21, 66, 154, 22, 67, 155, 24,
+ 69, 112, 157, 111, 114, 202, 201, 289,
+ 290, 204, 292, 19, 21, 23, 25, 64,
+ 66, 68, 70, 111, 113, 156, 158, 17,
+ 62, 109, 154, 20, 22, 24, 26, 65,
+ 67, 69, 71, 112, 114, 157, 159, 115,
+ 201, 203, 107, 199, 110, 116, 202, 204,
+ 205, 291, 293, 197, 289, 200, 206, 292,
+ 294, 27, 72, 160, 28, 73, 161, 30,
+ 75, 118, 163, 117, 120, 208, 207, 295,
+ 296, 210, 298, 25, 27, 29, 31, 70,
+ 72, 74, 76, 117, 119, 162, 164, 23,
+ 68, 115, 160, 26, 28, 30, 32, 71,
+ 73, 75, 77, 118, 120, 163, 165, 121,
+ 207, 209, 113, 205, 116, 122, 208, 210,
+ 211, 297, 299, 203, 295, 206, 212, 298,
+ 300, 33, 78, 166, 34, 79, 167, 36,
+ 81, 124, 169, 123, 126, 214, 213, 301,
+ 302, 216, 304, 31, 33, 35, 37, 76,
+ 78, 80, 82, 123, 125, 168, 170, 29,
+ 74, 121, 166, 32, 34, 36, 38, 77,
+ 79, 81, 83, 124, 126, 169, 171, 127,
+ 213, 215, 119, 211, 122, 128, 214, 216,
+ 217, 303, 305, 209, 301, 212, 218, 304,
+ 306, 39, 84, 172, 173, 42, 130, 175,
+ 129, 132, 220, 219, 307, 308, 310, 37,
+ 39, 41, 82, 84, 86, 129, 131, 174,
+ 176, 35, 80, 127, 172, 38, 42, 44,
+ 83, 89, 130, 132, 175, 133, 219, 221,
+ 125, 217, 128, 220, 223, 309, 311, 215,
+ 307, 218, 224, 310, 178, 179, 313, 314,
+ 262, 264, 266, 268, 354, 356, 170, 260,
+ 352, 173, 263, 265, 355, 357, 399, 401,
+ 305, 397, 308, 400, 359, 404, 46, 136,
+ 137, 138, 228, 47, 139, 229, 49, 141,
+ 231, 319, 0, 1, 48, 2, 4, 51,
+ 91, 92, 93, 183, 184, 185, 273, 274,
+ 275, 94, 186, 276, 50, 140, 142, 230,
+ 232, 318, 320, 143, 233, 321, 3, 5,
+ 52, 6, 53, 95, 187, 277, 365, 96,
+ 188, 278, 366, 322, 410, 323, 411, 367,
+ 455, 368, 456, 457, 458, 50, 52, 138,
+ 140, 142, 144, 228, 230, 232, 234, 320,
+ 322, 51, 53, 139, 141, 143, 145, 229,
+ 231, 233, 235, 321, 323, 55, 147, 237,
+ 325, 5, 7, 48, 54, 6, 8, 49,
+ 10, 57, 95, 97, 183, 185, 187, 189,
+ 273, 275, 277, 279, 365, 367, 96, 98,
+ 184, 186, 188, 190, 274, 276, 278, 280,
+ 366, 368, 100, 192, 282, 370, 54, 56,
+ 142, 144, 146, 148, 232, 234, 236, 238,
+ 324, 326, 52, 140, 230, 322, 55, 57,
+ 143, 145, 147, 149, 233, 235, 237, 239,
+ 325, 327, 9, 11, 58, 7, 50, 10,
+ 12, 53, 59, 99, 101, 187, 189, 191,
+ 193, 277, 279, 281, 283, 369, 371, 97,
+ 185, 275, 367, 100, 102, 188, 190, 192,
+ 194, 278, 280, 282, 284, 370, 372, 56,
+ 58, 144, 146, 148, 150, 234, 236, 238,
+ 240, 326, 328, 57, 59, 145, 147, 149,
+ 151, 235, 237, 239, 241, 327, 329, 61,
+ 153, 243, 331, 11, 13, 54, 60, 12,
+ 14, 55, 16, 63, 101, 103, 189, 191,
+ 193, 195, 279, 281, 283, 285, 371, 373,
+ 102, 104, 190, 192, 194, 196, 280, 282,
+ 284, 286, 372, 374, 106, 198, 288, 376,
+ 60, 62, 148, 150, 152, 154, 238, 240,
+ 242, 244, 330, 332, 58, 146, 236, 328,
+ 61, 63, 149, 151, 153, 155, 239, 241,
+ 243, 245, 331, 333, 15, 17, 64, 13,
+ 56, 16, 18, 59, 65, 105, 107, 193,
+ 195, 197, 199, 283, 285, 287, 289, 375,
+ 377, 103, 191, 281, 373, 106, 108, 194,
+ 196, 198, 200, 284, 286, 288, 290, 376,
+ 378, 62, 64, 150, 152, 154, 156, 240,
+ 242, 244, 246, 332, 334, 63, 65, 151,
+ 153, 155, 157, 241, 243, 245, 247, 333,
+ 335, 67, 159, 249, 337, 17, 19, 60,
+ 66, 18, 20, 61, 22, 69, 107, 109,
+ 195, 197, 199, 201, 285, 287, 289, 291,
+ 377, 379, 108, 110, 196, 198, 200, 202,
+ 286, 288, 290, 292, 378, 380, 112, 204,
+ 294, 382, 66, 68, 154, 156, 158, 160,
+ 244, 246, 248, 250, 336, 338, 64, 152,
+ 242, 334, 67, 69, 155, 157, 159, 161,
+ 245, 247, 249, 251, 337, 339, 21, 23,
+ 70, 19, 62, 22, 24, 65, 71, 111,
+ 113, 199, 201, 203, 205, 289, 291, 293,
+ 295, 381, 383, 109, 197, 287, 379, 112,
+ 114, 200, 202, 204, 206, 290, 292, 294,
+ 296, 382, 384, 68, 70, 156, 158, 160,
+ 162, 246, 248, 250, 252, 338, 340, 69,
+ 71, 157, 159, 161, 163, 247, 249, 251,
+ 253, 339, 341, 73, 165, 255, 343, 23,
+ 25, 66, 72, 24, 26, 67, 28, 75,
+ 113, 115, 201, 203, 205, 207, 291, 293,
+ 295, 297, 383, 385, 114, 116, 202, 204,
+ 206, 208, 292, 294, 296, 298, 384, 386,
+ 118, 210, 300, 388, 72, 74, 160, 162,
+ 164, 166, 250, 252, 254, 256, 342, 344,
+ 70, 158, 248, 340, 73, 75, 161, 163,
+ 165, 167, 251, 253, 255, 257, 343, 345,
+ 27, 29, 76, 25, 68, 28, 30, 71,
+ 77, 117, 119, 205, 207, 209, 211, 295,
+ 297, 299, 301, 387, 389, 115, 203, 293,
+ 385, 118, 120, 206, 208, 210, 212, 296,
+ 298, 300, 302, 388, 390, 74, 76, 162,
+ 164, 166, 168, 252, 254, 256, 258, 344,
+ 346, 75, 77, 163, 165, 167, 169, 253,
+ 255, 257, 259, 345, 347, 79, 171, 261,
+ 349, 29, 31, 72, 78, 30, 32, 73,
+ 34, 81, 119, 121, 207, 209, 211, 213,
+ 297, 299, 301, 303, 389, 391, 120, 122,
+ 208, 210, 212, 214, 298, 300, 302, 304,
+ 390, 392, 124, 216, 306, 394, 78, 80,
+ 166, 168, 170, 172, 256, 258, 260, 262,
+ 348, 350, 76, 164, 254, 346, 79, 81,
+ 167, 169, 171, 173, 257, 259, 261, 263,
+ 349, 351, 33, 35, 82, 31, 74, 34,
+ 36, 77, 83, 123, 125, 211, 213, 215,
+ 217, 301, 303, 305, 307, 393, 395, 121,
+ 209, 299, 391, 124, 126, 212, 214, 216,
+ 218, 302, 304, 306, 308, 394, 396, 80,
+ 82, 168, 170, 172, 174, 258, 260, 262,
+ 264, 350, 352, 81, 83, 169, 171, 173,
+ 175, 259, 261, 263, 265, 351, 355, 35,
+ 37, 78, 84, 36, 38, 79, 125, 127,
+ 213, 215, 217, 219, 303, 305, 307, 309,
+ 395, 397, 126, 128, 214, 216, 218, 220,
+ 304, 306, 308, 310, 396, 398, 130, 400,
+ 46, 136, 137, 138, 228, 229, 230, 318,
+ 319, 320, 47, 139, 231, 321, 91, 183,
+ 273, 274, 275, 365, 92, 184, 276, 366,
+ 455, 456, 368, 458, 410, 500, 411, 501,
+ 413, 503, 457, 547, 548, 412, 502, 322,
+ 323, 140, 142, 228, 230, 232, 234, 318,
+ 320, 322, 324, 410, 412, 141, 143, 229,
+ 231, 233, 235, 319, 321, 323, 325, 411,
+ 413, 145, 237, 327, 415, 185, 187, 273,
+ 275, 277, 279, 365, 367, 369, 455, 457,
+ 186, 188, 274, 276, 278, 280, 366, 368,
+ 370, 456, 458, 190, 282, 372, 460, 459,
+ 547, 548, 462, 550, 144, 146, 232, 234,
+ 236, 238, 322, 324, 326, 328, 414, 416,
+ 142, 230, 320, 412, 145, 147, 233, 235,
+ 237, 239, 323, 325, 327, 329, 415, 417,
+ 189, 191, 277, 279, 281, 283, 367, 369,
+ 371, 373, 459, 461, 187, 275, 365, 457,
+ 190, 192, 278, 280, 282, 284, 368, 370,
+ 372, 374, 460, 462, 463, 549, 551, 455,
+ 547, 458, 464, 550, 552, 146, 148, 234,
+ 236, 238, 240, 324, 326, 328, 330, 416,
+ 418, 147, 149, 235, 237, 239, 241, 325,
+ 327, 329, 331, 417, 419, 151, 243, 333,
+ 421, 191, 193, 279, 281, 283, 285, 369,
+ 371, 373, 375, 461, 463, 192, 194, 280,
+ 282, 284, 286, 370, 372, 374, 376, 462,
+ 464, 196, 288, 378, 466, 459, 465, 551,
+ 553, 460, 552, 554, 468, 556, 150, 152,
+ 238, 240, 242, 244, 328, 330, 332, 334,
+ 420, 422, 148, 236, 326, 418, 151, 153,
+ 239, 241, 243, 245, 329, 331, 333, 335,
+ 421, 423, 195, 197, 283, 285, 287, 289,
+ 373, 375, 377, 379, 465, 467, 193, 281,
+ 371, 463, 196, 198, 284, 286, 288, 290,
+ 374, 376, 378, 380, 466, 468, 469, 555,
+ 557, 461, 553, 464, 470, 556, 558, 152,
+ 154, 240, 242, 244, 246, 330, 332, 334,
+ 336, 422, 424, 153, 155, 241, 243, 245,
+ 247, 331, 333, 335, 337, 423, 425, 157,
+ 249, 339, 427, 197, 199, 285, 287, 289,
+ 291, 375, 377, 379, 381, 467, 469, 198,
+ 200, 286, 288, 290, 292, 376, 378, 380,
+ 382, 468, 470, 202, 294, 384, 472, 465,
+ 471, 557, 559, 466, 558, 560, 474, 562,
+ 156, 158, 244, 246, 248, 250, 334, 336,
+ 338, 340, 426, 428, 154, 242, 332, 424,
+ 157, 159, 245, 247, 249, 251, 335, 337,
+ 339, 341, 427, 429, 201, 203, 289, 291,
+ 293, 295, 379, 381, 383, 385, 471, 473,
+ 199, 287, 377, 469, 202, 204, 290, 292,
+ 294, 296, 380, 382, 384, 386, 472, 474,
+ 475, 561, 563, 467, 559, 470, 476, 562,
+ 564, 158, 160, 246, 248, 250, 252, 336,
+ 338, 340, 342, 428, 430, 159, 161, 247,
+ 249, 251, 253, 337, 339, 341, 343, 429,
+ 431, 163, 255, 345, 433, 203, 205, 291,
+ 293, 295, 297, 381, 383, 385, 387, 473,
+ 475, 204, 206, 292, 294, 296, 298, 382,
+ 384, 386, 388, 474, 476, 208, 300, 390,
+ 478, 471, 477, 563, 565, 472, 564, 566,
+ 480, 568, 162, 164, 250, 252, 254, 256,
+ 340, 342, 344, 346, 432, 434, 160, 248,
+ 338, 430, 163, 165, 251, 253, 255, 257,
+ 341, 343, 345, 347, 433, 435, 207, 209,
+ 295, 297, 299, 301, 385, 387, 389, 391,
+ 477, 479, 205, 293, 383, 475, 208, 210,
+ 296, 298, 300, 302, 386, 388, 390, 392,
+ 478, 480, 481, 567, 569, 473, 565, 476,
+ 482, 568, 570, 164, 166, 252, 254, 256,
+ 258, 342, 344, 346, 348, 434, 436, 165,
+ 167, 253, 255, 257, 259, 343, 345, 347,
+ 349, 435, 437, 169, 261, 351, 439, 209,
+ 211, 297, 299, 301, 303, 387, 389, 391,
+ 393, 479, 481, 210, 212, 298, 300, 302,
+ 304, 388, 390, 392, 394, 480, 482, 214,
+ 306, 396, 484, 477, 483, 569, 571, 478,
+ 570, 572, 486, 574, 168, 170, 256, 258,
+ 260, 262, 346, 348, 350, 352, 438, 440,
+ 166, 254, 344, 436, 169, 171, 257, 259,
+ 261, 263, 347, 349, 351, 439, 441, 213,
+ 215, 301, 303, 305, 307, 391, 393, 395,
+ 397, 483, 485, 211, 299, 389, 481, 214,
+ 216, 302, 304, 306, 308, 392, 394, 396,
+ 398, 484, 486, 487, 573, 575, 479, 571,
+ 482, 488, 574, 576, 170, 172, 258, 260,
+ 262, 264, 348, 350, 352, 354, 440, 442,
+ 171, 173, 259, 261, 263, 265, 349, 351,
+ 355, 441, 443, 175, 357, 445, 215, 217,
+ 303, 305, 307, 309, 393, 395, 397, 399,
+ 485, 487, 216, 218, 304, 306, 308, 310,
+ 394, 396, 398, 400, 486, 488, 220, 490,
+ 483, 489, 575, 577, 484, 576, 492, 174,
+ 176, 262, 264, 266, 268, 352, 354, 356,
+ 172, 260, 350, 442, 175, 263, 265, 355,
+ 357, 359, 445, 447, 219, 221, 307, 309,
+ 311, 313, 397, 399, 401, 489, 217, 305,
+ 395, 487, 220, 308, 310, 314, 398, 400,
+ 404, 490, 492, 493, 581, 485, 577, 488,
+ 582, 178, 448, 179, 223, 224, 320, 322,
+ 410, 412, 414, 500, 502, 504, 592, 321,
+ 323, 411, 413, 415, 501, 503, 505, 593,
+ 325, 417, 507, 595, 230, 232, 318, 324,
+ 231, 233, 319, 235, 327, 365, 367, 455,
+ 457, 459, 547, 549, 637, 366, 368, 456,
+ 458, 460, 548, 550, 638, 370, 462, 552,
+ 640, 594, 682, 683, 597, 685, 639, 642,
+ 730, 729, 732, 820, 324, 326, 412, 414,
+ 416, 418, 502, 504, 506, 508, 594, 596,
+ 322, 410, 500, 592, 325, 327, 413, 415,
+ 417, 419, 503, 505, 507, 509, 595, 597,
+ 234, 236, 328, 232, 320, 235, 237, 323,
+ 329, 369, 371, 457, 459, 461, 463, 547,
+ 549, 551, 553, 639, 641, 367, 455, 637,
+ 370, 372, 458, 460, 462, 464, 548, 550,
+ 552, 554, 640, 642, 326, 328, 414, 416,
+ 418, 420, 504, 506, 508, 510, 596, 598,
+ 327, 329, 415, 417, 419, 421, 505, 507,
+ 509, 511, 597, 599, 331, 423, 513, 601,
+ 236, 238, 324, 330, 237, 239, 325, 241,
+ 333, 371, 373, 459, 461, 463, 465, 549,
+ 551, 553, 555, 641, 643, 372, 374, 460,
+ 462, 464, 466, 550, 552, 554, 556, 642,
+ 644, 376, 468, 558, 646, 330, 332, 418,
+ 420, 422, 424, 508, 510, 512, 514, 600,
+ 602, 328, 416, 506, 598, 331, 333, 419,
+ 421, 423, 425, 509, 511, 513, 515, 601,
+ 603, 240, 242, 334, 238, 326, 241, 243,
+ 329, 335, 375, 377, 463, 465, 467, 469,
+ 553, 555, 557, 559, 645, 647, 373, 461,
+ 551, 643, 376, 378, 464, 466, 468, 470,
+ 554, 556, 558, 560, 646, 648, 332, 334,
+ 420, 422, 424, 426, 510, 512, 514, 516,
+ 602, 604, 333, 335, 421, 423, 425, 427,
+ 511, 513, 515, 517, 603, 605, 337, 429,
+ 519, 607, 242, 244, 330, 336, 243, 245,
+ 331, 247, 339, 377, 379, 465, 467, 469,
+ 471, 555, 557, 559, 561, 647, 649, 378,
+ 380, 466, 468, 470, 472, 556, 558, 560,
+ 562, 648, 650, 382, 474, 564, 652, 336,
+ 338, 424, 426, 428, 430, 514, 516, 518,
+ 520, 606, 608, 334, 422, 512, 604, 337,
+ 339, 425, 427, 429, 431, 515, 517, 519,
+ 521, 607, 609, 246, 248, 340, 244, 332,
+ 247, 249, 335, 341, 381, 383, 469, 471,
+ 473, 475, 559, 561, 563, 565, 651, 653,
+ 379, 467, 557, 649, 382, 384, 470, 472,
+ 474, 476, 560, 562, 564, 566, 652, 654,
+ 338, 340, 426, 428, 430, 432, 516, 518,
+ 520, 522, 608, 610, 339, 341, 427, 429,
+ 431, 433, 517, 519, 521, 523, 609, 611,
+ 343, 435, 525, 613, 248, 250, 336, 342,
+ 249, 251, 337, 253, 345, 383, 385, 471,
+ 473, 475, 477, 561, 563, 565, 567, 653,
+ 655, 384, 386, 472, 474, 476, 478, 562,
+ 564, 566, 568, 654, 656, 388, 480, 570,
+ 658, 342, 344, 430, 432, 434, 436, 520,
+ 522, 524, 526, 612, 614, 340, 428, 518,
+ 610, 343, 345, 431, 433, 435, 437, 521,
+ 523, 525, 527, 613, 615, 252, 254, 346,
+ 250, 338, 253, 255, 341, 347, 387, 389,
+ 475, 477, 479, 481, 565, 567, 569, 571,
+ 657, 659, 385, 473, 563, 655, 388, 390,
+ 476, 478, 480, 482, 566, 568, 570, 572,
+ 658, 660, 344, 346, 432, 434, 436, 438,
+ 522, 524, 526, 528, 614, 616, 345, 347,
+ 433, 435, 437, 439, 523, 525, 527, 529,
+ 615, 617, 349, 441, 531, 619, 254, 256,
+ 342, 348, 255, 257, 343, 259, 351, 389,
+ 391, 477, 479, 481, 483, 567, 569, 571,
+ 573, 659, 661, 390, 392, 478, 480, 482,
+ 484, 568, 570, 572, 574, 660, 662, 394,
+ 486, 576, 664, 348, 350, 436, 438, 440,
+ 442, 526, 528, 530, 532, 618, 620, 346,
+ 434, 524, 616, 349, 351, 437, 439, 441,
+ 443, 527, 529, 531, 619, 621, 258, 260,
+ 352, 256, 344, 259, 261, 347, 393, 395,
+ 481, 483, 485, 487, 571, 573, 575, 577,
+ 663, 391, 479, 569, 661, 394, 396, 482,
+ 484, 486, 488, 572, 574, 576, 664, 666,
+ 350, 352, 438, 440, 442, 528, 530, 532,
+ 620, 351, 439, 441, 443, 445, 529, 531,
+ 621, 355, 447, 537, 625, 260, 262, 348,
+ 354, 261, 263, 349, 265, 357, 395, 397,
+ 483, 485, 487, 489, 573, 575, 577, 667,
+ 396, 398, 484, 486, 488, 490, 574, 576,
+ 666, 400, 492, 582, 354, 356, 442, 448,
+ 532, 536, 538, 624, 352, 440, 530, 355,
+ 357, 443, 445, 447, 537, 539, 625, 264,
+ 266, 262, 350, 265, 359, 399, 401, 487,
+ 489, 493, 577, 581, 669, 671, 397, 485,
+ 575, 667, 400, 488, 490, 492, 582, 714,
+ 620, 717, 673, 759, 761, 757, 760, 851,
+ 758, 356, 448, 536, 538, 357, 359, 445,
+ 447, 537, 539, 266, 268, 354, 355, 401,
+ 489, 493, 581, 671, 673, 404, 490, 492,
+ 582, 318, 319, 320, 410, 500, 501, 502,
+ 592, 321, 411, 503, 593, 273, 365, 455,
+ 456, 457, 547, 637, 274, 366, 458, 548,
+ 638, 639, 729, 640, 730, 549, 550, 682,
+ 683, 684, 774, 685, 775, 819, 820, 594,
+ 595, 687, 777, 865, 505, 597, 731, 821,
+ 732, 822, 864, 912, 911, 1001, 1002, 414,
+ 416, 502, 504, 506, 508, 592, 594, 596,
+ 598, 684, 686, 412, 500, 682, 415, 417,
+ 503, 505, 507, 509, 593, 595, 597, 599,
+ 685, 687, 459, 461, 547, 549, 551, 553,
+ 637, 639, 641, 643, 729, 731, 457, 460,
+ 462, 548, 550, 552, 554, 638, 640, 642,
+ 644, 730, 732, 733, 819, 821, 734, 820,
+ 822, 416, 418, 504, 506, 508, 510, 594,
+ 596, 598, 600, 686, 688, 417, 419, 505,
+ 507, 509, 511, 595, 597, 599, 601, 687,
+ 689, 421, 513, 603, 691, 461, 463, 549,
+ 551, 553, 555, 639, 641, 643, 645, 731,
+ 733, 462, 464, 550, 552, 554, 556, 640,
+ 642, 644, 646, 732, 734, 466, 558, 648,
+ 736, 729, 735, 821, 823, 730, 822, 824,
+ 738, 826, 420, 422, 508, 510, 512, 514,
+ 598, 600, 602, 604, 690, 692, 418, 506,
+ 596, 688, 421, 423, 509, 511, 513, 515,
+ 599, 601, 603, 605, 691, 693, 465, 467,
+ 553, 555, 557, 559, 643, 645, 647, 649,
+ 735, 737, 463, 551, 641, 733, 466, 468,
+ 554, 556, 558, 560, 644, 646, 648, 650,
+ 736, 738, 739, 825, 827, 731, 823, 734,
+ 740, 826, 828, 422, 424, 510, 512, 514,
+ 516, 600, 602, 604, 606, 692, 694, 423,
+ 425, 511, 513, 515, 517, 601, 603, 605,
+ 607, 693, 695, 427, 519, 609, 697, 467,
+ 469, 555, 557, 559, 561, 645, 647, 649,
+ 651, 737, 739, 468, 470, 556, 558, 560,
+ 562, 646, 648, 650, 652, 738, 740, 472,
+ 564, 654, 742, 735, 741, 827, 829, 736,
+ 828, 830, 744, 832, 426, 428, 514, 516,
+ 518, 520, 604, 606, 608, 610, 696, 698,
+ 424, 512, 602, 694, 427, 429, 515, 517,
+ 519, 521, 605, 607, 609, 611, 697, 699,
+ 471, 473, 559, 561, 563, 565, 649, 651,
+ 653, 655, 741, 743, 469, 557, 647, 739,
+ 472, 474, 560, 562, 564, 566, 650, 652,
+ 654, 656, 742, 744, 745, 831, 833, 737,
+ 829, 740, 746, 832, 834, 428, 430, 516,
+ 518, 520, 522, 606, 608, 610, 612, 698,
+ 700, 429, 431, 517, 519, 521, 523, 607,
+ 609, 611, 613, 699, 701, 433, 525, 615,
+ 703, 473, 475, 561, 563, 565, 567, 651,
+ 653, 655, 657, 743, 745, 474, 476, 562,
+ 564, 566, 568, 652, 654, 656, 658, 744,
+ 746, 478, 570, 660, 748, 741, 747, 833,
+ 835, 742, 834, 836, 750, 838, 432, 434,
+ 520, 522, 524, 526, 610, 612, 614, 616,
+ 702, 704, 430, 518, 608, 700, 433, 435,
+ 521, 523, 525, 527, 611, 613, 615, 617,
+ 703, 705, 477, 479, 565, 567, 569, 571,
+ 655, 657, 659, 661, 747, 749, 475, 563,
+ 653, 745, 478, 480, 566, 568, 570, 572,
+ 656, 658, 660, 662, 748, 750, 751, 837,
+ 839, 743, 835, 746, 838, 840, 434, 436,
+ 522, 524, 526, 528, 612, 614, 616, 618,
+ 704, 706, 435, 437, 523, 525, 527, 529,
+ 613, 615, 617, 619, 705, 707, 439, 531,
+ 621, 479, 481, 567, 569, 571, 573, 657,
+ 659, 661, 663, 749, 751, 480, 482, 568,
+ 570, 572, 574, 658, 660, 662, 664, 750,
+ 484, 576, 666, 754, 747, 753, 839, 841,
+ 748, 840, 842, 756, 438, 440, 526, 528,
+ 530, 532, 616, 618, 620, 708, 710, 436,
+ 524, 614, 706, 439, 441, 527, 529, 531,
+ 617, 619, 621, 711, 483, 485, 571, 573,
+ 575, 577, 661, 663, 667, 753, 481, 569,
+ 659, 751, 484, 486, 572, 574, 576, 662,
+ 664, 666, 754, 756, 757, 749, 841, 758,
+ 846, 440, 442, 528, 530, 532, 618, 620,
+ 624, 710, 441, 443, 529, 531, 619, 621,
+ 625, 711, 713, 445, 537, 485, 487, 573,
+ 575, 577, 663, 667, 669, 757, 486, 488,
+ 574, 576, 664, 666, 756, 758, 398, 400,
+ 490, 492, 582, 760, 753, 759, 754, 846,
+ 448, 536, 538, 624, 447, 537, 539, 625,
+ 717, 493, 581, 669, 671, 673, 761, 492,
+ 582, 759, 851, 758, 760, 942, 714, 804,
+ 710, 800, 892, 713, 895, 532, 620, 757,
+ 667, 937, 594, 596, 682, 684, 686, 688,
+ 774, 776, 778, 864, 866, 592, 595, 597,
+ 683, 685, 687, 689, 775, 777, 779, 865,
+ 867, 504, 506, 598, 502, 505, 507, 593,
+ 599, 639, 641, 729, 731, 733, 819, 821,
+ 823, 911, 637, 640, 642, 730, 732, 734,
+ 820, 822, 824, 912, 868, 956, 869, 957,
+ 913, 1001, 914, 1002, 1003, 1004, 596, 598,
+ 684, 686, 688, 690, 774, 776, 778, 780,
+ 866, 868, 597, 599, 685, 687, 689, 691,
+ 775, 777, 779, 781, 867, 869, 601, 693,
+ 783, 871, 506, 508, 594, 600, 507, 509,
+ 595, 511, 603, 641, 643, 729, 731, 733,
+ 735, 819, 821, 823, 825, 911, 913, 642,
+ 644, 730, 732, 734, 736, 820, 822, 824,
+ 826, 912, 914, 646, 738, 828, 916, 600,
+ 602, 688, 690, 692, 694, 778, 780, 782,
+ 784, 870, 872, 598, 686, 776, 868, 601,
+ 603, 689, 691, 693, 695, 779, 781, 783,
+ 785, 871, 873, 510, 512, 604, 508, 596,
+ 511, 513, 599, 605, 645, 647, 733, 735,
+ 737, 739, 823, 825, 827, 829, 915, 917,
+ 643, 731, 821, 913, 646, 648, 734, 736,
+ 738, 740, 824, 826, 828, 830, 916, 918,
+ 602, 604, 690, 692, 694, 696, 780, 782,
+ 784, 786, 872, 874, 603, 605, 691, 693,
+ 695, 697, 781, 783, 785, 787, 873, 875,
+ 607, 699, 789, 877, 512, 514, 600, 606,
+ 513, 515, 601, 517, 609, 647, 649, 735,
+ 737, 739, 741, 825, 827, 829, 831, 917,
+ 919, 648, 650, 736, 738, 740, 742, 826,
+ 828, 830, 832, 918, 920, 652, 744, 834,
+ 922, 606, 608, 694, 696, 698, 700, 784,
+ 786, 788, 790, 876, 878, 604, 692, 782,
+ 874, 607, 609, 695, 697, 699, 701, 785,
+ 787, 789, 791, 877, 879, 516, 518, 610,
+ 514, 602, 517, 519, 605, 611, 651, 653,
+ 739, 741, 743, 745, 829, 831, 833, 835,
+ 921, 923, 649, 737, 827, 919, 652, 654,
+ 740, 742, 744, 746, 830, 832, 834, 836,
+ 922, 924, 608, 610, 696, 698, 700, 702,
+ 786, 788, 790, 792, 878, 880, 609, 611,
+ 697, 699, 701, 703, 787, 789, 791, 793,
+ 879, 881, 613, 705, 795, 883, 518, 520,
+ 606, 612, 519, 521, 607, 523, 615, 653,
+ 655, 741, 743, 745, 747, 831, 833, 835,
+ 837, 923, 925, 654, 656, 742, 744, 746,
+ 748, 832, 834, 836, 838, 924, 926, 658,
+ 750, 840, 928, 612, 614, 700, 702, 704,
+ 706, 790, 792, 794, 796, 882, 884, 610,
+ 698, 788, 880, 613, 615, 701, 703, 705,
+ 707, 791, 793, 795, 883, 885, 522, 524,
+ 616, 520, 608, 523, 525, 611, 617, 657,
+ 659, 745, 747, 749, 751, 835, 837, 839,
+ 841, 927, 929, 655, 743, 833, 925, 658,
+ 660, 746, 748, 750, 836, 838, 840, 842,
+ 928, 930, 614, 616, 702, 704, 706, 708,
+ 792, 794, 796, 884, 886, 615, 617, 703,
+ 705, 707, 793, 795, 799, 885, 887, 619,
+ 711, 889, 524, 526, 612, 618, 525, 527,
+ 613, 529, 621, 659, 661, 747, 749, 751,
+ 753, 837, 839, 841, 929, 931, 660, 662,
+ 748, 750, 754, 838, 840, 842, 930, 932,
+ 664, 756, 846, 934, 618, 620, 706, 708,
+ 710, 796, 800, 888, 890, 616, 704, 794,
+ 886, 619, 621, 707, 711, 713, 799, 889,
+ 891, 528, 530, 526, 614, 529, 531, 617,
+ 663, 751, 753, 757, 841, 661, 749, 839,
+ 931, 664, 666, 754, 756, 758, 842, 846,
+ 934, 936, 620, 708, 710, 714, 800, 804,
+ 890, 892, 621, 711, 713, 799, 891, 893,
+ 625, 717, 895, 530, 532, 618, 624, 531,
+ 619, 667, 753, 757, 759, 937, 666, 754,
+ 756, 758, 760, 846, 936, 938, 888, 980,
+ 982, 889, 981, 983, 934, 1026, 942, 1023,
+ 1029, 1117, 1024, 592, 682, 684, 774, 776,
+ 864, 866, 593, 683, 685, 775, 777, 865,
+ 867, 637, 729, 819, 821, 911, 638, 730,
+ 820, 822, 912, 1001, 1002, 914, 1004, 956,
+ 1046, 957, 1047, 500, 501, 639, 640, 1003,
+ 1093, 1094, 959, 1049, 958, 1048, 868, 869,
+ 1183, 1184, 1138, 1139, 1228, 1229, 1185, 1275,
+ 1365, 1186, 1276, 1366, 686, 688, 774, 776,
+ 778, 780, 864, 866, 868, 870, 956, 958,
+ 687, 689, 775, 777, 779, 781, 865, 867,
+ 869, 871, 957, 959, 691, 783, 873, 961,
+ 731, 733, 819, 821, 823, 825, 911, 913,
+ 915, 1001, 1003, 732, 734, 820, 822, 824,
+ 826, 912, 914, 916, 1002, 1004, 736, 828,
+ 918, 1006, 1005, 1093, 1094, 1008, 1096, 690,
+ 692, 778, 780, 782, 784, 868, 870, 872,
+ 874, 960, 962, 688, 776, 866, 958, 691,
+ 693, 779, 781, 783, 785, 869, 871, 873,
+ 875, 961, 963, 735, 737, 823, 825, 827,
+ 829, 913, 915, 917, 919, 1005, 1007, 733,
+ 821, 911, 1003, 736, 738, 824, 826, 828,
+ 830, 914, 916, 918, 920, 1006, 1008, 1009,
+ 1095, 1097, 1001, 1093, 1004, 1010, 1096, 1098,
+ 692, 694, 780, 782, 784, 786, 870, 872,
+ 874, 876, 962, 964, 693, 695, 781, 783,
+ 785, 787, 871, 873, 875, 877, 963, 965,
+ 697, 789, 879, 967, 737, 739, 825, 827,
+ 829, 831, 915, 917, 919, 921, 1007, 1009,
+ 738, 740, 826, 828, 830, 832, 916, 918,
+ 920, 922, 1008, 1010, 742, 834, 924, 1012,
+ 1005, 1011, 1097, 1099, 1006, 1098, 1100, 1014,
+ 1102, 696, 698, 784, 786, 788, 790, 874,
+ 876, 878, 880, 966, 968, 694, 782, 872,
+ 964, 697, 699, 785, 787, 789, 791, 875,
+ 877, 879, 881, 967, 969, 741, 743, 829,
+ 831, 833, 835, 919, 921, 923, 925, 1011,
+ 1013, 739, 827, 917, 1009, 742, 744, 830,
+ 832, 834, 836, 920, 922, 924, 926, 1012,
+ 1014, 1015, 1101, 1103, 1007, 1099, 1010, 1016,
+ 1102, 1104, 698, 700, 786, 788, 790, 792,
+ 876, 878, 880, 882, 968, 970, 699, 701,
+ 787, 789, 791, 793, 877, 879, 881, 883,
+ 969, 971, 703, 795, 885, 973, 743, 745,
+ 831, 833, 835, 837, 921, 923, 925, 927,
+ 1013, 1015, 744, 746, 832, 834, 836, 838,
+ 922, 924, 926, 928, 1014, 1016, 748, 840,
+ 930, 1018, 1011, 1017, 1103, 1105, 1012, 1104,
+ 1106, 1020, 1108, 702, 704, 790, 792, 794,
+ 796, 880, 882, 884, 886, 972, 974, 700,
+ 788, 878, 970, 703, 705, 791, 793, 795,
+ 881, 883, 885, 887, 973, 975, 747, 749,
+ 835, 837, 839, 841, 925, 927, 929, 931,
+ 1017, 1019, 745, 833, 923, 1015, 748, 750,
+ 836, 838, 840, 842, 926, 928, 930, 932,
+ 1018, 1020, 1021, 1107, 1109, 1013, 1105, 1016,
+ 1022, 1108, 1110, 704, 706, 792, 794, 796,
+ 882, 884, 886, 888, 974, 976, 705, 707,
+ 793, 795, 799, 883, 885, 887, 889, 975,
+ 977, 891, 979, 749, 751, 837, 839, 841,
+ 927, 929, 931, 1019, 1021, 750, 838, 840,
+ 842, 928, 930, 932, 934, 1020, 1022, 754,
+ 846, 936, 1024, 1017, 1023, 1109, 1111, 1018,
+ 1110, 1112, 1026, 1114, 708, 710, 796, 800,
+ 886, 888, 890, 892, 980, 706, 794, 884,
+ 976, 711, 799, 887, 889, 891, 893, 979,
+ 981, 663, 751, 753, 757, 839, 841, 929,
+ 931, 937, 1021, 1023, 1113, 754, 756, 842,
+ 846, 932, 934, 936, 938, 1024, 1026, 1019,
+ 1111, 1022, 1114, 982, 1066, 1070, 974, 1064,
+ 1156, 977, 983, 1073, 1159, 1117, 1205, 1109,
+ 1112, 714, 804, 892, 800, 890, 982, 717,
+ 893, 895, 759, 761, 851, 937, 1029, 1031,
+ 757, 760, 938, 942, 1033, 1117, 980, 1070,
+ 1168, 981, 983, 1073, 1163, 1207, 1026, 1208,
+ 1252, 1250, 1347, 1205, 1304, 1392, 1295, 1387,
+ 1388, 891, 979, 888, 889, 1023, 1113, 936,
+ 1024, 1114, 866, 868, 956, 958, 960, 1046,
+ 1048, 1050, 1138, 867, 869, 957, 959, 961,
+ 1047, 1049, 1051, 1139, 871, 963, 1053, 1141,
+ 776, 778, 864, 870, 777, 779, 865, 781,
+ 873, 911, 913, 1001, 1003, 1005, 1093, 1095,
+ 1183, 912, 914, 1002, 1004, 1006, 1094, 1096,
+ 1184, 916, 1008, 1098, 1186, 1140, 1228, 1229,
+ 1143, 1231, 1185, 1188, 1276, 1275, 1278, 1366,
+ 870, 872, 958, 960, 962, 964, 1048, 1050,
+ 1052, 1054, 1140, 1142, 868, 956, 1046, 1138,
+ 871, 873, 959, 961, 963, 965, 1049, 1051,
+ 1053, 1055, 1141, 1143, 780, 782, 874, 778,
+ 866, 781, 783, 869, 875, 915, 917, 1003,
+ 1005, 1007, 1009, 1093, 1095, 1097, 1099, 1185,
+ 1187, 913, 1001, 1183, 916, 918, 1004, 1006,
+ 1008, 1010, 1094, 1096, 1098, 1100, 1186, 1188,
+ 872, 874, 960, 962, 964, 966, 1050, 1052,
+ 1054, 1056, 1142, 1144, 873, 875, 961, 963,
+ 965, 967, 1051, 1053, 1055, 1057, 1143, 1145,
+ 877, 969, 1059, 1147, 782, 784, 870, 876,
+ 783, 785, 871, 787, 879, 917, 919, 1005,
+ 1007, 1009, 1011, 1095, 1097, 1099, 1101, 1187,
+ 1189, 918, 920, 1006, 1008, 1010, 1012, 1096,
+ 1098, 1100, 1102, 1188, 1190, 922, 1014, 1104,
+ 1192, 876, 878, 964, 966, 968, 970, 1054,
+ 1056, 1058, 1060, 1146, 1148, 874, 962, 1052,
+ 1144, 877, 879, 965, 967, 969, 971, 1055,
+ 1057, 1059, 1061, 1147, 1149, 786, 788, 880,
+ 784, 872, 787, 789, 875, 881, 921, 923,
+ 1009, 1011, 1013, 1015, 1099, 1101, 1103, 1105,
+ 1191, 1193, 919, 1007, 1097, 1189, 922, 924,
+ 1010, 1012, 1014, 1016, 1100, 1102, 1104, 1106,
+ 1192, 1194, 878, 880, 966, 968, 970, 972,
+ 1056, 1058, 1060, 1062, 1148, 1150, 879, 881,
+ 967, 969, 971, 973, 1057, 1059, 1061, 1063,
+ 1149, 1151, 883, 975, 1065, 1153, 788, 790,
+ 876, 882, 789, 791, 877, 793, 885, 923,
+ 925, 1011, 1013, 1015, 1017, 1101, 1103, 1105,
+ 1107, 1193, 1195, 924, 926, 1012, 1014, 1016,
+ 1018, 1102, 1104, 1106, 1108, 1194, 1196, 928,
+ 1020, 1110, 1198, 882, 884, 970, 972, 974,
+ 976, 1060, 1062, 1064, 1066, 1152, 1154, 880,
+ 968, 1058, 1150, 883, 885, 971, 973, 975,
+ 977, 1061, 1063, 1065, 1153, 1155, 792, 794,
+ 886, 790, 878, 793, 795, 881, 887, 927,
+ 929, 1015, 1017, 1019, 1021, 1105, 1107, 1109,
+ 1111, 1197, 1199, 925, 1013, 1103, 1195, 928,
+ 930, 1016, 1018, 1020, 1022, 1106, 1108, 1110,
+ 1112, 1198, 1200, 884, 886, 972, 974, 976,
+ 1062, 1064, 1066, 1154, 1156, 885, 887, 973,
+ 975, 977, 979, 1063, 1065, 1155, 1157, 889,
+ 981, 1159, 794, 796, 882, 888, 795, 883,
+ 799, 891, 929, 931, 1017, 1019, 1021, 1023,
+ 1107, 1109, 1111, 1113, 1199, 930, 932, 1018,
+ 1020, 1022, 1024, 1108, 1110, 1112, 1114, 1200,
+ 1202, 934, 1026, 864, 866, 956, 1046, 1048,
+ 1138, 865, 867, 957, 1047, 1049, 1139, 819,
+ 911, 1001, 1003, 1093, 1183, 820, 912, 1002,
+ 1004, 1094, 1184, 1185, 1275, 1186, 1276, 1095,
+ 1096, 1228, 1230, 1320, 1229, 1231, 1321, 1365,
+ 1366, 1140, 1141, 1233, 1323, 1411, 1051, 1143,
+ 1277, 1367, 1278, 1368, 1410, 1457, 1547, 1458,
+ 1548, 1502, 1592, 1503, 1593, 1413, 1412, 1640,
+ 1730, 1549, 1639, 1729, 1550, 960, 962, 1048,
+ 1050, 1052, 1054, 1138, 1140, 1142, 1144, 1230,
+ 1232, 958, 1046, 1228, 961, 963, 1049, 1051,
+ 1053, 1055, 1139, 1141, 1143, 1145, 1231, 1233,
+ 1005, 1007, 1093, 1095, 1097, 1099, 1183, 1185,
+ 1187, 1189, 1275, 1277, 1003, 1006, 1008, 1094,
+ 1096, 1098, 1100, 1184, 1186, 1188, 1190, 1276,
+ 1278, 1279, 1365, 1367, 1280, 1366, 1368, 962,
+ 964, 1050, 1052, 1054, 1056, 1140, 1142, 1144,
+ 1146, 1232, 1234, 963, 965, 1051, 1053, 1055,
+ 1057, 1141, 1143, 1145, 1147, 1233, 1235, 967,
+ 1059, 1149, 1237, 1007, 1009, 1095, 1097, 1099,
+ 1101, 1185, 1187, 1189, 1191, 1277, 1279, 1008,
+ 1010, 1096, 1098, 1100, 1102, 1186, 1188, 1190,
+ 1192, 1278, 1280, 1012, 1104, 1194, 1282, 1275,
+ 1281, 1367, 1369, 1276, 1368, 1370, 1284, 1372,
+ 966, 968, 1054, 1056, 1058, 1060, 1144, 1146,
+ 1148, 1150, 1236, 1238, 964, 1052, 1142, 1234,
+ 967, 969, 1055, 1057, 1059, 1061, 1145, 1147,
+ 1149, 1151, 1237, 1239, 1011, 1013, 1099, 1101,
+ 1103, 1105, 1189, 1191, 1193, 1195, 1281, 1283,
+ 1009, 1097, 1187, 1279, 1012, 1014, 1100, 1102,
+ 1104, 1106, 1190, 1192, 1194, 1196, 1282, 1284,
+ 1285, 1371, 1373, 1277, 1369, 1280, 1286, 1372,
+ 1374, 968, 970, 1056, 1058, 1060, 1062, 1146,
+ 1148, 1150, 1152, 1238, 1240, 969, 971, 1057,
+ 1059, 1061, 1063, 1147, 1149, 1151, 1153, 1239,
+ 1241, 973, 1065, 1155, 1243, 1013, 1015, 1101,
+ 1103, 1105, 1107, 1191, 1193, 1195, 1197, 1283,
+ 1285, 1014, 1016, 1102, 1104, 1106, 1108, 1192,
+ 1194, 1196, 1198, 1284, 1286, 1018, 1110, 1200,
+ 1288, 1281, 1287, 1373, 1375, 1282, 1374, 1376,
+ 1290, 1378, 972, 974, 1060, 1062, 1064, 1066,
+ 1150, 1152, 1154, 1156, 1242, 1244, 970, 1058,
+ 1148, 1240, 973, 975, 1061, 1063, 1065, 1151,
+ 1153, 1155, 1157, 1243, 1245, 1017, 1019, 1105,
+ 1107, 1109, 1111, 1195, 1197, 1199, 1287, 1289,
+ 1015, 1103, 1193, 1285, 1018, 1020, 1106, 1108,
+ 1110, 1112, 1196, 1198, 1200, 1202, 1288, 1290,
+ 1291, 1377, 1379, 1283, 1375, 1286, 1292, 1378,
+ 1380, 974, 976, 1062, 1064, 1066, 1152, 1154,
+ 1156, 1244, 1246, 975, 977, 1063, 1065, 1153,
+ 1155, 1157, 1159, 1245, 979, 1249, 1019, 1021,
+ 1107, 1109, 1111, 1113, 1197, 1199, 1289, 1291,
+ 1020, 1022, 1108, 1110, 1112, 1114, 1198, 1200,
+ 1202, 1290, 1292, 1024, 1294, 1287, 1293, 1379,
+ 1288, 1380, 1382, 980, 1066, 1070, 1156, 1248,
+ 1250, 976, 1064, 1154, 1246, 979, 981, 1073,
+ 1157, 1159, 1163, 1249, 1251, 1023, 1111, 1113,
+ 1117, 1205, 1207, 1293, 1295, 1021, 1109, 1199,
+ 1291, 1024, 1026, 1112, 1114, 1202, 1208, 1294,
+ 1385, 1289, 1292, 982, 1252, 983, 1387, 1388,
+ 1339, 1341, 1347, 1523, 1392, 1140, 1142, 1228,
+ 1230, 1232, 1234, 1320, 1322, 1324, 1410, 1412,
+ 1138, 1141, 1143, 1229, 1231, 1233, 1235, 1321,
+ 1323, 1325, 1411, 1413, 1050, 1052, 1144, 1048,
+ 1051, 1053, 1139, 1145, 1185, 1187, 1275, 1277,
+ 1279, 1365, 1367, 1369, 1457, 1183, 1186, 1188,
+ 1276, 1278, 1280, 1366, 1368, 1370, 1458, 1414,
+ 1502, 1415, 1503, 1459, 1547, 1460, 1548, 1549,
+ 1550, 1142, 1144, 1230, 1232, 1234, 1236, 1320,
+ 1322, 1324, 1326, 1412, 1414, 1143, 1145, 1231,
+ 1233, 1235, 1237, 1321, 1323, 1325, 1327, 1413,
+ 1415, 1147, 1239, 1329, 1417, 1052, 1054, 1140,
+ 1146, 1053, 1055, 1141, 1057, 1149, 1187, 1189,
+ 1275, 1277, 1279, 1281, 1365, 1367, 1369, 1371,
+ 1457, 1459, 1188, 1190, 1276, 1278, 1280, 1282,
+ 1366, 1368, 1370, 1372, 1458, 1460, 1192, 1284,
+ 1374, 1462, 1146, 1148, 1234, 1236, 1238, 1240,
+ 1324, 1326, 1328, 1330, 1416, 1418, 1144, 1232,
+ 1322, 1414, 1147, 1149, 1235, 1237, 1239, 1241,
+ 1325, 1327, 1329, 1331, 1417, 1419, 1056, 1058,
+ 1150, 1054, 1142, 1057, 1059, 1145, 1151, 1191,
+ 1193, 1279, 1281, 1283, 1285, 1369, 1371, 1373,
+ 1375, 1461, 1463, 1189, 1277, 1367, 1459, 1192,
+ 1194, 1280, 1282, 1284, 1286, 1370, 1372, 1374,
+ 1376, 1462, 1464, 1148, 1150, 1236, 1238, 1240,
+ 1242, 1326, 1328, 1330, 1332, 1418, 1420, 1149,
+ 1151, 1237, 1239, 1241, 1243, 1327, 1329, 1331,
+ 1333, 1419, 1421, 1153, 1245, 1335, 1423, 1058,
+ 1060, 1146, 1152, 1059, 1061, 1147, 1063, 1155,
+ 1193, 1195, 1281, 1283, 1285, 1287, 1371, 1373,
+ 1375, 1377, 1463, 1465, 1194, 1196, 1282, 1284,
+ 1286, 1288, 1372, 1374, 1376, 1378, 1464, 1466,
+ 1198, 1290, 1380, 1468, 1152, 1154, 1240, 1242,
+ 1244, 1246, 1330, 1332, 1334, 1336, 1422, 1424,
+ 1150, 1238, 1328, 1420, 1153, 1155, 1241, 1243,
+ 1245, 1331, 1333, 1335, 1337, 1423, 1425, 1062,
+ 1064, 1156, 1060, 1148, 1063, 1065, 1151, 1157,
+ 1197, 1199, 1285, 1287, 1289, 1291, 1375, 1377,
+ 1379, 1467, 1469, 1195, 1283, 1373, 1465, 1198,
+ 1200, 1286, 1288, 1290, 1292, 1376, 1378, 1380,
+ 1382, 1468, 1470, 1154, 1156, 1242, 1244, 1246,
+ 1248, 1332, 1334, 1336, 1424, 1426, 1155, 1157,
+ 1243, 1245, 1249, 1333, 1335, 1337, 1339, 1425,
+ 1427, 1159, 1251, 1341, 1064, 1066, 1152, 1065,
+ 1153, 1199, 1287, 1289, 1291, 1293, 1377, 1379,
+ 1469, 1471, 1200, 1202, 1288, 1290, 1292, 1294,
+ 1378, 1380, 1382, 1470, 1472, 1474, 1246, 1248,
+ 1250, 1252, 1336, 1156, 1244, 1334, 1426, 1159,
+ 1249, 1251, 1337, 1339, 1341, 1070, 1066, 1154,
+ 1157, 1163, 1205, 1291, 1293, 1295, 1385, 1387,
+ 1289, 1379, 1471, 1292, 1294, 1382, 1388, 1474,
+ 1424, 1516, 1518, 1427, 1563, 1565, 1469, 1561,
+ 1472, 1564, 1566, 1567, 1168, 1250, 1252, 1347,
+ 1073, 1163, 1251, 1207, 1295, 1385, 1387, 1304,
+ 1388, 1392, 1528, 1031, 1033, 1117, 1567, 1565,
+ 1566, 1574, 1750, 1138, 1228, 1230, 1320, 1322,
+ 1410, 1412, 1139, 1229, 1231, 1321, 1323, 1411,
+ 1413, 1183, 1275, 1365, 1367, 1457, 1184, 1276,
+ 1366, 1368, 1458, 1547, 1548, 1460, 1550, 1502,
+ 1592, 1503, 1593, 1549, 1639, 1640, 1505, 1595,
+ 1504, 1594, 1414, 1415, 1684, 1685, 1729, 1730,
+ 1731, 1821, 1732, 1822, 1774, 1775, 1046, 1047,
+ 1911, 1912, 1866, 1956, 1867, 1957, 1776, 1777,
+ 1232, 1234, 1320, 1322, 1324, 1326, 1410, 1412,
+ 1414, 1416, 1502, 1504, 1233, 1235, 1321, 1323,
+ 1325, 1327, 1411, 1413, 1415, 1417, 1503, 1505,
+ 1237, 1329, 1419, 1507, 1277, 1279, 1365, 1367,
+ 1369, 1371, 1457, 1459, 1461, 1547, 1549, 1278,
+ 1280, 1366, 1368, 1370, 1372, 1458, 1460, 1462,
+ 1548, 1550, 1282, 1374, 1464, 1552, 1551, 1639,
+ 1640, 1554, 1642, 1236, 1238, 1324, 1326, 1328,
+ 1330, 1414, 1416, 1418, 1420, 1506, 1508, 1234,
+ 1322, 1412, 1504, 1237, 1239, 1325, 1327, 1329,
+ 1331, 1415, 1417, 1419, 1421, 1507, 1509, 1281,
+ 1283, 1369, 1371, 1373, 1375, 1459, 1461, 1463,
+ 1465, 1551, 1553, 1279, 1367, 1457, 1549, 1282,
+ 1284, 1370, 1372, 1374, 1376, 1460, 1462, 1464,
+ 1466, 1552, 1554, 1555, 1641, 1643, 1547, 1639,
+ 1550, 1556, 1642, 1644, 1238, 1240, 1326, 1328,
+ 1330, 1332, 1416, 1418, 1420, 1422, 1508, 1510,
+ 1239, 1241, 1327, 1329, 1331, 1333, 1417, 1419,
+ 1421, 1423, 1509, 1511, 1243, 1335, 1425, 1513,
+ 1283, 1285, 1371, 1373, 1375, 1377, 1461, 1463,
+ 1465, 1467, 1553, 1555, 1284, 1286, 1372, 1374,
+ 1376, 1378, 1462, 1464, 1466, 1468, 1554, 1556,
+ 1288, 1380, 1470, 1551, 1557, 1643, 1645, 1552,
+ 1644, 1646, 1560, 1648, 1242, 1244, 1330, 1332,
+ 1334, 1336, 1420, 1422, 1424, 1426, 1512, 1514,
+ 1240, 1328, 1418, 1510, 1243, 1245, 1331, 1333,
+ 1335, 1337, 1421, 1423, 1425, 1427, 1513, 1515,
+ 1287, 1289, 1375, 1377, 1379, 1465, 1467, 1469,
+ 1471, 1557, 1285, 1373, 1463, 1555, 1288, 1290,
+ 1376, 1378, 1380, 1382, 1466, 1468, 1470, 1472,
+ 1560, 1561, 1647, 1649, 1553, 1645, 1556, 1648,
+ 1244, 1246, 1332, 1334, 1336, 1422, 1424, 1426,
+ 1514, 1516, 1245, 1333, 1335, 1337, 1339, 1423,
+ 1425, 1427, 1515, 1517, 1249, 1341, 1289, 1291,
+ 1377, 1379, 1467, 1469, 1471, 1561, 1290, 1292,
+ 1378, 1380, 1382, 1468, 1470, 1472, 1474, 1560,
+ 1294, 1564, 1557, 1563, 1649, 1652, 1566, 1512,
+ 1518, 1602, 1604, 1606, 1513, 1603, 1605, 1607,
+ 1609, 1695, 1699, 1647, 1739, 1741, 1648, 1740,
+ 1744, 1248, 1250, 1252, 1336, 1426, 1518, 1251,
+ 1339, 1341, 1523, 1163, 1347, 1295, 1385, 1387,
+ 1565, 1567, 1388, 1474, 1566, 1392, 1563, 1564,
+ 1574, 1748, 1750, 1516, 1606, 1698, 1704, 1609,
+ 1701, 1617, 1745, 1528, 1412, 1414, 1502, 1504,
+ 1506, 1592, 1594, 1596, 1684, 1413, 1415, 1503,
+ 1505, 1507, 1593, 1595, 1597, 1685, 1417, 1509,
+ 1599, 1687, 1322, 1324, 1410, 1416, 1323, 1325,
+ 1411, 1327, 1419, 1457, 1459, 1547, 1549, 1551,
+ 1639, 1641, 1729, 1458, 1460, 1548, 1550, 1552,
+ 1640, 1642, 1730, 1462, 1554, 1644, 1732, 1686,
+ 1774, 1775, 1689, 1777, 1731, 1734, 1822, 1821,
+ 1824, 1912, 1416, 1418, 1504, 1506, 1508, 1510,
+ 1594, 1596, 1598, 1600, 1686, 1688, 1414, 1502,
+ 1592, 1684, 1417, 1419, 1505, 1507, 1509, 1511,
+ 1595, 1597, 1599, 1601, 1687, 1689, 1326, 1328,
+ 1420, 1324, 1412, 1327, 1329, 1415, 1421, 1461,
+ 1463, 1549, 1551, 1553, 1555, 1639, 1641, 1643,
+ 1645, 1731, 1733, 1459, 1547, 1729, 1462, 1464,
+ 1550, 1552, 1554, 1556, 1640, 1642, 1644, 1646,
+ 1732, 1734, 1418, 1420, 1506, 1508, 1510, 1512,
+ 1596, 1598, 1600, 1602, 1688, 1690, 1419, 1421,
+ 1507, 1509, 1511, 1513, 1597, 1599, 1601, 1603,
+ 1689, 1691, 1423, 1515, 1605, 1328, 1330, 1416,
+ 1422, 1329, 1331, 1417, 1333, 1425, 1463, 1465,
+ 1551, 1553, 1555, 1557, 1641, 1643, 1645, 1647,
+ 1733, 1735, 1464, 1466, 1552, 1554, 1556, 1642,
+ 1644, 1646, 1648, 1734, 1736, 1468, 1560, 1738,
+ 1422, 1424, 1510, 1512, 1514, 1516, 1600, 1602,
+ 1604, 1606, 1692, 1420, 1508, 1598, 1690, 1423,
+ 1425, 1511, 1513, 1515, 1517, 1601, 1603, 1605,
+ 1607, 1695, 1332, 1334, 1426, 1330, 1418, 1333,
+ 1335, 1421, 1427, 1467, 1469, 1555, 1557, 1561,
+ 1645, 1647, 1649, 1737, 1739, 1465, 1553, 1643,
+ 1735, 1468, 1470, 1556, 1560, 1646, 1648, 1652,
+ 1738, 1740, 1516, 1518, 1606, 1698, 1426, 1514,
+ 1604, 1517, 1523, 1607, 1609, 1699, 1701, 1336,
+ 1424, 1249, 1251, 1337, 1339, 1341, 1425, 1427,
+ 1515, 1561, 1563, 1565, 1567, 1743, 1745, 1471,
+ 1649, 1741, 1474, 1564, 1566, 1652, 1744, 1786,
+ 1789, 1739, 1831, 1748, 1923, 1832, 1924, 1502,
+ 1592, 1594, 1684, 1410, 1503, 1593, 1595, 1685,
+ 1457, 1547, 1549, 1639, 1641, 1729, 1731, 1458,
+ 1548, 1550, 1640, 1642, 1730, 1732, 1821, 1822,
+ 1774, 1776, 1866, 1775, 1777, 1867, 1411, 1911,
+ 1912, 1686, 1687, 1779, 1869, 1957, 1597, 1689,
+ 1823, 1913, 1824, 1914, 1956, 2004, 2003, 1868,
+ 1958, 1959, 1506, 1508, 1594, 1596, 1598, 1600,
+ 1684, 1686, 1688, 1690, 1776, 1778, 1504, 1592,
+ 1774, 1507, 1509, 1595, 1597, 1599, 1601, 1685,
+ 1687, 1689, 1691, 1777, 1779, 1551, 1553, 1639,
+ 1641, 1643, 1645, 1729, 1731, 1733, 1735, 1821,
+ 1823, 1549, 1552, 1554, 1640, 1642, 1644, 1646,
+ 1730, 1732, 1734, 1736, 1822, 1824, 1825, 1911,
+ 1913, 1826, 1912, 1914, 1508, 1510, 1596, 1598,
+ 1600, 1602, 1686, 1688, 1690, 1692, 1778, 1780,
+ 1509, 1511, 1597, 1599, 1601, 1603, 1687, 1689,
+ 1691, 1779, 1781, 1513, 1605, 1695, 1783, 1553,
+ 1555, 1641, 1643, 1645, 1647, 1731, 1733, 1735,
+ 1737, 1823, 1825, 1554, 1556, 1642, 1644, 1646,
+ 1648, 1732, 1734, 1736, 1738, 1824, 1826, 1740,
+ 1828, 1821, 1827, 1913, 1915, 1822, 1914, 1830,
+ 1918, 1512, 1514, 1600, 1602, 1604, 1606, 1690,
+ 1692, 1782, 1784, 1510, 1598, 1688, 1780, 1513,
+ 1515, 1601, 1603, 1605, 1607, 1691, 1695, 1783,
+ 1785, 1557, 1645, 1647, 1649, 1735, 1737, 1739,
+ 1741, 1827, 1555, 1643, 1733, 1825, 1560, 1646,
+ 1648, 1652, 1736, 1738, 1740, 1828, 1830, 1831,
+ 1917, 1919, 1823, 1915, 1826, 1832, 1918, 1920,
+ 1514, 1516, 1602, 1604, 1606, 1692, 1698, 1784,
+ 1786, 1515, 1517, 1603, 1605, 1607, 1609, 1695,
+ 1699, 1785, 1701, 1789, 1561, 1647, 1649, 1737,
+ 1739, 1741, 1743, 1831, 1560, 1648, 1652, 1738,
+ 1740, 1744, 1830, 1832, 1564, 1827, 1919, 1828,
+ 1920, 1924, 1782, 1872, 1874, 1878, 1783, 1873,
+ 1877, 1879, 1965, 1967, 1917, 1923, 2011, 1918,
+ 2010, 2014, 1880, 1968, 1883, 1745, 2013, 1963,
+ 2007, 2008, 1518, 1606, 1698, 1704, 1880, 1523,
+ 1609, 1699, 1701, 1617, 1883, 1565, 1567, 1743,
+ 1745, 1566, 1744, 1748, 1750, 1930, 1878, 1972,
+ 1789, 1879, 1786, 1831, 1923, 2013, 1832, 1924,
+ 2014, 2018, 1976, 2021, 1968, 2011, 1704, 1617,
+ 1565, 1567, 1745, 1743, 1748, 1750, 2021, 1930,
+ 1528, 1574, 2024, 1976, 1883, 1686, 1688, 1774,
+ 1776, 1778, 1780, 1866, 1868, 1870, 1956, 1958,
+ 1684, 1687, 1689, 1775, 1777, 1779, 1781, 1867,
+ 1869, 1871, 1957, 1959, 1596, 1598, 1690, 1594,
+ 1597, 1599, 1685, 1691, 1731, 1733, 1821, 1823,
+ 1825, 1911, 1913, 1915, 2003, 1729, 1732, 1734,
+ 1822, 1824, 1826, 1912, 1914, 2004, 1960, 1961,
+ 2005, 2006, 1872, 1873, 1963, 1783, 1965, 1917,
+ 2007, 1918, 2008, 1828, 1920, 2010, 1688, 1690,
+ 1776, 1778, 1780, 1782, 1866, 1868, 1870, 1872,
+ 1958, 1960, 1689, 1691, 1777, 1779, 1781, 1783,
+ 1867, 1869, 1871, 1873, 1959, 1961, 1785, 1963,
+ 1598, 1600, 1686, 1692, 1599, 1601, 1687, 1603,
+ 1695, 1733, 1735, 1821, 1823, 1825, 1827, 1911,
+ 1913, 1915, 1917, 2003, 2005, 1734, 1736, 1822,
+ 1824, 1826, 1828, 1912, 1914, 1918, 2004, 2006,
+ 1738, 1830, 1920, 2008, 1692, 1780, 1782, 1784,
+ 1786, 1870, 1872, 1874, 1690, 1778, 1868, 1960,
+ 1695, 1781, 1783, 1785, 1871, 1873, 1877, 1963,
+ 1965, 1602, 1604, 1600, 1688, 1603, 1605, 1691,
+ 1737, 1739, 1825, 1827, 1831, 1915, 1917, 1919,
+ 2007, 1735, 1823, 1913, 2005, 1738, 1740, 1826,
+ 1828, 1830, 1832, 1918, 1920, 2008, 2010, 1958,
+ 1961, 1967, 2011, 2003, 2006, 1878, 1880, 1968,
+ 1972, 1786, 1874, 1789, 1877, 1879, 1883, 1967,
+ 1923, 2011, 2013, 1831, 1919, 1924, 2014, 2018,
+ 1972, 1976, 1880, 1883, 2021, 1923, 2013, 1930,
+ 2018, 2024,
+};
+
+static long _vq_fitmap_res_Zc_8[] = {
+ 0, 0, 0, 59, 59, 123, 123, 187,
+ 187, 251, 251, 315, 315, 375, 375, 438,
+ 438, 501, 566, 631, 696, 761, 826, 891,
+ 956, 1021, 1086, 1151, 375, 375, 1208, 438,
+ 1249, 1308, 1373, 1438, 1503, 1568, 1633, 1698,
+ 1763, 1828, 1892, 1951, 1951, 1208, 1208, 2006,
+ 2068, 2132, 2197, 2262, 2327, 2392, 2457, 2522,
+ 2587, 2648, 2700, 2753, 2777, 2777, 2006, 2831,
+ 2889, 2954, 3019, 3084, 3149, 3214, 3278, 3340,
+ 3393, 2700, 3440, 2777, 2777, 2777, 3474, 3534,
+ 3599, 3664, 3729, 3794, 3859, 3922, 3980, 4026,
+ 3440, 3440, 2777, 2777, 4075, 3474, 4132, 4191,
+ 4256, 4321, 4386, 4451, 4515, 4572, 4026, 4633,
+ 4633, 4075, 4075, 4075, 4075, 4682, 4744, 4808,
+ 4873, 4938, 5003, 5067, 4572, 4633, 4633, 4633,
+ 4075, 4075, 5123, 5123, 4682, 5189, 5247, 5312,
+ 5377, 5442, 5505, 5555, 5555, 4633, 4633, 4075,
+ 4075, 5123, 5123, 5123, 5605, 5665, 5730, 5795,
+ 5860, 5923, 5974, 5555, 6020, 6020, 5123, 5123,
+ 5123, 5123, 6043, 5605, 6104, 6163, 6228, 6292,
+ 6352, 5974, 6417, 6020, 6020, 5123, 5123, 5123,
+ 6043, 6043, 6043, 6452, 6514, 6578, 6640, 6352,
+ 6698, 6417, 6417, 6417, 5123, 5123, 5123, 6043,
+ 6043, 6743, 6452, 6794, 6852, 6913, 6968, 6698,
+ 7034, 7070, 7070, 6043, 6043, 6043, 6043, 6743,
+ 6743, 6743, 7085, 7150, 7212, 6968, 6968, 7034,
+ 7034, 7070, 6043, 6043, 6043, 6043, 6743, 6743,
+ 6743, 7085, 7085, 7212, 6968, 7269, 7034, 7288,
+ 7070,
+};
+
+static long _vq_fitlength_res_Zc_8[] = {
+ 59, 59, 59, 64, 64, 64, 64, 64,
+ 64, 64, 64, 60, 60, 63, 63, 63,
+ 63, 65, 65, 65, 65, 65, 65, 65,
+ 65, 65, 65, 57, 63, 63, 41, 63,
+ 59, 65, 65, 65, 65, 65, 65, 65,
+ 65, 64, 59, 55, 55, 41, 41, 62,
+ 64, 65, 65, 65, 65, 65, 65, 65,
+ 61, 52, 53, 24, 54, 54, 62, 58,
+ 65, 65, 65, 65, 65, 64, 62, 53,
+ 47, 53, 34, 54, 54, 54, 60, 65,
+ 65, 65, 65, 65, 63, 58, 46, 49,
+ 34, 34, 54, 54, 57, 60, 59, 65,
+ 65, 65, 65, 64, 57, 61, 49, 49,
+ 49, 57, 57, 57, 57, 62, 64, 65,
+ 65, 65, 64, 56, 61, 49, 49, 49,
+ 57, 57, 66, 66, 62, 58, 65, 65,
+ 65, 63, 50, 50, 50, 49, 49, 57,
+ 57, 66, 66, 66, 60, 65, 65, 65,
+ 63, 51, 46, 50, 23, 23, 66, 66,
+ 66, 66, 61, 60, 59, 65, 64, 60,
+ 65, 46, 35, 23, 23, 66, 66, 66,
+ 61, 61, 61, 62, 64, 62, 58, 65,
+ 45, 35, 35, 35, 66, 66, 66, 61,
+ 61, 51, 62, 58, 61, 55, 66, 45,
+ 36, 15, 15, 61, 61, 61, 61, 51,
+ 51, 51, 65, 62, 57, 66, 66, 36,
+ 36, 15, 61, 61, 61, 61, 51, 51,
+ 51, 65, 65, 57, 66, 19, 36, 10,
+ 15,
+};
+
+static encode_aux_pigeonhole _vq_auxp_res_Zc_8 = {
+ -22, 1, 44, 15,
+ _vq_pigeonmap_res_Zc_8,
+ 7298,
+ _vq_fitlist_res_Zc_8,
+ _vq_fitmap_res_Zc_8,
+ _vq_fitlength_res_Zc_8
+};
+
+static static_codebook _vq_book_res_Zc_8 = {
+ 2, 2025,
+ _vq_lengthlist_res_Zc_8,
+ 1, -527040512, 1611661312, 6, 0,
+ _vq_quantlist_res_Zc_8,
+ NULL,
+ &_vq_auxt_res_Zc_8,
+ &_vq_auxp_res_Zc_8,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/res_Zc_9.vqh b/lib/books/res_Zc_9.vqh
new file mode 100644
index 00000000..f6753c47
--- /dev/null
+++ b/lib/books/res_Zc_9.vqh
@@ -0,0 +1,99 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by vq/somethingorother
+
+ ********************************************************************/
+
+#ifndef _V_res_Zc_9_VQH_
+#define _V_res_Zc_9_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Zc_9[] = {
+ 2,
+ 1,
+ 3,
+ 0,
+ 4,
+};
+
+static long _vq_lengthlist_res_Zc_9[] = {
+ 1,11,10,11,11, 7,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,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11,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,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,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_res_Zc_9[] = {
+ -100.5, -33.5, 33.5, 100.5,
+};
+
+static long _vq_quantmap_res_Zc_9[] = {
+ 3, 1, 0, 2, 4,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Zc_9 = {
+ _vq_quantthresh_res_Zc_9,
+ _vq_quantmap_res_Zc_9,
+ 5,
+ 5
+};
+
+static static_codebook _vq_book_res_Zc_9 = {
+ 4, 625,
+ _vq_lengthlist_res_Zc_9,
+ 1, -521093120, 1624293376, 3, 0,
+ _vq_quantlist_res_Zc_9,
+ NULL,
+ &_vq_auxt_res_Zc_9,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/res_Zc_9a.vqh b/lib/books/res_Zc_9a.vqh
new file mode 100644
index 00000000..11e3559d
--- /dev/null
+++ b/lib/books/res_Zc_9a.vqh
@@ -0,0 +1,115 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by vq/somethingorother
+
+ ********************************************************************/
+
+#ifndef _V_res_Zc_9a_VQH_
+#define _V_res_Zc_9a_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Zc_9a[] = {
+ 11,
+ 10,
+ 12,
+ 9,
+ 13,
+ 8,
+ 14,
+ 7,
+ 15,
+ 6,
+ 16,
+ 5,
+ 17,
+ 4,
+ 18,
+ 3,
+ 19,
+ 2,
+ 20,
+ 1,
+ 21,
+ 0,
+ 22,
+};
+
+static long _vq_lengthlist_res_Zc_9a[] = {
+ 2, 4, 4, 8, 8, 9,10,10,11,11,14,14,14,13,14,12,
+ 12,14,12,14,14,14,14, 5, 5, 5, 7, 8,10,10,11,12,
+ 12,12,13,12,14,14,11,12,14,14,14,14,14,14,14, 5,
+ 4, 7, 7, 9, 9,10,10,13,13,13,13,12,13,12,12,12,
+ 13,13,13,13,13,13, 5, 5, 8, 8, 9, 9,10,11,11,11,
+ 12,13,13,13,12,13,13,13,13,13,13,13,13, 5, 5, 7,
+ 6, 9, 9,10,10,11,12,13,12,13,13,11,12,13,12,13,
+ 13,13,13,13, 8, 9, 6, 7, 9,10,10,11,12,11,13,13,
+ 13,13,13,12,13,13,13,13,13,13,13,13,13, 8, 6, 9,
+ 8,10,10,11,11,13,12,13,13,13,11,12,12,13,12,13,
+ 13,13,13,13, 9, 9, 9, 9, 9,10,11,13,13,13,13,13,
+ 13,12,13,13,12,13,13,13,13,13,13, 9, 9, 9, 9,10,
+ 11,13,11,13,13,13,13,13,12,13,13,13,13,13,13,13,
+ 13,13,12,12, 9, 9,10,10,11,12,13,13,13,13,12,13,
+ 13,13,13,13,13,12,13,13,13,13,13,10, 9,11,10,12,
+ 12,13,13,13,13,13,13,13,13,13,12,13,13,13,13,13,
+ 13,13,11,12,11,10,13,12,13,13,13,13,13,11,12,13,
+ 13,13,13,13,13,13,13,13,13,12,12,10,12,12,13,13,
+ 12,13,13,12,12,13,13,13,13,13,13,13,13,13,13,13,
+ 11,12,11,11,12,12,13,13,13,13,13,12,13,13,13,13,
+ 13,13,13,13,13,13,13,13,13,11,11,12,12,12,13,13,
+ 13,13,12,13,13,13,13,13,13,13,13,13,13,13,13,13,
+ 7, 9, 9,11,12,12,13,13,13,12,13,13,13,13,13,13,
+ 13,13,13,13,13,13,13,10, 7,10, 8,11,11,12,13,13,
+ 12,13,13,13,13,13,13,13,13,13,13,13,13,13, 8,12,
+ 7,11,11,11,12,12,13,13,13,13,13,13,13,13,13,13,
+ 13,13,13,13,13,13,13,10, 7,12,12,12,12,12,13,13,
+ 13,12,13,13,13,13,13,13,13,13,13,13,13,13, 9,12,
+ 9,12,11,12,12,13,13,13,13,13,13,13,13,13,13,13,
+ 13,13,13,13,13,13, 9,10,10,11,13,13,13,13,13,13,
+ 13,13,13,13,13,13,13,13,13,13,13,13,11,13,10,11,
+ 12,11,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+ 13,13,13,13,13,10,11,11,12,13,13,13,13,13,13,13,
+ 13,
+};
+
+static float _vq_quantthresh_res_Zc_9a[] = {
+ -31.5, -28.5, -25.5, -22.5, -19.5, -16.5, -13.5, -10.5,
+ -7.5, -4.5, -1.5, 1.5, 4.5, 7.5, 10.5, 13.5,
+ 16.5, 19.5, 22.5, 25.5, 28.5, 31.5,
+};
+
+static long _vq_quantmap_res_Zc_9a[] = {
+ 21, 19, 17, 15, 13, 11, 9, 7,
+ 5, 3, 1, 0, 2, 4, 6, 8,
+ 10, 12, 14, 16, 18, 20, 22,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Zc_9a = {
+ _vq_quantthresh_res_Zc_9a,
+ _vq_quantmap_res_Zc_9a,
+ 23,
+ 23
+};
+
+static static_codebook _vq_book_res_Zc_9a = {
+ 2, 529,
+ _vq_lengthlist_res_Zc_9a,
+ 1, -525303808, 1614282752, 5, 0,
+ _vq_quantlist_res_Zc_9a,
+ NULL,
+ &_vq_auxt_res_Zc_9a,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/books/res_Zc_9b.vqh b/lib/books/res_Zc_9b.vqh
new file mode 100644
index 00000000..38f4d97e
--- /dev/null
+++ b/lib/books/res_Zc_9b.vqh
@@ -0,0 +1,63 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: static codebook autogenerated by vq/somethingorother
+
+ ********************************************************************/
+
+#ifndef _V_res_Zc_9b_VQH_
+#define _V_res_Zc_9b_VQH_
+#include "codebook.h"
+
+static long _vq_quantlist_res_Zc_9b[] = {
+ 1,
+ 0,
+ 2,
+};
+
+static long _vq_lengthlist_res_Zc_9b[] = {
+ 5, 6, 6, 7, 6, 6, 7, 6, 7, 6, 6, 6, 7, 6, 6, 7,
+ 6, 7, 6, 6, 6, 7, 7, 7, 7, 6, 6, 7, 7, 7, 7, 7,
+ 7, 7, 7, 8, 6, 6, 6, 7, 7, 6, 7, 6, 6, 6, 6, 6,
+ 7, 6, 6, 7, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6,
+ 6, 6, 7, 6, 6, 8, 5, 6, 6, 6, 6, 6, 7, 6, 7, 6,
+ 6,
+};
+
+static float _vq_quantthresh_res_Zc_9b[] = {
+ -0.5, 0.5,
+};
+
+static long _vq_quantmap_res_Zc_9b[] = {
+ 1, 0, 2,
+};
+
+static encode_aux_threshmatch _vq_auxt_res_Zc_9b = {
+ _vq_quantthresh_res_Zc_9b,
+ _vq_quantmap_res_Zc_9b,
+ 3,
+ 3
+};
+
+static static_codebook _vq_book_res_Zc_9b = {
+ 4, 81,
+ _vq_lengthlist_res_Zc_9b,
+ 1, -535822336, 1611661312, 2, 0,
+ _vq_quantlist_res_Zc_9b,
+ NULL,
+ &_vq_auxt_res_Zc_9b,
+ NULL,
+ 0
+};
+
+
+#endif
diff --git a/lib/codebook.c b/lib/codebook.c
index 0a9f04b2..e9f2a794 100644
--- a/lib/codebook.c
+++ b/lib/codebook.c
@@ -11,7 +11,7 @@
********************************************************************
function: basic codebook pack/unpack/code/decode operations
- last mod: $Id: codebook.c,v 1.27 2001/06/18 22:19:26 xiphmont Exp $
+ last mod: $Id: codebook.c,v 1.28 2001/08/13 01:36:56 xiphmont Exp $
********************************************************************/
@@ -424,7 +424,7 @@ long vorbis_book_decodevv_add(codebook *book,float **a,long offset,int ch,
entry = vorbis_book_decode(book,b);
if(entry==-1)return(-1);
{
- const float *t = book->valuelist+entry*book->dim;
+ const float *t = book->valuelist+entry*book->dim;
for (j=0;j<book->dim;j++){
a[chptr++][i]+=t[j];
if(chptr==ch){
diff --git a/lib/codec_internal.h b/lib/codec_internal.h
index 3b333684..7efbb030 100644
--- a/lib/codec_internal.h
+++ b/lib/codec_internal.h
@@ -10,7 +10,7 @@
********************************************************************
function: libvorbis codec headers
- last mod: $Id: codec_internal.h,v 1.8 2001/03/26 23:27:43 xiphmont Exp $
+ last mod: $Id: codec_internal.h,v 1.9 2001/08/13 01:36:56 xiphmont Exp $
********************************************************************/
@@ -19,8 +19,6 @@
#include "envelope.h"
#include "codebook.h"
-#include "psy.h"
-#include "bitbuffer.h"
typedef struct vorbis_block_internal{
float **pcmdelay; /* this is a pointer into local storage */
@@ -33,12 +31,28 @@ typedef void vorbis_look_floor;
typedef void vorbis_look_residue;
typedef void vorbis_look_transform;
+/* mode ************************************************************/
+typedef struct {
+ int blockflag;
+ int windowtype;
+ int transformtype;
+ int mapping;
+} vorbis_info_mode;
+
+typedef void vorbis_info_time;
+typedef void vorbis_info_floor;
+typedef void vorbis_info_residue;
+typedef void vorbis_info_mapping;
+
+#include "psy.h"
+
typedef struct backend_lookup_state {
/* local lookup storage */
envelope_lookup *ve; /* envelope lookup */
float **window[2][2][2]; /* block, leadin, leadout, type */
vorbis_look_transform **transform[2]; /* block, type */
codebook *fullbooks;
+ vorbis_look_psy_global *psy_g_look;
/* backend lookups are tied to the mode, not the backend or naked mapping */
int modebits;
@@ -51,24 +65,9 @@ typedef struct backend_lookup_state {
unsigned char *header;
unsigned char *header1;
unsigned char *header2;
-
- float ampmax;
-
+
} backend_lookup_state;
-/* mode ************************************************************/
-typedef struct {
- int blockflag;
- int windowtype;
- int transformtype;
- int mapping;
-} vorbis_info_mode;
-
-typedef void vorbis_info_time;
-typedef void vorbis_info_floor;
-typedef void vorbis_info_residue;
-typedef void vorbis_info_mapping;
-
/* vorbis_info contains all the setup information specific to the
specific compression/decompression mode in progress (eg,
psychoacoustic settings, channel setup, options, codebook
@@ -83,7 +82,7 @@ typedef struct codec_setup_info {
long blocksizes[2];
/* modes are the primary means of supporting on-the-fly different
- blocksizes, different channel mappings (LR or mid-side),
+ blocksizes, different channel mappings (LR or M/A),
different residue backends, etc. Each mode consists of a
blocksize flag and a mapping (along with the mapping setup */
@@ -95,30 +94,22 @@ typedef struct codec_setup_info {
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;
- float preecho_thresh[4];
- float postecho_thresh[4];
- float preecho_minenergy;
-
- float ampmax_att_per_sec;
-
- /* delay caching... how many samples to keep around prior to our
- current block to aid in analysis? */
- int delaycache;
+ 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 */
+ vorbis_info_psy_global *psy_g_param;
} codec_setup_info;
+extern vorbis_look_psy_global *_vp_global_look(vorbis_info *vi);
+extern void _vp_global_free(vorbis_look_psy_global *look);
+
#endif
diff --git a/lib/envelope.c b/lib/envelope.c
index 53d7bf00..24ffeab9 100644
--- a/lib/envelope.c
+++ b/lib/envelope.c
@@ -11,7 +11,7 @@
********************************************************************
function: PCM data envelope analysis and manipulation
- last mod: $Id: envelope.c,v 1.36 2001/05/27 06:43:59 xiphmont Exp $
+ last mod: $Id: envelope.c,v 1.37 2001/08/13 01:36:56 xiphmont Exp $
Preecho calculation.
@@ -82,11 +82,12 @@ static float cheb_bandpass1k_A[]={
void _ve_envelope_init(envelope_lookup *e,vorbis_info *vi){
codec_setup_info *ci=vi->codec_setup;
+ vorbis_info_psy_global *gi=ci->psy_g_param;
int ch=vi->channels;
- int window=ci->envelopesa;
+ int window=gi->envelopesa;
int i;
e->winlength=window;
- e->minenergy=fromdB(ci->preecho_minenergy);
+ e->minenergy=fromdB(gi->preecho_minenergy);
e->iir=_ogg_calloc(ch*4,sizeof(IIR_state));
e->filtered=_ogg_calloc(ch*4,sizeof(float *));
e->ch=ch;
@@ -132,8 +133,8 @@ static float _ve_deltai(envelope_lookup *ve,float *pre,float *post){
basing blocks on quantization noise that outweighs the signal
itself (for low power signals) */
- float min=ve->minenergy;
- float A=min*min*n;
+ float minV=ve->minenergy;
+ float A=minV*minV*n;
float B=A;
for(i=0;i<n;i++){
@@ -150,10 +151,9 @@ static float _ve_deltai(envelope_lookup *ve,float *pre,float *post){
long _ve_envelope_search(vorbis_dsp_state *v,long searchpoint){
vorbis_info *vi=v->vi;
codec_setup_info *ci=vi->codec_setup;
+ vorbis_info_psy_global *gi=ci->psy_g_param;
envelope_lookup *ve=((backend_lookup_state *)(v->backend_state))->ve;
- long i,j,k,l;
- float *work=alloca(sizeof(float)*ve->winlength*2);
- static int seq=0;
+ long i,j,k;
/* make sure we have enough storage to match the PCM */
if(v->pcm_storage>ve->storage){
@@ -210,8 +210,8 @@ long _ve_envelope_search(vorbis_dsp_state *v,long searchpoint){
float *filtered=ve->filtered[i*4+k]+j;
float m=_ve_deltai(ve,filtered-ve->winlength,filtered);
- if(m>ci->preecho_thresh[k])return(0);
- if(m<ci->postecho_thresh[k])return(0);
+ if(m>gi->preecho_thresh[k])return(0);
+ if(m<gi->postecho_thresh[k])return(0);
}
}
diff --git a/lib/floor0.c b/lib/floor0.c
index a6372148..f568eb1b 100644
--- a/lib/floor0.c
+++ b/lib/floor0.c
@@ -11,7 +11,7 @@
********************************************************************
function: floor backend 0 implementation
- last mod: $Id: floor0.c,v 1.44 2001/06/18 09:07:31 xiphmont Exp $
+ last mod: $Id: floor0.c,v 1.45 2001/08/13 01:36:56 xiphmont Exp $
********************************************************************/
@@ -42,6 +42,8 @@ typedef struct {
lpc_lookup lpclook;
float *lsp_look;
+ long bits;
+ long frames;
} vorbis_look_floor0;
/* infrastructure for finding fit */
@@ -86,6 +88,10 @@ static void floor0_free_info(vorbis_info_floor *i){
static void floor0_free_look(vorbis_look_floor *i){
vorbis_look_floor0 *look=(vorbis_look_floor0 *)i;
if(i){
+
+ /*fprintf(stderr,"floor 0 bit usage %f\n",
+ (float)look->bits/look->frames);*/
+
if(look->linearmap)_ogg_free(look->linearmap);
if(look->lsp_look)_ogg_free(look->lsp_look);
lpc_clear(&look->lpclook);
@@ -252,9 +258,9 @@ float _curve_to_lpc(float *curve,float *lpc,
}
static int floor0_forward(vorbis_block *vb,vorbis_look_floor *in,
- const float *mdct, const float *logmdct, /* in */
+ float *mdct, const float *logmdct, /* in */
const float *logmask, const float *logmax, /* in */
- float *residue, float *codedflr){ /* out */
+ float *codedflr){ /* out */
long j;
vorbis_look_floor0 *look=(vorbis_look_floor0 *)in;
vorbis_info_floor0 *info=look->vi;
@@ -313,6 +319,8 @@ static int floor0_forward(vorbis_block *vb,vorbis_look_floor *in,
}
oggpack_write(&vb->opb,val,info->ampbits);
+ look->bits+=info->ampbits+1;
+ look->frames++;
if(val){
float *lspwork=alloca(look->m*sizeof(float));
@@ -342,7 +350,7 @@ static int floor0_forward(vorbis_block *vb,vorbis_look_floor *in,
b=be->fullbooks+info->books[booknum];
oggpack_write(&vb->opb,booknum,_ilog(info->numbooks));
-
+ look->bits+=_ilog(info->numbooks);
#ifdef TRAIN_LSP
{
@@ -366,7 +374,7 @@ static int floor0_forward(vorbis_block *vb,vorbis_look_floor *in,
for(j=0;j<look->m;j+=b->dim){
int entry=_f0_fit(b,codedflr,lspwork,j);
- bits+=vorbis_book_encode(b,entry,&vb->opb);
+ look->bits+=vorbis_book_encode(b,entry,&vb->opb);
#ifdef TRAIN_LSP
fprintf(ef,"%d,\n",entry);
@@ -389,10 +397,6 @@ static int floor0_forward(vorbis_block *vb,vorbis_look_floor *in,
_analysis_output("barklsp",seq-1,codedflr,look->n,1,1);
_analysis_output("lsp3",seq-1,codedflr,look->n,0,1);
- /* generate residue output */
- for(j=0;j<look->n;j++)
- residue[j]=mdct[j]/codedflr[j];
-
return(val);
}
@@ -401,7 +405,7 @@ static int floor0_forward(vorbis_block *vb,vorbis_look_floor *in,
#endif
memset(codedflr,0,sizeof(float)*look->n);
- memset(residue,0,sizeof(float)*look->n);
+ memset(mdct,0,sizeof(float)*look->n);
return(val);
}
diff --git a/lib/floor1.c b/lib/floor1.c
index 8094d02c..3387829a 100644
--- a/lib/floor1.c
+++ b/lib/floor1.c
@@ -11,7 +11,7 @@
********************************************************************
function: floor backend 1 implementation
- last mod: $Id: floor1.c,v 1.10 2001/06/15 23:59:47 xiphmont Exp $
+ last mod: $Id: floor1.c,v 1.11 2001/08/13 01:36:56 xiphmont Exp $
********************************************************************/
@@ -43,6 +43,9 @@ typedef struct {
int quant_q;
vorbis_info_floor1 *vi;
+ long phrasebits;
+ long postbits;
+ long frames;
} vorbis_look_floor1;
typedef struct lsfit_acc{
@@ -80,6 +83,11 @@ static void floor1_free_info(vorbis_info_floor *i){
static void floor1_free_look(vorbis_look_floor *i){
vorbis_look_floor1 *look=(vorbis_look_floor1 *)i;
if(i){
+ /*fprintf(stderr,"floor 1 bit usage %f:%f (%f total)\n",
+ (float)look->phrasebits/look->frames,
+ (float)look->postbits/look->frames,
+ (float)(look->postbits+look->phrasebits)/look->frames);*/
+
memset(look,0,sizeof(vorbis_look_floor1));
free(i);
}
@@ -613,14 +621,14 @@ static int post_Y(int *A,int *B,int pos){
}
static int floor1_forward(vorbis_block *vb,vorbis_look_floor *in,
- const float *mdct, const float *logmdct, /* in */
+ float *mdct, const float *logmdct, /* in */
const float *logmask, const float *logmax, /* in */
- float *residue, float *codedflr){ /* out */
+ float *codedflr){ /* out */
static int seq=0;
long i,j,k,l;
vorbis_look_floor1 *look=(vorbis_look_floor1 *)in;
vorbis_info_floor1 *info=look->vi;
- long n=look->n;
+ long n=info->n;
long posts=look->posts;
long nonzero=0;
lsfit_acc fits[VIF_POSIT+1];
@@ -633,8 +641,14 @@ static int floor1_forward(vorbis_block *vb,vorbis_look_floor *in,
int memo[VIF_POSIT+2];
codec_setup_info *ci=vb->vd->vi->codec_setup;
static_codebook **sbooks=ci->book_param;
- codebook *books=((backend_lookup_state *)(vb->vd->backend_state))->
- fullbooks;
+ codebook *books=NULL;
+ int writeflag=0;
+
+ if(vb->vd->backend_state){
+ books=((backend_lookup_state *)(vb->vd->backend_state))->
+ fullbooks;
+ writeflag=1;
+ }
memset(fit_flag,0,sizeof(fit_flag));
for(i=0;i<posts;i++)loneighbor[i]=0; /* 0 for the implicit 0 post */
@@ -876,94 +890,93 @@ static int floor1_forward(vorbis_block *vb,vorbis_look_floor *in,
/* we have everything we need. pack it out */
/* mark nontrivial floor */
- oggpack_write(&vb->opb,1,1);
-
- /* beginning/end post */
- oggpack_write(&vb->opb,fit_valueA[0],ilog(look->quant_q-1));
- oggpack_write(&vb->opb,fit_valueA[1],ilog(look->quant_q-1));
-
-#ifdef TRAIN_FLOOR1
- {
- FILE *of;
- char buffer[80];
- sprintf(buffer,"line%d_full.vqd",vb->mode);
- of=fopen(buffer,"a");
- for(j=2;j<posts;j++)
- fprintf(of,"%d\n",fit_valueB[j]);
- fclose(of);
- }
-#endif
-
-
- /* partition by partition */
- for(i=0,j=2;i<info->partitions;i++){
- int class=info->partitionclass[i];
- int cdim=info->class_dim[class];
- int csubbits=info->class_subs[class];
- int csub=1<<csubbits;
- int bookas[8]={0,0,0,0,0,0,0,0};
- int cval=0;
- int cshift=0;
-
- /* generate the partition's first stage cascade value */
- if(csubbits){
- int maxval[8];
- for(k=0;k<csub;k++){
- int booknum=info->class_subbook[class][k];
- if(booknum<0){
- maxval[k]=1;
- }else{
- maxval[k]=sbooks[info->class_subbook[class][k]]->entries;
+ if(writeflag){
+ oggpack_write(&vb->opb,1,1);
+
+ /* beginning/end post */
+ look->frames++;
+ look->postbits+=ilog(look->quant_q-1)*2;
+ oggpack_write(&vb->opb,fit_valueA[0],ilog(look->quant_q-1));
+ oggpack_write(&vb->opb,fit_valueA[1],ilog(look->quant_q-1));
+
+
+ /* partition by partition */
+ for(i=0,j=2;i<info->partitions;i++){
+ int class=info->partitionclass[i];
+ int cdim=info->class_dim[class];
+ int csubbits=info->class_subs[class];
+ int csub=1<<csubbits;
+ int bookas[8]={0,0,0,0,0,0,0,0};
+ int cval=0;
+ int cshift=0;
+
+ /* generate the partition's first stage cascade value */
+ if(csubbits){
+ int maxval[8];
+ for(k=0;k<csub;k++){
+ int booknum=info->class_subbook[class][k];
+ if(booknum<0){
+ maxval[k]=1;
+ }else{
+ maxval[k]=sbooks[info->class_subbook[class][k]]->entries;
+ }
}
- }
- for(k=0;k<cdim;k++){
- for(l=0;l<csub;l++){
- int val=fit_valueB[j+k];
- if(val<maxval[l]){
- bookas[k]=l;
- break;
+ for(k=0;k<cdim;k++){
+ for(l=0;l<csub;l++){
+ int val=fit_valueB[j+k];
+ if(val<maxval[l]){
+ bookas[k]=l;
+ break;
+ }
}
+ cval|= bookas[k]<<cshift;
+ cshift+=csubbits;
}
- cval|= bookas[k]<<cshift;
- cshift+=csubbits;
- }
- /* write it */
- vorbis_book_encode(books+info->class_book[class],cval,&vb->opb);
-
-#ifdef TRAIN_FLOOR1
- {
- FILE *of;
- char buffer[80];
- sprintf(buffer,"line%d_class%d.vqd",vb->mode,class);
- of=fopen(buffer,"a");
- fprintf(of,"%d\n",cval);
- fclose(of);
- }
-#endif
- }
-
- /* write post values */
- for(k=0;k<cdim;k++){
- int book=info->class_subbook[class][bookas[k]];
- if(book>=0){
- vorbis_book_encode(books+book,
- fit_valueB[j+k],&vb->opb);
-
+ /* write it */
+ look->phrasebits+=
+ vorbis_book_encode(books+info->class_book[class],cval,&vb->opb);
+
#ifdef TRAIN_FLOOR1
{
FILE *of;
char buffer[80];
- sprintf(buffer,"line%d_%dsub%d.vqd",vb->mode,class,bookas[k]);
+ sprintf(buffer,"line_%dx%d_class%d.vqd",
+ vb->pcmend/2,posts-2,class);
of=fopen(buffer,"a");
- fprintf(of,"%d\n",fit_valueB[j+k]);
+ fprintf(of,"%d\n",cval);
fclose(of);
}
#endif
}
+
+ /* write post values */
+ for(k=0;k<cdim;k++){
+ int book=info->class_subbook[class][bookas[k]];
+ if(book>=0){
+ /* hack to allow training with 'bad' books */
+ if(fit_valueB[j+k]<(books+book)->entries)
+ look->postbits+=vorbis_book_encode(books+book,
+ fit_valueB[j+k],&vb->opb);
+ /*else
+ fprintf(stderr,"+!");*/
+
+#ifdef TRAIN_FLOOR1
+ {
+ FILE *of;
+ char buffer[80];
+ sprintf(buffer,"line_%dx%d_%dsub%d.vqd",
+ vb->pcmend/2,posts-2,class,bookas[k]);
+ of=fopen(buffer,"a");
+ fprintf(of,"%d\n",fit_valueB[j+k]);
+ fclose(of);
+ }
+#endif
+ }
+ }
+ j+=cdim;
}
- j+=cdim;
}
-
+
{
/* generate quantized floor equivalent to what we'd unpack in decode */
int hx;
@@ -982,27 +995,26 @@ static int floor1_forward(vorbis_block *vb,vorbis_look_floor *in,
ly=hy;
}
}
- for(j=hx;j<look->n;j++)codedflr[j]=codedflr[j-1]; /* be certain */
+ for(j=lx;j<vb->pcmend/2;j++)codedflr[j]=codedflr[j-1]; /* be certain */
- /* use it to create residue vector. Eliminate residue elements
+ /* use it to create residue vector. Eliminate mdct elements
that were below the error training attenuation relative to
the original mask. This avoids portions of the floor fit
that were considered 'unused' in fitting from being used in
coding residue if the unfit values are significantly below
the original input mask */
+
for(j=0;j<n;j++)
if(logmdct[j]+info->twofitatten<logmask[j])
- residue[j]=0.f;
- else
- residue[j]=mdct[j]/codedflr[j];
- for(j=n;j<look->n;j++)residue[j]=0.f;
+ mdct[j]=0.f;
+ for(j=n;j<vb->pcmend/2;j++)mdct[j]=0.f;
}
}else{
- oggpack_write(&vb->opb,0,1);
+ if(writeflag)oggpack_write(&vb->opb,0,1);
memset(codedflr,0,n*sizeof(float));
- memset(residue,0,n*sizeof(float));
+ memset(mdct,0,n*sizeof(float));
}
seq++;
return(nonzero);
diff --git a/lib/info.c b/lib/info.c
index 50a484cc..4aa11a28 100644
--- a/lib/info.c
+++ b/lib/info.c
@@ -11,7 +11,7 @@
********************************************************************
function: maintain the info structure, info <-> header packets
- last mod: $Id: info.c,v 1.41 2001/06/15 21:15:39 xiphmont Exp $
+ last mod: $Id: info.c,v 1.42 2001/08/13 01:36:57 xiphmont Exp $
********************************************************************/
@@ -23,7 +23,6 @@
#include <ctype.h>
#include <ogg/ogg.h>
#include "vorbis/codec.h"
-#include "backends.h"
#include "codec_internal.h"
#include "codebook.h"
#include "registry.h"
@@ -408,7 +407,7 @@ static int _vorbis_pack_info(oggpack_buffer *opb,vorbis_info *vi){
}
static int _vorbis_pack_comment(oggpack_buffer *opb,vorbis_comment *vc){
- char temp[]="Xiphophorus libVorbis I 20010615";
+ char temp[]="Xiphophorus libVorbis I 20010812";
/* preamble */
oggpack_write(opb,0x03,8);
diff --git a/lib/mapping0.c b/lib/mapping0.c
index b16e0150..bfbe66af 100644
--- a/lib/mapping0.c
+++ b/lib/mapping0.c
@@ -11,7 +11,7 @@
********************************************************************
function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.33 2001/06/17 22:25:50 xiphmont Exp $
+ last mod: $Id: mapping0.c,v 1.34 2001/08/13 01:36:57 xiphmont Exp $
********************************************************************/
@@ -37,6 +37,8 @@
blocksize is set by the mode, and low backend lookups may require
parameters from other areas of the mode/mapping */
+extern int analysis_noisy;
+
typedef struct {
drft_lookup fft_look;
vorbis_info_mode *mode;
@@ -46,7 +48,7 @@ typedef struct {
vorbis_look_floor **floor_look;
vorbis_look_residue **residue_look;
- vorbis_look_psy *psy_look;
+ vorbis_look_psy *psy_look[2];
vorbis_func_time **time_func;
vorbis_func_floor **floor_func;
@@ -81,16 +83,21 @@ static void mapping0_free_look(vorbis_look_mapping *look){
l->time_func[i]->free_look(l->time_look[i]);
l->floor_func[i]->free_look(l->floor_look[i]);
l->residue_func[i]->free_look(l->residue_look[i]);
- if(l->psy_look)_vp_psy_clear(l->psy_look+i);
}
-
+ if(l->psy_look[1] && l->psy_look[1]!=l->psy_look[0]){
+ _vp_psy_clear(l->psy_look[1]);
+ _ogg_free(l->psy_look[1]);
+ }
+ if(l->psy_look[0]){
+ _vp_psy_clear(l->psy_look[0]);
+ _ogg_free(l->psy_look[0]);
+ }
_ogg_free(l->time_func);
_ogg_free(l->floor_func);
_ogg_free(l->residue_func);
_ogg_free(l->time_look);
_ogg_free(l->floor_look);
_ogg_free(l->residue_look);
- if(l->psy_look)_ogg_free(l->psy_look);
memset(l,0,sizeof(vorbis_look_mapping0));
_ogg_free(l);
}
@@ -109,7 +116,6 @@ static vorbis_look_mapping *mapping0_look(vorbis_dsp_state *vd,vorbis_info_mode
look->floor_look=_ogg_calloc(info->submaps,sizeof(vorbis_look_floor *));
look->residue_look=_ogg_calloc(info->submaps,sizeof(vorbis_look_residue *));
- if(ci->psys)look->psy_look=_ogg_calloc(info->submaps,sizeof(vorbis_look_psy));
look->time_func=_ogg_calloc(info->submaps,sizeof(vorbis_func_time *));
look->floor_func=_ogg_calloc(info->submaps,sizeof(vorbis_func_floor *));
@@ -130,10 +136,30 @@ static vorbis_look_mapping *mapping0_look(vorbis_dsp_state *vd,vorbis_info_mode
look->residue_look[i]=look->residue_func[i]->
look(vd,vm,ci->residue_param[resnum]);
- if(ci->psys && vd->analysisp){
- int psynum=info->psysubmap[i];
- _vp_psy_init(look->psy_look+i,ci->psy_param[psynum],
+ }
+ if(ci->psys && vd->analysisp){
+ if(info->psy[0] != info->psy[1]){
+
+ int psynum=info->psy[0];
+ look->psy_look[0]=_ogg_calloc(1,sizeof(vorbis_look_psy));
+ _vp_psy_init(look->psy_look[0],ci->psy_param[psynum],
+ ci->psy_g_param,
+ ci->blocksizes[vm->blockflag]/2,vi->rate);
+
+ psynum=info->psy[1];
+ look->psy_look[1]=_ogg_calloc(1,sizeof(vorbis_look_psy));
+ _vp_psy_init(look->psy_look[1],ci->psy_param[psynum],
+ ci->psy_g_param,
+ ci->blocksizes[vm->blockflag]/2,vi->rate);
+ }else{
+
+ int psynum=info->psy[0];
+ look->psy_look[0]=_ogg_calloc(1,sizeof(vorbis_look_psy));
+ look->psy_look[1]=look->psy_look[0];
+ _vp_psy_init(look->psy_look[0],ci->psy_param[psynum],
+ ci->psy_g_param,
ci->blocksizes[vm->blockflag]/2,vi->rate);
+
}
}
@@ -259,6 +285,7 @@ static long seq=0;
static int mapping0_forward(vorbis_block *vb,vorbis_look_mapping *l){
vorbis_dsp_state *vd=vb->vd;
vorbis_info *vi=vd->vi;
+ codec_setup_info *ci=vi->codec_setup;
backend_lookup_state *b=vb->vd->backend_state;
vorbis_look_mapping0 *look=(vorbis_look_mapping0 *)l;
vorbis_info_mapping0 *info=look->map;
@@ -267,30 +294,49 @@ static int mapping0_forward(vorbis_block *vb,vorbis_look_mapping *l){
int n=vb->pcmend;
int i,j;
float *window=b->window[vb->W][vb->lW][vb->nW][mode->windowtype];
-
- float **pcmbundle=alloca(sizeof(float *)*vi->channels);
- int *zerobundle=alloca(sizeof(int)*vi->channels);
-
- int *nonzero=alloca(sizeof(int)*vi->channels);
+ int *nonzero=alloca(sizeof(int)*vi->channels);
float *work=_vorbis_block_alloc(vb,n*sizeof(float));
- float newmax=vbi->ampmax;
+
+ float global_ampmax=vbi->ampmax;
+ float *local_ampmax=alloca(sizeof(float)*vi->channels);
+ int blocktype;
+
+ /* we differentiate between short and long block types to help the
+ masking engine; the window shapes also matter.
+ impulse block (a short block in which an impulse occurs)
+ padding block (a short block that pads between a transitional
+ long block and an impulse block, or vice versa)
+ transition block (the wqeird one; a long block with the transition
+ window; affects bass/midrange response and that must be
+ accounted for in masking)
+ long block (run of the mill long block)
+ */
+
+ if(vb->W){
+ if(!vb->lW || !vb->nW)
+ blocktype=BLOCKTYPE_TRANSITION;
+ else
+ blocktype=BLOCKTYPE_LONG;
+ }else{
+ /* right now we're missing the infrastructure to distingush the
+ two short types */
+ blocktype=BLOCKTYPE_IMPULSE;
+ }
for(i=0;i<vi->channels;i++){
float scale=4.f/n;
- int submap=info->chmuxlist[i];
- float ret;
/* the following makes things clearer to *me* anyway */
float *pcm =vb->pcm[i];
+ float *fft =work;
+ float *logfft =pcm+n/2;
+
+ /*float *res =pcm;
float *mdct =pcm;
- float *logmdct =pcm+n/2;
- float *res =pcm;
float *codedflr=pcm+n/2;
- float *fft =work;
- float *logfft =work;
float *logmax =work;
- float *logmask =work+n/2;
+ float *logmask =work+n/2;*/
/* window the PCM data */
for(j=0;j<n;j++)
@@ -299,30 +345,52 @@ static int mapping0_forward(vorbis_block *vb,vorbis_look_mapping *l){
/* transform the PCM data */
/* only MDCT right now.... */
mdct_forward(b->transform[vb->W][0],pcm,pcm);
- for(j=0;j<n/2;j++)
- logmdct[j]=todB(mdct+j);
/* FFT yields more accurate tonal estimation (not phase sensitive) */
drft_forward(&look->fft_look,fft);
fft[0]*=scale;
- fft[0]=todB(fft);
+ logfft[0]=todB(fft);
+ local_ampmax[i]=logfft[0];
for(j=1;j<n-1;j+=2){
float temp=scale*FAST_HYPOT(fft[j],fft[j+1]);
- logfft[(j+1)>>1]=todB(&temp);
+ temp=logfft[(j+1)>>1]=todB(&temp);
+ if(temp>local_ampmax[i])local_ampmax[i]=temp;
}
+ if(local_ampmax[i]>global_ampmax)global_ampmax=local_ampmax[i];
+
+ _analysis_output("fft",seq+i,logfft,n/2,1,0);
+ }
+
+ for(i=0;i<vi->channels;i++){
+ int submap=info->chmuxlist[i];
+
+ /* the following makes things clearer to *me* anyway */
+ float *mdct =vb->pcm[i];
+ float *res =mdct;
+ float *codedflr=mdct+n/2;
+ float *logfft =mdct+n/2;
+
+ float *logmdct =work;
+ float *logmax =mdct+n/2;
+ float *logmask =work+n/2;
+
+ for(j=0;j<n/2;j++)
+ logmdct[j]=todB(mdct+j);
+ _analysis_output("mdct",seq+i,logmdct,n/2,1,0);
- _analysis_output("fft",seq,logfft,n/2,0,0);
- _analysis_output("mdct",seq,logmdct,n/2,0,0);
/* perform psychoacoustics; do masking */
- ret=_vp_compute_mask(look->psy_look+submap,
- logfft, /* -> logmax */
- logmdct,
- logmask,
- vbi->ampmax);
- if(ret>newmax)newmax=ret;
-
- _analysis_output("mask",seq,logmask,n/2,0,0);
+ _vp_compute_mask(look->psy_look[blocktype],
+ b->psy_g_look,
+ i,
+ logfft, /* -> logmax */
+ logmdct,
+ logmask,
+ global_ampmax,
+ local_ampmax[i],
+ ci->blocksizes[vb->lW]/2);
+
+ _analysis_output("mask",seq+i,logmask,n/2,1,0);
/* perform floor encoding */
nonzero[i]=look->floor_func[submap]->
@@ -331,103 +399,151 @@ static int mapping0_forward(vorbis_block *vb,vorbis_look_mapping *l){
logmdct,
logmask,
logmax,
- res,
+
codedflr);
- /*for(j=0;j<n/2;j++)
- if(fabs(vb->pcm[i][j]>200))
- fprintf(stderr,"%ld ",seq);*/
-
- _analysis_output("res",seq-vi->channels+j,vb->pcm[i],n,0,0);
- _analysis_output("codedflr",seq++,codedflr,n/2,0,1);
+
+ _analysis_output("mdct2",seq+i,mdct,n/2,1,1);
+ _vp_remove_floor(look->psy_look[blocktype],
+ b->psy_g_look,
+ logmdct,
+ mdct,
+ codedflr,
+ res,
+ local_ampmax[i]);
+
+ for(j=0;j<n/2;j++)
+ if(fabs(res[j])>1200){
+ analysis_noisy=1;
+ /*fprintf(stderr,"%ld ",seq+i);*/
+ }
+
+ _analysis_output("res",seq+i,res,n/2,1,0);
+ _analysis_output("codedflr",seq+i,codedflr,n/2,1,1);
}
- vbi->ampmax=newmax;
+ vbi->ampmax=global_ampmax;
+
+ /* partition based prequantization and channel coupling */
+ /* Steps in prequant and coupling:
+
+ down-couple/down-quantize from perfect residue -> quantized vector
+ classify by this first quantized vector
+
+ do{
+ encode quantized vector; add encoded values to 'so-far' vector
+ more? [not yet at bitrate/not yet at target]
+ yes{
+ down-couple/down-quantize from perfect-'so-far' ->
+ quantized vector; when subtracting coupling,
+ account for +/- out-of-phase component
+ }no{
+ break
+ }
+ }
+ done.
+
+ quantization in each iteration is done (after circular normalization
+ in coupling) using a by-iteration quantization granule value.
+ */
+
+ {
+ float **pcm=vb->pcm;
+ float **quantized=alloca(sizeof(float*)*vi->channels);
+ float **sofar=alloca(sizeof(float*)*vi->channels);
+
+ long ***classifications=alloca(sizeof(long**)*info->submaps);
+ float ***pcmbundle=alloca(sizeof(float **)*info->submaps);
+ float ***sobundle=alloca(sizeof(float **)*info->submaps);
+ int **zerobundle=alloca(sizeof(int *)*info->submaps);
+ int *chbundle=alloca(sizeof(int)*info->submaps);
+ int chcounter=0;
+
+ /* play a little loose with this abstraction */
+ int quant_passes=look->psy_look[blocktype]->vi->coupling_passes;
+ int stopflag=0;
- /* channel coupling */
- for(i=0;i<info->coupling_steps;i++){
- if(nonzero[info->coupling_mag[i]] ||
- nonzero[info->coupling_ang[i]]){
-
- float *pcmM=vb->pcm[info->coupling_mag[i]];
- float *pcmA=vb->pcm[info->coupling_ang[i]];
-
- /* +-
- B
- | A-B
- -4 -3 -2 -1 0
- |
- 3 | 1
- |
- -+ 2-----+-----2----A ++
- |
- 1 | 3
- |
- 0 -1 -2 -3 -4
- B-A |
- --
-
- */
+ for(i=0;i<vi->channels;i++){
+ quantized[i]=pcm[i]+n/2;
+ sofar[i]=_vorbis_block_alloc(vb,n/2*sizeof(float));
+ memset(sofar[i],0,sizeof(float)*n/2);
+ }
- nonzero[info->coupling_mag[i]]=1;
- nonzero[info->coupling_ang[i]]=1;
+ pcmbundle[0]=alloca(sizeof(float *)*vi->channels);
+ sobundle[0]=alloca(sizeof(float *)*vi->channels);
+ zerobundle[0]=alloca(sizeof(int)*vi->channels);
+
+ /* initial down-quantized coupling */
+ _vp_quantize_couple(look->psy_look[blocktype],
+ info,
+ pcm,
+ sofar,
+ quantized,
+ nonzero,
+ 0);
- for(j=n/2-1;j>=0;j--){
- float A=rint(pcmM[j]);
- float B=rint(pcmA[j]);
- float mag;
- float ang;
-
- if(fabs(A)>fabs(B)){
- mag=A;
- if(A>0)
- ang=A-B;
+ for(i=0;i<vi->channels;i++)
+ _analysis_output("quant",seq+i,quantized[i],n/2,1,0);
+
+
+ /* classify, by submap */
+
+ for(i=0;i<info->submaps;i++){
+ int ch_in_bundle=0;
+ pcmbundle[i]=pcmbundle[0]+chcounter;
+ sobundle[i]=sobundle[0]+chcounter;
+ zerobundle[i]=zerobundle[0]+chcounter;
+
+ for(j=0;j<vi->channels;j++){
+ if(info->chmuxlist[j]==i){
+ if(nonzero[j])
+ zerobundle[i][ch_in_bundle]=1;
else
- ang=B-A;
- }else{
- mag=B;
- if(B>0)
- ang=A-B;
- else
- ang=B-A;
+ zerobundle[i][ch_in_bundle]=0;
+ pcmbundle[i][ch_in_bundle]=quantized[j];
+ sobundle[i][ch_in_bundle++]=sofar[j];
}
-
- /*if(fabs(mag)<3.5f)
- ang=rint(ang/(mag*2.f))*mag*2.f;*/
-
- /*if(fabs(mag)<1.5)
- ang=0;
-
- if(j>(n*3/16))
- ang=0;
-
- if(ang>=fabs(mag*2))ang=-fabs(mag*2);*/
-
- pcmM[j]=mag;
- pcmA[j]=ang;
}
+ chbundle[i]=ch_in_bundle;
+ chcounter+=ch_in_bundle;
+
+ classifications[i]=look->residue_func[i]->
+ class(vb,look->residue_look[i],pcmbundle[i],zerobundle[i],chbundle[i]);
}
- }
-
- /* perform residue encoding with residue mapping; this is
- multiplexed. All the channels belonging to one submap are
- encoded (values interleaved), then the next submap, etc */
-
- for(i=0;i<info->submaps;i++){
- int ch_in_bundle=0;
- for(j=0;j<vi->channels;j++){
- if(info->chmuxlist[j]==i){
- if(nonzero[j])
- zerobundle[ch_in_bundle]=1;
- else
- zerobundle[ch_in_bundle]=0;
- pcmbundle[ch_in_bundle++]=vb->pcm[j];
+
+ /* actual encoding loop */
+ for(i=0;!stopflag;){
+
+ /* perform residue encoding of this pass's quantized residue
+ vector, according residue mapping */
+
+ for(j=0;j<info->submaps;j++)
+ look->residue_func[j]->
+ forward(vb,look->residue_look[j],
+ pcmbundle[j],sobundle[j],zerobundle[j],chbundle[j],
+ i,classifications[j]);
+ i++;
+
+ /* bitrate management decision hook; the following if() is where
+ we tell progressive encoding to halt, right now it just
+ avoids falling off the edge */
+ if(i>=quant_passes /* || yadda yadda */)stopflag=1;
+
+ if(!stopflag){
+ /* down-couple/down-quantize from perfect-'so-far' ->
+ new quantized vector */
+ _vp_quantize_couple(look->psy_look[blocktype],
+ info,
+ pcm,
+ sofar,
+ quantized,
+ nonzero,
+ i);
}
+ /* steady as she goes */
}
-
- look->residue_func[i]->forward(vb,look->residue_look[i],
- pcmbundle,zerobundle,ch_in_bundle);
+ seq+=vi->channels;
}
look->lastframe=vb->sequence;
@@ -535,7 +651,7 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){
/* only MDCT right now.... */
for(i=0;i<vi->channels;i++){
float *pcm=vb->pcm[i];
- _analysis_output("out",seq+i,pcm,n/2,0,1);
+ _analysis_output("out",seq+i,pcm,n/2,1,1);
mdct_backward(b->transform[vb->W][0],pcm,pcm);
}
@@ -560,6 +676,12 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){
/* export hooks */
vorbis_func_mapping mapping0_exportbundle={
- &mapping0_pack,&mapping0_unpack,&mapping0_look,&mapping0_copy_info,
- &mapping0_free_info,&mapping0_free_look,&mapping0_forward,&mapping0_inverse
+ &mapping0_pack,
+ &mapping0_unpack,
+ &mapping0_look,
+ &mapping0_copy_info,
+ &mapping0_free_info,
+ &mapping0_free_look,
+ &mapping0_forward,
+ &mapping0_inverse
};
diff --git a/lib/modes/maskadj_Z.h b/lib/modes/maskadj_Z.h
new file mode 100644
index 00000000..44ecae2b
--- /dev/null
+++ b/lib/modes/maskadj_Z.h
@@ -0,0 +1,94 @@
+/********************************************************************
+ * *
+ * 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-2001 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/ *
+
+ ********************************************************************
+
+ function: predefined encoding modes; masking adjustments for low bitrate
+ last mod: $Id $
+
+ ********************************************************************/
+
+#ifndef _V_MASKADJ_Z_H_
+#define _V_MASKADJ_Z_H_
+
+#include <stdio.h>
+#include "vorbis/codec.h"
+#include "backends.h"
+
+static vp_attenblock _vp_tonemask_consbass_Z={
+ {{-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*63*/
+ {-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*88*/
+ {-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*125*/
+ {-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*175*/
+ {-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*250*/
+ {-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*350*/
+
+ {-35.f,-35.f,-35.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*500*/
+ {-35.f,-35.f,-35.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*700*/
+
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f}, /*2000*/
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f},
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f}, /*2000*/
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f},
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f}, /*2000*/
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f},
+ {-24.f,-24.f,-26.f,-30.f,-30.f,-35.f,-45.f,-55.f,-65.f,-75.f,-90.f}, /*16000*/
+}};
+
+static vp_attenblock _vp_tonemask_Z={
+
+ {{-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*63*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*88*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*125*/
+
+
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+
+
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f}, /*2000*/
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f},
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f}, /*2000*/
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f},
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f}, /*2000*/
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f},
+ {-24.f,-24.f,-26.f,-30.f,-30.f,-35.f,-45.f,-55.f,-65.f,-75.f,-90.f}, /*16000*/
+
+}};
+
+static vp_attenblock _vp_peakatt_Z={
+ {{-14.f,-16.f,-18.f,-19.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*63*/
+ {-14.f,-16.f,-18.f,-19.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*88*/
+ {-14.f,-16.f,-18.f,-19.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*125*/
+ {-14.f,-16.f,-18.f,-19.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*125*/
+ {-14.f,-16.f,-18.f,-19.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*125*/
+ {-14.f,-16.f,-18.f,-19.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*125*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-24.f,-24.f},/*500*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*700*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*1000*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*1400*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*2000*/
+ {-10.f,-10.f,-10.f,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*2400*/
+ {-10.f,-10.f,-10.f,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*4000*/
+ {-10.f,-10.f,-10.f,-12.f,-12.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*5600*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*8000*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*11500*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-12.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*16000*/
+}};
+
+#endif
diff --git a/lib/modes/mode_44c_Z.h b/lib/modes/mode_44c_Z.h
new file mode 100644
index 00000000..407feb0e
--- /dev/null
+++ b/lib/modes/mode_44c_Z.h
@@ -0,0 +1,315 @@
+/********************************************************************
+ * *
+ * 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-2001 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: predefined encoding modes; 44kHz stereo ~64kbps true VBR
+ last mod: $Id: mode_44c_Z.h,v 1.2 2001/08/13 01:37:13 xiphmont Exp $
+
+ ********************************************************************/
+
+#ifndef _V_MODES_44c_Z_H_
+#define _V_MODES_44c_Z_H_
+
+#include <stdio.h>
+#include "vorbis/codec.h"
+#include "backends.h"
+
+#include "books/line_128x7_class1.vqh"
+#include "books/line_128x7_class2.vqh"
+
+#include "books/line_128x7_0sub0.vqh"
+#include "books/line_128x7_1sub1.vqh"
+#include "books/line_128x7_1sub2.vqh"
+#include "books/line_128x7_1sub3.vqh"
+#include "books/line_128x7_2sub1.vqh"
+#include "books/line_128x7_2sub2.vqh"
+#include "books/line_128x7_2sub3.vqh"
+
+#include "books/line_1024x31_class0.vqh"
+#include "books/line_1024x31_class1.vqh"
+#include "books/line_1024x31_class2.vqh"
+#include "books/line_1024x31_class3.vqh"
+
+#include "books/line_1024x31_0sub0.vqh"
+#include "books/line_1024x31_0sub1.vqh"
+#include "books/line_1024x31_1sub0.vqh"
+#include "books/line_1024x31_1sub1.vqh"
+#include "books/line_1024x31_2sub1.vqh"
+#include "books/line_1024x31_2sub2.vqh"
+#include "books/line_1024x31_2sub3.vqh"
+#include "books/line_1024x31_3sub1.vqh"
+#include "books/line_1024x31_3sub2.vqh"
+#include "books/line_1024x31_3sub3.vqh"
+
+#include "books/res_Zc_128aux.vqh"
+#include "books/res_Zc_1024aux.vqh"
+
+#include "books/res_Zc_1.vqh"
+#include "books/res_Zc_2.vqh"
+#include "books/res_Zc_3.vqh"
+#include "books/res_Zc_4.vqh"
+#include "books/res_Zc_5.vqh"
+#include "books/res_Zc_6.vqh"
+#include "books/res_Zc_7.vqh"
+#include "books/res_Zc_8.vqh"
+#include "books/res_Zc_9.vqh"
+#include "books/res_Zc_9a.vqh"
+#include "books/res_Zc_9b.vqh"
+
+#include "maskadj_Z.h"
+
+static vorbis_info_psy_global _psy_set_44c_ZG={
+ 0, /* decaydBpms */
+ 8, /* lines per eighth octave */
+
+ /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
+ 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
+ -6.f,
+
+ 0,
+};
+
+static struct vp_couple_pass _psy_pass_44c_Z0[]={
+ {1.f,1.f,
+ {{24, 0,0, 0,0, 0,0},
+ {9999, 0,0, 7.5f,12, 7.5f,0}}
+ },
+};
+
+static vp_couple_pass _psy_pass_44c_Z[]={
+ {1.f,1.f,
+ {{288, 0,0, 0,0, 0,0},
+ {9999, 0,0, 7.5f,12, 7.5f,0}}
+ }
+};
+
+static vorbis_info_psy _psy_set_44c_Z0={
+ ATH_Bark_dB_lineaggressive,
+ -100.,-110.,
+
+ /* tonemaskp */
+ 3.f, -24.f,&_vp_tonemask_consbass_Z,
+ /* peakattp, curvelimitp */
+ 1, 0, &_vp_peakatt_Z,
+
+ /*noisemaskp */
+ 1,-24.f, /* suppress any noise curve over maxspec+n */
+ 1.f, 1.f, /* low/high window */
+ 2, 2, -1,
+
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-20,-20,-20,-20,-20,-20,-10, -5, 3, 3, 4, 4, 4, 4, 4, 4, 8},
+ {1.f,1.f,1.f,1.f,1.f,1.f,.8f,.7f,.7f,.7f,.7f,.7f,.8f,.88f,.89f,.9f,.9f},
+
+ 95.f, /* even decade + 5 is important; saves an rint() later in a
+ tight loop) */
+ 1,
+ _psy_pass_44c_Z0
+};
+
+static vorbis_info_psy _psy_set_44c_ZT={
+ ATH_Bark_dB_lineaggressive,
+ -100.f,-110.f,
+
+ /* tonemask */
+ 3.f,-20.f,&_vp_tonemask_consbass_Z,
+ /* peakattp,curvelimitp */
+ 1, 0, &_vp_peakatt_Z,
+
+ /*noisemaskp */
+ 1, -24.f, /* suppress any noise curve over maxspec+n */
+ .5f,.5f, /* low/high window */
+ 10,10,100,
+
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-20,-20,-20,-20,-20,-20,-20, -6, 3, 3, 4, 5, 5, 5, 5, 6, 10},
+ {1.f,1.f,1.f,1.f,1.f,1.f,.8f,.7f,.7f,.7f,.7f,.7f,.8f,.88f,.89f,.9f,.9f},
+
+ 95.f, /* even decade + 5 is important; saves an rint() later in a
+ tight loop) */
+ 1,_psy_pass_44c_Z
+};
+
+static vorbis_info_psy _psy_set_44c_Z={
+ ATH_Bark_dB_lineaggressive,
+ -100.f, -110.f,
+
+ /* tonemask */
+ 3.f,-20.f,&_vp_tonemask_Z,
+ /* peakattp, curvelimitp */
+ 1, 0, &_vp_peakatt_Z,
+
+ /*noisemaskp */
+ 1, -24.f, /* suppress any noise curve over maxspec+n */
+ .5f,.5f, /* low/high window */
+ 10,10,100,
+
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-20,-20,-20,-20,-20,-20,-10,-6, 3, 3, 4, 5, 5, 5, 5, 6, 10},
+ {1.f,1.f,1.f,1.f,1.f,1.f,.8f,.7f,.7f,.7f,.7f,.8f,.85f,.88f,.89f,.9f,.9f},
+
+ 95.f, /* even decade + 5 is important; saves an rint() later in a
+ tight loop) */
+ 1,_psy_pass_44c_Z
+};
+
+static vorbis_info_time0 _time_set_44c_Z={0};
+
+static vorbis_info_floor1 _floor_set_44c_Z0={
+ 3,
+ {0,1,2},
+
+ {1,3,3},
+ {0,2,2},
+ {-1,0,1},
+ {{2},{-1,3,4,5},{-1,6,7,8}},
+
+ 4,
+
+ {0,128,
+
+ 7,
+
+ 2,1,4,
+ 23,13,45},
+
+ 60,30,500,
+ 999,999,0,18.,
+ 8,70,
+ 90};
+
+static vorbis_info_floor1 _floor_set_44c_Z={
+ 10,
+ {0,1,2,2,2,2,2, 3,3,3},
+
+ {3,4,3,3},
+ {1,1,2,2},
+ {9,10,11,12},
+ {{13,14},
+ {15,16},
+ {-1,17,18,19},
+ {-1,20,21,22},
+ },
+
+ 4,
+ {0,1024,
+
+ 88,31,243,
+
+ 14,54,143,460,
+
+ 6,3,10, 22,18,26, 41,36,47,
+ 69,61,78, 112,99,126, 185,162,211,
+ 329,282,387, 672,553,825
+ },
+
+ 60,30,400,
+ 20,8,1,18.,
+ 20,600,
+ 720};
+
+static vorbis_info_residue0 _residue_set_44c_Z0={
+ 0,180, 12, 10,23,
+ {0,1,1,1,1,1,1,1,1,7},
+ {25, 26, 27, 28, 29, 30, 31, 32, 33,34,35},
+ {9999, 9999, 9999, 9999, 2,9999, 9999, 9999, 9999, 9999},
+ {.5, 1.5, 2.5f, 7.5, 1.5f,1.5, 2.5, 7.5, 22.5f},
+ {0},
+ {99, 4, 4, 4, 99,99, 99, 99, 99},
+ {3}};
+
+static vorbis_info_residue0 _residue_set_44c_Z={
+ 0,1408, 32, 10,24,
+ {0,1,1,1,1,1,1,1,1,7},
+ {25, 26, 27, 28, 29, 30, 31, 32, 33,34,35},
+ {9999, 9999, 9999, 9999, 3,9999, 9999, 9999, 9999, 9999},
+ {.5, 1.5, 2.5f, 7.5, 1.5f,1.5, 2.5, 7.5, 22.5f},
+ {0},
+ {99, 18, 18, 18, 99,99, 99, 99, 99},
+ {3}};
+
+static vorbis_info_mapping0 _mapping_set_44c_Z0={
+ 1, {0,0}, {0}, {0}, {0}, {0,0}, 1,{0},{1}};
+static vorbis_info_mapping0 _mapping_set_44c_Z={
+ 1, {0,0}, {0}, {1}, {1}, {1,2}, 1,{0},{1}};
+
+static vorbis_info_mode _mode_set_44c_Z0={0,0,0,0};
+static vorbis_info_mode _mode_set_44c_Z={1,0,0,1};
+
+/* CD quality stereo, no channel coupling */
+codec_setup_info info_44c_Z={
+
+ /* smallblock, largeblock */
+ {256, 2048},
+ /* modes,maps,times,floors,residues,books,psys */
+ 2, 2, 1, 2, 2, 36, 3,
+ /* modes */
+ {&_mode_set_44c_Z0,&_mode_set_44c_Z},
+ /* maps */
+ {0,0},{&_mapping_set_44c_Z0,&_mapping_set_44c_Z},
+ /* times */
+ {0,0},{&_time_set_44c_Z},
+ /* floors */
+ {1,1},{&_floor_set_44c_Z0,&_floor_set_44c_Z},
+ /* residue */
+ {2,2},{&_residue_set_44c_Z0,&_residue_set_44c_Z},
+ /* books */
+
+ {
+ &_huff_book_line_128x7_class1,
+ &_huff_book_line_128x7_class2, /* 1 */
+
+ &_huff_book_line_128x7_0sub0, /* 2 */
+ &_huff_book_line_128x7_1sub1, /* 3 */
+ &_huff_book_line_128x7_1sub2,
+ &_huff_book_line_128x7_1sub3, /* 5 */
+ &_huff_book_line_128x7_2sub1,
+ &_huff_book_line_128x7_2sub2, /* 7 */
+ &_huff_book_line_128x7_2sub3,
+
+ &_huff_book_line_1024x31_class0,
+ &_huff_book_line_1024x31_class1, /* 10 */
+ &_huff_book_line_1024x31_class2,
+ &_huff_book_line_1024x31_class3, /* 12 */
+
+ &_huff_book_line_1024x31_0sub0,
+ &_huff_book_line_1024x31_0sub1, /* 14 */
+ &_huff_book_line_1024x31_1sub0,
+ &_huff_book_line_1024x31_1sub1,
+ &_huff_book_line_1024x31_2sub1,
+ &_huff_book_line_1024x31_2sub2, /* 18 */
+ &_huff_book_line_1024x31_2sub3,
+ &_huff_book_line_1024x31_3sub1,
+ &_huff_book_line_1024x31_3sub2,
+ &_huff_book_line_1024x31_3sub3, /* 22 */
+
+ &_huff_book_res_Zc_128aux,
+ &_huff_book_res_Zc_1024aux,
+
+ &_vq_book_res_Zc_1,
+ &_vq_book_res_Zc_2,
+ &_vq_book_res_Zc_3,
+ &_vq_book_res_Zc_4,
+ &_vq_book_res_Zc_5,
+ &_vq_book_res_Zc_6,
+ &_vq_book_res_Zc_7,
+ &_vq_book_res_Zc_8,
+ &_vq_book_res_Zc_9,
+ &_vq_book_res_Zc_9a,
+ &_vq_book_res_Zc_9b,
+
+ },
+ /* psy */
+ {&_psy_set_44c_Z0,&_psy_set_44c_ZT,&_psy_set_44c_Z},
+ &_psy_set_44c_ZG
+};
+
+#endif
diff --git a/lib/modes/mode_A.h b/lib/modes/mode_A.h
index 71ea7031..cd3344af 100644
--- a/lib/modes/mode_A.h
+++ b/lib/modes/mode_A.h
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_A.h,v 1.16 2001/06/18 09:07:32 xiphmont Exp $
+ last mod: $Id: mode_A.h,v 1.17 2001/08/13 01:37:13 xiphmont Exp $
********************************************************************/
@@ -22,20 +22,35 @@
#include "vorbis/codec.h"
#include "backends.h"
-#include "books/lsp12_0.vqh"
-#include "books/lsp30_0.vqh"
-#include "books/lsp12_1.vqh"
-#include "books/lsp30_1.vqh"
+#include "books/line0_class1.vqh"
+#include "books/line0_class2.vqh"
+#include "books/line1_class0.vqh"
+#include "books/line1_class1.vqh"
+#include "books/line1_class2.vqh"
+#include "books/line1_class3.vqh"
+
+#include "books/line0_0sub0.vqh"
+#include "books/line0_1sub1.vqh"
+#include "books/line0_1sub2.vqh"
+#include "books/line0_1sub3.vqh"
+#include "books/line0_2sub1.vqh"
+#include "books/line0_2sub2.vqh"
+#include "books/line0_2sub3.vqh"
+
+#include "books/line1_0sub0.vqh"
+#include "books/line1_0sub1.vqh"
+#include "books/line1_1sub0.vqh"
+#include "books/line1_1sub1.vqh"
+#include "books/line1_2sub1.vqh"
+#include "books/line1_2sub2.vqh"
+#include "books/line1_2sub3.vqh"
+#include "books/line1_3sub1.vqh"
+#include "books/line1_3sub2.vqh"
+#include "books/line1_3sub3.vqh"
#include "books/res0_128_128aux.vqh"
#include "books/res0_128_1024aux.vqh"
-#include "books/res0_128_128_1.vqh"
-#include "books/res0_128_128_2.vqh"
-#include "books/res0_128_128_3.vqh"
-#include "books/res0_128_128_4.vqh"
-#include "books/res0_128_128_5.vqh"
-
#include "books/res0_128_1024_1.vqh"
#include "books/res0_128_1024_2.vqh"
#include "books/res0_128_1024_3.vqh"
@@ -43,218 +58,284 @@
#include "books/res0_128_1024_5.vqh"
#include "books/res0_128_1024_6.vqh"
#include "books/res0_128_1024_7.vqh"
+#include "books/res0_128_1024_7a.vqh"
#include "books/res0_128_1024_8.vqh"
+#include "books/res0_128_1024_8a.vqh"
#include "books/res0_128_1024_9.vqh"
+#include "books/res0_128_1024_9a.vqh"
+#include "books/res0_128_1024_9b.vqh"
+
+static vorbis_info_psy_global _psy_set_AG={
+ 0, /* decaydBpms */
+ 8, /* lines per eighth octave */
+
+ /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
+ 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
+ -6.f,
+
+ 0,
+};
+
+static struct vp_couple_pass _psy_passA0[]={
+ {1.f,1.f,
+ {{24, 0,0, 0,0, 0,0},
+ {64, 0,0, 12.5f,12, 0,0},
+ {9999, 0,0, 12.5f,12, 2.5f,0}}
+ },
+};
+
+static vp_couple_pass _psy_passA[]={
+ {1.f,1.f,
+ {{288, 0,0, 0,0, 0,0},
+ {512, 0,0, 12.5f,12, 0,0},
+ {9999, 0,0, 12.5f,12, 2.5f,0}}
+ }
+};
+
+static vp_attenblock _vp_tonemask_consbass_A={
+ {{-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*63*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*88*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*125*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*175*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*250*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*350*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*500*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*700*/
+
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
+
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
+ {-30.f,-30.f,-33.f,-35.f,-35.f,-45.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*11500*/
+ {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*16000*/
+}};
+
+static vp_attenblock _vp_tonemask_A={
+
+ {{-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*63*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*88*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*125*/
+
+
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
+
+ {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
+
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-45.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*11500*/
+ {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*16000*/
+}};
+
+static vp_attenblock _vp_peakatt_A={
+ {{-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*63*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*88*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*125*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*175*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*250*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*350*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*500*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-26.f,-32.f,-40.f},/*700*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-22.f,-32.f,-40.f},/*1000*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-32.f,-40.f},/*1400*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-32.f,-40.f},/*2000*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-32.f,-40.f},/*2400*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-32.f,-40.f},/*4000*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-12.f,-13.f,-22.f,-32.f,-40.f},/*5600*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-12.f,-13.f,-22.f,-32.f,-40.f},/*8000*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-22.f,-32.f,-40.f},/*11500*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-20.f,-32.f,-40.f},/*16000*/
+}};
static vorbis_info_psy _psy_set_A0={
- ATH_Bark_dB_lspconservative,
- 1,/*decayp*/
+ ATH_Bark_dB_lineaggressive,
-100.,
-140.,
- 8,
-
- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
- /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
- /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
-
- 1,/* tonemaskp */
- /* 0 10 20 30 40 50 60 70 80 90 100 */
- {
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*63*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*88*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*125*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*175*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*250*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*350*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*500*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*700*/
-
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/
- {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2000*/
- {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2800*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*11500*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*16000*/
- },
+ /* tonemaskp */
+ 0.f, -40.f,&_vp_tonemask_consbass_A,
- 1,/* peakattp */
- {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-22.f,-22.f,-22.f},/*63*/
- {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-22.f,-22.f,-22.f},/*88*/
- {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-22.f,-22.f,-22.f},/*125*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-22.f,-22.f},/*175*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-22.f,-22.f},/*250*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-22.f,-22.f},/*350*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-22.f,-22.f},/*500*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-22.f,-22.f,-22.f},/*700*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-22.f,-22.f,-22.f},/*1000*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-22.f,-22.f},/*1400*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-22.f,-22.f},/*2000*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-22.f,-22.f},/*2400*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-22.f,-22.f},/*4000*/
- {-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-12.f,-13.f,-22.f,-22.f,-22.f},/*5600*/
- {-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-12.f,-13.f,-22.f,-22.f,-22.f},/*8000*/
- {-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-22.f,-22.f,-22.f},/*11500*/
- {-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-20.f,-21.f,-22.f},/*16000*/
- },
+ /* peakattp */
+ 1, &_vp_peakatt_A,
1,/*noisemaskp */
- -10.f, /* suppress any noise curve over maxspec+n */
- .5f, /* low window */
- .5f, /* high window */
- 5,
- 5,
- 10,
- {.000f, 0.f,/*63*/
- .000f, 0.f,/*88*/
- .000f, 0.f,/*125*/
- .000f, 0.f,/*175*/
- .000f, 0.f,/*250*/
- .000f, 0.f,/*350*/
- .000f, 0.f,/*500*/
- .300f, 0.f,/*700*/
- .500f, 0.f,/*1000*/
- .500f, 0.f,/*1400*/
- .500f, 0.f,/*2000*/
- .500f, 0.f,/*2800*/
- .600f, 0.f,/*4000*/
- .700f, 0.f,/*5600*/
- .850f, 0.f,/*8000*/
- .900f, 0.f,/*11500*/
- .900f, 0.f,/*16000*/
- },
-
+ -30.f, /* suppress any noise curve over maxspec+n */
+ .6f, .6f, /* low/high window */
+ 5, 5, 10,
+
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-30,-30,-30,-30,-30,-30,-20,-10, 0, 0, 0, 0, 0, 1, 1, 2, 3},
+ {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.7f,.8f,.9f,.9f,.9f},
+
95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- -22.,
-
+ 1,
+ _psy_passA0
};
static vorbis_info_psy _psy_set_A={
- ATH_Bark_dB_lspconservative,
- 1,/*decayp*/
+ ATH_Bark_dB_lineaggressive,
-100.f,
-140.f,
- 8,
-
- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
- /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
- /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
- 1,/* tonemaskp */
- /* 0 10 20 30 40 50 60 70 80 90 100 */
- {
- {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/
- {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*88*/
- {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*125*/
-
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
-
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
-
- {-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
- {-30.f,-30.f,-33.f,-35.f,-35.f,-45.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*11500*/
- {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*16000*/
+ /* tonemask */
+ 0.f,-40.f,&_vp_tonemask_consbass_A,
+ /* peakattp */
+ 1, &_vp_peakatt_A,
- },
+ /*noisemaskp */
+ 1, -30.f, /* suppress any noise curve over maxspec+n */
+ .4f,.4f, /* low/high window */
+ 10,10,100,
- 1,/* peakattp */
- {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-24.f,-24.f,-24.f},/*63*/
- {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-24.f,-24.f,-24.f},/*88*/
- {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-24.f,-24.f,-24.f},/*125*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-24.f,-24.f,-24.f},/*175*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-24.f,-24.f,-24.f},/*250*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-24.f,-24.f},/*350*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-24.f,-24.f},/*500*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*700*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*1000*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*1400*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*2000*/
- {-10.f,-10.f,-10.f,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*2400*/
- {-10.f,-10.f,-10.f,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*4000*/
- {-10.f,-10.f,-10.f,-12.f,-12.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*5600*/
- {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*8000*/
- {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*11500*/
- {-10.f,-10.f,-10.f,-10.f,-10.f,-12.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*16000*/
- },
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+ {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.7f,.75f,.8f,.8f,.85f},
- 1,/*noisemaskp */
- -24.f, /* suppress any noise curve over maxspec+n */
- .5f, /* low window */
- .5f, /* high window */
- 25,
- 25,
- 50,
- {.000f, 0.f, /*63*/
- .000f, 0.f, /*88*/
- .000f, 0.f, /*125*/
- .000f, 0.f, /*175*/
- .000f, 0.f, /*250*/
- .000f, 0.f, /*350*/
- .000f, 0.f, /*500*/
- .200f, 0.f, /*700*/
- .300f, 0.f, /*1000*/
- .400f, 0.f, /*1400*/
- .400f, 0.f, /*2000*/
- .400f, 0.f, /*2800*/
- .700f, 0.f, /*4000*/
- .850f, 0.f, /*5600*/
- .900f, 0.f, /*8000*/
- .900f, 0.f, /*11500*/
- .900f, 1.f, /*16000*/
- },
-
95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- -28.,
+ 1,_psy_passA
+};
+
+static vorbis_info_psy _psy_set_AT={
+ ATH_Bark_dB_lineaggressive,
+
+ -100.f,
+ -140.f,
+
+ /* tonemask */
+ 0.f,-40.f,&_vp_tonemask_consbass_A,
+ /* peakattp */
+ 1, &_vp_peakatt_A,
+
+ /*noisemaskp */
+ 1, -30.f, /* suppress any noise curve over maxspec+n */
+ .4f,.4f, /* low/high window */
+ 10,10,100,
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-30,-30,-30,-30,-30,-30,-30,-20, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+ {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.7f,.75f,.8f,.8f,.85f},
+
+ 95.f, /* even decade + 5 is important; saves an rint() later in a
+ 1,_psy_passA
};
/* with GNUisms, this could be short and readable. Oh well */
static vorbis_info_time0 _time_set0A={0};
-static vorbis_info_floor0 _floor_set0A={12, 44100, 64, 10,130, 2, {0,1},
- 0.199f, .285f};
-static vorbis_info_floor0 _floor_set1A={30, 44100, 256, 12,150, 2, {2,3},
- .082f, .126f};
-static vorbis_info_residue0 _residue_set0A={0,96,16,6,4,
- {0,1,1,1,1,1},
- {6,7,8,9,10},
-
- {0,99999,9999,9999,9999},
- {999.f,1.5f,3.5f,15.5f,26.5f},
- {4,4,4,4,4},
- {99,99,99,99,99}};
-
-static vorbis_info_residue0 _residue_set1A={0, 960, 32,10,5,
- {0,1,1,1,1,1,1,1,1,1},
- {11,12,13,14,15,16,17,18,19},
-
- {0,8,9999,16,9999,
- 24,9999,9999,9999},
- {999.f,1.5f,1.5f,2.5f,2.5f,
- 6.5f,6.5f,12.5f,22.5f},
- {5,5,5,5,5,5,5,5,5},
- {99,99,99,99,99,99,99,99,99}};
-
-static vorbis_info_mapping0 _mapping_set0A={1, {0,0}, {0}, {0}, {0}, {0},
- 0,{0},{0}};
-static vorbis_info_mapping0 _mapping_set1A={1, {0,0}, {0}, {1}, {1}, {1},
- 0,{0},{0}};
+
+static vorbis_info_floor1 _floor_set0A={6,
+ {0,1,1,1,2,2},
+
+ {4,3,3},
+ {0,2,2},
+ {-1,0,1},
+ {{2},{-1,3,4,5},{-1,6,7,8}},
+
+ 4,
+
+ {0,128,
+
+ 6,17,30,58,
+
+ 2,1,4, 11,8,14, 23,20,26,
+ 41,35,48, 84,69,103},
+
+ 60,30,500,
+ 999,999,1,18.,
+ 8,70,
+ 96};
+
+static vorbis_info_floor1 _floor_set1A={10,
+ {0,1,2,2,2,2,2, 3,3,3},
+
+ {3,4,3,3},
+ {1,1,2,2},
+ {9,10,11,12},
+ {{13,14},
+ {15,16},
+ {-1,17,18,19},
+ {-1,20,21,22},
+ },
+
+ 2,
+ {0,1024,
+
+ 88,31,243,
+
+ 14,54,143,460,
+
+ 6,3,10, 22,18,26, 41,36,47,
+ 69,61,78, 112,99,126, 185,162,211,
+ 329,282,387, 672,553,825
+ },
+
+ 60,30,300,
+ 20,8,1,18.,
+ 20,600,
+ 768};
+
+static vorbis_info_residue0 _residue_set0A={0,192,8,10,23,
+ {0,1,1,1,1,1,1,3,3,7},
+ {25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,32,
+ 33,34,
+ 35,36,37},
+ {9999,9999,9999,9999,9999,9999,
+ 9999,9999,9999,9999},
+ {.5f,
+ 1.5f,1.5f,
+ 2.5f,2.5f,2.5f,
+ 4.5f,17.5f,80.5f},
+ {0},
+ {99,16,99,6,16,99,99,99,99,99},
+ {3}};
+
+static vorbis_info_residue0 _residue_set1A={0,1536, 32,10,24,
+ {0,1,1,1,1,1,1,3,3,7},
+ {25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,32,
+ 33,34,
+ 35,36,37},
+ {9999,9999,9999,9999,9999,9999,
+ 9999,9999,9999,9999},
+ {.5f,
+ 1.5f,1.5f,
+ 2.5f,2.5f,2.5f,
+ 4.5f,17.5f,80.f},
+ {0},
+ {99,32,99,18,32,99,99,99,99,99},
+ {3}};
+
+static vorbis_info_mapping0 _mapping_set0A={1, {0,0}, {0}, {0}, {0}, {0,0},
+ 1,{0},{1}};
+static vorbis_info_mapping0 _mapping_set1A={1, {0,0}, {0}, {1}, {1}, {1,2},
+ 1,{0},{1}};
static vorbis_info_mode _mode_set0A={0,0,0,0};
static vorbis_info_mode _mode_set1A={1,0,0,1};
@@ -264,7 +345,7 @@ codec_setup_info info_A={
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
- 2, 2, 1, 2, 2, 20, 2,
+ 2, 2, 1, 2, 2, 38, 3,
/* modes */
{&_mode_set0A,&_mode_set1A},
/* maps */
@@ -272,24 +353,42 @@ codec_setup_info info_A={
/* times */
{0,0},{&_time_set0A},
/* floors */
- {0,0},{&_floor_set0A,&_floor_set1A},
+ {1,1},{&_floor_set0A,&_floor_set1A},
/* residue */
- {0,0},{&_residue_set0A,&_residue_set1A},
+ {2,2},{&_residue_set0A,&_residue_set1A},
/* books */
- {&_vq_book_lsp12_0, /* 0 */
- &_vq_book_lsp12_1, /* 1 */
- &_vq_book_lsp30_0, /* 2 */
- &_vq_book_lsp30_1, /* 3 */
-
- &_huff_book_res0_128_128aux,
+
+ {
+ &_huff_book_line0_class1,
+ &_huff_book_line0_class2, /* 1 */
+
+ &_huff_book_line0_0sub0, /* 2 */
+ &_huff_book_line0_1sub1, /* 3 */
+ &_huff_book_line0_1sub2,
+ &_huff_book_line0_1sub3, /* 5 */
+ &_huff_book_line0_2sub1,
+ &_huff_book_line0_2sub2, /* 7 */
+ &_huff_book_line0_2sub3,
+
+ &_huff_book_line1_class0,
+ &_huff_book_line1_class1, /* 10 */
+ &_huff_book_line1_class2,
+ &_huff_book_line1_class3, /* 12 */
+
+ &_huff_book_line1_0sub0,
+ &_huff_book_line1_0sub1, /* 14 */
+ &_huff_book_line1_1sub0,
+ &_huff_book_line1_1sub1,
+ &_huff_book_line1_2sub1,
+ &_huff_book_line1_2sub2, /* 18 */
+ &_huff_book_line1_2sub3,
+ &_huff_book_line1_3sub1,
+ &_huff_book_line1_3sub2,
+ &_huff_book_line1_3sub3, /* 22 */
+
+ &_huff_book_res0_128_128aux,
&_huff_book_res0_128_1024aux,
- &_vq_book_res0_128_128_1,
- &_vq_book_res0_128_128_2,
- &_vq_book_res0_128_128_3,
- &_vq_book_res0_128_128_4,
- &_vq_book_res0_128_128_5,
-
&_vq_book_res0_128_1024_1,
&_vq_book_res0_128_1024_2,
&_vq_book_res0_128_1024_3,
@@ -297,21 +396,17 @@ codec_setup_info info_A={
&_vq_book_res0_128_1024_5,
&_vq_book_res0_128_1024_6,
&_vq_book_res0_128_1024_7,
+ &_vq_book_res0_128_1024_7a,
&_vq_book_res0_128_1024_8,
+ &_vq_book_res0_128_1024_8a,
&_vq_book_res0_128_1024_9,
+ &_vq_book_res0_128_1024_9a,
+ &_vq_book_res0_128_1024_9b,
},
/* psy */
- {&_psy_set_A0,&_psy_set_A},
-
- /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
-
- -10.,
-
- 0,
+ {&_psy_set_A0,&_psy_set_AT,&_psy_set_A},
+ &_psy_set_AG
};
-#define PREDEF_INFO_MAX 0
-
#endif
diff --git a/lib/modes/mode_B.h b/lib/modes/mode_B.h
index 35fdb770..c488947b 100644
--- a/lib/modes/mode_B.h
+++ b/lib/modes/mode_B.h
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_B.h,v 1.15 2001/06/18 09:07:32 xiphmont Exp $
+ last mod: $Id: mode_B.h,v 1.16 2001/08/13 01:37:13 xiphmont Exp $
********************************************************************/
@@ -22,236 +22,332 @@
#include "vorbis/codec.h"
#include "backends.h"
-#include "books/lsp12_0.vqh"
-#include "books/lsp30_0.vqh"
-#include "books/lsp12_1.vqh"
-#include "books/lsp30_1.vqh"
+#include "books/line0_class1.vqh"
+#include "books/line0_class2.vqh"
+#include "books/line1_class0.vqh"
+#include "books/line1_class1.vqh"
+#include "books/line1_class2.vqh"
+#include "books/line1_class3.vqh"
+
+#include "books/line0_0sub0.vqh"
+#include "books/line0_1sub1.vqh"
+#include "books/line0_1sub2.vqh"
+#include "books/line0_1sub3.vqh"
+#include "books/line0_2sub1.vqh"
+#include "books/line0_2sub2.vqh"
+#include "books/line0_2sub3.vqh"
+
+#include "books/line1_0sub0.vqh"
+#include "books/line1_0sub1.vqh"
+#include "books/line1_1sub0.vqh"
+#include "books/line1_1sub1.vqh"
+#include "books/line1_2sub1.vqh"
+#include "books/line1_2sub2.vqh"
+#include "books/line1_2sub3.vqh"
+#include "books/line1_3sub1.vqh"
+#include "books/line1_3sub2.vqh"
+#include "books/line1_3sub3.vqh"
+
+#include "books/res0_128_128aux.vqh"
+#include "books/res0_128_1024aux.vqh"
+
+#include "books/res0_128_1024_1.vqh"
+#include "books/res0_128_1024_2.vqh"
+#include "books/res0_128_1024_3.vqh"
+#include "books/res0_128_1024_4.vqh"
+#include "books/res0_128_1024_5.vqh"
+#include "books/res0_128_1024_6.vqh"
+#include "books/res0_128_1024_7.vqh"
+#include "books/res0_128_1024_7a.vqh"
+#include "books/res0_128_1024_8.vqh"
+#include "books/res0_128_1024_8a.vqh"
+#include "books/res0_128_1024_9.vqh"
+#include "books/res0_128_1024_9a.vqh"
+#include "books/res0_128_1024_9b.vqh"
+
+
+static vorbis_info_psy_global _psy_set_BG={
+ 0, /* decaydBpms */
+ 8, /* lines per eighth octave */
+
+ /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
+ 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
+ -6.f,
+
+ 0,
+};
-#include "books/res0_160_128aux.vqh"
-#include "books/res0_160_1024aux.vqh"
+static struct vp_couple_pass _psy_passB0[]={
+ {1.f,1.f,
+ {{24, 0,0, 0,0, 0,0},
+ {64, 4.5,0, 0,12, 0,0},
+ {9999, 7.5,0, 4.5,12, 1.5,0}}
+ },
+};
-#include "books/res0_160_128_1.vqh"
-#include "books/res0_160_128_2.vqh"
-#include "books/res0_160_128_3.vqh"
-#include "books/res0_160_128_4.vqh"
-#include "books/res0_160_128_5.vqh"
+static vp_couple_pass _psy_passB[]={
+ {1.f,1.f,
+ {{288, 0,0, 0,0, 0,0},
+ {512, 4.5,0, 0,12, 0,0},
+ {9999, 7.5,0, 4.5,12, 1.5,0}}
+ }
+};
+
+static vp_attenblock _vp_tonemask_consbass_B={
+ {{-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*63*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*88*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*125*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*175*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*250*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*350*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*500*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*700*/
+
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
+
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
+ {-30.f,-30.f,-33.f,-35.f,-35.f,-45.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*11500*/
+ {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*16000*/
+}};
-#include "books/res0_160_1024_1.vqh"
-#include "books/res0_160_1024_2.vqh"
-#include "books/res0_160_1024_3.vqh"
-#include "books/res0_160_1024_4.vqh"
-#include "books/res0_160_1024_5.vqh"
-#include "books/res0_160_1024_6.vqh"
-#include "books/res0_160_1024_7.vqh"
-#include "books/res0_160_1024_8.vqh"
-#include "books/res0_160_1024_9.vqh"
+static vp_attenblock _vp_tonemask_B={
+ {{-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*63*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*88*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*125*/
+
+
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
+
+ {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
+
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-45.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*11500*/
+ {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*16000*/
+}};
+
+
+static vp_attenblock _vp_peakatt_B={
+ {{-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*63*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*88*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*125*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*175*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*250*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*350*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*500*/
+ {-10.f,-10.f,-10.f,-14.f,-20.f,-20.f,-20.f,-24.f,-26.f,-32.f,-40.f},/*700*/
+ {-10.f,-10.f,-10.f,-14.f,-20.f,-20.f,-20.f,-24.f,-26.f,-32.f,-40.f},/*1000*/
+ {-10.f,-10.f,-10.f,-14.f,-20.f,-20.f,-20.f,-24.f,-26.f,-32.f,-40.f},/*1400*/
+ {-10.f,-10.f,-10.f,-14.f,-20.f,-20.f,-20.f,-24.f,-26.f,-32.f,-40.f},/*2000*/
+ {-10.f,-10.f,-10.f,-14.f,-20.f,-20.f,-20.f,-24.f,-26.f,-32.f,-40.f},/*2800*/
+ {-10.f,-10.f,-10.f,-10.f,-18.f,-20.f,-20.f,-22.f,-24.f,-32.f,-40.f},/*4000*/
+ {-10.f,-10.f,-10.f,-10.f,-12.f,-14.f,-16.f,-18.f,-22.f,-32.f,-40.f},/*5600*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-12.f,-13.f,-22.f,-32.f,-40.f},/*8000*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-22.f,-32.f,-40.f},/*11500*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-20.f,-32.f,-40.f},/*16000*/
+}};
static vorbis_info_psy _psy_set_B0={
- ATH_Bark_dB_lspconservative,
- 1,/*decayp*/
+ ATH_Bark_dB_lineaggressive,
-100.,
-140.,
- 8,
-
- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
- /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
- /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
-
- 1,/* tonemaskp */
- /* 0 10 20 30 40 50 60 70 80 90 100 */
- {
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*63*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*88*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*125*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*175*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*250*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*350*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*500*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*700*/
-
- {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
- {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/
- {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2000*/
- {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2800*/
- {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
- {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
- {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
- {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*11500*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*16000*/
- },
+ /* tonemaskp */
+ -3.f, -40.f, &_vp_tonemask_consbass_B,
- 1,/* peakattp */
- {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*63*/
- {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*88*/
- {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*125*/
- {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*175*/
- {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*250*/
- {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*350*/
- {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*500*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*700*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-24.f,-24.f,-24.f,-24.f},/*1000*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*1400*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*2000*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*2400*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*4000*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-12.f,-20.f,-24.f,-24.f,-24.f},/*5600*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f,-24.f},/*8000*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f,-24.f},/*11500*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f},/*16000*/
- },
+ /* peakattp */
+ 1, &_vp_peakatt_B,
- 1,/*noisemaskp */
- -10.f, /* suppress any noise curve over maxspec+n */
- .5f, /* low window */
- .5f, /* high window */
- 5,
- 5,
- 10,
- {.000f, 0.f,/*63*/
- .000f, 0.f,/*88*/
- .000f, 0.f,/*125*/
- .000f, 0.f,/*175*/
- .000f, 0.f,/*250*/
- .000f, 0.f,/*350*/
- .000f, 0.f,/*500*/
- .300f, 0.f,/*700*/
- .500f, 0.f,/*1000*/
- .500f, 0.f,/*1400*/
- .500f, 0.f,/*2000*/
- .500f, 0.f,/*2800*/
- .600f, 0.f,/*4000*/
- .700f, 0.f,/*5600*/
- .800f, 0.f,/*8000*/
- .800f, 0.f,/*11500*/
- .800f, 0.f,/*16000*/
- },
-
- 95.f, /* even decade + 5 is important; saves an rint() later in a
+ /*noisemaskp */
+ 1,-10.f, /* suppress any noise curve over maxspec+n */
+ .6f, .6f, /* low/high window */
+ 5, 5, 10,
+
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-30,-30,-30,-30,-30,-30,-20,-10, 0, 0, 0, 0, 0, 1, 1, 2, 3},
+ {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.6f,.75f,.85f,.85f,.85f},
+
+ 105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- -26.,
+ 1,
+ _psy_passB0
};
static vorbis_info_psy _psy_set_B={
- ATH_Bark_dB_lspconservative,
- 1,/*decayp*/
+ ATH_Bark_dB_lineaggressive,
-100.f,
-140.f,
- 8,
-
- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
- /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
- /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
- 1,/* tonemaskp */
- /* 0 10 20 30 40 50 60 70 80 90 100 */
- {
- {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/
- {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*88*/
- {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*125*/
-
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
-
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
-
- {-35.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
- {-35.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*11500*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*16000*/
+ /* tonemask */
+ -3.f,-40.f,&_vp_tonemask_consbass_B,
+ /* peakattp */
+ 1, &_vp_peakatt_B,
- },
+ /*noisemaskp */
+ 1, -10.f, /* suppress any noise curve over maxspec+n */
+ .4f,.4f, /* low/high window */
+ 10,10,100,
- 1,/* peakattp */
- {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*63*/
- {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*88*/
- {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*125*/
- {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-26.f,-26.f,-26.f},/*175*/
- {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-26.f,-26.f,-26.f},/*250*/
- {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-26.f,-26.f,-26.f},/*350*/
- {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-26.f,-26.f,-26.f},/*500*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-18.f,-24.f,-26.f,-26.f,-26.f},/*700*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-24.f,-26.f,-26.f,-26.f},/*1000*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-26.f,-26.f,-26.f},/*1400*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-26.f,-26.f,-26.f},/*2000*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-26.f,-26.f,-26.f},/*2400*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-26.f,-26.f,-26.f},/*4000*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-12.f,-20.f,-26.f,-26.f,-26.f},/*5600*/
- {-10.f,-10.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-22.f,-24.f,-26.f},/*8000*/
- {-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-14.f,-20.f,-22.f,-24.f,-26.f},/*11500*/
- {-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-26.f},/*16000*/
- },
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ { 0, 0, 0, 0, 0, 0, 0, 0, -6, -6, -6, -6, 0, 0, 0, 0, 0},
+ {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.6f,.7f,.75f,.8f},
- 1,/*noisemaskp */
- -28.f, /* suppress any noise curve over maxspec+n */
- .5f, /* low window */
- .5f, /* high window */
- 25,
- 25,
- 40,
- {.000f, 0.f, /*63*/
- .000f, 0.f, /*88*/
- .000f, 0.f, /*125*/
- .000f, 0.f, /*175*/
- .000f, 0.f, /*250*/
- .000f, 0.f, /*350*/
- .000f, 0.f, /*500*/
- .000f, 0.f, /*700*/
- .200f, 0.f, /*1000*/
- .300f, 0.f, /*1400*/
- .300f, 0.f, /*2000*/
- .300f, 0.f, /*2800*/
- .700f, 0.f, /*4000*/
- .700f, 0.f, /*5600*/
- .750f, 0.f, /*8000*/
- .750f, 0.f, /*11500*/
- .800f, 0.f, /*16000*/
- },
-
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- -30.,
+ 1,_psy_passB
+};
+
+static vorbis_info_psy _psy_set_BT={
+ ATH_Bark_dB_lineaggressive,
+
+ -100.f,
+ -140.f,
+
+ /* tonemask */
+ -3.f,-40.f,&_vp_tonemask_consbass_B,
+ /* peakattp */
+ 1, &_vp_peakatt_B,
+
+ /*noisemaskp */
+ 1, -10.f, /* suppress any noise curve over maxspec+n */
+ .4f,.4f, /* low/high window */
+ 10,10,100,
+
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-30,-30,-30,-30,-30,-30,-30,-20, -6, -6, -6, -6, 0, 0, 0, 0, 0},
+ {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.6f,.7f,.75f,.8f},
+ 105.f, /* even decade + 5 is important; saves an rint() later in a
+ tight loop) */
+ 1,_psy_passB
};
/* with GNUisms, this could be short and readable. Oh well */
static vorbis_info_time0 _time_set0B={0};
-static vorbis_info_floor0 _floor_set0B={12, 44100, 64, 10,130, 2, {0,1},
- 0.199f, .285f};
-static vorbis_info_floor0 _floor_set1B={30, 44100, 256, 12,150, 2, {2,3},
- .082f, .126f};
-static vorbis_info_residue0 _residue_set0B={0,96,16,6,4,
- {0,1,1,1,1,1},
- {6,7,8,9,10},
-
- {0,99999,9999,9999,9999},
- {999.f,1.5f,3.5f,15.5f,26.5f},
- {4,4,4,4,4},
- {99,99,99,99,99}};
-
-static vorbis_info_residue0 _residue_set1B={0, 960, 32,10,5,
- {0,1,1,1,1,1,1,1,1,1},
- {11,12,13,14,15,16,17,18,19},
-
- {0,8,9999,16,9999,
- 24,9999,9999,9999},
- {999.f,1.5f,1.5f,2.5f,2.5f,
- 6.5f,6.5f,12.5f,22.5f},
- {5,5,5,5,5,5,5,5,5},
- {99,99,99,99,99,99,99,99,99}};
-
-static vorbis_info_mapping0 _mapping_set0B={1, {0,0}, {0}, {0}, {0}, {0}};
-static vorbis_info_mapping0 _mapping_set1B={1, {0,0}, {0}, {1}, {1}, {1}};
+
+static vorbis_info_floor1 _floor_set0B={6,
+ {0,1,1,1,2,2},
+
+ {4,3,3},
+ {0,2,2},
+ {-1,0,1},
+ {{2},{-1,3,4,5},{-1,6,7,8}},
+
+ 4,
+
+ {0,128,
+
+ 6,17,30,58,
+
+ 2,1,4, 11,8,14, 23,20,26,
+ 41,35,48, 84,69,103},
+
+ 60,30,500,
+ 999,999,1,18.,
+ 8,70,
+ 112};
+
+static vorbis_info_floor1 _floor_set1B={10,
+ {0,1,2,2,2,2,2, 3,3,3},
+
+ {3,4,3,3},
+ {1,1,2,2},
+ {9,10,11,12},
+ {{13,14},
+ {15,16},
+ {-1,17,18,19},
+ {-1,20,21,22},
+ },
+
+ 2,
+ {0,1024,
+
+ 88,31,243,
+
+ 14,54,143,460,
+
+ 6,3,10, 22,18,26, 41,36,47,
+ 69,61,78, 112,99,126, 185,162,211,
+ 329,282,387, 672,553,825
+ },
+
+ 60,30,300,
+ 20,8,1,18.,
+ 20,600,
+ 896};
+
+static vorbis_info_residue0 _residue_set0B={0,224,16,10,23,
+ {0,1,1,1,1,1,1,3,3,7},
+ {25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,32,
+ 33,34,
+ 35,36,37},
+ {9999,
+ 7,9999,9999,
+ 11,9999,
+ 9999,9999,9999,9999},
+ {.5f,
+ 1.5f,1.5f,1.5f,
+ 2.5f,2.5f,
+ 4.5f,16.5f,84.5f},
+ {0},
+ {99,
+ 8,8,99,
+ 99,99,
+ 99,99,99,99},
+ {3}};
+
+static vorbis_info_residue0 _residue_set1B={0,1792, 32,10,24,
+ {0,1,1,1,1,1,1,3,3,7},
+ {25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,32,
+ 33,34,
+ 35,36,37},
+ {9999,
+ 10,9999,9999,
+ 20,9999,
+ 9999,9999,9999,9999},
+ {.5f,
+ 1.5f,1.5f,1.5f,
+ 2.5f,2.5f,
+ 4.5f,16.5f,84.f},
+ {0},
+ {99,
+ 32,32,99,
+ 99,99,
+ 99,99,99,99},
+ {3}};
+
+static vorbis_info_mapping0 _mapping_set0B={1, {0,0}, {0}, {0}, {0}, {0,0},
+ 1,{0},{1}};
+static vorbis_info_mapping0 _mapping_set1B={1, {0,0}, {0}, {1}, {1}, {1,2},
+ 1,{0},{1}};
static vorbis_info_mode _mode_set0B={0,0,0,0};
static vorbis_info_mode _mode_set1B={1,0,0,1};
@@ -261,7 +357,7 @@ codec_setup_info info_B={
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
- 2, 2, 1, 2, 2, 20, 2,
+ 2, 2, 1, 2, 2, 38, 3,
/* modes */
{&_mode_set0B,&_mode_set1B},
/* maps */
@@ -269,46 +365,60 @@ codec_setup_info info_B={
/* times */
{0,0},{&_time_set0B},
/* floors */
- {0,0},{&_floor_set0B,&_floor_set1B},
+ {1,1},{&_floor_set0B,&_floor_set1B},
/* residue */
- {0,0},{&_residue_set0B,&_residue_set1B},
+ {2,2},{&_residue_set0B,&_residue_set1B},
/* books */
- {&_vq_book_lsp12_0, /* 0 */
- &_vq_book_lsp12_1, /* 1 */
- &_vq_book_lsp30_0, /* 2 */
- &_vq_book_lsp30_1, /* 3 */
-
- &_huff_book_res0_160_128aux,
- &_huff_book_res0_160_1024aux,
-
- &_vq_book_res0_160_128_1,
- &_vq_book_res0_160_128_2,
- &_vq_book_res0_160_128_3,
- &_vq_book_res0_160_128_4,
- &_vq_book_res0_160_128_5,
-
- &_vq_book_res0_160_1024_1,
- &_vq_book_res0_160_1024_2,
- &_vq_book_res0_160_1024_3,
- &_vq_book_res0_160_1024_4,
- &_vq_book_res0_160_1024_5,
- &_vq_book_res0_160_1024_6,
- &_vq_book_res0_160_1024_7,
- &_vq_book_res0_160_1024_8,
- &_vq_book_res0_160_1024_9,
+
+ {
+ &_huff_book_line0_class1,
+ &_huff_book_line0_class2, /* 1 */
+
+ &_huff_book_line0_0sub0, /* 2 */
+ &_huff_book_line0_1sub1, /* 3 */
+ &_huff_book_line0_1sub2,
+ &_huff_book_line0_1sub3, /* 5 */
+ &_huff_book_line0_2sub1,
+ &_huff_book_line0_2sub2, /* 7 */
+ &_huff_book_line0_2sub3,
+
+ &_huff_book_line1_class0,
+ &_huff_book_line1_class1, /* 10 */
+ &_huff_book_line1_class2,
+ &_huff_book_line1_class3, /* 12 */
+
+ &_huff_book_line1_0sub0,
+ &_huff_book_line1_0sub1, /* 14 */
+ &_huff_book_line1_1sub0,
+ &_huff_book_line1_1sub1,
+ &_huff_book_line1_2sub1,
+ &_huff_book_line1_2sub2, /* 18 */
+ &_huff_book_line1_2sub3,
+ &_huff_book_line1_3sub1,
+ &_huff_book_line1_3sub2,
+ &_huff_book_line1_3sub3, /* 22 */
+
+ &_huff_book_res0_128_128aux,
+ &_huff_book_res0_128_1024aux,
+
+ &_vq_book_res0_128_1024_1,
+ &_vq_book_res0_128_1024_2,
+ &_vq_book_res0_128_1024_3,
+ &_vq_book_res0_128_1024_4,
+ &_vq_book_res0_128_1024_5,
+ &_vq_book_res0_128_1024_6,
+ &_vq_book_res0_128_1024_7,
+ &_vq_book_res0_128_1024_7a,
+ &_vq_book_res0_128_1024_8,
+ &_vq_book_res0_128_1024_8a,
+ &_vq_book_res0_128_1024_9,
+ &_vq_book_res0_128_1024_9a,
+ &_vq_book_res0_128_1024_9b,
},
/* psy */
- {&_psy_set_B0,&_psy_set_B},
-
- /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
-
- -10.,
-
- 0,
+ {&_psy_set_B0,&_psy_set_BT,&_psy_set_B},
+ &_psy_set_BG
};
-#define PREDEF_INFO_MAX 0
-
#endif
diff --git a/lib/modes/mode_C.h b/lib/modes/mode_C.h
index 75ea9673..7494782f 100644
--- a/lib/modes/mode_C.h
+++ b/lib/modes/mode_C.h
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_C.h,v 1.14 2001/06/18 09:07:32 xiphmont Exp $
+ last mod: $Id: mode_C.h,v 1.15 2001/08/13 01:37:14 xiphmont Exp $
********************************************************************/
@@ -22,236 +22,341 @@
#include "vorbis/codec.h"
#include "backends.h"
-#include "books/lsp12_0.vqh"
-#include "books/lsp30_0.vqh"
-#include "books/lsp12_1.vqh"
-#include "books/lsp30_1.vqh"
+#include "books/line0_class1.vqh"
+#include "books/line0_class2.vqh"
+#include "books/line1_class0.vqh"
+#include "books/line1_class1.vqh"
+#include "books/line1_class2.vqh"
+#include "books/line1_class3.vqh"
+
+#include "books/line0_0sub0.vqh"
+#include "books/line0_1sub1.vqh"
+#include "books/line0_1sub2.vqh"
+#include "books/line0_1sub3.vqh"
+#include "books/line0_2sub1.vqh"
+#include "books/line0_2sub2.vqh"
+#include "books/line0_2sub3.vqh"
+
+#include "books/line1_0sub0.vqh"
+#include "books/line1_0sub1.vqh"
+#include "books/line1_1sub0.vqh"
+#include "books/line1_1sub1.vqh"
+#include "books/line1_2sub1.vqh"
+#include "books/line1_2sub2.vqh"
+#include "books/line1_2sub3.vqh"
+#include "books/line1_3sub1.vqh"
+#include "books/line1_3sub2.vqh"
+#include "books/line1_3sub3.vqh"
+
+#include "books/res0_128_128aux.vqh"
+#include "books/res0_128_1024aux.vqh"
+
+#include "books/res0_128_1024_1.vqh"
+#include "books/res0_128_1024_2.vqh"
+#include "books/res0_128_1024_3.vqh"
+#include "books/res0_128_1024_4.vqh"
+#include "books/res0_128_1024_5.vqh"
+#include "books/res0_128_1024_6.vqh"
+#include "books/res0_128_1024_7.vqh"
+#include "books/res0_128_1024_8.vqh"
+#include "books/res0_128_1024_8a.vqh"
+#include "books/res0_128_1024_9.vqh"
+#include "books/res0_128_1024_9a.vqh"
+#include "books/res0_128_1024_9b.vqh"
+
+
+static vorbis_info_psy_global _psy_set_CG={
+ 0, /* decaydBpms */
+ 8, /* lines per eighth octave */
+
+ /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
+ 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
+ -6.f,
+
+ 0,
+};
-#include "books/res0_192_128aux.vqh"
-#include "books/res0_192_1024aux.vqh"
+static struct vp_couple_pass _psy_passC0[]={
+ {1.f,1.f,
+ {{24, 0,0, 0,0, 0,0},
+ {9999, 4.5,0, 0,12, 0,0}}
+ },
+};
-#include "books/res0_192_128_1.vqh"
-#include "books/res0_192_128_2.vqh"
-#include "books/res0_192_128_3.vqh"
-#include "books/res0_192_128_4.vqh"
-#include "books/res0_192_128_5.vqh"
+static vp_couple_pass _psy_passC[]={
+ {1.f,1.f,
+ {{512, 0,0, 0,0, 0,0},
+ {9999, 4.5,0, 0,12, 0,0}}
+ }
+};
+
+static vp_attenblock _vp_tonemask_consbass_C={
+ {{-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*63*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*88*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*125*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*175*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*250*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*350*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*500*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*700*/
+
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
+
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
+ {-30.f,-30.f,-33.f,-35.f,-35.f,-45.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*11500*/
+ {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*16000*/
+}};
-#include "books/res0_192_1024_1.vqh"
-#include "books/res0_192_1024_2.vqh"
-#include "books/res0_192_1024_3.vqh"
-#include "books/res0_192_1024_4.vqh"
-#include "books/res0_192_1024_5.vqh"
-#include "books/res0_192_1024_6.vqh"
-#include "books/res0_192_1024_7.vqh"
-#include "books/res0_192_1024_8.vqh"
-#include "books/res0_192_1024_9.vqh"
+static vp_attenblock _vp_tonemask_C={
+ {{-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*63*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*88*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*125*/
+
+
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
+
+ {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
+
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-45.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*11500*/
+ {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*16000*/
+}};
+
+
+static vp_attenblock _vp_peakatt_C={
+ {{-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*63*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*88*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*125*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*175*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*250*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*350*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-40.f},/*500*/
+ {-10.f,-10.f,-10.f,-14.f,-20.f,-20.f,-20.f,-24.f,-26.f,-32.f,-40.f},/*700*/
+ {-10.f,-10.f,-10.f,-14.f,-20.f,-20.f,-20.f,-24.f,-26.f,-32.f,-40.f},/*1000*/
+ {-10.f,-10.f,-10.f,-14.f,-20.f,-20.f,-20.f,-24.f,-26.f,-32.f,-40.f},/*1400*/
+ {-10.f,-10.f,-10.f,-14.f,-20.f,-20.f,-20.f,-24.f,-26.f,-32.f,-40.f},/*2000*/
+ {-10.f,-10.f,-10.f,-14.f,-20.f,-20.f,-20.f,-24.f,-26.f,-32.f,-40.f},/*2800*/
+ {-10.f,-10.f,-10.f,-10.f,-18.f,-20.f,-20.f,-22.f,-24.f,-32.f,-40.f},/*4000*/
+ {-10.f,-10.f,-10.f,-10.f,-12.f,-14.f,-16.f,-18.f,-22.f,-32.f,-40.f},/*5600*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-12.f,-13.f,-22.f,-32.f,-40.f},/*8000*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-22.f,-32.f,-40.f},/*11500*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-20.f,-32.f,-40.f},/*16000*/
+}};
static vorbis_info_psy _psy_set_C0={
- ATH_Bark_dB_lspconservative,
- 1,/*decayp*/
+ ATH_Bark_dB_lineaggressive,
-100.,
-140.,
- 8,
-
- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
- /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
- /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
-
- 1,/* tonemaskp */
- /* 0 10 20 30 40 50 60 70 80 90 100 */
- {
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*63*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*88*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*125*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*175*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*250*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*350*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*500*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*700*/
-
- {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
- {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/
- {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2000*/
- {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2800*/
- {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
- {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
- {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
- {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*11500*/
- {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*16000*/
- },
+ /* tonemask */
+ -3.f, -45.f, &_vp_tonemask_consbass_C,
- 1,/* peakattp */
- {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*63*/
- {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*88*/
- {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*125*/
- {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*175*/
- {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*250*/
- {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*350*/
- {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*500*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*700*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-24.f,-24.f,-24.f,-24.f},/*1000*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*1400*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*2000*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*2400*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*4000*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-12.f,-20.f,-24.f,-24.f,-24.f},/*5600*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f,-24.f},/*8000*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f,-24.f},/*11500*/
- {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f},/*16000*/
- },
+ /* peakattp */
+ 0, &_vp_peakatt_C,
+
+ /*noisemaskp */
+ 1,-30.f, /* suppress any noise curve over maxspec+n */
+ .6f, .6f, /* low/high window */
+ 5, 5, 10,
+
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-30,-30,-30,-30,-30,-30,-20,-10, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+ {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.6f,.7f,.8f,.8f},
- 1,/*noisemaskp */
- -20.f, /* suppress any noise curve over maxspec+n */
- .5f, /* low window */
- .5f, /* high window */
- 5,
- 5,
- 10,
- {.000f, 0.f,/*63*/
- .000f, 0.f,/*88*/
- .000f, 0.f,/*125*/
- .000f, 0.f,/*175*/
- .000f, 0.f,/*250*/
- .000f, 0.f,/*350*/
- .000f, 0.f,/*500*/
- .200f, 0.f,/*700*/
- .300f, 0.f,/*1000*/
- .300f, 0.f,/*1400*/
- .300f, 0.f,/*2000*/
- .300f, 0.f,/*2800*/
- .500f, 0.f,/*4000*/
- .600f, 0.f,/*5600*/
- .700f, 0.f,/*8000*/
- .700f, 0.f,/*11500*/
- .700f, 1.f,/*16000*/
- },
-
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- -26.,
+ 1,
+ _psy_passC0
};
static vorbis_info_psy _psy_set_C={
- ATH_Bark_dB_lspconservative,
- 1,/*decayp*/
+ ATH_Bark_dB_lineaggressive,
-100.f,
-140.f,
- 8,
-
- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
- /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
- /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
- 1,/* tonemaskp */
- /* 0 10 20 30 40 50 60 70 80 90 100 */
- {
- {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/
- {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*88*/
- {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*125*/
-
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
-
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
-
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*11500*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*16000*/
+ /* tonemask */
+ -6.f,-45.f,&_vp_tonemask_consbass_C,
+ /* peakattp */
+ 0, &_vp_peakatt_C,
- },
+ /*noisemaskp */
+ 1, -30.f, /* suppress any noise curve over maxspec+n */
+ .4f,.4f, /* low/high window */
+ 10,10,100,
- 1,
- {{-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*63*/
- {-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*88*/
- {-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*125*/
- {-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*175*/
- {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*250*/
- {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*350*/
- {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-28.f,-24.f,-28.f,-28.f,-28.f},/*500*/
- {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*700*/
- {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*1000*/
- {-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*1400*/
- {-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*2000*/
- {-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*2800*/
- {-20.f,-20.f,-20.f,-20.f,-22.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*4000*/
- {-20.f,-20.f,-20.f,-20.f,-22.f,-20.f,-22.f,-24.f,-28.f,-28.f,-28.f},/*5600*/
- {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-22.f,-24.f,-28.f,-28.f,-28.f},/*8000*/
- {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-22.f,-24.f,-28.f,-28.f,-28.f},/*11500*/
- {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-22.f,-24.f,-28.f,-28.f,-28.f},/*16000*/
- },
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ { 0, 0, 0, 0, 0, 0, 0, 0, -6, -6, -6, -6, 0, 0, 0, 0, 0},
+ {.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.5f,.6f,.7f,.7f},
- 1,/*noisemaskp */
- -28.f, /* suppress any noise curve over maxspec+n */
- .5f, /* low window */
- .5f, /* high window */
- 25,
- 25,
- 40,
- {.000f, 0.f, /*63*/
- .000f, 0.f, /*88*/
- .000f, 0.f, /*125*/
- .000f, 0.f, /*175*/
- .000f, 0.f, /*250*/
- .000f, 0.f, /*350*/
- .000f, 0.f, /*500*/
- .000f, 0.f, /*700*/
- .200f, 0.f, /*1000*/
- .300f, 0.f, /*1400*/
- .300f, 0.f, /*2000*/
- .300f, 0.f, /*2800*/
- .300f, 0.f, /*4000*/
- .400f, 0.f, /*5600*/
- .600f, 0.f, /*8000*/
- .600f, 0.f, /*11500*/
- .650f, 0.f, /*16000*/
- },
-
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- -32.,
+ 1,_psy_passC
+};
+
+static vorbis_info_psy _psy_set_CT={
+ ATH_Bark_dB_lineaggressive,
+
+ -100.f,
+ -140.f,
+
+ /* tonemask */
+ -6.f,-45.f,&_vp_tonemask_consbass_C,
+ /* peakattp */
+ 0, &_vp_peakatt_C,
+
+ /*noisemaskp */
+ 1, -30.f, /* suppress any noise curve over maxspec+n */
+ .4f,.4f, /* low/high window */
+ 10,10,100,
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-30,-30,-30,-30,-30,-30,-30,-20, -6, -6, -6, -6, 0, 0, 0, 0, 0},
+ {.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.5f,.6f,.7f,.7f},
+
+ 105.f, /* even decade + 5 is important; saves an rint() later in a
+ tight loop) */
+ 1,_psy_passC
};
/* with GNUisms, this could be short and readable. Oh well */
static vorbis_info_time0 _time_set0C={0};
-static vorbis_info_floor0 _floor_set0C={12, 44100, 64, 10,130, 2, {0,1},
- 0.199f, .285f};
-static vorbis_info_floor0 _floor_set1C={30, 44100, 256, 12,150, 2, {2,3},
- .082f, .126f};
-static vorbis_info_residue0 _residue_set0C={0,128,16,6,4,
- {0,1,1,1,1,1},
- {6,7,8,9,10},
-
- {0,99999,9999,9999,9999},
- {999.f,1.5f,3.5f,15.5f,26.5f},
- {4,4,4,4,4},
- {99,99,99,99,99}};
-
-static vorbis_info_residue0 _residue_set1C={0, 960, 32,10,5,
- {0,1,1,1,1,1,1,1,1,1},
- {11,12,13,14,15,16,17,18,19},
-
- {0,8,9999,16,9999,
- 24,9999,9999,9999},
- {999.f,1.5f,1.5f,2.5f,2.5f,
- 6.5f,6.5f,14.5f,30.f},
- {5,5,5,5,5,5,5,5,5},
- {99,99,99,99,99,99,99,99,99}};
-
-static vorbis_info_mapping0 _mapping_set0C={1, {0,0}, {0}, {0}, {0}, {0}};
-static vorbis_info_mapping0 _mapping_set1C={1, {0,0}, {0}, {1}, {1}, {1}};
+
+static vorbis_info_floor1 _floor_set0C={6,
+ {0,1,1,1,2,2},
+
+ {4,3,3},
+ {0,2,2},
+ {-1,0,1},
+ {{2},{-1,3,4,5},{-1,6,7,8}},
+
+ 4,
+
+ {0,128,
+
+ 6,17,30,58,
+
+ 2,1,4, 11,8,14, 23,20,26,
+ 41,35,48, 84,69,103},
+
+ 60,30,500,
+ 999,999,1,18.,
+ 8,70,
+ 128};
+
+static vorbis_info_floor1 _floor_set1C={10,
+ {0,1,2,2,2,2,2, 3,3,3},
+
+ {3,4,3,3},
+ {1,1,2,2},
+ {9,10,11,12},
+ {{13,14},
+ {15,16},
+ {-1,17,18,19},
+ {-1,20,21,22},
+ },
+
+ 2,
+ {0,1024,
+
+ 88,31,243,
+
+ 14,54,143,460,
+
+ 6,3,10, 22,18,26, 41,36,47,
+ 69,61,78, 112,99,126, 185,162,211,
+ 329,282,387, 672,553,825
+ },
+
+ 60,30,300,
+ 20,8,1,18.,
+ 20,600,
+ 1024};
+
+static vorbis_info_residue0 _residue_set0C={0,256,16,10,23,
+ {0,1,1,1,1,1,1,1,3,7},
+ {25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,32,
+ 33,34,
+ 35,36},
+ {9999,
+ 9999,
+ 12,9999,
+ 18,9999,
+ 28,9999,
+ 9999,9999},
+ {.5f,
+ 1.5f,
+ 2.5f,2.5f,
+ 4.5f,4.5,
+ 16.5f,16.5,
+ 84.5f},
+ {0},
+ {99,
+ 99,
+ 99,99,
+ 99,99,
+ 99,99,
+ 99,99},
+ {3}};
+
+static vorbis_info_residue0 _residue_set1C={0,2048, 32,10,24,
+ {0,1,1,1,1,1,1,1,3,7},
+ {25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,
+ 32,33,
+ 34,35,36},
+ {9999,
+ 9999,
+ 22,9999,
+ 34,9999,
+ 64,999,
+ 9999,9999},
+ {.5f,
+ 1.5f,
+ 2.5f,2.5f,
+ 4.5f,4.5,
+ 16.5f,16.5,
+ 84.f},
+ {0},
+ {99,
+ 99,
+ 99,99,
+ 99,99,
+ 99,99,
+ 99,99},
+ {3}};
+
+static vorbis_info_mapping0 _mapping_set0C={1, {0,0}, {0}, {0}, {0}, {0,0},
+ 1,{0},{1}};
+static vorbis_info_mapping0 _mapping_set1C={1, {0,0}, {0}, {1}, {1}, {1,2},
+ 1,{0},{1}};
static vorbis_info_mode _mode_set0C={0,0,0,0};
static vorbis_info_mode _mode_set1C={1,0,0,1};
@@ -261,7 +366,7 @@ codec_setup_info info_C={
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
- 2, 2, 1, 2, 2, 20, 2,
+ 2, 2, 1, 2, 2, 37, 3,
/* modes */
{&_mode_set0C,&_mode_set1C},
/* maps */
@@ -269,46 +374,59 @@ codec_setup_info info_C={
/* times */
{0,0},{&_time_set0C},
/* floors */
- {0,0},{&_floor_set0C,&_floor_set1C},
+ {1,1},{&_floor_set0C,&_floor_set1C},
/* residue */
- {0,0},{&_residue_set0C,&_residue_set1C},
+ {2,2},{&_residue_set0C,&_residue_set1C},
/* books */
- {&_vq_book_lsp12_0, /* 0 */
- &_vq_book_lsp12_1, /* 1 */
- &_vq_book_lsp30_0, /* 2 */
- &_vq_book_lsp30_1, /* 3 */
-
- &_huff_book_res0_192_128aux,
- &_huff_book_res0_192_1024aux,
-
- &_vq_book_res0_192_128_1,
- &_vq_book_res0_192_128_2,
- &_vq_book_res0_192_128_3,
- &_vq_book_res0_192_128_4,
- &_vq_book_res0_192_128_5,
-
- &_vq_book_res0_192_1024_1,
- &_vq_book_res0_192_1024_2,
- &_vq_book_res0_192_1024_3,
- &_vq_book_res0_192_1024_4,
- &_vq_book_res0_192_1024_5,
- &_vq_book_res0_192_1024_6,
- &_vq_book_res0_192_1024_7,
- &_vq_book_res0_192_1024_8,
- &_vq_book_res0_192_1024_9,
+
+ {
+ &_huff_book_line0_class1,
+ &_huff_book_line0_class2, /* 1 */
+
+ &_huff_book_line0_0sub0, /* 2 */
+ &_huff_book_line0_1sub1, /* 3 */
+ &_huff_book_line0_1sub2,
+ &_huff_book_line0_1sub3, /* 5 */
+ &_huff_book_line0_2sub1,
+ &_huff_book_line0_2sub2, /* 7 */
+ &_huff_book_line0_2sub3,
+
+ &_huff_book_line1_class0,
+ &_huff_book_line1_class1, /* 10 */
+ &_huff_book_line1_class2,
+ &_huff_book_line1_class3, /* 12 */
+
+ &_huff_book_line1_0sub0,
+ &_huff_book_line1_0sub1, /* 14 */
+ &_huff_book_line1_1sub0,
+ &_huff_book_line1_1sub1,
+ &_huff_book_line1_2sub1,
+ &_huff_book_line1_2sub2, /* 18 */
+ &_huff_book_line1_2sub3,
+ &_huff_book_line1_3sub1,
+ &_huff_book_line1_3sub2,
+ &_huff_book_line1_3sub3, /* 22 */
+
+ &_huff_book_res0_128_128aux,
+ &_huff_book_res0_128_1024aux,
+
+ &_vq_book_res0_128_1024_1,
+ &_vq_book_res0_128_1024_2,
+ &_vq_book_res0_128_1024_3,
+ &_vq_book_res0_128_1024_4,
+ &_vq_book_res0_128_1024_5,
+ &_vq_book_res0_128_1024_6,
+ &_vq_book_res0_128_1024_7,
+ &_vq_book_res0_128_1024_8,
+ &_vq_book_res0_128_1024_8a,
+ &_vq_book_res0_128_1024_9,
+ &_vq_book_res0_128_1024_9a,
+ &_vq_book_res0_128_1024_9b,
},
/* psy */
- {&_psy_set_C0,&_psy_set_C},
-
- /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
-
- -10.,
-
- 0,
+ {&_psy_set_C0,&_psy_set_CT,&_psy_set_C},
+ &_psy_set_CG
};
-#define PREDEF_INFO_MAX 0
-
#endif
diff --git a/lib/modes/mode_D.h b/lib/modes/mode_D.h
index 27145d1f..5ee214e1 100644
--- a/lib/modes/mode_D.h
+++ b/lib/modes/mode_D.h
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_D.h,v 1.15 2001/06/18 09:07:32 xiphmont Exp $
+ last mod: $Id: mode_D.h,v 1.16 2001/08/13 01:37:14 xiphmont Exp $
********************************************************************/
@@ -22,244 +22,348 @@
#include "vorbis/codec.h"
#include "backends.h"
-#include "books/lsp12_0.vqh"
-#include "books/lsp30_0.vqh"
-#include "books/lsp12_1.vqh"
-#include "books/lsp30_1.vqh"
+#include "books/line0_class1.vqh"
+#include "books/line0_class2.vqh"
+#include "books/line1_class0.vqh"
+#include "books/line1_class1.vqh"
+#include "books/line1_class2.vqh"
+#include "books/line1_class3.vqh"
+
+#include "books/line0_0sub0.vqh"
+#include "books/line0_1sub1.vqh"
+#include "books/line0_1sub2.vqh"
+#include "books/line0_1sub3.vqh"
+#include "books/line0_2sub1.vqh"
+#include "books/line0_2sub2.vqh"
+#include "books/line0_2sub3.vqh"
+
+#include "books/line1_0sub0.vqh"
+#include "books/line1_0sub1.vqh"
+#include "books/line1_1sub0.vqh"
+#include "books/line1_1sub1.vqh"
+#include "books/line1_2sub1.vqh"
+#include "books/line1_2sub2.vqh"
+#include "books/line1_2sub3.vqh"
+#include "books/line1_3sub1.vqh"
+#include "books/line1_3sub2.vqh"
+#include "books/line1_3sub3.vqh"
+
+#include "books/res0_128_128aux.vqh"
+#include "books/res0_128_1024aux.vqh"
+
+#include "books/res0_128_1024_1.vqh"
+#include "books/res0_128_1024_2.vqh"
+#include "books/res0_128_1024_3.vqh"
+#include "books/res0_128_1024_4.vqh"
+#include "books/res0_128_1024_5.vqh"
+#include "books/res0_128_1024_6.vqh"
+#include "books/res0_128_1024_7.vqh"
+#include "books/res0_128_1024_8.vqh"
+#include "books/res0_128_1024_8a.vqh"
+#include "books/res0_128_1024_9.vqh"
+#include "books/res0_128_1024_9a.vqh"
+#include "books/res0_128_1024_9b.vqh"
+
+
+static vorbis_info_psy_global _psy_set_DG={
+ 0, /* decaydBpms */
+ 8, /* lines per eighth octave */
+
+ /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
+ 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
+ -6.f,
+
+ 0,
+};
-#include "books/res0_256_128aux.vqh"
-#include "books/res0_256_1024aux.vqh"
+static struct vp_couple_pass _psy_passD[]={
+ {1.f,1.f,
+ {{9999, 0,0, 0,0, 0,0}}
+ },
+};
-#include "books/res0_256_128_1.vqh"
-#include "books/res0_256_128_2.vqh"
-#include "books/res0_256_128_3.vqh"
-#include "books/res0_256_128_4.vqh"
-#include "books/res0_256_128_5.vqh"
+static vp_attenblock _vp_tonemask_consbass_D={
+ {{-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*63*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*88*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*125*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*175*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*250*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*350*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*500*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*700*/
+
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
+
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f}, /*8000*/
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f},
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f},
+}};
-#include "books/res0_256_1024_1.vqh"
-#include "books/res0_256_1024_2.vqh"
-#include "books/res0_256_1024_3.vqh"
-#include "books/res0_256_1024_4.vqh"
-#include "books/res0_256_1024_5.vqh"
-#include "books/res0_256_1024_6.vqh"
-#include "books/res0_256_1024_7.vqh"
+static vp_attenblock _vp_tonemask_D={
+ {{-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*63*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*88*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*125*/
+
+
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
+
+
+ {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f}, /*8000*/
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f},
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f},
+}};
+
+
+static vp_attenblock _vp_peakatt_D={
+ {
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*63*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*88*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*125*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*170*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*250*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*350*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*500*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*700*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*1000*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*1400*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*2000*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*2800*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*4000*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*5600*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*8000*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*11500*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*1600*/
+ }};
static vorbis_info_psy _psy_set_D0={
- ATH_Bark_dB_lspconservative,
- 1,/*decayp*/
+ ATH_Bark_dB_lineconservative,
-100.,
-140.,
- 8,
+ /* tonemaskp */
+ -6.f, -45.f,&_vp_tonemask_consbass_D,
- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
- /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
- /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
+ /* peakattp */
+ 0, &_vp_peakatt_D,
- 1,/* tonemaskp */
- /* 0 10 20 30 40 50 60 70 80 90 100 */
- {
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*63*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*88*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*125*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*175*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*250*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*350*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*500*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*700*/
-
- {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
- {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/
- {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2000*/
- {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2800*/
- {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
- {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
- {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
- {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*11500*/
- {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*16000*/
- },
+ /*noisemaskp */
+ 1,-30.f, /* suppress any noise curve over maxspec+n */
+ .6f, .6f, /* low/high window */
+ 5, 5, 10,
- 1,/* peakattp */
- {{-16.f,-20.f,-20.f,-22.f,-22.f,-22.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*63*/
- {-16.f,-20.f,-20.f,-22.f,-22.f,-22.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*88*/
- {-16.f,-20.f,-20.f,-22.f,-22.f,-22.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*125*/
- {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f,-26.f},/*175*/
- {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f,-26.f},/*250*/
- {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f,-26.f},/*350*/
- {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f,-26.f},/*500*/
- {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f,-26.f},/*700*/
- {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f,-26.f},/*1000*/
- {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-22.f,-26.f,-26.f,-26.f,-26.f},/*2000*/
- {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-22.f,-26.f,-26.f,-26.f,-26.f},/*2000*/
- {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-22.f,-26.f,-26.f,-26.f,-26.f},/*2600*/
- {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-22.f,-26.f,-26.f,-26.f,-26.f},/*4000*/
- {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f},/*5600*/
- {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f},/*8000*/
- {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f,-26.f},/*11500*/
- {-16.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-26.f,-26.f},/*16000*/
- },
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-30,-30,-30,-30,-30,-30,-20,-10, 0, 0, 0, 0, 0, 0, 0, 0, 1},
+ {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.4f,.4f,.5f,.5f,.6f,.7f,.7f},
- 1,/*noisemaskp */
- -20.f, /* suppress any noise curve over maxspec+n */
- .5f, /* low window */
- .5f, /* high window */
- 5,
- 5,
- 10,
- {.000f, 0.f,/*63*/
- .000f, 0.f,/*88*/
- .000f, 0.f,/*125*/
- .000f, 0.f,/*175*/
- .000f, 0.f,/*250*/
- .000f, 0.f,/*350*/
- .000f, 0.f,/*500*/
- .100f, 0.f,/*700*/
- .100f, 0.f,/*1000*/
- .100f, 0.f,/*1400*/
- .100f, 0.f,/*2000*/
- .100f, 0.f,/*2800*/
- .200f, 0.f,/*4000*/
- .300f, 0.f,/*5600*/
- .400f, 0.f,/*8000*/
- .400f, 0.f,/*11500*/
- .400f, 0.f,/*16000*/
- },
-
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- -28.,
+ 1,
+ _psy_passD
};
static vorbis_info_psy _psy_set_D={
- ATH_Bark_dB_lspconservative,
- 1,/*decayp*/
+ ATH_Bark_dB_lineconservative,
-100.f,
-140.f,
- 8,
+ /* tonemask */
+ -6.f,-45.f,&_vp_tonemask_consbass_D,
+ /* peakattp */
+ 0, &_vp_peakatt_D,
- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
- /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
- /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
- 1,/* tonemaskp */
- /* 0 10 20 30 40 50 60 70 80 90 100 */
- {
- {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/
- {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*88*/
- {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*125*/
-
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
-
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
-
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*11500*/
- {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*16000*/
+ /*noisemaskp */
+ 1, -30.f, /* suppress any noise curve over maxspec+n */
+ .4f,.4f, /* low/high window */
+ 10,10,100,
- },
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ { 0, 0, 0, 0, 0, 0, 0, -3,-10,-10,-12,-12, -6, -3, -2, -1, -0},
+ {.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.5f,.6f,.7f,.7f},
- 1,
- {{-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*63*/
- {-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*88*/
- {-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*125*/
- {-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*175*/
- {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*250*/
- {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*350*/
- {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-28.f,-24.f,-28.f,-28.f,-28.f},/*500*/
- {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*700*/
- {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*1000*/
- {-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*1400*/
- {-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*2000*/
- {-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*2800*/
- {-20.f,-20.f,-20.f,-20.f,-22.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*4000*/
- {-20.f,-20.f,-20.f,-20.f,-22.f,-20.f,-22.f,-24.f,-28.f,-28.f,-28.f},/*5600*/
- {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-22.f,-24.f,-28.f,-28.f,-28.f},/*8000*/
- {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-22.f,-24.f,-28.f,-28.f,-28.f},/*11500*/
- {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-22.f,-24.f,-28.f,-28.f,-28.f},/*16000*/
- },
-
- 1,/*noisemaskp */
- -28.f, /* suppress any noise curve over maxspec+n */
- .5f, /* low window */
- .5f, /* high window */
- 25,
- 25,
- 40,
- {.000f, 0.f, /*63*/
- .000f, 0.f, /*88*/
- .000f, 0.f, /*125*/
- .000f, 0.f, /*175*/
- .000f, 0.f, /*250*/
- .000f, 0.f, /*350*/
- .000f, 0.f, /*500*/
- .000f, 0.f, /*700*/
- .000f, 0.f, /*1000*/
- .000f, 0.f, /*1400*/
- .000f, 0.f, /*2000*/
- .000f, 0.f, /*2800*/
- .050f, 0.f, /*4000*/
- .100f, 0.f, /*5600*/
- .100f, 0.f, /*8000*/
- .120f, 0.f, /*11500*/
- .150f, 0.f, /*16000*/
- },
-
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- -32.,
+ 1,_psy_passD
+};
+
+static vorbis_info_psy _psy_set_DT={
+ ATH_Bark_dB_lineconservative,
+
+ -100.f,
+ -140.f,
+
+ /* tonemask */
+ -6.f,-45.f,&_vp_tonemask_consbass_D,
+ /* peakattp */
+ 0, &_vp_peakatt_D,
+
+ /*noisemaskp */
+ 1, -30.f, /* suppress any noise curve over maxspec+n */
+ .4f,.4f, /* low/high window */
+ 10,10,100,
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-30,-30,-30,-30,-30,-30,-30,-20,-10,-12,-16,-16, -10, -6, -6, -6, -6},
+ {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.4f,.4f,.4f,.4f,.4f,.5f,.5f,.6f},
+
+ 105.f, /* even decade + 5 is important; saves an rint() later in a
+ tight loop) */
+ 1,_psy_passD
};
/* with GNUisms, this could be short and readable. Oh well */
static vorbis_info_time0 _time_set0D={0};
-static vorbis_info_floor0 _floor_set0D={12, 44100, 64, 10,130, 2, {0,1},
- 0.199f, .285f};
-static vorbis_info_floor0 _floor_set1D={30, 44100, 256, 12,150, 2, {2,3},
- .082f, .126f};
-static vorbis_info_residue0 _residue_set0D={0,128,16,6,4,
- {0,1,1,1,1,1},
- {6,7,8,9,10},
-
- {0,99999,9999,9999,9999},
- {999.f,1.5f,2.5f,6.5f,40.5f},
- {4,4,4,4,4},
- {99,99,99,99,99}};
-
-static vorbis_info_residue0 _residue_set1D={0,1024, 32,8,5,
- {0,1,1,1,1,1,1,1,1,1},
- {11,12,13,14,15,16,17,18,19},
-
- {0,9999,9999,60,9999,
+/*static vorbis_info_floor0 _floor_set0B={9, 44100, 64, 10,130, 2, {0,1},
+ 0.246f, .387f};*/
+/*static vorbis_info_floor0 _floor_set1B={30, 44100, 256, 12,150, 2, {2,3},
+ .082f, .126f};*/
+
+static vorbis_info_floor1 _floor_set0D={6,
+ {0,1,1,1,2,2},
+
+ {4,3,3},
+ {0,2,2},
+ {-1,0,1},
+ {{2},{-1,3,4,5},{-1,6,7,8}},
+
+ 4,
+
+ {0,128,
+
+ 6,17,30,58,
+
+ 2,1,4, 11,8,14, 23,20,26,
+ 41,35,48, 84,69,103},
+
+ 60,30,500,
+ 999,999,1,18.,
+ 8,70,
+ 128};
+
+static vorbis_info_floor1 _floor_set1D={10,
+ {0,1,2,2,2,2,2, 3,3,3},
+
+ {3,4,3,3},
+ {1,1,2,2},
+ {9,10,11,12},
+ {{13,14},
+ {15,16},
+ {-1,17,18,19},
+ {-1,20,21,22},
+ },
+
+ 2,
+ {0,1024,
+
+ 88,31,243,
+
+ 14,54,143,460,
+
+ 6,3,10, 22,18,26, 41,36,47,
+ 69,61,78, 112,99,126, 185,162,211,
+ 329,282,387, 672,553,825
+ },
+
+ 60,30,300,
+ 20,8,1,18.,
+ 20,600,
+ 1024};
+
+static vorbis_info_residue0 _residue_set0D={0,256,16,10,23,
+ {0,1,1,1,1,1,1,1,3,7},
+ {25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,32,
+ 33,34,
+ 35,36},
+ {9999,
+ 9999,
+ 12,9999,
+ 18,9999,
+ 28,9999,
9999,9999},
- {999.f,2.5f,4.5f,10.5f,10.5f,
- 20.5f,40.f},
- {5,5,5,5,5,5,5},
- {99,99,99,99,99,99,99,99,99}};
-
-static vorbis_info_mapping0 _mapping_set0D={1, {0,0}, {0}, {0}, {0}, {0}};
-static vorbis_info_mapping0 _mapping_set1D={1, {0,0}, {0}, {1}, {1}, {1}};
+ {.5f,
+ 1.5f,
+ 2.5f,2.5f,
+ 4.5f,4.5,
+ 16.5f,16.5,
+ 84.5f},
+ {0},
+ {99,
+ 99,
+ 99,99,
+ 99,99,
+ 99,99,
+ 99,99},
+ {3}};
+
+static vorbis_info_residue0 _residue_set1D={0,2048, 32,10,24,
+ {0,1,1,1,1,1,1,1,3,7},
+ {25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,
+ 32,33,
+ 34,35,36},
+ {9999,
+ 9999,
+ 22,9999,
+ 34,9999,
+ 64,999,
+ 9999,9999},
+ {.5f,
+ 1.5f,
+ 2.5f,2.5f,
+ 4.5f,4.5,
+ 16.5f,16.5,
+ 84.f},
+ {0},
+ {99,
+ 99,
+ 99,99,
+ 99,99,
+ 99,99,
+ 99,99},
+ {3}};
+
+static vorbis_info_mapping0 _mapping_set0D={1, {0,0}, {0}, {0}, {0}, {0,0},
+ 1,{0},{1}};
+static vorbis_info_mapping0 _mapping_set1D={1, {0,0}, {0}, {1}, {1}, {1,2},
+ 1,{0},{1}};
static vorbis_info_mode _mode_set0D={0,0,0,0};
static vorbis_info_mode _mode_set1D={1,0,0,1};
-/* CD quality stereo, no channel coupling */
+/* CD quality stereo, losslesschannel coupling */
codec_setup_info info_D={
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
- 2, 2, 1, 2, 2, 18, 2,
+ 2, 2, 1, 2, 2, 37, 3,
/* modes */
{&_mode_set0D,&_mode_set1D},
/* maps */
@@ -267,44 +371,59 @@ codec_setup_info info_D={
/* times */
{0,0},{&_time_set0D},
/* floors */
- {0,0},{&_floor_set0D,&_floor_set1D},
+ {1,1},{&_floor_set0D,&_floor_set1D},
/* residue */
- {0,0},{&_residue_set0D,&_residue_set1D},
+ {2,2},{&_residue_set0D,&_residue_set1D},
/* books */
- {&_vq_book_lsp12_0, /* 0 */
- &_vq_book_lsp12_1, /* 1 */
- &_vq_book_lsp30_0, /* 2 */
- &_vq_book_lsp30_1, /* 3 */
-
- &_huff_book_res0_256_128aux,
- &_huff_book_res0_256_1024aux,
-
- &_vq_book_res0_256_128_1,
- &_vq_book_res0_256_128_2,
- &_vq_book_res0_256_128_3,
- &_vq_book_res0_256_128_4,
- &_vq_book_res0_256_128_5,
-
- &_vq_book_res0_256_1024_1,
- &_vq_book_res0_256_1024_2,
- &_vq_book_res0_256_1024_3,
- &_vq_book_res0_256_1024_4,
- &_vq_book_res0_256_1024_5,
- &_vq_book_res0_256_1024_6,
- &_vq_book_res0_256_1024_7,
+
+ {
+ &_huff_book_line0_class1,
+ &_huff_book_line0_class2, /* 1 */
+
+ &_huff_book_line0_0sub0, /* 2 */
+ &_huff_book_line0_1sub1, /* 3 */
+ &_huff_book_line0_1sub2,
+ &_huff_book_line0_1sub3, /* 5 */
+ &_huff_book_line0_2sub1,
+ &_huff_book_line0_2sub2, /* 7 */
+ &_huff_book_line0_2sub3,
+
+ &_huff_book_line1_class0,
+ &_huff_book_line1_class1, /* 10 */
+ &_huff_book_line1_class2,
+ &_huff_book_line1_class3, /* 12 */
+
+ &_huff_book_line1_0sub0,
+ &_huff_book_line1_0sub1, /* 14 */
+ &_huff_book_line1_1sub0,
+ &_huff_book_line1_1sub1,
+ &_huff_book_line1_2sub1,
+ &_huff_book_line1_2sub2, /* 18 */
+ &_huff_book_line1_2sub3,
+ &_huff_book_line1_3sub1,
+ &_huff_book_line1_3sub2,
+ &_huff_book_line1_3sub3, /* 22 */
+
+ &_huff_book_res0_128_128aux,
+ &_huff_book_res0_128_1024aux,
+
+ &_vq_book_res0_128_1024_1,
+ &_vq_book_res0_128_1024_2,
+ &_vq_book_res0_128_1024_3,
+ &_vq_book_res0_128_1024_4,
+ &_vq_book_res0_128_1024_5,
+ &_vq_book_res0_128_1024_6,
+ &_vq_book_res0_128_1024_7,
+ &_vq_book_res0_128_1024_8,
+ &_vq_book_res0_128_1024_8a,
+ &_vq_book_res0_128_1024_9,
+ &_vq_book_res0_128_1024_9a,
+ &_vq_book_res0_128_1024_9b,
},
/* psy */
- {&_psy_set_D0,&_psy_set_D},
-
- /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, {26.f,26.f,26.f,30.f}, {-36.f,-36.f,-36.f,-36.f}, -90.f,
-
- -10.,
-
- 0,
+ {&_psy_set_D0,&_psy_set_DT,&_psy_set_D},
+ &_psy_set_DG
};
-#define PREDEF_INFO_MAX 0
-
#endif
diff --git a/lib/modes/mode_E.h b/lib/modes/mode_E.h
index f8700503..da87f394 100644
--- a/lib/modes/mode_E.h
+++ b/lib/modes/mode_E.h
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_E.h,v 1.14 2001/06/18 09:07:32 xiphmont Exp $
+ last mod: $Id: mode_E.h,v 1.15 2001/08/13 01:37:14 xiphmont Exp $
********************************************************************/
@@ -22,210 +22,303 @@
#include "vorbis/codec.h"
#include "backends.h"
-#include "books/lsp12_0.vqh"
-#include "books/lsp30_0.vqh"
-#include "books/lsp12_1.vqh"
-#include "books/lsp30_1.vqh"
-
-#include "books/res0_256_128aux.vqh"
-#include "books/res0_256_1024aux.vqh"
+#include "books/line0_class1.vqh"
+#include "books/line0_class2.vqh"
+#include "books/line1_class0.vqh"
+#include "books/line1_class1.vqh"
+#include "books/line1_class2.vqh"
+#include "books/line1_class3.vqh"
+
+#include "books/line0_0sub0.vqh"
+#include "books/line0_1sub1.vqh"
+#include "books/line0_1sub2.vqh"
+#include "books/line0_1sub3.vqh"
+#include "books/line0_2sub1.vqh"
+#include "books/line0_2sub2.vqh"
+#include "books/line0_2sub3.vqh"
+
+#include "books/line1_0sub0.vqh"
+#include "books/line1_0sub1.vqh"
+#include "books/line1_1sub0.vqh"
+#include "books/line1_1sub1.vqh"
+#include "books/line1_2sub1.vqh"
+#include "books/line1_2sub2.vqh"
+#include "books/line1_2sub3.vqh"
+#include "books/line1_3sub1.vqh"
+#include "books/line1_3sub2.vqh"
+#include "books/line1_3sub3.vqh"
+
+#include "books/res0_128_128aux.vqh"
+#include "books/res0_128_1024aux.vqh"
+
+#include "books/res0_128_1024_1.vqh"
+#include "books/res0_128_1024_2.vqh"
+#include "books/res0_128_1024_3.vqh"
+#include "books/res0_128_1024_4.vqh"
+#include "books/res0_128_1024_5.vqh"
+#include "books/res0_128_1024_6.vqh"
+#include "books/res0_128_1024_7.vqh"
+#include "books/res0_128_1024_8.vqh"
+#include "books/res0_128_1024_8a.vqh"
+#include "books/res0_128_1024_9.vqh"
+#include "books/res0_128_1024_9a.vqh"
+#include "books/res0_128_1024_9b.vqh"
+
+
+static vorbis_info_psy_global _psy_set_EG={
+ 0, /* decaydBpms */
+ 8, /* lines per eighth octave */
+
+ /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
+ 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
+ -6.f,
+
+ 0,
+};
-#include "books/res0_256_128_1.vqh"
-#include "books/res0_256_128_2.vqh"
-#include "books/res0_256_128_3.vqh"
-#include "books/res0_256_128_4.vqh"
-#include "books/res0_256_128_5.vqh"
+static struct vp_couple_pass _psy_passE[]={
+ {1.f,1.f,
+ {{9999, 0,0, 0,0, 0,0}}
+ },
+};
-#include "books/res0_256_1024_1.vqh"
-#include "books/res0_256_1024_2.vqh"
-#include "books/res0_256_1024_3.vqh"
-#include "books/res0_256_1024_4.vqh"
-#include "books/res0_256_1024_5.vqh"
-#include "books/res0_256_1024_6.vqh"
-#include "books/res0_350_1024_7.vqh"
+static vp_attenblock _vp_tonemask_E={
+ {{-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*63*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*88*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*125*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*175*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*250*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*350*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*500*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*700*/
+
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f}, /*1k*/
+ {-40.f,-40.f,-40.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f,-115.f},
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f}, /*2k*/
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f},
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f}, /*4k*/
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f}, /*8000*/
+
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f}, /*8000*/
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f},
+ {-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f,-9e9f},
+}};
+static vp_attenblock _vp_peakatt_E={
+ {
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*63*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*125*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*250*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*500*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*1k*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*2k*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*4k*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*8k*/
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},
+ {-14.f,-20.f,-24.f,-26.f,-32.f,-34.f,-36.f,-38.f,-40.f,-40.f,-40.f},/*16k*/
+ }};
static vorbis_info_psy _psy_set_E0={
- ATH_Bark_dB_lspconservative,
- 1,/*decayp*/
+ ATH_Bark_dB_lineconservative,
- -100.,
+ -110.,
-140.,
- 8,
+ /* tonemaskp */
+ -6.f, -50.f, &_vp_tonemask_E,
- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
- /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
- /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
+ /* peakattp */
+ 0, &_vp_peakatt_E,
- 1,/* tonemaskp */
- /* 0 10 20 30 40 50 60 70 80 90 100 */
- {
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*63*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*88*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*125*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*175*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*250*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*350*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*500*/
- {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*700*/
-
- {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
- {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/
- {-40.,-45.,-45.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*2000*/
- {-40.,-45.,-45.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*2800*/
- {-40.,-45.,-45.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*4000*/
- {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
- {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
- {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*11500*/
- {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*16000*/
- },
+ /*noisemaskp */
+ 1,-30.f, /* suppress any noise curve over maxspec+n */
+ .6f, .6f, /* low/high window */
+ 5, 5, 10,
- 1,/* peakattp */
- {{-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*63*/
- {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*88*/
- {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*125*/
- {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*175*/
- {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*250*/
- {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*350*/
- {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*500*/
- {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*700*/
- {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*1000*/
- {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*1400*/
- {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*2000*/
- {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*2600*/
- {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*4000*/
- {-20.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*5600*/
- {-20.f,-22.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*8000*/
- {-20.f,-22.f,-22.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*11500*/
- {-16.f,-20.f,-22.f,-22.f,-24.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*16000*/
- },
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-30,-30,-30,-30,-30,-30,-20,-10,-10,-10,-10,-10,-6,-6,-6,-6,-6},
+ {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.4f,.4f,.5f,.5f,.5f,.5f,.6f},
- 0,/*noisemaskp */
- -20.f, /* suppress any noise curve over maxspec+n */
- .5f, /* low window */
- .5f, /* high window */
- 5,
- 5,
- 10,
- {0.f},
-
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- -28.,
+ 1,
+ _psy_passE
};
static vorbis_info_psy _psy_set_E={
- ATH_Bark_dB_lspconservative,
- 1,/*decayp*/
+ ATH_Bark_dB_lineconservative,
- -100.f,
+ -110.f,
-140.f,
- 8,
+ /* tonemask */
+ -6.f,-50.f,&_vp_tonemask_E,
+ /* peakattp */
+ 0, &_vp_peakatt_E,
- /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
- /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
- /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
- 1,/* tonemaskp */
- /* 0 10 20 30 40 50 60 70 80 90 100 */
- {
- {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/
- {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*88*/
- {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*125*/
-
- {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*175*/
- {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*250*/
- {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*350*/
- {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*500*/
- {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*700*/
-
- {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*1000*/
- {-40.f,-45.f,-50.f,-50.f,-50.f,-60.f,-70.f,-80.f,-90.f,-99.f,-110.f}, /*1400*/
- {-40.f,-45.f,-50.f,-50.f,-50.f,-60.f,-70.f,-80.f,-90.f,-99.f,-110.f}, /*2000*/
- {-40.f,-45.f,-50.f,-50.f,-50.f,-60.f,-70.f,-80.f,-90.f,-99.f,-110.f}, /*2800*/
- {-40.f,-45.f,-50.f,-50.f,-50.f,-60.f,-70.f,-80.f,-90.f,-99.f,-110.f}, /*4000*/
- {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*5600*/
-
- {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*8000*/
- {-40.f,-45.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*11500*/
- {-40.f,-40.f,-45.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*16000*/
+ /*noisemaskp */
+ 1, -30.f, /* suppress any noise curve over maxspec+n */
+ .4f,.4f, /* low/high window */
+ 10,10,100,
- },
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-30,-30,-30,-30,-30,-30,-30,-20,-10,-12,-16,-16, -10, -6, -6, -6, -6},
+ {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.4f,.4f,.4f,.4f,.4f,.5f,.5f,.6f},
- 1,
- {{-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*63*/
- {-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*88*/
- {-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*125*/
- {-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*175*/
- {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*250*/
- {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*350*/
- {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*500*/
- {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*700*/
- {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*1000*/
- {-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*1400*/
- {-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*2000*/
- {-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*2800*/
- {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*4000*/
- {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f},/*5600*/
- {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f},/*8000*/
- {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f},/*11500*/
- {-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-26.f,-28.f,-28.f,-28.f,-28.f},/*16000*/
- },
-
- 0,/*noisemaskp */
- -28.f, /* suppress any noise curve over maxspec+n */
- .5f, /* low window */
- .5f, /* high window */
- 25,
- 25,
- 40,
- {0.f},
-
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- -32.,
-
+ 1,_psy_passE
};
/* with GNUisms, this could be short and readable. Oh well */
static vorbis_info_time0 _time_set0E={0};
-static vorbis_info_floor0 _floor_set0E={12, 44100, 64, 10,130, 2, {0,1},
- 0.199f, .285f};
-static vorbis_info_floor0 _floor_set1E={30, 44100, 256, 12,150, 2, {2,3},
- .082f, .126f};
-static vorbis_info_residue0 _residue_set0E={0,128,16,6,4,
- {0,1,1,1,1,1},
- {6,7,8,9,10},
-
- {0,99999,9999,9999,9999},
- {999.f,1.5f,2.5f,6.5f,40.5f},
- {4,4,4,4,4},
- {99,99,99,99,99}};
-
-static vorbis_info_residue0 _residue_set1E={0,1024, 32,8,5,
- {0,1,1,1,1,1,1,1,1,1},
- {11,12,13,14,15,16,17,18,19},
-
- {0,9999,9999,60,9999,
+/*static vorbis_info_floor0 _floor_set0B={9, 44100, 64, 10,130, 2, {0,1},
+ 0.246f, .387f};*/
+/*static vorbis_info_floor0 _floor_set1B={30, 44100, 256, 12,150, 2, {2,3},
+ .082f, .126f};*/
+
+static vorbis_info_floor1 _floor_set0E={6,
+ {0,1,1,1,2,2},
+
+ {4,3,3},
+ {0,2,2},
+ {-1,0,1},
+ {{2},{-1,3,4,5},{-1,6,7,8}},
+
+ 4,
+
+ {0,128,
+
+ 6,17,30,58,
+
+ 2,1,4, 11,8,14, 23,20,26,
+ 41,35,48, 84,69,103},
+
+ 60,30,500,
+ 999,999,1,18.,
+ 8,70,
+ 128};
+
+static vorbis_info_floor1 _floor_set1E={10,
+ {0,1,2,2,2,2,2, 3,3,3},
+
+ {3,4,3,3},
+ {1,1,2,2},
+ {9,10,11,12},
+ {{13,14},
+ {15,16},
+ {-1,17,18,19},
+ {-1,20,21,22},
+ },
+
+ 2,
+ {0,1024,
+
+ 88,31,243,
+
+ 14,54,143,460,
+
+ 6,3,10, 22,18,26, 41,36,47,
+ 69,61,78, 112,99,126, 185,162,211,
+ 329,282,387, 672,553,825
+ },
+
+ 60,30,300,
+ 20,8,1,18.,
+ 20,600,
+ 1024};
+
+static vorbis_info_residue0 _residue_set0E={0,256,16,10,23,
+ {0,1,1,1,1,1,1,1,3,7},
+ {25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,32,
+ 33,34,
+ 35,36},
+ {9999,
+ 9999,
+ 9999,
+ 9999,
+ 40,9999,
+ 58,9999,
9999,9999},
- {999.f,2.5f,4.5f,10.5f,10.5f,
- 20.5f,40.f},
- {5,5,5,5,5,5,5},
- {99,99,99,99,99,99,99,99,99}};
-
-static vorbis_info_mapping0 _mapping_set0E={1, {0,0}, {0}, {0}, {0}, {0}};
-static vorbis_info_mapping0 _mapping_set1E={1, {0,0}, {0}, {1}, {1}, {1}};
+ {.5f,
+ 1.5f,
+ 2.5f,
+ 4.5f,
+ 7.5f,7.5f,
+ 16.5f,16.5,
+ 84.5f},
+ {0},
+ {99,
+ 99,
+ 99,
+ 99,
+ 99,99,
+ 99,99,
+ 99,99},
+ {3}};
+
+static vorbis_info_residue0 _residue_set1E={0,2048, 32,10,24,
+ {0,1,1,1,1,1,1,1,3,7},
+ {25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,
+ 32,33,
+ 34,35,36},
+ {9999,
+ 9999,
+ 9999,
+ 9999,
+ 70,9999,
+ 110,9999,
+ 9999,9999},
+ {.5f,
+ 1.5f,
+ 2.5f,
+ 4.5f,
+ 7.5,7.5,
+ 16.5f,16.5,
+ 84.f},
+ {0},
+ {99,
+ 99,
+ 99,
+ 99,
+ 99,99,
+ 99,99,
+ 99,99},
+ {3}};
+
+static vorbis_info_mapping0 _mapping_set0E={1, {0,0}, {0}, {0}, {0}, {0,0},
+ 1,{0},{1}};
+static vorbis_info_mapping0 _mapping_set1E={1, {0,0}, {0}, {1}, {1}, {1,1},
+ 1,{0},{1}};
static vorbis_info_mode _mode_set0E={0,0,0,0};
static vorbis_info_mode _mode_set1E={1,0,0,1};
-/* CD quality stereo, no channel coupling */
+/* CD quality stereo, losslesschannel coupling */
codec_setup_info info_E={
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
- 2, 2, 1, 2, 2, 18, 2,
+ 2, 2, 1, 2, 2, 37, 2,
/* modes */
{&_mode_set0E,&_mode_set1E},
/* maps */
@@ -233,44 +326,59 @@ codec_setup_info info_E={
/* times */
{0,0},{&_time_set0E},
/* floors */
- {0,0},{&_floor_set0E,&_floor_set1E},
+ {1,1},{&_floor_set0E,&_floor_set1E},
/* residue */
- {0,0},{&_residue_set0E,&_residue_set1E},
+ {2,2},{&_residue_set0E,&_residue_set1E},
/* books */
- {&_vq_book_lsp12_0, /* 0 */
- &_vq_book_lsp12_1, /* 1 */
- &_vq_book_lsp30_0, /* 2 */
- &_vq_book_lsp30_1, /* 3 */
-
- &_huff_book_res0_256_128aux,
- &_huff_book_res0_256_1024aux,
-
- &_vq_book_res0_256_128_1,
- &_vq_book_res0_256_128_2,
- &_vq_book_res0_256_128_3,
- &_vq_book_res0_256_128_4,
- &_vq_book_res0_256_128_5,
-
- &_vq_book_res0_256_1024_1,
- &_vq_book_res0_256_1024_2,
- &_vq_book_res0_256_1024_3,
- &_vq_book_res0_256_1024_4,
- &_vq_book_res0_256_1024_5,
- &_vq_book_res0_256_1024_6,
- &_vq_book_res0_350_1024_7,
+
+ {
+ &_huff_book_line0_class1,
+ &_huff_book_line0_class2, /* 1 */
+
+ &_huff_book_line0_0sub0, /* 2 */
+ &_huff_book_line0_1sub1, /* 3 */
+ &_huff_book_line0_1sub2,
+ &_huff_book_line0_1sub3, /* 5 */
+ &_huff_book_line0_2sub1,
+ &_huff_book_line0_2sub2, /* 7 */
+ &_huff_book_line0_2sub3,
+
+ &_huff_book_line1_class0,
+ &_huff_book_line1_class1, /* 10 */
+ &_huff_book_line1_class2,
+ &_huff_book_line1_class3, /* 12 */
+
+ &_huff_book_line1_0sub0,
+ &_huff_book_line1_0sub1, /* 14 */
+ &_huff_book_line1_1sub0,
+ &_huff_book_line1_1sub1,
+ &_huff_book_line1_2sub1,
+ &_huff_book_line1_2sub2, /* 18 */
+ &_huff_book_line1_2sub3,
+ &_huff_book_line1_3sub1,
+ &_huff_book_line1_3sub2,
+ &_huff_book_line1_3sub3, /* 22 */
+
+ &_huff_book_res0_128_128aux,
+ &_huff_book_res0_128_1024aux,
+
+ &_vq_book_res0_128_1024_1,
+ &_vq_book_res0_128_1024_2,
+ &_vq_book_res0_128_1024_3,
+ &_vq_book_res0_128_1024_4,
+ &_vq_book_res0_128_1024_5,
+ &_vq_book_res0_128_1024_6,
+ &_vq_book_res0_128_1024_7,
+ &_vq_book_res0_128_1024_8,
+ &_vq_book_res0_128_1024_8a,
+ &_vq_book_res0_128_1024_9,
+ &_vq_book_res0_128_1024_9a,
+ &_vq_book_res0_128_1024_9b,
},
/* psy */
{&_psy_set_E0,&_psy_set_E},
-
- /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, {26.f,26.f,26.f,30.f}, {-36.f,-36.f,-36.f,-36.f}, -90.f,
-
- -10.,
-
- 0,
+ &_psy_set_EG
};
-#define PREDEF_INFO_MAX 0
-
#endif
diff --git a/lib/modes/mode_Za.h b/lib/modes/mode_Za.h
new file mode 100644
index 00000000..6159b717
--- /dev/null
+++ b/lib/modes/mode_Za.h
@@ -0,0 +1,406 @@
+/********************************************************************
+ * *
+ * 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-2001 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/ *
+
+ ********************************************************************
+
+ function: predefined encoding modes
+ last mod: $Id: mode_Za.h,v 1.2 2001/08/13 01:37:14 xiphmont Exp $
+
+ ********************************************************************/
+
+#ifndef _V_MODES_ZA_H_
+#define _V_MODES_ZA_H_
+
+#include <stdio.h>
+#include "vorbis/codec.h"
+#include "backends.h"
+
+#include "books/line0_class1.vqh"
+#include "books/line0_class2.vqh"
+#include "books/line1_class0.vqh"
+#include "books/line1_class1.vqh"
+#include "books/line1_class2.vqh"
+#include "books/line1_class3.vqh"
+
+#include "books/line0_0sub0.vqh"
+#include "books/line0_1sub1.vqh"
+#include "books/line0_1sub2.vqh"
+#include "books/line0_1sub3.vqh"
+#include "books/line0_2sub1.vqh"
+#include "books/line0_2sub2.vqh"
+#include "books/line0_2sub3.vqh"
+
+#include "books/line1_0sub0.vqh"
+#include "books/line1_0sub1.vqh"
+#include "books/line1_1sub0.vqh"
+#include "books/line1_1sub1.vqh"
+#include "books/line1_2sub1.vqh"
+#include "books/line1_2sub2.vqh"
+#include "books/line1_2sub3.vqh"
+#include "books/line1_3sub1.vqh"
+#include "books/line1_3sub2.vqh"
+#include "books/line1_3sub3.vqh"
+
+#include "books/res0_128_128aux.vqh"
+#include "books/res0_128_1024aux.vqh"
+
+#include "books/res0_128_1024_1.vqh"
+#include "books/res0_128_1024_2.vqh"
+#include "books/res0_128_1024_3.vqh"
+#include "books/res0_128_1024_4.vqh"
+#include "books/res0_128_1024_5.vqh"
+#include "books/res0_128_1024_5a.vqh"
+#include "books/res0_128_1024_5b.vqh"
+
+
+static vorbis_info_psy_global _psy_set_ZaG={
+ 0, /* decaydBpms */
+ 8, /* lines per eighth octave */
+
+ /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
+ 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
+ -6.f,
+
+ 0,
+};
+
+static struct vp_couple_pass _psy_passZa0[]={
+ {1.f,1.f,
+ {{24, 0,0, 0,0, 0,0},
+ {9999, 0,0, 12.5f,12, 4.5f,0}}
+ },
+};
+
+static vp_couple_pass _psy_passZa[]={
+ {1.f,1.f,
+ {{288, 0,0, 0,0, 0,0},
+ {9999, 0,0, 12.5f,12, 4.5f,0}}
+ }
+};
+
+static vp_attenblock _vp_tonemask_consbass_Za={
+
+ {
+ {-30.f,-30.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*63*/
+ {-30.f,-30.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f},
+ {-30.f,-30.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*125*/
+
+ {-30.f,-30.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f},
+ {-30.f,-30.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*250*/
+ {-30.f,-30.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f},
+
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
+
+ {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
+
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-45.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*11500*/
+ {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*16000*/
+}};
+
+static vp_attenblock _vp_tonemask_Za={
+
+ {{-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*63*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*88*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*125*/
+
+
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
+
+ {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
+
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-45.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*11500*/
+ {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*16000*/
+}};
+
+static vp_attenblock _vp_peakatt_Za={
+ {{-14.f,-20.f,-20.f,-20.f,-26.f,-22.f,-22.f,-22.f,-22.f,-22.f,-22.f},/*63*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-22.f,-22.f,-22.f,-22.f,-22.f,-22.f},/*88*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-22.f,-22.f,-22.f,-22.f,-22.f,-22.f},/*125*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-22.f,-22.f,-22.f,-22.f,-22.f,-22.f},/*175*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-22.f,-22.f,-22.f,-22.f,-22.f,-22.f},/*250*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-22.f,-22.f,-22.f,-22.f,-22.f,-22.f},/*350*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-22.f,-22.f,-22.f,-22.f,-22.f,-22.f},/*500*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-26.f,-22.f,-22.f},/*700*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-22.f,-22.f,-22.f},/*1000*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-22.f,-22.f},/*1400*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-22.f,-22.f},/*2000*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-30.f,-30.f},/*2400*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-30.f,-30.f},/*4000*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-12.f,-13.f,-22.f,-30.f,-30.f},/*5600*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-12.f,-13.f,-22.f,-30.f,-30.f},/*8000*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-22.f,-30.f,-30.f},/*11500*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-20.f,-30.f,-30.f},/*16000*/
+}};
+
+static vorbis_info_psy _psy_set_Za0={
+ ATH_Bark_dB_lineaggressive,
+
+ -100.,
+ -140.,
+
+ /* tonemaskp */
+ 0.f, -20.f,&_vp_tonemask_consbass_Za,
+
+ /* peakattp */
+ 1, &_vp_peakatt_Za,
+
+ /*noisemaskp */
+ 1,-20.f, /* suppress any noise curve over absolute dB */
+ .6f, .6f, /* low/high window */
+ 5, 5, -1,
+
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-30,-30,-30,-30,-30,-20,-20,-10,-10,-10,-10,-10, -3, 1, 2, 3, 6},
+ {.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f},
+
+ 95.f, /* even decade + 5 is important; saves an rint() later in a
+ tight loop) */
+ 1,
+ _psy_passZa0
+};
+
+static vorbis_info_psy _psy_set_Za={
+ ATH_Bark_dB_lineaggressive,
+
+ -100.f,
+ -140.f,
+
+ /* tonemask */
+ 0.f,-20.f,&_vp_tonemask_Za,
+ /* peakattp */
+ 1, &_vp_peakatt_Za,
+
+ /*noisemaskp */
+ 1, -20.f, /* suppress any noise curve over maxspec+n */
+ .4f,.4f, /* low/high window */
+ 10,10,-1,
+
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-6,-6,-6,-6,-6,-6, -6, -6,-10,-10,-10,-10,-3, -1, 1, 2, 3},
+ {.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f},
+
+ 95.f, /* even decade + 5 is important; saves an rint() later in a
+ tight loop) */
+ 1,_psy_passZa
+};
+
+static vorbis_info_psy _psy_set_ZaT={
+ ATH_Bark_dB_lineaggressive,
+
+ -100.f,
+ -140.f,
+
+ /* tonemask */
+ 0.f,-20.f,&_vp_tonemask_Za,
+ /* peakattp */
+ 1, &_vp_peakatt_Za,
+
+ /*noisemaskp */
+ 1, -20.f, /* suppress any noise curve over maxspec+n */
+ .4f,.4f, /* low/high window */
+ 10,10,-1,
+
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-30,-30,-30,-30,-30,-20, -6,-6,-10,-10,-10,-10, -3, -1, 1, 2, 3},
+ {.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f,.9f},
+
+ 95.f, /* even decade + 5 is important; saves an rint() later in a
+ tight loop) */
+ 1,_psy_passZa
+};
+
+/* with GNUisms, this could be short and readable. Oh well */
+static vorbis_info_time0 _time_set0Za={0};
+/*static vorbis_info_floor0 _floor_set0A={9, 44100, 64, 10,130, 2, {0,1},
+ 0.246f, .387f};*/
+/*static vorbis_info_floor0 _floor_set1A={30, 44100, 256, 12,150, 2, {2,3},
+ .082f, .126f};*/
+
+static vorbis_info_floor1 _floor_set0Zc={3,
+ {0,1,2},
+
+ {1,3,3},
+ {0,2,2},
+ {-1,0,1},
+ {{2},{-1,3,4,5},{-1,6,7,8}},
+
+ 4,
+
+ {0,128,
+
+ 7,
+
+ 2,1,4,
+ 23,13,45},
+
+ 60,30,500,
+ 999,999,0,18.,
+ 8,70,
+ 90};
+
+
+static vorbis_info_floor1 _floor_set1Za={10,
+ {0,1,2,2,2,2,2, 3,3,3},
+
+ {3,4,3,3},
+ {1,1,2,2},
+ {9,10,11,12},
+ {{13,14},
+ {15,16},
+ {-1,17,18,19},
+ {-1,20,21,22},
+ },
+
+ 4,
+ {0,1024,
+
+ 88,31,243,
+
+ 14,54,143,460,
+
+ 6,3,10, 22,18,26, 41,36,47,
+ 69,61,78, 112,99,126, 185,162,211,
+ 329,282,387, 672,553,825
+ },
+
+ 60,30,500,
+ 20,8,1,18.,
+ 20,600,
+ 704};
+
+static vorbis_info_residue0 _residue_set0Za={0,192,16,5,23,
+ {1,1,1,1,7},
+ {25,
+ 26,
+ 27,
+ 28,
+ 29,30,31},
+ {9999,
+ 9999,
+ 9999,
+ 9999,
+ 9999},
+ {4.5,
+ 12.5,
+ 1.5f,
+ 7.5f},
+ {0},
+ {3,3,99,99,99},
+ {3}};
+
+static vorbis_info_residue0 _residue_set1Za={0,1408, 32,5,24,
+ {1,1,1,1,7},
+ {25,
+ 26,
+ 27,
+ 28,
+ 29,30,31},
+ {9999,
+ 9999,
+ 9999,
+ 9999,
+ 9999},
+ {4.5f,
+ 12.5,
+ 1.5,
+ 7.5},
+ {0},
+ {18,18,99,99,99},
+ {3}};
+
+static vorbis_info_mapping0 _mapping_set0Za={1, {0,0}, {0}, {0}, {0}, {0,0},
+ 1,{0},{1}};
+static vorbis_info_mapping0 _mapping_set1Za={1, {0,0}, {0}, {1}, {1}, {1,2},
+ 1,{0},{1}};
+static vorbis_info_mode _mode_set0Za={0,0,0,0};
+static vorbis_info_mode _mode_set1Za={1,0,0,1};
+
+/* CD quality stereo, no channel coupling */
+codec_setup_info info_Za={
+
+ /* smallblock, largeblock */
+ {256, 2048},
+ /* modes,maps,times,floors,residues,books,psys */
+ 2, 2, 1, 2, 2, 32, 3,
+ /* modes */
+ {&_mode_set0Za,&_mode_set1Za},
+ /* maps */
+ {0,0},{&_mapping_set0Za,&_mapping_set1Za},
+ /* times */
+ {0,0},{&_time_set0Za},
+ /* floors */
+ {1,1},{&_floor_set0Za,&_floor_set1Za},
+ /* residue */
+ {2,2},{&_residue_set0Za,&_residue_set1Za},
+ /* books */
+
+ {
+ &_huff_book_line0_class1,
+ &_huff_book_line0_class2, /* 1 */
+
+ &_huff_book_line0_0sub0, /* 2 */
+ &_huff_book_line0_1sub1, /* 3 */
+ &_huff_book_line0_1sub2,
+ &_huff_book_line0_1sub3, /* 5 */
+ &_huff_book_line0_2sub1,
+ &_huff_book_line0_2sub2, /* 7 */
+ &_huff_book_line0_2sub3,
+
+ &_huff_book_line1_class0,
+ &_huff_book_line1_class1, /* 10 */
+ &_huff_book_line1_class2,
+ &_huff_book_line1_class3, /* 12 */
+
+ &_huff_book_line1_0sub0,
+ &_huff_book_line1_0sub1, /* 14 */
+ &_huff_book_line1_1sub0,
+ &_huff_book_line1_1sub1,
+ &_huff_book_line1_2sub1,
+ &_huff_book_line1_2sub2, /* 18 */
+ &_huff_book_line1_2sub3,
+ &_huff_book_line1_3sub1,
+ &_huff_book_line1_3sub2,
+ &_huff_book_line1_3sub3, /* 22 */
+
+ &_huff_book_res0_128_128aux,
+ &_huff_book_res0_128_1024aux,
+
+ &_vq_book_res0_128_1024_1,
+ &_vq_book_res0_128_1024_2,
+ &_vq_book_res0_128_1024_3,
+ &_vq_book_res0_128_1024_4,
+ &_vq_book_res0_128_1024_5,
+ &_vq_book_res0_128_1024_5a,
+ &_vq_book_res0_128_1024_5b,
+
+ },
+ /* psy */
+ {&_psy_set_Za0,&_psy_set_ZaT,&_psy_set_Za},
+ &_psy_set_ZaG
+};
+
+#endif
diff --git a/lib/modes/mode_Zb.h b/lib/modes/mode_Zb.h
new file mode 100644
index 00000000..6cf812a6
--- /dev/null
+++ b/lib/modes/mode_Zb.h
@@ -0,0 +1,410 @@
+/********************************************************************
+ * *
+ * 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-2001 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/ *
+
+ ********************************************************************
+
+ function: predefined encoding modes
+ last mod: $Id: mode_Zb.h,v 1.2 2001/08/13 01:37:14 xiphmont Exp $
+
+ ********************************************************************/
+
+#ifndef _V_MODES_Zb_H_
+#define _V_MODES_Zb_H_
+
+#include <stdio.h>
+#include "vorbis/codec.h"
+#include "backends.h"
+
+#include "books/line0_class1.vqh"
+#include "books/line0_class2.vqh"
+#include "books/line1_class0.vqh"
+#include "books/line1_class1.vqh"
+#include "books/line1_class2.vqh"
+#include "books/line1_class3.vqh"
+
+#include "books/line0_0sub0.vqh"
+#include "books/line0_1sub1.vqh"
+#include "books/line0_1sub2.vqh"
+#include "books/line0_1sub3.vqh"
+#include "books/line0_2sub1.vqh"
+#include "books/line0_2sub2.vqh"
+#include "books/line0_2sub3.vqh"
+
+#include "books/line1_0sub0.vqh"
+#include "books/line1_0sub1.vqh"
+#include "books/line1_1sub0.vqh"
+#include "books/line1_1sub1.vqh"
+#include "books/line1_2sub1.vqh"
+#include "books/line1_2sub2.vqh"
+#include "books/line1_2sub3.vqh"
+#include "books/line1_3sub1.vqh"
+#include "books/line1_3sub2.vqh"
+#include "books/line1_3sub3.vqh"
+
+#include "books/res0_128_128aux.vqh"
+#include "books/res0_128_1024aux.vqh"
+
+#include "books/res0_128_1024_1.vqh"
+#include "books/res0_128_1024_2.vqh"
+#include "books/res0_128_1024_3.vqh"
+#include "books/res0_128_1024_4.vqh"
+#include "books/res0_128_1024_5.vqh"
+#include "books/res0_128_1024_5a.vqh"
+#include "books/res0_128_1024_5b.vqh"
+
+
+static vorbis_info_psy_global _psy_set_ZbG={
+ 0, /* decaydBpms */
+ 8, /* lines per eighth octave */
+
+ /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
+ 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
+ -6.f,
+
+ 0,
+};
+
+static struct vp_couple_pass _psy_passZb0[]={
+ {1.f,1.f,
+ {{24, 0,0, 0,0, 0,0},
+ {9999, 0,0, 7.5f,12, 7.5f,0}}
+ },
+};
+
+static vp_couple_pass _psy_passZb[]={
+ {1.f,1.f,
+ {{288, 0,0, 0,0, 0,0},
+ {9999, 0,0, 7.5f,12, 7.5f,0}}
+ }
+};
+
+static vp_attenblock _vp_tonemask_consbass_Zb={
+ {{-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*63*/
+ {-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*88*/
+ {-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*125*/
+ {-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*175*/
+ {-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*250*/
+ {-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*350*/
+
+ {-35.f,-35.f,-35.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*500*/
+ {-35.f,-35.f,-35.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*700*/
+
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
+
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
+ {-30.f,-30.f,-33.f,-35.f,-35.f,-45.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*11500*/
+ {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*16000*/
+}};
+
+static vp_attenblock _vp_tonemask_Zb={
+
+ {{-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*63*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*88*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*125*/
+
+
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
+
+ {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
+
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-45.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*11500*/
+ {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*16000*/
+}};
+
+static vp_attenblock _vp_peakatt_Zb={
+ {{-14.f,-16.f,-18.f,-19.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*63*/
+ {-14.f,-16.f,-18.f,-19.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*88*/
+ {-14.f,-16.f,-18.f,-19.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*125*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-20.f,-26.f,-24.f,-24.f,-24.f,-24.f},/*175*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-26.f,-24.f,-24.f,-24.f},/*250*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-24.f,-24.f},/*350*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-24.f,-24.f},/*500*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*700*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*1000*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*1400*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*2000*/
+ {-10.f,-10.f,-10.f,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*2400*/
+ {-10.f,-10.f,-10.f,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*4000*/
+ {-10.f,-10.f,-10.f,-12.f,-12.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*5600*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*8000*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*11500*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-12.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*16000*/
+}};
+
+static vorbis_info_psy _psy_set_Zb0={
+ ATH_Bark_dB_lineaggressive,
+
+ -90.,
+ -140.,
+
+ /* tonemaskp */
+ 6.f, -20.f,&_vp_tonemask_consbass_Zb,
+
+ /* peakattp */
+ 1, &_vp_peakatt_Zb,
+
+ /*noisemaskp */
+ 1,-24.f, /* suppress any noise curve over maxspec+n */
+ .5f, .5f, /* low/high window */
+ 5, 5, -1,
+
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-20,-20,-20,-20,-20,-20,-10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
+ {1.f,1.f,1.f,1.f,1.f,1.f,1.f,.8f,.8f,.8f,.8f,.8f,.85f,.95f,.95f,1.f,1.f},
+
+ 95.f, /* even decade + 5 is important; saves an rint() later in a
+ tight loop) */
+ 1,
+ _psy_passZb0
+};
+
+static vorbis_info_psy _psy_set_Zb={
+ ATH_Bark_dB_lineaggressive,
+
+ -90.f,
+ -140.f,
+
+ /* tonemask */
+ 6.f,-20.f,&_vp_tonemask_Zb,
+ /* peakattp */
+ 1, &_vp_peakatt_Zb,
+
+ /*noisemaskp */
+ 1, -24.f, /* suppress any noise curve over maxspec+n */
+ .5f,.5f, /* low/high window */
+ 10,10,-1,
+
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-10,-10,-10,-10,-10,-10,-10, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3},
+ {.8f,.8f,.8f,.8f,.8f,.8f,.8f,.8f,.8f,.8f,.8f,.8f,.9f,.9f,.9f,.95f,.95f},
+
+ 95.f, /* even decade + 5 is important; saves an rint() later in a
+ tight loop) */
+ 1,_psy_passZb
+};
+
+static vorbis_info_psy _psy_set_ZbT={
+ ATH_Bark_dB_lineaggressive,
+
+ -90.f,
+ -140.f,
+
+ /* tonemask */
+ 6.f,-20.f,&_vp_tonemask_consbass_Zb,
+ /* peakattp */
+ 1, &_vp_peakatt_Zb,
+
+ /*noisemaskp */
+ 1, -24.f, /* suppress any noise curve over maxspec+n */
+ .5f,.5f, /* low/high window */
+ 10,10,-1,
+
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-20,-20,-20,-20,-20,-20,-10, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3},
+ {1.f,1.f,1.f,1.f,1.f,1.f,.9f,.8f,.8f,.8f,.8f,.8f,.9f,.9f,.9f,.95f,.95f},
+
+ 95.f, /* even decade + 5 is important; saves an rint() later in a
+ tight loop) */
+ 1,_psy_passZb
+};
+
+/* with GNUisms, this could be short and readable. Oh well */
+static vorbis_info_time0 _time_set0Zb={0};
+/*static vorbis_info_floor0 _floor_set0Zb={9, 44100, 64, 10,130, 2, {0,1},
+ 0.246f, .387f};*/
+/*static vorbis_info_floor0 _floor_set1Zb={30, 44100, 256, 12,150, 2, {2,3},
+ .082f, .126f};*/
+
+static vorbis_info_floor1 _floor_set0Zb={3,
+ {0,1,2},
+
+ {1,3,3},
+ {0,2,2},
+ {-1,0,1},
+ {{2},{-1,3,4,5},{-1,6,7,8}},
+
+ 4,
+
+ {0,128,
+
+ 7,
+
+ 2,1,4,
+ 23,13,45},
+
+ 60,30,500,
+ 999,999,0,18.,
+ 8,70,
+ 90};
+
+static vorbis_info_floor1 _floor_set1Zb={10,
+ {0,1,2,2,2,2,2, 3,3,3},
+
+ {3,4,3,3},
+ {1,1,2,2},
+ {9,10,11,12},
+ {{13,14},
+ {15,16},
+ {-1,17,18,19},
+ {-1,20,21,22},
+ },
+
+ 4,
+ {0,1024,
+
+ 88,31,243,
+
+ 14,54,143,460,
+
+ 6,3,10, 22,18,26, 41,36,47,
+ 69,61,78, 112,99,126, 185,162,211,
+ 329,282,387, 672,553,825
+ },
+
+ 60,30,400,
+ 20,8,1,18.,
+ 20,600,
+ 720};
+
+static vorbis_info_residue0 _residue_set0Zb={0,180,12,5,23,
+ {1,1,1,1,7},
+ {25,
+ 26,
+ 27,
+ 28,
+ 29,30,31},
+ {9999,
+ 9999,
+ 9999,
+ 9999,
+ 9999},
+ {2.5f,
+ 7.5,
+ 1.5f,
+ 22.5f},
+ {0},
+ {2,
+ 2,
+ 99,
+ 99,
+ 99},
+ {3}};
+
+static vorbis_info_residue0 _residue_set1Zb={0,1440, 32,5,24,
+ {1,1,1,1,7},
+ {25,
+ 26,
+ 27,
+ 28,
+ 29,30,31},
+ {9999,
+ 9999,
+ 9999,
+ 9999,
+ 9999},
+ {2.5f,
+ 7.5f,
+ 1.5f,
+ 22.5f},
+ {0},
+ {18,
+ 18,
+ 99,
+ 99,
+ 99},
+ {3}};
+
+static vorbis_info_mapping0 _mapping_set0Zb={1, {0,0}, {0}, {0}, {0}, {0,0},
+ 1,{0},{1}};
+static vorbis_info_mapping0 _mapping_set1Zb={1, {0,0}, {0}, {1}, {1}, {1,2},
+ 1,{0},{1}};
+static vorbis_info_mode _mode_set0Zb={0,0,0,0};
+static vorbis_info_mode _mode_set1Zb={1,0,0,1};
+
+/* CD quality stereo, no channel coupling */
+codec_setup_info info_Zb={
+
+ /* smallblock, largeblock */
+ {256, 2048},
+ /* modes,maps,times,floors,residues,books,psys */
+ 2, 2, 1, 2, 2, 32, 3,
+ /* modes */
+ {&_mode_set0Zb,&_mode_set1Zb},
+ /* maps */
+ {0,0},{&_mapping_set0Zb,&_mapping_set1Zb},
+ /* times */
+ {0,0},{&_time_set0Zb},
+ /* floors */
+ {1,1},{&_floor_set0Zb,&_floor_set1Zb},
+ /* residue */
+ {2,2},{&_residue_set0Zb,&_residue_set1Zb},
+ /* books */
+
+ {
+ &_huff_book_line0_class1,
+ &_huff_book_line0_class2, /* 1 */
+
+ &_huff_book_line0_0sub0, /* 2 */
+ &_huff_book_line0_1sub1, /* 3 */
+ &_huff_book_line0_1sub2,
+ &_huff_book_line0_1sub3, /* 5 */
+ &_huff_book_line0_2sub1,
+ &_huff_book_line0_2sub2, /* 7 */
+ &_huff_book_line0_2sub3,
+
+ &_huff_book_line1_class0,
+ &_huff_book_line1_class1, /* 10 */
+ &_huff_book_line1_class2,
+ &_huff_book_line1_class3, /* 12 */
+
+ &_huff_book_line1_0sub0,
+ &_huff_book_line1_0sub1, /* 14 */
+ &_huff_book_line1_1sub0,
+ &_huff_book_line1_1sub1,
+ &_huff_book_line1_2sub1,
+ &_huff_book_line1_2sub2, /* 18 */
+ &_huff_book_line1_2sub3,
+ &_huff_book_line1_3sub1,
+ &_huff_book_line1_3sub2,
+ &_huff_book_line1_3sub3, /* 22 */
+
+ &_huff_book_res0_128_128aux,
+ &_huff_book_res0_128_1024aux,
+
+ &_vq_book_res0_128_1024_1,
+ &_vq_book_res0_128_1024_2,
+ &_vq_book_res0_128_1024_3,
+ &_vq_book_res0_128_1024_4,
+ &_vq_book_res0_128_1024_5,
+ &_vq_book_res0_128_1024_5a,
+ &_vq_book_res0_128_1024_5b,
+
+ },
+ /* psy */
+ {&_psy_set_Zb0,&_psy_set_ZbT,&_psy_set_Zb},
+ &_psy_set_ZbG
+};
+
+#endif
diff --git a/lib/modes/mode_Zc.h b/lib/modes/mode_Zc.h
new file mode 100644
index 00000000..fc5d4c12
--- /dev/null
+++ b/lib/modes/mode_Zc.h
@@ -0,0 +1,451 @@
+/********************************************************************
+ * *
+ * 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-2001 *
+ * by the XIPHOPHORUS Company http://www.xiph.org/ *
+
+ ********************************************************************
+
+ function: predefined encoding modes
+ last mod: $Id: mode_Zc.h,v 1.2 2001/08/13 01:37:14 xiphmont Exp $
+
+ ********************************************************************/
+
+#ifndef _V_MODES_Zc_H_
+#define _V_MODES_Zc_H_
+
+#include <stdio.h>
+#include "vorbis/codec.h"
+#include "backends.h"
+
+#include "books/line0_class1.vqh"
+#include "books/line0_class2.vqh"
+#include "books/line1_class0.vqh"
+#include "books/line1_class1.vqh"
+#include "books/line1_class2.vqh"
+#include "books/line1_class3.vqh"
+
+#include "books/line0_0sub0.vqh"
+#include "books/line0_1sub1.vqh"
+#include "books/line0_1sub2.vqh"
+#include "books/line0_1sub3.vqh"
+#include "books/line0_2sub1.vqh"
+#include "books/line0_2sub2.vqh"
+#include "books/line0_2sub3.vqh"
+
+#include "books/line1_0sub0.vqh"
+#include "books/line1_0sub1.vqh"
+#include "books/line1_1sub0.vqh"
+#include "books/line1_1sub1.vqh"
+#include "books/line1_2sub1.vqh"
+#include "books/line1_2sub2.vqh"
+#include "books/line1_2sub3.vqh"
+#include "books/line1_3sub1.vqh"
+#include "books/line1_3sub2.vqh"
+#include "books/line1_3sub3.vqh"
+
+#include "books/res0_128_128aux.vqh"
+#include "books/res0_128_1024aux.vqh"
+
+#include "books/res0_128_1024_1.vqh"
+#include "books/res0_128_1024_2.vqh"
+#include "books/res0_128_1024_3.vqh"
+#include "books/res0_128_1024_4.vqh"
+#include "books/res0_128_1024_5.vqh"
+#include "books/res0_128_1024_6.vqh"
+#include "books/res0_128_1024_7.vqh"
+#include "books/res0_128_1024_8.vqh"
+#include "books/res0_128_1024_9.vqh"
+#include "books/res0_128_1024_9a.vqh"
+#include "books/res0_128_1024_9b.vqh"
+
+
+static vorbis_info_psy_global _psy_set_ZcG={
+ 0, /* decaydBpms */
+ 8, /* lines per eighth octave */
+
+ /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
+ 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
+ -6.f,
+
+ 0,
+};
+
+static struct vp_couple_pass _psy_passZc0[]={
+ {1.f,1.f,
+ {{24, 0,0, 0,0, 0,0},
+ {9999, 0,0, 7.5f,12, 7.5f,0}}
+ },
+};
+
+static vp_couple_pass _psy_passZc[]={
+ {1.f,1.f,
+ {{288, 0,0, 0,0, 0,0},
+ {9999, 0,0, 7.5f,12, 7.5f,0}}
+ }
+};
+
+static vp_attenblock _vp_tonemask_consbass_Zc={
+ {{-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*63*/
+ {-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*88*/
+ {-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*125*/
+ {-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*175*/
+ {-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*250*/
+ {-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f,-110.f}, /*350*/
+
+ {-35.f,-35.f,-35.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*500*/
+ {-35.f,-35.f,-35.f,-45.f,-45.f,-55.f,-65.f,-75.f,-85.f,-95.f,-105.f}, /*700*/
+
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f}, /*2000*/
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f},
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f}, /*2000*/
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f},
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f}, /*2000*/
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f},
+ {-24.f,-24.f,-26.f,-30.f,-30.f,-35.f,-45.f,-55.f,-65.f,-75.f,-90.f}, /*16000*/
+}};
+
+static vp_attenblock _vp_tonemask_Zc={
+
+ {{-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*63*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*88*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*125*/
+
+
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+
+
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f}, /*2000*/
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f},
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f}, /*2000*/
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f},
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f}, /*2000*/
+ {-30.f,-30.f,-30.f,-30.f,-30.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f},
+ {-24.f,-24.f,-26.f,-30.f,-30.f,-35.f,-45.f,-55.f,-65.f,-75.f,-90.f}, /*16000*/
+
+}};
+
+static vp_attenblock _vp_peakatt_Zc={
+ {{-14.f,-16.f,-18.f,-19.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*63*/
+ {-14.f,-16.f,-18.f,-19.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*88*/
+ {-14.f,-16.f,-18.f,-19.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*125*/
+ {-14.f,-16.f,-18.f,-19.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*125*/
+ {-14.f,-16.f,-18.f,-19.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*125*/
+ {-14.f,-16.f,-18.f,-19.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*125*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-24.f,-24.f},/*500*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*700*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*1000*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*1400*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*2000*/
+ {-10.f,-10.f,-10.f,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*2400*/
+ {-10.f,-10.f,-10.f,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*4000*/
+ {-10.f,-10.f,-10.f,-12.f,-12.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*5600*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*8000*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*11500*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-12.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*16000*/
+}};
+
+static vorbis_info_psy _psy_set_Zc0={
+ ATH_Bark_dB_lineaggressive,
+
+ -100.,
+ -110.,
+
+ /* tonemaskp */
+ 3.f, -24.f,&_vp_tonemask_consbass_Zc,
+
+ /* peakattp */
+ 1, &_vp_peakatt_Zc,
+
+ /*noisemaskp */
+ 1,-24.f, /* suppress any noise curve over maxspec+n */
+ 1.f, 1.f, /* low/high window */
+ 2, 2, -1,
+
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-20,-20,-20,-20,-20,-20,-10, -5, 3, 3, 4, 4, 4, 4, 4, 4, 8},
+ {1.f,1.f,1.f,1.f,1.f,1.f,.8f,.7f,.7f,.7f,.7f,.7f,.8f,.88f,.89f,.9f,.9f},
+
+ 95.f, /* even decade + 5 is important; saves an rint() later in a
+ tight loop) */
+ 1,
+ _psy_passZc0
+};
+
+static vorbis_info_psy _psy_set_ZcT={
+ ATH_Bark_dB_lineaggressive,
+
+ -100.f,
+ -110.f,
+
+ /* tonemask */
+ 3.f,-20.f,&_vp_tonemask_consbass_Zc,
+ /* peakattp */
+ 1, &_vp_peakatt_Zc,
+
+ /*noisemaskp */
+ 1, -24.f, /* suppress any noise curve over maxspec+n */
+ .5f,.5f, /* low/high window */
+ 10,10,100,
+
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-20,-20,-20,-20,-20,-20,-20, -6, 3, 3, 4, 5, 5, 5, 5, 6, 10},
+ {1.f,1.f,1.f,1.f,1.f,1.f,.8f,.7f,.7f,.7f,.7f,.7f,.8f,.88f,.89f,.9f,.9f},
+
+ 95.f, /* even decade + 5 is important; saves an rint() later in a
+ tight loop) */
+ 1,_psy_passZc
+};
+
+static vorbis_info_psy _psy_set_Zc={
+ ATH_Bark_dB_lineaggressive,
+
+ -100.f,
+ -110.f,
+
+ /* tonemask */
+ -3.f,-20.f,&_vp_tonemask_Zc,
+ /* peakattp */
+ 1, &_vp_peakatt_Zc,
+
+ /*noisemaskp */
+ 1, -24.f, /* suppress any noise curve over maxspec+n */
+ .5f,.5f, /* low/high window */
+ 10,10,100,
+
+ /*63 125 250 500 1k 2k 4k 8k 16k*/
+ {-20,-20,-20,-20,-20,-20,-10, 0, 3, 3, 4, 5, 5, 5, 5, 6, 10},
+ {1.f,1.f,1.f,1.f,1.f,1.f,.8f,.7f,.7f,.7f,.7f,.8f,.85f,.88f,.89f,.9f,.9f},
+
+ 95.f, /* even decade + 5 is important; saves an rint() later in a
+ tight loop) */
+ 1,_psy_passZc
+};
+
+/* with GNUisms, this could be short and readable. Oh well */
+static vorbis_info_time0 _time_set0Zc={0};
+/*static vorbis_info_floor0 _floor_set0Zc={9, 44100, 64, 10,130, 2, {0,1},
+ 0.246f, .387f};*/
+/*static vorbis_info_floor0 _floor_set1Zc={30, 44100, 256, 12,150, 2, {2,3},
+ .082f, .126f};*/
+
+static vorbis_info_floor1 _floor_set0Zc={3,
+ {0,1,2},
+
+ {1,3,3},
+ {0,2,2},
+ {-1,0,1},
+ {{2},{-1,3,4,5},{-1,6,7,8}},
+
+ 4,
+
+ {0,128,
+
+ 7,
+
+ 2,1,4,
+ 23,13,45},
+
+ 60,30,500,
+ 999,999,0,18.,
+ 8,70,
+ 90};
+
+static vorbis_info_floor1 _floor_set1Zc={10,
+ {0,1,2,2,2,2,2, 3,3,3},
+
+ {3,4,3,3},
+ {1,1,2,2},
+ {9,10,11,12},
+ {{13,14},
+ {15,16},
+ {-1,17,18,19},
+ {-1,20,21,22},
+ },
+
+ 4,
+ {0,1024,
+
+ 88,31,243,
+
+ 14,54,143,460,
+
+ 6,3,10, 22,18,26, 41,36,47,
+ 69,61,78, 112,99,126, 185,162,211,
+ 329,282,387, 672,553,825
+ },
+
+ 60,30,400,
+ 20,8,1,18.,
+ 20,600,
+ 720};
+
+static vorbis_info_residue0 _residue_set0Zc={0,180,12,10,23,
+ {0,1,1,1,1,1,1,1,1,7},
+ {25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,
+ 32,
+ 33,34,35},
+ {9999,
+ 9999,
+ 9999,
+ 9999,
+ 2,9999,
+ 9999,
+ 9999,
+ 9999,
+ 9999},
+ {.5,
+ 1.5,
+ 2.5f,
+ 7.5,
+ 1.5f,
+ 1.5,
+ 2.5,
+ 7.5,
+ 22.5f},
+ {0},
+ {99,
+ 4,
+ 4,
+ 4,
+ 99,99,
+ 99,
+ 99,
+ 99},
+ {3}};
+
+static vorbis_info_residue0 _residue_set1Zc={0,1408, 32,10,24,
+ {0,1,1,1,1,1,1,1,1,7},
+ {25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,
+ 32,
+ 33,34,35},
+ {9999,
+ 9999,
+ 9999,
+ 9999,
+ 3,9999,
+ 9999,
+ 9999,
+ 9999,
+ 9999},
+ {.5,
+ 1.5,
+ 2.5f,
+ 7.5,
+ 1.5f,
+ 1.5,
+ 2.5,
+ 7.5,
+ 22.5f},
+ {0},
+ {99,
+ 18,
+ 18,
+ 18,
+ 99,99,
+ 99,
+ 99,
+ 99},
+ {3}};
+
+static vorbis_info_mapping0 _mapping_set0Zc={1, {0,0}, {0}, {0}, {0}, {0,0},
+ 1,{0},{1}};
+static vorbis_info_mapping0 _mapping_set1Zc={1, {0,0}, {0}, {1}, {1}, {1,2},
+ 1,{0},{1}};
+static vorbis_info_mode _mode_set0Zc={0,0,0,0};
+static vorbis_info_mode _mode_set1Zc={1,0,0,1};
+
+/* CD quality stereo, no channel coupling */
+codec_setup_info info_Zc={
+
+ /* smallblock, largeblock */
+ {256, 2048},
+ /* modes,maps,times,floors,residues,books,psys */
+ 2, 2, 1, 2, 2, 36, 3,
+ /* modes */
+ {&_mode_set0Zc,&_mode_set1Zc},
+ /* maps */
+ {0,0},{&_mapping_set0Zc,&_mapping_set1Zc},
+ /* times */
+ {0,0},{&_time_set0Zc},
+ /* floors */
+ {1,1},{&_floor_set0Zc,&_floor_set1Zc},
+ /* residue */
+ {2,2},{&_residue_set0Zc,&_residue_set1Zc},
+ /* books */
+
+ {
+ &_huff_book_line0_class1,
+ &_huff_book_line0_class2, /* 1 */
+
+ &_huff_book_line0_0sub0, /* 2 */
+ &_huff_book_line0_1sub1, /* 3 */
+ &_huff_book_line0_1sub2,
+ &_huff_book_line0_1sub3, /* 5 */
+ &_huff_book_line0_2sub1,
+ &_huff_book_line0_2sub2, /* 7 */
+ &_huff_book_line0_2sub3,
+
+ &_huff_book_line1_class0,
+ &_huff_book_line1_class1, /* 10 */
+ &_huff_book_line1_class2,
+ &_huff_book_line1_class3, /* 12 */
+
+ &_huff_book_line1_0sub0,
+ &_huff_book_line1_0sub1, /* 14 */
+ &_huff_book_line1_1sub0,
+ &_huff_book_line1_1sub1,
+ &_huff_book_line1_2sub1,
+ &_huff_book_line1_2sub2, /* 18 */
+ &_huff_book_line1_2sub3,
+ &_huff_book_line1_3sub1,
+ &_huff_book_line1_3sub2,
+ &_huff_book_line1_3sub3, /* 22 */
+
+ &_huff_book_res0_128_128aux,
+ &_huff_book_res0_128_1024aux,
+
+ &_vq_book_res0_128_1024_1,
+ &_vq_book_res0_128_1024_2,
+ &_vq_book_res0_128_1024_3,
+ &_vq_book_res0_128_1024_4,
+ &_vq_book_res0_128_1024_5,
+ &_vq_book_res0_128_1024_6,
+ &_vq_book_res0_128_1024_7,
+ &_vq_book_res0_128_1024_8,
+ &_vq_book_res0_128_1024_9,
+ &_vq_book_res0_128_1024_9a,
+ &_vq_book_res0_128_1024_9b,
+
+ },
+ /* psy */
+ {&_psy_set_Zc0,&_psy_set_ZcT,&_psy_set_Zc},
+ &_psy_set_ZcG
+};
+
+#endif
diff --git a/lib/modes/modes.h b/lib/modes/modes.h
index b218e76e..0e133132 100644
--- a/lib/modes/modes.h
+++ b/lib/modes/modes.h
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: modes.h,v 1.8 2001/06/15 21:15:43 xiphmont Exp $
+ last mod: $Id: modes.h,v 1.9 2001/08/13 01:37:14 xiphmont Exp $
********************************************************************/
@@ -19,11 +19,6 @@
#define _V_MODES_H_
#include "masking.h"
-#include "modes/mode_AA.h"
-#include "modes/mode_A.h"
-#include "modes/mode_B.h"
-#include "modes/mode_C.h"
-#include "modes/mode_D.h"
-#include "modes/mode_E.h"
+#include "modes/mode_44c_Z.h"
#endif
diff --git a/lib/os.h b/lib/os.h
index bef8a595..f93e579a 100644
--- a/lib/os.h
+++ b/lib/os.h
@@ -13,7 +13,7 @@
********************************************************************
function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os.h,v 1.26 2001/06/04 05:50:10 xiphmont Exp $
+ last mod: $Id: os.h,v 1.27 2001/08/13 01:36:57 xiphmont Exp $
********************************************************************/
@@ -51,9 +51,6 @@
#ifdef HAVE_EXPF
# define exp expf
#endif
-#ifdef HAVE_POWF
-# define pow powf
-#endif
#ifdef HAVE_ACOSF
# define acos acosf
#endif
diff --git a/lib/psy.c b/lib/psy.c
index 3d5dfae1..eac3bd81 100644
--- a/lib/psy.c
+++ b/lib/psy.c
@@ -7,11 +7,11 @@
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
* by the XIPHOPHORUS Company http://www.xiph.org/ *
-
+ * *
********************************************************************
function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.49 2001/07/01 16:10:07 msmith Exp $
+ last mod: $Id: psy.c,v 1.50 2001/08/13 01:36:57 xiphmont Exp $
********************************************************************/
@@ -34,8 +34,41 @@
/* Why Bark scale for encoding but not masking computation? Because
masking has a strong harmonic dependancy */
-/* the beginnings of real psychoacoustic infrastructure. This is
- still not tightly tuned */
+vorbis_look_psy_global *_vp_global_look(vorbis_info *vi){
+ int i,j;
+ codec_setup_info *ci=vi->codec_setup;
+ vorbis_info_psy_global *gi=ci->psy_g_param;
+ vorbis_look_psy_global *look=_ogg_calloc(1,sizeof(vorbis_look_psy_global));
+
+ int shiftoc=rint(log(gi->eighth_octave_lines*8)/log(2))-1;
+ look->decaylines=toOC(96000.f)*(1<<(shiftoc+1))+.5f; /* max sample
+ rate of
+ 192000kHz
+ for now */
+ look->decay=_ogg_calloc(vi->channels,sizeof(float *));
+ for(i=0;i<vi->channels;i++){
+ look->decay[i]=_ogg_calloc(look->decaylines,sizeof(float));
+ for(j=0;j<look->decaylines;j++)
+ look->decay[i][j]=-9999.;
+ }
+ look->channels=vi->channels;
+
+ look->ampmax=-9999.;
+ look->gi=gi;
+ return(look);
+}
+
+void _vp_global_free(vorbis_look_psy_global *look){
+ int i;
+ if(look->decay){
+ for(i=0;i<look->channels;i++)
+ _ogg_free(look->decay[i]);
+ _ogg_free(look->decay);
+ }
+ memset(look,0,sizeof(vorbis_look_psy_global));
+ _ogg_free(look);
+}
+
void _vi_psy_free(vorbis_info_psy *i){
if(i){
memset(i,0,sizeof(vorbis_info_psy));
@@ -91,6 +124,7 @@ static void interp_curve(float *c,float *c1,float *c2,float del){
c[i]=c2[i]*del+c1[i]*(1.f-del);
}
+extern int analysis_noisy;
static void setup_curve(float **c,
int band,
float *curveatt_dB){
@@ -166,11 +200,11 @@ static void setup_curve(float **c,
/* add fenceposts */
for(j=0;j<P_LEVELS;j++){
- for(i=0;i<EHMER_MAX;i++)
+ for(i=0;i<EHMER_OFFSET;i++)
if(c[j][i+2]>-200.f)break;
c[j][0]=i;
- for(i=EHMER_MAX-1;i>=0;i--)
+ for(i=EHMER_MAX-1;i>EHMER_OFFSET+1;i--)
if(c[j][i+2]>-200.f)
break;
c[j][1]=i;
@@ -178,16 +212,17 @@ static void setup_curve(float **c,
}
}
-void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,int n,long rate){
- long i,j,lo=0,hi=0;
+void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,
+ vorbis_info_psy_global *gi,int n,long rate){
+ long i,j,k,lo=0,hi=0;
long maxoc;
memset(p,0,sizeof(vorbis_look_psy));
- p->eighth_octave_lines=vi->eighth_octave_lines;
- p->shiftoc=rint(log(vi->eighth_octave_lines*8)/log(2))-1;
+ p->eighth_octave_lines=gi->eighth_octave_lines;
+ p->shiftoc=rint(log(gi->eighth_octave_lines*8)/log(2))-1;
- p->firstoc=toOC(.25f*rate/n)*(1<<(p->shiftoc+1))-vi->eighth_octave_lines;
+ p->firstoc=toOC(.25f*rate/n)*(1<<(p->shiftoc+1))-gi->eighth_octave_lines;
maxoc=toOC((n*.5f-.25f)*rate/n)*(1<<(p->shiftoc+1))+.5f;
p->total_octave_lines=maxoc-p->firstoc+1;
@@ -197,9 +232,9 @@ void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,int n,long rate){
p->bark=_ogg_malloc(n*sizeof(unsigned long));
p->vi=vi;
p->n=n;
+ p->rate=rate;
/* set up the lookups for a given blocksize and sample rate */
- /* Vorbis max sample rate is currently limited by 26 Bark (54kHz) */
if(vi->ath)
set_curve(vi->ath, p->ath,n,rate);
for(i=0;i<n;i++){
@@ -219,18 +254,15 @@ void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,int n,long rate){
p->octave[i]=toOC((i*.5f+.25f)*rate/n)*(1<<(p->shiftoc+1))+.5f;
p->tonecurves=_ogg_malloc(P_BANDS*sizeof(float **));
- p->noisemedian=_ogg_malloc(n*sizeof(int));
+ p->noisethresh=_ogg_malloc(n*sizeof(float));
p->noiseoffset=_ogg_malloc(n*sizeof(float));
- p->peakatt=_ogg_malloc(P_BANDS*sizeof(float *));
- for(i=0;i<P_BANDS;i++){
+ for(i=0;i<P_BANDS;i++)
p->tonecurves[i]=_ogg_malloc(P_LEVELS*sizeof(float *));
- p->peakatt[i]=_ogg_malloc(P_LEVELS*sizeof(float));
- }
-
+
for(i=0;i<P_BANDS;i++)
- for(j=0;j<P_LEVELS;j++){
+ for(j=0;j<P_LEVELS;j++)
p->tonecurves[i][j]=_ogg_malloc((EHMER_MAX+2)*sizeof(float));
- }
+
/* OK, yeah, this was a silly way to do it */
memcpy(p->tonecurves[0][4]+2,tone_125_40dB_SL,sizeof(float)*EHMER_MAX);
@@ -278,6 +310,14 @@ void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,int n,long rate){
memcpy(p->tonecurves[16][8]+2,tone_8000_80dB_SL,sizeof(float)*EHMER_MAX);
memcpy(p->tonecurves[16][10]+2,tone_8000_100dB_SL,sizeof(float)*EHMER_MAX);
+ /* value limit the tonal masking curves; the peakatt not only
+ optionally specifies maximum dynamic depth, but also [always]
+ limits the masking curves to a minimum depth */
+ for(i=0;i<P_BANDS;i+=2)
+ for(j=4;j<P_LEVELS;j+=2)
+ for(k=2;k<EHMER_MAX+2;k++)
+ p->tonecurves[i][j][k]+=vi->tone_masteratt;
+
/* interpolate curves between */
for(i=1;i<P_BANDS;i+=2)
for(j=4;j<P_LEVELS;j+=2){
@@ -290,17 +330,37 @@ void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,int n,long rate){
/* set up the final curves */
for(i=0;i<P_BANDS;i++)
- setup_curve(p->tonecurves[i],i,vi->toneatt[i]);
+ setup_curve(p->tonecurves[i],i,vi->toneatt->block[i]);
+
+ if(vi->curvelimitp){
+ /* value limit the tonal masking curves; the peakatt not only
+ optionally specifies maximum dynamic depth, but also [always]
+ limits the masking curves to a minimum depth */
+ for(i=0;i<P_BANDS;i++)
+ for(j=0;j<P_LEVELS;j++){
+ for(k=2;k<EHMER_OFFSET+2+vi->curvelimitp;k++)
+ if(p->tonecurves[i][j][k]> vi->peakatt->block[i][j])
+ p->tonecurves[i][j][k]= vi->peakatt->block[i][j];
+ else
+ break;
+ }
+ }
+
+ if(vi->peakattp) /* we limit depth only optionally */
+ for(i=0;i<P_BANDS;i++)
+ for(j=0;j<P_LEVELS;j++)
+ if(p->tonecurves[i][j][EHMER_OFFSET+2]< vi->peakatt->block[i][j])
+ p->tonecurves[i][j][EHMER_OFFSET+2]= vi->peakatt->block[i][j];
- /* set up attenuation levels */
+ /* but guarding is mandatory */
for(i=0;i<P_BANDS;i++)
- for(j=0;j<P_LEVELS;j++){
- p->peakatt[i][j]=p->vi->peakatt[i][j];
- }
+ for(j=0;j<P_LEVELS;j++)
+ if(p->tonecurves[i][j][EHMER_OFFSET+2]< vi->tone_maxatt)
+ p->tonecurves[i][j][EHMER_OFFSET+2]= vi->tone_maxatt;
/* set up rolling noise median */
for(i=0;i<n;i++){
- float halfoc=toOC((i+.5)*rate/(2.*n))*2.+2.;
+ float halfoc=toOC((i+.5)*rate/(2.*n))*2.;
int inthalfoc;
float del;
@@ -309,15 +369,53 @@ void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,int n,long rate){
inthalfoc=(int)halfoc;
del=halfoc-inthalfoc;
- p->noisemedian[i]=rint(
- (p->vi->noisemedian[inthalfoc*2]*(1.-del) +
- p->vi->noisemedian[inthalfoc*2+2]*del)*1024.f);
+ p->noisethresh[i]=((p->vi->noisethresh[inthalfoc]*(1.-del) +
+ p->vi->noisethresh[inthalfoc+1]*del))*2.f-1.f;
p->noiseoffset[i]=
- p->vi->noisemedian[inthalfoc*2+1]*(1.-del) +
- p->vi->noisemedian[inthalfoc*2+3]*del -
- 140.f;
+ p->vi->noiseoff[inthalfoc]*(1.-del) +
+ p->vi->noiseoff[inthalfoc+1]*del;
}
- /*_analysis_output("mediancurve",0,p->noisemedian,n,0,0);*/
+
+ analysis_noisy=1;
+ _analysis_output("noiseoff",0,p->noiseoffset,n,1,0);
+ _analysis_output("noisethresh",0,p->noisethresh,n,1,0);
+
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_63Hz",i,p->tonecurves[0][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_88Hz",i,p->tonecurves[1][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_125Hz",i,p->tonecurves[2][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_170Hz",i,p->tonecurves[3][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_250Hz",i,p->tonecurves[4][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_350Hz",i,p->tonecurves[5][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_500Hz",i,p->tonecurves[6][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_700Hz",i,p->tonecurves[7][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_1kHz",i,p->tonecurves[8][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_1.4Hz",i,p->tonecurves[9][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_2kHz",i,p->tonecurves[10][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_2.4kHz",i,p->tonecurves[11][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_4kHz",i,p->tonecurves[12][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_5.6kHz",i,p->tonecurves[13][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_8kHz",i,p->tonecurves[14][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_11.5kHz",i,p->tonecurves[15][i]+2,EHMER_MAX,0,0);
+ for(i=0;i<P_LEVELS;i++)
+ _analysis_output("curve_16kHz",i,p->tonecurves[16][i]+2,EHMER_MAX,0,0);
+ analysis_noisy=1;
+
}
void _vp_psy_clear(vorbis_look_psy *p){
@@ -332,12 +430,9 @@ void _vp_psy_clear(vorbis_look_psy *p){
_ogg_free(p->tonecurves[i][j]);
}
_ogg_free(p->tonecurves[i]);
- _ogg_free(p->peakatt[i]);
}
_ogg_free(p->tonecurves);
- _ogg_free(p->noisemedian);
_ogg_free(p->noiseoffset);
- _ogg_free(p->peakatt);
}
memset(p,0,sizeof(vorbis_look_psy));
}
@@ -371,31 +466,11 @@ static void seed_curve(float *seed,
}
}
-static void seed_peak(float *seed,
- const float *att,
- float amp,
- int oc,
- int linesper,
- float dBoffset){
- long seedptr;
-
- int choice=(int)((amp+dBoffset)*.1f);
- choice=max(choice,0);
- choice=min(choice,P_LEVELS-1);
- seedptr=oc-(linesper>>1);
-
- amp+=att[choice];
- if(seed[seedptr]<amp)seed[seedptr]=amp;
-
-}
-
static void seed_loop(vorbis_look_psy *p,
const float ***curves,
- const float **att,
const float *f,
const float *flr,
- float *minseed,
- float *maxseed,
+ float *seed,
float specmax){
vorbis_info_psy *vi=p->vi;
long n=p->n,i;
@@ -404,50 +479,25 @@ static void seed_loop(vorbis_look_psy *p,
/* prime the working vector with peak values */
for(i=0;i<n;i++){
- float max=f[i];
- long oc=p->octave[i];
- while(i+1<n && p->octave[i+1]==oc){
- i++;
- if(f[i]>max)max=f[i];
- }
-
- if(max>flr[i]){
- oc=oc>>p->shiftoc;
- if(oc>=P_BANDS)oc=P_BANDS-1;
- if(oc<0)oc=0;
- if(vi->tonemaskp)
- seed_curve(minseed,
- curves[oc],
- max,
- p->octave[i]-p->firstoc,
- p->total_octave_lines,
- p->eighth_octave_lines,
- dBoffset);
- if(vi->peakattp)
- seed_peak(maxseed,
- att[oc],
- max,
- p->octave[i]-p->firstoc,
- p->eighth_octave_lines,
- dBoffset);
- }
- }
-}
-
-static void bound_loop(vorbis_look_psy *p,
- float *f,
- float *seeds,
- float *flr,
- float att){
- long n=p->n,i;
-
- long off=(p->eighth_octave_lines>>1)+p->firstoc;
- long *ocp=p->octave;
-
- for(i=0;i<n;i++){
- long oc=ocp[i]-off;
- float v=f[i]+att;
- if(seeds[oc]<v)seeds[oc]=v;
+ float max=f[i];
+ long oc=p->octave[i];
+ while(i+1<n && p->octave[i+1]==oc){
+ i++;
+ if(f[i]>max)max=f[i];
+ }
+
+ if(max+6.f>flr[i]){
+ oc=oc>>p->shiftoc;
+ if(oc>=P_BANDS)oc=P_BANDS-1;
+ if(oc<0)oc=0;
+ seed_curve(seed,
+ curves[oc],
+ max,
+ p->octave[i]-p->firstoc,
+ p->total_octave_lines,
+ p->eighth_octave_lines,
+ dBoffset);
+ }
}
}
@@ -508,247 +558,520 @@ static void seed_chase(float *seeds, int linesper, long n){
}
/* bleaugh, this is more complicated than it needs to be */
-static void max_seeds(vorbis_look_psy *p,float *minseed,float *maxseed,
+static void max_seeds(vorbis_look_psy *p,
+ vorbis_look_psy_global *g,
+ int channel,
+ float *seed,
float *flr){
long n=p->total_octave_lines;
int linesper=p->eighth_octave_lines;
long linpos=0;
long pos;
- seed_chase(minseed,linesper,n); /* for masking */
- seed_chase(maxseed,linesper,n); /* for peak att */
+ seed_chase(seed,linesper,n); /* for masking */
pos=p->octave[0]-p->firstoc-(linesper>>1);
while(linpos+1<p->n){
- float min=minseed[pos];
- float max=maxseed[pos];
+ float minV=seed[pos];
long end=((p->octave[linpos]+p->octave[linpos+1])>>1)-p->firstoc;
while(pos+1<=end){
pos++;
- if((minseed[pos]>NEGINF && minseed[pos]<min) || min==NEGINF)
- min=minseed[pos];
- if(maxseed[pos]>max)max=maxseed[pos];
+ if((seed[pos]>NEGINF && seed[pos]<minV) || minV==NEGINF)
+ minV=seed[pos];
}
- if(max<min)max=min;
/* seed scale is log. Floor is linear. Map back to it */
end=pos+p->firstoc;
for(;linpos<p->n && p->octave[linpos]<=end;linpos++)
- if(flr[linpos]<max)flr[linpos]=max;
+ if(flr[linpos]<minV)flr[linpos]=minV;
}
{
- float min=minseed[p->total_octave_lines-1];
- float max=maxseed[p->total_octave_lines-1];
- if(max<min)max=min;
+ float minV=seed[p->total_octave_lines-1];
for(;linpos<p->n;linpos++)
- if(flr[linpos]<max)flr[linpos]=max;
+ if(flr[linpos]<minV)flr[linpos]=minV;
}
}
-/* set to match vorbis_quantdblook.h */
-#define BINCOUNT 280
-#define LASTBIN (BINCOUNT-1)
-
-static int psy_dBquant(const float *x){
- int i= *x*2.f+279.5f;
- if(i>279)return(279);
- if(i<0)return(0);
- return i;
-}
-
-
-static void bark_noise_median(int n,const long *b,const float *f,
- float *noise,
- float lowidth,float hiwidth,
- int lomin,int himin,
- const int *thresh,const float *off,
- int fixed){
- int i=0,lo=-1,hi=-1,fixedc=0;
- int median=LASTBIN>>1;
-
- int barkradix[BINCOUNT];
- int barkcountbelow=0;
+static void bark_noise_pointmp(int n,const long *b,
+ const float *f,
+ float *noise,
+ const int fixed){
+ long i,hi=0,lo=0,hif=0,lof=0;
+ double xa=0,xb=0;
+ double ya=0,yb=0;
+ double x2a=0,x2b=0;
+ double y2a=0,y2b=0;
+ double xya=0,xyb=0;
+ double na=0,nb=0;
+
+ for(i=0;i<n;i++){
+ if(hi<n){
+ /* find new lo/hi */
+ int bi=b[i]>>16;
+ for(;hi<bi;hi++){
+ double bin=(f[hi]<-140.f?0.:f[hi]+140.);
+ double nn= bin*bin;
+ na += nn;
+ xa += hi*nn;
+ ya += bin*nn;
+ x2a += hi*hi*nn;
+ y2a += bin*bin*nn;
+ xya += hi*bin*nn;
+ }
+ bi=b[i]&0xffff;
+ for(;lo<bi;lo++){
+ double bin=(f[lo]<-140.f?0.:f[lo]+140.);
+ double nn= bin*bin;
+ na -= nn;
+ xa -= lo*nn;
+ ya -= bin*nn;
+ x2a -= lo*lo*nn;
+ y2a -= bin*bin*nn;
+ xya -= lo*bin*nn;
+ }
+ }
- int fixedradix[BINCOUNT];
- int fixedcountbelow=0;
+ if(hif<n && fixed>0){
+ int bi=i+fixed/2;
+ if(bi>n)bi=n;
+ for(;hif<bi;hif++){
+ double bin=(f[hif]<-140.f?0.:f[hif]+140.);
+ double nn= bin*bin;
+ nb += nn;
+ xb += hif*nn;
+ yb += bin*nn;
+ x2b += hif*hif*nn;
+ y2b += bin*bin*nn;
+ xyb += hif*bin*nn;
+ }
+ bi=i-(fixed+1)/2;
+ if(bi<0)bi=0;
+ for(;lof<bi;lof++){
+ double bin=(f[lof]<-140.f?0.:f[lof]+140.);
+ double nn= bin*bin;
+ nb -= nn;
+ xb -= lof*nn;
+ yb -= bin*nn;
+ x2b -= lof*lof*nn;
+ y2b -= bin*bin*nn;
+ xyb -= lof*bin*nn;
+ }
+ }
- memset(barkradix,0,sizeof(barkradix));
+ {
+ double denom=1./(na*x2a-xa*xa);
+ double a=(ya*x2a-xya*xa)*denom;
+ double b=(na*xya-xa*ya)*denom;
+ double va=a+b*i;
- if(fixed>0){
- memset(fixedradix,0,sizeof(fixedradix));
+ if(fixed>0){
+ double denomf=1./(nb*x2b-xb*xb);
+ double af=(yb*x2b-xyb*xb)*denomf;
+ double bf=(nb*xyb-xb*yb)*denomf;
+ double vb=af+bf*i;
+ if(va>vb)va=vb;
+ }
- /* bootstrap the fixed window case seperately */
- for(i=0;i<(fixed>>1);i++){
- int bin=psy_dBquant(f+i);
- fixedradix[bin]++;
- fixedc++;
- if(bin<=median)
- fixedcountbelow++;
+ noise[i]=va-140.f;
}
}
+}
+
+static void bark_noise_hybridmp(int n,const long *b,
+ const float *f,
+ float *noise,
+ const int fixed){
+ long i,hi=0,lo=0,hif=0,lof=0;
+ double xa=0,xb=0;
+ double ya=0,yb=0;
+ double x2a=0,x2b=0;
+ double y2a=0,y2b=0;
+ double xya=0,xyb=0;
+ double na=0,nb=0;
+ int first=-1,firstf=-1;
+ int last=0,lastf=0;
+ int rna=0,rnb=0;
for(i=0;i<n;i++){
- /* find new lo/hi */
- int bi=b[i]>>16;
- for(;hi<bi;hi++){
- int bin=psy_dBquant(f+hi);
- barkradix[bin]++;
- if(bin<=median)
- barkcountbelow++;
- }
- bi=b[i]&0xffff;
- for(;lo<bi;lo++){
- int bin=psy_dBquant(f+lo);
- barkradix[bin]--;
- if(bin<=median)
- barkcountbelow--;
+ if(hi<n){
+ /* find new lo/hi */
+ int bi=b[i]>>16;
+ for(;hi<bi;hi++){
+ double bin=f[hi];
+ if(bin>0.f){
+ double nn= bin*bin;
+ nn*=nn;
+ na += nn;
+ xa += hi*nn;
+ ya += bin*nn;
+ x2a += hi*hi*nn;
+ y2a += bin*bin*nn;
+ xya += hi*bin*nn;
+ last=hi;
+ rna++;
+ if(first==-1)first=hi;
+ }
+ }
+ bi=b[i]&0xffff;
+ for(;lo<bi;lo++){
+ double bin=f[lo];
+ if(bin>0.f){
+ double nn= bin*bin;
+ nn*=nn;
+ na -= nn;
+ xa -= lo*nn;
+ ya -= bin*nn;
+ x2a -= lo*lo*nn;
+ y2a -= bin*bin*nn;
+ xya -= lo*bin*nn;
+ rna--;
+ }
+ if(first<lo)first=-1;
+ if(last<lo){
+ first=-1;
+ }else{
+ for(first=lo;first<hi;first++)
+ if(f[first]>0.f)break;
+ if(first==hi)first=-1;
+ }
+ }
}
- if(fixed>0){
- bi=i+(fixed>>1);
- if(bi<n){
- int bin=psy_dBquant(f+bi);
- fixedradix[bin]++;
- fixedc++;
- if(bin<=median)
- fixedcountbelow++;
+ if(hif<n && fixed>0){
+ int bi=i+fixed/2;
+ if(bi>n)bi=n;
+
+ for(;hif<bi;hif++){
+ double bin=f[hif];
+ if(bin>0.f){
+ double nn= bin*bin;
+ nn*=nn;
+ nb += nn;
+ xb += hif*nn;
+ yb += bin*nn;
+ x2b += hif*hif*nn;
+ y2b += bin*bin*nn;
+ xyb += hif*bin*nn;
+ lastf=hif;
+ rnb++;
+ if(firstf==-1)firstf=hif;
+ }
}
-
- bi-=fixed;
- if(bi>=0){
- int bin=psy_dBquant(f+bi);
- fixedradix[bin]--;
- fixedc--;
- if(bin<=median)
- fixedcountbelow--;
+ bi=i-(fixed+1)/2;
+ if(bi<0)bi=0;
+ for(;lof<bi;lof++){
+ double bin=f[lof];
+ if(bin>0.f){
+ double nn= bin*bin;
+ nn*=nn;
+ nb -= nn;
+ xb -= lof*nn;
+ yb -= bin*nn;
+ x2b -= lof*lof*nn;
+ y2b -= bin*bin*nn;
+ xyb -= lof*bin*nn;
+ rnb--;
+ }
+ if(firstf<lof)firstf=-1;
+ if(lastf<lof){
+ firstf=-1;
+ }else{
+ for(firstf=lof;firstf<hif;firstf++)
+ if(f[firstf]>0.f)break;
+ if(firstf==hif)firstf=-1;
+ }
}
}
- /* move the median if needed */
- {
- int bark_th = (thresh[i]*(hi-lo)+512)/1024;
+ {
+ double va;
- if(fixed>0){
- int fixed_th = (thresh[i]*(fixedc)+512)/1024;
-
- while(bark_th>=barkcountbelow &&
- fixed_th>=fixedcountbelow /* && median<LASTBIN by rep invariant */
- ){
- median++;
- barkcountbelow+=barkradix[median];
- fixedcountbelow+=fixedradix[median];
- }
-
- while(bark_th<barkcountbelow ||
- fixed_th<fixedcountbelow /* && median>=0 by rep invariant */
- ){
- barkcountbelow-=barkradix[median];
- fixedcountbelow-=fixedradix[median];
- median--;
- }
+ if(rna>2 && (last-first)*3/2>hi-lo){
+ double denom=1./(na*x2a-xa*xa);
+ double a=(ya*x2a-xya*xa)*denom;
+ double b=(na*xya-xa*ya)*denom;
+ va=a+b*i;
}else{
- while(bark_th>=barkcountbelow){
- median++;
- barkcountbelow+=barkradix[median];
- }
-
- while(bark_th<barkcountbelow){
- barkcountbelow-=barkradix[median];
- median--;
- }
+ va=0.f;
+ if(na>.5)va=ya/na;
}
- }
+ if(va<0.)va=0.;
+
+ if(fixed>0){
+ double vb;
+
+ if(rnb>2 && (lastf-firstf)*3/2>hif-lof){
+ double denomf=1./(nb*x2b-xb*xb);
+ double af=(yb*x2b-xyb*xb)*denomf;
+ double bf=(nb*xyb-xb*yb)*denomf;
+ vb=af+bf*i;
+ }else{
+ vb=0.f;
+ if(nb>.5)vb=yb/nb;
+ }
+
+ if(vb<0.)vb=0.;
+ if(va>vb && vb>0.)va=vb;
- noise[i]= (median+1)*.5f+off[i];
+ }
+
+ noise[i]=va;
+ }
}
+}
+
+void _vp_remove_floor(vorbis_look_psy *p,
+ vorbis_look_psy_global *g,
+ float *logmdct,
+ float *mdct,
+ float *codedflr,
+ float *residue,
+ float local_specmax){
+ int i,n=p->n;
+
+ for(i=0;i<n;i++)
+ if(mdct[i]!=0.f)
+ residue[i]=mdct[i]/codedflr[i];
+ else
+ residue[i]=0.f;
}
+
-float _vp_compute_mask(vorbis_look_psy *p,
- float *fft,
- float *mdct,
- float *mask,
- float specmax){
+void _vp_compute_mask(vorbis_look_psy *p,
+ vorbis_look_psy_global *g,
+ int channel,
+ float *logfft,
+ float *logmdct,
+ float *logmask,
+ float global_specmax,
+ float local_specmax,
+ int lastsize){
int i,n=p->n;
- float localmax=NEGINF;
static int seq=0;
- float *minseed=alloca(sizeof(float)*p->total_octave_lines);
- float *maxseed=alloca(sizeof(float)*p->total_octave_lines);
- for(i=0;i<p->total_octave_lines;i++)minseed[i]=maxseed[i]=NEGINF;
-
- /* Find the highest peak so we know the limits */
- for(i=0;i<n;i++)
- if(fft[i]>localmax)localmax=fft[i];
- if(specmax<localmax)specmax=localmax;
+ float *seed=alloca(sizeof(float)*p->total_octave_lines);
+ for(i=0;i<p->total_octave_lines;i++)seed[i]=NEGINF;
/* noise masking */
if(p->vi->noisemaskp){
- bark_noise_median(n,p->bark,mdct,mask,
- p->vi->noisewindowlo,
- p->vi->noisewindowhi,
- p->vi->noisewindowlomin,
- p->vi->noisewindowhimin,
- p->noisemedian,
- p->noiseoffset,
- p->vi->noisewindowfixed);
- /* suppress any noise curve > specmax+p->vi->noisemaxsupp */
- for(i=0;i<n;i++)
- if(mask[i]>specmax+p->vi->noisemaxsupp)
- mask[i]=specmax+p->vi->noisemaxsupp;
- _analysis_output("noise",seq,mask,n,0,0);
+ float *work=alloca(n*sizeof(float));
+
+ bark_noise_pointmp(n,p->bark,logmdct,logmask,
+ -1);
+
+ for(i=0;i<n;i++)work[i]=logmdct[i]-logmask[i];
+
+ _analysis_output("medianmdct",seq,work,n,1,0);
+ bark_noise_hybridmp(n,p->bark,work,logmask,
+ p->vi->noisewindowfixed);
+
+ for(i=0;i<n;i++)work[i]=logmdct[i]-work[i];
+
+ /* work[i] holds the median line (.5), logmask holds the upper
+ envelope line (1.) */
+
+ _analysis_output("median",seq,work,n,1,0);
+ _analysis_output("envelope",seq,logmask,n,1,0);
+
+ for(i=0;i<n;i++)logmask[i]=
+ work[i]+
+ p->noisethresh[i]*logmask[i]+p->noiseoffset[i];
+
+ _analysis_output("noise",seq,logmask,n,1,0);
+
}else{
- for(i=0;i<n;i++)mask[i]=NEGINF;
+ for(i=0;i<n;i++)logmask[i]=NEGINF;
}
/* set the ATH (floating below localmax, not global max by a
specified att) */
if(p->vi->ath){
- float att=localmax+p->vi->ath_adjatt;
+ float att=local_specmax+p->vi->ath_adjatt;
if(att<p->vi->ath_maxatt)att=p->vi->ath_maxatt;
for(i=0;i<n;i++){
float av=p->ath[i]+att;
- if(av>mask[i])mask[i]=av;
+ if(av>logmask[i])logmask[i]=av;
}
}
-
/* tone/peak masking */
+ seed_loop(p,(const float ***)p->tonecurves,logfft,logmask,seed,global_specmax);
+ max_seeds(p,g,channel,seed,logmask);
- /* XXX apply decay to the fft here */
-
- seed_loop(p,
- (const float ***)p->tonecurves,
- (const float **)p->peakatt,fft,mask,minseed,maxseed,specmax);
- bound_loop(p,mdct,maxseed,mask,p->vi->bound_att_dB);
- max_seeds(p,minseed,maxseed,mask);
+ /* suppress any curve > p->vi->noisemaxsupp */
+ if(p->vi->noisemaxsupp<0.f)
+ for(i=0;i<n;i++)
+ if(logmask[i]>p->vi->noisemaxsupp)
+ logmask[i]=p->vi->noisemaxsupp;
+
/* doing this here is clean, but we need to find a faster way to do
it than to just tack it on */
- for(i=0;i<n;i++)if(mdct[i]>=mask[i])break;
+ for(i=0;i<n;i++)if(logmdct[i]>=logmask[i])break;
if(i==n)
- for(i=0;i<n;i++)mask[i]=NEGINF;
+ for(i=0;i<n;i++)logmask[i]=NEGINF;
else
- for(i=0;i<n;i++)fft[i]=max(mdct[i],fft[i]);
+ for(i=0;i<n;i++)
+ logfft[i]=max(logmdct[i],logfft[i]);
+
seq++;
- return(specmax);
}
float _vp_ampmax_decay(float amp,vorbis_dsp_state *vd){
vorbis_info *vi=vd->vi;
codec_setup_info *ci=vi->codec_setup;
+ vorbis_info_psy_global *gi=ci->psy_g_param;
+
int n=ci->blocksizes[vd->W]/2;
float secs=(float)n/vi->rate;
- amp+=secs*ci->ampmax_att_per_sec;
+ amp+=secs*gi->ampmax_att_per_sec;
if(amp<-9999)amp=-9999;
return(amp);
}
+static void couple_lossless(float A, float B, float *mag, float *ang){
+ if(fabs(A)>fabs(B)){
+ *mag=A; *ang=(A>0.f?A-B:B-A);
+ }else{
+ *mag=B; *ang=(B>0.f?A-B:B-A);
+ }
+}
+static void couple_8phase(float A, float B, float *mag, float *ang){
+ if(fabs(A)>fabs(B)){
+ *mag=A; *ang=(A>0?A-B:B-A);
+ }else{
+ *mag=B; *ang=(B>0?A-B:B-A);
+ }
+ if(*mag!=0.f)
+ switch((int)(rint(*ang / *mag))){
+ case 0:
+ *ang=0;
+ break;
+ case 2:case -2:
+ *ang=-2*fabs(*mag);
+ break;
+ case 1:
+ *ang= *mag;
+ break;
+ case -1:
+ *ang= -*mag;
+ break;
+ }
+}
+
+static void couple_6phase(float A, float B, float *mag, float *ang){
+ if(fabs(A)>fabs(B)){
+ *mag=A; *ang=(A>0?A-B:B-A);
+ }else{
+ *mag=B; *ang=(B>0?A-B:B-A);
+ }
+
+ if(*mag!=0.f)
+ switch((int)(rint(*ang / *mag))){
+ case -2:case 2:
+ *mag=0;
+ /*fall*/
+ case 0:
+ *ang=0;
+ break;
+ case 1:
+ *ang= *mag;
+ break;
+ case -1:
+ *ang= -*mag;
+ break;
+ }
+}
+
+static void couple_point(float A, float B, float *mag, float *ang){
+ if(fabs(A)>fabs(B)){
+ *mag=A; *ang=(A>0?A-B:B-A);
+ }else{
+ *mag=B; *ang=(B>0?A-B:B-A);
+ }
+
+ if(*mag!=0.f)
+ switch((int)(rint(*ang / *mag))){
+ case -2:case 2:
+ *mag=0;
+ /* fall */
+ case 0:case 1: case -1:
+ *ang=0;
+ break;
+ }
+}
+
+void _vp_quantize_couple(vorbis_look_psy *p,
+ vorbis_info_mapping0 *vi,
+ float **pcm,
+ float **sofar,
+ float **quantized,
+ int *nonzero,
+ int passno){
+
+ int i,j,k,n=p->n;
+ vorbis_info_psy *info=p->vi;
+
+ /* perform any requested channel coupling */
+ for(i=0;i<vi->coupling_steps;i++){
+ float granulem=info->couple_pass[passno].granulem;
+ float igranulem=info->couple_pass[passno].igranulem;
+
+ /* make sure coupling a zero and a nonzero channel results in two
+ nonzero channels. */
+ if(nonzero[vi->coupling_mag[i]] ||
+ nonzero[vi->coupling_ang[i]]){
+
+ float *pcmM=pcm[vi->coupling_mag[i]];
+ float *pcmA=pcm[vi->coupling_ang[i]];
+ float *sofarM=sofar[vi->coupling_mag[i]];
+ float *sofarA=sofar[vi->coupling_ang[i]];
+ float *qM=quantized[vi->coupling_mag[i]];
+ float *qA=quantized[vi->coupling_ang[i]];
+
+ nonzero[vi->coupling_mag[i]]=1;
+ nonzero[vi->coupling_ang[i]]=1;
+
+ for(j=0,k=0;j<n;k++){
+ vp_couple *part=info->couple_pass[passno].couple_pass+k;
+
+ for(;j<part->limit && j<p->n;j++){
+ /* partition by partition; k is our by-location partition
+ class counter */
+
+ float Am=rint(pcmM[j]*igranulem)*granulem;
+ float Bm=rint(pcmA[j]*igranulem)*granulem;
+ float ang,mag,fmag=max(fabs(Am),fabs(Bm));
+
+ if(fmag<part->amppost_point){
+ couple_point(Am,Bm,&mag,&ang);
+ }else{
+ if(fmag<part->amppost_6phase){
+ couple_6phase(Am,Bm,&mag,&ang);
+ }else{
+ if(fmag<part->amppost_8phase){
+ couple_8phase(Am,Bm,&mag,&ang);
+ }else{
+ couple_lossless(Am,Bm,&mag,&ang);
+ }
+ }
+ }
+ fmag=rint(fmag);
+ if(ang>fmag*1.9999f)ang=-fmag*2.f;
+
+ qM[j]=mag-sofarM[j];
+ qA[j]=ang-sofarA[j];
+ }
+ }
+ }
+ }
+}
diff --git a/lib/psy.h b/lib/psy.h
index 4047f59b..6c97deaa 100644
--- a/lib/psy.h
+++ b/lib/psy.h
@@ -11,7 +11,7 @@
********************************************************************
function: random psychoacoustics (not including preecho)
- last mod: $Id: psy.h,v 1.21 2001/06/15 21:15:40 xiphmont Exp $
+ last mod: $Id: psy.h,v 1.22 2001/08/13 01:36:57 xiphmont Exp $
********************************************************************/
@@ -19,6 +19,14 @@
#define _V_PSY_H_
#include "smallft.h"
+#include "backends.h"
+
+#define BLOCKTYPE_IMPULSE 0
+#define BLOCKTYPE_PADDING 1
+#define BLOCKTYPE_TRANSITION 0
+#define BLOCKTYPE_LONG 1
+
+
#ifndef EHMER_MAX
#define EHMER_MAX 56
#endif
@@ -27,24 +35,49 @@
#define MAX_BARK 27
#define P_BANDS 17
#define P_LEVELS 11
+
+typedef struct vp_couple{
+ int limit; /* sample post */
+
+ float amppost_8phase;
+ float thresh_8phase;
+
+ float amppost_6phase;
+ float thresh_6phase;
+
+ float amppost_point;
+ float thresh_point;
+
+} vp_couple;
+
+typedef struct vp_couple_pass{
+ float granulem;
+ float igranulem;
+
+ vp_couple couple_pass[8];
+} vp_couple_pass;
+
+typedef struct vp_attenblock{
+ float block[P_BANDS][P_LEVELS];
+} vp_attenblock;
+
typedef struct vorbis_info_psy{
float *ath;
- int decayp;
float ath_adjatt;
float ath_maxatt;
- int eighth_octave_lines;
-
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
/* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
/* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
- int tonemaskp;
- float toneatt[P_BANDS][P_LEVELS];
+ float tone_masteratt;
+ float tone_maxatt;
+ vp_attenblock *toneatt;
int peakattp;
- float peakatt[P_BANDS][P_LEVELS];
+ int curvelimitp;
+ vp_attenblock *peakatt;
int noisemaskp;
float noisemaxsupp;
@@ -53,20 +86,49 @@ typedef struct vorbis_info_psy{
int noisewindowlomin;
int noisewindowhimin;
int noisewindowfixed;
- float noisemedian[P_BANDS*2];
+ float noiseoff[P_BANDS];
+ float noisethresh[P_BANDS];
float max_curve_dB;
- float bound_att_dB;
+
+ int coupling_passes;
+ vp_couple_pass *couple_pass;
} vorbis_info_psy;
+typedef struct{
+ float decaydBpms;
+ int eighth_octave_lines;
+
+ /* for block long/short tuning; encode only */
+ int envelopesa;
+ float preecho_thresh[4];
+ float postecho_thresh[4];
+ float preecho_minenergy;
+
+ float ampmax_att_per_sec;
+
+ /* delay caching... how many samples to keep around prior to our
+ current block to aid in analysis? */
+ int delaycache;
+} vorbis_info_psy_global;
+
+typedef struct {
+ float ampmax;
+ float **decay;
+ int decaylines;
+ int channels;
+
+ vorbis_info_psy_global *gi;
+} vorbis_look_psy_global;
+
+
typedef struct {
int n;
struct vorbis_info_psy *vi;
float ***tonecurves;
- float **peakatt;
- int *noisemedian;
+ float *noisethresh;
float *noiseoffset;
float *ath;
@@ -77,21 +139,43 @@ typedef struct {
long shiftoc;
int eighth_octave_lines; /* power of two, please */
int total_octave_lines;
-
+ long rate; /* cache it */
} vorbis_look_psy;
-extern void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,int n,long rate);
+extern void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,
+ vorbis_info_psy_global *gi,int n,long rate);
extern void _vp_psy_clear(vorbis_look_psy *p);
extern void *_vi_psy_dup(void *source);
extern void _vi_psy_free(vorbis_info_psy *i);
extern vorbis_info_psy *_vi_psy_copy(vorbis_info_psy *i);
-extern float _vp_compute_mask(vorbis_look_psy *p,
+extern void _vp_remove_floor(vorbis_look_psy *p,
+ vorbis_look_psy_global *g,
+ float *logmdct,
+ float *mdct,
+ float *codedflr,
+ float *residue,
+ float local_specmax);
+
+extern void _vp_compute_mask(vorbis_look_psy *p,
+ vorbis_look_psy_global *g,
+ int channel,
float *fft,
float *mdct,
- float *mask,
- float prev_maxamp);
+ float *mask,
+ float global_specmax,
+ float local_specmax,
+ int lastsize);
+
+extern void _vp_quantize_couple(vorbis_look_psy *p,
+ vorbis_info_mapping0 *vi,
+ float **pcm,
+ float **sofar,
+ float **quantized,
+ int *nonzero,
+ int passno);
+
extern float _vp_ampmax_decay(float amp,vorbis_dsp_state *vd);
#endif
diff --git a/lib/psytune.c b/lib/psytune.c
index 12285d21..4f2e59c9 100644
--- a/lib/psytune.c
+++ b/lib/psytune.c
@@ -12,7 +12,7 @@
function: simple utility that runs audio through the psychoacoustics
without encoding
- last mod: $Id: psytune.c,v 1.15 2001/05/27 06:44:00 xiphmont Exp $
+ last mod: $Id: psytune.c,v 1.16 2001/08/13 01:36:57 xiphmont Exp $
********************************************************************/
@@ -22,6 +22,7 @@
#include <math.h>
#include "vorbis/codec.h"
+#include "codec_internal.h"
#include "os.h"
#include "psy.h"
#include "mdct.h"
@@ -30,70 +31,100 @@
#include "scales.h"
#include "lpc.h"
#include "lsp.h"
+#include "masking.h"
+#include "registry.h"
-static vorbis_info_psy _psy_set0={
- 1,/*athp*/
- 1,/*decayp*/
+static vorbis_info_psy_global _psy_set0G={
+ 0, /* decaydBpms */
+ 8, /* lines per eighth octave */
+
+ /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
+ 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
+ -6.f,
+
+ 0,
+
+ 0.,
+ 0.,
+};
+
+static vp_part _vp_part0[]={
+ { 1,9e10f, 9e10f, 1.f,9999.f},
+ { 9999, .75f, 9e10f, .5f,9999.f},
+ //{ 9999, 1.5f, 9e10f, .5f,9999.f},
+ { 18,9e10f, 9e10f, .5f, 30.f},
+ { 9999,9e10f, 9e10f, .5f, 30.f}
+};
+
+static vp_couple _vp_couple0[]={
+ { 1, {9e10f,9e10f,0}, { 0.f, 0.f,0}, { 0.f, 0.f,0}, {0.f,0.f,0}},
+ { 18, {9e10f,9e10f,0}, { 0.f, 0.f,0}, { 0.f, 0.f,0}, {0.f,0.f,0}},
+ { 9999, {9e10f,9e10f,0}, { 0.f, 9e10f,0}, { 0.f,22.f,1}, {0.f,0.f,0}}
+};
+static vorbis_info_psy _psy_set0={
+ ATH_Bark_dB_lineaggressive,
+
-100.f,
-140.f,
-
- 8,
+ 6.f, /* floor master att */
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
/* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
/* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
- 1,/* tonemaskp */
+ 1, /* tonemaskp */
+ 0.f, /* tone master att */
/* 0 10 20 30 40 50 60 70 80 90 100 */
{
{-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/
{-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*88*/
{-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*125*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
-
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
+ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/
{-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/
{-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
- {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
+ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
+
+ {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
{-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
- {-30.f,-30.f,-33.f,-35.f,-35.f,-45.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*11500*/
- {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*16000*/
+ {-30.f,-30.f,-33.f,-35.f,-40.f,-45.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*11500*/
+ {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*16000*/
},
1,/* peakattp */
- {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-24.f,-24.f,-24.f},/*63*/
- {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-24.f,-24.f,-24.f},/*88*/
- {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-24.f,-24.f,-24.f},/*125*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-24.f,-24.f,-24.f},/*175*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-24.f,-24.f,-24.f},/*250*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-24.f,-24.f},/*350*/
- {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-24.f,-24.f},/*500*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*700*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*1000*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*1400*/
- {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*2000*/
- {-10.f,-10.f,-10.f,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*2400*/
- {-10.f,-10.f,-10.f,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*4000*/
- {-10.f,-10.f,-10.f,-12.f,-12.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*5600*/
- {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*8000*/
- {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*11500*/
- {-10.f,-10.f,-10.f,-10.f,-10.f,-12.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*16000*/
+ {{-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*63*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*88*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*125*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*175*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*250*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*350*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*500*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*700*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*1000*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*1400*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*2000*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*2800*/
+ {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*4000*/
+ {-10.f,-12.f,-14.f,-16.f,-16.f,-20.f,-24.f,-30.f,-32.f,-40.f,-40.f},/*5600*/
+ {-10.f,-12.f,-14.f,-16.f,-16.f,-20.f,-24.f,-30.f,-32.f,-40.f,-40.f},/*8000*/
+ {-10.f,-10.f,-10.f,-12.f,-14.f,-18.f,-22.f,-28.f,-32.f,-40.f,-40.f},/*11500*/
+ {-10.f,-10.f,-10.f,-12.f,-14.f,-18.f,-22.f,-28.f,-32.f,-40.f,-40.f},/*16000*/
},
1,/*noisemaskp */
- -24.f, /* suppress any noise curve over maxspec+n */
+ -10.f, /* suppress any noise curve over maxspec+n */
.5f, /* low window */
.5f, /* high window */
- 25,
+ 10,
+ 10,
25,
{.000f, 0.f, /*63*/
.000f, 0.f, /*88*/
@@ -102,25 +133,65 @@ static vorbis_info_psy _psy_set0={
.000f, 0.f, /*250*/
.000f, 0.f, /*350*/
.000f, 0.f, /*500*/
- .200f, 0.f, /*700*/
- .300f, 0.f, /*1000*/
- .400f, 0.f, /*1400*/
- .400f, 0.f, /*2000*/
- .400f, 0.f, /*2800*/
- .700f, 0.f, /*4000*/
- .850f, 0.f, /*5600*/
- .900f, 0.f, /*8000*/
+ .000f, 0.f, /*700*/
+ .000f, 0.f, /*1000*/
+ .300f, 0.f, /*1400*/
+ .300f, 0.f, /*2000*/
+ .300f, 0.f, /*2800*/
+ .500f, 0.f, /*4000*/
+ .700f, 0.f, /*5600*/
+ .850f, 0.f, /*8000*/
.900f, 0.f, /*11500*/
.900f, 1.f, /*16000*/
},
95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
- -28.,
+ -44.,
+ 32,
+ _vp_part0,_vp_couple0
};
-static int noisy=1;
+static vorbis_info_floor1 _floor_set0={1,
+ {0},
+
+ {32},
+ {0},
+ {0},
+ {{-1}},
+
+ 2,
+ {0,1024,
+
+ 88,31,243,
+
+ 14,54,143,460,
+
+ 6,3,10, 22,18,26, 41,36,47,
+ 69,61,78, 112,99,126, 185,162,211,
+ 329,282,387, 672,553,825
+ },
+
+ 60,30,400,
+ 20,8,1,18.,
+ 20,600,
+ 960};
+
+
+static vorbis_info_mapping0 mapping_info={1,{0,1},{0},{0},{0},0, 1, {0},{1}};
+static codec_setup_info codec_setup0={ {0,0},
+ 1,1,1,1,1,0,1,
+ {NULL},
+ {0},{&mapping_info},
+ {0},{NULL},
+ {1},{&_floor_set0},
+ {2},{NULL},
+ {NULL},
+ {&_psy_set0},
+ &_psy_set0G};
+
+static int noisy=0;
void analysis(char *base,int i,float *v,int n,int bark,int dB){
if(noisy){
int j;
@@ -139,7 +210,7 @@ void analysis(char *base,int i,float *v,int n,int bark,int dB){
fprintf(of,"%g ",(float)j);
if(dB){
- fprintf(of,"%g\n",todB(fabs(v+j)));
+ fprintf(of,"%g\n",todB(v+j));
}else{
fprintf(of,"%g\n",v[j]);
}
@@ -159,18 +230,19 @@ int main(int argc,char *argv[]){
float acc=0.f;
float tot=0.f;
float ampmax=-9999,newmax;
+ float local_ampmax[2];
int framesize=2048;
- int order=30;
- int map=256;
- float ampmax_att_per_sec=-10.;
+ float ampmax_att_per_sec=-6.;
- float *pcm[2],*out[2],*window,*lpc,*flr,*mask;
+ float *pcm[2],*out[2],*window,*flr[2],*mask[2],*work[2];
signed char *buffer,*buffer2;
mdct_lookup m_look;
drft_lookup f_look;
- drft_lookup f_look2;
vorbis_look_psy p_look;
+ vorbis_look_psy_global *pg_look;
+ vorbis_look_floor *floor_look;
+ vorbis_info vi;
long i,j,k;
int ath=0;
@@ -183,47 +255,36 @@ int main(int argc,char *argv[]){
if(argv[0][1]=='v'){
noisy=0;
}
- if(argv[0][1]=='o'){
- order=atoi(argv[0]+2);
- }
- if(argv[0][1]=='m'){
- map=atoi(argv[0]+2);
- }
}else
if(*argv[0]=='+'){
/* option */
if(argv[0][1]=='v'){
noisy=1;
}
- if(argv[0][1]=='o'){
- order=atoi(argv[0]+2);
- }
- if(argv[0][1]=='m'){
- map=atoi(argv[0]+2);
- }
}else
framesize=atoi(argv[0]);
argv++;
}
- mask=_ogg_malloc(framesize*sizeof(float));
+ vi.channels=2;
+ vi.codec_setup=&codec_setup0;
+
pcm[0]=_ogg_malloc(framesize*sizeof(float));
pcm[1]=_ogg_malloc(framesize*sizeof(float));
out[0]=_ogg_calloc(framesize/2,sizeof(float));
out[1]=_ogg_calloc(framesize/2,sizeof(float));
- flr=_ogg_malloc(framesize*sizeof(float));
- lpc=_ogg_malloc(order*sizeof(float));
+ work[0]=_ogg_calloc(framesize,sizeof(float));
+ work[1]=_ogg_calloc(framesize,sizeof(float));
+ flr[0]=_ogg_calloc(framesize/2,sizeof(float));
+ flr[1]=_ogg_calloc(framesize/2,sizeof(float));
buffer=_ogg_malloc(framesize*4);
buffer2=buffer+framesize*2;
window=_vorbis_window(0,framesize,framesize/2,framesize/2);
mdct_init(&m_look,framesize);
drft_init(&f_look,framesize);
- drft_init(&f_look2,framesize/2);
- _vp_psy_init(&p_look,&_psy_set0,framesize/2,44100);
-
- for(i=0;i<P_BANDS;i++)
- for(j=0;j<P_LEVELS;j++)
- analysis("Ptonecurve",i*100+j,p_look.tonecurves[i][j],EHMER_MAX,0,0);
+ _vp_psy_init(&p_look,&_psy_set0,&_psy_set0G,framesize/2,44100);
+ pg_look=_vp_global_look(&vi);
+ floor_look=_floor_P[1]->look(NULL,NULL,&_floor_set0);
/* we cheat on the WAV header; we just bypass 44 bytes and never
verify that it matches 16bit/stereo/44.1kHz. */
@@ -242,6 +303,7 @@ int main(int argc,char *argv[]){
memset(buffer2+bytes,0,framesize*2-bytes);
if(bytes!=0){
+ int nonzero[2];
/* uninterleave samples */
for(i=0;i<framesize;i++){
@@ -257,93 +319,181 @@ int main(int argc,char *argv[]){
ampmax+=secs*ampmax_att_per_sec;
if(ampmax<-9999)ampmax=-9999;
}
- newmax=ampmax;
for(i=0;i<2;i++){
- float amp;
+ float scale=4.f/framesize;
+ float *fft=work[i];
+ float *mdct=pcm[i];
+ float *logmdct=mdct+framesize/2;
- analysis("pre",frameno,pcm[i],framesize,0,0);
- memcpy(mask,pcm[i],sizeof(float)*framesize);
+ analysis("pre",frameno+i,pcm[i],framesize,0,0);
- /* do the psychacoustics */
+ /* fft and mdct transforms */
for(j=0;j<framesize;j++)
- mask[j]=pcm[i][j]*=window[j];
+ fft[j]=pcm[i][j]*=window[j];
- drft_forward(&f_look,mask);
-
- mask[0]/=(framesize/4.);
- for(j=1;j<framesize-1;j+=2)
- mask[(j+1)>>1]=4*hypot(mask[j],mask[j+1])/framesize;
-
- mdct_forward(&m_look,pcm[i],pcm[i]);
- memcpy(mask+framesize/2,pcm[i],sizeof(float)*framesize/2);
- analysis("mdct",frameno,pcm[i],framesize/2,0,1);
- analysis("fft",frameno,mask,framesize/2,0,1);
+ drft_forward(&f_look,fft);
- {
- float ret;
- ret=_vp_compute_mask(&p_look,mask,mask+framesize/2,flr,NULL,ampmax);
- if(ret>newmax)newmax=ret;
+ local_ampmax[i]=-9999.f;
+ fft[0]*=scale;
+ fft[0]=todB(fft);
+ for(j=1;j<framesize-1;j+=2){
+ float temp=scale*FAST_HYPOT(fft[j],fft[j+1]);
+ temp=fft[(j+1)>>1]=todB(&temp);
+ if(temp>local_ampmax[i])local_ampmax[i]=temp;
}
+ if(local_ampmax[i]>ampmax)ampmax=local_ampmax[i];
+
+ mdct_forward(&m_look,pcm[i],mdct);
+ for(j=0;j<framesize/2;j++)
+ logmdct[j]=todB(mdct+j);
- analysis("mask",frameno,flr,framesize/2,0,0);
+ analysis("mdct",frameno+i,logmdct,framesize/2,1,0);
+ analysis("fft",frameno+i,fft,framesize/2,1,0);
+ }
- mask[framesize-1]=0.;
- mask[0]=0.;
- for(j=1;j<framesize-1;j+=2){
- mask[j]=todB(pcm[i]+((j+1)>>1));
- mask[j+1]=0;
+ for(i=0;i<2;i++){
+ float amp;
+ float *fft=work[i];
+ float *logmax=fft;
+ float *mdct=pcm[i];
+ float *logmdct=mdct+framesize/2;
+ float *mask=fft+framesize/2;
+
+ /* floor psychoacoustics */
+ _vp_compute_mask(&p_look,
+ pg_look,
+ i,
+ fft,
+ logmdct,
+ mask,
+ ampmax,
+ local_ampmax[i],
+ framesize/2);
+
+ analysis("mask",frameno+i,mask,framesize/2,1,0);
+
+ {
+ vorbis_block vb;
+ vorbis_dsp_state vd;
+ memset(&vd,0,sizeof(vd));
+ vd.vi=&vi;
+ vb.vd=&vd;
+ vb.pcmend=framesize;
+
+ /* floor quantization/application */
+ nonzero[i]=_floor_P[1]->forward(&vb,floor_look,
+ mdct,
+ logmdct,
+ mask,
+ logmax,
+
+ flr[i]);
}
- analysis("lfft",frameno,mask,framesize,0,0);
- drft_backward(&f_look,mask);
+ _vp_remove_floor(&p_look,
+ pg_look,
+ logmdct,
+ mdct,
+ flr[i],
+ pcm[i],
+ local_ampmax[i]);
- analysis("cep",frameno,mask,framesize,0,0);
- analysis("logcep",frameno,mask,framesize,0,1);
+ for(j=0;j<framesize/2;j++)
+ if(fabs(pcm[i][j])>1500)
+ fprintf(stderr,"%ld ",frameno+i);
+ analysis("res",frameno+i,pcm[i],framesize/2,1,0);
+ analysis("codedflr",frameno+i,flr[i],framesize/2,1,1);
+ }
+ /* residue prequantization */
+ _vp_partition_prequant(&p_look,
+ &vi,
+ pcm,
+ nonzero);
+
+ for(i=0;i<2;i++)
+ analysis("quant",frameno+i,pcm[i],framesize/2,1,0);
- /*for(j=0;j<framesize/2;j++){
- float val=fromdB(flr[j]);
- int p=rint(pcm[i][j]/val);
- pcm[i][j]=p*val;
- }*/
+ /* channel coupling / stereo quantization */
- /*for(j=0;j<framesize/2;j++){
- float val=todB(pcm[i]+j);
- if(val+6.<flr[j])
- pcm[i][j]=0.;
- }*/
+ _vp_couple(&p_look,
+ &mapping_info,
+ pcm,
+ nonzero);
+
+ for(i=0;i<2;i++)
+ analysis("coupled",frameno+i,pcm[i],framesize/2,1,0);
+ /* decoupling */
+ for(i=mapping_info.coupling_steps-1;i>=0;i--){
+ float *pcmM=pcm[mapping_info.coupling_mag[i]];
+ float *pcmA=pcm[mapping_info.coupling_ang[i]];
+
for(j=0;j<framesize/2;j++){
- float val=rint(todB(pcm[i]+j)/6);
- if(pcm[i][j]>0)
- pcm[i][j]=fromdB(val*6);
+ float mag=pcmM[j];
+ float ang=pcmA[j];
+
+ if(mag>0)
+ if(ang>0){
+ pcmM[j]=mag;
+ pcmA[j]=mag-ang;
+ }else{
+ pcmA[j]=mag;
+ pcmM[j]=mag+ang;
+ }
else
- pcm[i][j]=-fromdB(val*6);
+ if(ang>0){
+ pcmM[j]=mag;
+ pcmA[j]=mag+ang;
+ }else{
+ pcmA[j]=mag;
+ pcmM[j]=mag-ang;
+ }
}
+ }
+
+ for(i=0;i<2;i++)
+ analysis("decoupled",frameno+i,pcm[i],framesize/2,1,0);
+
+ for(i=0;i<2;i++){
+ float amp;
+ for(j=0;j<framesize/2;j++)
+ pcm[i][j]*=flr[i][j];
- analysis("final",frameno,pcm[i],framesize/2,0,1);
+ analysis("final",frameno+i,pcm[i],framesize/2,1,1);
/* take it back to time */
mdct_backward(&m_look,pcm[i],pcm[i]);
+
for(j=0;j<framesize/2;j++)
out[i][j]+=pcm[i][j]*window[j];
- frameno++;
+ analysis("out",frameno+i,out[i],framesize/2,0,0);
+
+
}
- ampmax=newmax;
/* write data. Use the part of buffer we're about to shift out */
for(i=0;i<2;i++){
char *ptr=buffer+i*2;
float *mono=out[i];
+ int flag=0;
for(j=0;j<framesize/2;j++){
int val=mono[j]*32767.;
/* might as well guard against clipping */
- if(val>32767)val=32767;
- if(val<-32768)val=-32768;
+ if(val>32767){
+ if(!flag)fprintf(stderr,"clipping in frame %ld ",frameno+i);
+ flag=1;
+ val=32767;
+ }
+ if(val<-32768){
+ if(!flag)fprintf(stderr,"clipping in frame %ld ",frameno+i);
+ flag=1;
+ val=-32768;
+ }
ptr[0]=val&0xff;
ptr[1]=(val>>8)&0xff;
ptr+=4;
@@ -358,6 +508,7 @@ int main(int argc,char *argv[]){
for(j=0,k=framesize/2;j<framesize/2;j++,k++)
out[i][j]=pcm[i][k]*window[k];
}
+ frameno+=2;
}else
eos=1;
}
diff --git a/lib/registry.c b/lib/registry.c
index c35b6bb9..b8a5d511 100644
--- a/lib/registry.c
+++ b/lib/registry.c
@@ -11,11 +11,12 @@
********************************************************************
function: registry for time, floor, res backends and channel mappings
- last mod: $Id: registry.c,v 1.8 2001/06/15 21:15:40 xiphmont Exp $
+ last mod: $Id: registry.c,v 1.9 2001/08/13 01:36:57 xiphmont Exp $
********************************************************************/
#include "vorbis/codec.h"
+#include "codec_internal.h"
#include "registry.h"
#include "misc.h"
diff --git a/lib/registry.h b/lib/registry.h
index 53d7c4a7..1c53b4a4 100644
--- a/lib/registry.h
+++ b/lib/registry.h
@@ -11,15 +11,13 @@
********************************************************************
function: registry for time, floor, res backends and channel mappings
- last mod: $Id: registry.h,v 1.7 2001/06/15 21:15:40 xiphmont Exp $
+ last mod: $Id: registry.h,v 1.8 2001/08/13 01:36:57 xiphmont Exp $
********************************************************************/
#ifndef _V_REG_H_
#define _V_REG_H_
-#include "backends.h"
-
#define VI_TRANSFORMB 1
#define VI_WINDOWB 1
#define VI_TIMEB 1
diff --git a/lib/res0.c b/lib/res0.c
index 20df837b..303d3edd 100644
--- a/lib/res0.c
+++ b/lib/res0.c
@@ -11,7 +11,7 @@
********************************************************************
function: residue backend 0, 1 and 2 implementation
- last mod: $Id: res0.c,v 1.32 2001/06/15 23:31:00 xiphmont Exp $
+ last mod: $Id: res0.c,v 1.33 2001/08/13 01:36:57 xiphmont Exp $
********************************************************************/
@@ -45,11 +45,9 @@ typedef struct {
int partvals;
int **decodemap;
- /*long resbits[32][32];
- long resbitsflat;
- long resvals[32];
+ long postbits;
long phrasebits;
- long frames;*/
+ long frames;
} vorbis_look_residue0;
@@ -68,13 +66,19 @@ void res0_free_info(vorbis_info_residue *i){
}
void res0_free_look(vorbis_look_residue *i){
- int j,k;
+ int j;
if(i){
vorbis_look_residue0 *look=(vorbis_look_residue0 *)i;
- vorbis_info_residue0 *info=look->info;
- /*fprintf(stderr,
+ /*fprintf(stderr,"residue bit usage %f:%f (%f total)\n",
+ (float)look->phrasebits/look->frames,
+ (float)look->postbits/look->frames,
+ (float)(look->postbits+look->phrasebits)/look->frames);*/
+
+ /*vorbis_info_residue0 *info=look->info;
+
+ fprintf(stderr,
"%ld frames encoded in %ld phrasebits and %ld residue bits "
"(%g/frame) \n",look->frames,look->phrasebits,
look->resbitsflat,
@@ -281,37 +285,25 @@ static int _interleaved_testhack(float *vec,int n,vorbis_look_residue0 *look,
static int _testhack(float *vec,int n,vorbis_look_residue0 *look,
int auxparts,int auxpartnum){
vorbis_info_residue0 *info=look->info;
- int i,j=0;
- float max,localmax=0.f;
+ int i;
+ float max=0.f;
float temp[128];
- float entropy[8];
+ float entropy=0.f;
/* setup */
for(i=0;i<n;i++)temp[i]=fabs(vec[i]);
- /* handle case subgrp==1 outside */
for(i=0;i<n;i++)
- if(temp[i]>localmax)localmax=temp[i];
- max=localmax;
+ if(temp[i]>max)max=temp[i];
for(i=0;i<n;i++)temp[i]=rint(temp[i]);
-
- while(n){
- entropy[j]=localmax;
- n>>=1;
- j++;
- if(!n)break;
- for(i=0;i<n;i++){
- temp[i]=temp[i*2]+temp[i*2+1];
- }
- localmax=0.f;
- for(i=0;i<n;i++)
- if(temp[i]>localmax)localmax=temp[i];
- }
+
+ for(i=0;i<n;i++)
+ entropy+=temp[i];
for(i=0;i<auxparts-1;i++)
if(auxpartnum<info->blimit[i] &&
- entropy[info->subgrp[i]]<=info->entmax[i] &&
+ entropy<=info->entmax[i] &&
max<=info->ampmax[i])
break;
@@ -374,13 +366,118 @@ static int _encodepart(oggpack_buffer *opb,float *vec, int n,
return(bits);
}
+static long **_01class(vorbis_block *vb,vorbis_look_residue *vl,
+ float **in,int ch,
+ int (*classify)(float *,int,vorbis_look_residue0 *,
+ int,int)){
+ long i,j;
+ vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
+ vorbis_info_residue0 *info=look->info;
+
+ /* move all this setup out later */
+ int samples_per_partition=info->grouping;
+ int possible_partitions=info->partitions;
+ int n=info->end-info->begin;
+
+ int partvals=n/samples_per_partition;
+ long **partword=_vorbis_block_alloc(vb,ch*sizeof(long *));
+
+ /* we find the partition type for each partition of each
+ channel. We'll go back and do the interleaved encoding in a
+ bit. For now, clarity */
+
+ for(i=0;i<ch;i++){
+ partword[i]=_vorbis_block_alloc(vb,n/samples_per_partition*sizeof(long));
+ memset(partword[i],0,n/samples_per_partition*sizeof(long));
+ }
+
+ for(i=0;i<partvals;i++){
+ for(j=0;j<ch;j++)
+ /* do the partition decision based on the 'entropy'
+ int the block */
+ partword[j][i]=
+ classify(in[j]+i*samples_per_partition+info->begin,
+ samples_per_partition,look,possible_partitions,i);
+
+ }
+
+#ifdef TRAIN_RES
+ {
+ FILE *of;
+ char buffer[80];
+
+ for(i=0;i<ch;i++){
+ sprintf(buffer,"resaux_%d.vqd",vb->mode);
+ of=fopen(buffer,"a");
+ for(j=0;j<partvals;j++)
+ fprintf(of,"%ld, ",partword[i][j]);
+ fprintf(of,"\n");
+ fclose(of);
+ }
+ }
+#endif
+ look->frames++;
+
+ return(partword);
+}
+
+static long **_2class(vorbis_block *vb,vorbis_look_residue *vl,
+ float **in,int ch,
+ int (*classify)(float *,int,vorbis_look_residue0 *,
+ int,int)){
+ long i,j,k,l;
+ vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
+ vorbis_info_residue0 *info=look->info;
+
+ /* move all this setup out later */
+ int samples_per_partition=info->grouping;
+ int possible_partitions=info->partitions;
+ int n=info->end-info->begin;
+
+ int partvals=n/samples_per_partition;
+ long **partword=_vorbis_block_alloc(vb,sizeof(long *));
+ float *work=alloca(sizeof(float)*samples_per_partition);
+
+ partword[0]=_vorbis_block_alloc(vb,n*ch/samples_per_partition*sizeof(long));
+ memset(partword[0],0,n*ch/samples_per_partition*sizeof(long));
+
+ for(i=0,j=0,k=0,l=info->begin;i<partvals;i++){
+ for(k=0;k<samples_per_partition;k++){
+ work[k]=in[j][l];
+ j++;
+ if(j>=ch){
+ j=0;
+ l++;
+ }
+ }
+ partword[0][i]=
+ classify(work,samples_per_partition,look,possible_partitions,i);
+ }
+
+#ifdef TRAIN_RES
+ {
+ FILE *of;
+ char buffer[80];
+
+ sprintf(buffer,"resaux_%d.vqd",vb->mode);
+ of=fopen(buffer,"a");
+ for(i=0;i<partvals;i++)
+ fprintf(of,"%ld, ",partword[0][i]);
+ fprintf(of,"\n");
+ fclose(of);
+ }
+#endif
+ look->frames++;
+
+ return(partword);
+}
+
static int _01forward(vorbis_block *vb,vorbis_look_residue *vl,
float **in,int ch,
- int (*classify)(float *,int,vorbis_look_residue0 *,
- int,int),
+ int pass,long **partword,
int (*encode)(oggpack_buffer *,float *,int,
codebook *,vorbis_look_residue0 *)){
- long i,j,k,l,s;
+ long i,j,k,s;
vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
vorbis_info_residue0 *info=look->info;
@@ -391,8 +488,8 @@ static int _01forward(vorbis_block *vb,vorbis_look_residue *vl,
int n=info->end-info->begin;
int partvals=n/samples_per_partition;
- int partwords=(partvals+partitions_per_word-1)/partitions_per_word;
- long **partword=_vorbis_block_alloc(vb,ch*sizeof(long *));
+ long resbits[128];
+ long resvals[128];
#ifdef TRAIN_RES
FILE *of;
@@ -400,77 +497,80 @@ static int _01forward(vorbis_block *vb,vorbis_look_residue *vl,
int m;
for(i=0;i<ch;i++){
- sprintf(buffer,"residue_%d.vqd",vb->mode);
+ sprintf(buffer,"residue_%d#%d.vqd",vb->mode,pass);
of=fopen(buffer,"a");
for(m=0;m<info->end;m++)
fprintf(of,"%.2f, ",in[i][m]);
fprintf(of,"\n");
fclose(of);
}
-
#endif
- partvals=partwords*partitions_per_word;
-
- /* we find the patition type for each partition of each
- channel. We'll go back and do the interleaved encoding in a
- bit. For now, clarity */
-
- for(i=0;i<ch;i++){
- partword[i]=_vorbis_block_alloc(vb,n/samples_per_partition*sizeof(long));
- memset(partword[i],0,n/samples_per_partition*sizeof(long));
- }
-
- for(i=info->begin,l=0;i<info->end;i+=samples_per_partition,l++){
- for(j=0;j<ch;j++)
- /* do the partition decision based on the 'entropy'
- int the block */
- partword[j][l]=
- classify(in[j]+i,samples_per_partition,look,possible_partitions,l);
+ memset(resbits,0,sizeof(resbits));
+ memset(resvals,0,sizeof(resvals));
- }
-
/* we code the partition words for each channel, then the residual
words for a partition per channel until we've written all the
residual words for that partition word. Then write the next
partition channel words... */
- /*look->frames++;*/
- for(s=0;s<look->stages;s++){
- for(i=info->begin,l=0;i<info->end;){
+ for(s=(pass==0?0:info->passlimit[pass-1]);s<info->passlimit[pass];s++){
+ for(i=0;i<partvals;){
/* first we encode a partition codeword for each channel */
if(s==0){
for(j=0;j<ch;j++){
- long val=partword[j][l];
+ long val=partword[j][i];
long ret;
- for(k=1;k<partitions_per_word;k++)
- val= val*possible_partitions+partword[j][l+k];
- ret=vorbis_book_encode(look->phrasebook,val,&vb->opb);
- /*look->phrasebits+=ret;*/
+ for(k=1;k<partitions_per_word;k++){
+ val*=possible_partitions;
+ if(i+k<partvals)
+ val+=partword[j][i+k];
+ }
+
+ /* training hack */
+ if(val<look->phrasebook->entries)
+ ret=vorbis_book_encode(look->phrasebook,val,&vb->opb);
+ /*else
+ fprintf(stderr,"!");*/
+
+ look->phrasebits+=ret;
+
}
}
/* now we encode interleaved residual values for the partitions */
- for(k=0;k<partitions_per_word;k++,l++,i+=samples_per_partition){
+ for(k=0;k<partitions_per_word && i<partvals;k++,i++){
+ long offset=i*samples_per_partition+info->begin;
for(j=0;j<ch;j++){
- /*if(s==0)look->resvals[partword[j][l]]++;*/
- if(info->secondstages[partword[j][l]]&(1<<s)){
- codebook *statebook=look->partbooks[partword[j][l]][s];
+ if(s==0)resvals[partword[j][i]]+=samples_per_partition;
+ if(info->secondstages[partword[j][i]]&(1<<s)){
+ codebook *statebook=look->partbooks[partword[j][i]][s];
if(statebook){
- int ret=encode(&vb->opb,in[j]+i,samples_per_partition,
+ int ret=encode(&vb->opb,in[j]+offset,samples_per_partition,
statebook,look);
- /*look->resbits[partword[j][l]][s]+=ret;
- look->resbitsflat+=ret;*/
-
+ look->postbits+=ret;
+ resbits[partword[j][i]]+=ret;
}
}
}
}
}
}
-
+
+ /*{
+ long total=0;
+ long totalbits=0;
+ fprintf(stderr,"%d :: ",vb->mode);
+ for(k=0;k<possible_partitions;k++){
+ fprintf(stderr,"%ld/%1.2g, ",resvals[k],(float)resbits[k]/resvals[k]);
+ total+=resvals[k];
+ totalbits+=resbits[k];
+ }
+
+ fprintf(stderr,":: %ld:%1.2g\n",total,(double)totalbits/total);
+ }*/
return(0);
}
@@ -488,18 +588,19 @@ static int _01inverse(vorbis_block *vb,vorbis_look_residue *vl,
int samples_per_partition=info->grouping;
int partitions_per_word=look->phrasebook->dim;
int n=info->end-info->begin;
-
+
int partvals=n/samples_per_partition;
int partwords=(partvals+partitions_per_word-1)/partitions_per_word;
int ***partword=alloca(ch*sizeof(int **));
- partvals=partwords*partitions_per_word;
for(j=0;j<ch;j++)
partword[j]=_vorbis_block_alloc(vb,partwords*sizeof(int *));
for(s=0;s<look->stages;s++){
- for(i=info->begin,l=0;i<info->end;l++){
+ /* each loop decodes on partition codeword containing
+ partitions_pre_word partitions */
+ for(i=0,l=0;i<partvals;l++){
if(s==0){
/* fetch the partition word for each channel */
for(j=0;j<ch;j++){
@@ -511,12 +612,13 @@ static int _01inverse(vorbis_block *vb,vorbis_look_residue *vl,
}
/* now we decode residual values for the partitions */
- for(k=0;k<partitions_per_word;k++,i+=samples_per_partition)
+ for(k=0;k<partitions_per_word && i<partvals;k++,i++)
for(j=0;j<ch;j++){
+ long offset=info->begin+i*samples_per_partition;
if(info->secondstages[partword[j][l][k]]&(1<<s)){
codebook *stagebook=look->partbooks[partword[j][l][k]][s];
if(stagebook){
- if(decodepart(stagebook,in[j]+i,&vb->opb,
+ if(decodepart(stagebook,in[j]+offset,&vb->opb,
samples_per_partition)==-1)goto eopbreak;
}
}
@@ -531,19 +633,45 @@ static int _01inverse(vorbis_block *vb,vorbis_look_residue *vl,
/* residue 0 and 1 are just slight variants of one another. 0 is
interleaved, 1 is not */
-int res0_forward(vorbis_block *vb,vorbis_look_residue *vl,
- float **in,int *nonzero,int ch){
+long **res0_class(vorbis_block *vb,vorbis_look_residue *vl,
+ float **in,int *nonzero,int ch){
/* we encode only the nonzero parts of a bundle */
int i,used=0;
for(i=0;i<ch;i++)
if(nonzero[i])
in[used++]=in[i];
if(used)
- return(_01forward(vb,vl,in,used,_interleaved_testhack,_interleaved_encodepart));
+ return(_01class(vb,vl,in,used,_interleaved_testhack));
else
return(0);
}
+int res0_forward(vorbis_block *vb,vorbis_look_residue *vl,
+ float **in,float **out,int *nonzero,int ch,
+ int pass, long **partword){
+ /* we encode only the nonzero parts of a bundle */
+ int i,j,used=0,n=vb->pcmend/2;
+ for(i=0;i<ch;i++)
+ if(nonzero[i]){
+ for(j=0;j<n;j++)
+ out[i][j]+=in[i][j];
+ in[used++]=in[i];
+ }
+ if(used){
+ int ret=_01forward(vb,vl,in,used,pass,partword,
+ _interleaved_encodepart);
+ used=0;
+ for(i=0;i<ch;i++)
+ if(nonzero[i]){
+ for(j=0;j<n;j++)
+ out[i][j]-=in[used][j];
+ used++;
+ }
+ return(ret);
+ }else
+ return(0);
+}
+
int res0_inverse(vorbis_block *vb,vorbis_look_residue *vl,
float **in,int *nonzero,int ch){
int i,used=0;
@@ -557,13 +685,38 @@ int res0_inverse(vorbis_block *vb,vorbis_look_residue *vl,
}
int res1_forward(vorbis_block *vb,vorbis_look_residue *vl,
- float **in,int *nonzero,int ch){
+ float **in,float **out,int *nonzero,int ch,
+ int pass, long **partword){
+ int i,j,used=0,n=vb->pcmend/2;
+ for(i=0;i<ch;i++)
+ if(nonzero[i]){
+ for(j=0;j<n;j++)
+ out[i][j]+=in[i][j];
+ in[used++]=in[i];
+ }
+
+ if(used){
+ int ret=_01forward(vb,vl,in,used,pass,partword,_encodepart);
+ used=0;
+ for(i=0;i<ch;i++)
+ if(nonzero[i]){
+ for(j=0;j<n;j++)
+ out[i][j]-=in[used][j];
+ used++;
+ }
+ return(ret);
+ }else
+ return(0);
+}
+
+long **res1_class(vorbis_block *vb,vorbis_look_residue *vl,
+ float **in,int *nonzero,int ch){
int i,used=0;
for(i=0;i<ch;i++)
if(nonzero[i])
in[used++]=in[i];
if(used)
- return(_01forward(vb,vl,in,used,_testhack,_encodepart));
+ return(_01class(vb,vl,in,used,_testhack));
else
return(0);
}
@@ -580,25 +733,49 @@ int res1_inverse(vorbis_block *vb,vorbis_look_residue *vl,
return(0);
}
+long **res2_class(vorbis_block *vb,vorbis_look_residue *vl,
+ float **in,int *nonzero,int ch){
+ int i,used=0;
+ for(i=0;i<ch;i++)
+ if(nonzero[i])
+ in[used++]=in[i];
+ if(used)
+ return(_2class(vb,vl,in,used,_testhack));
+ else
+ return(0);
+}
+
/* 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,
- float **in,int *nonzero,int ch){
+ float **in,float **out,int *nonzero,int ch,
+ int pass,long **partword){
long i,j,k,n=vb->pcmend/2,used=0;
/* don't duplicate the code; use a working vector hack for now and
reshape ourselves into a single channel res1 */
+ /* ugly; reallocs for each coupling pass :-( */
float *work=_vorbis_block_alloc(vb,ch*n*sizeof(float));
for(i=0;i<ch;i++){
- float *pcm=vb->pcm[i];
+ float *pcm=in[i];
if(nonzero[i])used++;
for(j=0,k=i;j<n;j++,k+=ch)
work[k]=pcm[j];
}
- if(used)
- return(_01forward(vb,vl,&work,1,_testhack,_encodepart));
- else
+ if(used){
+ int ret=_01forward(vb,vl,&work,1,pass,partword,_encodepart);
+ /* update the sofar vector */
+ for(i=0;i<ch;i++){
+ float *pcm=in[i];
+ float *sofar=out[i];
+ for(j=0,k=i;j<n;j++,k+=ch)
+ sofar[j]+=pcm[j]-work[k];
+ }
+
+ return(ret);
+ }else
return(0);
}
@@ -617,14 +794,12 @@ int res2_inverse(vorbis_block *vb,vorbis_look_residue *vl,
int partvals=n/samples_per_partition;
int partwords=(partvals+partitions_per_word-1)/partitions_per_word;
int **partword=_vorbis_block_alloc(vb,partwords*sizeof(int *));
- int used;
- partvals=partwords*partitions_per_word;
for(i=0;i<ch;i++)if(nonzero[i])break;
if(i==ch)return(0); /* no nonzero vectors */
for(s=0;s<look->stages;s++){
- for(i=info->begin,l=0;i<info->end;l++){
+ for(i=0,l=0;i<partvals;l++){
if(s==0){
/* fetch the partition word */
@@ -635,12 +810,13 @@ int res2_inverse(vorbis_block *vb,vorbis_look_residue *vl,
}
/* now we decode residual values for the partitions */
- for(k=0;k<partitions_per_word;k++,i+=samples_per_partition)
+ for(k=0;k<partitions_per_word && i<partvals;k++,i++)
if(info->secondstages[partword[l][k]]&(1<<s)){
codebook *stagebook=look->partbooks[partword[l][k]][s];
-
+
if(stagebook){
- if(vorbis_book_decodevv_add(stagebook,in,i,ch,
+ if(vorbis_book_decodevv_add(stagebook,in,
+ i*samples_per_partition+info->begin,ch,
&vb->opb,samples_per_partition)==-1)
goto eopbreak;
}
@@ -661,6 +837,7 @@ vorbis_func_residue residue0_exportbundle={
&res0_copy_info,
&res0_free_info,
&res0_free_look,
+ &res0_class,
&res0_forward,
&res0_inverse
};
@@ -672,6 +849,7 @@ vorbis_func_residue residue1_exportbundle={
&res0_copy_info,
&res0_free_info,
&res0_free_look,
+ &res1_class,
&res1_forward,
&res1_inverse
};
@@ -683,6 +861,7 @@ vorbis_func_residue residue2_exportbundle={
&res0_copy_info,
&res0_free_info,
&res0_free_look,
+ &res2_class,
&res2_forward,
&res2_inverse
};
diff --git a/lib/sharedbook.c b/lib/sharedbook.c
index e6898c68..95371ccd 100644
--- a/lib/sharedbook.c
+++ b/lib/sharedbook.c
@@ -11,7 +11,7 @@
********************************************************************
function: basic shared codebook operations
- last mod: $Id: sharedbook.c,v 1.16 2001/02/26 03:50:43 xiphmont Exp $
+ last mod: $Id: sharedbook.c,v 1.17 2001/08/13 01:36:57 xiphmont Exp $
********************************************************************/
@@ -396,7 +396,7 @@ int _best(codebook *book, float *a, int step){
for(k=0,o=step*(dim-1);k<dim;k++,o-=step){
int i;
/* linear search the quant list for now; it's small and although
- with > 8 entries, it would be faster to bisect, this would be
+ with > ~8 entries, it would be faster to bisect, this would be
a misplaced optimization for now */
for(i=0;i<tt->threshvals-1;i++)
if(a[o]<tt->quantthresh[i])break;
diff --git a/lib/synthesis.c b/lib/synthesis.c
index eb314b89..57c6f1d6 100644
--- a/lib/synthesis.c
+++ b/lib/synthesis.c
@@ -11,13 +11,14 @@
********************************************************************
function: single-block PCM synthesis
- last mod: $Id: synthesis.c,v 1.22 2001/05/27 06:44:01 xiphmont Exp $
+ last mod: $Id: synthesis.c,v 1.23 2001/08/13 01:36:57 xiphmont Exp $
********************************************************************/
#include <stdio.h>
#include <ogg/ogg.h>
#include "vorbis/codec.h"
+#include "codec_internal.h"
#include "registry.h"
#include "misc.h"
#include "os.h"
@@ -75,7 +76,7 @@ int vorbis_synthesis(vorbis_block *vb,ogg_packet *op){
long vorbis_packet_blocksize(vorbis_info *vi,ogg_packet *op){
codec_setup_info *ci=vi->codec_setup;
oggpack_buffer opb;
- int type,mode,i;
+ int mode;
oggpack_readinit(&opb,op->packet,op->bytes);
diff --git a/lib/time0.c b/lib/time0.c
index b2db6dc1..7ef9d657 100644
--- a/lib/time0.c
+++ b/lib/time0.c
@@ -11,13 +11,14 @@
********************************************************************
function: time backend 0 (dummy)
- last mod: $Id: time0.c,v 1.9 2001/02/26 03:50:43 xiphmont Exp $
+ last mod: $Id: time0.c,v 1.10 2001/08/13 01:36:57 xiphmont Exp $
********************************************************************/
#include <stdlib.h>
#include <string.h>
#include "vorbis/codec.h"
+#include "codec_internal.h"
#include "registry.h"
#include "misc.h"
diff --git a/lib/vorbisenc.c b/lib/vorbisenc.c
index 52e06834..1e0dc5b8 100644
--- a/lib/vorbisenc.c
+++ b/lib/vorbisenc.c
@@ -11,7 +11,7 @@
********************************************************************
function: simple programmatic interface for encoder mode setup
- last mod: $Id: vorbisenc.c,v 1.7 2001/05/27 06:44:01 xiphmont Exp $
+ last mod: $Id: vorbisenc.c,v 1.8 2001/08/13 01:36:58 xiphmont Exp $
********************************************************************/
@@ -83,12 +83,22 @@ static void codec_setup_partialcopy(codec_setup_info *ci,
}
-/* right now, this just encapsultes the old modes behind the interface
- we'll be using from here on out. After beta 3, the new bitrate
- tracking/modding/tuning engine will lurk inside */
/* encoders will need to use vorbis_info_init beforehand and call
vorbis_info clear when all done */
+int vorbis_encode_init_vbr(vorbis_info *vi,
+ long channels,
+ long rate,
+
+ float base_quality /* 0. to 1. */
+ ){
+
+
+
+
+}
+
+
int vorbis_encode_init(vorbis_info *vi,
long channels,
long rate,
@@ -114,8 +124,12 @@ int vorbis_encode_init(vorbis_info *vi,
/* copy a mode into our allocated storage */
bpch=nominal_bitrate/channels;
+
+ mode=&info_44c_Z;
+
+#if 0
if(bpch<60000){
- /* mode A */
+ /* mode AA */
mode=&info_AA;
}else if(bpch<75000){
/* mode A */
@@ -133,6 +147,7 @@ int vorbis_encode_init(vorbis_info *vi,
/* mode E */
mode=&info_E;
}
+#endif
/* now we have to deepcopy */
codec_setup_partialcopy(ci,mode);