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

[tterribe at svn.xiph.org]

Author: tterribe
Date: 2010-07-02 21:03:30 -0700 (Fri, 02 Jul 2010)
New Revision: 17321

Modified:
   experimental/derf/theora-ptalarbvorm/lib/tokenize.c
Log:
Fix a bug that prevented a zero run followed by -3 or -4 from being tokenized
 as a combo token ending in -3.


Modified: experimental/derf/theora-ptalarbvorm/lib/tokenize.c
===================================================================
--- experimental/derf/theora-ptalarbvorm/lib/tokenize.c	2010-07-03 01:18:55 UTC (rev 17320)
+++ experimental/derf/theora-ptalarbvorm/lib/tokenize.c	2010-07-03 04:03:30 UTC (rev 17321)
@@ -577,7 +577,7 @@
               cat=nzeros>>1;
               token=OC_DCT_RUN_CAT2A+cat;
               bits=oc_token_bits(_enc,huffi,zzi,token);
-              val=2+((val+val_s^val_s)>2);
+              val=2+(val>2);
               e=(_dct[OC_FZIG_ZAG[zzj]]+val_s^val_s)-_dequant[zzj]*val;
               d2=e*(ogg_int32_t)e+sum_d2-d2_accum[zzj];
               cost=d2+_lambda*bits+tokens[zzk][tk].cost;