ref: 9603989c7227ead249f94df60e1b5310c40843fe
parent: 2b491c19b8c8558060ea2598ec49501f31b9c9a1
parent: 25ecb1f0b30e9a8db2fb5d0e538aa05f9f6d85e7
author: Jim Bankoski <jimbankoski@google.com>
date: Mon Oct 7 11:44:50 EDT 2013
Merge "cpplint vp9_variance_sse2.c"
--- a/vp9/encoder/x86/vp9_variance_sse2.c
+++ b/vp9/encoder/x86/vp9_variance_sse2.c
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "vpx_config.h"
+#include "./vpx_config.h"
#include "vp9/encoder/vp9_variance.h"
#include "vp9/common/vp9_pragmas.h"
@@ -26,7 +26,7 @@
unsigned int vp9_get_mb_ss_sse2
(
- const short *src_ptr
+ const int16_t *src_ptr
);
unsigned int vp9_get16x16var_sse2
(
@@ -250,7 +250,6 @@
const unsigned char *ref_ptr,
int recon_stride,
unsigned int *sse) {-
unsigned int sse0;
int sum0;
vp9_get16x16var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &sse0,
@@ -407,12 +406,12 @@
FN(32, 16, 16, 5, 4, opt1, (int64_t)); \
FN(16, 32, 16, 4, 5, opt1, (int64_t)); \
FN(16, 16, 16, 4, 4, opt1, (unsigned int)); \
-FN(16, 8, 16, 4, 3, opt1,); \
-FN(8, 16, 8, 3, 4, opt1,); \
-FN(8, 8, 8, 3, 3, opt1,); \
-FN(8, 4, 8, 3, 2, opt1,); \
-FN(4, 8, 4, 2, 3, opt2,); \
-FN(4, 4, 4, 2, 2, opt2,)
+FN(16, 8, 16, 4, 3, opt1, (unsigned int)); \
+FN(8, 16, 8, 3, 4, opt1, (unsigned int)); \
+FN(8, 8, 8, 3, 3, opt1, (unsigned int)); \
+FN(8, 4, 8, 3, 2, opt1, (unsigned int)); \
+FN(4, 8, 4, 2, 3, opt2, (unsigned int)); \
+FN(4, 4, 4, 2, 2, opt2, (unsigned int))
FNS(sse2, sse);
FNS(ssse3, ssse3);
@@ -487,12 +486,12 @@
FN(32, 16, 16, 5, 4, opt1, (int64_t)); \
FN(16, 32, 16, 4, 5, opt1, (int64_t)); \
FN(16, 16, 16, 4, 4, opt1, (unsigned int)); \
-FN(16, 8, 16, 4, 3, opt1,); \
-FN(8, 16, 8, 3, 4, opt1,); \
-FN(8, 8, 8, 3, 3, opt1,); \
-FN(8, 4, 8, 3, 2, opt1,); \
-FN(4, 8, 4, 2, 3, opt2,); \
-FN(4, 4, 4, 2, 2, opt2,)
+FN(16, 8, 16, 4, 3, opt1, (unsigned int)); \
+FN(8, 16, 8, 3, 4, opt1, (unsigned int)); \
+FN(8, 8, 8, 3, 3, opt1, (unsigned int)); \
+FN(8, 4, 8, 3, 2, opt1, (unsigned int)); \
+FN(4, 8, 4, 2, 3, opt2, (unsigned int)); \
+FN(4, 4, 4, 2, 2, opt2, (unsigned int))
FNS(sse2, sse);
FNS(ssse3, ssse3);