diff options
| author | Jingning Han <jingning@google.com> | 2014-03-05 16:01:06 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-03-05 16:01:06 -0800 |
| commit | 99cd4c7679fef347bb491afae6036d04cd1d4984 (patch) | |
| tree | 4c23e8ddedb37010634c453615b7f2fd39ea0126 /vp9 | |
| parent | 97ffad507a09ec06ecfe3a3106c5a8a0beb2fba3 (diff) | |
| parent | 90a8dad162ab678e3f669c11ec7624b8fd00e94b (diff) | |
| download | libvpx-99cd4c7679fef347bb491afae6036d04cd1d4984.tar libvpx-99cd4c7679fef347bb491afae6036d04cd1d4984.tar.gz libvpx-99cd4c7679fef347bb491afae6036d04cd1d4984.tar.bz2 libvpx-99cd4c7679fef347bb491afae6036d04cd1d4984.zip | |
Merge "Fix set_mode_info settings"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index dd5cf657f..e29fbd64a 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2296,19 +2296,13 @@ typedef enum { static void set_mode_info(MB_MODE_INFO *mbmi, BLOCK_SIZE bsize, MB_PREDICTION_MODE mode) { - mbmi->interp_filter = EIGHTTAP; mbmi->mode = mode; + mbmi->uv_mode = mode; mbmi->mv[0].as_int = 0; mbmi->mv[1].as_int = 0; - if (mode < NEARESTMV) { - mbmi->ref_frame[0] = INTRA_FRAME; - } else { - mbmi->ref_frame[0] = LAST_FRAME; - } - - mbmi->ref_frame[1] = INTRA_FRAME; + mbmi->ref_frame[0] = INTRA_FRAME; + mbmi->ref_frame[1] = NONE; mbmi->tx_size = max_txsize_lookup[bsize]; - mbmi->uv_mode = mode; mbmi->skip = 0; mbmi->sb_type = bsize; mbmi->segment_id = 0; |