commit f7159223848a75f2429e645261d2f3f02d7f02a1
author Angie Chiang <angiebird@google.com> Wed Jan 18 12:51:12 2017 -0800
committer Angie Chiang <angiebird@google.com> Wed Jan 18 23:40:27 2017 +0000
tree 6d1a9820782f3e0b9b1bece763f71197ea3733c0
parent 907230ea7212233337d07ebe89e818d349781425

Store result on conv_params->buf when no rounding

We need uint16_t buf for storing no-rounding prediction.
Add uint16_t buf in conv_params for that.
This CL let us avoid changing interface of convolve functions.

Change-Id: I079fad911327f40ffb98e17c73e7638b1719c975

av1/common/convolve.c

diff --git a/av1/common/convolve.c b/av1/common/convolve.c
index 0294d41..58c6fd3 100644
--- a/av1/common/convolve.c
+++ b/av1/common/convolve.c
@@ -41,13 +41,20 @@
       int k, sum = 0;
       for (k = 0; k < filter_size; ++k) sum += src_x[k] * x_filter[k];
 
-      if (conv_params->round == CONVOLVE_OPT_ROUND)
+      if (conv_params->round == CONVOLVE_OPT_ROUND) {
         sum = clip_pixel(ROUND_POWER_OF_TWO(sum, FILTER_BITS));
-
-      if (conv_params->ref)
-        dst[x] = ROUND_POWER_OF_TWO(dst[x] + sum, 1);
-      else
-        dst[x] = sum;
+        if (conv_params->ref)
+          dst[x] = ROUND_POWER_OF_TWO(dst[x] + sum, 1);
+        else
+          dst[x] = sum;
+      } else {
+        int tmp = conv_params->dst[y * conv_params->dst_stride + x];
+        if (conv_params->ref)
+          tmp = ROUND_POWER_OF_TWO(tmp + sum, 1);
+        else
+          tmp = sum;
+        conv_params->dst[y * conv_params->dst_stride + x] = tmp;
+      }
 
       x_q4 += x_step_q4;
     }
@@ -75,13 +82,21 @@
       for (k = 0; k < filter_size; ++k)
         sum += src_y[k * src_stride] * y_filter[k];
 
-      if (conv_params->round == CONVOLVE_OPT_ROUND)
+      if (conv_params->round == CONVOLVE_OPT_ROUND) {
         sum = clip_pixel(ROUND_POWER_OF_TWO(sum, FILTER_BITS));
-
-      if (conv_params->ref)
-        dst[y * dst_stride] = ROUND_POWER_OF_TWO(dst[y * dst_stride] + sum, 1);
-      else
-        dst[y * dst_stride] = sum;
+        if (conv_params->ref)
+          dst[y * dst_stride] =
+              ROUND_POWER_OF_TWO(dst[y * dst_stride] + sum, 1);
+        else
+          dst[y * dst_stride] = sum;
+      } else {
+        int tmp = conv_params->dst[y * conv_params->dst_stride + x];
+        if (conv_params->ref)
+          tmp = ROUND_POWER_OF_TWO(tmp + sum, 1);
+        else
+          tmp = sum;
+        conv_params->dst[y * conv_params->dst_stride + x] = tmp;
+      }
 
       y_q4 += y_step_q4;
     }
@@ -96,22 +111,29 @@
   if (conv_params->ref == 0) {
     int r, c;
     for (r = 0; r < h; ++r) {
-      memcpy(dst, src, w);
-      if (conv_params->round == CONVOLVE_OPT_NO_ROUND)
-        for (c = 0; c < w; ++c) dst[c] = dst[c] << FILTER_BITS;
+      if (conv_params->round == CONVOLVE_OPT_ROUND) {
+        memcpy(dst, src, w);
+      } else {
+        for (c = 0; c < w; ++c)
+          conv_params->dst[r * conv_params->dst_stride + c] = ((uint16_t)src[c])
+                                                              << FILTER_BITS;
+      }
       src += src_stride;
       dst += dst_stride;
     }
   } else {
     int r, c;
     for (r = 0; r < h; ++r) {
-      if (conv_params->round == CONVOLVE_OPT_ROUND)
-        for (c = 0; c < w; ++c)
+      for (c = 0; c < w; ++c) {
+        if (conv_params->round == CONVOLVE_OPT_ROUND) {
           dst[c] = clip_pixel(ROUND_POWER_OF_TWO(dst[c] + src[c], 1));
-      else
-        for (c = 0; c < w; ++c)
-          dst[c] = clip_pixel(
-              ROUND_POWER_OF_TWO(dst[c] + (src[c] << FILTER_BITS), 1));
+        } else {
+          int tmp = conv_params->dst[r * conv_params->dst_stride + c];
+          tmp =
+              ROUND_POWER_OF_TWO(tmp + (((uint16_t)src[c]) << FILTER_BITS), 1);
+          conv_params->dst[r * conv_params->dst_stride + c] = tmp;
+        }
+      }
       src += src_stride;
       dst += dst_stride;
     }

av1/common/convolve.h

diff --git a/av1/common/convolve.h b/av1/common/convolve.h
index 7b4e141..e62bcea 100644
--- a/av1/common/convolve.h
+++ b/av1/common/convolve.h
@@ -26,6 +26,8 @@
 typedef struct ConvolveParams {
   int ref;
   CONVOLVE_OPT round;
+  uint16_t *dst;
+  int dst_stride;
 } ConvolveParams;
 
 static INLINE ConvolveParams get_conv_params(int ref) {