Commit 86728ce1 authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by Gerrit Code Review
Browse files

Merge "A clean up of the down_copy function" into experimental

parents 818ee904 d269de5f
...@@ -295,7 +295,8 @@ void vp8_comp_intra4x4_predict_c(BLOCKD *x, ...@@ -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 /* 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. * 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 - unsigned char *above_right = *(xd->block[0].base_dst) + xd->block[0].dst -
xd->block[0].dst_stride + 16; xd->block[0].dst_stride + 16;
unsigned int *src_ptr = (unsigned int *) unsigned int *src_ptr = (unsigned int *)
......
...@@ -12,6 +12,6 @@ ...@@ -12,6 +12,6 @@
#ifndef __INC_RECONINTRA4x4_H #ifndef __INC_RECONINTRA4x4_H
#define __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 #endif
...@@ -658,8 +658,7 @@ decode_sb_row(VP8D_COMP *pbi, VP8_COMMON *pc, int mbrow, MACROBLOCKD *xd, ...@@ -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]; mi[pc->mode_info_stride + 1] = mi[0];
} }
#endif #endif
vp8_intra_prediction_down_copy(xd, mb_col == pc->mb_cols - 1 && vp8_intra_prediction_down_copy(xd);
!(mb_row & 1));
decode_macroblock(pbi, xd, mb_col, bc); decode_macroblock(pbi, xd, mb_col, bc);
#if CONFIG_SUPERBLOCKS #if CONFIG_SUPERBLOCKS
if (xd->mode_info_context->mbmi.encoded_as_sb) { if (xd->mode_info_context->mbmi.encoded_as_sb) {
......
...@@ -613,8 +613,7 @@ static void pick_mb_modes(VP8_COMP *cpi, ...@@ -613,8 +613,7 @@ static void pick_mb_modes(VP8_COMP *cpi,
cpi->update_context = 0; // TODO Do we need this now?? cpi->update_context = 0; // TODO Do we need this now??
vp8_intra_prediction_down_copy(xd, mb_col == cm->mb_cols - 1 && vp8_intra_prediction_down_copy(xd);
(mb_row & 1) == 0);
// Find best coding mode & reconstruct the MB so it is available // Find best coding mode & reconstruct the MB so it is available
// as a predictor for MBs that follow in the SB // as a predictor for MBs that follow in the SB
...@@ -983,8 +982,7 @@ static void encode_sb(VP8_COMP *cpi, ...@@ -983,8 +982,7 @@ static void encode_sb(VP8_COMP *cpi,
#if CONFIG_SUPERBLOCKS #if CONFIG_SUPERBLOCKS
if (!xd->mode_info_context->mbmi.encoded_as_sb) if (!xd->mode_info_context->mbmi.encoded_as_sb)
#endif #endif
vp8_intra_prediction_down_copy(xd, mb_col == cm->mb_cols - 1 && vp8_intra_prediction_down_copy(xd);
(mb_row & 1) == 0);
if (cm->frame_type == KEY_FRAME) { if (cm->frame_type == KEY_FRAME) {
#if CONFIG_SUPERBLOCKS #if CONFIG_SUPERBLOCKS
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment