cleanup and commit in preparation for merge

svn path=/branches/branch_monty_20011009/vorbis/; revision=2588

7 files changed, 157 insertions, 256 deletions

diff --git a/vq/44c1_s3.vqs b/vq/44c1_s3.vqs
new file mode 100644
index 00000000..408735af
--- /dev/null
+++ b/vq/44c1_s3.vqs
@@ -0,0 +1,44 @@
+huffbuild line_128x9_class1.vqd 0-256
+huffbuild line_128x9_class2.vqd 0-256
+
+huffbuild line_128x9_0sub0.vqd 0-64
+huffbuild line_128x9_1sub1.vqd 1-9
+huffbuild line_128x9_1sub2.vqd 9-25
+huffbuild line_128x9_1sub3.vqd 25-64
+huffbuild line_128x9_2sub1.vqd 1-9
+huffbuild line_128x9_2sub2.vqd 9-25
+huffbuild line_128x9_2sub3.vqd 25-64
+
+cp resaux_short.vqd _44c1_short.vqd
+cp resaux_long.vqd _44c1_long.vqd
+
+GO
+
+>_44c1s noninterleaved
+haux _44c1_short.vqd 0,12,2
+
+>_44c1 noninterleaved
+haux _44c1_long.vqd 0,46,2
+	
+#iter 0
+
+#       0   1   2   4  26   1   4   +      
+#           0   0   0   0      
+#
+#       0   1   2   3   4   5   6   7
+#   1                   .           .
+#   2                   .           .
+#   4       .   .   .       .   .   .
+
+:_s0_p1_0 res_long_part1_it0.vqd, 4, nonseq cull, 0 +- 1 2
+:_s0_p2_0 res_long_part2_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_s0_p3_0 res_long_part3_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_s0_p4_0 res_long_part4_it0.vqd, 2, nonseq , 0 +- 7 14 21 28 35 42 49
++_s0_p4_1, 2, nonseq cull, 0 +- 1 2 3 
+:_s1_p5_0 res_long_part5_it0.vqd, 4, nonseq cull, 0 +- 1
+:_s2_p6_0 res_long_part6_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+
+:_s3_p7_0 res_long_part7_it0.vqd, 2, nonseq, 0 +- 67 134 201	
++_s3_p7_1, 2, nonseq, 0 +- 3 6 9 12 15 18 21 24 27 30 33
++_s3_p7_2, 4, nonseq, 0 +- 1 
+
diff --git a/vq/44c2_s2.vqs b/vq/44c2_s2.vqs
new file mode 100644
index 00000000..10f63fd3
--- /dev/null
+++ b/vq/44c2_s2.vqs
@@ -0,0 +1,33 @@
+cp resaux_short.vqd _44c2_short.vqd
+cp resaux_long.vqd _44c2_long.vqd
+
+GO
+
+>_44c2s noninterleaved
+haux _44c2_short.vqd 0,12,2
+
+>_44c2 noninterleaved
+haux _44c2_long.vqd 0,48,2
+	
+#iter 0
+
+#       0   1   2   4  26   1   4   +      
+#           0   0   0   0      
+#
+#       0   1   2   3   4   5   6   7
+#   1                   .           .
+#   2                   .           .
+#   4       .   .   .       .   .   .
+
+:_s0_p1_0 res_long_part1_it0.vqd, 4, nonseq cull, 0 +- 1 2
+:_s0_p2_0 res_long_part2_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_s0_p3_0 res_long_part3_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_s0_p4_0 res_long_part4_it0.vqd, 2, nonseq , 0 +- 7 14 21 28 35 42 49
++_s0_p4_1, 2, nonseq cull, 0 +- 1 2 3 
+:_s1_p5_0 res_long_part5_it0.vqd, 4, nonseq cull, 0 +- 1
+:_s2_p6_0 res_long_part6_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+
+:_s2_p7_0 res_long_part7_it0.vqd, 2, nonseq, 0 +- 67 134 201	
++_s2_p7_1, 2, nonseq, 0 +- 3 6 9 12 15 18 21 24 27 30 33
++_s2_p7_2, 4, nonseq, 0 +- 1 
+
diff --git a/vq/44c3_s2.vqs b/vq/44c3_s2.vqs
new file mode 100644
index 00000000..3592108b
--- /dev/null
+++ b/vq/44c3_s2.vqs
@@ -0,0 +1,44 @@
+huffbuild line_128x19_class1.vqd 0-64
+huffbuild line_128x19_class2.vqd 0-64
+
+huffbuild line_128x19_0sub0.vqd 0-128
+huffbuild line_128x19_1sub1.vqd 1-25
+huffbuild line_128x19_1sub2.vqd 18-50
+huffbuild line_128x19_1sub3.vqd 50-128
+huffbuild line_128x19_2sub1.vqd 1-18
+huffbuild line_128x19_2sub2.vqd 18-50
+huffbuild line_128x19_2sub3.vqd 50-128
+
+cp resaux_short.vqd _44c3_short.vqd
+cp resaux_long.vqd _44c3_long.vqd
+
+GO
+
+>_44c3s noninterleaved
+haux _44c3_short.vqd 0,14,2
+
+>_44c3 noninterleaved
+haux _44c3_long.vqd 0,52,2
+	
+#iter 0
+
+#       0   1   2   4  26   1   4   +      
+#           0   0   0   0      
+#
+#       0   1   2   3   4   5   6   7
+#   1                   .           .
+#   2                   .           .
+#   4       .   .   .       .   .   .
+
+:_s0_p1_0 res_long_part1_it0.vqd, 4, nonseq cull, 0 +- 1 2
+:_s0_p2_0 res_long_part2_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_s0_p3_0 res_long_part3_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_s0_p4_0 res_long_part4_it0.vqd, 2, nonseq , 0 +- 7 14 21 28 35 42 49
++_s0_p4_1, 2, nonseq cull, 0 +- 1 2 3 
+:_s1_p5_0 res_long_part5_it0.vqd, 4, nonseq cull, 0 +- 1
+:_s2_p6_0 res_long_part6_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+
+:_s2_p7_0 res_long_part7_it0.vqd, 2, nonseq, 0 +- 67 134 201	
++_s2_p7_1, 2, nonseq, 0 +- 3 6 9 12 15 18 21 24 27 30 33
++_s2_p7_2, 4, nonseq, 0 +- 1 
+
diff --git a/vq/44c4_s1.vqs b/vq/44c4_s1.vqs
new file mode 100644
index 00000000..daff1796
--- /dev/null
+++ b/vq/44c4_s1.vqs
@@ -0,0 +1,36 @@
+cp resaux_short.vqd _44c4_short.vqd
+cp resaux_long.vqd _44c4_long.vqd
+
+GO
+
+>_44c4s noninterleaved
+haux _44c4_short.vqd 0,16,2
+
+>_44c4 noninterleaved
+haux _44c4_long.vqd 0,60,2
+	
+#iter 0
+
+#     0   1   1   2   2   4   4  16  42   +      
+#         0       0       0    
+
+#     0   1   2   3   4   5   6   7   8   9
+# 1                               .   .   .
+# 2                               .   .   .
+# 4       .   .   .   .   .   .           .
+ 
+:_s0_p1_0 res_long_part1_it0.vqd, 4, nonseq cull, 0 +- 1 2
+:_s1_p2_0 res_long_part2_it0.vqd, 4, nonseq cull, 0 +- 1
+:_s0_p3_0 res_long_part3_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_s1_p4_0 res_long_part4_it0.vqd, 4, nonseq cull, 0 +- 1 2
+:_s0_p5_0 res_long_part5_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_s1_p6_0 res_long_part6_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_s1_p7_0 res_long_part7_it0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
++_s1_p7_1, 2, nonseq cull, 0 +- 1 2 
+:_s1_p8_0 res_long_part8_it0.vqd, 2, nonseq cull, 0 +- 13 26 39 52 65 78
++_s1_p8_1, 2, nonseq cull, 0 +- 1 2 3 4 5 6
+
+:_s1_p9_0 res_long_part9_it0.vqd, 2, nonseq, 0 +- 169 338 507 676 845 1014
++_s1_p9_1, 2, nonseq, 0 +- 13 26 39 52 65 78 
++_s1_p9_2, 2, nonseq, 0 +- 1 2 3 4 5 6
+
diff --git a/vq/res_44c_A.vqs b/vq/res_44c_A.vqs
deleted file mode 100644
index 2b01f87b..00000000
--- a/vq/res_44c_A.vqs
+++ /dev/null
@@ -1,69 +0,0 @@
-huffbuild line_128x19_class1.vqd 0-64
-huffbuild line_128x19_class2.vqd 0-64
-
-huffbuild line_128x19_0sub0.vqd 0-64
-huffbuild line_128x19_1sub1.vqd 1-9
-huffbuild line_128x19_1sub2.vqd 9-25
-huffbuild line_128x19_1sub3.vqd 25-64
-huffbuild line_128x19_2sub1.vqd 1-9
-huffbuild line_128x19_2sub2.vqd 9-25
-huffbuild line_128x19_2sub3.vqd 25-64
-
-huffbuild line_1024x31_class0.vqd 0-8
-huffbuild line_1024x31_class1.vqd 0-16
-huffbuild line_1024x31_class2.vqd 0-64
-huffbuild line_1024x31_class3.vqd 0-64
-
-huffbuild line_1024x31_0sub0.vqd 0-16
-huffbuild line_1024x31_0sub1.vqd 16-64
-
-huffbuild line_1024x31_1sub0.vqd 0-16
-huffbuild line_1024x31_1sub1.vqd 16-64
-
-huffbuild line_1024x31_2sub1.vqd 1-9
-huffbuild line_1024x31_2sub2.vqd 9-25
-huffbuild line_1024x31_2sub3.vqd 25-64
-huffbuild line_1024x31_3sub1.vqd 1-9
-huffbuild line_1024x31_3sub2.vqd 9-25
-huffbuild line_1024x31_3sub3.vqd 25-64
-
-residuesplit residue_0#0.vqd 0,224,16 res_A ,.7,    ,1.5,8 ,1.5 ,2.5,3 ,2.5,8 ,2.5 ,4.5 ,17.5 ,84.5 
-mv res_Aaux.vqd res_44c_A_128aux.vqd
-
-residuesplit residue_1#0.vqd residue_1#1.vqd 0,1792,32 res_B ,.7, ,1.5,32 ,1.5 ,2.5,18 ,2.5,32 ,2.5 ,4.5 ,17.5 ,84.5
-mv res_Baux.vqd res_44c_A_1024aux.vqd
-
-GO
-
->res_Ac_128 noninterleaved
-haux res_44c_A_128aux.vqd 0,14,2
-
->res_Ac noninterleaved
-haux res_44c_A_1024aux.vqd 0,56,2
-	
-:_1 res_B_1A.vqd, 4, nonseq cull, 0 +- 1
-:_2 res_B_2A.vqd, 4, nonseq cull, 0 +- 1
-:_3 res_B_3A.vqd, 4, nonseq cull, 0 +- 1 2
-:_4 res_B_4A.vqd, 4, nonseq cull, 0 +- 1 2
-:_5 res_B_5A.vqd, 4, nonseq cull, 0 +- 1 2
-:_6 res_B_6A.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_7 res_B_7A.vqd, 2, nonseq cull, 0 +- 5 10 15 
-+_7a, 4, nonseq cull, 0 +- 1 2
-
-:_8 res_B_8A.vqd, 2, nonseq cull, 0 +- 13 26 39 52 65 78 
-+_8a, 2, nonseq cull, 0 +- 1 2 3 4 5 6 
-
-:_9 res_B_9A.vqd, 2, nonseq, 0 +- 169 338 507
-+_9a, 2, nonseq, 0 +- 13 26 39 52 65 78 
-+_9b, 2, nonseq, 0 +- 1 2 3 4 5 6
-
-
-:_0a res_B_0B.vqd, 4, nonseq cull, 0 +- 1 2
-:_2a res_B_2B.vqd, 2, nonseq cull, 0 +- 1 2 3
-:_5a res_B_5B.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_7b res_B_7B.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6
-
-
-
-
-
diff --git a/vq/res_44c_Ab.vqs b/vq/res_44c_Ab.vqs
deleted file mode 100644
index eb26558a..00000000
--- a/vq/res_44c_Ab.vqs
+++ /dev/null
@@ -1,124 +0,0 @@
-huffbuild line_128x19_class1.vqd 0-64
-huffbuild line_128x19_class2.vqd 0-64
-
-huffbuild line_128x19_0sub0.vqd 0-64
-huffbuild line_128x19_1sub1.vqd 1-9
-huffbuild line_128x19_1sub2.vqd 9-25
-huffbuild line_128x19_1sub3.vqd 25-64
-huffbuild line_128x19_2sub1.vqd 1-9
-huffbuild line_128x19_2sub2.vqd 9-25
-huffbuild line_128x19_2sub3.vqd 25-64
-
-huffbuild line_1024x31_class0.vqd 0-8
-huffbuild line_1024x31_class1.vqd 0-16
-huffbuild line_1024x31_class2.vqd 0-64
-huffbuild line_1024x31_class3.vqd 0-64
-
-huffbuild line_1024x31_0sub0.vqd 0-16
-huffbuild line_1024x31_0sub1.vqd 16-64
-
-huffbuild line_1024x31_1sub0.vqd 0-16
-huffbuild line_1024x31_1sub1.vqd 16-64
-
-huffbuild line_1024x31_2sub1.vqd 1-9
-huffbuild line_1024x31_2sub2.vqd 9-25
-huffbuild line_1024x31_2sub3.vqd 25-64
-huffbuild line_1024x31_3sub1.vqd 1-9
-huffbuild line_1024x31_3sub2.vqd 9-25
-huffbuild line_1024x31_3sub3.vqd 25-64
-
-cp resaux_short.vqd res_44c_A_128aux.vqd
-cp resaux_long.vqd res_44c_A_1024aux.vqd
-
-GO
-
->res_Ac_128 noninterleaved
-haux res_44c_A_128aux.vqd 0,14,2
-
->res_Ac noninterleaved
-haux res_44c_A_1024aux.vqd 0,56,2
-	
-#       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               .       .       .   .   
-#
-#  16   .           .   .   .   .
-#  32       .   .                   .   .   .
-#  64   .           .   .   .   .
-# 128       .   .                   .   .   .
-#
-#      80 161 163  92  84  92  84 169 175 167
-
-#iter 0
-
-# fmag 4  #25
-:_1 res_long_part1_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
-
-# fmag 20 
-:_2 res_long_part2_it0.vqd, 2, nonseq, 0 +- 9 18 27 36 
-+_2a, 2, nonseq, 0 +- 1 2 3 4 
-
-:_3 res_long_part3_it0.vqd, 4, nonseq cull, 0 +- 1
-:_4 res_long_part4_it0.vqd, 4, nonseq cull, 0 +- 1
-
-:_5 res_long_part5_it0.vqd, 4, nonseq cull, 0 +- 1 2
-:_6 res_long_part6_it0.vqd, 4, nonseq cull, 0 +- 1 2
-
-:_7 res_long_part7_it0.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-
-#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
-
-:_9 res_long_part9_it0.vqd, 2, nonseq, 0 +- 169 338 507
-+_9a, 2, nonseq, 0 +- 13 26 39 52 65 78 
-+_9b, 2, nonseq, 0 +- 1 2 3 4 5 6
-
-#iter 1
-
-:_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
-
-:_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
-
-
-
-
-
-
-
-
diff --git a/vq/res_44c_Z.vqs b/vq/res_44c_Z.vqs
deleted file mode 100644
index 2b4859cf..00000000
--- a/vq/res_44c_Z.vqs
+++ /dev/null
@@ -1,63 +0,0 @@
-huffbuild line_128x7_class1.vqd 0-64
-huffbuild line_128x7_class2.vqd 0-64
-
-huffbuild line_128x7_0sub0.vqd 0-64
-huffbuild line_128x7_1sub1.vqd 1-9
-huffbuild line_128x7_1sub2.vqd 9-25
-huffbuild line_128x7_1sub3.vqd 25-64
-huffbuild line_128x7_2sub1.vqd 1-9
-huffbuild line_128x7_2sub2.vqd 9-25
-huffbuild line_128x7_2sub3.vqd 25-64
-
-huffbuild line_1024x31_class0.vqd 0-8
-huffbuild line_1024x31_class1.vqd 0-16
-huffbuild line_1024x31_class2.vqd 0-64
-huffbuild line_1024x31_class3.vqd 0-64
-
-huffbuild line_1024x31_0sub0.vqd 0-16
-huffbuild line_1024x31_0sub1.vqd 16-64
-
-huffbuild line_1024x31_1sub0.vqd 0-16
-huffbuild line_1024x31_1sub1.vqd 16-64
-
-huffbuild line_1024x31_2sub1.vqd 1-9
-huffbuild line_1024x31_2sub2.vqd 9-25
-huffbuild line_1024x31_2sub3.vqd 25-64
-huffbuild line_1024x31_3sub1.vqd 1-9
-huffbuild line_1024x31_3sub2.vqd 9-25
-huffbuild line_1024x31_3sub3.vqd 25-64
-
-residuesplit residue_0#0.vqd 0,144,12 res_A ,.5 ,1.5,4 ,2.5,4 ,7.5,4 2,1.5 ,1.5 ,2.5 ,7.5 ,22.5
-mv res_Aaux.vqd res_44c_Z_128aux.vqd
-
-residuesplit residue_1#0.vqd 0,1408,32 res_B ,.5 ,1.5,18 ,2.5,18 ,7.5,18 3,1.5 ,1.5 ,2.5 ,7.5 ,22.5
-mv res_Baux.vqd res_44c_Z_1024aux.vqd
-
-GO
-
->res_Zc_128 noninterleaved
-haux res_44c_Z_128aux.vqd 0,12,3
-
->res_Zc noninterleaved
-haux res_44c_Z_1024aux.vqd 0,44,2
-
-:_1 res_B_1.vqd, 4, nonseq cull, 0 +- 1 
-:_2 res_B_2.vqd, 4, nonseq cull, 0 +- 1 2 
-:_3 res_B_3.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7
-
-:_4 res_B_4.vqd, 4, nonseq cull, 0 +- 1
-:_5 res_B_5.vqd, 4, nonseq cull, 0 +- 1
-:_6 res_B_6.vqd, 4, nonseq cull, 0 +- 1 2
-:_7 res_B_7.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7
-:_8 res_B_8.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
-
-:_9 res_B_9.vqd, 4, nonseq, 0 +- 67 134
-+_9a, 2, nonseq, 0 +- 3 6 9 12 15 18 21 24 27 30 33
-+_9b, 4, nonseq, 0 +- 1
-
-
-
-
-
-
-