From 05b45e6b790326a533f018d900a6eb8089cfe914 Mon Sep 17 00:00:00 2001 From: Frederic Barbier Date: Mon, 26 Jun 2017 09:57:40 +0200 Subject: [PATCH] Avoid use of deprecated inv-txfm in encoder Change-Id: Ie721eaf58d0716e340b9ebdff9fd215cfe0c3c2a --- av1/encoder/encodemb.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c index 6b0991fef..c44142137 100644 --- 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