[xiph-commits] r14936 - branches/theora-thusnelda/lib/enc

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2008-05-21 20:12:06 -0700 (Wed, 21 May 2008)
New Revision: 14936

Modified:
   branches/theora-thusnelda/lib/enc/mcenc.c
Log:
Actually need the round-toward-zero behavior for reencode.


Modified: branches/theora-thusnelda/lib/enc/mcenc.c
===================================================================
--- branches/theora-thusnelda/lib/enc/mcenc.c	2008-05-21 23:44:56 UTC (rev 14935)
+++ branches/theora-thusnelda/lib/enc/mcenc.c	2008-05-22 03:12:06 UTC (rev 14936)
@@ -588,8 +588,8 @@
 
   macroblock_t *mb = &cpi->macro[_mbi];
   mv_t mv;
-  mv.x = mb->analysis_mv[0][_goldenp].x>>1;
-  mv.y = mb->analysis_mv[0][_goldenp].y>>1;
+  mv.x = mb->analysis_mv[0][_goldenp].x/2;
+  mv.y = mb->analysis_mv[0][_goldenp].y/2;
   
   err=oc_mcenc_ysad_halfpel_mbrefine(cpi,_mbi,&mv,err,_goldenp);
   mb->analysis_mv[0][_goldenp]=mv;
@@ -605,8 +605,8 @@
   int bi;
   for(bi=0;bi<4;bi++){
     mv_t mv;
-    mv.x = mb->mv[bi].x>>1;
-    mv.y = mb->mv[bi].y>>1;
+    mv.x = mb->mv[bi].x/2;
+    mv.y = mb->mv[bi].y/2;
     oc_mcenc_ysad_halfpel_brefine(cpi,_mbi,bi,&mv,err[bi],0);
     mb->mv[bi]=mv;
   }