ref: 99fb568e67429e0cffa8c2392fcf1dcfb1a4ee2b
parent: ad6fe4a88c9d051a34c85d3f422cde5819f2bbdf
parent: ab2dfd22f3edb6b0571913bd27645252653520bf
author: Yaowu Xu <yaowu@google.com>
date: Mon May 23 10:49:56 EDT 2011
Merge "use get8x8var directly for non-subpixel motion case in VP8_UVSSE"
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -456,17 +456,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;
}