diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-08-09 09:36:18 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-08-09 09:36:18 -0700 |
| commit | 97280c1a2312c239da1b3bafeca184f8c979db0e (patch) | |
| tree | 3d5b87f30d95755476b9862eeda69c448da3de3e /vp8/encoder/rdopt.c | |
| parent | be9b5fa062631fb53af4b61c386ede42151188f9 (diff) | |
| parent | 7d0656537b5739f06b923d471c39c3a0b249e76c (diff) | |
| download | libvpx-97280c1a2312c239da1b3bafeca184f8c979db0e.tar libvpx-97280c1a2312c239da1b3bafeca184f8c979db0e.tar.gz libvpx-97280c1a2312c239da1b3bafeca184f8c979db0e.tar.bz2 libvpx-97280c1a2312c239da1b3bafeca184f8c979db0e.zip | |
Merge "Merging in the sixteenth subpel uv experiment" into experimental
Diffstat (limited to 'vp8/encoder/rdopt.c')
| -rw-r--r-- | vp8/encoder/rdopt.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 1a325161d..878d34476 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -518,17 +518,10 @@ int VP8_UVSSE(MACROBLOCK *x, const vp8_variance_rtcd_vtable_t *rtcd) { vptr = x->e_mbd.pre.v_buffer + offset; if ((mv_row | mv_col) & 7) { -#if CONFIG_SIXTEENTH_SUBPEL_UV VARIANCE_INVOKE(rtcd, subpixvar8x8)(uptr, pre_stride, (mv_col & 7) << 1, (mv_row & 7) << 1, upred_ptr, uv_stride, &sse2); VARIANCE_INVOKE(rtcd, subpixvar8x8)(vptr, pre_stride, (mv_col & 7) << 1, (mv_row & 7) << 1, vpred_ptr, uv_stride, &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); -#endif sse2 += sse1; } else { VARIANCE_INVOKE(rtcd, var8x8)(uptr, pre_stride, |