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

Ralph Giles giles at xiph.org
Tue Aug 21 12:05:10 PDT 2001



giles       01/08/21 12:05:09

  Modified:    lib      psytune.c vorbisenc.c
               lib/modes mode_22c_Z.h
  Log:
  remove additional C++ comments

Revision  Changes    Path
1.17      +2 -2      vorbis/lib/psytune.c

Index: psytune.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psytune.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- psytune.c	2001/08/13 01:36:57	1.16
+++ psytune.c	2001/08/21 19:05:06	1.17
@@ -12,7 +12,7 @@
 
  function: simple utility that runs audio through the psychoacoustics
            without encoding
- last mod: $Id: psytune.c,v 1.16 2001/08/13 01:36:57 xiphmont Exp $
+ last mod: $Id: psytune.c,v 1.17 2001/08/21 19:05:06 giles Exp $
 
  ********************************************************************/
 
@@ -51,7 +51,7 @@
 static vp_part _vp_part0[]={
   {    1,9e10f, 9e10f,       1.f,9999.f},
   { 9999,  .75f, 9e10f,       .5f,9999.f},
-  //{ 9999, 1.5f, 9e10f,       .5f,9999.f},
+/*{ 9999, 1.5f, 9e10f,       .5f,9999.f},*/
   {   18,9e10f, 9e10f,       .5f,  30.f},
   { 9999,9e10f, 9e10f,       .5f,  30.f}
 };

1.13      +3 -3      vorbis/lib/vorbisenc.c

Index: vorbisenc.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/vorbisenc.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vorbisenc.c	2001/08/13 11:33:40	1.12
+++ vorbisenc.c	2001/08/21 19:05:06	1.13
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: simple programmatic interface for encoder mode setup
- last mod: $Id: vorbisenc.c,v 1.12 2001/08/13 11:33:40 xiphmont Exp $
+ last mod: $Id: vorbisenc.c,v 1.13 2001/08/21 19:05:06 giles Exp $
 
  ********************************************************************/
 
@@ -135,7 +135,7 @@
 
   switch(channels){
   case 2:
-    //if(rate>40000){
+/*	if(rate>40000){	*/
 
     if(bpch<35000){
       mode=&info_44c_Z;
@@ -154,7 +154,7 @@
     }else{
       mode=&info_44c_E;
     }
-    //}
+/*	}	*/
 
     break;
   default:

1.2       +6 -6      vorbis/lib/modes/mode_22c_Z.h

Index: mode_22c_Z.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_22c_Z.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mode_22c_Z.h	2001/08/13 11:30:59	1.1
+++ mode_22c_Z.h	2001/08/21 19:05:08	1.2
@@ -11,7 +11,7 @@
  ********************************************************************
 
  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 $
+ last mod: $Id: mode_22c_Z.h,v 1.2 2001/08/21 19:05:08 giles Exp $
 
  ********************************************************************/
 
@@ -107,7 +107,7 @@
 
   /*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},
+/*{-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
@@ -132,11 +132,11 @@
 
   /*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,-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},
+  {-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},
 
 

--- >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