commit 82c65fc8377349c5e76d9501e83fd569542cc683
author Jean-Marc Valin <jmvalin@mozilla.com> Wed Oct 12 18:09:48 2016 -0400
committer Yaowu Xu <yaowu@google.com> Wed Nov 02 22:35:00 2016 +0000
tree 30f9f67f1300adb9e91b9e11668cdec1e0a9fe91
parent 643902d62168adf5d324cfb00d542d355fb59974

De-sparsifying the deringing output buffer

No change in output

Change-Id: I940203975564aedca8734d6f74b013edb513f517

av1/encoder/pickdering.c

diff --git a/av1/encoder/pickdering.c b/av1/encoder/pickdering.c
index 0c79e45..a503dd9 100644
--- a/av1/encoder/pickdering.c
+++ b/av1/encoder/pickdering.c
@@ -98,6 +98,7 @@
       int best_gi;
       int32_t best_mse = INT32_MAX;
       int16_t dst[MAX_MIB_SIZE * MAX_MIB_SIZE * 8 * 8];
+      int16_t tmp_dst[MAX_MIB_SIZE * MAX_MIB_SIZE * 8 * 8];
       nhb = AOMMIN(MAX_MIB_SIZE, cm->mi_cols - MAX_MIB_SIZE * sbc);
       nvb = AOMMIN(MAX_MIB_SIZE, cm->mi_rows - MAX_MIB_SIZE * sbr);
       if (sb_all_skip_out(cm, sbr * MAX_MIB_SIZE, sbc * MAX_MIB_SIZE, bskip, &dering_count))
@@ -115,13 +116,15 @@
                     sbc * bsize[0] * MAX_MIB_SIZE + c];
           }
         }
-        od_dering(dst, MAX_MIB_SIZE * bsize[0],
+        od_dering(tmp_dst,
                   &src[sbr * stride * bsize[0] * MAX_MIB_SIZE +
                        sbc * bsize[0] * MAX_MIB_SIZE],
                   cm->mi_cols * bsize[0], nhb, nvb, sbc, sbr, nhsb, nvsb, 0,
                   dir, 0,
                   bskip,
                   dering_count, threshold, coeff_shift);
+        copy_blocks_16bit(dst, MAX_MIB_SIZE * bsize[0], tmp_dst, bskip,
+            dering_count, 3);
         cur_mse = (int)compute_dist(
             dst, MAX_MIB_SIZE * bsize[0],
             &ref_coeff[sbr * stride * bsize[0] * MAX_MIB_SIZE +