commit 50910f60e56216fa2659747e7e9ea86c8eb3ffaa
author Angie Chiang <angiebird@google.com> Mon Apr 03 12:31:34 2017 -0700
committer Angie Chiang <angiebird@google.com> Tue Apr 04 20:51:19 2017 +0000
tree 9045e21d69098c5b4ad73ec3b781fff2fb956f5c
parent 576055313fe705e1f4b71599918641501e552ccc

Empty the dst buffer before inv txfm when PVQ on

Change-Id: I35b2b69e3937e70a7923ba76735f035f366de27f

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index f0881c8..0659ec6 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1419,8 +1419,10 @@
     *out_sse = this_sse >> shift;
   } else {
     const BLOCK_SIZE tx_bsize = txsize_to_bsize[tx_size];
+#if !CONFIG_PVQ || CONFIG_DAALA_DIST
     const int bsw = block_size_wide[tx_bsize];
     const int bsh = block_size_high[tx_bsize];
+#endif
     const int src_stride = x->plane[plane].src.stride;
     const int dst_stride = xd->plane[plane].dst.stride;
     // Scale the transform block index to pixel unit.
@@ -1460,6 +1462,7 @@
       DECLARE_ALIGNED(16, uint8_t, recon[MAX_TX_SQUARE]);
 #endif  // CONFIG_AOM_HIGHBITDEPTH
 
+#if !CONFIG_PVQ
 #if CONFIG_AOM_HIGHBITDEPTH
       if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
         aom_highbd_convolve_copy(dst, dst_stride, recon, MAX_TX_SIZE, NULL, 0,
@@ -1467,16 +1470,10 @@
       } else
 #endif  // CONFIG_AOM_HIGHBITDEPTH
       {
-#if !CONFIG_PVQ
         aom_convolve_copy(dst, dst_stride, recon, MAX_TX_SIZE, NULL, 0, NULL, 0,
                           bsw, bsh);
-#else
-        int i, j;
-
-        for (j = 0; j < bsh; j++)
-          for (i = 0; i < bsw; i++) recon[j * MAX_TX_SIZE + i] = 0;
-#endif  // !CONFIG_PVQ
       }
+#endif  // !CONFIG_PVQ
 
       const int block_raster_idx =
           av1_block_index_to_raster_order(tx_size, block);