Commit 9fdd90c9 authored by John Koleszar's avatar John Koleszar Committed by Code Review

Merge "arm: remove duplicate functions"

parents 91d927f9 d330a587
...@@ -295,22 +295,8 @@ void vp8_predict_intra4x4(BLOCKD *x, ...@@ -295,22 +295,8 @@ void vp8_predict_intra4x4(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 *x)
{
unsigned char *above_right = *(x->block[0].base_dst) + x->block[0].dst - x->block[0].dst_stride + 16;
unsigned int *src_ptr = (unsigned int *)above_right;
unsigned int *dst_ptr0 = (unsigned int *)(above_right + 4 * x->block[0].dst_stride);
unsigned int *dst_ptr1 = (unsigned int *)(above_right + 8 * x->block[0].dst_stride);
unsigned int *dst_ptr2 = (unsigned int *)(above_right + 12 * x->block[0].dst_stride);
*dst_ptr0 = *src_ptr;
*dst_ptr1 = *src_ptr;
*dst_ptr2 = *src_ptr;
}
extern void vp8_intra_prediction_down_copy(MACROBLOCKD *x);
/* /*
......
This diff is collapsed.
...@@ -1127,6 +1127,7 @@ int vp8_diamond_search_sadx4 ...@@ -1127,6 +1127,7 @@ int vp8_diamond_search_sadx4
} }
#if !(CONFIG_REALTIME_ONLY)
int vp8_full_search_sad(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int error_per_bit, int distance, vp8_variance_fn_ptr_t *fn_ptr, int *mvcost[2], int *mvsadcost[2]) int vp8_full_search_sad(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int error_per_bit, int distance, vp8_variance_fn_ptr_t *fn_ptr, int *mvcost[2], int *mvsadcost[2])
{ {
unsigned char *what = (*(b->base_src) + b->src); unsigned char *what = (*(b->base_src) + b->src);
...@@ -1339,6 +1340,8 @@ int vp8_full_search_sadx3(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int er ...@@ -1339,6 +1340,8 @@ int vp8_full_search_sadx3(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int er
else else
return INT_MAX; return INT_MAX;
} }
#endif
#ifdef ENTROPY_STATS #ifdef ENTROPY_STATS
void print_mode_context(void) void print_mode_context(void)
......
Markdown is supported
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