commit 44d7e669bd5d69da6058bb99a40435022521838c
author Angie Chiang <angiebird@google.com> Thu Apr 06 11:07:53 2017 -0700
committer Angie Chiang <angiebird@google.com> Thu Apr 06 20:56:04 2017 +0000
tree 9dde6fd4f9a37d1b7396892ff6f34112f5e2e605
parent 08195cc6f53242bd36218483d62702e0a6af1058

Use av1_inverse_transform_block in encode_block

Change-Id: I7eaff4fd5ee24d6e1138ad8d241dbb63a697961f

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 03ec981..aa743db 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -749,12 +749,7 @@
 #if !CONFIG_PVQ
   ENTROPY_CONTEXT *a, *l;
 #endif
-  INV_TXFM_PARAM inv_txfm_param;
   const int block_raster_idx = av1_block_index_to_raster_order(tx_size, block);
-#if CONFIG_PVQ
-  int tx_width_pixels, tx_height_pixels;
-  int j;
-#endif
 #if CONFIG_VAR_TX
   int bw = block_size_wide[plane_bsize] >> tx_size_wide_log2[0];
 #endif
@@ -804,36 +799,10 @@
   if (!x->pvq_skip[plane]) *(args->skip) = 0;
 
   if (x->pvq_skip[plane]) return;
-
-  // transform block size in pixels
-  tx_width_pixels = tx_size_wide[tx_size];
-  tx_height_pixels = tx_size_high[tx_size];
-
-  // Since av1 does not have separate function which does inverse transform
-  // but av1_inv_txfm_add_*x*() also does addition of predicted image to
-  // inverse transformed image,
-  // pass blank dummy image to av1_inv_txfm_add_*x*(), i.e. set dst as zeros
-  for (j = 0; j < tx_height_pixels; j++) {
-    int i;
-    for (i = 0; i < tx_width_pixels; i++) dst[j * pd->dst.stride + i] = 0;
-  }
 #endif
-
-  // inverse transform parameters
-  inv_txfm_param.tx_type =
-      get_tx_type(pd->plane_type, xd, block_raster_idx, tx_size);
-  inv_txfm_param.tx_size = tx_size;
-  inv_txfm_param.eob = p->eobs[block];
-  inv_txfm_param.lossless = xd->lossless[xd->mi[0]->mbmi.segment_id];
-
-#if CONFIG_AOM_HIGHBITDEPTH
-  if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
-    inv_txfm_param.bd = xd->bd;
-    av1_highbd_inv_txfm_add(dqcoeff, dst, pd->dst.stride, &inv_txfm_param);
-    return;
-  }
-#endif  // CONFIG_AOM_HIGHBITDEPTH
-  av1_inv_txfm_add(dqcoeff, dst, pd->dst.stride, &inv_txfm_param);
+  TX_TYPE tx_type = get_tx_type(pd->plane_type, xd, block_raster_idx, tx_size);
+  av1_inverse_transform_block(xd, dqcoeff, tx_type, tx_size, dst,
+                              pd->dst.stride, p->eobs[block]);
 }
 
 #if CONFIG_VAR_TX