[xiph-cvs] cvs commit: vorbis/vq 44c0_s4.vqs bookutil.c
Monty
xiphmont at xiph.org
Fri Dec 7 00:52:48 PST 2001
xiphmont 01/12/07 00:52:48
Modified: examples Tag: branch_monty_20011009 encoder_example.c
lib/books Tag: branch_monty_20011009 Makefile.am
vq Tag: branch_monty_20011009 bookutil.c
Added: lib/books/coupled Tag: branch_monty_20011009 _44c0_long.vqh
_44c0_s0_p1_0.vqh _44c0_s0_p2_0.vqh
_44c0_s0_p3_0.vqh _44c0_s0_p4_0.vqh
_44c0_s0_p4_1.vqh _44c0_s1_p5_0.vqh
_44c0_s1_p6_0.vqh _44c0_s2_p7_0.vqh
_44c0_s4_p8_0.vqh _44c0_s4_p8_1.vqh
_44c0_s4_p9_0.vqh _44c0_s4_p9_1.vqh
_44c0_s4_p9_2.vqh _44c0_short.vqh
lib/books/floor Tag: branch_monty_20011009
line_1024x31_0sub0.vqh line_1024x31_0sub1.vqh
line_1024x31_1sub0.vqh line_1024x31_1sub1.vqh
line_1024x31_2sub1.vqh line_1024x31_2sub2.vqh
line_1024x31_2sub3.vqh line_1024x31_3sub1.vqh
line_1024x31_3sub2.vqh line_1024x31_3sub3.vqh
line_1024x31_class0.vqh line_1024x31_class1.vqh
line_1024x31_class2.vqh line_1024x31_class3.vqh
line_128x19_0sub0.vqh line_128x19_1sub1.vqh
line_128x19_1sub2.vqh line_128x19_1sub3.vqh
line_128x19_2sub1.vqh line_128x19_2sub2.vqh
line_128x19_2sub3.vqh line_128x19_class1.vqh
line_128x19_class2.vqh line_128x7_0sub0.vqh
line_128x7_1sub1.vqh line_128x7_1sub2.vqh
line_128x7_1sub3.vqh line_128x7_2sub1.vqh
line_128x7_2sub2.vqh line_128x7_2sub3.vqh
line_128x7_class1.vqh line_128x7_class2.vqh
vq Tag: branch_monty_20011009 44c0_s4.vqs
Removed: lib/books Tag: branch_monty_20011009 lsp30_0.vqh lsp30_1.vqh
lsp9_0.vqh lsp9_1.vqh res_22c_Z_1024aux.vqh
res_22c_Z_128aux.vqh res_32c_Z_1024aux.vqh
res_32c_Z_128aux.vqh res_44_A_1024aux.vqh
res_44_A_128aux.vqh res_44_B_1024aux.vqh
res_44_B_128aux.vqh res_44_Y_1024aux.vqh
res_44_Y_128aux.vqh res_44_Z_1024aux.vqh
res_44_Z_128aux.vqh res_44c_A_1024aux.vqh
res_44c_A_128aux.vqh res_44c_B_1024aux.vqh
res_44c_B_128aux.vqh res_44c_C_1024aux.vqh
res_44c_C_128aux.vqh res_44c_E_1024aux.vqh
res_44c_E_128aux.vqh res_44c_X_1024aux.vqh
res_44c_X_128aux.vqh res_44c_Y_1024aux.vqh
res_44c_Y_128aux.vqh res_44c_Z_1024aux.vqh
res_44c_Z_128aux.vqh res_Ac_0.vqh res_Ac_0a.vqh
res_Ac_0b.vqh res_Ac_1.vqh res_Ac_1024_1.vqh
res_Ac_1024_2.vqh res_Ac_1024_3.vqh
res_Ac_1024_4.vqh res_Ac_1024_5.vqh
res_Ac_1024_6.vqh res_Ac_1024_7.vqh
res_Ac_1024_7a.vqh res_Ac_1024_8.vqh
res_Ac_1024_8a.vqh res_Ac_1024_9.vqh
res_Ac_1024_9a.vqh res_Ac_1024_9b.vqh res_Ac_1a.vqh
res_Ac_1b.vqh res_Ac_2.vqh res_Ac_2a.vqh
res_Ac_2b.vqh res_Ac_2c.vqh res_Ac_3.vqh
res_Ac_3a.vqh res_Ac_3b.vqh res_Ac_4.vqh
res_Ac_4a.vqh res_Ac_4b.vqh res_Ac_4c.vqh
res_Ac_5.vqh res_Ac_5a.vqh res_Ac_5b.vqh
res_Ac_6.vqh res_Ac_6a.vqh res_Ac_6b.vqh
res_Ac_7.vqh res_Ac_7a.vqh res_Ac_7b.vqh
res_Ac_7c.vqh res_Ac_8.vqh res_Ac_8a.vqh
res_Ac_8b.vqh res_Ac_8c.vqh res_Ac_8d.vqh
res_Ac_9.vqh res_Ac_9a.vqh res_Ac_9b.vqh
res_Ac_9c.vqh res_Ac_9d.vqh res_B_1.vqh res_B_2.vqh
res_B_3.vqh res_B_4.vqh res_B_5.vqh res_B_5a.vqh
res_B_6.vqh res_B_6a.vqh res_B_6b.vqh res_Bc_1.vqh
res_Bc_2.vqh res_Bc_3.vqh res_Bc_4.vqh res_Bc_5.vqh
res_Bc_6.vqh res_Bc_7.vqh res_Bc_7a.vqh
res_Bc_8.vqh res_Bc_8a.vqh res_Bc_9.vqh
res_Bc_9a.vqh res_Bc_9b.vqh res_Cc_1.vqh
res_Cc_2.vqh res_Cc_3.vqh res_Cc_4.vqh res_Cc_5.vqh
res_Cc_6.vqh res_Cc_7.vqh res_Cc_8.vqh
res_Cc_8a.vqh res_Cc_9.vqh res_Cc_9a.vqh
res_Cc_9b.vqh res_Ec_1.vqh res_Ec_2.vqh
res_Ec_3.vqh res_Ec_4.vqh res_Ec_5.vqh res_Ec_6.vqh
res_Ec_7.vqh res_Ec_8.vqh res_Ec_8a.vqh
res_Ec_9.vqh res_Ec_9a.vqh res_Ec_9b.vqh
res_Xc_1.vqh res_Xc_2.vqh res_Xc_3.vqh res_Xc_4.vqh
res_Xc_5.vqh res_Xc_6.vqh res_Xc_7.vqh res_Xc_8.vqh
res_Xc_9.vqh res_Xc_9a.vqh res_Xc_9b.vqh
res_Z_1.vqh res_Z_2.vqh res_Z_3.vqh res_Z_4.vqh
res_Z_5.vqh res_Z_6.vqh res_Z_6a.vqh res_Z_6b.vqh
res_Zc_1.vqh res_Zc_1024aux.vqh res_Zc_128aux.vqh
res_Zc_2.vqh res_Zc_3.vqh res_Zc_4.vqh res_Zc_5.vqh
res_Zc_6.vqh res_Zc_7.vqh res_Zc_8.vqh res_Zc_9.vqh
res_Zc_9a.vqh res_Zc_9b.vqh
lib/modes Tag: branch_monty_20011009 maskadj_A.h maskadj_X.h
maskadj_Z.h mode_22c_Z.h mode_32c_Z.h mode_44_A.h
mode_44_B.h mode_44_C.h mode_44_X.h mode_44_Y.h
mode_44_Z.h mode_44c_A.h mode_44c_B.h mode_44c_C.h
mode_44c_D.h mode_44c_E.h mode_44c_X.h mode_44c_Y.h
mode_44c_Z.h modes.h
Log:
Catch the book formatting up with current
Revision Changes Path
No revision
No revision
1.27.2.4 +3 -2 vorbis/examples/encoder_example.c
Index: encoder_example.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/encoder_example.c,v
retrieving revision 1.27.2.3
retrieving revision 1.27.2.4
diff -u -r1.27.2.3 -r1.27.2.4
--- encoder_example.c 2001/11/22 06:19:52 1.27.2.3
+++ encoder_example.c 2001/12/07 08:52:33 1.27.2.4
@@ -11,7 +11,7 @@
********************************************************************
function: simple example encoder
- last mod: $Id: encoder_example.c,v 1.27.2.3 2001/11/22 06:19:52 xiphmont Exp $
+ last mod: $Id: encoder_example.c,v 1.27.2.4 2001/12/07 08:52:33 xiphmont Exp $
********************************************************************/
@@ -95,7 +95,8 @@
/* choose an encoding mode */
/* (mode 0: 44kHz stereo uncoupled, roughly 128kbps VBR) */
vorbis_info_init(&vi);
- vorbis_encode_init(&vi,2,44100, -1, 128000, -1);
+
+ vorbis_encode_init_vbr(&vi,2,44100,.4);
/* add a comment */
vorbis_comment_init(&vc);
No revision
No revision
1.10.2.1 +1 -1 vorbis/lib/books/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- Makefile.am 2001/08/13 11:38:35 1.10
+++ Makefile.am 2001/12/07 08:52:34 1.10.2.1
@@ -2,4 +2,4 @@
AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST = line_1024x31_0sub0.vqh line_1024x31_0sub1.vqh line_1024x31_1sub0.vqh line_1024x31_1sub1.vqh line_1024x31_2sub1.vqh line_1024x31_2sub2.vqh line_1024x31_2sub3.vqh line_1024x31_3sub1.vqh line_1024x31_3sub2.vqh line_1024x31_3sub3.vqh line_1024x31_class0.vqh line_1024x31_class1.vqh line_1024x31_class2.vqh line_1024x31_class3.vqh line_128x19_0sub0.vqh line_128x19_1sub1.vqh line_128x19_1sub2.vqh line_128x19_1sub3.vqh line_128x19_2sub1.vqh line_128x19_2sub2.vqh line_128x19_2sub3.vqh line_128x19_class1.vqh line_128x19_class2.vqh line_128x7_0sub0.vqh line_128x7_1sub1.vqh line_128x7_1sub2.vqh line_128x7_1sub3.vqh line_128x7_2sub1.vqh line_128x7_2sub2.vqh line_128x7_2sub3.vqh line_128x7_class1.vqh line_128x7_class2.vqh lsp12_0.vqh lsp12_1.vqh lsp30_0.vqh lsp30_1.vqh lsp9_0.vqh lsp9_1.vqh res_22c_Z_1024aux.vqh res_22c_Z_128aux.vqh res_32c_Z_1024aux.vqh res_32c_Z_128aux.vqh res_44_A_1024aux.vqh res_44_A_128aux.vqh res_44_B_1024aux.vqh res_44_B_128aux.vqh res_44c_A_1024aux.vqh res_44c_A_128aux.vqh res_44c_B_
1024aux.vqh res_44c_B_128aux.vqh res_44c_C_1024aux.vqh res_44c_C_128aux.vqh res_44c_E_1024aux.vqh res_44c_E_128aux.vqh res_44c_X_1024aux.vqh res_44c_X_128aux.vqh res_44c_Y_1024aux.vqh res_44c_Y_128aux.vqh res_44c_Z_1024aux.vqh res_44c_Z_128aux.vqh res_44_Y_1024aux.vqh res_44_Y_128aux.vqh res_44_Z_1024aux.vqh res_44_Z_128aux.vqh res_Ac_1024_1.vqh res_Ac_1024_2.vqh res_Ac_1024_3.vqh res_Ac_1024_4.vqh res_Ac_1024_5.vqh res_Ac_1024_6.vqh res_Ac_1024_7a.vqh res_Ac_1024_7.vqh res_Ac_1024_8a.vqh res_Ac_1024_8.vqh res_Ac_1024_9a.vqh res_Ac_1024_9b.vqh res_Ac_1024_9.vqh res_Ac_1.vqh res_Ac_2.vqh res_Ac_3.vqh res_Ac_4.vqh res_Ac_5.vqh res_Ac_6.vqh res_Ac_7a.vqh res_Ac_7.vqh res_Ac_8a.vqh res_Ac_8.vqh res_Ac_9a.vqh res_Ac_9b.vqh res_Ac_9.vqh res_B_1.vqh res_B_2.vqh res_B_3.vqh res_B_4.vqh res_B_5a.vqh res_B_5.vqh res_B_6a.vqh res_B_6b.vqh res_B_6.vqh res_Bc_1.vqh res_Bc_2.vqh res_Bc_3.vqh res_Bc_4.vqh res_Bc_5.vqh res_Bc_6.vqh res_Bc_7a.vqh res_Bc_7.vqh res_Bc_8a.vqh res_Bc_8.vqh res_Bc_9a.vqh res_Bc_9b.vqh res_Bc_9.vq
h res_Cc_1.vqh res_Cc_2.vqh res_Cc_3.vqh res_Cc_4.vqh res_Cc_5.vqh res_Cc_6.vqh res_Cc_7.vqh res_Cc_8a.vqh res_Cc_8.vqh res_Cc_9a.vqh res_Cc_9b.vqh res_Cc_9.vqh res_Ec_1.vqh res_Ec_2.vqh res_Ec_3.vqh res_Ec_4.vqh res_Ec_5.vqh res_Ec_6.vqh res_Ec_7.vqh res_Ec_8a.vqh res_Ec_8.vqh res_Ec_9a.vqh res_Ec_9b.vqh res_Ec_9.vqh res_Xc_1.vqh res_Xc_2.vqh res_Xc_3.vqh res_Xc_4.vqh res_Xc_5.vqh res_Xc_6.vqh res_Xc_7.vqh res_Xc_8.vqh res_Xc_9a.vqh res_Xc_9b.vqh res_Xc_9.vqh res_Z_1.vqh res_Z_2.vqh res_Z_3.vqh res_Z_4.vqh res_Z_5.vqh res_Z_6a.vqh res_Z_6b.vqh res_Z_6.vqh res_Zc_1024aux.vqh res_Zc_128aux.vqh res_Zc_1.vqh res_Zc_2.vqh res_Zc_3.vqh res_Zc_4.vqh res_Zc_5.vqh res_Zc_6.vqh res_Zc_7.vqh res_Zc_8.vqh res_Zc_9a.vqh res_Zc_9b.vqh res_Zc_9.vqh temp26040.vqh
+
No revision
No revision
1.1.2.1 +43 -0 vorbis/lib/books/coupled/Attic/_44c0_long.vqh
1.1.2.1 +99 -0 vorbis/lib/books/coupled/Attic/_44c0_s0_p1_0.vqh
1.1.2.1 +70 -0 vorbis/lib/books/coupled/Attic/_44c0_s0_p2_0.vqh
1.1.2.1 +93 -0 vorbis/lib/books/coupled/Attic/_44c0_s0_p3_0.vqh
1.1.2.1 +86 -0 vorbis/lib/books/coupled/Attic/_44c0_s0_p4_0.vqh
1.1.2.1 +65 -0 vorbis/lib/books/coupled/Attic/_44c0_s0_p4_1.vqh
1.1.2.1 +63 -0 vorbis/lib/books/coupled/Attic/_44c0_s1_p5_0.vqh
1.1.2.1 +99 -0 vorbis/lib/books/coupled/Attic/_44c0_s1_p6_0.vqh
1.1.2.1 +70 -0 vorbis/lib/books/coupled/Attic/_44c0_s2_p7_0.vqh
1.1.2.1 +86 -0 vorbis/lib/books/coupled/Attic/_44c0_s4_p8_0.vqh
1.1.2.1 +65 -0 vorbis/lib/books/coupled/Attic/_44c0_s4_p8_1.vqh
1.1.2.1 +65 -0 vorbis/lib/books/coupled/Attic/_44c0_s4_p9_0.vqh
1.1.2.1 +115 -0 vorbis/lib/books/coupled/Attic/_44c0_s4_p9_1.vqh
1.1.2.1 +63 -0 vorbis/lib/books/coupled/Attic/_44c0_s4_p9_2.vqh
1.1.2.1 +43 -0 vorbis/lib/books/coupled/Attic/_44c0_short.vqh
No revision
No revision
1.1.2.1 +37 -0 vorbis/lib/books/floor/Attic/line_1024x31_0sub0.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_1024x31_0sub1.vqh
1.1.2.1 +37 -0 vorbis/lib/books/floor/Attic/line_1024x31_1sub0.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_1024x31_1sub1.vqh
1.1.2.1 +37 -0 vorbis/lib/books/floor/Attic/line_1024x31_2sub1.vqh
1.1.2.1 +38 -0 vorbis/lib/books/floor/Attic/line_1024x31_2sub2.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_1024x31_2sub3.vqh
1.1.2.1 +37 -0 vorbis/lib/books/floor/Attic/line_1024x31_3sub1.vqh
1.1.2.1 +38 -0 vorbis/lib/books/floor/Attic/line_1024x31_3sub2.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_1024x31_3sub3.vqh
1.1.2.1 +37 -0 vorbis/lib/books/floor/Attic/line_1024x31_class0.vqh
1.1.2.1 +37 -0 vorbis/lib/books/floor/Attic/line_1024x31_class1.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_1024x31_class2.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_1024x31_class3.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_128x19_0sub0.vqh
1.1.2.1 +37 -0 vorbis/lib/books/floor/Attic/line_128x19_1sub1.vqh
1.1.2.1 +38 -0 vorbis/lib/books/floor/Attic/line_128x19_1sub2.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_128x19_1sub3.vqh
1.1.2.1 +37 -0 vorbis/lib/books/floor/Attic/line_128x19_2sub1.vqh
1.1.2.1 +38 -0 vorbis/lib/books/floor/Attic/line_128x19_2sub2.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_128x19_2sub3.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_128x19_class1.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_128x19_class2.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_128x7_0sub0.vqh
1.1.2.1 +37 -0 vorbis/lib/books/floor/Attic/line_128x7_1sub1.vqh
1.1.2.1 +38 -0 vorbis/lib/books/floor/Attic/line_128x7_1sub2.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_128x7_1sub3.vqh
1.1.2.1 +37 -0 vorbis/lib/books/floor/Attic/line_128x7_2sub1.vqh
1.1.2.1 +38 -0 vorbis/lib/books/floor/Attic/line_128x7_2sub2.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_128x7_2sub3.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_128x7_class1.vqh
1.1.2.1 +40 -0 vorbis/lib/books/floor/Attic/line_128x7_class2.vqh
No revision
No revision
1.24.6.2 +3 -3 vorbis/vq/bookutil.c
Index: bookutil.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/bookutil.c,v
retrieving revision 1.24.6.1
retrieving revision 1.24.6.2
diff -u -r1.24.6.1 -r1.24.6.2
--- bookutil.c 2001/10/12 00:08:15 1.24.6.1
+++ bookutil.c 2001/12/07 08:52:47 1.24.6.2
@@ -11,7 +11,7 @@
********************************************************************
function: utility functions for loading .vqh and .vqd files
- last mod: $Id: bookutil.c,v 1.24.6.1 2001/10/12 00:08:15 xiphmont Exp $
+ last mod: $Id: bookutil.c,v 1.24.6.2 2001/12/07 08:52:47 xiphmont Exp $
********************************************************************/
@@ -191,7 +191,7 @@
}
/* find the codebook struct */
- find_seek_to(in,"static static_codebook _");
+ find_seek_to(in,"static static_codebook ");
/* get the major important values */
line=get_line(in);
@@ -708,7 +708,7 @@
/* tie it all together */
- fprintf(out,"static static_codebook _vq_book_%s = {\n",name);
+ fprintf(out,"static static_codebook %s = {\n",name);
fprintf(out,"\t%ld, %ld,\n",c->dim,c->entries);
fprintf(out,"\t_vq_lengthlist_%s,\n",name);
No revision
No revision
1.1.2.1 +39 -0 vorbis/vq/Attic/44c0_s4.vqs
--- >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