[xiph-cvs] cvs commit: vorbis/lib/modes psych_44.h

Monty xiphmont at xiph.org
Thu Dec 27 00:07:31 PST 2001



xiphmont    01/12/27 00:07:30

  Modified:    lib/modes Tag: monty_branch_rc4 psych_44.h
  Log:
  Minor refinements to go along with a low bitrate improvement incoming.

Revision  Changes    Path
No                   revision

No                   revision

1.7.2.1   +30 -31    vorbis/lib/modes/psych_44.h

Index: psych_44.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/psych_44.h,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- psych_44.h	2001/12/22 09:40:40	1.7
+++ psych_44.h	2001/12/27 08:07:30	1.7.2.1
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: key psychoacoustic settings for 44.1/48kHz
- last mod: $Id: psych_44.h,v 1.7 2001/12/22 09:40:40 xiphmont Exp $
+ last mod: $Id: psych_44.h,v 1.7.2.1 2001/12/27 08:07:30 xiphmont Exp $
 
  ********************************************************************/
 
@@ -105,18 +105,17 @@
     { 10, 10,  5,                               }, 
     { 10, 10,  5,                               }, /* 500 */
     { 10, 10,  5,                               }, 
-    { 10, 10,  5,                               }, /* 1000 */
-    { 10, 10,  5,                               }, 
+    {  0,                                       }, /* 1000 */
+    {  0,                                       }, 
 
-    { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, /* 2000 */
-    { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10},
-    { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, /* 4000 */
-    { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10},
-    { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, /* 8000 */
-    { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, 
-    { 16, 16, 14, 12, 12, 15, 15, 15, 15, 15, 10}, /* 16000 */
+    { 13, 13, 10, 10, 10, 10, 10, 10, 10, 10, 10}, /* 2000 */
+    { 13, 13, 10, 10, 10, 10, 10, 10, 10, 10, 10},
+    { 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 10}, /* 4000 */
+    { 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 10},
+    { 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 10}, /* 8000 */
+    { 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 10}, 
+    { 20, 20, 20, 18, 18, 18, 18, 18, 18, 15, 10}, /* 16000 */
   }},
-
   /* adjust for mode two */
   {{
     { 10, 10,  5,                               }, /*63*/
@@ -242,13 +241,13 @@
     {  5,  5,  5,                               }, /*1000*/
     {  5,  5,  5,                               }, 
 
-    { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, /*2000*/
-    { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, 
-    { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, /*4000*/
-    { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, 
-    { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, /*8000*/
-    { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10}, 
-    { 16, 16, 14, 12, 12, 15, 15, 15, 15, 15, 10}, /*16000*/
+    { 13, 13, 10, 10, 10, 10, 10, 10, 10, 10, 10}, /* 2000 */
+    { 13, 13, 10, 10, 10, 10, 10, 10, 10, 10, 10},
+    { 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 10}, /* 4000 */
+    { 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 10},
+    { 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 10}, /* 8000 */
+    { 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 10}, 
+    { 20, 20, 20, 18, 18, 18, 18, 18, 18, 15, 10}, /* 16000 */
   }},
 
   /* adjust for mode two */
@@ -375,16 +374,16 @@
     {-14,-16,-18,-19,-24,-24,-24,-24,-24,-24,-24},/*250*/
     {-14,-16,-18,-19,-24,-24,-24,-24,-24,-24,-24},
     {-10,-10,-10,-10,-16,-16,-18,-20,-22,-24,-24},/*500*/
-    {-10,-10,-10,-10,-14,-14,-16,-20,-22,-24,-24},
-    {-10,-10,-10,-10,-14,-14,-16,-20,-22,-24,-24},/*1000*/
+    {-10,-10,-10,-10,-14,-14,-14,-20,-22,-24,-24},
+    {-10,-10,-10,-10,-14,-14,-14,-20,-22,-24,-24},/*1000*/
     {-10,-10,-10,-10,-14,-14,-16,-20,-22,-24,-24},
     {-10,-10,-10,-10,-14,-14,-16,-20,-22,-24,-24},/*2000*/
-    {-10,-10,-10,-12,-16,-16,-16,-20,-22,-24,-24},
-    {-10,-10,-10,-12,-16,-16,-16,-20,-22,-24,-24},/*4000*/
-    {-10,-10,-10,-12,-12,-14,-16,-18,-22,-24,-24},
-    {-10,-10,-10,-10,-10,-14,-16,-18,-22,-24,-24},/*8000*/
-    {-10,-10,-10,-10,-10,-14,-16,-18,-22,-24,-24},
-    {-10,-10,-10,-10,-10,-12,-16,-18,-22,-24,-24},/*16000*/
+    {-10,-10,-10,-10,-14,-14,-16,-20,-22,-24,-24},
+    {-10,-10,-10,-10,-10,-14,-16,-20,-22,-24,-24},/*4000*/
+    {-10,-10,-10,-10,-10,-11,-12,-13,-22,-24,-24},
+    {-10,-10,-10,-10,-10,-11,-12,-13,-22,-24,-24},/*8000*/
+    {-10,-10,-10,-10,-10,-10,-10,-11,-22,-24,-24},
+    {-10,-10,-10,-10,-10,-10,-10,-10,-20,-24,-24},/*16000*/
   }},
   /* two */
   {{
@@ -490,7 +489,7 @@
 
 static int _psy_noisebias_long[11][17]={
   /*63     125     250     500      1k       2k      4k      8k     16k*/
-  {-20,-20,-18,-18,-18,-16,-14, -8, -6, -2,  0,  2,  3,  3,  4,  4, 10},
+  {-20,-20,-20,-20,-20,-18,-16, -8, -6, -2,  2,  2,  3,  3,  4,  4, 10},
   {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -2, -2,  1,  1,  2,  2,  4},
   {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -3, -3, -1, -1,  0,  1,  2},
   {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2, -3, -3, -1, -1,  0,  1,  2},
@@ -507,7 +506,7 @@
 
 static int _psy_noisebias_impulse[11][17]={
   /*63     125     250     500      1k       2k      4k      8k     16k*/
-  {-20,-20,-20,-20,-20,-18,-14,-10,-10, -2,  2,  2,  2,  2,  2,  3,  6},
+  {-30,-30,-30,-30,-26,-22,-20,-14,-10, -2,  0,  0,  2,  2,  2,  3,  6},
   {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -4, -4, -2, -2, -2, -2,  2},
   {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -4, -4, -4, -2,  0},
   {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -6, -6, -4, -4, -4, -2, -2},
@@ -524,7 +523,7 @@
 
 static int _psy_noisebias_other[11][17]={
   /*63     125     250     500      1k       2k      4k      8k     16k*/
-  {-20,-20,-20,-20,-20,-18,-14,-10, -6, -2,  2,  2,  3,  3,  4,  4, 10},
+  {-26,-26,-26,-26,-26,-22,-18,-12, -6, -2,  2,  2,  3,  3,  4,  4, 10},
   {-26,-26,-26,-26,-26,-22,-20,-14,-10, -2, -2, -2,  1,  1,  2,  2,  4},
   {-30,-30,-30,-30,-26,-22,-20,-14,-10, -2, -3, -3, -1, -1,  0,  1,  2},
   {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -1, -1,  0,  1,  2},
@@ -567,7 +566,7 @@
 };
 
 static double _psy_tone_masteratt[11]={
-  3.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,
+  0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,
 };
 
 static double _psy_tone_masterguard[11]={
@@ -637,7 +636,7 @@
 
 /* lowpass **************/
 static double _psy_lowpass_44[11]={
-  15.1,15.8,16.5,17.9,20.5,48.,999.,999.,999.,999.,999.
+  14.1,15.8,16.5,17.9,20.5,48.,999.,999.,999.,999.,999.
 };
 
 /* management noise offset */

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.



More information about the commits mailing list