From 5c772f38faafb05459457117132a5fd9ad73fc72 Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Wed, 10 Feb 2016 11:33:37 -0800 Subject: [PATCH] Format clean-ups in transform experiments Change-Id: Ib2843cb03ae452ce9fec3a94c709431ea0202d8b --- vp10/encoder/encodeframe.c | 2 +- vp10/encoder/rdopt.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/vp10/encoder/encodeframe.c b/vp10/encoder/encodeframe.c index ed5600671..41a697f1e 100644 --- a/vp10/encoder/encodeframe.c +++ b/vp10/encoder/encodeframe.c @@ -3280,7 +3280,7 @@ static void rd_pick_partition(VP10_COMP *cpi, ThreadData *td, #if CONFIG_VAR_TX xd->above_txfm_context = cm->above_txfm_context + mi_col; xd->left_txfm_context = - xd->left_txfm_context_buffer + (mi_row & 0x07); + xd->left_txfm_context_buffer + (mi_row & MI_MASK); restore_context(x, mi_row, mi_col, a, l, sa, sl, ta, tl, bsize); #else restore_context(x, mi_row, mi_col, a, l, sa, sl, bsize); diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c index 9e29ce6db..7ff886854 100644 --- a/vp10/encoder/rdopt.c +++ b/vp10/encoder/rdopt.c @@ -2752,9 +2752,9 @@ static void select_tx_type_yrd(const VP10_COMP *cpi, MACROBLOCK *x, } } #else // CONFIG_EXT_TX - if (max_tx_size >= TX_32X32 && tx_type != DCT_DCT) { + if (max_tx_size >= TX_32X32 && tx_type != DCT_DCT) continue; - } + mbmi->tx_type = tx_type; inter_block_yrd(cpi, x, &this_rate, &this_dist, &this_skip, &this_sse, @@ -2783,9 +2783,7 @@ static void select_tx_type_yrd(const VP10_COMP *cpi, MACROBLOCK *x, if (is_inter && !xd->lossless[xd->mi[0]->mbmi.segment_id] && !this_skip) rd = VPXMIN(rd, RDCOST(x->rdmult, x->rddiv, s1, this_sse)); - if (rd < - (is_inter && best_tx_type == DCT_DCT ? ext_tx_th : 1) * - best_rd) { + if (rd < (is_inter && best_tx_type == DCT_DCT ? ext_tx_th : 1) * best_rd) { best_rd = rd; *distortion = this_dist; *rate = this_rate; -- 2.40.0