diff options
| author | Adrian Grange <agrange@google.com> | 2013-06-09 10:10:33 -0700 |
|---|---|---|
| committer | Adrian Grange <agrange@google.com> | 2013-06-10 11:43:16 -0700 |
| commit | eac344ef100e774fa14833df4dbce4700e110d8b (patch) | |
| tree | b9bb91e274ec4ed6ceb297b2cbe23951fc6051ce /vp9/decoder/vp9_decodemv.c | |
| parent | eedd98ac0a7aded03218acbc2391b8bc6c3e2b67 (diff) | |
| download | libvpx-eac344ef100e774fa14833df4dbce4700e110d8b.tar libvpx-eac344ef100e774fa14833df4dbce4700e110d8b.tar.gz libvpx-eac344ef100e774fa14833df4dbce4700e110d8b.tar.bz2 libvpx-eac344ef100e774fa14833df4dbce4700e110d8b.zip | |
Implement intra-coded frames
Implements ability to signal and decode frames that are
encoded using only intra coding modes. Only the decode
side has been implemented here.
Change-Id: I53ac6a8d90422cd08ba389e5236e15b45f9e93de
Diffstat (limited to 'vp9/decoder/vp9_decodemv.c')
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 99902d92a..477296b31 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -337,7 +337,7 @@ static INLINE COMPPREDMODE_TYPE read_comp_pred_mode(vp9_reader *r) { static void mb_mode_mv_init(VP9D_COMP *pbi, vp9_reader *r) { VP9_COMMON *const cm = &pbi->common; - if (cm->frame_type != KEY_FRAME) { + if ((cm->frame_type != KEY_FRAME) && (!cm->intra_only)) { nmv_context *const nmvc = &pbi->common.fc.nmvc; MACROBLOCKD *const xd = &pbi->mb; int i, j; @@ -816,7 +816,7 @@ void vp9_decode_mb_mode_mv(VP9D_COMP* const pbi, MODE_INFO *mi = xd->mode_info_context; MB_MODE_INFO *const mbmi = &mi->mbmi; - if (cm->frame_type == KEY_FRAME) { + if ((cm->frame_type == KEY_FRAME) || cm->intra_only) { kfread_modes(pbi, mi, mi_row, mi_col, r); } else { read_mb_modes_mv(pbi, mi, &mi->mbmi, mi_row, mi_col, r); |