That's it. Full 1.0 libVorbis code handoff to release engineering.

svn path=/trunk/vorbis/; revision=3576

diff --git a/README b/README
index 310f63f..e242ead 100644 (file)
--- a/README
+++ b/README
@@ -73,8 +73,7 @@ patent concerns.
 This package contains:
 
 .) libvorbis, a BSD-style license software implementation of
-the Vorbis specification by the Xiphophorus company
-(http://www.xiph.org/) 
+the Vorbis specification by the Xiph.Org Foundation (http://www.xiph.org/) 
 
 .) libvorbisfile, a BSD-style license convenience library
 built on Vorbis designed to simplify common uses and a number of GPL

diff --git a/doc/v-comment.html b/doc/v-comment.html
index f37f15c..9e924b5 100644 (file)
--- a/doc/v-comment.html
+++ b/doc/v-comment.html
@@ -7,7 +7,7 @@
 Ogg Vorbis comment field specification
 </font></h1>
 
-<em>Last update to this document: July 2, 2002</em><p>
+<em>Last update to this document: July 11, 2002</em><p>
 
 <p>The text comment header is the second (of three) header packets that
 begin a Vorbis bitstream. It is meant for short, text comments,
@@ -36,8 +36,8 @@ number of vectors is bounded to 2^32-1 and the length of each vector
 is limited to 2^32-1 bytes. The vector length is encoded; the vector
 is not null terminated. In addition to the vector list, there is a
 single vector for vendor name (also 8 bit clean, length encoded in 32
-bits). Libvorbis currently sets the vendor string to "Xiphophorus
-libVorbis I 20010910".<p>
+bits). Libvorbis currently sets the vendor string to "Xiph.Org
+libVorbis I 20020711".<p>
 
 The comment vectors are structured similarly to a UNIX environment variable.
 That is, comment fields consist of a field name and a field value and

diff --git a/lib/bitrate.c b/lib/bitrate.c
index 634c031..9262055 100644 (file)
--- a/lib/bitrate.c
+++ b/lib/bitrate.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: bitrate tracking and management
- last mod: $Id: bitrate.c,v 1.18 2002/07/11 06:40:48 xiphmont Exp $
+ last mod: $Id: bitrate.c,v 1.19 2002/07/11 08:57:28 xiphmont Exp $
 
  ********************************************************************/
 
@@ -293,8 +293,7 @@ int vorbis_bitrate_addblock(vorbis_block *vb){
        /* apply the average floater to new blocks */
        bin=rint(bm->avgfloat);
 
-       fprintf(stderr,"%d ",bin);
-
+       /*fprintf(stderr,"%d ",bin);*/
        
        while(bm->avg_centeracc>desired_center){
          samples=ci->blocksizes[bm->queue_actual[bm->avg_center]&

diff --git a/lib/info.c b/lib/info.c
index d65e3cc..3bc4efd 100644 (file)
--- a/lib/info.c
+++ b/lib/info.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: maintain the info structure, info <-> header packets
- last mod: $Id: info.c,v 1.56 2002/07/02 04:25:16 xiphmont Exp $
+ last mod: $Id: info.c,v 1.57 2002/07/11 08:57:28 xiphmont Exp $
 
  ********************************************************************/
 
@@ -415,7 +415,7 @@ static int _vorbis_pack_info(oggpack_buffer *opb,vorbis_info *vi){
 }
 
 static int _vorbis_pack_comment(oggpack_buffer *opb,vorbis_comment *vc){
-  char temp[]="Xiphophorus libVorbis I 20020701";
+  char temp[]="Xiph.Org libVorbis I 20020711";
   int bytes = strlen(temp);
 
   /* preamble */  

diff --git a/lib/modes/psych_44.h b/lib/modes/psych_44.h
index 3ba007a..83485cf 100644 (file)
--- a/lib/modes/psych_44.h
+++ b/lib/modes/psych_44.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: key psychoacoustic settings for 44.1/48kHz
- last mod: $Id: psych_44.h,v 1.24 2002/07/11 06:41:04 xiphmont Exp $
+ last mod: $Id: psych_44.h,v 1.25 2002/07/11 08:57:29 xiphmont Exp $
 
  ********************************************************************/
 
@@ -412,7 +412,7 @@ static adj_stereo _psy_stereo_modes_44_low[2]={
   /*  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14         1  */
   {{  4,  4,  4,  4,  4,  4,  4,  3,  2,  2,  1,  0,  0,  0,  0},
    {  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  5,  4,  3},
-   {  1,  2,  3,  4,  4,  4,  4,  4,  4,  5,  6,  7,  8,  8,  8},
+   {  1,  2,  3,  4,  5,  5,  6,  6,  6,  6,  6,  7,  8,  8,  8},
    { 12,12.5, 13,13.5, 14,14.5, 15, 99, 99, 99, 99, 99, 99, 99, 99}},
 };
 
@@ -420,7 +420,7 @@ static adj_stereo _psy_stereo_modes_44[11]={
   /*  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14         0  */
   {{  4,  4,  4,  4,  4,  4,  4,  3,  2,  2,  1,  0,  0,  0,  0},
    {  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  5,  4,  3},
-   {  1,  2,  3,  4,  4,  4,  4,  6,  4,  5,  6,  7,  8,  8,  8},
+   {  1,  2,  3,  4,  5,  5,  6,  6,  6,  6,  6,  7,  8,  8,  8},
    { 12,12.5, 13,13.5, 14,14.5, 15, 99, 99, 99, 99, 99, 99, 99, 99}},
   /*  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14         1  */
   {{  3,  3,  3,  3,  3,  3,  3,  3,  2,  1,  0,  0,  0,  0,  0},
@@ -477,7 +477,7 @@ static adj_stereo _psy_stereo_modes_44[11]={
 /* tone master attenuation by base quality mode and bitrate tweak */
 
 static att3 _psy_tone_masteratt_44_low[2]={
-  {{ 34,  24,   8}, -6, 1.25}, /* 0 */
+  {{ 34,  20,   8},  0, 1.25}, /* 0 */
   {{ 34,  20,   8}, -2, 1.25}, /* 1 */
 };
 static att3 _psy_tone_masteratt_44[11]={

diff --git a/lib/modes/psych_8.h b/lib/modes/psych_8.h
index dde9199..79ba849 100644 (file)
--- a/lib/modes/psych_8.h
+++ b/lib/modes/psych_8.h
@@ -11,14 +11,14 @@
  ********************************************************************
 
  function: 8kHz psychoacoustic settings 
- last mod: $Id: psych_8.h,v 1.1 2002/07/10 03:04:22 xiphmont Exp $
+ last mod: $Id: psych_8.h,v 1.2 2002/07/11 08:57:29 xiphmont Exp $
 
  ********************************************************************/
 
 static att3 _psy_tone_masteratt_8[3]={
   {{ 32,  25,  12},  0,   0},  /* 0 */
   {{ 30,  25,  12},  0,   0},  /* 0 */
-  {{ 20,   0, -14},  0,  1.}, /* 0 */
+  {{ 20,   0, -14},  0,   0}, /* 0 */
 };
 
 static vp_adjblock _vp_tonemask_adj_8[3]={

diff --git a/lib/modes/setup_16.h b/lib/modes/setup_16.h
index cadda73..fece385 100644 (file)
--- a/lib/modes/setup_16.h
+++ b/lib/modes/setup_16.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: 16kHz settings 
- last mod: $Id: setup_16.h,v 1.2 2002/07/11 06:41:04 xiphmont Exp $
+ last mod: $Id: setup_16.h,v 1.3 2002/07/11 08:57:29 xiphmont Exp $
 
  ********************************************************************/
 
@@ -37,7 +37,7 @@ static double rate_mapping_16[4]={
 };
 
 static double rate_mapping_16_uncoupled[4]={
-  16000.,28000.,50000.,90000.
+  16000.,28000.,64000.,100000.
 };
 
 static double _global_mapping_16[4]={ 1., 2., 3., 4. };

diff --git a/lib/modes/setup_44.h b/lib/modes/setup_44.h
index ec42210..2342539 100644 (file)
--- a/lib/modes/setup_44.h
+++ b/lib/modes/setup_44.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: toplevel settings for 44.1/48kHz
- last mod: $Id: setup_44.h,v 1.8 2002/07/11 06:41:05 xiphmont Exp $
+ last mod: $Id: setup_44.h,v 1.9 2002/07/11 08:57:29 xiphmont Exp $
 
  ********************************************************************/
 
@@ -56,8 +56,8 @@ static double _psy_compand_long_mapping[11]={
 static double _global_mapping_44[11]={
   1., 1., 1.5, 2., 2., 2.5, 2.7, 3.0, 3.5, 4., 4.
 };
-static double _global_mapping_44_low[11]={
-  1., 1., 1.5, 2., 2., 2.5, 2.7, 3.0, 3.5, 4., 4.
+static double _global_mapping_44_low[2]={
+  0., 1.,
 };
 static int _floor_short_mapping_44_low[1]={
   1,