shithub: libvpx

Download patch

ref: 7c6337ba9e486c8066db83ea2d845c3e8b7697f8
parent: 6ffa05901de549f9aad458c2b4c570468b8aff38
parent: e65c564c788de32eb19f2e98a979c463e7aca3d7
author: Dmitry Kovalev <dkovalev@google.com>
date: Thu Mar 13 13:47:27 EDT 2014 

Merge "Adding vp9_swap_mi_and_prev_mi() function."


--- a/vp9/common/vp9_alloccommon.c
+++ b/vp9/common/vp9_alloccommon.c
@@ -224,3 +224,19 @@
   if (cm->last_frame_seg_map)
     vpx_memset(cm->last_frame_seg_map, 0, cm->mi_rows * cm->mi_cols);
 }
+
+void vp9_swap_mi_and_prev_mi(VP9_COMMON *cm) {
+  // 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->prev_mi = cm->prev_mip + cm->mode_info_stride + 1;
+  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;
+}
--- a/vp9/common/vp9_alloccommon.h
+++ b/vp9/common/vp9_alloccommon.h
@@ -31,6 +31,8 @@
 
 void vp9_update_frame_size(VP9_COMMON *cm);
 
+void vp9_swap_mi_and_prev_mi(VP9_COMMON *cm);
+
 #ifdef __cplusplus
 }  // extern "C"
 #endif
--- a/vp9/decoder/vp9_decoder.c
+++ b/vp9/decoder/vp9_decoder.c
@@ -423,25 +423,9 @@
   if (!cm->show_existing_frame)
     cm->last_show_frame = cm->show_frame;
   if (cm->show_frame) {
-    if (!cm->show_existing_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;
+    if (!cm->show_existing_frame)
+      vp9_swap_mi_and_prev_mi(cm);
 
-      // update the upper left visible macroblock ptrs
-      cm->mi = cm->mip + cm->mode_info_stride + 1;
-      cm->prev_mi = cm->prev_mip + cm->mode_info_stride + 1;
-      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;
-    }
     cm->current_video_frame++;
   }
 
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -3252,20 +3252,7 @@
     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
-- 
⑨