Commit a8e6d4d0 authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review
Browse files

Merge "Properly store the tx_size of selected intra mode"

parents 2258e28f 56a8bc54
...@@ -845,6 +845,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -845,6 +845,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
MIN(max_txsize_lookup[bsize], MIN(max_txsize_lookup[bsize],
tx_mode_to_biggest_tx_size[cpi->common.tx_mode]); tx_mode_to_biggest_tx_size[cpi->common.tx_mode]);
int i; int i;
TX_SIZE best_intra_tx_size = TX_SIZES;
if (reuse_inter_pred && best_pred != NULL) { if (reuse_inter_pred && best_pred != NULL) {
if (best_pred->data == orig_dst.buf) { if (best_pred->data == orig_dst.buf) {
...@@ -888,7 +889,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -888,7 +889,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
if (this_rdc.rdcost < best_rdc.rdcost) { if (this_rdc.rdcost < best_rdc.rdcost) {
best_rdc = this_rdc; best_rdc = this_rdc;
mbmi->mode = this_mode; mbmi->mode = this_mode;
mbmi->tx_size = intra_tx_size; best_intra_tx_size = mbmi->tx_size;
mbmi->ref_frame[0] = INTRA_FRAME; mbmi->ref_frame[0] = INTRA_FRAME;
mbmi->uv_mode = this_mode; mbmi->uv_mode = this_mode;
mbmi->mv[0].as_int = INVALID_MV; mbmi->mv[0].as_int = INVALID_MV;
...@@ -899,6 +900,8 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -899,6 +900,8 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
if (mbmi->ref_frame[0] != INTRA_FRAME) { if (mbmi->ref_frame[0] != INTRA_FRAME) {
x->skip_txfm[0] = best_mode_skip_txfm; x->skip_txfm[0] = best_mode_skip_txfm;
mbmi->tx_size = best_tx_size; mbmi->tx_size = best_tx_size;
} else {
mbmi->tx_size = best_intra_tx_size;
} }
} }
......
Markdown is supported
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