shithub: libvpx

Download patch

ref: f7044d4058fe22e81179727d87a7a425026538ee
parent: f7a8e66fadeaad96f300e81fc0bd6e98dd54fc74
parent: 99fb568e67429e0cffa8c2392fcf1dcfb1a4ee2b
author: John Koleszar <jkoleszar@google.com>
date: Mon May 23 20:05:09 EDT 2011 

Merge remote branch 'internal/upstream' into HEAD


--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -517,17 +517,21 @@
 
     if ((mv_row | mv_col) & 7)
     {
-        VARIANCE_INVOKE(rtcd, subpixvar8x8)(uptr, pre_stride, mv_col & 7, mv_row & 7, upred_ptr, uv_stride, &sse2);
-        VARIANCE_INVOKE(rtcd, subpixvar8x8)(vptr, pre_stride, mv_col & 7, mv_row & 7, vpred_ptr, uv_stride, &sse1);
+        VARIANCE_INVOKE(rtcd, subpixvar8x8)(uptr, pre_stride,
+            mv_col & 7, mv_row & 7, upred_ptr, uv_stride, &sse2);
+        VARIANCE_INVOKE(rtcd, subpixvar8x8)(vptr, pre_stride,
+            mv_col & 7, mv_row & 7, vpred_ptr, uv_stride, &sse1);
         sse2 += sse1;
     }
     else
     {
-        VARIANCE_INVOKE(rtcd, subpixvar8x8)(uptr, pre_stride, mv_col & 7, mv_row & 7, upred_ptr, uv_stride, &sse2);
-        VARIANCE_INVOKE(rtcd, subpixvar8x8)(vptr, pre_stride, mv_col & 7, mv_row & 7, vpred_ptr, uv_stride, &sse1);
+        int sum2, sum1;
+        VARIANCE_INVOKE(rtcd, get8x8var)(uptr, pre_stride,
+            upred_ptr, uv_stride, &sse2, &sum2);
+        VARIANCE_INVOKE(rtcd, get8x8var)(vptr, pre_stride,
+            vpred_ptr, uv_stride, &sse1, &sum1);
         sse2 += sse1;
     }
-
     return sse2;
 
 }
-- 
⑨