commit c7606978617e00bbd7d9a29d27653b0551a66f10
author Rostislav Pehlivanov <rpehlivanov@mozilla.com> Mon Mar 20 17:34:35 2017 +0000
committer Rostislav Pehlivanov <rpehlivanov@mozilla.com> Tue Mar 21 22:22:03 2017 +0000
tree 67e91ba636e390f9c0a80f3f8e1d68e38f9ccf7b
parent 3c33def72ce9b0e1d09dc4507c1b6dc706ece85b

Fix building PVQ with OD_FLOAT_PVQ defined

Got broken due to compiler function definition errors when SIMD PVQ
got merged.

Change-Id: I5a98578e74173f21634c6c9ea054f6efe3051ef9

av1/common/av1_rtcd_defs.pl

diff --git a/av1/common/av1_rtcd_defs.pl b/av1/common/av1_rtcd_defs.pl
index 9b03e5c..aa604c8 100644
--- a/av1/common/av1_rtcd_defs.pl
+++ b/av1/common/av1_rtcd_defs.pl
@@ -11,6 +11,7 @@
 #include "av1/common/filter.h"
 #include "av1/common/convolve.h"
 #include "av1/common/av1_txfm.h"
+#include "av1/common/odintrin.h"
 
 struct macroblockd;
 
@@ -765,7 +766,7 @@
 # PVQ Functions
 
 if (aom_config("CONFIG_PVQ") eq "yes") {
-  add_proto qw/double pvq_search_rdo_double/, "const int16_t *xcoeff, int n, int k, int *ypulse, double g2, double pvq_norm_lambda, int prev_k";
+  add_proto qw/double pvq_search_rdo_double/, "const od_val16 *xcoeff, int n, int k, int *ypulse, double g2, double pvq_norm_lambda, int prev_k";
   specialize qw/pvq_search_rdo_double sse4_1/;
 }
 

av1/common/x86/pvq_sse4.c

diff --git a/av1/common/x86/pvq_sse4.c b/av1/common/x86/pvq_sse4.c
index 0931b1a..5aa886f 100644
--- a/av1/common/x86/pvq_sse4.c
+++ b/av1/common/x86/pvq_sse4.c
@@ -58,7 +58,7 @@
  *                          reuse for the search (or 0 for a new search)
  * @return                  cosine distance between x and y (between 0 and 1)
  */
-double pvq_search_rdo_double_sse4_1(const int16_t *xcoeff, int n, int k,
+double pvq_search_rdo_double_sse4_1(const od_val16 *xcoeff, int n, int k,
                                     int *ypulse, double g2,
                                     double pvq_norm_lambda, int prev_k) {
   int i, j;