[xiph-commits] r17322 - experimental/derf/theora-ptalarbvorm/lib

[tterribe at svn.xiph.org]

Author: tterribe
Date: 2010-07-02 21:24:20 -0700 (Fri, 02 Jul 2010)
New Revision: 17322

Modified:
   experimental/derf/theora-ptalarbvorm/lib/tokenize.c
Log:
Fix off-by-one error that prevented combo tokens from using their full run
 length.


Modified: experimental/derf/theora-ptalarbvorm/lib/tokenize.c
===================================================================
--- experimental/derf/theora-ptalarbvorm/lib/tokenize.c	2010-07-03 04:03:30 UTC (rev 17321)
+++ experimental/derf/theora-ptalarbvorm/lib/tokenize.c	2010-07-03 04:24:20 UTC (rev 17322)
@@ -544,7 +544,7 @@
             best_bits=bits+tokens[zzj][1].bits;
             best_qc=0;
           }
-          if(nzeros<16+dc_reserve){
+          if(nzeros<17+dc_reserve){
             val=_qdct[zzj];
             val_s=-(val<0);
             val=val+val_s^val_s;
@@ -572,7 +572,7 @@
                 best_qc=1+val_s^val_s;
               }
             }
-            if(nzeros<2+dc_reserve&&2<=val&&val<=4){
+            if(nzeros<3+dc_reserve&&2<=val&&val<=4){
               /*Try a +/- 2/3 combo token.*/
               cat=nzeros>>1;
               token=OC_DCT_RUN_CAT2A+cat;