[xiph-cvs] cvs commit: vorbis/vq res_44c_Ab.vqs
Monty
xiphmont at xiph.org
Mon Oct 22 00:34:24 PDT 2001
xiphmont 01/10/22 00:34:23
Modified: lib/modes Tag: branch_monty_20011009 mode_44c_A.h
vq Tag: branch_monty_20011009 res_44c_Ab.vqs
Log:
Oops. Forgot to commit the rest of the bloody thing.
Monty
Revision Changes Path
No revision
No revision
1.4.2.8 +40 -47 vorbis/lib/modes/mode_44c_A.h
Index: mode_44c_A.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_44c_A.h,v
retrieving revision 1.4.2.7
retrieving revision 1.4.2.8
diff -u -r1.4.2.7 -r1.4.2.8
--- mode_44c_A.h 2001/10/20 03:00:11 1.4.2.7
+++ mode_44c_A.h 2001/10/22 07:34:22 1.4.2.8
@@ -11,7 +11,7 @@
********************************************************************
function: predefined encoding modes; 44kHz stereo ~64kbps true VBR
- last mod: $Id: mode_44c_A.h,v 1.4.2.7 2001/10/20 03:00:11 xiphmont Exp $
+ last mod: $Id: mode_44c_A.h,v 1.4.2.8 2001/10/22 07:34:22 xiphmont Exp $
********************************************************************/
@@ -54,27 +54,23 @@
#include "books/res_Ac_0.vqh"
#include "books/res_Ac_0a.vqh"
-#include "books/res_Ac_0b.vqh"
#include "books/res_Ac_1.vqh"
#include "books/res_Ac_1a.vqh"
+#include "books/res_Ac_1b.vqh"
#include "books/res_Ac_2.vqh"
#include "books/res_Ac_2a.vqh"
-#include "books/res_Ac_2b.vqh"
-#include "books/res_Ac_2c.vqh"
#include "books/res_Ac_3.vqh"
#include "books/res_Ac_3a.vqh"
-#include "books/res_Ac_3b.vqh"
#include "books/res_Ac_4.vqh"
#include "books/res_Ac_4a.vqh"
#include "books/res_Ac_4b.vqh"
-#include "books/res_Ac_4c.vqh"
#include "books/res_Ac_5.vqh"
#include "books/res_Ac_5a.vqh"
-#include "books/res_Ac_5b.vqh"
#include "books/res_Ac_6.vqh"
-#include "books/res_Ac_6a.vqh"
#include "books/res_Ac_7.vqh"
#include "books/res_Ac_7a.vqh"
+#include "books/res_Ac_7b.vqh"
+#include "books/res_Ac_7c.vqh"
#include "books/res_Ac_8.vqh"
#include "books/res_Ac_8a.vqh"
#include "books/res_Ac_8b.vqh"
@@ -98,8 +94,7 @@
static struct vp_couple_pass _psy_pass_44c_A0[]={
{1.f,1.f,
{{ 24, 0, 9e10, 0},
- { 64, 0, 9e10, 4.5},
- {9999, 0, 9e10, 7.5}}
+ {9999, 0, 9e10, 4.5}}
},
{1.f,1.f,
{{ 64, 0, 9e10, 0},
@@ -118,8 +113,7 @@
static vp_couple_pass _psy_pass_44c_A[]={
{1.f,1.f,
{{ 288, 0, 9e10, 0},
- { 512, 0, 9e10, 4.5},
- {9999, 0, 9e10, 7.5}}
+ {9999, 0, 9e10, 4.5}}
},
{1.f,1.f,
{{ 512, 0, 9e10, 0},
@@ -135,6 +129,27 @@
},
};
+static vorbis_info_residue0 _residue_set_44c_A0={
+ 0,224, 16, 10,23,
+ /* 0 1 2 3 4 5 6 7 8 9 */
+ { 80, 161, 163, 92, 84, 92, 84, 169, 175, 167},
+ {25,26, 27,28,29, 30,31,28,29, 32,33,28,29, 34,35,36, 37,38,28,29, 39,35,36, 40,41,42,43, 44,45,46,41,28,29, 47,48,49,28,29},
+ { 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999},
+ { .5, 4.5, 20.5, 1.5, 1.5, 2.5, 2.5, 4.5, 98.5},
+ {0},
+ { 99, 3, 3, 8, 99, 8, 99, 99, 99}};
+
+static vorbis_info_residue0 _residue_set_44c_A={
+ 0,1792, 32,10,24,
+ /* 0 1 2 3 4 5 6 7 8 9 */
+ { 80, 161, 163, 92, 84, 92, 84, 169, 175, 167},
+ {25,26, 27,28,29, 30,31,28,29, 32,33,28,29, 34,35,36, 37,38,28,29, 39,35,36, 40,41,42,43, 44,45,46,41,28,29, 47,48,49,28,29},
+ { 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999},
+ { .5, 4.5, 20.5, 1.5, 1.5, 2.5, 2.5, 4.5, 98.5},
+ {0},
+ { 99, 18, 18, 32, 99, 32, 99, 99, 99}};
+
+
static float _psy_compand_44c_A[NOISE_COMPAND_LEVELS]={
0.f, 1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, /* 7dB */
8.f, 8.f, 7.f, 6.f, 5.f, 4.f, 4.f, 4.f, /* 15dB */
@@ -274,24 +289,6 @@
20,600,
896};
-static vorbis_info_residue0 _residue_set_44c_A0={
- 0,224, 16, 10,23,
- { 97, 3, 120, 104, 116, 104, 17, 3, 7, 7},
- {25,26,27, 28,29, 30,31,32,33, 34,35,36, 37,38,39,40, 41,42,43, 44,45, 46,47, 48,49,50, 51,52,53},
- { 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999},
- { 4.5, 20.5, 1.5, 1.5, 2.5, 2.5, 4.5, 20.5, 98.5},
- {0},
- { 3, 3, 8, 99, 8, 99, 99, 99, 99}};
-
-static vorbis_info_residue0 _residue_set_44c_A={
- 0,1792, 32,10,24,
- { 97, 3, 116, 100, 114, 98, 17, 3, 7, 7},
- {25,26,27, 28,29, 30,31,32,33, 34,35,36, 37,38,39,40, 41,42,43, 44,45, 46,47, 48,49,50, 51,52,53},
- { 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999},
- { 4.5, 20.5, 1.5, 1.5, 2.5, 2.5, 4.5, 20.5, 98.5},
- {0},
- { 18, 18, 32, 99, 32, 99, 99, 99, 99}};
-
static vorbis_info_mapping0 _mapping_set_44c_A0={
1, {0,0}, {0}, {0}, {0}, {0,0}, 1,{0},{1}};
static vorbis_info_mapping0 _mapping_set_44c_A={
@@ -305,7 +302,7 @@
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
- 2, 2, 1, 2, 2, 54, 3,
+ 2, 2, 1, 2, 2, 50, 3,
/* modes */
{&_mode_set_44c_A0,&_mode_set_44c_A},
/* maps */
@@ -351,31 +348,27 @@
&_vq_book_res_Ac_0, /* 25 */
&_vq_book_res_Ac_0a,
- &_vq_book_res_Ac_0b,
- &_vq_book_res_Ac_1, /* 28 */
+ &_vq_book_res_Ac_1, /* 27 */
&_vq_book_res_Ac_1a,
+ &_vq_book_res_Ac_1b,
&_vq_book_res_Ac_2, /* 30 */
&_vq_book_res_Ac_2a,
- &_vq_book_res_Ac_2b,
- &_vq_book_res_Ac_2c,
- &_vq_book_res_Ac_3, /* 34 */
+ &_vq_book_res_Ac_3, /* 32 */
&_vq_book_res_Ac_3a,
- &_vq_book_res_Ac_3b,
- &_vq_book_res_Ac_4, /* 37 */
+ &_vq_book_res_Ac_4, /* 34 */
&_vq_book_res_Ac_4a,
&_vq_book_res_Ac_4b,
- &_vq_book_res_Ac_4c,
- &_vq_book_res_Ac_5, /* 41 */
+ &_vq_book_res_Ac_5, /* 37 */
&_vq_book_res_Ac_5a,
- &_vq_book_res_Ac_5b,
- &_vq_book_res_Ac_6, /* 44 */
- &_vq_book_res_Ac_6a,
- &_vq_book_res_Ac_7, /* 46 */
+ &_vq_book_res_Ac_6, /* 39 */
+ &_vq_book_res_Ac_7, /* 40 */
&_vq_book_res_Ac_7a,
- &_vq_book_res_Ac_8, /* 48 */
+ &_vq_book_res_Ac_7b,
+ &_vq_book_res_Ac_7c,
+ &_vq_book_res_Ac_8, /* 44 */
&_vq_book_res_Ac_8a,
&_vq_book_res_Ac_8b,
- &_vq_book_res_Ac_9, /* 51 */
+ &_vq_book_res_Ac_9, /* 47 */
&_vq_book_res_Ac_9a,
&_vq_book_res_Ac_9b,
@@ -387,13 +380,13 @@
/* progressive coding and bitrate controls */
110000,90000, 0,0,
- 4., 112000, 140000,
+ 3., 112000, 140000,
124000, 128000,
4.0, 0., -1., .05,
-.05, .05,
- {4,5,6,7},
+ {3,4,6,8},
4,
};
No revision
No revision
1.1.2.2 +46 -56 vorbis/vq/Attic/res_44c_Ab.vqs
Index: res_44c_Ab.vqs
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/Attic/res_44c_Ab.vqs,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- res_44c_Ab.vqs 2001/10/20 01:04:09 1.1.2.1
+++ res_44c_Ab.vqs 2001/10/22 07:34:23 1.1.2.2
@@ -38,64 +38,41 @@
>res_Ac noninterleaved
haux res_44c_A_1024aux.vqd 0,56,2
-#short
-# 4 20 1 1 2 2 4 20 98 +
-# 0 0 1 1
+# 0 4 20 1 1 2 2 4 98 +
+# 0 0 1 1
#
# 0 1 2 3 4 5 6 7 8 9
-# 1 . . . . . .
-# 2 . . . .
-# 4 . . .
-# 8 . . .
+# 1 . . . . .
+# 2 . . .
+# 4 . . . . . .
#
-# 16 . . .
+# 8 . . . .
#
-# 32 . . . . .
+# 16 . . . . .
+# 32 . . . . .
+# 64 . . . . .
+# 128 . . . . .
#
-# 64 . . . . .
-#
-# 127 97 3 120 104 116 104 17 3 7 7
-
-#long
-# 4 22 1 1 2 2 4 22 98 +
-# 0 0 1 1
-#
-# 0 1 2 3 4 5 6 7 8 9
-# 1 . . . . . .
-# 2 . . . . . .
-# 4 . . . .
-# 8
-#
-# 16 . . .
-#
-# 32 . . . . .
-#
-# 64 . . . . .
-#
-# 127 97 3 116 100 114 98 17 3 7 7
+# 80 161 163 92 84 92 84 169 175 167
#iter 0
-# fmag 4
-:_0 res_long_part0_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+# fmag 4 #25
+:_1 res_long_part1_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
-# fmag 20
-:_1 res_long_part1_it0.vqd, 2, nonseq, 0 +- 9 18 27 36
-+_1a, 2, nonseq, 0 +- 1 2 3 4
+# fmag 20
+:_2 res_long_part2_it0.vqd, 2, nonseq, 0 +- 9 18 27 36
++_2a, 2, nonseq, 0 +- 1 2 3 4
-:_2 res_long_part2_it0.vqd, 4, nonseq cull, 0 +- 1
:_3 res_long_part3_it0.vqd, 4, nonseq cull, 0 +- 1
+:_4 res_long_part4_it0.vqd, 4, nonseq cull, 0 +- 1
-:_4 res_long_part4_it0.vqd, 4, nonseq cull, 0 +- 1 2
:_5 res_long_part5_it0.vqd, 4, nonseq cull, 0 +- 1 2
+:_6 res_long_part6_it0.vqd, 4, nonseq cull, 0 +- 1 2
-:_6 res_long_part6_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_7 res_long_part7_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-#fmag 20
-:_7 res_long_part7_it0.vqd, 2, nonseq, 0 +- 9 18 27 36
-+_7a, 2, nonseq, 0 +- 1 2 3 4
-
-#fmag 98
+#fmag 98 #33
:_8 res_long_part8_it0.vqd, 2, nonseq, 0 +- 55 110 165
+_8a, 2, nonseq, 0 +- 9 18 27
+_8b, 2, nonseq, 0 +- 1 2 3 4
@@ -106,25 +83,38 @@
#iter 1
-:_2a res_long_part2_it1.vqd, 4, nonseq cull, 0 +- 1 2
-:_4a res_long_part4_it1.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_6a res_long_part6_it1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_3a res_long_part3_it1.vqd, 4, nonseq cull, 0 +- 1 2
+:_5a res_long_part5_it1.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_7a res_long_part7_it1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+#7a :_8c ..41
#iter 2
-:_0a res_long_part0_it2.vqd, 2, nonseq cull, 0 +- .333333 .666667
-:_2b res_long_part2_it2.vqd, 2, nonseq cull, 0 +- .333333 .666667
-:_3a res_long_part3_it2.vqd, 2, nonseq cull, 0 +- .333333
-:_4b res_long_part4_it2.vqd, 2, nonseq cull, 0 +- .333333 .666667
-:_5a res_long_part5_it2.vqd, 2, nonseq cull, 0 +- .333333
+:_0 res_long_part0_it2.vqd, 2, nonseq cull, 0 +- .333333 .666667
+:_1a res_long_part1_it2.vqd, 2, nonseq cull, 0 +- .333333 .666667
+#1a :_2b ..28
+#1a :_3b ..28
+:_4a res_long_part4_it2.vqd, 2, nonseq cull, 0 +- .333333
+#1a :_5b ..28
+#4a :_6a ..35
+:_7b res_long_part7_it2.vqd, 2, nonseq cull, 0 +- .333333 .666667
+#1a :_8d ..28
+#1a :_9c ..28
#iter 3
+
+:_0a res_long_part0_it3.vqd, 2, nonseq cull, 0 +- .111111 .222222
+:_1b res_long_part1_it3.vqd, 2, nonseq cull, 0 +- .111111 .222222
+#1b :_2c ..29
+#1b :_3c ..29
+:_4b res_long_part4_it3.vqd, 2, nonseq cull, 0 +- .111111
+#1b :_5c ..29
+#4b :_6b ..36
+#1b :_7c ..29
+:_7c res_long_part8_it3.vqd, 2, nonseq cull, 0 +- .111111 .222222
+#1b :_8e ..29
+#1b :_9d ..29
-:_0b res_long_part0_it3.vqd, 2, nonseq cull, 0 +- .111111 .222222
-:_2c res_long_part2_it3.vqd, 2, nonseq cull, 0 +- .111111 .222222
-:_3b res_long_part3_it3.vqd, 2, nonseq cull, 0 +- .111111
-:_4c res_long_part4_it3.vqd, 2, nonseq cull, 0 +- .111111 .222222
-:_5b res_long_part5_it3.vqd, 2, nonseq cull, 0 +- .111111
--- >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