diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-01-22 08:31:55 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-01-22 08:31:55 -0800 |
| commit | bed59eb8de198ca9ab1230011e5a6d54d1c9765e (patch) | |
| tree | 397e857179f211092032482a2da4a7e2f5a659e4 /vp9/decoder/vp9_decodemv.c | |
| parent | b95ed6883a3ade47044fbf6b2ee6470f1bac53ed (diff) | |
| parent | 2f24ad9e85e4db0d9d5b265a6d4c1f4b7db6babb (diff) | |
| download | libvpx-bed59eb8de198ca9ab1230011e5a6d54d1c9765e.tar libvpx-bed59eb8de198ca9ab1230011e5a6d54d1c9765e.tar.gz libvpx-bed59eb8de198ca9ab1230011e5a6d54d1c9765e.tar.bz2 libvpx-bed59eb8de198ca9ab1230011e5a6d54d1c9765e.zip | |
Merge changes Ia82cef79,I7324a75a,I7b66daad,I73344451,I91dc210f,I5945b5ce into experimental
* changes:
Use alt-ref frame context for keyframes
Preserve the previous golden frame on golden updates
Generalize and increase frame coding contexts
Start to anonymize reference frames
Update encoder to use fb_idx_ref_cnt
Remove buffer-to-buffer copy logic
Diffstat (limited to 'vp9/decoder/vp9_decodemv.c')
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index c6c3d1576..eef9e6e60 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -730,12 +730,7 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, int ref_fb_idx; /* Select the appropriate reference frame for this MB */ - if (ref_frame == LAST_FRAME) - ref_fb_idx = cm->lst_fb_idx; - else if (ref_frame == GOLDEN_FRAME) - ref_fb_idx = cm->gld_fb_idx; - else - ref_fb_idx = cm->alt_fb_idx; + ref_fb_idx = cm->active_ref_idx[ref_frame - 1]; recon_y_stride = cm->yv12_fb[ref_fb_idx].y_stride ; recon_uv_stride = cm->yv12_fb[ref_fb_idx].uv_stride; @@ -818,13 +813,7 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, if (mbmi->second_ref_frame > 0) { int second_ref_fb_idx; /* Select the appropriate reference frame for this MB */ - if (mbmi->second_ref_frame == LAST_FRAME) - second_ref_fb_idx = cm->lst_fb_idx; - else if (mbmi->second_ref_frame == - GOLDEN_FRAME) - second_ref_fb_idx = cm->gld_fb_idx; - else - second_ref_fb_idx = cm->alt_fb_idx; + second_ref_fb_idx = cm->active_ref_idx[mbmi->second_ref_frame - 1]; xd->second_pre.y_buffer = cm->yv12_fb[second_ref_fb_idx].y_buffer + recon_yoffset; |