From 7d0656537b5739f06b923d471c39c3a0b249e76c Mon Sep 17 00:00:00 2001 From: Deb Mukherjee Date: Wed, 8 Aug 2012 16:49:15 -0700 Subject: Merging in the sixteenth subpel uv experiment Merges this experiment in to make it easier to run tests on filter precision, vectorized implementation etc. Also removes an experimental filter. Change-Id: I1e8706bb6d4fc469815123939e9c6e0b5ae945cd --- vp8/encoder/rdopt.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'vp8/encoder/rdopt.c') 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, -- cgit v1.2.3