Commit 0f34e35d authored by Jingning Han's avatar Jingning Han
Browse files

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
parent 7c5fe4cb
...@@ -4277,10 +4277,12 @@ static int64_t handle_inter_mode(VP10_COMP *cpi, MACROBLOCK *x, ...@@ -4277,10 +4277,12 @@ static int64_t handle_inter_mode(VP10_COMP *cpi, MACROBLOCK *x,
bsize, ref_best_rd); bsize, ref_best_rd);
#endif #endif
} else { } else {
int idx, idy;
super_block_yrd(cpi, x, rate_y, &distortion_y, &skippable_y, psse, super_block_yrd(cpi, x, rate_y, &distortion_y, &skippable_y, psse,
bsize, ref_best_rd); bsize, ref_best_rd);
for (i = 0; i < 64; ++i) for (idy = 0; idy < xd->n8_h; ++idy)
mbmi->inter_tx_size[i] = mbmi->tx_size; for (idx = 0; idx < xd->n8_w; ++idx)
mbmi->inter_tx_size[idy * 8 + idx] = mbmi->tx_size;
} }
#else #else
super_block_yrd(cpi, x, rate_y, &distortion_y, &skippable_y, psse, 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, ...@@ -5549,8 +5551,7 @@ void vp10_rd_pick_inter_mode_sub8x8(VP10_COMP *cpi,
} }
#if CONFIG_VAR_TX #if CONFIG_VAR_TX
for (i = 0; i < 64; ++i) mbmi->inter_tx_size[0] = mbmi->tx_size;
mbmi->inter_tx_size[i] = mbmi->tx_size;
#endif #endif
if (ref_frame == INTRA_FRAME) { if (ref_frame == INTRA_FRAME) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment