From: Monty Date: Tue, 11 Sep 2001 05:45:03 +0000 (+0000) Subject: tuned out the knocking X-Git-Tag: v1.3.3~923 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a4c20256b4285a128dab3c2087b7385d3745f4dc;p=platform%2Fupstream%2Flibvorbis.git tuned out the knocking svn path=/trunk/vorbis/; revision=2018 --- diff --git a/lib/books/line_128x19_0sub0.vqh b/lib/books/line_128x19_0sub0.vqh index 0a3ed58..fb7841a 100644 --- a/lib/books/line_128x19_0sub0.vqh +++ b/lib/books/line_128x19_0sub0.vqh @@ -20,10 +20,10 @@ #include "codebook.h" static long _huff_lengthlist_line_128x19_0sub0[] = { - 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 5, 4, 5, 5, 6, 5, - 6, 5, 6, 5, 6, 6, 7, 6, 7, 7, 7, 7, 7, 8, 7, 8, - 7, 9, 8,10, 8,12, 8,13, 7,13, 8,11, 8, 9, 8, 9, - 8,10, 9,10, 9, 9, 9,10,11,12,14,15,15,15,15,14, + 4, 4, 4, 4, 4, 4, 4, 4, 5, 4, 5, 4, 5, 5, 6, 5, + 6, 5, 6, 6, 7, 6, 7, 7, 7, 7, 7, 8, 8, 9, 8,10, + 7,10, 7,12, 8,13, 8,11, 8,10, 8, 9, 9,10, 9,10, + 9,10, 9,11,12,15,14,15,15,15,15,15,15,15,15,15, }; static static_codebook _huff_book_line_128x19_0sub0 = { diff --git a/lib/books/line_128x19_1sub1.vqh b/lib/books/line_128x19_1sub1.vqh index 51c4133..88baf35 100644 --- a/lib/books/line_128x19_1sub1.vqh +++ b/lib/books/line_128x19_1sub1.vqh @@ -20,7 +20,7 @@ #include "codebook.h" static long _huff_lengthlist_line_128x19_1sub1[] = { - 0, 3, 3, 3, 3, 2, 4, 3, 4, + 0, 3, 3, 3, 3, 3, 3, 3, 3, }; static static_codebook _huff_book_line_128x19_1sub1 = { diff --git a/lib/books/line_128x19_1sub2.vqh b/lib/books/line_128x19_1sub2.vqh index 583ae24..4efc2df 100644 --- a/lib/books/line_128x19_1sub2.vqh +++ b/lib/books/line_128x19_1sub2.vqh @@ -20,8 +20,8 @@ #include "codebook.h" static long _huff_lengthlist_line_128x19_1sub2[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 4, 3, 5, 4, - 5, 4, 5, 5, 6, 6, 6, 7, 7, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 3, 4, 4, 5, + 4, 5, 5, 6, 5, 7, 6, 7, 6, }; static static_codebook _huff_book_line_128x19_1sub2 = { diff --git a/lib/books/line_128x19_1sub3.vqh b/lib/books/line_128x19_1sub3.vqh index 4d8a41e..72c5c14 100644 --- a/lib/books/line_128x19_1sub3.vqh +++ b/lib/books/line_128x19_1sub3.vqh @@ -21,9 +21,9 @@ static long _huff_lengthlist_line_128x19_1sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 4, 2, 5, 3, 7, - 3, 7, 4, 9, 5,10, 6,10, 8,10, 9,10,10,10,10,10, - 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 7, 3, 7, 2, 9, + 3, 9, 4, 9, 5, 9, 6, 9, 7, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, }; static static_codebook _huff_book_line_128x19_1sub3 = { diff --git a/lib/books/line_128x19_2sub2.vqh b/lib/books/line_128x19_2sub2.vqh index 5a5dd9f..c19d911 100644 --- a/lib/books/line_128x19_2sub2.vqh +++ b/lib/books/line_128x19_2sub2.vqh @@ -20,8 +20,8 @@ #include "codebook.h" static long _huff_lengthlist_line_128x19_2sub2[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 2, 4, 3, 5, 4, - 6, 5, 7, 6, 9, 6,10, 8,10, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 2, 5, 3, 6, 3, + 6, 4, 7, 5, 9, 6,10, 8,10, }; static static_codebook _huff_book_line_128x19_2sub2 = { diff --git a/lib/books/line_128x19_2sub3.vqh b/lib/books/line_128x19_2sub3.vqh index 48d653d..7209391 100644 --- a/lib/books/line_128x19_2sub3.vqh +++ b/lib/books/line_128x19_2sub3.vqh @@ -21,9 +21,9 @@ static long _huff_lengthlist_line_128x19_2sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 4, 6, 4, 5, 4, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 7, 4, 7, 4, 5, 4, 6, 6, 6, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, }; static static_codebook _huff_book_line_128x19_2sub3 = { diff --git a/lib/books/line_128x19_class1.vqh b/lib/books/line_128x19_class1.vqh index 4dc818a..ce7b974 100644 --- a/lib/books/line_128x19_class1.vqh +++ b/lib/books/line_128x19_class1.vqh @@ -20,10 +20,10 @@ #include "codebook.h" static long _huff_lengthlist_line_128x19_class1[] = { - 2, 3, 4,13, 6, 4, 5,12, 8, 5, 6,13,16,14,12,16, - 6, 4, 4,12, 7, 5, 6,13, 8, 6, 7,12,15,13,14,15, - 7, 5, 5,11, 8, 5, 6, 9, 9, 6, 6,10,15,12,11,15, - 14,11,12,14,13,10, 8,11,11, 8, 7,11,15,12,13,14, + 3, 3, 4,13, 6, 4, 5,13, 8, 5, 6,15,14,14,13,15, + 5, 3, 4,12, 7, 5, 6,14, 8, 5, 7,14,15,14,14,15, + 7, 4, 5,12, 8, 5, 6,11, 9, 6, 6,13,15,13,13,15, + 13,10,10,13,11, 8, 7,12,11, 8, 8,14,15,15,15,15, }; static static_codebook _huff_book_line_128x19_class1 = { diff --git a/lib/books/line_128x19_class2.vqh b/lib/books/line_128x19_class2.vqh index be6e1c8..23ffe77 100644 --- a/lib/books/line_128x19_class2.vqh +++ b/lib/books/line_128x19_class2.vqh @@ -20,10 +20,10 @@ #include "codebook.h" static long _huff_lengthlist_line_128x19_class2[] = { - 2, 3, 4,13, 5, 3, 4,13, 8, 6, 7,13,14,14,14,14, - 6, 3, 5,11, 6, 4, 5,12, 9, 7, 8,13,14,14,14,14, - 10, 8,10,14,10, 8, 8,11,12,10,10,14,14,14,13,13, - 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13, + 2, 3, 3,12, 6, 3, 4,13, 9, 6, 7,13,14,14,14,14, + 6, 3, 5,11, 7, 5, 5,12, 9, 7, 8,13,14,14,14,14, + 10, 8,10,14,11, 9, 9,11,12,10,11,14,14,14,14,14, + 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14, }; static static_codebook _huff_book_line_128x19_class2 = { diff --git a/lib/books/res_44c_A_1024aux.vqh b/lib/books/res_44c_A_1024aux.vqh index 8430630..89575cb 100644 --- a/lib/books/res_44c_A_1024aux.vqh +++ b/lib/books/res_44c_A_1024aux.vqh @@ -20,13 +20,13 @@ #include "codebook.h" static long _huff_lengthlist_res_44c_A_1024aux[] = { - 2, 9, 7,14,11,10, 9,10,11,17, 9, 5,17, 7, 5,17, - 6, 8,14,17, 6,17, 3,17,17, 6, 7,10,16,17,13, 7, - 17, 5,17,17, 6, 7,13,17,11, 5,17,17, 4,17, 6, 8, - 17,17, 9,17, 6,17,17, 7, 8,12,16,17,10, 6, 7, 6, - 6, 8, 4, 5,12,17,11, 8,10, 6, 9,12, 5, 5, 9,16, - 10,12,17,13,16,16,11, 6, 7,14,11,14,17,15,17,17, - 15, 8,10,15, + 2,10, 7,14,11,11,10,10,12,17,10, 5,18, 7, 5,18, + 6, 8,14,18, 5,18, 3,18,18, 7, 8,10,16,17,14, 7, + 17, 5,17,17, 6, 7,14,17,11, 5,17,17, 4,17, 6, 9, + 17,17,11,17, 6,17,17, 8,10,11,16,17,10, 6, 8, 5, + 6, 9, 4, 5,12,17,11, 8,10, 6, 9,11, 5, 5, 9,16, + 10,12,17,13,16,16,11, 6, 7,16,11,14,17,16,17,17, + 16, 8,10,17, }; static static_codebook _huff_book_res_44c_A_1024aux = { diff --git a/lib/books/res_44c_A_128aux.vqh b/lib/books/res_44c_A_128aux.vqh index 97663da..1bfff9e 100644 --- a/lib/books/res_44c_A_128aux.vqh +++ b/lib/books/res_44c_A_128aux.vqh @@ -20,13 +20,13 @@ #include "codebook.h" static long _huff_lengthlist_res_44c_A_128aux[] = { - 5, 8, 4,16, 9, 9,10,15,16,16, 7, 3,16, 6, 4,16, - 6, 9,16,16, 4,16, 3,16,16, 7, 9,13,16,16,16, 6, - 16, 4,16,16, 5, 8,16,16, 8, 4,16,16, 4,16, 7,11, - 16,16, 8,16, 6,16,16,10,12,14,16,16, 8, 5, 7, 6, - 6,12, 6, 9,15,16,11, 9,12,10,11,15,10,12,16,16, - 16, 8,16, 5,16,16, 5, 7,16,16,16,11,16, 8,16,16, - 6, 7,14,16, + 6, 9, 5,17,10,10,11,15,17,16, 9, 3,16, 7, 4,16, + 6, 9,16,16, 5,16, 2,16,16, 7, 9,12,16,16,16, 6, + 16, 5,16,16, 5, 8,15,16, 9, 4,16,16, 4,16, 6,11, + 16,16, 9,16, 6,16,16,10,12,14,16,16, 8, 5, 8, 5, + 6,12, 5, 8,15,16,11, 9,11, 9,10,14, 9,10,15,16, + 16,16,16,10,16,16, 6, 5,12,16,16,16,16,13,16,16, + 9, 6, 9,16, }; static static_codebook _huff_book_res_44c_A_128aux = { diff --git a/lib/books/res_Ac_1.vqh b/lib/books/res_Ac_1.vqh index 393f3e1..8480a0a 100644 --- a/lib/books/res_Ac_1.vqh +++ b/lib/books/res_Ac_1.vqh @@ -25,10 +25,10 @@ static long _vq_quantlist_res_Ac_1[] = { }; static long _vq_lengthlist_res_Ac_1[] = { - 2, 5, 5, 0, 4, 4, 0, 4, 5, 5, 7, 6, 0, 8, 7, 0, + 2, 5, 5, 0, 5, 4, 0, 4, 5, 5, 7, 7, 0, 8, 7, 0, 8, 7, 5, 6, 7, 0, 7, 8, 0, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 8, 7, 0, 7, 6, 0, 7, 7, 5, 7, 8, - 0, 7, 7, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, + 0, 6, 7, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 8, 7, 0, 7, 7, 0, 7, 7, 5, 7, 8, 0, 7, 7, 0, 6, 7, }; diff --git a/lib/books/res_Ac_2.vqh b/lib/books/res_Ac_2.vqh index e0e0506..397220e 100644 --- a/lib/books/res_Ac_2.vqh +++ b/lib/books/res_Ac_2.vqh @@ -25,8 +25,8 @@ static long _vq_quantlist_res_Ac_2[] = { }; static long _vq_lengthlist_res_Ac_2[] = { - 1, 3, 4, 0, 0, 0, 0, 0, 0, 4, 5, 5, 0, 0, 0, 0, - 0, 0, 3, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 3, 3, 0, 0, 0, 0, 0, 0, 4, 5, 5, 0, 0, 0, 0, + 0, 0, 4, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/lib/books/res_Ac_3.vqh b/lib/books/res_Ac_3.vqh index e92ef26..7555f15 100644 --- a/lib/books/res_Ac_3.vqh +++ b/lib/books/res_Ac_3.vqh @@ -29,43 +29,43 @@ static long _vq_quantlist_res_Ac_3[] = { static long _vq_lengthlist_res_Ac_3[] = { 3, 6, 6, 9, 9, 0, 5, 5, 9, 9, 0, 5, 5, 8, 9, 0, 7, 7, 9, 9, 0, 0, 0, 9, 9, 6, 8, 7,10,10, 0, 8, - 7,10,10, 0, 7, 7,10,10, 0, 9, 9,11,10, 0, 0, 0, + 7,10, 9, 0, 7, 7,10,10, 0, 9, 9,11,10, 0, 0, 0, 11,11, 6, 7, 8,10,10, 0, 7, 8,10,10, 0, 7, 7,10, 10, 0, 9, 9,10,11, 0, 0, 0,11,11, 9,10,10,12,12, - 0,12,11,13,12, 0,11,11,13,13, 0,14,13,14,13, 0, - 0, 0,14,13, 9,10,10,11,12, 0,11,11,12,13, 0,11, - 11,13,13, 0,13,13,13,14, 0, 0, 0,14,14, 0, 0, 0, + 0,11,11,13,12, 0,11,11,12,13, 0,14,13,13,13, 0, + 0, 0,13,13, 9,10,10,11,12, 0,11,12,12,13, 0,11, + 11,13,13, 0,12,13,13,14, 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 7, 7,11,11, 0, 7, 6,10,10, - 0, 7, 7,10,10, 0, 9, 8,10,10, 0, 0, 0,10,10, 5, - 7, 7,11,11, 0, 7, 7,10,10, 0, 7, 7,10,10, 0, 8, - 8,10,10, 0, 0, 0,11,10, 9,10,10,13,13, 0,10,10, - 12,12, 0,10,10,12,13, 0,12,12,13,13, 0, 0, 0,13, - 13, 9,10,10,13,13, 0,10,10,12,12, 0,10,10,13,13, - 0,11,12,13,13, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, + 0, 7, 7,10,10, 0, 9, 8,11,10, 0, 0, 0,10,10, 5, + 7, 7,11,11, 0, 6, 7,10,10, 0, 7, 7,10,10, 0, 8, + 9,10,10, 0, 0, 0,11,10, 9,10,10,13,12, 0,10,10, + 12,12, 0,10,10,12,12, 0,12,12,13,13, 0, 0, 0,13, + 13, 9,10,10,13,13, 0,10,10,12,12, 0,10,10,13,12, + 0,11,12,12,13, 0, 0, 0,13,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 5, 8, 7,12,11, 0, 7, 7,10,10, 0, 7, 6, + 0, 0, 0, 5, 8, 7,11,11, 0, 7, 7,10,10, 0, 7, 7, 10,10, 0, 8, 8,10,10, 0, 0, 0,10,10, 5, 7, 8,11, 11, 0, 7, 7,10,10, 0, 6, 7,10,10, 0, 8, 8,10,10, 0, 0, 0,10,10, 9,10,10,13,12, 0,10,10,13,12, 0, - 10,10,12,12, 0,12,12,13,12, 0, 0, 0,13,12, 9,10, - 10,12,13, 0,10,10,12,13, 0,10,10,11,12, 0,11,12, - 12,13, 0, 0, 0,12,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 10,10,12,12, 0,12,12,13,12, 0, 0, 0,13,13, 9,10, + 10,12,12, 0,10,10,11,13, 0,10,10,11,12, 0,11,12, + 12,14, 0, 0, 0,12,13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 7, 9, 9,13,13, 0, 8, 8,11,11, 0, 8, 9,12,11, 0, - 10, 9,12,11, 0, 0, 0,11,12, 7, 9, 9,14,12, 0, 8, - 8,12,12, 0, 9, 8,12,11, 0, 9,10,12,12, 0, 0, 0, - 12,11, 9,11,10,14,14, 0,10,10,13,12, 0,10,11,12, - 13, 0,12,11,13,12, 0, 0, 0,12,14, 9,11,11,14,13, + 7, 9, 9,13,13, 0, 8, 8,11,12, 0, 8, 9,12,12, 0, + 10, 9,12,11, 0, 0, 0,11,12, 7, 9, 9,13,12, 0, 8, + 8,12,11, 0, 9, 8,12,11, 0, 9,10,12,12, 0, 0, 0, + 12,11, 9,11,11,13,14, 0,10,10,13,12, 0,10,10,13, + 13, 0,12,11,13,12, 0, 0, 0,13,13, 9,11,11,14,14, 0,10,10,12,13, 0,10,10,13,13, 0,11,12,12,13, 0, 0, 0,13,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, - 11,10,14,13, 0,10,10,13,13, 0,10,10,13,12, 0,12, - 11,13,13, 0, 0, 0,13,13, 9,10,11,13,14, 0,10,10, - 12,14, 0,10,10,12,13, 0,11,11,13,13, 0, 0, 0,12, + 11,10,14,13, 0,10,10,13,12, 0,10,10,13,12, 0,11, + 11,13,12, 0, 0, 0,13,12, 9,10,11,13,14, 0,10,10, + 12,13, 0,10,10,12,13, 0,12,11,13,12, 0, 0, 0,12, 13, }; diff --git a/lib/books/res_Ac_4.vqh b/lib/books/res_Ac_4.vqh index 34d3572..b1b728f 100644 --- a/lib/books/res_Ac_4.vqh +++ b/lib/books/res_Ac_4.vqh @@ -30,42 +30,42 @@ static long _vq_lengthlist_res_Ac_4[] = { 2, 6, 6,11,10, 0, 5, 5, 9, 9, 0, 5, 5, 9, 9, 0, 6, 6, 9, 9, 0, 0, 0, 9, 9, 6, 8, 7,12,11, 0, 8, 8,11,10, 0, 8, 8,11,11, 0,10, 9,12,12, 0, 0, 0, - 12,11, 6, 8, 8,11,12, 0, 8, 8,10,12, 0, 8, 8,10, + 12,11, 6, 7, 8,11,12, 0, 8, 8,10,12, 0, 8, 8,10, 11, 0, 9,10,11,12, 0, 0, 0,11,12,10,12,11,14,13, - 0,12,12,15,14, 0,13,12,15,14, 0,15,16,16,15, 0, + 0,12,12,15,14, 0,13,12,15,14, 0,14,16,16,15, 0, 0, 0,18,15,10,11,12,13,15, 0,12,13,14,15, 0,12, 12,13,15, 0,15,15,14,18, 0, 0, 0,15,18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 8, 8,13,13, 0, 7, 7,11,10, 0, 7, 7,11,11, 0, 9, 8,11,10, 0, 0, 0,11,11, 5, - 8, 8,12,13, 0, 7, 7,10,11, 0, 7, 7,11,11, 0, 8, - 9,10,11, 0, 0, 0,11,11, 9,11,10,15,15, 0,11,11, - 14,13, 0,12,11,14,13, 0,13,13,14,13, 0, 0, 0,14, - 14, 9,10,11,13,14, 0,10,11,12,14, 0,11,11,14,14, + 8, 8,12,13, 0, 7, 7,11,11, 0, 7, 7,11,11, 0, 8, + 9,10,11, 0, 0, 0,11,11, 9,11,11,15,15, 0,11,11, + 14,13, 0,12,11,14,13, 0,13,13,15,13, 0, 0, 0,15, + 14, 9,10,11,14,14, 0,10,11,13,14, 0,11,11,14,14, 0,12,13,13,14, 0, 0, 0,14,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 5, 8, 8,13,12, 0, 7, 7,11,11, 0, 7, 7, + 0, 0, 0, 5, 8, 8,13,13, 0, 7, 7,11,11, 0, 7, 7, 11,11, 0, 8, 8,11,11, 0, 0, 0,11,10, 5, 8, 8,12, 13, 0, 7, 7,11,11, 0, 7, 7,11,11, 0, 8, 8,11,11, - 0, 0, 0,10,11, 9,11,11,15,14, 0,11,11,14,13, 0, - 11,11,13,12, 0,13,13,16,14, 0, 0, 0,15,13, 9,10, + 0, 0, 0,10,11, 9,11,11,15,14, 0,11,11,14,14, 0, + 11,11,14,12, 0,13,13,16,14, 0, 0, 0,15,14, 9,10, 11,14,16, 0,11,11,13,14, 0,10,11,13,14, 0,13,12, 14,15, 0, 0, 0,14,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,10,10,15,15, 0, 8, 8,14,13, 0, 8, 9,13,14, 0, - 10, 9,13,12, 0, 0, 0,12,13, 7,10, 9,15,15, 0, 8, + 10, 9,13,12, 0, 0, 0,12,13, 7,10,10,15,15, 0, 8, 8,13,13, 0, 9, 8,13,13, 0, 9,10,12,13, 0, 0, 0, 13,12,10,12,11,17,18, 0,11,10,15,14, 0,11,11,15, - 15, 0,13,12,15,12, 0, 0, 0,14,14, 9,11,12,15,16, + 15, 0,13,12,15,13, 0, 0, 0,15,14,10,11,12,15,16, 0,10,11,13,14, 0,11,11,14,18, 0,12,13,13,15, 0, - 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,14,15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, - 12,11,18,16, 0,11,11,14,14, 0,11,10,15,13, 0,12, - 12,14,14, 0, 0, 0,14,13, 9,11,12,14,16, 0,11,11, - 15,15, 0,10,11,13,15, 0,12,12,14,14, 0, 0, 0,13, + 12,11,18,16, 0,11,11,15,14, 0,11,10,15,13, 0,12, + 13,14,14, 0, 0, 0,14,13, 9,11,12,15,16, 0,11,11, + 15,15, 0,10,11,14,15, 0,12,12,15,14, 0, 0, 0,13, 14, }; diff --git a/lib/books/res_Ac_5.vqh b/lib/books/res_Ac_5.vqh index 4f85d00..349347f 100644 --- a/lib/books/res_Ac_5.vqh +++ b/lib/books/res_Ac_5.vqh @@ -27,46 +27,46 @@ static long _vq_quantlist_res_Ac_5[] = { }; static long _vq_lengthlist_res_Ac_5[] = { - 2, 4, 3, 9, 9, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, - 0, 0, 8, 8, 0, 0, 0, 8, 8, 3, 5, 4,10, 9, 0, 0, - 0, 9, 8, 0, 0, 0, 9, 8, 0, 0, 0, 9, 8, 0, 0, 0, - 9, 8, 4, 4, 5, 9,10, 0, 0, 0, 8, 9, 0, 0, 0, 8, - 9, 0, 0, 0, 8, 9, 0, 0, 0, 8, 9, 9,10, 9,14,11, - 0, 0, 0,14,13, 0, 0, 0,14,12, 0, 0, 0,16,15, 0, - 0, 0,16,14, 9, 9,10,11,14, 0, 0, 0,13,13, 0, 0, - 0,12,16, 0, 0, 0,13,15, 0, 0, 0, 0,16, 0, 0, 0, + 2, 4, 4, 7, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 4, 7, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 3, 4, 4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6,10, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 6, 6, 7, 8,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 8, 9, 8,15,12, 0, 0, 0, - 13,12, 0, 0, 0,15,13, 0, 0, 0,14,12, 0, 0, 0,14, - 13, 8, 8, 9,12,14, 0, 0, 0,12,12, 0, 0, 0,12,14, - 0, 0, 0,13,14, 0, 0, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 8, 9, 8,13,13, 0, 0, 0,13,13, 0, - 0, 0,14,11, 0, 0, 0,14,14, 0, 0, 0,16,12, 8, 8, - 9,13,13, 0, 0, 0,13,14, 0, 0, 0,12,13, 0, 0, 0, - 13,14, 0, 0, 0,13,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 8, 9, 8, 0,15, 0, 0, 0,13,12, 0, 0, 0,13, - 13, 0, 0, 0,13,12, 0, 0, 0,13,13, 8, 8, 9,16,16, - 0, 0, 0,12,13, 0, 0, 0,14,13, 0, 0, 0,12,13, 0, - 0, 0,15,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, - 9, 8, 0,14, 0, 0, 0,16,14, 0, 0, 0,14,12, 0, 0, - 0,13,14, 0, 0, 0,15,12, 8, 8, 9,14,16, 0, 0, 0, - 12,14, 0, 0, 0,13,14, 0, 0, 0,14,13, 0, 0, 0,13, - 14, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, }; static float _vq_quantthresh_res_Ac_5[] = { @@ -89,138 +89,26 @@ static long _vq_pigeonmap_res_Ac_5[] = { }; static long _vq_fitlist_res_Ac_5[] = { - 0, 1, 2, 3, 8, 13, 18, 25, - 26, 27, 28, 33, 38, 43, 50, 51, - 52, 53, 58, 63, 68, 75, 76, 77, - 78, 83, 88, 93, 200, 201, 202, 203, - 208, 213, 218, 325, 326, 327, 328, 333, - 450, 451, 452, 458, 4, 9, 14, 19, - 29, 34, 39, 44, 54, 59, 64, 69, - 79, 84, 89, 94, 204, 209, 214, 219, - 329, 334, 454, 459, 339, 344, 464, 469, - 23, 48, 73, 98, 223, 338, 463, 24, - 49, 74, 99, 224, 349, 474, 100, 101, - 102, 103, 113, 225, 226, 227, 228, 238, - 248, 348, 350, 351, 363, 373, 473, 475, - 476, 488, 498, 575, 576, 588, 598, 104, - 114, 124, 229, 239, 249, 352, 364, 374, - 477, 489, 499, 577, 589, 599, 108, 118, - 233, 243, 353, 358, 478, 483, 109, 119, - 234, 244, 354, 359, 479, 484, 369, 494, - 600, 601, 613, 623, 602, 614, 624, 368, - 493, 603, 604, 343, 583, 579, 584, 594, - 608, 609, 619, 618, 593, 0, 1, 3, - 8, 13, 18, 25, 26, 28, 33, 38, - 43, 50, 51, 53, 58, 63, 68, 75, - 76, 78, 83, 88, 93, 200, 201, 203, - 208, 213, 218, 325, 326, 328, 333, 338, - 343, 450, 451, 458, 463, 468, 23, 48, - 73, 98, 223, 348, 473, 100, 101, 103, - 108, 113, 118, 225, 226, 228, 233, 238, - 243, 350, 351, 353, 358, 363, 368, 475, - 476, 478, 483, 488, 493, 248, 373, 498, - 575, 576, 583, 588, 593, 598, 600, 601, - 603, 608, 613, 618, 623, 2, 27, 52, - 77, 327, 577, 102, 352, 602, 0, 1, - 2, 3, 4, 8, 9, 13, 18, 19, - 25, 26, 27, 28, 29, 33, 34, 38, - 43, 44, 50, 51, 52, 53, 54, 58, - 59, 63, 68, 69, 75, 76, 77, 78, - 79, 83, 84, 88, 93, 94, 100, 101, - 102, 103, 108, 118, 200, 201, 202, 203, - 204, 208, 209, 213, 218, 219, 225, 226, - 227, 228, 233, 243, 325, 326, 327, 328, - 333, 334, 343, 344, 350, 351, 358, 368, - 450, 451, 452, 458, 459, 468, 469, 475, - 476, 483, 493, 575, 576, 583, 593, 14, - 39, 64, 89, 104, 109, 119, 214, 229, - 234, 244, 329, 352, 359, 369, 454, 477, - 484, 494, 577, 584, 594, 113, 238, 353, - 478, 600, 601, 608, 618, 114, 239, 354, - 479, 602, 609, 619, 363, 488, 603, 364, - 489, 604, 338, 339, 579, 613, 614, 588, - 589, 0, 1, 2, 3, 8, 13, 18, - 25, 26, 27, 28, 33, 38, 43, 75, - 76, 77, 78, 83, 88, 93, 200, 201, - 202, 203, 208, 213, 218, 325, 326, 327, - 328, 333, 338, 343, 450, 451, 452, 458, - 463, 468, 4, 9, 14, 19, 29, 34, - 39, 44, 79, 84, 89, 94, 204, 209, - 214, 219, 329, 334, 339, 344, 454, 459, - 464, 469, 23, 48, 98, 223, 348, 473, - 24, 49, 99, 224, 349, 474, 50, 51, - 52, 53, 63, 73, 575, 576, 577, 588, - 598, 54, 64, 74, 579, 589, 599, 583, - 593, 584, 594, 0, 1, 2, 3, 4, - 8, 9, 13, 18, 19, 25, 26, 27, - 28, 29, 33, 34, 38, 43, 44, 50, - 51, 52, 53, 58, 68, 75, 76, 77, - 78, 79, 83, 84, 88, 93, 94, 200, - 201, 202, 203, 204, 208, 209, 213, 218, - 219, 325, 326, 327, 328, 329, 333, 334, - 338, 343, 344, 450, 451, 452, 454, 458, - 459, 463, 468, 469, 575, 576, 577, 583, - 593, 14, 39, 54, 59, 69, 89, 214, - 339, 464, 579, 584, 594, 588, 589, 0, - 1, 2, 3, 4, 8, 9, 13, 14, - 18, 19, 23, 25, 26, 27, 28, 29, - 33, 34, 38, 39, 43, 44, 48, 50, - 51, 52, 53, 54, 58, 59, 63, 68, - 75, 76, 77, 78, 79, 83, 84, 88, - 93, 100, 101, 102, 103, 108, 200, 201, - 202, 203, 204, 208, 209, 213, 214, 218, - 219, 223, 225, 226, 227, 228, 233, 238, - 243, 325, 326, 327, 328, 333, 450, 451, - 452, 454, 458, 459, 463, 464, 468, 469, - 473, 475, 476, 477, 478, 483, 488, 493, - 24, 49, 64, 69, 89, 94, 104, 109, - 224, 229, 234, 239, 244, 329, 334, 474, - 479, 484, 489, 494, 74, 99, 114, 119, - 339, 344, 73, 98, 113, 248, 338, 498, - 249, 499, 124, 349, 348, 350, 351, 363, - 373, 352, 364, 374, 118, 353, 358, 354, - 359, 369, 0, 1, 2, 3, 8, 13, - 18, 23, 25, 26, 27, 28, 33, 38, - 43, 48, 50, 51, 52, 53, 58, 63, - 68, 73, 75, 76, 77, 78, 83, 88, - 93, 98, 100, 101, 103, 108, 113, 118, - 200, 201, 202, 203, 208, 213, 218, 223, - 225, 226, 228, 233, 238, 243, 325, 326, - 328, 333, 338, 343, 450, 451, 452, 458, - 463, 468, 473, 475, 476, 478, 483, 488, - 493, 248, 348, 498, 102, 227, 350, 351, - 353, 358, 363, 368, 477, 373, 0, 1, - 2, 3, 4, 8, 9, 13, 14, 18, - 19, 25, 26, 27, 28, 29, 33, 34, - 38, 39, 43, 44, 50, 51, 52, 53, - 54, 58, 59, 63, 68, 69, 75, 76, - 77, 78, 79, 83, 84, 88, 93, 94, - 100, 101, 102, 103, 108, 109, 118, 119, - 200, 201, 202, 203, 204, 208, 209, 213, - 214, 218, 219, 225, 226, 227, 228, 229, - 233, 234, 238, 243, 244, 325, 326, 327, - 328, 333, 334, 343, 344, 350, 351, 358, - 368, 450, 451, 452, 454, 458, 459, 463, - 464, 468, 469, 475, 476, 477, 478, 479, - 483, 484, 488, 493, 494, 64, 89, 104, - 239, 329, 352, 359, 369, 489, 113, 353, - 114, 354, + 0, 1, 2, 3, 25, 26, 27, 28, + 50, 51, 52, 53, 75, 76, 77, 78, + 4, 29, 54, 79, 100, 101, 102, 103, + 104, }; static long _vq_fitmap_res_Ac_5[] = { - 0, 165, 262, 165, 401, 165, 499, 165, - 583, 722, 806, 722, 401, 165, 499, 165, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, }; static long _vq_fitlength_res_Ac_5[] = { - 165, 97, 139, 97, 98, 97, 84, 97, - 139, 84, 116, 84, 98, 97, 84, 97, + 25, 25, 25, 25, 25, 25, 25, 25, + 25, 25, 25, 25, 25, 25, 25, 25, }; static encode_aux_pigeonhole _vq_auxp_res_Ac_5 = { -2, 1, 4, 2, _vq_pigeonmap_res_Ac_5, - 922, + 25, _vq_fitlist_res_Ac_5, _vq_fitmap_res_Ac_5, _vq_fitlength_res_Ac_5 diff --git a/lib/books/res_Ac_6.vqh b/lib/books/res_Ac_6.vqh index 67aac59..2041fa3 100644 --- a/lib/books/res_Ac_6.vqh +++ b/lib/books/res_Ac_6.vqh @@ -31,10 +31,10 @@ static long _vq_quantlist_res_Ac_6[] = { }; static long _vq_lengthlist_res_Ac_6[] = { - 2, 4, 3, 7, 7, 8, 8,10,10, 0, 4, 4, 6, 6, 8, 8, - 10,10, 0, 4, 4, 6, 6, 8, 8,10,10, 0, 5, 5, 6, 6, - 8, 8,10,10, 0, 0, 0, 6, 6, 8, 8,10,10, 0, 0, 0, - 7, 7, 9, 9,10,10, 0, 0, 0, 7, 7, 9, 9,10,10, 0, + 2, 4, 4, 7, 7, 8, 8,10,10, 0, 4, 4, 6, 6, 8, 8, + 10,10, 0, 4, 3, 6, 6, 8, 8,10,10, 0, 5, 5, 6, 6, + 8, 8,10,10, 0, 0, 0, 7, 6, 8, 8,10,10, 0, 0, 0, + 7, 7, 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0, 8, 8, 9, 9,11,11, 0, 0, 0, 0, 0, 9, 9,11, 11, }; diff --git a/lib/books/res_Ac_7.vqh b/lib/books/res_Ac_7.vqh index 1105abb..514b0ec 100644 --- a/lib/books/res_Ac_7.vqh +++ b/lib/books/res_Ac_7.vqh @@ -29,10 +29,10 @@ static long _vq_quantlist_res_Ac_7[] = { }; static long _vq_lengthlist_res_Ac_7[] = { - 1, 4, 3, 7, 7, 9, 9, 5, 4, 4, 8, 8,10,10, 5, 5, - 5, 8, 8,10,10, 0, 8, 8, 9, 9,11,11, 0, 9, 9,10, - 9,12,11, 0,13,13,11,11,12,12, 0,14,14,11,11,12, - 13, + 1, 4, 3, 7, 7, 9, 9, 5, 4, 4, 7, 7, 9, 9, 6, 5, + 5, 8, 8,10,10, 0, 8, 8, 9, 9,11,10, 0, 9, 8, 9, + 9,11,11, 0,13,13,10,10,11,11, 0,13,13,10,11,12, + 12, }; static float _vq_quantthresh_res_Ac_7[] = { diff --git a/lib/books/res_Ac_7a.vqh b/lib/books/res_Ac_7a.vqh index 854aa96..90b0cc6 100644 --- a/lib/books/res_Ac_7a.vqh +++ b/lib/books/res_Ac_7a.vqh @@ -27,45 +27,45 @@ static long _vq_quantlist_res_Ac_7a[] = { }; static long _vq_lengthlist_res_Ac_7a[] = { - 3, 6, 6, 8, 8,10, 6, 6, 8, 8,10, 6, 6, 8, 8,11, - 8, 8, 8, 8,11,11,11, 8, 8, 6, 8, 7, 9, 9,11, 8, - 8, 9, 9,11, 8, 8, 9, 9,11,10,10, 9, 9,11,11,11, - 10, 9, 6, 7, 8, 9, 9,11, 8, 8, 9, 9,11, 8, 8, 9, - 9,11, 9,10, 9, 9,11,12,11, 9,10, 8, 9, 9,10,10, - 12,10,10,10,10,11,10,10,10,10,12,11,11,10,10,12, - 12,12,10,10, 8, 9, 9,10,10,12,10,10,11,10,12,10, - 10,10,10,12,11,11,10,11,12,12,11,10,10,10,11,11, - 11,12,13,11,11,12,12,13,11,11,12,11,13,12,12,11, - 12,13,13,13,12,12, 6, 8, 8,10,10,11, 8, 8,10, 9, - 11, 8, 8,10,10,11, 9, 9, 9, 9,11,11,11, 9, 9, 6, - 8, 8,10,10,11, 8, 8,10,10,11, 8, 8, 9,10,11, 9, - 9, 9, 9,11,11,11, 9, 9, 8, 9, 9,10,10,11,10,10, - 10,10,12,10,10,11,11,12,10,10,10,10,12,12,12,10, - 10, 8, 9,10,11,10,12,10, 9,10,10,12, 9,10,10,10, - 12,11,11,10,10,12,12,12,10,10,10,11,11,12,11,13, - 11,12,12,12,12,11,11,12,11,13,12,12,12,11,13,13, - 12,12,12, 6, 8, 8,10,10,11, 8, 8,10,10,11, 8, 8, - 10, 9,11, 9, 9, 9, 9,11,12,11,10, 9, 6, 8, 8,10, - 10,11, 8, 8,10,10,11, 7, 8,10,10,11, 9, 9, 9, 9, - 11,11,11, 9, 9, 8, 9,10,10,10,12,10,10,10,10,12, - 9, 9,10,10,12,10,10,10,10,12,11,12,10,10, 8, 9, - 9,10,10,12,10, 9,10,10,11, 9, 9,10,10,12,10,10, - 10,10,12,12,12,10,10,11,11,11,12,12,13,11,11,12, - 12,13,11,12,12,12,13,12,12,12,11,13,13,13,11,12, + 3, 6, 6, 8, 8,10, 6, 6, 8, 8,10, 6, 6, 8, 8,10, + 8, 8, 8, 8,11,10,11, 8, 8, 6, 7, 7, 9, 9,11, 8, + 8, 9, 9,11, 8, 8, 9, 9,11,10,10,10,10,11,11,11, + 10,10, 6, 7, 7, 9, 9,11, 8, 8, 9, 9,11, 8, 8, 9, + 9,11,10, 9,10,10,11,11,11,10,10, 8, 9, 9,10, 9, + 11,10,10,10,10,11,10,10,10,10,12,11,11,11,10,12, + 12,12,11,10, 8, 9, 9,10,10,11,10,10,11,10,12,10, + 10,10,10,12,11,11,10,11,12,12,12,10,11,10,11,11, + 11,12,12,11,12,12,12,13,12,11,11,11,12,12,12,11, + 12,12,13,13,11,12, 6, 8, 8,10,10,11, 8, 8,10, 9, + 11, 8, 8,10,10,11, 9, 9, 9, 9,11,12,11, 9, 9, 6, + 8, 8,10,10,11, 8, 8,10,10,11, 8, 8, 9, 9,11, 9, + 9, 9, 9,12,11,11, 9,10, 8, 9, 9,10,10,11,10,10, + 10,11,12,10,10,10,10,12,11,10,10,10,12,12,12,10, + 10, 9, 9, 9,10,10,12, 9,10,10,11,12, 9,10,10,10, + 12,11,11,11,11,12,12,12,10,10,10,11,11,12,11,13, + 11,11,12,12,12,11,11,11,11,13,12,12,12,12,14,13, + 12,12,11, 6, 8, 8,10,10,11, 8, 8,10,10,11, 8, 8, + 10, 9,11, 9, 9, 9, 9,11,12,11, 9, 9, 6, 8, 8,10, + 10,11, 8, 8,10,10,11, 7, 8, 9, 9,11, 9, 9, 9, 9, + 11,11,12, 9, 9, 8, 9,10,11,10,12,10,10,11,10,12, + 10, 9,10,10,12,10,10,10,10,12,11,12,10,10, 8, 9, + 9,10,10,12,10, 9,10,11,12, 9, 9,10,10,11,10,10, + 10,10,12,12,12,10,10,11,11,11,12,12,13,12,11,12, + 12,13,11,11,12,12,13,12,12,12,12,13,12,13,11,12, 8,10,10,11,11,12, 9, 9,11,11,12, 9, 9,10,10,11, 10,10,10,10,12,12,12,10,10, 8,10, 9,11,11,12, 9, - 9,11,11,12, 9, 9,10,10,12,10,10,10,10,12,12,12, - 10,10, 8,10, 9,10,10,11,10, 9,10,10,12, 9, 9,10, - 10,12,10,10,10,10,11,11,12,10,10, 8,10,10,10,10, - 12, 9, 9,10,10,12,10, 9,10,10,12,10,10,10,10,12, - 12,12,10,10,10,11,11,12,12,13,11,11,12,12,13,11, - 12,11,12,13,12,12,12,12,13,13,13,12,11,11,11,12, - 12,12,13,12,11,12,12,13,12,12,12,12,13,12,12,12, - 11,13,13,13,12,12,11,11,11,12,13,13,12,11,12,12, - 13,11,11,12,12,13,12,12,12,12,13,13,12,11,12, 8, - 10,10,10,10,11, 9,10,10,10,11, 9, 9,10,10,11,10, - 10,10,10,11,12,12,10,10, 8,10,10,10,11,12, 9, 9, - 10,10,12, 9, 9,10,10,12,10,10,10,10,12,12,12,10, + 9,10,11,12, 9, 9,10,10,12,10,10,10,10,12,12,12, + 10,10, 8,10,10,10,10,11, 9, 9,10,11,12, 9, 9,10, + 10,12,10,10,10,10,12,11,12,10,10, 8,10,10,11,10, + 12, 9, 9,10,10,12, 9, 9,10,10,11,10,10,10,10,12, + 12,12,10,10,11,11,11,12,12,13,11,11,12,12,13,11, + 11,11,12,13,12,12,12,12,13,13,14,11,11,11,11,12, + 12,12,13,11,11,12,12,13,12,12,12,12,13,12,12,12, + 11,13,13,13,12,12,11,11,11,12,13,13,12,12,13,12, + 12,11,12,12,12,13,12,12,12,12,13,13,13,11,12, 8, + 10,10,10,10,12, 9,10,10,11,12, 9, 9,10,10,11,10, + 10,10,10,11,12,12,10,10, 8,10,10,11,11,12, 9, 9, + 11,10,11, 9, 9,10,10,12,10,10,10,10,11,12,12,10, 10, }; diff --git a/lib/books/res_Ac_8.vqh b/lib/books/res_Ac_8.vqh index f6d9bcc..1cbd213 100644 --- a/lib/books/res_Ac_8.vqh +++ b/lib/books/res_Ac_8.vqh @@ -35,17 +35,17 @@ static long _vq_quantlist_res_Ac_8[] = { }; static long _vq_lengthlist_res_Ac_8[] = { - 1, 4, 3, 6, 6, 7, 7, 9, 9,10,10,12,10, 6, 5, 5, - 7, 7, 9, 9,10,10,11,11,12,12, 6, 5, 5, 7, 7, 9, - 9,10,10,11,11,12,11, 0, 8, 8, 8, 8,10, 9,11,11, - 12,12,13,13, 0, 8, 8, 8, 8,10,10,11,11,13,12,13, - 12, 0,13,13,10,10,11,10,12,11,13,13,13,16, 0,13, - 13,10,10,10,11,12,11,13,13, 0,14, 0, 0, 0,12,12, - 12,12,14,13,13,12,15,14, 0, 0, 0,12,12,12,11,12, - 13,14,14,15,16, 0, 0, 0,16,16,13,12,13,14,15,13, - 14,14, 0, 0, 0,16, 0,13,11,13,13,13,15,14,15, 0, - 0, 0, 0, 0,12,16,13,16,15, 0,15,16, 0, 0, 0, 0, - 0,14,11,14,11,15,13,15,15, + 1, 4, 3, 6, 6, 7, 7, 9, 9,10,10,11,10, 6, 5, 5, + 7, 7, 9, 9, 9,10,11,11,12,12, 6, 5, 5, 7, 7, 9, + 8,10,10,11,11,12,12, 0, 8, 8, 8, 8,10,10,11,11, + 12,12,13,13, 0, 8, 8, 8, 8,10,10,11,10,12,13,13, + 12, 0,13,12,10,10,11,11,11,11,13,13,13,16, 0,13, + 13,10,10,10,11,12,12,13,13,15,16, 0, 0, 0,13,12, + 12,12,13,13,13,13,16,14, 0, 0, 0,12,13,12,11,12, + 13,14,14,15,15, 0, 0, 0,16,16,14,12,13,14,16,13, + 14,14, 0, 0, 0,15, 0,14,13,13,13,15,15,15,14, 0, + 0, 0, 0, 0,14,16,16, 0,16,14,16,16, 0, 0, 0, 0, + 0,14,14,15,14,15,13,15,16, }; static float _vq_quantthresh_res_Ac_8[] = { @@ -90,98 +90,98 @@ static long _vq_fitlist_res_Ac_8[] = { 48, 50, 5, 18, 33, 46, 8, 10, 12, 21, 23, 25, 36, 38, 49, 51, 61, 63, 31, 59, 34, 62, 64, 87, - 57, 85, 60, 88, 90, 13, 14, 40, - 41, 42, 66, 67, 68, 15, 43, 69, - 17, 45, 71, 95, 0, 1, 16, 2, - 4, 19, 26, 27, 53, 54, 55, 79, - 80, 81, 28, 56, 82, 30, 58, 84, - 108, 16, 18, 40, 42, 44, 46, 66, - 68, 70, 72, 94, 96, 14, 17, 19, - 41, 43, 45, 47, 67, 69, 71, 73, - 95, 97, 3, 5, 20, 1, 13, 4, - 6, 15, 21, 29, 31, 53, 55, 57, - 59, 79, 81, 83, 85, 107, 109, 27, - 30, 32, 54, 56, 58, 60, 80, 82, - 84, 86, 108, 110, 18, 20, 42, 44, - 46, 48, 68, 70, 72, 74, 96, 98, - 19, 21, 43, 45, 47, 49, 69, 71, - 73, 75, 97, 99, 23, 51, 77, 101, - 5, 7, 16, 22, 6, 8, 17, 10, - 25, 31, 33, 55, 57, 59, 61, 81, - 83, 85, 87, 109, 111, 32, 34, 56, - 58, 60, 62, 82, 84, 86, 88, 110, - 112, 36, 64, 90, 114, 22, 24, 46, - 48, 50, 72, 74, 76, 100, 102, 20, - 44, 70, 98, 23, 25, 47, 49, 51, - 73, 75, 77, 101, 103, 9, 11, 7, - 18, 10, 12, 21, 35, 37, 59, 61, - 63, 85, 87, 113, 115, 33, 57, 83, - 111, 36, 38, 60, 62, 64, 86, 88, - 90, 114, 116, 40, 66, 67, 68, 94, - 41, 69, 95, 43, 71, 97, 121, 53, - 79, 80, 81, 107, 54, 82, 108, 56, - 84, 110, 109, 133, 135, 136, 42, 44, - 66, 68, 70, 72, 94, 96, 98, 120, - 122, 40, 43, 45, 67, 69, 71, 73, - 95, 97, 99, 121, 123, 55, 57, 79, - 81, 83, 85, 107, 109, 111, 133, 135, - 53, 56, 58, 80, 82, 84, 86, 108, - 110, 112, 136, 137, 161, 138, 162, 44, - 46, 68, 70, 72, 74, 94, 96, 98, - 100, 122, 124, 45, 47, 69, 71, 73, - 75, 95, 97, 99, 101, 123, 125, 49, - 77, 103, 127, 57, 59, 81, 83, 85, - 87, 107, 109, 111, 113, 135, 137, 58, - 60, 82, 84, 86, 88, 108, 110, 112, - 114, 136, 138, 62, 90, 116, 140, 133, - 139, 161, 163, 162, 164, 142, 166, 48, - 50, 72, 74, 76, 98, 100, 102, 126, - 128, 46, 70, 96, 124, 49, 51, 73, - 75, 77, 99, 101, 103, 127, 129, 61, - 63, 85, 87, 111, 113, 115, 139, 141, - 59, 83, 109, 137, 62, 64, 86, 88, - 90, 112, 114, 116, 140, 142, 165, 167, - 135, 163, 138, 166, 168, 66, 94, 120, - 121, 122, 148, 67, 95, 123, 149, 40, - 68, 96, 41, 69, 97, 79, 107, 133, - 135, 161, 80, 82, 108, 110, 136, 162, - 138, 164, 94, 96, 120, 122, 124, 148, - 150, 95, 97, 121, 123, 125, 149, 151, - 68, 70, 98, 66, 69, 71, 99, 107, - 109, 133, 135, 137, 161, 163, 108, 110, - 136, 138, 162, 164, 96, 98, 120, 122, - 124, 126, 148, 150, 152, 97, 99, 121, - 123, 125, 127, 149, 151, 101, 129, 155, - 70, 72, 94, 100, 71, 73, 95, 75, - 103, 109, 111, 133, 135, 137, 139, 161, - 163, 165, 110, 112, 136, 138, 140, 162, - 164, 166, 114, 142, 168, 100, 102, 124, - 126, 128, 150, 152, 154, 98, 122, 148, - 101, 103, 125, 127, 129, 151, 155, 74, - 76, 72, 96, 75, 77, 99, 113, 115, - 137, 139, 141, 163, 165, 167, 111, 135, - 161, 114, 116, 138, 140, 142, 164, 166, - 168, + 89, 57, 85, 60, 88, 90, 13, 14, + 40, 41, 42, 66, 67, 68, 15, 43, + 69, 17, 45, 71, 95, 0, 1, 16, + 2, 4, 19, 26, 27, 53, 54, 55, + 79, 80, 81, 28, 56, 82, 30, 58, + 84, 108, 16, 18, 40, 42, 44, 46, + 66, 68, 70, 72, 94, 96, 14, 17, + 19, 41, 43, 45, 47, 67, 69, 71, + 73, 95, 97, 3, 5, 20, 1, 13, + 4, 6, 15, 21, 29, 31, 53, 55, + 57, 59, 79, 81, 83, 85, 107, 109, + 27, 30, 32, 54, 56, 58, 60, 80, + 82, 84, 86, 108, 110, 18, 20, 42, + 44, 46, 48, 68, 70, 72, 74, 96, + 98, 19, 21, 43, 45, 47, 49, 69, + 71, 73, 75, 97, 99, 23, 51, 77, + 101, 5, 7, 16, 22, 6, 8, 17, + 10, 25, 31, 33, 55, 57, 59, 61, + 81, 83, 85, 87, 109, 111, 32, 34, + 56, 58, 60, 62, 82, 84, 86, 88, + 110, 112, 36, 64, 90, 114, 22, 24, + 46, 48, 50, 72, 74, 76, 100, 102, + 20, 44, 70, 98, 23, 25, 47, 49, + 51, 73, 75, 77, 101, 103, 9, 11, + 7, 18, 10, 12, 21, 35, 37, 59, + 61, 63, 85, 87, 89, 113, 115, 33, + 57, 83, 111, 36, 38, 60, 62, 64, + 86, 88, 90, 114, 116, 40, 66, 67, + 68, 94, 41, 69, 95, 43, 71, 97, + 121, 53, 79, 80, 81, 107, 54, 82, + 108, 56, 84, 110, 109, 133, 135, 136, + 42, 44, 66, 68, 70, 72, 94, 96, + 98, 120, 122, 40, 43, 45, 67, 69, + 71, 73, 95, 97, 99, 121, 123, 55, + 57, 79, 81, 83, 85, 107, 109, 111, + 133, 135, 53, 56, 58, 80, 82, 84, + 86, 108, 110, 112, 136, 137, 161, 138, + 162, 44, 46, 68, 70, 72, 74, 94, + 96, 98, 100, 122, 124, 45, 47, 69, + 71, 73, 75, 95, 97, 99, 101, 123, + 125, 49, 77, 103, 127, 57, 59, 81, + 83, 85, 87, 107, 109, 111, 113, 135, + 137, 58, 60, 82, 84, 86, 88, 108, + 110, 112, 114, 136, 138, 62, 90, 116, + 140, 133, 139, 161, 163, 162, 164, 142, + 166, 48, 50, 72, 74, 76, 98, 100, + 102, 126, 128, 46, 70, 96, 124, 49, + 51, 73, 75, 77, 99, 101, 103, 127, + 129, 61, 63, 85, 87, 89, 111, 113, + 115, 139, 141, 59, 83, 109, 137, 62, + 64, 86, 88, 90, 112, 114, 116, 140, + 142, 165, 167, 135, 163, 138, 166, 168, + 66, 94, 120, 121, 122, 148, 67, 95, + 123, 149, 40, 68, 96, 41, 69, 97, + 79, 107, 133, 135, 161, 80, 82, 108, + 110, 136, 162, 138, 164, 94, 96, 120, + 122, 124, 148, 150, 95, 97, 121, 123, + 125, 149, 68, 70, 98, 66, 69, 71, + 99, 107, 109, 133, 135, 137, 161, 163, + 108, 110, 136, 138, 162, 164, 96, 98, + 120, 122, 124, 126, 148, 150, 152, 97, + 99, 121, 123, 125, 127, 149, 153, 101, + 129, 155, 70, 72, 94, 100, 71, 73, + 95, 75, 103, 109, 111, 133, 135, 137, + 139, 161, 163, 165, 110, 112, 136, 138, + 140, 162, 164, 166, 114, 142, 168, 100, + 102, 124, 126, 128, 150, 152, 154, 98, + 122, 148, 101, 103, 125, 127, 129, 153, + 155, 74, 76, 72, 96, 75, 77, 99, + 113, 115, 137, 139, 141, 163, 165, 167, + 111, 135, 161, 114, 116, 138, 140, 142, + 164, 166, 168, }; static long _vq_fitmap_res_Ac_8[] = { - 0, 29, 74, 120, 157, 157, 193, 252, - 317, 371, 371, 398, 447, 511, 565, 565, - 594, 628, 677, 721, 721, 721, 721, 721, - 721, + 0, 29, 74, 120, 158, 158, 194, 253, + 318, 373, 373, 400, 449, 513, 568, 568, + 597, 630, 679, 723, 723, 723, 723, 723, + 723, }; static long _vq_fitlength_res_Ac_8[] = { - 29, 45, 46, 37, 0, 36, 59, 65, - 54, 0, 27, 49, 64, 54, 0, 29, - 34, 49, 44, 0, 0, 0, 0, 0, + 29, 45, 46, 38, 0, 36, 59, 65, + 55, 0, 27, 49, 64, 55, 0, 29, + 33, 49, 44, 0, 0, 0, 0, 0, 0, }; static encode_aux_pigeonhole _vq_auxp_res_Ac_8 = { -78, 13, 12, 5, _vq_pigeonmap_res_Ac_8, - 721, + 723, _vq_fitlist_res_Ac_8, _vq_fitmap_res_Ac_8, _vq_fitlength_res_Ac_8 diff --git a/lib/books/res_Ac_8a.vqh b/lib/books/res_Ac_8a.vqh index bf3c2ed..05d219f 100644 --- a/lib/books/res_Ac_8a.vqh +++ b/lib/books/res_Ac_8a.vqh @@ -36,10 +36,10 @@ static long _vq_quantlist_res_Ac_8a[] = { static long _vq_lengthlist_res_Ac_8a[] = { 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 9, 6, 6, - 6, 7, 7, 7, 7, 7, 7, 7, 8, 7, 9, 6, 6, 6, 6, 7, + 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 9, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 9, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8, 8, - 8, 9, 9, 9, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, + 8, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, diff --git a/lib/books/res_Ac_9.vqh b/lib/books/res_Ac_9.vqh index 32b3ac8..302629e 100644 --- a/lib/books/res_Ac_9.vqh +++ b/lib/books/res_Ac_9.vqh @@ -29,10 +29,10 @@ static long _vq_quantlist_res_Ac_9[] = { }; static long _vq_lengthlist_res_Ac_9[] = { - 1, 3, 3,10,10,12,12, 3, 5, 9,12,12,11,11, 4, 9, - 7,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, - 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, - 11, + 1, 4, 3,10,10,11,11, 4, 4, 9,11,11,11,11, 3,10, + 5, 9,10,11,11,11,11,11,11,11,11,11,11,11,11,11, + 11,11,11,11,11,10,10,10,10,10,10,10,10,10,10,10, + 10, }; static float _vq_quantthresh_res_Ac_9[] = { diff --git a/lib/books/res_Ac_9a.vqh b/lib/books/res_Ac_9a.vqh index 03f0988..7d47041 100644 --- a/lib/books/res_Ac_9a.vqh +++ b/lib/books/res_Ac_9a.vqh @@ -35,17 +35,17 @@ static long _vq_quantlist_res_Ac_9a[] = { }; static long _vq_lengthlist_res_Ac_9a[] = { - 1, 4, 4, 7, 7, 9, 9, 9, 9, 9, 9, 8, 8, 6, 6, 6, - 9, 9,10,10,10,10,12,10,10, 9, 6, 5, 4, 9, 8,10, - 9,10,11,10,10, 9, 9,12, 8, 8,10,10,11,11,12,11, - 11,11,11,10,14, 6, 5, 7, 7,11,11,11,10,10,12, 9, - 9,14,12,10,10, 9,12,13,12,12,12,11,12,11,14,10, - 11, 7, 6,11,10,11,12,11,11, 9,10,12,13,12,10,12, - 12,14,11,13,14,10,12,11,13,13,14,12,10,11,10,12, - 12, 9,12,10,13,14,14,14,13,14,13,14,13,10,13, 9, - 12,12,13,14,14,14,14,13,14,10,13, 9,12,13,14,13, - 14,13,13,13,14,11,14, 8,11, 9,12,12,14,14,14,14, - 14,12,14, 8,12,13,11,12,11, + 1, 4, 4, 7, 7, 9, 9,10, 9, 8,10, 8, 8, 6, 6, 6, + 9, 9,11,10,10,10,12,10,10, 8, 5, 5, 4, 9, 9,10, + 10,10,11,10,10, 8, 9,13, 9, 7,11,11,12,11,12,12, + 10,11,10, 8,14, 6, 6, 7, 6,11,11,11,11,10,13, 8, + 10,14,12,10,10, 9,12,12,12,12,11,10,11, 9,14,11, + 9, 7, 6,12,11,12,12,10,12, 9,12,12,14,13,11,11, + 13,13,12,12,12,11,11, 9,14,14,14,12, 9,12,10,12, + 13,10,14,13,13,14,13,14,14,13,13,14,14,12,12,11, + 12,12,13,14,14,14,14,13,14,12,12,11,12,14,14,14, + 14,14,14,14,14,13,13,12,12,12,11,12,14,14,13,13, + 14,13,14,11,13,13,12,13,12, }; static float _vq_quantthresh_res_Ac_9a[] = { diff --git a/lib/books/res_Ac_9b.vqh b/lib/books/res_Ac_9b.vqh index cf96888..25f45e0 100644 --- a/lib/books/res_Ac_9b.vqh +++ b/lib/books/res_Ac_9b.vqh @@ -35,17 +35,17 @@ static long _vq_quantlist_res_Ac_9b[] = { }; static long _vq_lengthlist_res_Ac_9b[] = { - 4, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 8, 7, 7, - 7, 7, 7, 7, 7, 8, 7, 7, 7, 7, 9, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 9, 8, 8, 8, 8, 7, 8, 8, 8, - 8, 8, 7, 7, 9, 8, 9, 7, 8, 7, 8, 7, 8, 7, 7, 7, - 8, 9, 9, 9, 8, 8, 8, 8, 8, 8, 7, 8, 7, 7, 8, 9, - 9, 7, 8, 7, 8, 7, 7, 7, 8, 7, 8, 9, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 7, 7, 7, 9, 9, 8, 8, 9, 8, 8, 8, - 8, 7, 8, 7, 8, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 7, - 8, 7, 9, 9, 8, 9, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8, - 9, 8, 9, 9, 7, 8, 8, 7, 8, 8, 8, 8, 9, 9, 8, 9, - 8, 8, 8, 8, 7, 8, 8, 7, 8, + 4, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 9, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 9, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 9, 8, 8, 8, 8, 8, 8, 7, 8, + 8, 7, 7, 7, 8, 8, 8, 8, 8, 7, 8, 7, 7, 7, 7, 7, + 7, 9, 9, 9, 8, 8, 8, 8, 8, 8, 7, 8, 8, 8, 8, 9, + 9, 7, 8, 7, 8, 7, 8, 7, 7, 7, 8, 9, 9, 8, 8, 8, + 9, 8, 8, 8, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, + 7, 7, 8, 7, 7, 9, 9, 8, 9, 8, 8, 8, 8, 8, 7, 7, + 8, 7, 9, 8, 8, 9, 8, 8, 8, 7, 7, 8, 7, 8, 8, 9, + 9, 9, 9, 8, 8, 8, 8, 7, 8, 8, 7, 7, 9, 9, 8, 8, + 8, 8, 8, 8, 7, 8, 7, 8, 7, }; static float _vq_quantthresh_res_Ac_9b[] = { diff --git a/lib/modes/mode_44c_A.h b/lib/modes/mode_44c_A.h index f8f1228..ebd36d3 100644 --- a/lib/modes/mode_44c_A.h +++ b/lib/modes/mode_44c_A.h @@ -11,7 +11,7 @@ ******************************************************************** function: predefined encoding modes; 44kHz stereo ~64kbps true VBR - last mod: $Id: mode_44c_A.h,v 1.3 2001/09/11 05:07:02 xiphmont Exp $ + last mod: $Id: mode_44c_A.h,v 1.4 2001/09/11 05:45:03 xiphmont Exp $ ********************************************************************/ @@ -83,7 +83,7 @@ static struct vp_couple_pass _psy_pass_44c_A0[]={ {1.f,1.f, {{24, 0, 0, 0}, {64, 0, 0, 0}, - {9999, 0, 0, 1.5f}} + {9999, 0, 0, 2.5f}} }, }; @@ -91,7 +91,7 @@ static vp_couple_pass _psy_pass_44c_A[]={ {1.f,1.f, {{288, 0, 0, 0}, {512, 0, 0, 0}, - {9999, 0, 0, 1.5f}} + {9999, 0, 0, 2.5f}} } }; @@ -115,7 +115,7 @@ static vorbis_info_psy _psy_set_44c_A0={ -100.,-140., /* tonemaskp, guard, abs_limit */ - 0.f, -30.f, -30.f, + 0.f, -26.f, -30.f, &_vp_tonemask_consbass_A, /* peakattp, curvelimitp */ 1, 4, &_vp_peakatt_A, @@ -126,7 +126,7 @@ static vorbis_info_psy _psy_set_44c_A0={ 2, 2, 15, /*63 125 250 500 1k 2k 4k 8k 16k*/ - {-30,-30,-30,-30,-30,-30,-20,-10, 0, 0, -2, -2, 0, 0, 1, 2, 4}, + {-30,-30,-30,-30,-24,-20,-18,-14,-10,-2, -3, -3, 0, 0, 0, 0, 2}, _psy_compand_44c_A, 95.f, /* even decade + 5 is important; saves an rint() later in a @@ -140,7 +140,7 @@ static vorbis_info_psy _psy_set_44c_AT={ -100.f,-140.f, /* tonemaskp, guard, abs_limit */ - 0.f,-30.f,-30.f, + 0.f,-26.f,-30.f, &_vp_tonemask_consbass_A, /* peakattp,curvelimitp */ 1, 4, &_vp_peakatt_A, @@ -151,7 +151,7 @@ static vorbis_info_psy _psy_set_44c_AT={ 4,4,100, /*63 125 250 500 1k 2k 4k 8k 16k*/ - {-30,-30,-30,-30,-20,-20,-10,-10, 0, 0, -6, -6, 0, 0, 0, 0, 2}, + {-30,-30,-30,-30,-20,-20,-10,-10, 0, -2, -5, -5, 0, 0, 0, 0, 2}, _psy_compand_44c_A, 95.f, /* even decade + 5 is important; saves an rint() later in a @@ -164,7 +164,7 @@ static vorbis_info_psy _psy_set_44c_A={ -100.f, -140.f, /* tonemaskp, guard, abs_limit */ - 0.f,-30.f,-30.f, + 0.f,-26.f,-30.f, &_vp_tonemask_consbass_A, /* peakattp, curvelimitp */ 1, 4, &_vp_peakatt_A, @@ -175,7 +175,7 @@ static vorbis_info_psy _psy_set_44c_A={ 4,4,100, /*63 125 250 500 1k 2k 4k 8k 16k*/ - {-20,-20,-20,-20,-20,-20,-10, -3, 0, 0, -6, -6, 0, 0, 0, 0, 2}, + {-20,-20,-20,-20,-20,-20,-10, -3, 0, -2, -5, -5, 0, 0, 0, 0, 2}, _psy_compand_44c_A, 95.f, /* even decade + 5 is important; saves an rint() later in a