beta 3 commit. Unless I missed something (give it 50/50 odds ;-)

[platform/upstream/libvorbis.git] / lib / modes / mode_D.h

diff --git a/lib/modes/mode_D.h b/lib/modes/mode_D.h
index 774e8ea..6664ab8 100644 (file)
--- a/lib/modes/mode_D.h
+++ b/lib/modes/mode_D.h
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: predefined encoding modes
- last mod: $Id: mode_D.h,v 1.5 2000/11/14 00:07:57 xiphmont Exp $
+ last mod: $Id: mode_D.h,v 1.6 2000/11/17 11:47:38 xiphmont Exp $
 
  ********************************************************************/
 
@@ -43,7 +43,52 @@
 #include "books/res0_256_1024_4.vqh"
 #include "books/res0_256_1024_5.vqh"
 
-static vorbis_info_psy _psy_set_256 ={
+static vorbis_info_psy _psy_set_D0 ={
+  1,/*athp*/
+  0,/*decayp*/
+  1,/*smoothp*/
+  0,.1,
+
+  -100.,
+  -140.,
+
+  /*     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 */
+
+  0,/* tonemaskp */
+  /*  0   10   20   30   40   50   60   70   80   90   100 */
+  {{0}},
+
+  1,/* peakattp */
+  {{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*63*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*88*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*125*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*175*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*250*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*350*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*500*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*700*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*1000*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*1400*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*2000*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*2800*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*4000*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*5600*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*8000*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*11500*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*16000*/
+  },
+
+  0,/*noisemaskp */
+  /*  0   10   20   30   40   50   60    70    80    90   100 */
+  {{0}},
+ 
+  110.,
+
+  -0., -.004   /* attack/decay control */
+};
+static vorbis_info_psy _psy_set_D1 ={
   1,/*athp*/
   0,/*decayp*/
   1,/*smoothp*/
@@ -59,6 +104,7 @@ static vorbis_info_psy _psy_set_256 ={
   1,/* tonemaskp */
   /*  0   10   20   30   40   50   60   70   80   90   100 */
   {{-40.,-40.,-40.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*63*/
+   {-40.,-40.,-40.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*88*/
    {-40.,-40.,-40.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*125*/
    {-40.,-40.,-40.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*175*/
    {-40.,-40.,-40.,-45.,-45.,-55.,-65.,-75.,-85.,-95.,-105.}, /*250*/
@@ -77,13 +123,13 @@ static vorbis_info_psy _psy_set_256 ={
   },
 
   1,/* peakattp */
-  {{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*63*/
-   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*88*/
-   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*125*/
-   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*175*/
-   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*250*/
-   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*350*/
-   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*500*/
+  {{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*63*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*88*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*125*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*175*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*250*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*350*/
+   {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*500*/
    {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*700*/
    {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*1000*/
    {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-22.,-22.,-22.}, /*1400*/
@@ -128,7 +174,7 @@ static vorbis_info_residue0 _residue_set1_256={0,1024, 32,6,3,
                                           {99,99,99,99,99}};
 
 static vorbis_info_mapping0 _mapping_set0_256={1, {0,0}, {0}, {0}, {0}, {0}};
-static vorbis_info_mapping0 _mapping_set1_256={1, {0,0}, {0}, {1}, {1}, {0}};
+static vorbis_info_mapping0 _mapping_set1_256={1, {0,0}, {0}, {1}, {1}, {1}};
 static vorbis_info_mode _mode_set0_256={0,0,0,0};
 static vorbis_info_mode _mode_set1_256={1,0,0,1};
 
@@ -138,7 +184,7 @@ codec_setup_info info_D={
   /* smallblock, largeblock */
   {256, 2048}, 
   /* modes,maps,times,floors,residues,books,psys */
-  2,          2,    1,     2,       2,   14,   1,
+  2,          2,    1,     2,       2,   14,   2,
   /* modes */
   {&_mode_set0_256,&_mode_set1_256},
   /* maps */
@@ -170,7 +216,7 @@ codec_setup_info info_D={
 
   },
   /* psy */
-  {&_psy_set_256},
+  {&_psy_set_D0,&_psy_set_D1},
   /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
   256, 24, 6, -96.
 };