Merge of the current Monty branch; this brings in new psychoacoustic

[platform/upstream/libvorbis.git] / include / vorbis / book / res0a_4.vqh

diff --git a/include/vorbis/book/res0a_4.vqh b/include/vorbis/book/res0a_4.vqh
index ef64452..f90183e 100644 (file)
--- a/include/vorbis/book/res0a_4.vqh
+++ b/include/vorbis/book/res0a_4.vqh
@@ -25,183 +25,70 @@ static long _vq_quantlist_res0a_4[] = {
        2,
        3,
        4,
-       5,
-       6,
 };
 
 static long _vq_lengthlist_res0a_4[] = {
-       18,17,18,17,17,19,18,18,17,15,15,16,17,18,18,16,
-       14,14,14,16,17,17,15,14,13,14,15,17,17,16,15,14,
-       14,16,17,19,17,16,15,16,17,18,21,18,17,17,17,19,
-       20,17,17,15,15,15,16,18,17,15,14,13,14,16,17,16,
-       14,13,12,13,14,16,15,14,12,11,12,13,15,16,14,13,
-       12,13,14,16,17,15,14,13,14,16,17,17,16,16,15,16,
-       16,19,18,16,14,14,14,16,17,16,14,13,12,13,14,16,
-       14,13,11,10,11,13,15,14,12,11, 9,10,12,14,15,13,
-       11,10,11,13,14,15,14,13,12,13,14,16,18,16,15,14,
-       15,16,17,17,16,14,13,14,16,16,15,14,12,11,12,14,
-       15,14,12,11,10,11,12,14,13,11,10, 8, 9,11,13,14,
-       12,10,10,11,12,14,15,14,12,11,12,13,15,17,15,14,
-       13,14,15,16,17,16,15,14,15,16,17,16,14,13,12,13,
-       14,15,15,13,11,10,11,13,15,14,12,10, 9,11,12,14,
-       15,13,11,10,11,13,15,16,14,13,12,13,14,16,18,16,
-       15,14,15,15,19,18,17,16,15,15,17,18,17,15,14,13,
-       14,15,16,16,14,13,12,13,14,16,15,13,12,11,12,14,
-       15,16,14,13,12,13,14,16,16,15,14,14,14,15,17,18,
-       17,16,15,15,17,18,18,18,17,16,16,17,19,19,16,16,
-       15,16,17,17,17,16,15,13,14,16,17,16,15,14,13,14,
-       15,17,17,16,15,14,15,16,16,19,17,16,15,16,18,19,
-       19,18,18,17,18,18,21,17,16,15,15,16,17,18,17,15,
-       14,13,14,15,17,16,14,13,12,13,15,16,15,13,12,11,
-       12,14,15,16,14,13,12,13,14,16,17,15,14,13,14,16,
-       16,19,17,16,15,16,17,18,16,15,14,13,14,15,17,15,
-       14,13,13,14,15,15,14,13,12,11,12,13,14,13,13,12,
-       11,11,13,14,14,13,12,11,12,13,14,16,15,13,13,13,
-       14,15,17,15,14,13,14,15,17,16,14,13,12,13,14,16,
-       14,13,12,11,12,13,14,13,12,11,10,11,12,13,12,11,
-       10, 9,10,12,12,13,12,11,10,11,12,13,14,13,12,11,
-       12,13,14,15,14,13,12,13,14,16,16,13,12,11,12,13,
-       15,13,13,12,11,12,13,13,12,12,10, 9,10,12,12,11,
-       11, 9, 8, 9,11,11,12,11,10, 9,10,11,12,13,13,11,
-       11,12,13,14,15,13,12,11,12,13,15,16,14,13,12,13,
-       14,15,14,14,12,11,12,13,14,13,12,11,10,11,12,13,
-       12,12,10, 9,10,12,12,13,12,11,10,11,12,13,14,13,
-       12,12,12,14,14,15,14,13,12,13,14,16,17,15,14,13,
-       14,15,16,16,14,14,13,13,14,15,14,14,12,11,12,13,
-       14,14,13,12,11,11,13,13,14,13,12,11,12,13,14,16,
-       14,13,13,13,14,16,16,16,14,14,14,16,16,18,16,16,
-       15,16,16,17,17,15,14,13,14,15,17,16,14,13,12,13,
-       14,16,15,14,12,11,12,14,16,16,14,13,12,13,14,16,
-       18,16,14,13,14,16,17,17,17,16,16,16,17,17,16,15,
-       14,14,14,16,17,16,14,13,12,13,14,16,14,13,11,10,
-       11,13,15,14,12,11,10,11,12,14,15,13,11,10,11,13,
-       15,15,14,13,12,13,14,15,17,16,14,14,14,15,17,15,
-       14,13,12,13,14,16,14,13,12,11,12,13,14,13,12,11,
-       10,11,12,13,12,11,10, 9,10,11,12,13,12,11,10,11,
-       12,13,14,13,12,11,12,13,14,16,14,13,12,13,14,16,
-       14,13,11,10,11,13,15,13,12,11,10,11,12,13,11,11,
-        9, 8, 9,11,11,10,10, 9, 8, 9,10,10,11,11, 9, 9,
-        9,11,11,13,12,11,10,11,12,13,14,13,11,11,11,13,
-       14,14,12,10,10,11,12,14,12,11,10, 9,10,11,12,10,
-       10, 9, 8, 8,10,10, 9, 9, 8, 7, 8, 9, 9,10,10, 9,
-        8, 9,10,10,12,11,10, 9,10,11,12,14,12,10, 9,10,
-       12,14,14,13,11,11,11,12,15,13,12,11,10,11,12,13,
-       11,11, 9, 9, 9,11,11,10,10, 9, 8, 9,10,10,11,11,
-        9, 9, 9,11,11,13,12,11,10,11,12,13,14,13,11,11,
-       11,13,14,16,14,13,12,13,14,15,14,13,12,11,12,13,
-       14,13,12,11,10,11,12,13,12,11,10, 9,10,12,12,13,
-       12,11,10,11,12,13,14,13,12,11,12,13,14,15,14,13,
-       12,13,14,16,17,16,15,14,14,15,17,15,14,13,12,13,
-       14,15,14,13,11,10,11,13,15,14,12,10,10,11,12,14,
-       14,13,11,10,11,13,14,16,14,13,12,13,14,15,18,16,
-       15,14,15,16,17,16,15,14,13,14,15,16,15,13,12,11,
-       12,14,15,13,12,10, 9,10,12,14,13,11,10, 8,10,11,
-       13,14,12,10, 9,10,12,14,15,13,12,11,12,13,15,16,
-       15,14,13,14,15,17,15,13,12,11,12,13,15,13,12,11,
-       10,11,13,13,12,11,10, 9,10,11,12,11,11, 9, 8, 9,
-       11,11,12,12,10, 9,10,11,12,13,12,11,11,11,13,13,
-       15,13,12,11,12,13,15,14,12,10, 9,10,12,14,12,11,
-       10, 9,10,11,12,10,10, 8, 8, 8,10,10, 9, 9, 8, 7,
-        8, 9, 9,10,10, 8, 8, 8,10,10,12,11,10, 9,10,11,
-       12,13,12,10, 9,10,12,13,12,11, 9, 8, 9,11,13,11,
-       10, 9, 8, 9,10,11, 9, 9, 8, 7, 8, 9, 9, 8, 8, 7,
-        5, 7, 8, 8, 9, 9, 8, 7, 8, 9, 9,11,11, 9, 8, 9,
-       10,11,13,11, 9, 8, 9,11,13,14,12,10, 9,10,12,14,
-       12,11,10, 9,10,11,12,10,10, 8, 8, 9,10,10, 9, 9,
-        8, 7, 8, 9, 9,10,10, 8, 8, 8,10,10,12,11,10, 9,
-       10,11,12,14,12,10, 9,10,12,13,15,13,12,11,12,13,
-       15,13,13,11,11,11,12,13,12,11,10, 9,10,11,12,11,
-       11, 9, 8, 9,11,11,12,11,10, 9,10,11,12,14,13,11,
-       11,11,12,13,15,13,12,11,12,13,15,16,15,14,13,14,
-       15,16,15,13,12,11,12,13,15,14,12,10, 9,10,12,14,
-       13,11,10, 8,10,11,13,14,12,11, 9,10,12,14,15,14,
-       12,11,12,13,15,16,15,14,13,14,15,16,17,16,14,14,
-       15,16,16,16,14,13,12,13,14,16,15,13,11,10,11,13,
-       15,14,12,11,10,11,12,14,15,13,11,10,11,13,14,15,
-       14,13,12,13,14,16,17,15,15,14,14,16,17,16,14,13,
-       12,13,14,16,14,13,12,11,12,13,14,13,12,11,10,11,
-       12,13,12,12,10, 9,10,11,12,13,12,11,10,11,12,13,
-       14,13,12,11,12,13,14,16,14,13,12,13,14,15,14,13,
-       11,11,11,13,15,13,12,11,10,11,12,13,11,11, 9, 9,
-        9,11,11,10,10, 9, 8, 9,10,10,11,11, 9, 9, 9,11,
-       11,13,12,11,10,11,12,13,14,13,11,10,11,13,14,14,
-       12,10,10,10,12,14,12,11,10, 9,10,11,12,10,10, 9,
-        8, 9,10,10, 9, 9, 8, 7, 8, 9, 9,10,10, 9, 8, 9,
-       10,10,12,11,10, 9,10,11,12,14,12,11,10,10,12,14,
-       14,13,11,10,11,13,14,13,12,11,10,11,12,13,11,11,
-        9, 9, 9,11,11,10,10, 9, 8, 9,10,10,11,11, 9, 9,
-        9,11,11,13,12,11,10,11,12,13,14,13,11,10,11,12,
-       14,16,14,13,12,13,14,16,14,13,12,11,12,13,14,12,
-       12,11,10,11,12,13,12,12,10, 9,10,12,12,13,12,11,
-       10,11,12,13,14,13,12,11,12,13,14,16,14,13,12,13,
-       14,16,19,16,15,14,14,15,17,16,14,13,12,13,14,16,
-       14,13,11,10,11,13,15,14,12,11, 9,10,12,14,15,13,
-       11,10,11,13,15,16,14,13,12,13,14,16,17,17,15,14,
-       14,15,17,18,16,16,15,15,17,19,17,15,14,13,14,15,
-       18,16,14,13,12,13,14,15,15,14,12,11,12,14,15,16,
-       14,13,12,13,14,16,16,15,14,13,14,15,16,18,16,16,
-       15,16,18,18,16,15,14,14,14,15,17,16,15,14,13,13,
-       14,16,14,13,12,12,12,13,14,14,13,11,11,11,13,13,
-       14,13,12,11,12,14,14,15,14,13,13,13,15,15,16,15,
-       14,13,14,16,17,16,14,13,12,13,14,16,14,13,12,11,
-       12,13,14,13,12,11,10,11,12,13,12,12,10, 9,10,12,
-       12,13,12,11,10,11,12,13,14,13,12,11,12,14,14,16,
-       14,13,12,13,15,16,15,14,12,11,12,13,15,13,13,11,
-       11,11,13,13,12,11,10, 9,10,11,12,11,11, 9, 8, 9,
-       11,11,12,12,10, 9,10,12,12,13,13,11,11,11,13,13,
-       15,14,12,11,12,14,15,16,14,13,12,13,14,16,14,13,
-       12,11,12,13,14,13,12,11,10,11,12,13,12,11,10, 9,
-       10,12,12,13,12,11,10,11,12,13,14,13,12,12,12,13,
-       14,16,14,13,12,13,14,16,16,15,14,14,14,16,16,16,
-       14,13,13,13,15,16,14,13,12,11,12,13,14,13,13,11,
-       11,11,13,14,14,13,12,11,12,13,14,15,15,13,13,13,
-       14,15,16,16,14,13,14,15,16,18,17,16,15,16,17,19,
-       17,15,14,13,14,16,17,16,14,13,12,13,14,16,15,13,
-       12,11,12,13,15,16,14,13,12,13,14,16,17,15,14,13,
-       14,15,17,18,17,15,15,16,16,18,20,18,17,18,17,18,
-       19,18,17,16,15,16,17,18,17,16,15,14,15,16,18,16,
-       15,14,13,14,15,16,17,16,15,14,14,16,17,18,16,15,
-       15,16,17,18,19,17,16,16,17,19,18,18,18,16,15,16,
-       17,18,16,15,14,14,14,15,17,16,14,13,12,13,14,17,
-       15,13,12,11,12,14,15,16,14,13,12,13,14,16,17,16,
-       14,13,14,15,17,19,17,16,15,16,16,18,17,16,15,14,
-       15,15,17,16,14,13,12,13,14,16,15,13,11,11,11,13,
-       14,14,12,10, 9,10,12,14,15,13,11,11,11,13,15,16,
-       15,13,12,13,14,16,17,16,14,14,14,16,17,16,15,14,
-       13,14,15,16,15,14,12,11,12,14,15,14,12,11,10,11,
-       12,14,13,11,10, 8,10,11,13,14,12,11,10,11,12,14,
-       15,13,12,11,12,14,15,17,15,14,13,14,15,16,18,16,
-       14,14,14,16,17,15,14,13,12,13,14,16,15,13,11,10,
-       11,13,14,14,12,10, 9,11,12,14,15,13,11,10,11,13,
-       15,16,14,13,12,13,14,15,16,16,15,14,14,16,19,19,
-       18,16,15,16,17,18,18,16,14,14,14,15,17,16,14,13,
-       12,13,14,16,15,13,12,11,12,13,15,16,14,13,12,13,
-       14,16,16,16,14,13,14,16,16,18,17,16,15,16,16,20,
-       19,17,17,16,18,17,19,17,17,16,15,16,17,20,17,16,
-       15,14,15,16,18,16,15,14,13,14,15,17,17,16,14,14,
-       15,16,17,18,17,16,15,16,17,19,20,18,17,16,18,17,
-       17,
+       19,15,15,16,18,16,14,13,14,16,15,13,12,13,15,16,
+       14,13,14,16,18,16,15,17,19,16,14,13,14,16,14,11,
+       10,11,14,13,10, 9,10,13,14,11,10,11,14,16,14,13,
+       14,16,16,13,12,13,15,13,10, 9,10,13,12, 9, 8, 9,
+       12,13,10, 9,10,13,16,13,12,13,15,17,14,13,14,16,
+       14,11,10,11,14,13,10, 9,10,13,14,11,10,11,14,16,
+       14,13,14,16,18,16,15,16,19,17,14,13,14,16,15,13,
+       12,13,15,16,14,13,14,16,18,16,16,17,18,16,14,13,
+       14,16,14,11,10,11,14,13,10, 9,10,13,14,11,10,11,
+       14,16,14,13,14,15,13,11,10,11,14,11, 9, 8, 9,11,
+       10, 8, 7, 8,10,11, 9, 8, 9,11,14,11,10,11,13,13,
+       10, 9,10,12,10, 8, 7, 8,10, 9, 7, 6, 7, 9,10, 8,
+        7, 8,10,13,10, 9,10,12,13,11,10,11,13,11, 9, 8,
+        9,11,10, 8, 7, 8,10,11, 9, 8, 9,11,14,11,10,11,
+       13,17,14,13,13,16,14,11,10,11,14,13,10, 9,10,13,
+       13,11,10,11,14,16,14,13,14,16,15,13,12,13,15,13,
+       10, 9,10,13,12, 9, 8, 9,12,13,10, 9,10,13,15,13,
+       12,13,15,12,10, 9,10,13,10, 7, 6, 7,10, 9, 6, 5,
+        6, 9,10, 7, 6, 8,10,13,10, 9,10,13,12, 9, 8, 9,
+       11, 9, 6, 5, 6, 9, 8, 5, 5, 5, 8, 9, 6, 5, 6, 9,
+       11, 9, 8, 9,11,13,10, 9,10,13,10, 7, 6, 7,10, 9,
+        6, 5, 7, 9,10, 7, 6, 7,10,13,10, 9,10,13,15,13,
+       12,13,15,13,10, 9,10,13,12, 9, 8, 9,12,13,10, 9,
+       10,13,15,13,12,13,14,16,14,13,14,16,14,11,10,11,
+       13,13,10, 9,10,13,14,11,10,11,13,16,14,13,13,17,
+       14,11,10,11,14,11, 9, 8, 9,11,10, 8, 7, 8,10,11,
+        9, 8, 9,11,14,11,10,11,14,13,10, 9,10,13,10, 7,
+        7, 8,10, 9, 6, 6, 7, 9,10, 7, 7, 8,10,13,10, 9,
+       10,13,14,11,10,11,14,11, 9, 8, 9,11,10, 8, 7, 8,
+       10,11, 9, 8, 9,11,14,11,10,11,13,16,14,13,14,16,
+       14,11,10,11,13,13,10, 9,10,13,14,11,10,11,13,16,
+       14,13,14,16,17,16,16,15,18,16,14,13,14,16,15,13,
+       12,13,15,16,14,13,14,16,19,16,15,16,19,16,14,13,
+       14,16,14,11,10,11,14,13,10, 9,10,13,14,11,10,11,
+       14,16,14,13,14,16,15,13,12,13,15,13,10, 9,10,13,
+       12, 9, 8, 9,12,13,10, 9,10,13,15,13,12,13,15,16,
+       14,13,14,16,14,11,10,11,14,13,10, 9,10,13,14,11,
+       10,11,14,17,14,13,13,16,19,16,15,16,18,17,14,13,
+       14,17,15,13,12,13,15,16,14,13,14,16,18,16,15,16,
+       18,
 };
 
 static double _vq_quantthresh_res0a_4[] = {
-       -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 
+       -1.5, -0.5, 0.5, 1.5, 
 };
 
 static long _vq_quantmap_res0a_4[] = {
-           0,    1,    2,    3,    4,    5,    6,
+           0,    1,    2,    3,    4,
 };
 
 static encode_aux_threshmatch _vq_aux_res0a_4 = {
        _vq_quantthresh_res0a_4,
        _vq_quantmap_res0a_4,
-       7,
-       7
+       5,
+       5
 };
 
 static static_codebook _vq_book_res0a_4 = {
-       4, 2401,
+       4, 625,
        _vq_lengthlist_res0a_4,
-       1, -533200896, 1611661312, 3, 0,
+       1, -533725184, 1611661312, 3, 0,
        _vq_quantlist_res0a_4,
        NULL,
        &_vq_aux_res0a_4