| Index: source/libvpx/vp8/encoder/x86/variance_sse2.c
|
| ===================================================================
|
| --- source/libvpx/vp8/encoder/x86/variance_sse2.c (revision 96967)
|
| +++ source/libvpx/vp8/encoder/x86/variance_sse2.c (working copy)
|
| @@ -8,7 +8,7 @@
|
| * be found in the AUTHORS file in the root of the source tree.
|
| */
|
|
|
| -
|
| +#include "vpx_config.h"
|
| #include "vp8/encoder/variance.h"
|
| #include "vp8/common/pragmas.h"
|
| #include "vpx_ports/mem.h"
|
| @@ -53,13 +53,6 @@
|
| unsigned int *SSE,
|
| int *Sum
|
| );
|
| -unsigned int vp8_get16x16pred_error_sse2
|
| -(
|
| - const unsigned char *src_ptr,
|
| - int src_stride,
|
| - const unsigned char *ref_ptr,
|
| - int ref_stride
|
| -);
|
| unsigned int vp8_get8x8var_sse2
|
| (
|
| const unsigned char *src_ptr,
|
| @@ -148,30 +141,31 @@
|
| const unsigned char *src_ptr,
|
| int source_stride,
|
| const unsigned char *ref_ptr,
|
| - int recon_stride)
|
| + int recon_stride,
|
| + unsigned int *sse)
|
| {
|
| unsigned int var;
|
| int avg;
|
|
|
| vp8_get4x4var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ;
|
| + *sse = var;
|
| return (var - ((avg * avg) >> 4));
|
|
|
| }
|
|
|
| -
|
| -
|
| unsigned int vp8_variance8x8_wmt
|
| (
|
| const unsigned char *src_ptr,
|
| int source_stride,
|
| const unsigned char *ref_ptr,
|
| - int recon_stride)
|
| + int recon_stride,
|
| + unsigned int *sse)
|
| {
|
| unsigned int var;
|
| int avg;
|
|
|
| vp8_get8x8var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ;
|
| -
|
| + *sse = var;
|
| return (var - ((avg * avg) >> 6));
|
|
|
| }
|
|
|