commit 554d2c334096b9a25b0bc872c48e04bd06bbbbec
author Monty Montgomery <cmontgomery@mozilla.com> Tue Jul 11 21:01:07 2017 -0400
committer Christopher Montgomery <cmontgomery@mozilla.com> Wed Jul 12 18:30:48 2017 +0000
tree 729006ccd814e71498e1b4d0b2fa5e8bcb866253
parent d032a447ab548f6fc649e3139dc28a1a80c9ae02

Minor refactor to match the 4x4 forward transform.

Change-Id: Ib5337dfa78b73059ad169ca98a07119aa991864b

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index a9e2f2a..b6301aa 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -822,6 +822,7 @@
   struct macroblock_plane *const p = &x->plane[plane];
   struct macroblockd_plane *const pd = &xd->plane[plane];
   tran_low_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
+  INV_TXFM_PARAM inv_txfm_param;
   uint8_t *dst;
   int ctx = 0;
   dst = &pd->dst
@@ -857,12 +858,11 @@
 #endif  // CONFIG_HIGHBITDEPTH
     }
 #endif  // !CONFIG_PVQ
-#if CONFIG_HIGHBITDEPTH
-    INV_TXFM_PARAM inv_txfm_param;
     inv_txfm_param.bd = xd->bd;
     inv_txfm_param.tx_type = DCT_DCT;
     inv_txfm_param.eob = p->eobs[block];
     inv_txfm_param.lossless = xd->lossless[xd->mi[0]->mbmi.segment_id];
+#if CONFIG_HIGHBITDEPTH
     if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
       av1_highbd_inv_txfm_add_4x4(dqcoeff, dst, pd->dst.stride,
                                   &inv_txfm_param);
@@ -870,9 +870,9 @@
     }
 #endif  //  CONFIG_HIGHBITDEPTH
     if (xd->lossless[xd->mi[0]->mbmi.segment_id]) {
-      av1_iwht4x4_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]);
+      av1_iwht4x4_add(dqcoeff, dst, pd->dst.stride, &inv_txfm_param);
     } else {
-      av1_idct4x4_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]);
+      av1_idct4x4_add(dqcoeff, dst, pd->dst.stride, &inv_txfm_param);
     }
   }
 }