commit 8d9bd6d5e1e284c489d941b1967780f6fd29d732
author Debargha Mukherjee <debargha@google.com> Fri Feb 23 15:41:42 2018 -0800
committer Debargha Mukherjee <debargha@google.com> Sat Feb 24 00:55:13 2018 +0000
tree be320cdc331299be76ba95ece4b87df950b4416c
parent 21de60c040430ee83a5df372ada26112dfb09c16

Fix a bug in  av1_highbd_convolve_... functions

Fixes several tests: *AV1HighbdConvolve2DTest*

Change-Id: I65480bfe81a5879863e018340619f873d4a2e37b

av1/common/convolve.c

diff --git a/av1/common/convolve.c b/av1/common/convolve.c
index ba9b96f..674ee3f 100644
--- a/av1/common/convolve.c
+++ b/av1/common/convolve.c
@@ -1117,10 +1117,13 @@
   for (int y = 0; y < h; ++y) {
     for (int x = 0; x < w; ++x) {
       CONV_BUF_TYPE res = src[y * src_stride + x] << bits;
-      if (conv_params->do_average)
-        dst[y * dst_stride + x] += res;
-      else
+      if (conv_params->do_average) {
+        int32_t tmp = dst[y * dst_stride + x];
+        tmp += res;
+        dst[y * dst_stride + x] = tmp >> 1;
+      } else {
         dst[y * dst_stride + x] = res;
+      }
     }
   }
 }
@@ -1153,10 +1156,13 @@
         res += x_filter[k] * src[y * src_stride + x - fo_horiz + k];
       }
       res = (1 << bits) * ROUND_POWER_OF_TWO(res, conv_params->round_0);
-      if (conv_params->do_average)
-        dst[y * dst_stride + x] += res;
-      else
+      if (conv_params->do_average) {
+        int32_t tmp = dst[y * dst_stride + x];
+        tmp += res;
+        dst[y * dst_stride + x] = tmp >> 1;
+      } else {
         dst[y * dst_stride + x] = res;
+      }
     }
   }
 }
@@ -1190,10 +1196,13 @@
       }
       res *= (1 << bits);
       res = ROUND_POWER_OF_TWO(res, conv_params->round_1);
-      if (conv_params->do_average)
-        dst[y * dst_stride + x] += res;
-      else
+      if (conv_params->do_average) {
+        int32_t tmp = dst[y * dst_stride + x];
+        tmp += res;
+        dst[y * dst_stride + x] = tmp >> 1;
+      } else {
         dst[y * dst_stride + x] = res;
+      }
     }
   }
 }