A clean up of the down_copy function

Change-Id: I0c689fb44e9e91539c450d26672d7a1d92e92900

diff --git a/vp8/common/reconintra4x4.c b/vp8/common/reconintra4x4.c
index 1e40168ec3641b701bca1f828685e64937c6fa50..741fd7d31399f64d57f26cb75276e3ecbf0c55c7 100644 (file)
--- a/vp8/common/reconintra4x4.c
+++ b/vp8/common/reconintra4x4.c
@@ -295,7 +295,8 @@ void vp8_comp_intra4x4_predict_c(BLOCKD *x,
 /* copy 4 bytes from the above right down so that the 4x4 prediction modes using pixels above and
  * to the right prediction have filled in pixels to use.
  */
-void vp8_intra_prediction_down_copy(MACROBLOCKD *xd, int extend_edge) {
+void vp8_intra_prediction_down_copy(MACROBLOCKD *xd) {
+  int extend_edge = (xd->mb_to_right_edge == 0 && xd->mb_index < 2);
   unsigned char *above_right = *(xd->block[0].base_dst) + xd->block[0].dst -
                                xd->block[0].dst_stride + 16;
   unsigned int *src_ptr = (unsigned int *)

diff --git a/vp8/common/reconintra4x4.h b/vp8/common/reconintra4x4.h
index 771e0b2eb93d3b1a3e27a68b91b46613adabc843..a8cdea47c9ec9b3a9a3ed829796aa50f0a189207 100644 (file)
--- a/vp8/common/reconintra4x4.h
+++ b/vp8/common/reconintra4x4.h
@@ -12,6 +12,6 @@
 #ifndef __INC_RECONINTRA4x4_H
 #define __INC_RECONINTRA4x4_H
 
-extern void vp8_intra_prediction_down_copy(MACROBLOCKD *xd, int extend_edge);
+extern void vp8_intra_prediction_down_copy(MACROBLOCKD *xd);
 
 #endif

diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c
index 78ba590e08744236d607deb11d6fe5923b337f41..c53560dbb53b6ac34937dbc3795172db17948331 100644 (file)
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@ -658,8 +658,7 @@ decode_sb_row(VP8D_COMP *pbi, VP8_COMMON *pc, int mbrow, MACROBLOCKD *xd,
         mi[pc->mode_info_stride + 1] = mi[0];
       }
 #endif
-      vp8_intra_prediction_down_copy(xd, mb_col == pc->mb_cols - 1 &&
-                                     !(mb_row & 1));
+      vp8_intra_prediction_down_copy(xd);
       decode_macroblock(pbi, xd, mb_col, bc);
 #if CONFIG_SUPERBLOCKS
       if (xd->mode_info_context->mbmi.encoded_as_sb) {

diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index a71715ea5f0d10c85720487c6584836a9385aa06..8cc0715a9b0b3f23a790ab3668dac5915b06dfb7 100644 (file)
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -613,8 +613,7 @@ static void pick_mb_modes(VP8_COMP *cpi,
 
     cpi->update_context = 0;    // TODO Do we need this now??
 
-    vp8_intra_prediction_down_copy(xd, mb_col == cm->mb_cols - 1 &&
-                                       (mb_row & 1) == 0);
+    vp8_intra_prediction_down_copy(xd);
 
     // Find best coding mode & reconstruct the MB so it is available
     // as a predictor for MBs that follow in the SB
@@ -983,8 +982,7 @@ static void encode_sb(VP8_COMP *cpi,
 #if CONFIG_SUPERBLOCKS
     if (!xd->mode_info_context->mbmi.encoded_as_sb)
 #endif
-      vp8_intra_prediction_down_copy(xd, mb_col == cm->mb_cols - 1 &&
-                                     (mb_row & 1) == 0);
+      vp8_intra_prediction_down_copy(xd);
 
     if (cm->frame_type == KEY_FRAME) {
 #if CONFIG_SUPERBLOCKS