From: Dmitry Kovalev <dkovalev@google.com>
Date: Thu, 10 Apr 2014 03:44:30 +0000 (-0700)
Subject: Merge "Revert "Converting set_prev_mi() to get_prev_mi().""
X-Git-Tag: v1.4.0~1851
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65e650e0c0b030ce3cab880ef5b189e337a689ac;p=libvpx

Merge "Revert "Converting set_prev_mi() to get_prev_mi().""
---

65e650e0c0b030ce3cab880ef5b189e337a689ac
diff --cc vp9/encoder/vp9_encodeframe.c
index 61a5022ec,929722563..311854b16
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@@ -3261,14 -3067,26 +3261,14 @@@ static void encode_frame_internal(VP9_C
  
    vp9_initialize_rd_consts(cpi);
    vp9_initialize_me_consts(cpi, cm->base_qindex);
 -
 -  if (cpi->oxcf.tuning == VP8_TUNE_SSIM) {
 -    // Initialize encode frame context.
 -    init_encode_frame_mb_context(cpi);
 -
 -    // Build a frame level activity map
 -    build_activity_map(cpi);
 -  }
 -
 -  // Re-initialize encode frame context.
    init_encode_frame_mb_context(cpi);
  
 -  vp9_zero(cpi->rd_comp_pred_diff);
 -  vp9_zero(cpi->rd_filter_diff);
 -  vp9_zero(cpi->rd_tx_select_diff);
 -  vp9_zero(cpi->rd_tx_select_threshes);
 +  if (cpi->oxcf.tuning == VP8_TUNE_SSIM)
 +    build_activity_map(cpi);
  
-   cm->prev_mi = get_prev_mi(cm);
+   set_prev_mi(cm);
  
 -  if (cpi->sf.use_nonrd_pick_mode) {
 +  if (sf->use_nonrd_pick_mode) {
      // Initialize internal buffer pointers for rtc coding, where non-RD
      // mode decision is used and hence no buffer pointer swap needed.
      int i;