mono modes
authorMonty <xiphmont@xiph.org>
Mon, 13 Aug 2001 11:30:59 +0000 (11:30 +0000)
committerMonty <xiphmont@xiph.org>
Mon, 13 Aug 2001 11:30:59 +0000 (11:30 +0000)
svn path=/trunk/vorbis/; revision=1878

20 files changed:
lib/modes/mode_22c_Z.h [new file with mode: 0644]
lib/modes/mode_32c_Z.h [new file with mode: 0644]
lib/modes/mode_44_A.h [new file with mode: 0644]
lib/modes/mode_44_B.h [new file with mode: 0644]
lib/modes/mode_44_C.h [new file with mode: 0644]
lib/modes/mode_44_X.h [new file with mode: 0644]
lib/modes/mode_44_Y.h [new file with mode: 0644]
lib/modes/mode_44_Z.h [new file with mode: 0644]
lib/modes/mode_44c_C.h
lib/modes/mode_44c_D.h
lib/modes/mode_A.h [deleted file]
lib/modes/mode_AA.h [deleted file]
lib/modes/mode_B.h [deleted file]
lib/modes/mode_C.h [deleted file]
lib/modes/mode_D.h [deleted file]
lib/modes/mode_E.h [deleted file]
lib/modes/mode_Za.h [deleted file]
lib/modes/mode_Zb.h [deleted file]
lib/modes/mode_Zc.h [deleted file]
lib/modes/modes.h

diff --git a/lib/modes/mode_22c_Z.h b/lib/modes/mode_22c_Z.h
new file mode 100644 (file)
index 0000000..c29f24e
--- /dev/null
@@ -0,0 +1,321 @@
+/********************************************************************
+ *                                                                  *
+ * 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; 22kHz stereo ~32kbps true VBR
+ last mod: $Id: mode_22c_Z.h,v 1.1 2001/08/13 11:30:59 xiphmont Exp $
+
+ ********************************************************************/
+
+#ifndef _V_MODES_22c_Z_H_
+#define _V_MODES_22c_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_22c_Z_128aux.vqh"
+#include "books/res_22c_Z_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_22c_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_22c_Z0[]={
+  {1.f,1.f,
+    {{48,    0,0,       0,0,      0,0},
+     {9999,  0,0,   7.5f,12,  7.5f,0}}
+  },
+};
+
+static vp_couple_pass _psy_pass_22c_Z[]={
+  {1.f,1.f,
+    {{384,   0,0,       0,0,      0,0},
+     {9999,  0,0,   7.5f,12,  7.5f,0}}
+  }
+};
+
+static vorbis_info_psy _psy_set_22c_Z0={
+  ATH_Bark_dB_lineaggressive,
+  -90.,-110.,
+
+  /* tonemaskp */
+  -99.f, -24.f,&_vp_tonemask_consbass_Z,
+  /* peakattp, curvelimitp */
+  0, 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,-20, -26,-25,-25,-25,-25,-25, -26,-27,-20,-20},
+  //{-20,-20,-20,-20,-20,-10,-10, -5,  3,  3,  5,  5,  5,  6,  7, 10,  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_22c_Z0
+};
+
+static vorbis_info_psy _psy_set_22c_ZT={
+  ATH_Bark_dB_lineaggressive,
+  -90.f,-110.f,
+
+  /* tonemask */
+  -99.f,-20.f,&_vp_tonemask_consbass_Z,
+  /* peakattp,curvelimitp */
+  0, 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, -26,-25,-25,-25,-25,-25, -26,-27,-20,-20},
+  //{-20,-20,-20,-20,-20,-10,-10, -6,  5,  5,  5,  5,  5,   6,  7, 10, 10},
+  //{1.f,1.f,1.f,1.f,1.f,1.f,.8f,.8f,.8f,.8f,.8f,.8f,.8f,.88f,.89f,.9f,.9f},
+
+  //{-20,-20,-20,-20,-20,-20,-20,-6,  -3, -3,  0,  0,  0,   3,  5, 10, 10},
+  //{-20,-20,-15,-15,-15,-15,-10,-3,  -3, 0,  0,  0,  2,   4,  6, 10, 10},
+  {1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f},
+
+
+  95.f,  /* even decade + 5 is important; saves an rint() later in a
+            tight loop) */
+  1,_psy_pass_22c_Z
+};
+
+static vorbis_info_psy _psy_set_22c_Z={
+  ATH_Bark_dB_lineaggressive,
+  -90.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 */
+      4,4,60,
+
+  /*63     125     250     500      1k      2k      4k       8k     16k*/
+  {-20,-20,-15,-15,-15,-15,-10, 3,  3,  3,  3,  3,  3,   4,  4, 10, 10},
+  {1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f,1.f},
+
+  95.f,  /* even decade + 5 is important; saves an rint() later in a
+            tight loop) */
+  1,_psy_pass_22c_Z
+};
+
+static vorbis_info_time0 _time_set_22c_Z={0};
+
+static vorbis_info_floor1 _floor_set_22c_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,
+  128};
+
+static vorbis_info_floor1 _floor_set_22c_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,
+  1024};
+
+static vorbis_info_residue0 _residue_set_22c_Z0={
+  0,256, 16, 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, 8, 8, 8, 99,99, 99, 99, 99},
+  {3}};
+
+static vorbis_info_residue0 _residue_set_22c_Z={
+  0,2048, 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, 24, 24, 24, 99,99, 99, 99, 99},
+  {3}};
+
+static vorbis_info_mapping0 _mapping_set_22c_Z0={
+  1, {0,0}, {0}, {0}, {0}, {0,0}, 1,{0},{1}};
+static vorbis_info_mapping0 _mapping_set_22c_Z={
+  1, {0,0}, {0}, {1}, {1}, {1,2}, 1,{0},{1}};
+
+static vorbis_info_mode _mode_set_22c_Z0={0,0,0,0};
+static vorbis_info_mode _mode_set_22c_Z={1,0,0,1};
+
+codec_setup_info info_22c_Z={
+
+  /* smallblock, largeblock */
+  {256, 2048}, 
+  /* modes,maps,times,floors,residues,books,psys */
+  2,          2,    1,     2,       2,   36,   3,
+  /* modes */
+  {&_mode_set_22c_Z0,&_mode_set_22c_Z},
+  /* maps */
+  {0,0},{&_mapping_set_22c_Z0,&_mapping_set_22c_Z},
+  /* times */
+  {0,0},{&_time_set_22c_Z},
+  /* floors */
+  {1,1},{&_floor_set_22c_Z0,&_floor_set_22c_Z},
+  /* residue */
+  {2,2},{&_residue_set_22c_Z0,&_residue_set_22c_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_22c_Z_128aux, 
+   &_huff_book_res_22c_Z_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_22c_Z0,&_psy_set_22c_ZT,&_psy_set_22c_Z},
+  &_psy_set_22c_ZG
+};
+
+#endif
diff --git a/lib/modes/mode_32c_Z.h b/lib/modes/mode_32c_Z.h
new file mode 100644 (file)
index 0000000..02c98db
--- /dev/null
@@ -0,0 +1,314 @@
+/********************************************************************
+ *                                                                  *
+ * 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; 32kHz stereo ~48kbps true VBR
+ last mod: $Id: mode_32c_Z.h,v 1.1 2001/08/13 11:30:59 xiphmont Exp $
+
+ ********************************************************************/
+
+#ifndef _V_MODES_32c_Z_H_
+#define _V_MODES_32c_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_32c_Z_128aux.vqh"
+#include "books/res_32c_Z_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_32c_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_32c_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_32c_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_32c_Z0={
+  ATH_Bark_dB_lineaggressive,
+  -90.,-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_32c_Z0
+};
+
+static vorbis_info_psy _psy_set_32c_ZT={
+  ATH_Bark_dB_lineaggressive,
+  -90.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_32c_Z
+};
+
+static vorbis_info_psy _psy_set_32c_Z={
+  ATH_Bark_dB_lineaggressive,
+  -90.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_32c_Z
+};
+
+static vorbis_info_time0 _time_set_32c_Z={0};
+
+static vorbis_info_floor1 _floor_set_32c_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,
+  108};
+
+static vorbis_info_floor1 _floor_set_32c_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,
+  864};
+
+static vorbis_info_residue0 _residue_set_32c_Z0={
+  0,216, 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_32c_Z={
+  0,1728, 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_32c_Z0={
+  1, {0,0}, {0}, {0}, {0}, {0,0}, 1,{0},{1}};
+static vorbis_info_mapping0 _mapping_set_32c_Z={
+  1, {0,0}, {0}, {1}, {1}, {1,2}, 1,{0},{1}};
+
+static vorbis_info_mode _mode_set_32c_Z0={0,0,0,0};
+static vorbis_info_mode _mode_set_32c_Z={1,0,0,1};
+
+codec_setup_info info_32c_Z={
+
+  /* smallblock, largeblock */
+  {256, 2048}, 
+  /* modes,maps,times,floors,residues,books,psys */
+  2,          2,    1,     2,       2,   36,   3,
+  /* modes */
+  {&_mode_set_32c_Z0,&_mode_set_32c_Z},
+  /* maps */
+  {0,0},{&_mapping_set_32c_Z0,&_mapping_set_32c_Z},
+  /* times */
+  {0,0},{&_time_set_32c_Z},
+  /* floors */
+  {1,1},{&_floor_set_32c_Z0,&_floor_set_32c_Z},
+  /* residue */
+  {2,2},{&_residue_set_32c_Z0,&_residue_set_32c_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_32c_Z_128aux, 
+   &_huff_book_res_32c_Z_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_32c_Z0,&_psy_set_32c_ZT,&_psy_set_32c_Z},
+  &_psy_set_32c_ZG
+};
+
+#endif
diff --git a/lib/modes/mode_44_A.h b/lib/modes/mode_44_A.h
new file mode 100644 (file)
index 0000000..170a365
--- /dev/null
@@ -0,0 +1,298 @@
+/********************************************************************
+ *                                                                  *
+ * 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_44_A.h,v 1.1 2001/08/13 11:30:59 xiphmont Exp $
+
+ ********************************************************************/
+
+#ifndef _V_MODES_44_A_H_
+#define _V_MODES_44_A_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_44_Y_128aux.vqh"
+#include "books/res_44_Y_1024aux.vqh"
+
+#include "books/res_Z_1.vqh"
+#include "books/res_Z_2.vqh"
+#include "books/res_Z_3.vqh"
+#include "books/res_Z_4.vqh"
+#include "books/res_Z_5.vqh"
+#include "books/res_Z_6.vqh"
+#include "books/res_Z_6a.vqh"
+#include "books/res_Z_6b.vqh"
+
+#include "maskadj_A.h"
+
+static vorbis_info_psy_global _psy_set_44_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_pass_44_A[]={
+  {1.f,1.f, {0}}
+};
+
+static vorbis_info_psy _psy_set_44_A0={
+  ATH_Bark_dB_lineaggressive,
+  -100.,-140.,
+
+  /* tonemaskp */
+  0.f, -24.f,&_vp_tonemask_consbass_Z,
+  /* peakattp, curvelimitp */
+  1, 4, &_vp_peakatt_A,
+
+  /*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*/
+  {-30,-30,-30,-30,-30,-30,-20,-10,  0,  0,  0,  0,  0,  1,  1,  2,  3},
+  {.9f,.9f,.9f,.9f,.9f,.8f,.8f,.6f,.6f,.6f,.6f,.6f,.7f,.8f,.89f,.9f,.9f},
+
+  105.f,  /* even decade + 5 is important; saves an rint() later in a
+            tight loop) */
+  1,
+  _psy_pass_44_A
+};
+
+static vorbis_info_psy _psy_set_44_AT={
+  ATH_Bark_dB_lineaggressive,
+  -100.f,-140.f,
+
+  /* tonemask */
+  0.f,-24.f,&_vp_tonemask_consbass_Z,
+  /* peakattp,curvelimitp */
+  1, 4,  &_vp_peakatt_A,
+
+  /*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*/
+  {-30,-30,-30,-30,-30,-30,-30,-20,  0,  0,  0,  0,  0,   0,  0,  1,  2},
+  {.7f,.7f,.7f,.7f,.7f,.6f,.5f,.5f,.5f,.5f,.5f,.5f,.7f,.75f,.8f,.8f,.85f},
+
+  105.f,  /* even decade + 5 is important; saves an rint() later in a
+            tight loop) */
+  1,_psy_pass_44_A
+};
+
+static vorbis_info_psy _psy_set_44_A={
+  ATH_Bark_dB_lineaggressive,
+  -100.f,  -140.f,
+
+  /* tonemask */
+  0.f,-24.f,&_vp_tonemask_Z,
+  /* peakattp, curvelimitp */
+  1, 4, &_vp_peakatt_A,
+
+  /*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,  0,  0,  0,  0,  0,   0,  0,  1,  2},
+  {.6f,.6f,.6f,.6f,.6f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.7f,.75f,.8f,.8f,.85f},
+
+  105.f,  /* even decade + 5 is important; saves an rint() later in a
+            tight loop) */
+  1,_psy_pass_44_A
+};
+
+static vorbis_info_time0 _time_set_44_A={0};
+
+static vorbis_info_floor1 _floor_set_44_A0={
+  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,
+  120};
+
+static vorbis_info_floor1 _floor_set_44_A={
+  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,
+  960};
+
+static vorbis_info_residue0 _residue_set_44_A0={
+  0,120, 12, 7,23,
+  {0,1,1,1,1,1,7},
+  {25, 26, 27, 28, 29, 30, 31, 32},
+  {9999, 3,9999, 9999, 9999, 9999, 9999},
+  {.5, 1.5f,1.5, 2.5, 7.5, 22.5f},
+  {0},
+  {99, 99,99, 99, 99, 99},
+  {3}};
+
+static vorbis_info_residue0 _residue_set_44_A={
+  0,960, 32, 7,24,
+  {0,1,1,1,1,1,7},
+  {25, 26, 27, 28, 29, 30, 31, 32},
+  {9999, 4,9999, 9999, 9999, 9999, 9999},
+  {.5, 1.5f,1.5, 2.5, 7.5, 22.5f},
+  {0},
+  {99, 99,99, 99, 99, 99},
+  {3}};
+
+static vorbis_info_mapping0 _mapping_set_44_A0={
+  1, {0,0}, {0}, {0}, {0}, {0,0}, 0,{0},{0}};
+static vorbis_info_mapping0 _mapping_set_44_A={
+  1, {0,0}, {0}, {1}, {1}, {1,2}, 0,{0},{0}};
+
+static vorbis_info_mode _mode_set_44_A0={0,0,0,0};
+static vorbis_info_mode _mode_set_44_A={1,0,0,1};
+
+codec_setup_info info_44_A={
+
+  /* smallblock, largeblock */
+  {256, 2048}, 
+  /* modes,maps,times,floors,residues,books,psys */
+  2,          2,    1,     2,       2,   33,   3,
+  /* modes */
+  {&_mode_set_44_A0,&_mode_set_44_A},
+  /* maps */
+  {0,0},{&_mapping_set_44_A0,&_mapping_set_44_A},
+  /* times */
+  {0,0},{&_time_set_44_A},
+  /* floors */
+  {1,1},{&_floor_set_44_A0,&_floor_set_44_A},
+  /* residue */
+  {0,0},{&_residue_set_44_A0,&_residue_set_44_A},
+  /* 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_44_Y_128aux, 
+   &_huff_book_res_44_Y_1024aux,
+
+   &_vq_book_res_Z_1,
+   &_vq_book_res_Z_2,
+   &_vq_book_res_Z_3,
+   &_vq_book_res_Z_4,
+   &_vq_book_res_Z_5,
+   &_vq_book_res_Z_6,
+   &_vq_book_res_Z_6a,
+   &_vq_book_res_Z_6b,
+
+  },
+  /* psy */
+  {&_psy_set_44_A0,&_psy_set_44_AT,&_psy_set_44_A},
+  &_psy_set_44_AG
+};
+
+#endif
diff --git a/lib/modes/mode_44_B.h b/lib/modes/mode_44_B.h
new file mode 100644 (file)
index 0000000..989c671
--- /dev/null
@@ -0,0 +1,300 @@
+/********************************************************************
+ *                                                                  *
+ * 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_44_B.h,v 1.1 2001/08/13 11:30:59 xiphmont Exp $
+
+ ********************************************************************/
+
+#ifndef _V_MODES_44_B_H_
+#define _V_MODES_44_B_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_44_B_128aux.vqh"
+#include "books/res_44_B_1024aux.vqh"
+
+#include "books/res_B_1.vqh"
+#include "books/res_B_2.vqh"
+#include "books/res_B_3.vqh"
+#include "books/res_B_4.vqh"
+#include "books/res_B_5.vqh"
+#include "books/res_B_5a.vqh"
+#include "books/res_B_6.vqh"
+#include "books/res_B_6a.vqh"
+#include "books/res_B_6b.vqh"
+
+#include "maskadj_A.h"
+
+static vorbis_info_psy_global _psy_set_44_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,
+};
+
+static struct vp_couple_pass _psy_pass_44_B[]={
+  {1.f,1.f, {0}}
+};
+
+static vorbis_info_psy _psy_set_44_B0={
+  ATH_Bark_dB_lineconservative,
+  -110.,-140.,
+
+  /* tonemaskp */
+  -3.f, -30.f,&_vp_tonemask_consbass_A,
+  /* peakattp, curvelimitp */
+  1, 30, &_vp_peakatt_D,
+
+  /*noisemaskp */
+  1,-30.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*/
+  {-30,-30,-30,-30,-30,-30,-20,-10, -6, -6, -6, -6,  0,  0,  0,  0,  0},
+  {.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.5f,.5f,.6f,.7f},
+
+  105.f,  /* even decade + 5 is important; saves an rint() later in a
+            tight loop) */
+  1,
+  _psy_pass_44_B
+};
+
+static vorbis_info_psy _psy_set_44_BT={
+  ATH_Bark_dB_lineconservative,
+  -110.f,-140.f,
+
+  /* tonemask */
+  -3.f,-30.f,&_vp_tonemask_consbass_A,
+  /* peakattp,curvelimitp */
+  1, 30,  &_vp_peakatt_D,
+
+  /*noisemaskp */
+  1,  -30.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*/
+  {-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_pass_44_B
+};
+
+static vorbis_info_psy _psy_set_44_B={
+  ATH_Bark_dB_lineconservative,
+  -110.f,  -140.f,
+
+  /* tonemask */
+  -3.f,-30.f,&_vp_tonemask_A,
+  /* peakattp, curvelimitp */
+  1, 30, &_vp_peakatt_D,
+
+  /*noisemaskp */
+  1,  -30.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*/
+  {-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_pass_44_B
+};
+
+static vorbis_info_time0 _time_set_44_B={0};
+
+static vorbis_info_floor1 _floor_set_44_B0={
+  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,
+  128};
+
+static vorbis_info_floor1 _floor_set_44_B={
+  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,
+  1024};
+
+static vorbis_info_residue0 _residue_set_44_B0={
+  0,128, 16, 7,23,
+  {0,1,1,1,1,3,7},
+  {25, 26, 27, 28, 29, 30, 31, 32, 33},
+  {9999, 9999 ,9999, 9999, 9999, 9999, 9999},
+  {.5, 1.5, 2.5, 4.5, 16.5, 84.5f},
+  {0},
+  {99, 99,99, 99, 99, 99},
+  {3}};
+
+static vorbis_info_residue0 _residue_set_44_B={
+  0,1024, 32, 7,24,
+  {0,1,1,1,1,3,7},
+  {25, 26, 27, 28, 29, 30, 31, 32, 33},
+  {9999, 9999 ,9999, 9999, 9999, 9999, 9999},
+  {.5, 1.5, 2.5, 4.5, 16.5, 84.5f},
+  {0},
+  {99, 99,99, 99, 99, 99},
+  {3}};
+
+static vorbis_info_mapping0 _mapping_set_44_B0={
+  1, {0,0}, {0}, {0}, {0}, {0,0}, 0,{0},{0}};
+static vorbis_info_mapping0 _mapping_set_44_B={
+  1, {0,0}, {0}, {1}, {1}, {1,2}, 0,{0},{0}};
+
+static vorbis_info_mode _mode_set_44_B0={0,0,0,0};
+static vorbis_info_mode _mode_set_44_B={1,0,0,1};
+
+codec_setup_info info_44_B={
+
+  /* smallblock, largeblock */
+  {256, 2048}, 
+  /* modes,maps,times,floors,residues,books,psys */
+  2,          2,    1,     2,       2,   34,   3,
+  /* modes */
+  {&_mode_set_44_B0,&_mode_set_44_B},
+  /* maps */
+  {0,0},{&_mapping_set_44_B0,&_mapping_set_44_B},
+  /* times */
+  {0,0},{&_time_set_44_B},
+  /* floors */
+  {1,1},{&_floor_set_44_B0,&_floor_set_44_B},
+  /* residue */
+  {0,0},{&_residue_set_44_B0,&_residue_set_44_B},
+  /* 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_44_B_128aux, 
+   &_huff_book_res_44_B_1024aux,
+
+   &_vq_book_res_B_1,
+   &_vq_book_res_B_2,
+   &_vq_book_res_B_3,
+   &_vq_book_res_B_4,
+   &_vq_book_res_B_5,
+   &_vq_book_res_B_5a,
+   &_vq_book_res_B_6,
+   &_vq_book_res_B_6a,
+   &_vq_book_res_B_6b,
+
+  },
+  /* psy */
+  {&_psy_set_44_B0,&_psy_set_44_BT,&_psy_set_44_B},
+  &_psy_set_44_BG
+};
+
+#endif
diff --git a/lib/modes/mode_44_C.h b/lib/modes/mode_44_C.h
new file mode 100644 (file)
index 0000000..1c946c9
--- /dev/null
@@ -0,0 +1,300 @@
+/********************************************************************
+ *                                                                  *
+ * 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_44_C.h,v 1.1 2001/08/13 11:30:59 xiphmont Exp $
+
+ ********************************************************************/
+
+#ifndef _V_MODES_44_C_H_
+#define _V_MODES_44_C_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_44_B_128aux.vqh"
+#include "books/res_44_B_1024aux.vqh"
+
+#include "books/res_B_1.vqh"
+#include "books/res_B_2.vqh"
+#include "books/res_B_3.vqh"
+#include "books/res_B_4.vqh"
+#include "books/res_B_5.vqh"
+#include "books/res_B_5a.vqh"
+#include "books/res_B_6.vqh"
+#include "books/res_B_6a.vqh"
+#include "books/res_B_6b.vqh"
+
+#include "maskadj_A.h"
+
+static vorbis_info_psy_global _psy_set_44_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,
+};
+
+static struct vp_couple_pass _psy_pass_44_C[]={
+  {1.f,1.f, {0}}
+};
+
+static vorbis_info_psy _psy_set_44_C0={
+  ATH_Bark_dB_lineconservative,
+  -110.,-140.,
+
+  /* tonemaskp */
+  -3.f, -40.f,&_vp_tonemask_E,
+  /* peakattp, curvelimitp */
+  1, 30, &_vp_peakatt_D,
+
+  /*noisemaskp */
+  1,-40.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*/
+  {-30,-30,-30,-30,-30,-30,-20,-10, -6, -6, -6, -6,  0,  0,  0,  0,  0},
+  {.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.4f,.5f,.6f},
+
+  105.f,  /* even decade + 5 is important; saves an rint() later in a
+            tight loop) */
+  1,
+  _psy_pass_44_C
+};
+
+static vorbis_info_psy _psy_set_44_CT={
+  ATH_Bark_dB_lineconservative,
+  -110.f,-140.f,
+
+  /* tonemask */
+  -3.f,-40.f,&_vp_tonemask_E,
+  /* peakattp,curvelimitp */
+  1, 30,  &_vp_peakatt_D,
+
+  /*noisemaskp */
+  1,  -40.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*/
+  {-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,.4f,.4f,.5f,.5f},
+
+  105.f,  /* even decade + 5 is important; saves an rint() later in a
+            tight loop) */
+  1,_psy_pass_44_C
+};
+
+static vorbis_info_psy _psy_set_44_C={
+  ATH_Bark_dB_lineconservative,
+  -110.f,  -140.f,
+
+  /* tonemask */
+  -3.f,-40.f,&_vp_tonemask_E,
+  /* peakattp, curvelimitp */
+  1, 30, &_vp_peakatt_D,
+
+  /*noisemaskp */
+  1,  -40.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*/
+  {-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,.4f,.4f,.5f,.5f},
+
+  105.f,  /* even decade + 5 is important; saves an rint() later in a
+            tight loop) */
+  1,_psy_pass_44_C
+};
+
+static vorbis_info_time0 _time_set_44_C={0};
+
+static vorbis_info_floor1 _floor_set_44_C0={
+  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,
+  128};
+
+static vorbis_info_floor1 _floor_set_44_C={
+  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,
+  1024};
+
+static vorbis_info_residue0 _residue_set_44_C0={
+  0,128, 16, 7,23,
+  {0,1,1,1,1,3,7},
+  {25, 26, 27, 28, 29, 30, 31, 32, 33},
+  {9999, 9999 ,9999, 9999, 9999, 9999, 9999},
+  {.5, 1.5, 2.5, 4.5, 16.5, 84.5f},
+  {0},
+  {99, 99,99, 99, 99, 99},
+  {3}};
+
+static vorbis_info_residue0 _residue_set_44_C={
+  0,1024, 32, 7,24,
+  {0,1,1,1,1,3,7},
+  {25, 26, 27, 28, 29, 30, 31, 32, 33},
+  {9999, 9999 ,9999, 9999, 9999, 9999, 9999},
+  {.5, 1.5, 2.5, 4.5, 16.5, 84.5f},
+  {0},
+  {99, 99,99, 99, 99, 99},
+  {3}};
+
+static vorbis_info_mapping0 _mapping_set_44_C0={
+  1, {0,0}, {0}, {0}, {0}, {0,0}, 0,{0},{0}};
+static vorbis_info_mapping0 _mapping_set_44_C={
+  1, {0,0}, {0}, {1}, {1}, {1,2}, 0,{0},{0}};
+
+static vorbis_info_mode _mode_set_44_C0={0,0,0,0};
+static vorbis_info_mode _mode_set_44_C={1,0,0,1};
+
+codec_setup_info info_44_C={
+
+  /* smallblock, largeblock */
+  {256, 2048}, 
+  /* modes,maps,times,floors,residues,books,psys */
+  2,          2,    1,     2,       2,   34,   3,
+  /* modes */
+  {&_mode_set_44_C0,&_mode_set_44_C},
+  /* maps */
+  {0,0},{&_mapping_set_44_C0,&_mapping_set_44_C},
+  /* times */
+  {0,0},{&_time_set_44_C},
+  /* floors */
+  {1,1},{&_floor_set_44_C0,&_floor_set_44_C},
+  /* residue */
+  {0,0},{&_residue_set_44_C0,&_residue_set_44_C},
+  /* 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_44_B_128aux, 
+   &_huff_book_res_44_B_1024aux,
+
+   &_vq_book_res_B_1,
+   &_vq_book_res_B_2,
+   &_vq_book_res_B_3,
+   &_vq_book_res_B_4,
+   &_vq_book_res_B_5,
+   &_vq_book_res_B_5a,
+   &_vq_book_res_B_6,
+   &_vq_book_res_B_6a,
+   &_vq_book_res_B_6b,
+
+  },
+  /* psy */
+  {&_psy_set_44_C0,&_psy_set_44_CT,&_psy_set_44_C},
+  &_psy_set_44_CG
+};
+
+#endif
diff --git a/lib/modes/mode_44_X.h b/lib/modes/mode_44_X.h
new file mode 100644 (file)
index 0000000..81cc208
--- /dev/null
@@ -0,0 +1,298 @@
+/********************************************************************
+ *                                                                  *
+ * 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_44_X.h,v 1.1 2001/08/13 11:30:59 xiphmont Exp $
+
+ ********************************************************************/
+
+#ifndef _V_MODES_44_X_H_
+#define _V_MODES_44_X_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_44_Y_128aux.vqh"
+#include "books/res_44_Y_1024aux.vqh"
+
+#include "books/res_Z_1.vqh"
+#include "books/res_Z_2.vqh"
+#include "books/res_Z_3.vqh"
+#include "books/res_Z_4.vqh"
+#include "books/res_Z_5.vqh"
+#include "books/res_Z_6.vqh"
+#include "books/res_Z_6a.vqh"
+#include "books/res_Z_6b.vqh"
+
+#include "maskadj_Z.h"
+
+static vorbis_info_psy_global _psy_set_44_XG={
+  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_44_X[]={
+  {1.f,1.f, {0}}
+};
+
+static vorbis_info_psy _psy_set_44_X0={
+  ATH_Bark_dB_lineaggressive,
+  -100.,-120.,
+
+  /* tonemaskp */
+  0.f, -24.f,&_vp_tonemask_consbass_Z,
+  /* peakattp, curvelimitp */
+  1, 0, &_vp_peakatt_X,
+
+  /*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*/
+  {-30,-30,-30,-30,-30,-30,-15, -15,  0, 0, 0, 0,  0,  0,  1,  2,  3},
+  {1.f,1.f,1.f,1.f,1.f,1.f,.8f,.7f,.7f,.7f,.7f,.7f,.75f,.8f,.8f,.85f,.9f},
+
+  95.f,  /* even decade + 5 is important; saves an rint() later in a
+            tight loop) */
+  1,
+  _psy_pass_44_X
+};
+
+static vorbis_info_psy _psy_set_44_XT={
+  ATH_Bark_dB_lineaggressive,
+  -100.f,-120.f,
+
+  /* tonemask */
+  0.f,-20.f,&_vp_tonemask_consbass_Z,
+  /* peakattp,curvelimitp */
+  1, 0,  &_vp_peakatt_X,
+
+  /*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,  0,  0,  0,  0,   0,  0,  0, 0},
+  {1.f,1.f,1.f,1.f,1.f,1.f,.8f,.7f,.7f,.7f,.7f,.7f,.75f,.8f,.8f,.85f,.9f},
+
+  95.f,  /* even decade + 5 is important; saves an rint() later in a
+            tight loop) */
+  1,_psy_pass_44_X
+};
+
+static vorbis_info_psy _psy_set_44_X={
+  ATH_Bark_dB_lineaggressive,
+  -100.f,  -120.f,
+
+  /* tonemask */
+  0.f,-20.f,&_vp_tonemask_Z,
+  /* peakattp, curvelimitp */
+  1, 0, &_vp_peakatt_X,
+
+  /*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,  0,  0,  0,  0,   0,  0,  0, 0},
+  {1.f,1.f,1.f,1.f,1.f,1.f,.8f,.7f,.7f,.7f,.7f,.7f,.75f,.8f,.8f,.85f,.9f},
+
+  95.f,  /* even decade + 5 is important; saves an rint() later in a
+            tight loop) */
+  1,_psy_pass_44_X
+};
+
+static vorbis_info_time0 _time_set_44_X={0};
+
+static vorbis_info_floor1 _floor_set_44_X0={
+  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,
+  96};
+
+static vorbis_info_floor1 _floor_set_44_X={
+  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,
+  768};
+
+static vorbis_info_residue0 _residue_set_44_X0={
+  0,96, 12, 7,23,
+  {0,1,1,1,1,1,7},
+  {25, 26, 27, 28, 29, 30, 31, 32},
+  {9999, 3,9999, 9999, 9999, 9999, 9999},
+  {.5, 1.5f,1.5, 2.5, 7.5, 22.5f},
+  {0},
+  {99, 99,99, 99, 99, 99},
+  {3}};
+
+static vorbis_info_residue0 _residue_set_44_X={
+  0,768, 32, 7,24,
+  {0,1,1,1,1,1,7},
+  {25, 26, 27, 28, 29, 30, 31, 32},
+  {9999, 4,9999, 9999, 9999, 9999, 9999},
+  {.5, 1.5f,1.5, 2.5, 7.5, 22.5f},
+  {0},
+  {99, 99,99, 99, 99, 99},
+  {3}};
+
+static vorbis_info_mapping0 _mapping_set_44_X0={
+  1, {0,0}, {0}, {0}, {0}, {0,0}, 0,{0},{0}};
+static vorbis_info_mapping0 _mapping_set_44_X={
+  1, {0,0}, {0}, {1}, {1}, {1,2}, 0,{0},{0}};
+
+static vorbis_info_mode _mode_set_44_X0={0,0,0,0};
+static vorbis_info_mode _mode_set_44_X={1,0,0,1};
+
+codec_setup_info info_44_X={
+
+  /* smallblock, largeblock */
+  {256, 2048}, 
+  /* modes,maps,times,floors,residues,books,psys */
+  2,          2,    1,     2,       2,   33,   3,
+  /* modes */
+  {&_mode_set_44_X0,&_mode_set_44_X},
+  /* maps */
+  {0,0},{&_mapping_set_44_X0,&_mapping_set_44_X},
+  /* times */
+  {0,0},{&_time_set_44_X},
+  /* floors */
+  {1,1},{&_floor_set_44_X0,&_floor_set_44_X},
+  /* residue */
+  {0,0},{&_residue_set_44_X0,&_residue_set_44_X},
+  /* 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_44_Y_128aux, 
+   &_huff_book_res_44_Y_1024aux,
+
+   &_vq_book_res_Z_1,
+   &_vq_book_res_Z_2,
+   &_vq_book_res_Z_3,
+   &_vq_book_res_Z_4,
+   &_vq_book_res_Z_5,
+   &_vq_book_res_Z_6,
+   &_vq_book_res_Z_6a,
+   &_vq_book_res_Z_6b,
+
+  },
+  /* psy */
+  {&_psy_set_44_X0,&_psy_set_44_XT,&_psy_set_44_X},
+  &_psy_set_44_XG
+};
+
+#endif
diff --git a/lib/modes/mode_44_Y.h b/lib/modes/mode_44_Y.h
new file mode 100644 (file)
index 0000000..f2c4c50
--- /dev/null
@@ -0,0 +1,298 @@
+/********************************************************************
+ *                                                                  *
+ * 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_44_Y.h,v 1.1 2001/08/13 11:30:59 xiphmont Exp $
+
+ ********************************************************************/
+
+#ifndef _V_MODES_44_Y_H_
+#define _V_MODES_44_Y_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_44_Y_128aux.vqh"
+#include "books/res_44_Y_1024aux.vqh"
+
+#include "books/res_Z_1.vqh"
+#include "books/res_Z_2.vqh"
+#include "books/res_Z_3.vqh"
+#include "books/res_Z_4.vqh"
+#include "books/res_Z_5.vqh"
+#include "books/res_Z_6.vqh"
+#include "books/res_Z_6a.vqh"
+#include "books/res_Z_6b.vqh"
+
+#include "maskadj_Z.h"
+
+static vorbis_info_psy_global _psy_set_44_YG={
+  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_44_Y[]={
+  {1.f,1.f, {0}}
+};
+
+static vorbis_info_psy _psy_set_44_Y0={
+  ATH_Bark_dB_lineaggressive,
+  -100.,-110.,
+
+  /* tonemaskp */
+  0.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,  0,  0,  1,  1,  2,  2,  2,  2,  4},
+  {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_44_Y
+};
+
+static vorbis_info_psy _psy_set_44_YT={
+  ATH_Bark_dB_lineaggressive,
+  -100.f,-110.f,
+
+  /* tonemask */
+  0.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,  2,  2,  2,  2,  3,   3,  3,  4, 6},
+  {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_44_Y
+};
+
+static vorbis_info_psy _psy_set_44_Y={
+  ATH_Bark_dB_lineaggressive,
+  -100.f,  -110.f,
+
+  /* tonemask */
+  0.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,  0,  0,  1,  1,  2,   2,  2,  2, 6},
+  {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_44_Y
+};
+
+static vorbis_info_time0 _time_set_44_Y={0};
+
+static vorbis_info_floor1 _floor_set_44_Y0={
+  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,
+  96};
+
+static vorbis_info_floor1 _floor_set_44_Y={
+  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,
+  768};
+
+static vorbis_info_residue0 _residue_set_44_Y0={
+  0,96, 12, 7,23,
+  {0,1,1,1,1,1,7},
+  {25, 26, 27, 28, 29, 30, 31, 32},
+  {9999, 3,9999, 9999, 9999, 9999, 9999},
+  {.5, 1.5f,1.5, 2.5, 7.5, 22.5f},
+  {0},
+  {99, 99,99, 99, 99, 99},
+  {3}};
+
+static vorbis_info_residue0 _residue_set_44_Y={
+  0,768, 32, 7,24,
+  {0,1,1,1,1,1,7},
+  {25, 26, 27, 28, 29, 30, 31, 32},
+  {9999, 4,9999, 9999, 9999, 9999, 9999},
+  {.5, 1.5f,1.5, 2.5, 7.5, 22.5f},
+  {0},
+  {99, 99,99, 99, 99, 99},
+  {3}};
+
+static vorbis_info_mapping0 _mapping_set_44_Y0={
+  1, {0,0}, {0}, {0}, {0}, {0,0}, 0,{0},{0}};
+static vorbis_info_mapping0 _mapping_set_44_Y={
+  1, {0,0}, {0}, {1}, {1}, {1,2}, 0,{0},{0}};
+
+static vorbis_info_mode _mode_set_44_Y0={0,0,0,0};
+static vorbis_info_mode _mode_set_44_Y={1,0,0,1};
+
+codec_setup_info info_44_Y={
+
+  /* smallblock, largeblock */
+  {256, 2048}, 
+  /* modes,maps,times,floors,residues,books,psys */
+  2,          2,    1,     2,       2,   33,   3,
+  /* modes */
+  {&_mode_set_44_Y0,&_mode_set_44_Y},
+  /* maps */
+  {0,0},{&_mapping_set_44_Y0,&_mapping_set_44_Y},
+  /* times */
+  {0,0},{&_time_set_44_Y},
+  /* floors */
+  {1,1},{&_floor_set_44_Y0,&_floor_set_44_Y},
+  /* residue */
+  {0,0},{&_residue_set_44_Y0,&_residue_set_44_Y},
+  /* 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_44_Y_128aux, 
+   &_huff_book_res_44_Y_1024aux,
+
+   &_vq_book_res_Z_1,
+   &_vq_book_res_Z_2,
+   &_vq_book_res_Z_3,
+   &_vq_book_res_Z_4,
+   &_vq_book_res_Z_5,
+   &_vq_book_res_Z_6,
+   &_vq_book_res_Z_6a,
+   &_vq_book_res_Z_6b,
+
+  },
+  /* psy */
+  {&_psy_set_44_Y0,&_psy_set_44_YT,&_psy_set_44_Y},
+  &_psy_set_44_YG
+};
+
+#endif
diff --git a/lib/modes/mode_44_Z.h b/lib/modes/mode_44_Z.h
new file mode 100644 (file)
index 0000000..007fcd8
--- /dev/null
@@ -0,0 +1,298 @@
+/********************************************************************
+ *                                                                  *
+ * 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_44_Z.h,v 1.1 2001/08/13 11:30:59 xiphmont Exp $
+
+ ********************************************************************/
+
+#ifndef _V_MODES_44_Z_H_
+#define _V_MODES_44_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_44_Z_128aux.vqh"
+#include "books/res_44_Z_1024aux.vqh"
+
+#include "books/res_Z_1.vqh"
+#include "books/res_Z_2.vqh"
+#include "books/res_Z_3.vqh"
+#include "books/res_Z_4.vqh"
+#include "books/res_Z_5.vqh"
+#include "books/res_Z_6.vqh"
+#include "books/res_Z_6a.vqh"
+#include "books/res_Z_6b.vqh"
+
+#include "maskadj_Z.h"
+
+static vorbis_info_psy_global _psy_set_44_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_44_Z[]={
+  {1.f,1.f, {0}}
+};
+
+static vorbis_info_psy _psy_set_44_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_44_Z
+};
+
+static vorbis_info_psy _psy_set_44_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_44_Z
+};
+
+static vorbis_info_psy _psy_set_44_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_44_Z
+};
+
+static vorbis_info_time0 _time_set_44_Z={0};
+
+static vorbis_info_floor1 _floor_set_44_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_44_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,
+  704};
+
+static vorbis_info_residue0 _residue_set_44_Z0={
+  0,96, 12, 7,23,
+  {0,1,1,1,1,1,7},
+  {25, 26, 27, 28, 29, 30, 31, 32},
+  {9999, 3,9999, 9999, 9999, 9999, 9999},
+  {.5, 1.5f,1.5, 2.5, 7.5, 22.5f},
+  {0},
+  {99, 99,99, 99, 99, 99},
+  {3}};
+
+static vorbis_info_residue0 _residue_set_44_Z={
+  0,704, 32, 7,24,
+  {0,1,1,1,1,1,7},
+  {25, 26, 27, 28, 29, 30, 31, 32},
+  {9999, 4,9999, 9999, 9999, 9999, 9999},
+  {.5, 1.5f,1.5, 2.5, 7.5, 22.5f},
+  {0},
+  {99, 99,99, 99, 99, 99},
+  {3}};
+
+static vorbis_info_mapping0 _mapping_set_44_Z0={
+  1, {0,0}, {0}, {0}, {0}, {0,0}, 0,{0},{0}};
+static vorbis_info_mapping0 _mapping_set_44_Z={
+  1, {0,0}, {0}, {1}, {1}, {1,2}, 0,{0},{0}};
+
+static vorbis_info_mode _mode_set_44_Z0={0,0,0,0};
+static vorbis_info_mode _mode_set_44_Z={1,0,0,1};
+
+codec_setup_info info_44_Z={
+
+  /* smallblock, largeblock */
+  {256, 2048}, 
+  /* modes,maps,times,floors,residues,books,psys */
+  2,          2,    1,     2,       2,   33,   3,
+  /* modes */
+  {&_mode_set_44_Z0,&_mode_set_44_Z},
+  /* maps */
+  {0,0},{&_mapping_set_44_Z0,&_mapping_set_44_Z},
+  /* times */
+  {0,0},{&_time_set_44_Z},
+  /* floors */
+  {1,1},{&_floor_set_44_Z0,&_floor_set_44_Z},
+  /* residue */
+  {0,0},{&_residue_set_44_Z0,&_residue_set_44_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_44_Z_128aux, 
+   &_huff_book_res_44_Z_1024aux,
+
+   &_vq_book_res_Z_1,
+   &_vq_book_res_Z_2,
+   &_vq_book_res_Z_3,
+   &_vq_book_res_Z_4,
+   &_vq_book_res_Z_5,
+   &_vq_book_res_Z_6,
+   &_vq_book_res_Z_6a,
+   &_vq_book_res_Z_6b,
+
+  },
+  /* psy */
+  {&_psy_set_44_Z0,&_psy_set_44_ZT,&_psy_set_44_Z},
+  &_psy_set_44_ZG
+};
+
+#endif
index 675f6fb..b814ed1 100644 (file)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: predefined encoding modes; 44kHz stereo ~64kbps true VBR
- last mod: $Id: mode_44c_C.h,v 1.2 2001/08/13 08:38:30 xiphmont Exp $
+ last mod: $Id: mode_44c_C.h,v 1.3 2001/08/13 11:30:59 xiphmont Exp $
 
  ********************************************************************/
 
@@ -154,7 +154,7 @@ static vorbis_info_psy _psy_set_44c_C={
       10,10,100,
 
   /*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},
+  {-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
index 7c81378..b1bd61d 100644 (file)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: predefined encoding modes; 44kHz stereo ~64kbps true VBR
- last mod: $Id: mode_44c_D.h,v 1.1 2001/08/13 08:38:30 xiphmont Exp $
+ last mod: $Id: mode_44c_D.h,v 1.2 2001/08/13 11:30:59 xiphmont Exp $
 
  ********************************************************************/
 
@@ -146,7 +146,7 @@ static vorbis_info_psy _psy_set_44c_D={
       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},
+  {-30,-30,-30,-30,-30,-30,-20, -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},
 
   105.f,  /* even decade + 5 is important; saves an rint() later in a
diff --git a/lib/modes/mode_A.h b/lib/modes/mode_A.h
deleted file mode 100644 (file)
index ae6d6a1..0000000
+++ /dev/null
@@ -1,412 +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: predefined encoding modes
- last mod: $Id: mode_A.h,v 1.18 2001/08/13 07:43:15 xiphmont Exp $
-
- ********************************************************************/
-
-#ifndef _V_MODES_A_H_
-#define _V_MODES_A_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_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_lineaggressive,
-
-  -100.,
-  -140.,
-
-  /* tonemaskp */
-  0.f, -40.f,&_vp_tonemask_consbass_A,
-
-  /* peakattp */
-  1, &_vp_peakatt_A,
-
-  1,/*noisemaskp */
-  -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) */
-  1,
-  _psy_passA0
-};
-
-static vorbis_info_psy _psy_set_A={
-  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*/
-  {  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},
-
-  95.f,  /* even decade + 5 is important; saves an rint() later in a
-            tight loop) */
-  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_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,84.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,84.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};
-
-/* CD quality stereo, no channel coupling */
-codec_setup_info info_A={
-
-  /* smallblock, largeblock */
-  {256, 2048}, 
-  /* modes,maps,times,floors,residues,books,psys */
-  2,          2,    1,     2,       2,   38,   3,
-  /* modes */
-  {&_mode_set0A,&_mode_set1A},
-  /* maps */
-  {0,0},{&_mapping_set0A,&_mapping_set1A},
-  /* times */
-  {0,0},{&_time_set0A},
-  /* floors */
-  {1,1},{&_floor_set0A,&_floor_set1A},
-  /* residue */
-  {2,2},{&_residue_set0A,&_residue_set1A},
-  /* 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_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_AT,&_psy_set_A},
-  &_psy_set_AG
-};
-
-#endif
diff --git a/lib/modes/mode_AA.h b/lib/modes/mode_AA.h
deleted file mode 100644 (file)
index 3663b73..0000000
+++ /dev/null
@@ -1,313 +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: predefined encoding modes
- last mod: $Id: mode_AA.h,v 1.12 2001/06/18 09:07:32 xiphmont Exp $
-
- ********************************************************************/
-
-#ifndef _V_MODES_AA_H_
-#define _V_MODES_AA_H_
-
-#include <stdio.h>
-#include "vorbis/codec.h"
-#include "backends.h"
-
-#include "books/lsp9_0.vqh"
-#include "books/lsp30_0.vqh"
-#include "books/lsp9_1.vqh"
-#include "books/lsp30_1.vqh"
-
-#include "books/res0_96_128aux.vqh"
-#include "books/res0_96_1024aux.vqh"
-
-#include "books/res0_96_128_1.vqh"
-#include "books/res0_96_128_2.vqh"
-#include "books/res0_96_128_3.vqh"
-#include "books/res0_96_128_4.vqh"
-#include "books/res0_96_128_5.vqh"
-
-#include "books/res0_96_1024_1.vqh"
-#include "books/res0_96_1024_2.vqh"
-#include "books/res0_96_1024_3.vqh"
-#include "books/res0_96_1024_4.vqh"
-#include "books/res0_96_1024_5.vqh"
-#include "books/res0_96_1024_6.vqh"
-#include "books/res0_96_1024_7.vqh"
-#include "books/res0_96_1024_8.vqh"
-#include "books/res0_96_1024_9.vqh"
-
-
-static vorbis_info_psy _psy_set_AA0={
-  ATH_Bark_dB_lspconservative,
-  1,/*decayp*/
-
-  -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*/
-  },
-
-  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*/
-  },
-
-  1,/*noisemaskp */
-  -0.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, 2.f,/*11500*/
-   .900f, 3.f,/*16000*/
-  },
-  95.f,  /* even decade + 5 is important; saves an rint() later in a
-            tight loop) */
-  -22.,
-};
-
-static vorbis_info_psy _psy_set_AA={
-  ATH_Bark_dB_lspconservative,
-  1,/*decayp*/
-
-  -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*/
-
-   {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
-   {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
-   {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
-   {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
-   {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
-
-   {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
-   {-30.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*/
-   {-30.f,-35.f,-35.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*/
-
-   {-20.f,-25.f,-30.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
-   {-20.f,-25.f,-30.f,-35.f,-35.f,-45.f,-50.f,-60.f,-70.f,-80.f,-90.f}, /*11500*/
-   {-20.f,-24.f,-26.f,-32.f,-35.f,-45.f,-50.f,-60.f,-70.f,-80.f,-90.f}, /*16000*/
-
-  },
-
-  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,-16.f,-20.f,-22.f,-22.f,-22.f},/*700*/
-   {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.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,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-22.f,-22.f},/*2400*/
-   {-10.f,-10.f,-10.f,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-22.f,-22.f},/*4000*/
-   {-10.f,-10.f,-10.f,-12.f,-12.f,-14.f,-16.f,-18.f,-22.f,-22.f,-22.f},/*5600*/
-   {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-22.f,-22.f},/*8000*/
-   {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-22.f,-22.f},/*11500*/
-   {-10.f,-10.f,-10.f,-10.f,-10.f,-12.f,-16.f,-18.f,-22.f,-22.f,-22.f},/*16000*/
-  },
-
-  1,/*noisemaskp */
-  -0.f,  /* suppress any noise curve over maxspec+n */
-  .7f,   /* low window */
-  .7f,   /* 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) */
-  -22.,
-
-};
-
-/* with GNUisms, this could be short and readable. Oh well */
-static vorbis_info_time0 _time_set0AA={0};
-static vorbis_info_floor0 _floor_set0AA={9, 44100,  64, 10,130, 2, {0,1},
-                                        0.246f, .387f};
-static vorbis_info_floor0 _floor_set1AA={30, 44100, 256, 12,150, 2, {2,3}, 
-                                        .082f, .126f};
-static vorbis_info_residue0 _residue_set0AA={0,192,16,6,4,
-                                           {0,1,1,1,1,1},
-                                           {6,7,8,9,10},
-                                           
-                                           {0,7,9999,9999,9999},
-                                           {999.f,2.f,2.f,9.5f,26.f},
-                                           {4,4,4,4,4},
-                                           {99,99,99,99,99}};
-
-static vorbis_info_residue0 _residue_set1AA={0, 768, 32,10,5,
-                                           {0,1,1,1,1,1,1,1,1,1},
-                                           {11,12,13,14,15,16,17,18,19},
-                                          
-                                           {0,10,9999,16,9999,
-                                            26,9999,9999,9999},
-                                           {999.f,2.f,2.f,4.f,4.f,
-                                            9.5f,9.5f,18.f,37.f},
-                                           {5,5,5,5,5,5,5,5,5},
-                                           {99,99,99,99,99,99,99,99,99}};
-
-static vorbis_info_mapping0 _mapping_set0AA={1, {0,0}, {0}, {0}, {0}, {0}};
-static vorbis_info_mapping0 _mapping_set1AA={1, {0,0}, {0}, {1}, {1}, {1}};
-static vorbis_info_mode _mode_set0AA={0,0,0,0};
-static vorbis_info_mode _mode_set1AA={1,0,0,1};
-
-/* CD quality stereo, no channel coupling */
-codec_setup_info info_AA={
-
-  /* smallblock, largeblock */
-  {512, 2048}, 
-  /* modes,maps,times,floors,residues,books,psys */
-  2,          2,    1,     2,       2,   20,   2,
-  /* modes */
-  {&_mode_set0AA,&_mode_set1AA},
-  /* maps */
-  {0,0},{&_mapping_set0AA,&_mapping_set1AA},
-  /* times */
-  {0,0},{&_time_set0AA},
-  /* floors */
-  {0,0},{&_floor_set0AA,&_floor_set1AA},
-  /* residue */
-  {0,0},{&_residue_set0AA,&_residue_set1AA},
-  /* books */
-  {&_vq_book_lsp9_0,       /* 0 */
-   &_vq_book_lsp9_1,       /* 1 */
-   &_vq_book_lsp30_0,      /* 2 */
-   &_vq_book_lsp30_1,      /* 3 */
-
-   &_huff_book_res0_96_128aux,
-   &_huff_book_res0_96_1024aux,
-
-   &_vq_book_res0_96_128_1,
-   &_vq_book_res0_96_128_2,
-   &_vq_book_res0_96_128_3,
-   &_vq_book_res0_96_128_4,
-   &_vq_book_res0_96_128_5,
-
-   &_vq_book_res0_96_1024_1,
-   &_vq_book_res0_96_1024_2,
-   &_vq_book_res0_96_1024_3,
-   &_vq_book_res0_96_1024_4,
-   &_vq_book_res0_96_1024_5,
-   &_vq_book_res0_96_1024_6,
-   &_vq_book_res0_96_1024_7,
-   &_vq_book_res0_96_1024_8,
-   &_vq_book_res0_96_1024_9,
-
-  },
-  /* psy */
-  {&_psy_set_AA0,&_psy_set_AA},
-  /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
-  256, {30.f,30.f,30.f,34.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
-
-  -10., 
-
-  0,
-};
-
-#define PREDEF_INFO_MAX 0
-
-#endif
diff --git a/lib/modes/mode_B.h b/lib/modes/mode_B.h
deleted file mode 100644 (file)
index c488947..0000000
+++ /dev/null
@@ -1,424 +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: predefined encoding modes
- last mod: $Id: mode_B.h,v 1.16 2001/08/13 01:37:13 xiphmont Exp $
-
- ********************************************************************/
-
-#ifndef _V_MODES_B_H_
-#define _V_MODES_B_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_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,
-};
-
-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}}
-  },
-};
-
-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*/
-}};
-
-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_lineaggressive,
-
-  -100.,
-  -140.,
-
-  /* tonemaskp */
-  -3.f, -40.f, &_vp_tonemask_consbass_B,
-
-  /* peakattp */
-  1, &_vp_peakatt_B,
-
-  /*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) */
-  1,
-  _psy_passB0
-};
-
-static vorbis_info_psy _psy_set_B={
-  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*/
-  {  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},
-
-  105.f,  /* even decade + 5 is important; saves an rint() later in a
-            tight loop) */
-  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_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};
-
-/* CD quality stereo, no channel coupling */
-codec_setup_info info_B={
-
-  /* smallblock, largeblock */
-  {256, 2048}, 
-  /* modes,maps,times,floors,residues,books,psys */
-  2,          2,    1,     2,       2,   38,   3,
-  /* modes */
-  {&_mode_set0B,&_mode_set1B},
-  /* maps */
-  {0,0},{&_mapping_set0B,&_mapping_set1B},
-  /* times */
-  {0,0},{&_time_set0B},
-  /* floors */
-  {1,1},{&_floor_set0B,&_floor_set1B},
-  /* residue */
-  {2,2},{&_residue_set0B,&_residue_set1B},
-  /* 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_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_BT,&_psy_set_B},
-  &_psy_set_BG
-};
-
-#endif
diff --git a/lib/modes/mode_C.h b/lib/modes/mode_C.h
deleted file mode 100644 (file)
index 7494782..0000000
+++ /dev/null
@@ -1,432 +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: predefined encoding modes
- last mod: $Id: mode_C.h,v 1.15 2001/08/13 01:37:14 xiphmont Exp $
-
- ********************************************************************/
-
-#ifndef _V_MODES_C_H_
-#define _V_MODES_C_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_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,
-};
-
-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}}
-  },
-};
-
-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*/
-}};
-
-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_lineaggressive,
-
-  -100.,
-  -140.,
-
-  /* tonemask */
-  -3.f, -45.f, &_vp_tonemask_consbass_C,
-
-  /* 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},
-
-  105.f,  /* even decade + 5 is important; saves an rint() later in a
-            tight loop) */
-  1,
-  _psy_passC0
-};
-
-static vorbis_info_psy _psy_set_C={
-  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*/
-  {  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},
-
-  105.f,  /* even decade + 5 is important; saves an rint() later in a
-            tight loop) */
-  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_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};
-
-/* CD quality stereo, no channel coupling */
-codec_setup_info info_C={
-
-  /* smallblock, largeblock */
-  {256, 2048}, 
-  /* modes,maps,times,floors,residues,books,psys */
-  2,          2,    1,     2,       2,   37,   3,
-  /* modes */
-  {&_mode_set0C,&_mode_set1C},
-  /* maps */
-  {0,0},{&_mapping_set0C,&_mapping_set1C},
-  /* times */
-  {0,0},{&_time_set0C},
-  /* floors */
-  {1,1},{&_floor_set0C,&_floor_set1C},
-  /* residue */
-  {2,2},{&_residue_set0C,&_residue_set1C},
-  /* 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_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_CT,&_psy_set_C},
-  &_psy_set_CG
-};
-
-#endif
diff --git a/lib/modes/mode_D.h b/lib/modes/mode_D.h
deleted file mode 100644 (file)
index 1048172..0000000
+++ /dev/null
@@ -1,430 +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: predefined encoding modes
- last mod: $Id: mode_D.h,v 1.17 2001/08/13 08:38:30 xiphmont Exp $
-
- ********************************************************************/
-
-#ifndef _V_MODES_D_H_
-#define _V_MODES_D_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_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,
-};
-
-static struct vp_couple_pass _psy_passD[]={
-  {1.f,1.f,
-   {{9999,  0,0,      0,0,      0,0}}
-  },
-};
-
-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}, 
-}};
-
-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_lineconservative,
-
-  -100.,
-  -140.,
-
-  /* tonemaskp */
-  -6.f, -45.f,&_vp_tonemask_consbass_D,
-
-  /* peakattp */
-  0, &_vp_peakatt_D,
-
-  /*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,  1},
-  {.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.5f,.4f,.4f,.5f,.5f,.6f,.7f,.7f},
-
-  105.f,  /* even decade + 5 is important; saves an rint() later in a
-            tight loop) */
-  1,
-  _psy_passD
-};
-
-static vorbis_info_psy _psy_set_D={
-  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*/
-  {  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},
-
-  105.f,  /* even decade + 5 is important; saves an rint() later in a
-            tight loop) */
-  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_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},
-                                           {.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, losslesschannel coupling */
-codec_setup_info info_D={
-
-  /* smallblock, largeblock */
-  {256, 2048}, 
-  /* modes,maps,times,floors,residues,books,psys */
-  2,          2,    1,     2,       2,   37,   3,
-  /* modes */
-  {&_mode_set0D,&_mode_set1D},
-  /* maps */
-  {0,0},{&_mapping_set0D,&_mapping_set1D},
-  /* times */
-  {0,0},{&_time_set0D},
-  /* floors */
-  {1,1},{&_floor_set0D,&_floor_set1D},
-  /* residue */
-  {2,2},{&_residue_set0D,&_residue_set1D},
-  /* 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_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_DT,&_psy_set_D},
-  &_psy_set_DG
-};
-
-#endif
diff --git a/lib/modes/mode_E.h b/lib/modes/mode_E.h
deleted file mode 100644 (file)
index da87f39..0000000
+++ /dev/null
@@ -1,384 +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: predefined encoding modes
- last mod: $Id: mode_E.h,v 1.15 2001/08/13 01:37:14 xiphmont Exp $
-
- ********************************************************************/
-
-#ifndef _V_MODES_E_H_
-#define _V_MODES_E_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_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,
-};
-
-static struct vp_couple_pass _psy_passE[]={
-  {1.f,1.f,
-   {{9999,  0,0,      0,0,      0,0}}
-  },
-};
-
-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_lineconservative,
-
-  -110.,
-  -140.,
-
-  /* tonemaskp */
-  -6.f, -50.f, &_vp_tonemask_E,
-
-  /* peakattp */
-  0, &_vp_peakatt_E,
-
-  /*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,-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},
-
-  105.f,  /* even decade + 5 is important; saves an rint() later in a
-            tight loop) */
-  1,
-  _psy_passE
-};
-
-static vorbis_info_psy _psy_set_E={
-  ATH_Bark_dB_lineconservative,
-
-  -110.f,
-  -140.f,
-
-  /* tonemask */
-  -6.f,-50.f,&_vp_tonemask_E,
-  /* peakattp */
-  0,  &_vp_peakatt_E,
-
-  /*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_passE
-};
-
-/* with GNUisms, this could be short and readable. Oh well */
-static vorbis_info_time0 _time_set0E={0};
-/*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},
-                                           {.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, losslesschannel coupling */
-codec_setup_info info_E={
-
-  /* smallblock, largeblock */
-  {256, 2048}, 
-  /* modes,maps,times,floors,residues,books,psys */
-  2,          2,    1,     2,       2,   37,   2,
-  /* modes */
-  {&_mode_set0E,&_mode_set1E},
-  /* maps */
-  {0,0},{&_mapping_set0E,&_mapping_set1E},
-  /* times */
-  {0,0},{&_time_set0E},
-  /* floors */
-  {1,1},{&_floor_set0E,&_floor_set1E},
-  /* residue */
-  {2,2},{&_residue_set0E,&_residue_set1E},
-  /* 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_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},
-  &_psy_set_EG
-};
-
-#endif
diff --git a/lib/modes/mode_Za.h b/lib/modes/mode_Za.h
deleted file mode 100644 (file)
index 6159b71..0000000
+++ /dev/null
@@ -1,406 +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: 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
deleted file mode 100644 (file)
index 6cf812a..0000000
+++ /dev/null
@@ -1,410 +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: 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
deleted file mode 100644 (file)
index fc5d4c1..0000000
+++ /dev/null
@@ -1,451 +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: 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
index 04ee862..a42d6d4 100644 (file)
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: predefined encoding modes
- last mod: $Id: modes.h,v 1.12 2001/08/13 08:38:30 xiphmont Exp $
+ last mod: $Id: modes.h,v 1.13 2001/08/13 11:30:59 xiphmont Exp $
 
  ********************************************************************/
 
@@ -19,6 +19,7 @@
 #define _V_MODES_H_
 
 #include "masking.h"
+/* stereo (coupled) */
 #include "modes/mode_44c_Z.h"
 #include "modes/mode_44c_Y.h"
 #include "modes/mode_44c_X.h"
 #include "modes/mode_44c_D.h"
 #include "modes/mode_44c_E.h"
 
+/* mono/dual/multi */
+#include "modes/mode_44_Z.h"
+#include "modes/mode_44_Y.h"
+#include "modes/mode_44_X.h"
+#include "modes/mode_44_A.h"
+#include "modes/mode_44_B.h"
+#include "modes/mode_44_C.h"
+
 #endif