shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Prevent accidental changes to the previous frame mode_infos"

--- a/vp9/decoder/vp9_onyxd_if.c

+++ b/vp9/decoder/vp9_onyxd_if.c

@@ -394,6 +394,10 @@

     cm->mi_grid_visible = cm->mi_grid_base + cm->mode_info_stride + 1;

     cm->prev_mi_grid_visible = cm->prev_mi_grid_base + cm->mode_info_stride + 1;

+    pbi->mb.mi_8x8 = cm->mi_grid_visible;

+    pbi->mb.mi_8x8[0] = cm->mi;

+    pbi->mb.this_mi = cm->mi;

+

     cm->current_video_frame++;

   }

--- a/vp9/encoder/vp9_onyx_if.c

+++ b/vp9/encoder/vp9_onyx_if.c

@@ -3493,6 +3493,10 @@

     cm->mi = cm->mip + cm->mode_info_stride + 1;

     cm->mi_grid_visible = cm->mi_grid_base + cm->mode_info_stride + 1;

+    cpi->mb.e_mbd.mi_8x8 = cm->mi_grid_visible;

+    cpi->mb.e_mbd.mi_8x8[0] = cm->mi;

+    cpi->mb.e_mbd.this_mi = cm->mi;

+

     // Don't increment frame counters if this was an altref buffer

     // update not a real frame

     ++cm->current_video_frame;