commit d92d4bf40adcf86c2e81254df8a9858e8564bba7
author Angie Chiang <angiebird@google.com> Sun Apr 02 17:49:18 2017 -0700
committer Angie Chiang <angiebird@google.com> Mon Apr 03 23:12:22 2017 +0000
tree a0e4d0ec8b056c86becd4af1d054b34bb737c8b6
parent f87e43f522ef4797e5e37a12a8abdeb8cb5001f8

Add av1_inverse_transform_block

Move most of the code of inverse_transform_block to
av1_inverse_transform_block such that encoder can use the
function as well.

Use av1_inverse_transform_block in av1_encoder_block_intra.
This will make the code cleaner.

Change-Id: I84dbeef2c65e252910606dbea446ce43165d504c

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 6fe992d..dcedfdf 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -1094,7 +1094,6 @@
   AV1_COMMON *cm = args->cm;
   MACROBLOCK *const x = args->x;
   MACROBLOCKD *const xd = &x->e_mbd;
-  MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
   struct macroblock_plane *const p = &x->plane[plane];
   struct macroblockd_plane *const pd = &xd->plane[plane];
   tran_low_t *dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
@@ -1107,7 +1106,6 @@
   uint8_t *dst =
       &pd->dst.buf[(blk_row * dst_stride + blk_col) << tx_size_wide_log2[0]];
   int ctx = 0;
-  INV_TXFM_PARAM inv_txfm_param;
 #if CONFIG_PVQ
   int tx_blk_size;
   int i, j;
@@ -1143,25 +1141,8 @@
 #endif  // CONFIG_NEW_QUANT
   }
 
-  if (*eob) {
-    // inverse transform
-    inv_txfm_param.tx_type = tx_type;
-    inv_txfm_param.tx_size = tx_size;
-    inv_txfm_param.eob = *eob;
-    inv_txfm_param.lossless = xd->lossless[mbmi->segment_id];
-#if CONFIG_AOM_HIGHBITDEPTH
-    inv_txfm_param.bd = xd->bd;
-    if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
-      av1_highbd_inv_txfm_add(dqcoeff, dst, dst_stride, &inv_txfm_param);
-    } else {
-      av1_inv_txfm_add(dqcoeff, dst, dst_stride, &inv_txfm_param);
-    }
-#else
-    av1_inv_txfm_add(dqcoeff, dst, dst_stride, &inv_txfm_param);
-#endif  // CONFIG_AOM_HIGHBITDEPTH
-
-    *(args->skip) = 0;
-  }
+  av1_inverse_transform_block(xd, dqcoeff, tx_type, tx_size, dst, dst_stride,
+                              *eob);
 #else  // #if !CONFIG_PVQ
 
 #if CONFIG_NEW_QUANT
@@ -1197,20 +1178,8 @@
   }
 #endif  // CONFIG_AOM_HIGHBITDEPTH
 
-  inv_txfm_param.tx_type = tx_type;
-  inv_txfm_param.tx_size = tx_size;
-  inv_txfm_param.eob = *eob;
-  inv_txfm_param.lossless = xd->lossless[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, dst_stride, &inv_txfm_param);
-  } else {
-#endif
-    av1_inv_txfm_add(dqcoeff, dst, dst_stride, &inv_txfm_param);
-#if CONFIG_AOM_HIGHBITDEPTH
-  }
-#endif
+  av1_inverse_transform_block(xd, dqcoeff, tx_type, tx_size, dst, dst_stride,
+                              *eob);
 #endif  // #if !CONFIG_PVQ
 
 #if !CONFIG_PVQ