diff options
| author | Jingning Han <jingning@google.com> | 2014-02-10 12:38:46 -0800 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2014-02-10 15:20:11 -0800 |
| commit | f34a7eb253516cfe06cbd5df163981ed0c34b550 (patch) | |
| tree | 35c8e9f38d92857c92b41e2c6d5e5f135470f5b2 /vp9/encoder | |
| parent | 734938dc6b3866136d1ef282b28da6e01bec2dad (diff) | |
| download | libvpx-f34a7eb253516cfe06cbd5df163981ed0c34b550.tar libvpx-f34a7eb253516cfe06cbd5df163981ed0c34b550.tar.gz libvpx-f34a7eb253516cfe06cbd5df163981ed0c34b550.tar.bz2 libvpx-f34a7eb253516cfe06cbd5df163981ed0c34b550.zip | |
Rework mode_info update in vp9_pick_inter_mode
This commit moves unnecessary mode_info update steps out of inter
mode test loop.
Change-Id: I3705450c44cda060021f4fd76c34f1b20d11658b
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 1aaa4162b..512b6bf18 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -170,6 +170,10 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, mbmi->ref_frame[1] = NONE; mbmi->tx_size = MIN(max_txsize_lookup[bsize], tx_mode_to_biggest_tx_size[cpi->common.tx_mode]); + mbmi->interp_filter = cpi->common.interp_filter == SWITCHABLE ? + EIGHTTAP : cpi->common.interp_filter; + mbmi->skip_coeff = 0; + mbmi->segment_id = 0; for (ref_frame = LAST_FRAME; ref_frame <= LAST_FRAME ; ++ref_frame) { x->pred_mv_sad[ref_frame] = INT_MAX; @@ -219,15 +223,7 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, mbmi->ref_frame[0] = ref_frame; mbmi->mv[0].as_int = frame_mv[this_mode][ref_frame].as_int; xd->mi_8x8[0]->bmi[0].as_mv[0].as_int = mbmi->mv[0].as_int; - mbmi->interp_filter = cpi->common.interp_filter == SWITCHABLE ? - EIGHTTAP : cpi->common.interp_filter; - - mbmi->ref_frame[1] = INTRA_FRAME; - mbmi->tx_size = max_txsize_lookup[bsize]; mbmi->uv_mode = this_mode; - mbmi->skip_coeff = 0; - mbmi->sb_type = bsize; - mbmi->segment_id = 0; } } } |