From: Dmitry Kovalev <dkovalev@google.com>
Date: Wed, 8 May 2013 23:36:24 +0000 (-0700)
Subject: Merge "Eliminating several YV12_BUFFER_CONFIG usages." into experimental
X-Git-Tag: v1.3.0~1106^2~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b602cba651a5c89aef8ac09cf7572e7550071e3;p=libvpx

Merge "Eliminating several YV12_BUFFER_CONFIG usages." into experimental
---

7b602cba651a5c89aef8ac09cf7572e7550071e3
diff --cc vp9/encoder/vp9_temporal_filter.c
index eb12c5baf,12837a595..30143d77d
--- a/vp9/encoder/vp9_temporal_filter.c
+++ b/vp9/encoder/vp9_temporal_filter.c
@@@ -141,16 -141,18 +141,16 @@@ static int temporal_filter_find_matchin
    best_ref_mv1_full.as_mv.row = best_ref_mv1.as_mv.row >> 3;
  
    // Setup frame pointers
-   x->plane[0].src.buf = arf_frame->y_buffer + mb_offset;
-   x->plane[0].src.stride = arf_frame->y_stride;
-   xd->plane[0].pre[0].buf = frame_ptr->y_buffer + mb_offset;
-   xd->plane[0].pre[0].stride = arf_frame->y_stride;
+   x->plane[0].src.buf = arf_frame_buf;
+   x->plane[0].src.stride = stride;
+   xd->plane[0].pre[0].buf = frame_ptr_buf;
+   xd->plane[0].pre[0].stride = stride;
  
    // Further step/diamond searches as necessary
 -  if (cpi->Speed < 8) {
 -    step_param = cpi->sf.first_step +
 -                 ((cpi->Speed > 5) ? 1 : 0);
 -  } else {
 +  if (cpi->speed < 8)
 +    step_param = cpi->sf.first_step + ((cpi->speed > 5) ? 1 : 0);
 +  else
      step_param = cpi->sf.first_step + 2;
 -  }
  
    /*cpi->sf.search_method == HEX*/
    // TODO Check that the 16x16 vf & sdf are selected here