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/variance_c.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/variance_c.c')
-rw-r--r-- | vp8/encoder/variance_c.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/vp8/encoder/variance_c.c b/vp8/encoder/variance_c.c index 9444ed87d..0b9d569b0 100644 --- a/vp8/encoder/variance_c.c +++ b/vp8/encoder/variance_c.c @@ -341,13 +341,8 @@ unsigned int vp8_variance_halfpixvar16x16_h_c( const unsigned char *ref_ptr, int recon_stride, unsigned int *sse) { -#if CONFIG_SIXTEENTH_SUBPEL_UV return vp8_sub_pixel_variance16x16_c(src_ptr, source_stride, 8, 0, ref_ptr, recon_stride, sse); -#else - return vp8_sub_pixel_variance16x16_c(src_ptr, source_stride, 4, 0, - ref_ptr, recon_stride, sse); -#endif } @@ -357,13 +352,8 @@ unsigned int vp8_variance_halfpixvar16x16_v_c( const unsigned char *ref_ptr, int recon_stride, unsigned int *sse) { -#if CONFIG_SIXTEENTH_SUBPEL_UV return vp8_sub_pixel_variance16x16_c(src_ptr, source_stride, 0, 8, ref_ptr, recon_stride, sse); -#else - return vp8_sub_pixel_variance16x16_c(src_ptr, source_stride, 0, 4, - ref_ptr, recon_stride, sse); -#endif } @@ -373,13 +363,8 @@ unsigned int vp8_variance_halfpixvar16x16_hv_c( const unsigned char *ref_ptr, int recon_stride, unsigned int *sse) { -#if CONFIG_SIXTEENTH_SUBPEL_UV return vp8_sub_pixel_variance16x16_c(src_ptr, source_stride, 8, 8, ref_ptr, recon_stride, sse); -#else - return vp8_sub_pixel_variance16x16_c(src_ptr, source_stride, 4, 4, - ref_ptr, recon_stride, sse); -#endif } |