diff options
| author | Jingning Han <jingning@google.com> | 2014-12-19 11:02:37 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-12-19 11:02:37 -0800 |
| commit | a8e6d4d041cbceead00408e6ffc8a892d2d8796d (patch) | |
| tree | 48725c5eb0f8a3030ccac081284dec5c160d71d7 | |
| parent | 2258e28f7e6e41fe6533c53d3363ed06e36cfeb7 (diff) | |
| parent | 56a8bc54a61619f675694f06be7fe5cce2a6dc56 (diff) | |
| download | libvpx-a8e6d4d041cbceead00408e6ffc8a892d2d8796d.tar libvpx-a8e6d4d041cbceead00408e6ffc8a892d2d8796d.tar.gz libvpx-a8e6d4d041cbceead00408e6ffc8a892d2d8796d.tar.bz2 libvpx-a8e6d4d041cbceead00408e6ffc8a892d2d8796d.zip | |
Merge "Properly store the tx_size of selected intra mode"
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index e0892fe35..54423789b 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -845,6 +845,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, MIN(max_txsize_lookup[bsize], tx_mode_to_biggest_tx_size[cpi->common.tx_mode]); int i; + TX_SIZE best_intra_tx_size = TX_SIZES; if (reuse_inter_pred && best_pred != NULL) { if (best_pred->data == orig_dst.buf) { @@ -888,7 +889,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, if (this_rdc.rdcost < best_rdc.rdcost) { best_rdc = this_rdc; mbmi->mode = this_mode; - mbmi->tx_size = intra_tx_size; + best_intra_tx_size = mbmi->tx_size; mbmi->ref_frame[0] = INTRA_FRAME; mbmi->uv_mode = this_mode; mbmi->mv[0].as_int = INVALID_MV; @@ -899,6 +900,8 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, if (mbmi->ref_frame[0] != INTRA_FRAME) { x->skip_txfm[0] = best_mode_skip_txfm; mbmi->tx_size = best_tx_size; + } else { + mbmi->tx_size = best_intra_tx_size; } } |