shithub: libvpx

Download patch

ref: 3fa1348d5fa06585e40bf402f3c9cd7be7839c3a
parent: 1761a6b55a0138ad12e3d9e7a5bfc415a7f6b538
author: Yaowu Xu <yaowu@google.com>
date: Tue Nov 13 09:45:53 EST 2012

fix a few typos

Change-Id: I7b6f27826052eb706fc6080d4e3a940dff7d3a58

--- a/vp9/common/findnearmv.c
+++ b/vp9/common/findnearmv.c
@@ -155,7 +155,7 @@
 
   variance(src_ptr, source_stride, ref_ptr, recon_stride, 2, 32, &var, &avg);
   *sse = var;
-  return (var - (((unsigned int)avg * avg) >> 5));
+  return (var - (((unsigned int)avg * avg) >> 6));
 }
 
 unsigned int vp9_variance32x2_c(const unsigned char *src_ptr,
@@ -168,7 +168,7 @@
 
   variance(src_ptr, source_stride, ref_ptr, recon_stride, 32, 2, &var, &avg);
   *sse = var;
-  return (var - (((unsigned int)avg * avg) >> 5));
+  return (var - (((unsigned int)avg * avg) >> 6));
 }
 
 unsigned int vp9_sub_pixel_variance32x2_c(const unsigned char  *src_ptr,
@@ -189,10 +189,10 @@
                                     src_pixels_per_line, 1, 3, 32, HFilter);
   var_filter_block2d_bil_second_pass(FData3, temp2, 32, 32, 2, 32, VFilter);
 
-  return vp9_variance16x2_c(temp2, 32, dst_ptr, dst_pixels_per_line, sse);
+  return vp9_variance32x2_c(temp2, 32, dst_ptr, dst_pixels_per_line, sse);
 }
 
-unsigned int vp9_sub_pixel_variance2x16_c(const unsigned char  *src_ptr,
+unsigned int vp9_sub_pixel_variance2x32_c(const unsigned char  *src_ptr,
                                           const int  src_pixels_per_line,
                                           const int  xoffset,
                                           const int  yoffset,
@@ -210,7 +210,7 @@
                                     src_pixels_per_line, 1, 33, 2, HFilter);
   var_filter_block2d_bil_second_pass(FData3, temp2, 2, 2, 32, 2, VFilter);
 
-  return vp9_variance2x16_c(temp2, 2, dst_ptr, dst_pixels_per_line, sse);
+  return vp9_variance2x32_c(temp2, 2, dst_ptr, dst_pixels_per_line, sse);
 }
 #endif
 #endif