From 0f34e35d26526ade01b592bc6da4f3084a0158ee Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Sun, 15 Nov 2015 20:52:51 -0800 Subject: [PATCH] Limit the reset range of inter_tx_size array Reset the effective range of inter_tx_size, instead of the entire array in the rate-distortion optimization loop. Change-Id: Id453fbd6dddfe69f4e451ba8518c083326d5dd53 --- vp10/encoder/rdopt.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c index 5c447b2fc..f31917a02 100644 --- a/vp10/encoder/rdopt.c +++ b/vp10/encoder/rdopt.c @@ -4277,10 +4277,12 @@ static int64_t handle_inter_mode(VP10_COMP *cpi, MACROBLOCK *x, bsize, ref_best_rd); #endif } else { + int idx, idy; super_block_yrd(cpi, x, rate_y, &distortion_y, &skippable_y, psse, bsize, ref_best_rd); - for (i = 0; i < 64; ++i) - mbmi->inter_tx_size[i] = mbmi->tx_size; + for (idy = 0; idy < xd->n8_h; ++idy) + for (idx = 0; idx < xd->n8_w; ++idx) + mbmi->inter_tx_size[idy * 8 + idx] = mbmi->tx_size; } #else super_block_yrd(cpi, x, rate_y, &distortion_y, &skippable_y, psse, @@ -5549,8 +5551,7 @@ void vp10_rd_pick_inter_mode_sub8x8(VP10_COMP *cpi, } #if CONFIG_VAR_TX - for (i = 0; i < 64; ++i) - mbmi->inter_tx_size[i] = mbmi->tx_size; + mbmi->inter_tx_size[0] = mbmi->tx_size; #endif if (ref_frame == INTRA_FRAME) { -- 2.50.1