shithub: libvpx

Download patch

ref: f07602e403ae6fd4c87a4a561adc96555b75f030
parent: 9aa37a51b28596137ba6fbcb1411c070287d6e11
parent: 16ac5a5cde0472fc29719aab7ad0958d1492df43
author: John Koleszar <jkoleszar@google.com>
date: Thu May 16 11:22:38 EDT 2013 

Merge "Remove vp9_extend_mb_row()" into experimental


--- a/vp9/common/vp9_extend.c
+++ b/vp9/common/vp9_extend.c
@@ -119,29 +119,3 @@
                         srcw_uv, srch_uv,
                         et_uv, el_uv, eb_uv, er_uv);
 }
-
-// note the extension is only for the last row, for intra prediction purpose
-void vp9_extend_mb_row(YV12_BUFFER_CONFIG *buf,
-                       uint8_t *y, uint8_t *u, uint8_t *v) {
-  int i;
-
-  y += buf->y_stride * 14;
-  u += buf->uv_stride * 6;
-  v += buf->uv_stride * 6;
-
-  for (i = 0; i < 4; i++) {
-    y[i] = y[-1];
-    u[i] = u[-1];
-    v[i] = v[-1];
-  }
-
-  y += buf->y_stride;
-  u += buf->uv_stride;
-  v += buf->uv_stride;
-
-  for (i = 0; i < 4; i++) {
-    y[i] = y[-1];
-    u[i] = u[-1];
-    v[i] = v[-1];
-  }
-}
--- a/vp9/common/vp9_extend.h
+++ b/vp9/common/vp9_extend.h
@@ -22,9 +22,4 @@
                                          YV12_BUFFER_CONFIG *dst,
                                          int srcy, int srcx,
                                          int srch, int srcw);
-
-void vp9_extend_mb_row(YV12_BUFFER_CONFIG *buf,
-                       uint8_t *y, uint8_t *u, uint8_t *v);
-
-
 #endif  // VP9_COMMON_VP9_EXTEND_H_
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -298,13 +298,6 @@
 
     // adjust to the next row of mbs
     x->plane[0].src.buf += 16 * x->plane[0].src.stride - 16 * cm->mb_cols;
-
-#if ALT_ACT_MEASURE
-    // extend the recon for intra prediction
-    vp9_extend_mb_row(new_yv12, xd->plane[0].dst.buf + 16,
-                      xd->plane[1].dst.buf + 8, xd->plane[2].dst.buf + 8);
-#endif
-
   }
 
   // Calculate an "average" MB activity
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -688,9 +688,6 @@
     x->plane[1].src.buf += 8 * x->plane[1].src.stride - 8 * cm->mb_cols;
     x->plane[2].src.buf += 8 * x->plane[1].src.stride - 8 * cm->mb_cols;
 
-    // extend the recon for intra prediction
-    vp9_extend_mb_row(new_yv12, xd->plane[0].dst.buf + 16,
-                      xd->plane[1].dst.buf + 8, xd->plane[2].dst.buf + 8);
     vp9_clear_system_state();  // __asm emms;
   }