Avoid use of deprecated inv-txfm in encoder

Change-Id: Ie721eaf58d0716e340b9ebdff9fd215cfe0c3c2a
mozilla · Jun 28, 2017 · 05b45e6 · 05b45e6
1 parent 894cc81
commit 05b45e6
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
@@ -906,13 +906,9 @@ static void encode_block_pass1(int plane, int block, int blk_row, int blk_col,
 #endif  // !CONFIG_PVQ
 #if CONFIG_HIGHBITDEPTH
     if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
-      if (xd->lossless[xd->mi[0]->mbmi.segment_id]) {
-        av1_highbd_iwht4x4_add(dqcoeff, dst, pd->dst.stride, p->eobs[block],
-                               xd->bd);
-      } else {
-        av1_highbd_idct4x4_add(dqcoeff, dst, pd->dst.stride, p->eobs[block],
-                               xd->bd);
-      }
+      av1_highbd_inv_txfm_add_4x4(dqcoeff, dst, pd->dst.stride, p->eobs[block],
+                                  xd->bd, DCT_DCT,
+                                  xd->lossless[xd->mi[0]->mbmi.segment_id]);
       return;
     }
 #endif  //  CONFIG_HIGHBITDEPTH