From 97ec6291ee97c20d7c6168b3e82b2a5db9019ebd Mon Sep 17 00:00:00 2001
From: Jerome Jiang <jianj@google.com>
Date: Fri, 18 Nov 2016 17:11:59 -0800
Subject: [PATCH] Change C/MSA post proc to match SSE2.

BUG=webm:1321

Change-Id: I719023375dc48cf7d8ed72188853f0f1ccc4ad7f
---
 test/pp_filter_test.cc     | 8 ++++----
 vpx_dsp/deblock.c          | 2 +-
 vpx_dsp/mips/deblock_msa.c | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/pp_filter_test.cc b/test/pp_filter_test.cc
index 0175bb909..1fccb9249 100644
--- a/test/pp_filter_test.cc
+++ b/test/pp_filter_test.cc
@@ -177,7 +177,7 @@ TEST_P(VpxMbPostProcAcrossIpTest, CheckLowFilterOutput) {
   delete[] expected_output;
 }
 
-TEST_P(VpxMbPostProcAcrossIpTest, DISABLED_CheckMediumFilterOutput) {
+TEST_P(VpxMbPostProcAcrossIpTest, CheckMediumFilterOutput) {
   const int rows = 16;
   const int cols = 16;
   const int src_left_padding = 8;
@@ -227,7 +227,7 @@ TEST_P(VpxMbPostProcAcrossIpTest, CheckHighFilterOutput) {
   delete[] src;
 }
 
-TEST_P(VpxMbPostProcAcrossIpTest, DISABLED_CheckCvsAssembly) {
+TEST_P(VpxMbPostProcAcrossIpTest, CheckCvsAssembly) {
   const int rows = 16;
   const int cols = 16;
   const int src_left_padding = 8;
@@ -379,7 +379,7 @@ TEST_P(VpxMbPostProcDownTest, CheckHighFilterOutput) {
   delete[] c_mem;
 }
 
-TEST_P(VpxMbPostProcDownTest, DISABLED_CheckMediumFilterOutput) {
+TEST_P(VpxMbPostProcDownTest, CheckMediumFilterOutput) {
   const int rows = 16;
   const int cols = 16;
   const int src_pitch = cols;
@@ -441,7 +441,7 @@ TEST_P(VpxMbPostProcDownTest, CheckLowFilterOutput) {
   delete[] expected_output;
 }
 
-TEST_P(VpxMbPostProcDownTest, DISABLED_CheckCvsAssembly) {
+TEST_P(VpxMbPostProcDownTest, CheckCvsAssembly) {
   const int rows = 16;
   const int cols = 16;
   const int src_pitch = cols;
diff --git a/vpx_dsp/deblock.c b/vpx_dsp/deblock.c
index b2d94795d..6c2748497 100644
--- a/vpx_dsp/deblock.c
+++ b/vpx_dsp/deblock.c
@@ -117,7 +117,7 @@ void vpx_mbpost_proc_across_ip_c(unsigned char *src, int pitch, int rows,
   unsigned char d[16];
 
   for (r = 0; r < rows; r++) {
-    int sumsq = 0;
+    int sumsq = 16;
     int sum = 0;
 
     for (i = -8; i < 0; i++) s[i] = s[0];
diff --git a/vpx_dsp/mips/deblock_msa.c b/vpx_dsp/mips/deblock_msa.c
index ba52e8095..e33ea740a 100644
--- a/vpx_dsp/mips/deblock_msa.c
+++ b/vpx_dsp/mips/deblock_msa.c
@@ -459,7 +459,7 @@ void vpx_mbpost_proc_across_ip_msa(uint8_t *src_ptr, int32_t pitch,
 
   flimit_vec = __msa_fill_w(flimit);
   for (row = rows; row--;) {
-    int32_t sum_sq = 0;
+    int32_t sum_sq;
     int32_t sum = 0;
     src0 = (v16u8)__msa_fill_b(src_dup[0]);
     ST8x1_UB(src0, (src_dup - 8));
@@ -474,7 +474,7 @@ void vpx_mbpost_proc_across_ip_msa(uint8_t *src_ptr, int32_t pitch,
     ILVRL_B2_UH(zero, src, src_r_h, src_l_h);
     src_r_w = __msa_dotp_u_w(src_r_h, src_r_h);
     src_r_w += __msa_dotp_u_w(src_l_h, src_l_h);
-    sum_sq = HADD_SW_S32(src_r_w);
+    sum_sq = HADD_SW_S32(src_r_w) + 16;
     sum_h = __msa_hadd_u_h(src, src);
     sum = HADD_UH_U32(sum_h);
     {
-- 
2.50.0