[xiph-cvs] cvs commit: vorbis/lib/modes psych_44.h psych_8.h setup_16.h setup_44.h
Monty
xiphmont at xiph.org
Thu Jul 11 01:57:30 PDT 2002
xiphmont 02/07/11 01:57:30
Modified: . README
doc v-comment.html
lib bitrate.c info.c
lib/modes psych_44.h psych_8.h setup_16.h setup_44.h
Log:
That's it. Full 1.0 libVorbis code handoff to release engineering.
Revision Changes Path
1.14 +1 -2 vorbis/README
Index: README
===================================================================
RCS file: /usr/local/cvsroot/vorbis/README,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- README 2002/07/03 03:22:14 1.13
+++ README 2002/07/11 08:57:27 1.14
@@ -73,8 +73,7 @@
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
<p><p>1.10 +3 -3 vorbis/doc/v-comment.html
Index: v-comment.html
===================================================================
RCS file: /usr/local/cvsroot/vorbis/doc/v-comment.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- v-comment.html 2002/07/03 00:37:58 1.9
+++ v-comment.html 2002/07/11 08:57:27 1.10
@@ -7,7 +7,7 @@
Ogg Vorbis comment field specification
</font></h1>
-Last update to this document: July 2, 2002</em><p>
+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 @@
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
<p><p>1.19 +2 -3 vorbis/lib/bitrate.c
Index: bitrate.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/bitrate.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bitrate.c 2002/07/11 06:40:48 1.18
+++ bitrate.c 2002/07/11 08:57:28 1.19
@@ -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 @@
/* 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]&
<p><p>1.57 +2 -2 vorbis/lib/info.c
Index: info.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/info.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- info.c 2002/07/02 04:25:16 1.56
+++ info.c 2002/07/11 08:57:28 1.57
@@ -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_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 */
<p><p>1.25 +4 -4 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- psych_44.h 2002/07/11 06:41:04 1.24
+++ psych_44.h 2002/07/11 08:57:29 1.25
@@ -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 @@
/* 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 @@
/* 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 @@
/* 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]={
<p><p>1.2 +2 -2 vorbis/lib/modes/psych_8.h
Index: psych_8.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/psych_8.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- psych_8.h 2002/07/10 03:04:22 1.1
+++ psych_8.h 2002/07/11 08:57:29 1.2
@@ -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]={
<p><p>1.3 +2 -2 vorbis/lib/modes/setup_16.h
Index: setup_16.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/setup_16.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setup_16.h 2002/07/11 06:41:04 1.2
+++ setup_16.h 2002/07/11 08:57:29 1.3
@@ -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_uncoupled[4]={
- 16000.,28000.,50000.,90000.
+ 16000.,28000.,64000.,100000.
};
static double _global_mapping_16[4]={ 1., 2., 3., 4. };
<p><p>1.9 +3 -3 vorbis/lib/modes/setup_44.h
Index: setup_44.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/setup_44.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- setup_44.h 2002/07/11 06:41:05 1.8
+++ setup_44.h 2002/07/11 08:57:29 1.9
@@ -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 _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,
<p><p><p>--- >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