Correct a longstanding bug in the 16u2 codebook; the bug was harmless (though it...

coupling/quant code, but it causes corrupt output in the new code; fixed.

Update frameview code for recent Tk

svn path=/trunk/vorbis/; revision=17022

diff --git a/examples/frameview.pl b/examples/frameview.pl
index 0cf5b37..edcf5d0 100755 (executable)
--- a/examples/frameview.pl
+++ b/examples/frameview.pl
@@ -185,27 +185,27 @@ $panel->configure(-background=>$panel->optionGet("background",""));
 
 #$panel->resizable("FALSE","FALSE");
 
-my $panel_shell=$panel->Label(Name=>"shell",borderwidth=>1,relief=>'raised')->
+my $panel_shell=$panel->Label(Name=>"shell",-borderwidth=>1,-relief=>'raised')->
     place(-x=>10,-y=>36,-relwidth=>1.0,-relheight=>1.0,
           -width=>-20,-height=>-46,-anchor=>'nw');
 
-my $panel_quit=$panel_shell->Button(-class=>"Exit",text=>"quit",-command=>[sub{Shutdown()}])->
+my $panel_quit=$panel_shell->Button(-class=>"Exit",-text=>"quit",-command=>[sub{Shutdown()}])->
     place(-x=>-1,-y=>-1,-relx=>1.0,-rely=>1.0,-anchor=>'se');
 
-$panel->Label(Name=>"logo text",-class=>"Panel",text=>$version)->
+$panel->Label(Name=>"logo text",-class=>"Panel",-text=>$version)->
     place(-x=>5,-y=>5,-anchor=>'nw');
 
 
-my $graph_shell=$toplevel->Label(Name=>"shell",borderwidth=>1,relief=>'raised')->
+my $graph_shell=$toplevel->Label(Name=>"shell",-borderwidth=>1,-relief=>'raised')->
     place(-x=>10,-y=>36,-relwidth=>1.0,-relheight=>1.0,
           -width=>-20,-height=>-46,-anchor=>'nw');
 
-my $graph_status=$toplevel->Label(Name=>"logo text",-class=>"Panel",text=>"Starting up")->
+my $graph_status=$toplevel->Label(Name=>"logo text",-class=>"Panel",-text=>"Starting up")->
     place(-x=>5,-y=>5,-anchor=>'nw');
 
 
 my $panely=5;
-my $panel_rescan=$panel_shell->Button(text=>"rescan",command=>[sub{scan_directory()}])->
+my $panel_rescan=$panel_shell->Button(-text=>"rescan",-command=>[sub{scan_directory()}])->
     place(-x=>-5,-relx=>1.,-y=>$panely,-anchor=>'ne');
 $panely+=$panel_rescan->reqheight()+6;
 
@@ -236,7 +236,7 @@ $graphy-=$temp->reqheight()+5;
 my$onecrop;
 my$twocrop;
 
-my$oneresize=$temp=$graph_shell->Checkbutton(text=>"rescale",-variable=>\$onecrop,
+my$oneresize=$temp=$graph_shell->Checkbutton(-text=>"rescale",-variable=>\$onecrop,
                                -command=>[sub{draw_graph();}])->
     place(-x=>5,-y=>5,-anchor=>'nw');
 
@@ -245,7 +245,7 @@ my$one=$graph_shell->Canvas()->
                                     -x=>5,-y=>5+$temp->reqheight,-anchor=>'nw');
 
 
-my$tworesize=$temp=$graph_shell->Checkbutton(text=>"rescale",-variable=>\$twocrop,
+my$tworesize=$temp=$graph_shell->Checkbutton(-text=>"rescale",-variable=>\$twocrop,
                                -command=>[sub{draw_graph();}])->
     place(-rely=>1.,-y=>5,-anchor=>'nw',-in=>$one);
 my$two=$graph_shell->Canvas()->
@@ -552,18 +552,18 @@ sub populate_panel{
        }
 
        my $temp=$panel_twos[$i]=$panel_shell->
-           Checkbutton(-variable=>\$panel_twovars[$i],-command=>['main::draw_graph'],text=>'2')->
+           Checkbutton(-variable=>\$panel_twovars[$i],-command=>['main::draw_graph'],-text=>'2')->
            place(-y=>$localy,-x=>-5,-anchor=>"ne",-relx=>1.);
        my $oney=$temp->reqheight();
        my $onex=$temp->reqwidth()+15;
 
        $temp=$panel_ones[$i]=$panel_shell->
-           Checkbutton(-variable=>\$panel_onevars[$i],-command=>['main::draw_graph'],text=>'1')->
+           Checkbutton(-variable=>\$panel_onevars[$i],-command=>['main::draw_graph'],-text=>'1')->
            place(-y=>0,-x=>0,-anchor=>"ne",-in=>$temp,-bordermode=>'outside');
        $oney=$temp->reqheight() if ($oney<$temp->reqheight());
        $onex+=$temp->reqwidth();
 
-       $temp=$panel_labels[$i]=$panel_shell->Label(-text=>$key,-class=>'Field',justify=>'left')->
+       $temp=$panel_labels[$i]=$panel_shell->Label(-text=>$key,-class=>'Field',-justify=>'left')->
            place(-y=>$localy,-x=>5,-anchor=>"nw",-relwidth=>1.,-width=>-$onex,
                  -bordermode=>'outside');
        $oney=$temp->reqheight() if ($oney<$temp->reqheight());
@@ -587,7 +587,7 @@ sub Shutdown{
 
 sub Status{
     my$text=shift @_;
-    $graph_status->configure(text=>"$text");
+    $graph_status->configure(-text=>"$text");
     $toplevel->update();
 }
 

diff --git a/lib/books/uncoupled/res_books_uncoupled.h b/lib/books/uncoupled/res_books_uncoupled.h
index 3f36866..1f204e6 100644 (file)
--- a/lib/books/uncoupled/res_books_uncoupled.h
+++ b/lib/books/uncoupled/res_books_uncoupled.h
@@ -16,6 +16,7 @@
  ********************************************************************/
 
 #include "codebook.h"
+
 static const long _vq_quantlist__16u0__p1_0[] = {
         1,
         0,
@@ -932,660 +933,660 @@ static const static_codebook _huff_book__16u1__short = {
 };
 
 static const long _huff_lengthlist__16u2__long[] = {
-         5, 7,10,10,10,11,11,13,18,19, 6, 5, 5, 6, 7, 8,
-         9,12,19,19, 8, 5, 4, 4, 6, 7, 9,13,19,19, 8, 5,
-         4, 4, 5, 6, 8,12,17,19, 7, 5, 5, 4, 4, 5, 7,12,
-        18,18, 8, 7, 7, 6, 5, 5, 6,10,18,18, 9, 9, 9, 8,
-         6, 5, 6, 9,18,18,11,13,13,13, 8, 7, 7, 9,16,18,
-        13,17,18,16,11, 9, 9, 9,17,18,15,18,18,18,15,13,
-        13,14,18,18,
+        5, 8,10,10,10,11,11,12,14,18, 7, 5, 5, 6, 8, 9,
+       10,12,14,17, 9, 5, 4, 5, 6, 8,10,11,13,19, 9, 5,
+        4, 4, 5, 6, 9,10,12,17, 8, 6, 5, 4, 4, 5, 7,10,
+       11,15, 8, 7, 7, 6, 5, 5, 6, 9,11,14, 8, 9, 8, 7,
+        6, 5, 6, 7,11,14, 9,11,11, 9, 7, 6, 6, 6, 9,14,
+       11,14,15,13, 9, 8, 7, 7, 9,14,13,15,19,17,12,11,
+       10, 9,10,14,
 };
 
 static const static_codebook _huff_book__16u2__long = {
-        2, 100,
-        (long *)_huff_lengthlist__16u2__long,
-        0, 0, 0, 0, 0,
-        NULL,
-        0
-};
-
-static const long _huff_lengthlist__16u2__short[] = {
-         8,11,12,12,14,15,16,16,16,16, 9, 7, 7, 8, 9,11,
-        13,14,16,16,13, 7, 6, 6, 7, 9,12,13,15,16,15, 7,
-         6, 5, 4, 6,10,11,14,16,12, 8, 7, 4, 2, 4, 7,10,
-        14,16,11, 9, 7, 5, 3, 4, 6, 9,14,16,11,10, 9, 7,
-         5, 5, 6, 9,16,16,10,10, 9, 8, 6, 6, 7,10,16,16,
-        11,11,11,10,10,10,11,14,16,16,16,14,14,13,14,16,
-        16,16,16,16,
-};
-
-static const static_codebook _huff_book__16u2__short = {
-        2, 100,
-        (long *)_huff_lengthlist__16u2__short,
-        0, 0, 0, 0, 0,
-        NULL,
-        0
+       2, 100,
+       (long *)_huff_lengthlist__16u2__long,
+       0, 0, 0, 0, 0,
+       NULL,
+       0
 };
 
 static const long _vq_quantlist__16u2_p1_0[] = {
-        1,
-        0,
-        2,
+       1,
+       0,
+       2,
 };
 
 static const long _vq_lengthlist__16u2_p1_0[] = {
-         1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 9, 9, 7,
-         9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 9, 5, 7, 7, 8, 9,
-         9, 7, 9, 9, 7, 9, 9, 9,10,10, 9,10,10, 7, 9, 9,
-         9,10,10, 9,10,11, 5, 7, 8, 8, 9, 9, 8, 9, 9, 7,
-         9, 9, 9,10,10, 9, 9,10, 7, 9, 9, 9,10,10, 9,11,
-        10,
+        1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 9, 9, 7,
+        9, 9, 5, 7, 7, 7, 9, 9, 8, 9, 9, 5, 7, 7, 8, 9,
+        9, 7, 9, 9, 7, 9, 9, 9,10,11, 9,10,10, 7, 9, 9,
+        9,10, 9, 9,10,11, 5, 8, 7, 7, 9, 9, 8, 9, 9, 7,
+        9, 9, 9,11,10, 9, 9,10, 7, 9, 9, 9,10,10, 9,11,
+       10,
 };
 
 static const static_codebook _16u2_p1_0 = {
-        4, 81,
-        (long *)_vq_lengthlist__16u2_p1_0,
-        1, -535822336, 1611661312, 2, 0,
-        (long *)_vq_quantlist__16u2_p1_0,
-        0
+       4, 81,
+       (long *)_vq_lengthlist__16u2_p1_0,
+       1, -535822336, 1611661312, 2, 0,
+       (long *)_vq_quantlist__16u2_p1_0,
+       0
 };
 
 static const long _vq_quantlist__16u2_p2_0[] = {
-        2,
-        1,
-        3,
-        0,
-        4,
+       2,
+       1,
+       3,
+       0,
+       4,
 };
 
 static const long _vq_lengthlist__16u2_p2_0[] = {
-         3, 5, 5, 8, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 9,
-        10, 9,11,11, 9, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8,
-         8,10,10, 7, 8, 8,10,10,10,10,10,12,12, 9,10,10,
-        11,12, 5, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,
-        10, 9,10,10,12,11,10,10,10,12,12, 9,10,10,12,12,
-        10,11,10,13,12, 9,10,10,12,12,12,12,12,14,14,11,
-        12,12,13,14, 9,10,10,12,12, 9,10,10,12,12,10,10,
-        10,12,12,11,12,12,14,13,12,13,12,14,14, 5, 7, 7,
-         9, 9, 7, 8, 8,10,10, 7, 8, 8,10,10,10,11,10,12,
-        12,10,10,11,12,12, 7, 8, 8,10,10, 8, 9, 9,11,11,
-         8, 9, 9,11,11,11,11,11,12,13,10,11,11,12,13, 7,
-         8, 8,10,10, 8, 9, 8,11,10, 8, 9, 9,11,11,10,11,
-        10,13,12,10,11,11,13,13, 9,11,10,13,13,10,11,11,
-        13,13,10,11,11,13,13,12,12,13,13,15,12,12,13,14,
-        15, 9,10,10,12,12,10,11,10,13,12,10,11,11,13,13,
-        11,13,11,14,13,12,13,13,15,15, 5, 7, 7, 9, 9, 7,
-         8, 8,10,10, 7, 8, 8,10,10,10,10,10,12,12,10,10,
-        11,12,12, 7, 8, 8,10,10, 8, 9, 9,11,11, 8, 8, 9,
-        10,11,10,11,11,13,13,10,10,11,12,13, 7, 8, 8,10,
-        11, 8, 9, 9,11,11, 8, 9, 9,11,11,10,11,11,13,12,
-        11,11,11,13,12, 9,10,10,12,12,10,11,11,13,13,10,
-        10,11,12,13,12,13,13,15,14,11,11,13,12,14,10,10,
-        11,13,13,10,11,11,13,13,10,11,11,13,13,12,13,13,
-        14,14,12,13,12,14,13, 8,10, 9,12,12, 9,11,10,13,
-        13, 9,10,10,12,13,12,13,13,14,14,12,12,13,14,14,
-         9,11,10,13,13,10,11,11,13,13,10,11,11,13,13,12,
-        13,13,15,15,13,13,13,14,15, 9,10,10,12,13,10,11,
-        10,13,12,10,11,11,13,13,12,13,12,15,14,13,13,13,
-        14,15,11,12,12,15,14,12,12,13,15,15,12,13,13,15,
-        14,14,13,15,14,16,13,14,15,16,16,11,12,12,14,14,
-        11,12,12,15,14,12,13,13,15,15,13,14,13,16,14,14,
-        14,14,16,16, 8, 9, 9,12,12, 9,10,10,13,12, 9,10,
-        10,13,13,12,12,12,14,14,12,12,13,15,15, 9,10,10,
-        13,12,10,11,11,13,13,10,10,11,13,14,12,13,13,15,
-        15,12,12,13,14,15, 9,10,10,13,13,10,11,11,13,13,
-        10,11,11,13,13,12,13,13,14,14,13,14,13,15,14,11,
-        12,12,14,14,12,13,13,15,14,11,12,12,14,15,14,14,
-        14,16,15,13,12,14,14,16,11,12,13,14,15,12,13,13,
-        14,16,12,13,12,15,14,13,15,14,16,16,14,15,13,16,
-        13,
+        3, 5, 5, 8, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 9,
+       10, 9,11,11, 9, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8,
+        8,10,10, 7, 8, 8,10,10,10,10,10,12,12, 9,10,10,
+       11,12, 5, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,
+       10, 9,10,10,12,11,10,10,10,12,12, 9,10,10,12,12,
+       10,10,10,12,12, 9,10,10,12,12,12,12,12,14,14,11,
+       12,12,13,14, 9,10,10,12,12, 9,10,10,12,12,10,10,
+       10,12,12,11,12,12,14,13,12,12,12,14,13, 5, 7, 7,
+        9, 9, 7, 8, 8,10,10, 7, 8, 8,10,10,10,10,10,12,
+       12,10,10,10,12,12, 7, 8, 8,11,10, 8, 9, 9,11,11,
+        8, 9, 9,11,11,10,11,11,12,13,10,11,11,12,13, 7,
+        8, 8,10,10, 8, 9, 8,11,10, 8, 9, 9,11,11,10,11,
+       10,13,12,10,11,11,13,13,10,11,10,13,12,10,11,11,
+       13,13,10,11,11,13,13,12,12,13,13,14,12,13,13,14,
+       14, 9,10,10,12,12,10,11,10,13,12,10,11,11,13,13,
+       12,13,12,14,13,12,13,13,14,15, 5, 7, 7, 9,10, 7,
+        8, 8,10,10, 7, 8, 8,10,10,10,10,10,12,12,10,10,
+       11,12,12, 7, 8, 8,10,10, 8, 9, 9,11,11, 8, 8, 9,
+       10,11,10,11,11,13,13,10,10,11,12,13, 7, 8, 8,10,
+       10, 8, 9, 9,11,11, 8, 9, 9,11,11,10,11,11,13,12,
+       10,11,11,13,12, 9,10,10,12,12,10,11,11,13,13,10,
+       10,11,12,13,12,13,13,15,14,12,12,13,12,14, 9,10,
+       11,12,13,10,11,11,13,13,10,11,11,13,13,12,13,13,
+       14,14,12,13,12,14,13, 8,10,10,12,12, 9,11,10,13,
+       12, 9,10,10,12,13,12,13,13,14,14,12,12,12,14,14,
+        9,10,10,13,13,10,11,11,13,13,10,11,11,13,13,13,
+       13,13,14,15,12,13,13,14,15, 9,10,10,12,13,10,11,
+       10,13,13,10,11,11,12,13,12,13,12,15,14,12,13,13,
+       14,15,11,12,12,15,14,12,12,13,14,15,12,13,13,15,
+       14,13,13,15,14,16,14,14,14,16,15,11,12,12,14,14,
+       11,12,12,14,14,12,13,13,14,15,13,14,13,15,13,14,
+       14,14,15,16, 8, 9,10,12,12, 9,10,10,13,12, 9,10,
+       11,12,13,12,12,12,14,14,12,13,13,14,14, 9,10,10,
+       13,12,10,11,11,13,13,10,10,11,13,13,12,13,13,15,
+       14,12,12,13,14,15, 9,10,10,13,13,10,11,11,13,13,
+       10,11,11,13,13,12,13,13,14,14,13,13,13,15,15,11,
+       12,12,14,13,12,13,13,15,14,11,12,12,14,14,14,14,
+       14,16,15,13,13,14,13,16,11,12,12,14,14,12,13,13,
+       14,15,12,13,12,14,14,14,14,14,16,16,14,15,13,16,
+       14,
 };
 
 static const static_codebook _16u2_p2_0 = {
-        4, 625,
-        (long *)_vq_lengthlist__16u2_p2_0,
-        1, -533725184, 1611661312, 3, 0,
-        (long *)_vq_quantlist__16u2_p2_0,
-        0
+       4, 625,
+       (long *)_vq_lengthlist__16u2_p2_0,
+       1, -533725184, 1611661312, 3, 0,
+       (long *)_vq_quantlist__16u2_p2_0,
+       0
 };
 
 static const long _vq_quantlist__16u2_p3_0[] = {
-        4,
-        3,
-        5,
-        2,
-        6,
-        1,
-        7,
-        0,
-        8,
+       4,
+       3,
+       5,
+       2,
+       6,
+       1,
+       7,
+       0,
+       8,
 };
 
 static const long _vq_lengthlist__16u2_p3_0[] = {
-         2, 4, 4, 6, 6, 7, 7, 9, 9, 4, 5, 5, 6, 6, 8, 7,
-         9, 9, 4, 5, 5, 6, 6, 7, 8, 9, 9, 6, 6, 6, 7, 7,
-         8, 8,10,10, 6, 6, 6, 7, 7, 8, 8, 9,10, 7, 8, 7,
-         8, 8, 9, 9,10,10, 7, 8, 8, 8, 8, 9, 9,10,10, 9,
-         9, 9,10, 9,10,10,11,11, 9, 9, 9,10,10,10,10,11,
-        11,
+        2, 4, 4, 6, 6, 7, 7, 9, 9, 4, 5, 5, 6, 6, 8, 7,
+        9, 9, 4, 5, 5, 6, 6, 7, 8, 9, 9, 6, 6, 6, 7, 7,
+        8, 8,10,10, 6, 6, 6, 7, 7, 8, 8,10,10, 7, 8, 7,
+        8, 8, 9, 9,11,10, 7, 7, 8, 8, 8, 9, 9,10,11, 9,
+        9, 9,10,10,11,10,11,11, 9, 9, 9,10,10,10,11,11,
+       11,
 };
 
 static const static_codebook _16u2_p3_0 = {
-        2, 81,
-        (long *)_vq_lengthlist__16u2_p3_0,
-        1, -531628032, 1611661312, 4, 0,
-        (long *)_vq_quantlist__16u2_p3_0,
-        0
+       2, 81,
+       (long *)_vq_lengthlist__16u2_p3_0,
+       1, -531628032, 1611661312, 4, 0,
+       (long *)_vq_quantlist__16u2_p3_0,
+       0
 };
 
 static const long _vq_quantlist__16u2_p4_0[] = {
-        8,
-        7,
-        9,
-        6,
-        10,
-        5,
-        11,
-        4,
-        12,
-        3,
-        13,
-        2,
-        14,
-        1,
-        15,
-        0,
-        16,
+       8,
+       7,
+       9,
+       6,
+       10,
+       5,
+       11,
+       4,
+       12,
+       3,
+       13,
+       2,
+       14,
+       1,
+       15,
+       0,
+       16,
 };
 
 static const long _vq_lengthlist__16u2_p4_0[] = {
-         2, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11,11,
-        11, 5, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11,
-        12,11, 5, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,
-        11,12,12, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,
-        11,11,12,12, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,
-        10,11,11,12,12, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,10,
-        11,11,12,12,12,12, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,
-        10,11,11,11,12,12,12, 9, 9, 9, 9, 9, 9,10,10,10,
-        10,10,11,11,12,12,13,13, 8, 9, 9, 9, 9,10, 9,10,
-        10,10,10,11,11,12,12,13,13, 9, 9, 9, 9, 9,10,10,
-        10,10,11,11,11,12,12,12,13,13, 9, 9, 9, 9, 9,10,
-        10,10,10,11,11,12,11,12,12,13,13,10,10,10,10,10,
-        11,11,11,11,11,12,12,12,12,13,13,14,10,10,10,10,
-        10,11,11,11,11,12,11,12,12,13,12,13,13,11,11,11,
-        11,11,12,12,12,12,12,12,13,13,13,13,14,14,11,11,
-        11,11,11,12,12,12,12,12,12,13,12,13,13,14,14,11,
-        12,12,12,12,12,12,13,13,13,13,13,13,14,14,14,14,
-        11,12,12,12,12,12,12,13,13,13,13,14,13,14,14,14,
-        14,
+        2, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11,11,
+       11, 5, 5, 5, 7, 6, 8, 7, 9, 9, 9, 9,10,10,11,11,
+       12,12, 5, 5, 5, 6, 6, 7, 8, 8, 9, 9, 9,10,10,11,
+       11,12,12, 6, 7, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,
+       11,11,12,12, 6, 6, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,
+       10,11,11,12,12, 7, 8, 8, 8, 8, 9, 9, 9, 9,10,10,
+       11,11,11,11,12,12, 7, 7, 8, 8, 8, 9, 9, 9, 9,10,
+       10,11,11,11,11,12,12, 8, 9, 9, 9, 9, 9, 9,10,10,
+       10,10,11,11,12,12,12,12, 8, 9, 9, 9, 9, 9, 9,10,
+       10,10,10,11,11,12,12,12,12, 9, 9, 9, 9, 9,10,10,
+       10,10,10,11,11,11,12,12,13,13, 9, 9, 9, 9, 9,10,
+       10,10,10,11,10,11,11,12,12,13,13,10,10,10,10,10,
+       11,11,11,11,11,11,11,12,12,12,13,13,10,10,10,10,
+       10,11,11,11,11,11,11,12,11,12,12,13,13,11,11,11,
+       11,11,11,11,12,12,12,12,12,12,13,13,13,13,11,11,
+       11,11,11,11,11,12,12,12,12,13,12,13,13,13,13,11,
+       12,12,12,12,12,12,12,12,13,13,13,13,13,13,14,14,
+       11,12,12,12,12,12,12,12,13,13,13,13,13,13,13,14,
+       14,
 };
 
 static const static_codebook _16u2_p4_0 = {
-        2, 289,
-        (long *)_vq_lengthlist__16u2_p4_0,
-        1, -529530880, 1611661312, 5, 0,
-        (long *)_vq_quantlist__16u2_p4_0,
-        0
+       2, 289,
+       (long *)_vq_lengthlist__16u2_p4_0,
+       1, -529530880, 1611661312, 5, 0,
+       (long *)_vq_quantlist__16u2_p4_0,
+       0
 };
 
 static const long _vq_quantlist__16u2_p5_0[] = {
-        1,
-        0,
-        2,
+       1,
+       0,
+       2,
 };
 
 static const long _vq_lengthlist__16u2_p5_0[] = {
-         1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 8, 7,10, 9, 7,
-        10, 9, 5, 8, 9, 7, 9,10, 7, 9,10, 4, 9, 9, 9,11,
-        11, 8,11,11, 7,11,11,10,10,13,10,14,13, 7,11,11,
-        10,13,11,10,13,14, 5, 9, 9, 8,11,11, 9,11,11, 7,
-        11,11,10,14,13,10,12,14, 7,11,11,10,13,13,10,13,
-        10,
+        1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 7, 9, 9, 7,
+        9,10, 5, 8, 8, 7,10, 9, 7,10, 9, 5, 8, 8, 8,11,
+       10, 8,10,10, 7,10,10, 9, 9,12,10,12,12, 7,10,10,
+        9,12,10,10,11,12, 5, 8, 8, 8,10,10, 8,11,11, 7,
+       11,10,10,12,11, 9,10,12, 7,10,11,10,12,12, 9,12,
+        9,
 };
 
 static const static_codebook _16u2_p5_0 = {
-        4, 81,
-        (long *)_vq_lengthlist__16u2_p5_0,
-        1, -529137664, 1618345984, 2, 0,
-        (long *)_vq_quantlist__16u2_p5_0,
-        0
+       4, 81,
+       (long *)_vq_lengthlist__16u2_p5_0,
+       1, -529137664, 1618345984, 2, 0,
+       (long *)_vq_quantlist__16u2_p5_0,
+       0
 };
 
 static const long _vq_quantlist__16u2_p5_1[] = {
-        5,
-        4,
-        6,
-        3,
-        7,
-        2,
-        8,
-        1,
-        9,
-        0,
-        10,
+       5,
+       4,
+       6,
+       3,
+       7,
+       2,
+       8,
+       1,
+       9,
+       0,
+       10,
 };
 
 static const long _vq_lengthlist__16u2_p5_1[] = {
-         2, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 5, 5, 5, 7, 7,
-         7, 7, 8, 8, 8, 8, 5, 5, 6, 7, 7, 7, 7, 8, 8, 8,
-         8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7,
-         7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 8, 8, 8, 8, 9, 9,
-         9, 9, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 8, 8, 8,
-         8, 8, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 9, 9, 9,
-         9, 9, 9, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 8, 8,
-         8, 8, 8, 9, 9, 9, 9, 9, 9,
+        2, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 5, 6, 6, 7, 7,
+        7, 7, 8, 8, 8, 8, 5, 6, 6, 6, 7, 7, 7, 8, 8, 8,
+        8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7,
+        7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8,
+        8, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+        8, 8, 8, 8, 8, 8, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8,
+        8, 9, 9, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 8, 8,
+        8, 8, 8, 8, 8, 9, 9, 9, 9,
 };
 
 static const static_codebook _16u2_p5_1 = {
-        2, 121,
-        (long *)_vq_lengthlist__16u2_p5_1,
-        1, -531365888, 1611661312, 4, 0,
-        (long *)_vq_quantlist__16u2_p5_1,
-        0
+       2, 121,
+       (long *)_vq_lengthlist__16u2_p5_1,
+       1, -531365888, 1611661312, 4, 0,
+       (long *)_vq_quantlist__16u2_p5_1,
+       0
 };
 
 static const long _vq_quantlist__16u2_p6_0[] = {
-        6,
-        5,
-        7,
-        4,
-        8,
-        3,
-        9,
-        2,
-        10,
-        1,
-        11,
-        0,
-        12,
+       6,
+       5,
+       7,
+       4,
+       8,
+       3,
+       9,
+       2,
+       10,
+       1,
+       11,
+       0,
+       12,
 };
 
 static const long _vq_lengthlist__16u2_p6_0[] = {
-         1, 4, 4, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 4, 6, 6,
-         8, 8, 9, 9, 9, 9,10,10,12,11, 4, 6, 6, 8, 8, 9,
-         9, 9, 9,10,10,11,12, 7, 8, 8, 9, 9,10,10,10,10,
-        12,12,13,12, 7, 8, 8, 9, 9,10,10,10,10,11,12,12,
-        12, 8, 9, 9,10,10,11,11,11,11,12,12,13,13, 8, 9,
-         9,10,10,11,11,11,11,12,13,13,13, 8, 9, 9,10,10,
-        11,11,12,12,13,13,14,14, 8, 9, 9,10,10,11,11,12,
-        12,13,13,14,14, 9,10,10,11,12,13,12,13,14,14,14,
-        14,14, 9,10,10,11,12,12,13,13,13,14,14,14,14,10,
-        11,11,12,12,13,13,14,14,15,15,15,15,10,11,11,12,
-        12,13,13,14,14,14,14,15,15,
+        1, 5, 4, 7, 7, 8, 8, 8, 8,10,10,11,11, 4, 6, 6,
+        7, 7, 9, 9, 9, 9,10,10,11,11, 4, 6, 6, 7, 7, 9,
+        9, 9, 9,10,10,11,11, 7, 8, 8, 9, 9, 9, 9,10,10,
+       11,11,12,12, 7, 7, 7, 9, 8,10, 9,10,10,11,11,12,
+       12, 8, 9, 9, 9,10,10,10,11,11,12,12,13,13, 8, 9,
+        9,10, 9,10,10,11,11,12,12,13,13, 8, 9, 9,10,10,
+       11,11,11,11,12,12,13,13, 8, 9, 9,10,10,11,11,12,
+       11,12,12,13,13,10,10,10,11,11,12,12,12,12,13,13,
+       14,14,10,10,10,11,11,12,12,12,12,13,13,14,14,11,
+       11,11,12,12,13,13,13,13,14,14,14,14,11,11,11,12,
+       12,13,13,13,13,14,14,14,14,
 };
 
 static const static_codebook _16u2_p6_0 = {
-        2, 169,
-        (long *)_vq_lengthlist__16u2_p6_0,
-        1, -526516224, 1616117760, 4, 0,
-        (long *)_vq_quantlist__16u2_p6_0,
-        0
+       2, 169,
+       (long *)_vq_lengthlist__16u2_p6_0,
+       1, -526516224, 1616117760, 4, 0,
+       (long *)_vq_quantlist__16u2_p6_0,
+       0
 };
 
 static const long _vq_quantlist__16u2_p6_1[] = {
-        2,
-        1,
-        3,
-        0,
-        4,
+       2,
+       1,
+       3,
+       0,
+       4,
 };
 
 static const long _vq_lengthlist__16u2_p6_1[] = {
-         2, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-         5, 5, 6, 6, 5, 5, 5, 6, 6,
+        2, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+        5, 5, 5, 5, 5, 5, 5, 5, 5,
 };
 
 static const static_codebook _16u2_p6_1 = {
-        2, 25,
-        (long *)_vq_lengthlist__16u2_p6_1,
-        1, -533725184, 1611661312, 3, 0,
-        (long *)_vq_quantlist__16u2_p6_1,
-        0
+       2, 25,
+       (long *)_vq_lengthlist__16u2_p6_1,
+       1, -533725184, 1611661312, 3, 0,
+       (long *)_vq_quantlist__16u2_p6_1,
+       0
 };
 
 static const long _vq_quantlist__16u2_p7_0[] = {
-        6,
-        5,
-        7,
-        4,
-        8,
-        3,
-        9,
-        2,
-        10,
-        1,
-        11,
-        0,
-        12,
+       6,
+       5,
+       7,
+       4,
+       8,
+       3,
+       9,
+       2,
+       10,
+       1,
+       11,
+       0,
+       12,
 };
 
 static const long _vq_lengthlist__16u2_p7_0[] = {
-         1, 4, 4, 7, 7, 7, 7, 8, 8, 9, 9,10,10, 4, 6, 6,
-         9, 9, 9, 9, 9, 9,10,10,11,11, 4, 6, 6, 8, 9, 9,
-         9, 9, 9,10,11,12,11, 7, 8, 9,10,10,10,10,11,10,
-        11,12,12,13, 7, 9, 9,10,10,10,10,10,10,11,12,13,
-        13, 7, 9, 8,10,10,11,11,11,12,12,13,13,14, 7, 9,
-         9,10,10,11,11,11,12,13,13,13,13, 8, 9, 9,10,11,
-        11,12,12,12,13,13,13,13, 8, 9, 9,10,11,11,11,12,
-        12,13,13,14,14, 9,10,10,12,11,12,13,13,13,14,13,
-        13,13, 9,10,10,11,11,12,12,13,14,13,13,14,13,10,
-        11,11,12,13,14,14,14,15,14,14,14,14,10,11,11,12,
-        12,13,13,13,14,14,14,15,14,
+        1, 4, 4, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 4, 6, 6,
+        8, 8, 9, 9, 9, 9,10,10,11,10, 4, 6, 6, 8, 8, 9,
+        9, 9, 9,10,10,11,11, 7, 8, 8,10, 9,10,10,10,10,
+       11,11,12,12, 7, 8, 8,10,10,10,10,10,10,11,11,12,
+       12, 8, 9, 9,10,10,11,11,11,11,12,12,13,13, 8, 9,
+        9,10,10,11,11,11,11,12,12,13,13, 8, 9, 9,11,10,
+       11,11,12,12,13,13,14,13, 8, 9, 9,10,10,11,11,12,
+       12,13,13,13,13, 9,10,10,11,11,12,12,13,13,13,13,
+       14,14, 9,10,10,11,11,12,12,13,13,13,13,14,14,10,
+       11,11,12,12,13,13,14,13,14,14,15,14,10,11,11,12,
+       12,13,13,14,13,14,14,15,14,
 };
 
 static const static_codebook _16u2_p7_0 = {
-        2, 169,
-        (long *)_vq_lengthlist__16u2_p7_0,
-        1, -523206656, 1618345984, 4, 0,
-        (long *)_vq_quantlist__16u2_p7_0,
-        0
+       2, 169,
+       (long *)_vq_lengthlist__16u2_p7_0,
+       1, -523206656, 1618345984, 4, 0,
+       (long *)_vq_quantlist__16u2_p7_0,
+       0
 };
 
 static const long _vq_quantlist__16u2_p7_1[] = {
-        5,
-        4,
-        6,
-        3,
-        7,
-        2,
-        8,
-        1,
-        9,
-        0,
-        10,
+       5,
+       4,
+       6,
+       3,
+       7,
+       2,
+       8,
+       1,
+       9,
+       0,
+       10,
 };
 
 static const long _vq_lengthlist__16u2_p7_1[] = {
-         3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 6, 7, 7,
-         7, 7, 7, 7, 8, 8, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8,
-         8, 6, 6, 7, 7, 7, 8, 7, 8, 8, 8, 8, 6, 7, 7, 7,
-         7, 7, 7, 8, 8, 8, 8, 7, 7, 7, 7, 7, 8, 8, 8, 8,
-         8, 8, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7,
-         8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 8, 8, 8, 8, 8,
-         8, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 8,
-         8, 8, 8, 8, 8, 8, 8, 8, 8,
+        2, 5, 5, 7, 7, 7, 7, 7, 7, 8, 8, 5, 6, 6, 7, 7,
+        7, 7, 8, 8, 8, 8, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8,
+        8, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7,
+        7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8,
+        8, 8, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 7, 8, 8,
+        8, 8, 8, 8, 8, 8, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8,
+        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+        8, 8, 8, 8, 8, 8, 8, 8, 8,
 };
 
 static const static_codebook _16u2_p7_1 = {
-        2, 121,
-        (long *)_vq_lengthlist__16u2_p7_1,
-        1, -531365888, 1611661312, 4, 0,
-        (long *)_vq_quantlist__16u2_p7_1,
-        0
+       2, 121,
+       (long *)_vq_lengthlist__16u2_p7_1,
+       1, -531365888, 1611661312, 4, 0,
+       (long *)_vq_quantlist__16u2_p7_1,
+       0
 };
 
 static const long _vq_quantlist__16u2_p8_0[] = {
-        7,
-        6,
-        8,
-        5,
-        9,
-        4,
-        10,
-        3,
-        11,
-        2,
-        12,
-        1,
-        13,
-        0,
-        14,
+       7,
+       6,
+       8,
+       5,
+       9,
+       4,
+       10,
+       3,
+       11,
+       2,
+       12,
+       1,
+       13,
+       0,
+       14,
 };
 
 static const long _vq_lengthlist__16u2_p8_0[] = {
-         1, 5, 5, 7, 7, 8, 8, 7, 7, 8, 8,10, 9,11,11, 4,
-         6, 6, 8, 8,10, 9, 9, 8, 9, 9,10,10,12,14, 4, 6,
-         7, 8, 9, 9,10, 9, 8, 9, 9,10,12,12,11, 7, 8, 8,
-        10,10,10,10, 9, 9,10,10,11,13,13,12, 7, 8, 8, 9,
-        11,11,10, 9, 9,11,10,12,11,11,14, 8, 9, 9,11,10,
-        11,11,10,10,11,11,13,12,14,12, 8, 9, 9,11,12,11,
-        11,10,10,12,11,12,12,12,14, 7, 8, 8, 9, 9,10,10,
-        10,11,12,11,13,13,14,12, 7, 8, 9, 9, 9,10,10,11,
-        11,11,12,12,14,14,14, 8,10, 9,10,11,11,11,11,14,
-        12,12,13,14,14,13, 9, 9, 9,10,11,11,11,12,12,12,
-        14,12,14,13,14,10,10,10,12,11,12,11,14,13,14,13,
-        14,14,13,14, 9,10,10,11,12,11,13,12,13,13,14,14,
-        14,13,14,10,13,13,12,12,11,12,14,13,14,13,14,12,
-        14,13,10,11,11,12,11,12,12,14,14,14,13,14,14,14,
-        14,
+        1, 4, 4, 7, 7, 8, 8, 7, 7, 9, 8,10, 9,11,11, 4,
+        7, 6, 9, 8, 9, 9, 9, 9,10, 9,11, 9,12, 9, 4, 6,
+        7, 8, 8, 9, 9, 9, 9,10,10,10,11,11,12, 7, 9, 8,
+       10,10,11,11,10,10,11,11,12,12,13,12, 7, 8, 8,10,
+       10,10,11,10,10,11,11,11,12,12,13, 8, 9, 9,11,11,
+       11,11,11,11,12,12,13,13,13,13, 8, 9, 9,11,11,11,
+       11,11,11,12,12,13,13,13,14, 8, 9, 9,10,10,11,11,
+       12,11,13,13,14,13,14,14, 8, 9, 9,10,10,11,11,12,
+       12,12,12,13,13,14,14, 9,10,10,11,11,12,12,13,12,
+       13,13,14,14,15,15, 9,10,10,11,11,12,12,12,13,13,
+       13,14,14,14,15,10,11,11,12,12,13,13,14,13,14,14,
+       15,14,15,15,10,11,11,12,12,13,12,13,14,14,14,14,
+       14,15,15,11,12,12,13,13,13,13,14,14,15,14,15,15,
+       16,16,11,12,12,13,13,13,13,14,14,14,15,15,15,16,
+       16,
 };
 
 static const static_codebook _16u2_p8_0 = {
-        2, 225,
-        (long *)_vq_lengthlist__16u2_p8_0,
-        1, -520986624, 1620377600, 4, 0,
-        (long *)_vq_quantlist__16u2_p8_0,
-        0
+       2, 225,
+       (long *)_vq_lengthlist__16u2_p8_0,
+       1, -520986624, 1620377600, 4, 0,
+       (long *)_vq_quantlist__16u2_p8_0,
+       0
 };
 
 static const long _vq_quantlist__16u2_p8_1[] = {
-        10,
-        9,
-        11,
-        8,
-        12,
-        7,
-        13,
-        6,
-        14,
-        5,
-        15,
-        4,
-        16,
-        3,
-        17,
-        2,
-        18,
-        1,
-        19,
-        0,
-        20,
+       10,
+       9,
+       11,
+       8,
+       12,
+       7,
+       13,
+       6,
+       14,
+       5,
+       15,
+       4,
+       16,
+       3,
+       17,
+       2,
+       18,
+       1,
+       19,
+       0,
+       20,
 };
 
 static const long _vq_lengthlist__16u2_p8_1[] = {
-         2, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10, 9,10, 9, 9,
-         9,10,10,10,10, 5, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,
-        10, 9,10,10,10,10,10,10,11,10, 5, 6, 6, 7, 7, 8,
-         8, 8, 9, 9,10,10,10,10,10,10,10,10,10,10,10, 7,
-         7, 7, 8, 8, 9, 8, 9, 9,10, 9,10,10,10,10,10,10,
-        11,10,11,10, 7, 7, 7, 8, 8, 8, 9, 9, 9,10, 9,10,
-        10,10,10,10,10,10,10,10,10, 8, 8, 8, 9, 9, 9, 9,
-        10, 9,10,10,10,10,10,10,10,11,10,10,11,10, 8, 8,
-         8, 8, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,11,
-        11,10,10, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,
-        11,10,11,10,11,10,11,10, 8, 9, 9, 9, 9, 9,10,10,
-        10,10,10,10,10,10,10,10,11,11,10,10,10, 9,10, 9,
-         9,10,10,10,11,10,10,10,10,10,10,10,10,11,11,11,
-        11,11, 9, 9, 9,10, 9,10,10,10,10,10,10,11,10,11,
-        10,11,11,11,11,10,10, 9,10, 9,10,10,10,10,11,10,
-        10,10,10,10,11,10,11,10,11,10,10,11, 9,10,10,10,
-        10,10,10,10,10,10,11,10,10,11,11,10,11,11,11,11,
-        11, 9, 9,10,10,10,10,10,11,10,10,11,10,10,11,10,
-        10,11,11,11,11,11, 9,10,10,10,10,10,10,10,11,10,
-        11,10,11,10,11,11,11,11,11,10,11,10,10,10,10,10,
-        10,10,10,10,11,11,11,11,11,11,11,11,11,10,11,11,
-        10,10,10,10,10,11,10,10,10,11,10,11,11,11,11,10,
-        12,11,11,11,10,10,10,10,10,10,11,10,10,10,11,11,
-        12,11,11,11,11,11,11,11,11,11,10,10,10,11,10,11,
-        11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,10,
-        10,10,11,10,11,10,10,11,11,11,11,11,11,11,11,11,
-        11,11,11,10,10,10,10,10,10,10,11,11,10,11,11,10,
-        11,11,10,11,11,11,10,11,11,
+        3, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9,10,10,10,10, 5, 6, 6, 7, 7, 8,
+        8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 7,
+        7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,
+       10,10,10,10, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9,
+        9,10, 9,10,10,10, 9,10, 9, 8, 8, 8, 9, 8, 9, 9,
+        9, 9,10, 9,10,10,10,10,10,10,10,10,10,10, 8, 8,
+        8, 8, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,
+       10,10,10, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,
+       10,10,10,10,10,10,10,10, 8, 9, 9, 9, 9, 9, 9, 9,
+       10,10,10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9,
+        9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10, 9, 9, 9, 9, 9,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9,
+        9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10, 9, 9, 9,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10, 9, 9,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+        9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10, 9,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10, 9,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, 9,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10, 9,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,
 };
 
 static const static_codebook _16u2_p8_1 = {
-        2, 441,
-        (long *)_vq_lengthlist__16u2_p8_1,
-        1, -529268736, 1611661312, 5, 0,
-        (long *)_vq_quantlist__16u2_p8_1,
-        0
+       2, 441,
+       (long *)_vq_lengthlist__16u2_p8_1,
+       1, -529268736, 1611661312, 5, 0,
+       (long *)_vq_quantlist__16u2_p8_1,
+       0
 };
 
 static const long _vq_quantlist__16u2_p9_0[] = {
-        5586,
-        4655,
-        6517,
-        3724,
-        7448,
-        2793,
-        8379,
-        1862,
-        9310,
-        931,
-        10241,
-        0,
-        11172,
-        5521,
-        5651,
+       7,
+       6,
+       8,
+       5,
+       9,
+       4,
+       10,
+       3,
+       11,
+       2,
+       12,
+       1,
+       13,
+       0,
+       14,
 };
 
 static const long _vq_lengthlist__16u2_p9_0[] = {
-         1,10,10,10,10,10,10,10,10,10,10,10,10, 5, 4,10,
-        10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-        10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-        10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-        10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-        10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-        10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-        10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-        10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-        10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-        10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-        10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-        10,10,10, 4,10,10,10,10,10,10,10,10,10,10,10,10,
-         6, 6, 5,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 5,
-         5,
+        1, 5, 3, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5,
+        7, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 7,
+        8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+       10,
 };
 
 static const static_codebook _16u2_p9_0 = {
-        2, 225,
-        (long *)_vq_lengthlist__16u2_p9_0,
-        1, -510275072, 1611661312, 14, 0,
-        (long *)_vq_quantlist__16u2_p9_0,
-        0
+       2, 225,
+       (long *)_vq_lengthlist__16u2_p9_0,
+       1, -510036736, 1631393792, 4, 0,
+       (long *)_vq_quantlist__16u2_p9_0,
+       0
 };
 
 static const long _vq_quantlist__16u2_p9_1[] = {
-        392,
-        343,
-        441,
-        294,
-        490,
-        245,
-        539,
-        196,
-        588,
-        147,
-        637,
-        98,
-        686,
-        49,
-        735,
-        0,
-        784,
-        388,
-        396,
+       9,
+       8,
+       10,
+       7,
+       11,
+       6,
+       12,
+       5,
+       13,
+       4,
+       14,
+       3,
+       15,
+       2,
+       16,
+       1,
+       17,
+       0,
+       18,
 };
 
 static const long _vq_lengthlist__16u2_p9_1[] = {
-         1,12,10,12,10,12,10,12,11,12,12,12,12,12,12,12,
-        12, 5, 5, 9,10,12,11,11,12,12,12,12,12,12,12,12,
-        12,12,12,12,10, 9, 9,11, 9,11,11,12,11,12,12,12,
-        12,12,12,12,12,12,12, 8, 8,10,11, 9,12,11,12,12,
-        12,12,12,12,12,12,12,12,12,12, 9, 8,10,11,12,11,
-        12,11,12,12,12,12,12,12,12,12,12,12,12, 8, 9,11,
-        11,10,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-         9,10,11,12,11,12,11,12,12,12,12,12,12,12,12,12,
-        12,12,12, 9, 9,11,12,12,12,12,12,12,12,12,12,12,
-        12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-        12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-        12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-        12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-        12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-        12,12,12,12,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,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,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, 5, 8, 9, 9, 8,11, 9,11,11,11,11,11,11,
-        11,11,11,11, 5, 5, 4, 8, 8, 8, 8,10, 9,10,10,11,
-        11,11,11,11,11,11,11, 5, 4,
+        1, 4, 4, 7, 7, 7, 7, 7, 6, 9, 7,10, 8,12,12,13,
+       13,14,14, 4, 7, 7, 9, 9, 9, 8, 9, 8,10, 9,11, 9,
+       14, 9,14,10,13,11, 4, 7, 7, 9, 9, 9, 9, 8, 9,10,
+       10,11,11,12,13,12,13,14,15, 7, 9, 9,10,11,10,10,
+       10,10,11,12,13,13,13,14,17,14,15,16, 7, 9, 9,10,
+       10,10,10,10,10,11,12,13,13,14,14,15,15,18,18, 8,
+        9, 9,11,10,11,11,11,12,13,12,14,14,16,15,15,17,
+       18,15, 8, 9, 9,10,10,11,11,11,11,13,13,14,14,15,
+       15,15,16,16,18, 7, 9, 8,10,10,11,11,12,12,14,14,
+       15,15,16,16,15,17,16,18, 8, 9, 9,10,10,11,12,12,
+       12,13,13,16,15,17,16,17,18,17,18, 9,10,10,12,11,
+       13,13,14,13,14,14,15,17,16,18,17,18,17,18, 9,10,
+       10,12,11,12,13,13,14,15,16,14,15,16,18,18,18,18,
+       17,11,11,11,13,13,14,14,16,15,15,15,16,15,15,18,
+       18,18,17,16,11,11,12,13,13,15,14,15,16,16,16,17,
+       16,15,18,17,18,16,18,12,13,13,15,15,15,16,18,16,
+       17,16,17,16,17,17,17,18,18,17,13,13,13,15,13,16,
+       15,17,16,16,16,18,18,18,18,16,17,17,18,13,15,14,
+       15,15,18,17,18,18,18,16,18,17,18,17,18,16,17,17,
+       14,14,14,15,16,17,16,18,18,18,17,18,17,18,18,18,
+       16,16,16,14,17,16,17,15,16,18,18,17,18,17,18,17,
+       18,18,18,17,18,17,15,16,15,18,15,18,17,16,18,18,
+       18,18,18,18,17,18,16,18,17,
 };
 
 static const static_codebook _16u2_p9_1 = {
-        2, 361,
-        (long *)_vq_lengthlist__16u2_p9_1,
-        1, -518488064, 1611661312, 10, 0,
-        (long *)_vq_quantlist__16u2_p9_1,
-        0
+       2, 361,
+       (long *)_vq_lengthlist__16u2_p9_1,
+       1, -518287360, 1622704128, 5, 0,
+       (long *)_vq_quantlist__16u2_p9_1,
+       0
 };
 
 static const long _vq_quantlist__16u2_p9_2[] = {
-        24,
-        23,
-        25,
-        22,
-        26,
-        21,
-        27,
-        20,
-        28,
-        19,
-        29,
-        18,
-        30,
-        17,
-        31,
-        16,
-        32,
-        15,
-        33,
-        14,
-        34,
-        13,
-        35,
-        12,
-        36,
-        11,
-        37,
-        10,
-        38,
-        9,
-        39,
-        8,
-        40,
-        7,
-        41,
-        6,
-        42,
-        5,
-        43,
-        4,
-        44,
-        3,
-        45,
-        2,
-        46,
-        1,
-        47,
-        0,
-        48,
+       24,
+       23,
+       25,
+       22,
+       26,
+       21,
+       27,
+       20,
+       28,
+       19,
+       29,
+       18,
+       30,
+       17,
+       31,
+       16,
+       32,
+       15,
+       33,
+       14,
+       34,
+       13,
+       35,
+       12,
+       36,
+       11,
+       37,
+       10,
+       38,
+       9,
+       39,
+       8,
+       40,
+       7,
+       41,
+       6,
+       42,
+       5,
+       43,
+       4,
+       44,
+       3,
+       45,
+       2,
+       46,
+       1,
+       47,
+       0,
+       48,
 };
 
 static const long _vq_lengthlist__16u2_p9_2[] = {
-         1, 3, 3, 4, 7, 7, 7, 8, 7, 7, 7, 7, 8, 8, 8, 8,
-         7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 9, 9, 8, 9, 9,
-         9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,12,12,10,
-        11,
+        2, 3, 4, 4, 4, 5, 5, 6, 5, 6, 6, 6, 6, 6, 6, 7,
+        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+        7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 7, 8, 8, 8, 8, 8,
+        8,
 };
 
 static const static_codebook _16u2_p9_2 = {
-        1, 49,
-        (long *)_vq_lengthlist__16u2_p9_2,
-        1, -526909440, 1611661312, 6, 0,
-        (long *)_vq_quantlist__16u2_p9_2,
-        0
+       1, 49,
+       (long *)_vq_lengthlist__16u2_p9_2,
+       1, -526909440, 1611661312, 6, 0,
+       (long *)_vq_quantlist__16u2_p9_2,
+       0
+};
+
+static const long _huff_lengthlist__16u2__short[] = {
+        8,11,13,13,15,16,19,19,19,19,11, 8, 8, 9, 9,11,
+       13,15,19,20,14, 8, 7, 7, 8, 9,12,13,15,20,15, 9,
+        6, 5, 5, 7,10,12,14,18,14, 9, 7, 5, 3, 4, 7,10,
+       12,16,13,10, 8, 6, 3, 3, 5, 8,11,14,11,10, 9, 7,
+        5, 4, 4, 6,11,14,10,10,10, 8, 6, 5, 5, 6,10,14,
+       10,10,10, 9, 8, 7, 7, 7,10,14,11,12,12,12,11,10,
+       10,10,12,16,
+};
+
+static const static_codebook _huff_book__16u2__short = {
+       2, 100,
+       (long *)_huff_lengthlist__16u2__short,
+       0, 0, 0, 0, 0,
+       NULL,
+       0
 };
 
 static const long _vq_quantlist__8u0__p1_0[] = {

diff --git a/lib/mapping0.c b/lib/mapping0.c
index e25fdb9..e0be6a0 100644 (file)
--- a/lib/mapping0.c
+++ b/lib/mapping0.c
@@ -656,11 +656,11 @@ static int mapping0_forward(vorbis_block *vb){
 #if 0
       for(i=0;i<vi->channels;i++){
         char buf[80];
-        sprintf(buf,"resI%c%d",i?'R':'L',k);
+        sprintf(buf,"res%c%d",i?'R':'L',k);
         float work[n/2];
         for(j=0;j<n/2;j++)
           work[j]=iwork[i][j];
-        _analysis_output(buf,seq,work,n/2,0,0,0);
+        _analysis_output(buf,seq,work,n/2,1,0,0);
       }
 #endif
 

diff --git a/lib/vorbisenc.c b/lib/vorbisenc.c
index 3730dfa..1b342bb 100644 (file)
--- a/lib/vorbisenc.c
+++ b/lib/vorbisenc.c
@@ -452,7 +452,7 @@ static void vorbis_encode_blocksize_setup(vorbis_info *vi,double s,
   ci->blocksizes[1]=blocklong;
 
 }
-#include<stdio.h>
+
 static void vorbis_encode_residue_setup(vorbis_info *vi,
                                         int number, int block,
                                         const vorbis_residue_template *res){

diff --git a/vq/16u.vqs b/vq/16u.vqs
index b49196a..854de98 100644 (file)
--- a/vq/16u.vqs
+++ b/vq/16u.vqs
@@ -4,18 +4,18 @@ GO
 >_16u0_ noninterleaved
 haux 16u0/resaux_0.vqd _16u0__single 0,64,2 8
        
-:_p1_0 16u0/res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1 
-:_p2_0 16u0/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 
-:_p3_0 16u0/res_part3_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p4_0 16u0/res_part4_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p5_0 16u0/res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_p1_0 16u0/res_sub0_part1_pass2.vqd, 4, nonseq cull, 0 +- 1 
+:_p2_0 16u0/res_sub0_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 
+:_p3_0 16u0/res_sub0_part3_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p4_0 16u0/res_sub0_part4_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p5_0 16u0/res_sub0_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
 
-:_p6_0 16u0/res_part6_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
-:_p6_1 16u0/res_part6_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
+:_p6_0 16u0/res_sub0_part6_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
+:_p6_1 16u0/res_sub0_part6_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
 
-:_p7_0 16u0/res_part7_pass0.vqd, 4, nonseq, 0 +- 315
-:_p7_1 16u0/res_part7_pass1.vqd, 2, nonseq, 0 +- 21 42 63 84 105 126 147
-:_p7_2 16u0/res_part7_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10
+:_p7_0 16u0/res_sub0_part7_pass0.vqd, 4, nonseq, 0 +- 315
+:_p7_1 16u0/res_sub0_part7_pass1.vqd, 2, nonseq, 0 +- 21 42 63 84 105 126 147
+:_p7_2 16u0/res_sub0_part7_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10
 
        
 >_16u1s_ noninterleaved
@@ -23,22 +23,22 @@ haux 16u1/resaux_0.vqd _16u1__short 0,64,2 10
 >_16u1_ noninterleaved
 haux 16u1/resaux_1.vqd _16u1__long 0,64,2 10
        
-:_p1_0 16u1/res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1 
-:_p2_0 16u1/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 
-:_p3_0 16u1/res_part3_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p4_0 16u1/res_part4_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p5_0 16u1/res_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p6_0 16u1/res_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_p1_0 16u1/res_sub0_part1_pass2.vqd, 4, nonseq cull, 0 +- 1 
+:_p2_0 16u1/res_sub0_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 
+:_p3_0 16u1/res_sub0_part3_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p4_0 16u1/res_sub0_part4_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p5_0 16u1/res_sub0_part5_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_p6_0 16u1/res_sub0_part6_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
 
-:_p7_0 16u1/res_part7_pass0.vqd, 4, nonseq, 0 +- 11
-:_p7_1 16u1/res_part7_pass1.vqd, 2, nonseq, 0 +- 1 2 3 4 5 
+:_p7_0 16u1/res_sub0_part7_pass0.vqd, 4, nonseq, 0 +- 11
+:_p7_1 16u1/res_sub0_part7_pass1.vqd, 2, nonseq, 0 +- 1 2 3 4 5 
 
-:_p8_0 16u1/res_part8_pass0.vqd, 2, nonseq, 0 +- 11 22 33 44 55
-:_p8_1 16u1/res_part8_pass1.vqd, 2, nonseq, 0 +- 1 2 3 4 5 
+:_p8_0 16u1/res_sub0_part8_pass0.vqd, 2, nonseq, 0 +- 11 22 33 44 55
+:_p8_1 16u1/res_sub0_part8_pass1.vqd, 2, nonseq, 0 +- 1 2 3 4 5 
 
-:_p9_0 16u1/res_part9_pass0.vqd, 2, nonseq, 0 +- 255 510 765 1020 1275 1530 1785
-:_p9_1 16u1/res_part9_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 119
-:_p9_2 16u1/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
+:_p9_0 16u1/res_sub0_part9_pass0.vqd, 2, nonseq, 0 +- 255 510 765 1020 1275 1530 1785
+:_p9_1 16u1/res_sub0_part9_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 119
+:_p9_2 16u1/res_sub0_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
 
 >_16u2s noninterleaved
 haux 16u2/resaux_0.vqd _16u2__short 0,16,2 10
@@ -46,26 +46,24 @@ haux 16u2/resaux_0.vqd _16u2__short 0,16,2 10
 >_16u2 noninterleaved
 haux 16u2/resaux_1.vqd _16u2__long 0,64,2 10
         
-:_p1_0 16u2/res_part1_pass2.vqd, 4, nonseq cull, 0 +- 1
-:_p2_0 16u2/res_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
-:_p3_0 16u2/res_part3_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
-:_p4_0 16u2/res_part4_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
+:_p1_0 16u2/res_sub0_part1_pass2.vqd, 4, nonseq cull, 0 +- 1
+:_p2_0 16u2/res_sub0_part2_pass2.vqd, 4, nonseq cull, 0 +- 1 2
+:_p3_0 16u2/res_sub0_part3_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4
+:_p4_0 16u2/res_sub0_part4_pass2.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8
 
-:_p5_0 16u2/res_part5_pass0.vqd, 4, nonseq cull, 0 +- 11
-:_p5_1 16u2/res_part5_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 
+:_p5_0 16u2/res_sub0_part5_pass0.vqd, 4, nonseq cull, 0 +- 11
+:_p5_1 16u2/res_sub0_part5_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 
 
-:_p6_0 16u2/res_part6_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
-:_p6_1 16u2/res_part6_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
+:_p6_0 16u2/res_sub0_part6_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
+:_p6_1 16u2/res_sub0_part6_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
 
-:_p7_0 16u2/res_part7_pass0.vqd, 2, nonseq, 0 +- 11 22 33 44 55 66
-:_p7_1 16u2/res_part7_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5
+:_p7_0 16u2/res_sub0_part7_pass0.vqd, 2, nonseq, 0 +- 11 22 33 44 55 66
+:_p7_1 16u2/res_sub0_part7_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5
 
-:_p8_0 16u2/res_part8_pass0.vqd, 2, nonseq, 0 +- 21 42 63 84 105 126 147
-:_p8_1 16u2/res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8 9 10
+:_p8_0 16u2/res_sub0_part8_pass0.vqd, 2, nonseq, 0 +- 21 42 63 84 105 126 147
+:_p8_1 16u2/res_sub0_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 8 9 10
 
-:_p9_0 16u2/res_part9_pass0.vqd, 2, nonseq, 0 +- 931 1862 2793 3724 4655 5586 65
-17
-:_p9_1 16u2/res_part9_pass1.vqd, 2, nonseq, 0 +- 49 98 147 196 245 294 343 392 4
-41
-:_p9_2 16u2/res_part9_pass2.vqd, 1, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 
+:_p9_0 16u2/res_sub0_part9_pass0.vqd, 2, nonseq, 0 +- 931 1862 2793 3724 4655 5586 6517
+:_p9_1 16u2/res_sub0_part9_pass1.vqd, 2, nonseq, 0 +- 49 98 147 196 245 294 343 392 441
+:_p9_2 16u2/res_sub0_part9_pass2.vqd, 1, nonseq, 0 +- 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24