Commit 0ee3ca0f authored by Monty's avatar Monty

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

Correct a longstanding bug in the 16u2 codebook; the bug was harmless (though it hurt efficiency) in the old 
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
parent 263e7552
......@@ -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();
}
......
This diff is collapsed.
......@@ -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
......
......@@ -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){
......
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment