Merge "Prevent accidental changes to the previous frame mode_infos"
This commit is contained in:
commit
42bcb4a7ad
@ -394,6 +394,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++;
|
||||
}
|
||||
|
||||
|
@ -3493,6 +3493,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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user