From 16ac5a5cde0472fc29719aab7ad0958d1492df43 Mon Sep 17 00:00:00 2001
From: John Koleszar <jkoleszar@google.com>
Date: Thu, 16 May 2013 11:48:34 -0700
Subject: [PATCH] Remove vp9_extend_mb_row()
This code is no longer needed for correct intra prediction.
Change-Id: I822d1a8b0ad0a00e7c4c6e7b2931790c39d1267d
---
vp9/common/vp9_extend.c | 26 --------------------------
vp9/common/vp9_extend.h | 5 -----
vp9/encoder/vp9_encodeframe.c | 7 -------
vp9/encoder/vp9_firstpass.c | 3 ---
4 files changed, 41 deletions(-)
diff --git a/vp9/common/vp9_extend.c b/vp9/common/vp9_extend.c
index 1dcf0e19cf..6aeadf6aa6 100644
--- a/vp9/common/vp9_extend.c
+++ b/vp9/common/vp9_extend.c
@@ -119,29 +119,3 @@ void vp9_copy_and_extend_frame_with_rect(const YV12_BUFFER_CONFIG *src,
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];
- }
-}
diff --git a/vp9/common/vp9_extend.h b/vp9/common/vp9_extend.h
index 6ec75c992a..7ff79b7b6b 100644
--- a/vp9/common/vp9_extend.h
+++ b/vp9/common/vp9_extend.h
@@ -22,9 +22,4 @@ void vp9_copy_and_extend_frame_with_rect(const YV12_BUFFER_CONFIG *src,
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_
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 954eefae9c..ae1e3f5d31 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -298,13 +298,6 @@ static void build_activity_map(VP9_COMP *cpi) {
// 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
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c
index 367ebecc32..5ec6966042 100644
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -688,9 +688,6 @@ void vp9_first_pass(VP9_COMP *cpi) {
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;
}
--
GitLab