From 8d69a6e816c4d74914a4134a8f5fd08252c04a95 Mon Sep 17 00:00:00 2001 From: Debargha Mukherjee Date: Wed, 6 Jan 2016 14:36:13 -0800 Subject: [PATCH] Some fixes on tx size/type selection For ext_tx experiment. Change-Id: Ie37b9b456b09bde8b606fb978fee4cca8d0326b7 --- vp10/encoder/rdopt.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c index b55f53ac8..ee731fae7 100644 --- a/vp10/encoder/rdopt.c +++ b/vp10/encoder/rdopt.c @@ -820,8 +820,7 @@ static void choose_largest_tx_size(VP10_COMP *cpi, MACROBLOCK *x, #if CONFIG_EXT_TX ext_tx_set = get_ext_tx_set(mbmi->tx_size, bs, is_inter); - if (is_inter && - get_ext_tx_types(mbmi->tx_size, bs, is_inter) > 1 && + if (get_ext_tx_types(mbmi->tx_size, bs, is_inter) > 1 && !xd->lossless[mbmi->segment_id]) { for (tx_type = 0; tx_type < TX_TYPES; ++tx_type) { if (is_inter) { @@ -931,12 +930,12 @@ static void choose_largest_tx_size(VP10_COMP *cpi, MACROBLOCK *x, if (is_inter) { if (ext_tx_set > 0) *rate += cpi->inter_tx_type_costs[ext_tx_set][mbmi->tx_size] - [mbmi->tx_type]; + [mbmi->tx_type]; } else { if (ext_tx_set > 0 && ALLOW_INTRA_EXT_TX) *rate += cpi->intra_tx_type_costs[ext_tx_set][mbmi->tx_size] - [mbmi->mode][mbmi->tx_type]; + [mbmi->mode][mbmi->tx_type]; } } #else -- 2.40.0