shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Merge set_prev_mi function into encoder function."

--- a/vp9/common/vp9_onyxc_int.h

+++ b/vp9/common/vp9_onyxc_int.h

@@ -311,17 +311,6 @@

   xd->left_available  = (mi_col > tile->mi_col_start);

 }

-static INLINE void set_prev_mi(VP9_COMMON *cm) {

-  const int use_prev_in_find_mv_refs = cm->width == cm->last_width &&

-                                       cm->height == cm->last_height &&

-                                       !cm->intra_only &&

-                                       cm->last_show_frame;

-  // Special case: set prev_mi to NULL when the previous mode info

-  // context cannot be used.

-  cm->prev_mi = use_prev_in_find_mv_refs ?

-                  cm->prev_mip + cm->mi_stride + 1 : NULL;

-}

-

 static INLINE void update_partition_context(MACROBLOCKD *xd,

                                             int mi_row, int mi_col,

                                             BLOCK_SIZE subsize,

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -3641,12 +3641,15 @@

   vp9_initialize_rd_consts(cpi);

   vp9_initialize_me_consts(cpi, cm->base_qindex);

   init_encode_frame_mb_context(cpi);

-  set_prev_mi(cm);

   cm->use_prev_frame_mvs = !cm->error_resilient_mode &&

                            cm->width == cm->last_width &&

                            cm->height == cm->last_height &&

                            !cm->intra_only &&

                            cm->last_show_frame;

+  // Special case: set prev_mi to NULL when the previous mode info

+  // context cannot be used.

+  cm->prev_mi = cm->use_prev_frame_mvs ?

+                  cm->prev_mip + cm->mi_stride + 1 : NULL;

   x->quant_fp = cpi->sf.use_quant_fp;

   vp9_zero(x->skip_txfm);