Update libvpx snapshot to v0.9.7-p1 (Cayuga).

source/libvpx/vp8/encoder/variance.h

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 83 matching lines @@
         int rp, \
         unsigned long *sum_s, \
         unsigned long *sum_r, \
         unsigned long *sum_sq_s, \
         unsigned long *sum_sq_r, \
         unsigned long *sum_sxr \
       );
 
 #define prototype_getmbss(sym) unsigned int (sym)(const short *)
 
+#define prototype_get16x16prederror(sym)\
+    unsigned int (sym)\
+    (\
+     const unsigned char *src_ptr, \
+     int source_stride, \
+     const unsigned char *ref_ptr, \
+     int  ref_stride \
+    )
+
 #if ARCH_X86 || ARCH_X86_64
 #include "x86/variance_x86.h"
 #endif
 
 #if ARCH_ARM
 #include "arm/variance_arm.h"
 #endif
 
 #ifndef vp8_variance_sad4x4
 #define vp8_variance_sad4x4 vp8_sad4x4_c
@@ skipping 92 matching lines @@
 #ifndef vp8_variance_sad8x16x4d
 #define vp8_variance_sad8x16x4d vp8_sad8x16x4d_c
 #endif
 extern prototype_sad_multi_dif_address(vp8_variance_sad8x16x4d);
 
 #ifndef vp8_variance_sad4x4x4d
 #define vp8_variance_sad4x4x4d vp8_sad4x4x4d_c
 #endif
 extern prototype_sad_multi_dif_address(vp8_variance_sad4x4x4d);
 
+#if ARCH_X86 || ARCH_X86_64
+#ifndef vp8_variance_copy32xn
+#define vp8_variance_copy32xn vp8_copy32xn_c
+#endif
+extern prototype_sad(vp8_variance_copy32xn);
+#endif
+
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 #ifndef vp8_variance_var4x4
 #define vp8_variance_var4x4 vp8_variance4x4_c
 #endif
 extern prototype_variance(vp8_variance_var4x4);
 
 #ifndef vp8_variance_var8x8
 #define vp8_variance_var8x8 vp8_variance8x8_c
 #endif
@@ skipping 66 matching lines @@
 #ifndef vp8_variance_getmbss
 #define vp8_variance_getmbss vp8_get_mb_ss_c
 #endif
 extern prototype_getmbss(vp8_variance_getmbss);
 
 #ifndef vp8_variance_mse16x16
 #define vp8_variance_mse16x16 vp8_mse16x16_c
 #endif
 extern prototype_variance(vp8_variance_mse16x16);
 
-#ifndef vp8_variance_get16x16prederror
-#define vp8_variance_get16x16prederror vp8_get16x16pred_error_c
-#endif
-extern prototype_sad(vp8_variance_get16x16prederror);
-
-#ifndef vp8_variance_get8x8var
-#define vp8_variance_get8x8var vp8_get8x8var_c
-#endif
-extern prototype_variance2(vp8_variance_get8x8var);
-
-#ifndef vp8_variance_get16x16var
-#define vp8_variance_get16x16var vp8_get16x16var_c
-#endif
-extern prototype_variance2(vp8_variance_get16x16var);
-
 #ifndef vp8_variance_get4x4sse_cs
 #define vp8_variance_get4x4sse_cs vp8_get4x4sse_cs_c
 #endif
-extern prototype_sad(vp8_variance_get4x4sse_cs);
+extern prototype_get16x16prederror(vp8_variance_get4x4sse_cs);
 
 #ifndef vp8_ssimpf
 #define vp8_ssimpf ssim_parms_c
 #endif
 extern prototype_ssimpf(vp8_ssimpf)
 
 #ifndef vp8_ssimpf_8x8
 #define vp8_ssimpf_8x8 ssim_parms_8x8_c
 #endif
 extern prototype_ssimpf(vp8_ssimpf_8x8)
 
 typedef prototype_sad(*vp8_sad_fn_t);
 typedef prototype_sad_multi_same_address(*vp8_sad_multi_fn_t);
 typedef prototype_sad_multi_same_address_1(*vp8_sad_multi1_fn_t);
 typedef prototype_sad_multi_dif_address(*vp8_sad_multi_d_fn_t);
 typedef prototype_variance(*vp8_variance_fn_t);
 typedef prototype_variance2(*vp8_variance2_fn_t);
 typedef prototype_subpixvariance(*vp8_subpixvariance_fn_t);
 typedef prototype_getmbss(*vp8_getmbss_fn_t);
-
-typedef prototype_ssimpf(*vp8_ssimpf_fn_t)
-
+typedef prototype_ssimpf(*vp8_ssimpf_fn_t);
+typedef prototype_get16x16prederror(*vp8_get16x16prederror_fn_t);
 
 typedef struct
 {
     vp8_sad_fn_t             sad4x4;
     vp8_sad_fn_t             sad8x8;
     vp8_sad_fn_t             sad8x16;
     vp8_sad_fn_t             sad16x8;
     vp8_sad_fn_t             sad16x16;
 
     vp8_variance_fn_t        var4x4;
     vp8_variance_fn_t        var8x8;
     vp8_variance_fn_t        var8x16;
     vp8_variance_fn_t        var16x8;
     vp8_variance_fn_t        var16x16;
 
     vp8_subpixvariance_fn_t  subpixvar4x4;
     vp8_subpixvariance_fn_t  subpixvar8x8;
     vp8_subpixvariance_fn_t  subpixvar8x16;
     vp8_subpixvariance_fn_t  subpixvar16x8;
     vp8_subpixvariance_fn_t  subpixvar16x16;
     vp8_variance_fn_t        halfpixvar16x16_h;
     vp8_variance_fn_t        halfpixvar16x16_v;
     vp8_variance_fn_t        halfpixvar16x16_hv;
     vp8_subpixvariance_fn_t  subpixmse16x16;
 
     vp8_getmbss_fn_t         getmbss;
     vp8_variance_fn_t        mse16x16;
 
-    vp8_sad_fn_t             get16x16prederror;
-    vp8_variance2_fn_t       get8x8var;
-    vp8_variance2_fn_t       get16x16var;
-    vp8_sad_fn_t             get4x4sse_cs;
+    vp8_get16x16prederror_fn_t get4x4sse_cs;
 
     vp8_sad_multi_fn_t       sad16x16x3;
     vp8_sad_multi_fn_t       sad16x8x3;
     vp8_sad_multi_fn_t       sad8x16x3;
     vp8_sad_multi_fn_t       sad8x8x3;
     vp8_sad_multi_fn_t       sad4x4x3;
 
     vp8_sad_multi1_fn_t      sad16x16x8;
     vp8_sad_multi1_fn_t      sad16x8x8;
     vp8_sad_multi1_fn_t      sad8x16x8;
     vp8_sad_multi1_fn_t      sad8x8x8;
     vp8_sad_multi1_fn_t      sad4x4x8;
 
     vp8_sad_multi_d_fn_t     sad16x16x4d;
     vp8_sad_multi_d_fn_t     sad16x8x4d;
     vp8_sad_multi_d_fn_t     sad8x16x4d;
     vp8_sad_multi_d_fn_t     sad8x8x4d;
     vp8_sad_multi_d_fn_t     sad4x4x4d;
 
-#if CONFIG_PSNR
+#if ARCH_X86 || ARCH_X86_64
+    vp8_sad_fn_t             copy32xn;
+#endif
+
+#if CONFIG_INTERNAL_STATS
     vp8_ssimpf_fn_t          ssimpf_8x8;
     vp8_ssimpf_fn_t          ssimpf;
 #endif
 
 } vp8_variance_rtcd_vtable_t;
 
 typedef struct
 {
     vp8_sad_fn_t            sdf;
     vp8_variance_fn_t       vf;
     vp8_subpixvariance_fn_t svf;
     vp8_variance_fn_t       svf_halfpix_h;
     vp8_variance_fn_t       svf_halfpix_v;
     vp8_variance_fn_t       svf_halfpix_hv;
     vp8_sad_multi_fn_t      sdx3f;
     vp8_sad_multi1_fn_t     sdx8f;
     vp8_sad_multi_d_fn_t    sdx4df;
-
+#if ARCH_X86 || ARCH_X86_64
+    vp8_sad_fn_t            copymem;
+#endif
 } vp8_variance_fn_ptr_t;
 
 #if CONFIG_RUNTIME_CPU_DETECT
 #define VARIANCE_INVOKE(ctx,fn) (ctx)->fn
 #else
 #define VARIANCE_INVOKE(ctx,fn) vp8_variance_##fn
 #endif
 
 #endif