diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-03-13 17:47:27 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-03-13 17:47:27 -0700 |
| commit | 7c6337ba9e486c8066db83ea2d845c3e8b7697f8 (patch) | |
| tree | 414b63d0173547907ffac7acfe82aaaf37e4af4e /vp9/encoder/vp9_onyx_if.c | |
| parent | 6ffa05901de549f9aad458c2b4c570468b8aff38 (diff) | |
| parent | e65c564c788de32eb19f2e98a979c463e7aca3d7 (diff) | |
| download | libvpx-7c6337ba9e486c8066db83ea2d845c3e8b7697f8.tar libvpx-7c6337ba9e486c8066db83ea2d845c3e8b7697f8.tar.gz libvpx-7c6337ba9e486c8066db83ea2d845c3e8b7697f8.tar.bz2 libvpx-7c6337ba9e486c8066db83ea2d845c3e8b7697f8.zip | |
Merge "Adding vp9_swap_mi_and_prev_mi() function."
Diffstat (limited to 'vp9/encoder/vp9_onyx_if.c')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 627258744..fbd1b239d 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -3252,20 +3252,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, cm->last_show_frame = cm->show_frame; if (cm->show_frame) { - // current mip will be the prev_mip for the next frame - MODE_INFO *temp = cm->prev_mip; - MODE_INFO **temp2 = cm->prev_mi_grid_base; - cm->prev_mip = cm->mip; - cm->mip = temp; - cm->prev_mi_grid_base = cm->mi_grid_base; - cm->mi_grid_base = temp2; - - // update the upper left visible macroblock ptrs - 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; + vp9_swap_mi_and_prev_mi(cm); // Don't increment frame counters if this was an altref buffer // update not a real frame |