[xiph-commits] r16921 - trunk/vorbis/lib

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2010-02-18 18:49:25 -0800 (Thu, 18 Feb 2010)
New Revision: 16921

Modified:
   trunk/vorbis/lib/vorbisenc.c
Log:
Correct a setup 'bug' that doesn't affect anything in current encoder, but could certainly be 
annoying when surround lands.



Modified: trunk/vorbis/lib/vorbisenc.c
===================================================================
--- trunk/vorbis/lib/vorbisenc.c	2010-02-18 23:12:46 UTC (rev 16920)
+++ trunk/vorbis/lib/vorbisenc.c	2010-02-19 02:49:25 UTC (rev 16921)
@@ -486,11 +486,6 @@
   }
   ci->residue_type[number]=res->res_type;
 
-  /* to be adjusted by lowpass/pointlimit later */
-  n=r->end=ci->blocksizes[block]>>1;
-  if(res->res_type==2)
-    n=r->end*=vi->channels;
-
   /* fill in all the books */
   {
     int booklist=0,k;
@@ -572,7 +567,7 @@
        boundaries.  We still lowpass 'wherever', but we have to round up
        here to next boundary, or the vorbis spec will round it *down* to
        previous boundary in encode/decode */
-    if(ci->residue_type[block]==2)
+    if(ci->residue_type[number]==2)
       r->end=(int)((freq/nyq*blocksize*2)/r->grouping+.9)* /* round up only if we're well past */
         r->grouping;
     else