commit ad6bf6825837fef205a6586367224af550e06ed6
author Venkat <sanampudi.venkatarao@ittiam.com> Fri Aug 09 11:45:48 2019 +0530
committer Yunqing Wang <yunqingwang@google.com> Fri Aug 09 17:36:00 2019 +0000
tree 7a75320b9e1c11d36b020b9f1218170b5ebbbce3
parent cfd59e96ac52938662cbae9ccfbd6c3654d0c789

Call aom_clear_system_state() in cross correlation

Added aom_clear_system_state() in av1_compute_cross_correlation
functions before double operation.

Change-Id: Ifb42bb4b8f0cfacdb3f5ca3137593bd126b12ee0

av1/encoder/corner_match.c

diff --git a/av1/encoder/corner_match.c b/av1/encoder/corner_match.c
index 19b70b1..12f633b 100644
--- a/av1/encoder/corner_match.c
+++ b/av1/encoder/corner_match.c
@@ -15,6 +15,7 @@
 
 #include "config/av1_rtcd.h"
 
+#include "aom_ports/system_state.h"
 #include "av1/encoder/corner_match.h"
 
 #define SEARCH_SZ 9
@@ -65,6 +66,7 @@
     }
   var2 = sumsq2 * MATCH_SZ_SQ - sum2 * sum2;
   cov = cross * MATCH_SZ_SQ - sum1 * sum2;
+  aom_clear_system_state();
   return cov / sqrt((double)var2);
 }
 

av1/encoder/x86/corner_match_avx2.c

diff --git a/av1/encoder/x86/corner_match_avx2.c b/av1/encoder/x86/corner_match_avx2.c
index 033ae37..8d7eb3f 100644
--- a/av1/encoder/x86/corner_match_avx2.c
+++ b/av1/encoder/x86/corner_match_avx2.c
@@ -15,6 +15,7 @@
 #include "config/av1_rtcd.h"
 
 #include "aom_ports/mem.h"
+#include "aom_ports/system_state.h"
 #include "av1/encoder/corner_match.h"
 
 DECLARE_ALIGNED(16, static const uint8_t,
@@ -75,5 +76,6 @@
 
   int var2 = sumsq2_acc * MATCH_SZ_SQ - sum2_acc * sum2_acc;
   int cov = cross_acc * MATCH_SZ_SQ - sum1_acc * sum2_acc;
+  aom_clear_system_state();
   return cov / sqrt((double)var2);
 }

av1/encoder/x86/corner_match_sse4.c

diff --git a/av1/encoder/x86/corner_match_sse4.c b/av1/encoder/x86/corner_match_sse4.c
index 1a879da..5c9ca20 100644
--- a/av1/encoder/x86/corner_match_sse4.c
+++ b/av1/encoder/x86/corner_match_sse4.c
@@ -19,6 +19,7 @@
 #include "config/av1_rtcd.h"
 
 #include "aom_ports/mem.h"
+#include "aom_ports/system_state.h"
 #include "av1/encoder/corner_match.h"
 
 DECLARE_ALIGNED(16, static const uint8_t,
@@ -99,5 +100,6 @@
 
   int var2 = sumsq2 * MATCH_SZ_SQ - sum2 * sum2;
   int cov = cross * MATCH_SZ_SQ - sum1 * sum2;
+  aom_clear_system_state();
   return cov / sqrt((double)var2);
 }