commit ead610f6a42c6b15343c4f6bba21400d9b1b020b
author Debargha Mukherjee <debargha@google.com> Fri Oct 26 17:43:57 2018 -0700
committer Debargha Mukherjee <debargha@google.com> Sat Oct 27 02:02:56 2018 +0000
tree d6cb90d66e764a7c502e3448996f921cdf4888b5
parent fa873d82a130eec2bc05f57d19b0f0d0b86a317e

Revert horver calculation to C version temporarily

The new AVX2/SSE4 implementations of the horver calculations
are causing issues with slightly different results depending
on the platform.
So reverting to the C version for now, until the issue is fixed,

Change-Id: Id45781563a247170a0b1265050691b5b317913a1

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index e27a713..ddca999 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1875,9 +1875,9 @@
   const int16_t *diff = p->src_diff + 4 * blk_row * diff_stride + 4 * blk_col;
   get_energy_distribution_finer(diff, diff_stride, bw, bh, hfeatures,
                                 vfeatures);
-  av1_get_horver_correlation_full(diff, diff_stride, bw, bh,
-                                  &hfeatures[hfeatures_num - 1],
-                                  &vfeatures[vfeatures_num - 1]);
+  av1_get_horver_correlation_full_c(diff, diff_stride, bw, bh,
+                                    &hfeatures[hfeatures_num - 1],
+                                    &vfeatures[vfeatures_num - 1]);
   av1_nn_predict(hfeatures, nn_config_hor, hscores);
   av1_nn_predict(vfeatures, nn_config_ver, vscores);