diff options
| author | Jingning Han <jingning@google.com> | 2014-12-16 10:01:03 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-12-16 10:01:03 -0800 |
| commit | 581c8dbd3374fa90c0f31573d4c2369604f47721 (patch) | |
| tree | a848535fd576a330c33fef8c8ae90e9f36c0de30 /vp9/encoder | |
| parent | b60ae45f36ee0cfb18eb9f297bf704b0c8a8d646 (diff) | |
| parent | c2c7596fc71b14c40ec4e90547c04b4cde439861 (diff) | |
| download | libvpx-581c8dbd3374fa90c0f31573d4c2369604f47721.tar libvpx-581c8dbd3374fa90c0f31573d4c2369604f47721.tar.gz libvpx-581c8dbd3374fa90c0f31573d4c2369604f47721.tar.bz2 libvpx-581c8dbd3374fa90c0f31573d4c2369604f47721.zip | |
Merge "Initialize best_tx_size with invalid value"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 379d06739..db5650c10 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -522,8 +522,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, struct macroblockd_plane *const pd = &xd->plane[0]; PREDICTION_MODE best_mode = ZEROMV; MV_REFERENCE_FRAME ref_frame, best_ref_frame = LAST_FRAME; - TX_SIZE best_tx_size = MIN(max_txsize_lookup[bsize], - tx_mode_to_biggest_tx_size[cm->tx_mode]); + TX_SIZE best_tx_size = TX_SIZES; INTERP_FILTER best_pred_filter = EIGHTTAP; int_mv frame_mv[MB_MODE_COUNT][MAX_REF_FRAMES]; struct buf_2d yv12_mb[4][MAX_MB_PLANE]; @@ -870,7 +869,6 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, pd->dst = orig_dst; for (i = 0; i < 4; ++i) { - const TX_SIZE saved_tx_size = mbmi->tx_size; const PREDICTION_MODE this_mode = intra_mode_list[i]; if (!((1 << this_mode) & cpi->sf.intra_y_mode_mask[intra_tx_size])) continue; @@ -897,7 +895,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, mbmi->mv[0].as_int = INVALID_MV; } else { x->skip_txfm[0] = best_mode_skip_txfm; - mbmi->tx_size = saved_tx_size; + mbmi->tx_size = best_tx_size; } } } |