From b364176c08db2c7a8229bb8353446949c19ce72f Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 10 Oct 2013 10:38:34 -0700 Subject: [PATCH] Prevent accidental changes to the previous frame mode_infos This is needed to fix mbgraph but shouldn't affect anything else Change-Id: I2f515052f62e348cd3794b7ff0c139802225ea95 --- vp9/decoder/vp9_onyxd_if.c | 4 ++++ vp9/encoder/vp9_onyx_if.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/vp9/decoder/vp9_onyxd_if.c b/vp9/decoder/vp9_onyxd_if.c index a42c2cf30..3875d743a 100644 --- a/vp9/decoder/vp9_onyxd_if.c +++ b/vp9/decoder/vp9_onyxd_if.c @@ -397,6 +397,10 @@ int vp9_receive_compressed_data(VP9D_PTR ptr, 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++; } diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index ff1d17945..c4e56d401 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -3453,6 +3453,10 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, 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; -- 2.40.0