diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-05-24 00:05:09 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-05-24 00:05:09 -0400 |
| commit | f7044d4058fe22e81179727d87a7a425026538ee (patch) | |
| tree | dbceeafedefa63d59bb6b65414f0c170b3549022 | |
| parent | f7a8e66fadeaad96f300e81fc0bd6e98dd54fc74 (diff) | |
| parent | 99fb568e67429e0cffa8c2392fcf1dcfb1a4ee2b (diff) | |
| download | libvpx-f7044d4058fe22e81179727d87a7a425026538ee.tar libvpx-f7044d4058fe22e81179727d87a7a425026538ee.tar.gz libvpx-f7044d4058fe22e81179727d87a7a425026538ee.tar.bz2 libvpx-f7044d4058fe22e81179727d87a7a425026538ee.zip | |
Merge remote branch 'internal/upstream' into HEAD
| -rw-r--r-- | vp8/encoder/rdopt.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 6c1ff3687..d74c5f003 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -517,17 +517,21 @@ int VP8_UVSSE(MACROBLOCK *x, const vp8_variance_rtcd_vtable_t *rtcd) 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; } |