summaryrefslogtreecommitdiff
path: root/vp8/encoder/x86/variance_x86.h
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-07-23 00:05:14 -0400
committerJohn Koleszar <jkoleszar@google.com>2011-07-23 00:05:14 -0400
commit664cd5ac91d432bad9f4f375b583a490464288c5 (patch)
tree78ec5d758f8473b73c75a1b2eaec8dffce5430a3 /vp8/encoder/x86/variance_x86.h
parent058566797a18e226acd1868a562b16e0903b73db (diff)
parent773bcc300d88b47b3b465b7627e794b62b01938f (diff)
downloadlibvpx-664cd5ac91d432bad9f4f375b583a490464288c5.tar
libvpx-664cd5ac91d432bad9f4f375b583a490464288c5.tar.gz
libvpx-664cd5ac91d432bad9f4f375b583a490464288c5.tar.bz2
libvpx-664cd5ac91d432bad9f4f375b583a490464288c5.zip
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/encoder/x86/variance_x86.h')
-rw-r--r--vp8/encoder/x86/variance_x86.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/vp8/encoder/x86/variance_x86.h b/vp8/encoder/x86/variance_x86.h
index 0ee8eb7e5..af6c4d27e 100644
--- a/vp8/encoder/x86/variance_x86.h
+++ b/vp8/encoder/x86/variance_x86.h
@@ -121,6 +121,7 @@ extern prototype_sad(vp8_sad8x8_wmt);
extern prototype_sad(vp8_sad8x16_wmt);
extern prototype_sad(vp8_sad16x8_wmt);
extern prototype_sad(vp8_sad16x16_wmt);
+extern prototype_sad(vp8_copy32xn_sse2);
extern prototype_variance(vp8_variance4x4_wmt);
extern prototype_variance(vp8_variance8x8_wmt);
extern prototype_variance(vp8_variance8x16_wmt);
@@ -156,6 +157,9 @@ extern prototype_variance2(vp8_get16x16var_sse2);
#undef vp8_variance_sad16x16
#define vp8_variance_sad16x16 vp8_sad16x16_wmt
+#undef vp8_variance_copy32xn
+#define vp8_variance_copy32xn vp8_copy32xn_sse2
+
#undef vp8_variance_var4x4
#define vp8_variance_var4x4 vp8_variance4x4_wmt
@@ -222,6 +226,7 @@ extern prototype_sad_multi_dif_address(vp8_sad16x8x4d_sse3);
extern prototype_sad_multi_dif_address(vp8_sad8x16x4d_sse3);
extern prototype_sad_multi_dif_address(vp8_sad8x8x4d_sse3);
extern prototype_sad_multi_dif_address(vp8_sad4x4x4d_sse3);
+extern prototype_sad(vp8_copy32xn_sse3);
#if !CONFIG_RUNTIME_CPU_DETECT
@@ -258,6 +263,9 @@ extern prototype_sad_multi_dif_address(vp8_sad4x4x4d_sse3);
#undef vp8_variance_sad4x4x4d
#define vp8_variance_sad4x4x4d vp8_sad4x4x4d_sse3
+#undef vp8_variance_copy32xn
+#define vp8_variance_copy32xn vp8_copy32xn_sse3
+
#endif
#endif