From 2ed2f29d217d1332e70c8dc19684ee16d0af4bde Mon Sep 17 00:00:00 2001 From: Yue Chen Date: Tue, 27 Jan 2015 11:51:02 -0800 Subject: [PATCH] Fix a bug in COPY_MODE + EXT_TX experiment Remove the duplicated step counting the overhead for ext_tx, because it has been counted in super_block_yrd(). Change-Id: I50bc01d8166572bc0847305565cf33c14ee516e6 --- vp9/encoder/vp9_rdopt.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 33fbe00fa..5bbe7f3f6 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -5235,10 +5235,6 @@ void vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, rate2 += vp9_cost_bit(vp9_get_skip_prob(cm, xd), 1); this_skip2 = 1; } else if (!xd->lossless) { -#if CONFIG_EXT_TX - if (mbmi->tx_size < TX_32X32) - rate2 += cpi->ext_tx_costs[mbmi->tx_size][mbmi->ext_txfrm]; -#endif // CONFIG_EXT_TX if (RDCOST(x->rdmult, x->rddiv, rate2, distortion2) < RDCOST(x->rdmult, x->rddiv, 0, total_sse)) { rate2 += vp9_cost_bit(vp9_get_skip_prob(cm, xd), 0);