Commit a497cb59 authored by Johann's avatar Johann
Browse files

Rename vp8_intra4x4_predict_d

predict_d has become canonical. Remove previous helper function.

Disable ARM assembly pending update.

Change-Id: Idd84ac8a28f9b0221ea97904a77de1e705d06a7d
parent 41aede61
......@@ -13,11 +13,11 @@
#include "vpx_rtcd.h"
#include "blockd.h"
void vp8_intra4x4_predict_d_c(unsigned char *Above,
unsigned char *yleft, int left_stride,
int b_mode,
unsigned char *dst, int dst_stride,
unsigned char top_left)
void vp8_intra4x4_predict_c(unsigned char *Above,
unsigned char *yleft, int left_stride,
int b_mode,
unsigned char *dst, int dst_stride,
unsigned char top_left)
{
int i, r, c;
......@@ -293,16 +293,3 @@ void vp8_intra4x4_predict_d_c(unsigned char *Above,
}
}
void vp8_intra4x4_predict_c(unsigned char *src, int src_stride,
int b_mode,
unsigned char *dst, int dst_stride)
{
unsigned char *Above = src - src_stride;
vp8_intra4x4_predict_d(Above,
src - 1, src_stride,
b_mode,
dst, dst_stride,
Above[-1]);
}
......@@ -144,13 +144,9 @@ specialize vp8_build_intra_predictors_mby_s sse2 ssse3
prototype void vp8_build_intra_predictors_mbuv_s "struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride"
specialize vp8_build_intra_predictors_mbuv_s sse2 ssse3
prototype void vp8_intra4x4_predict_d "unsigned char *above, unsigned char *left, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left"
prototype void vp8_intra4x4_predict "unsigned char *above, unsigned char *left, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left"
# No existing specializations
prototype void vp8_intra4x4_predict "unsigned char *src, int src_stride, int b_mode, unsigned char *dst, int dst_stride"
specialize vp8_intra4x4_predict media
vp8_intra4x4_predict_media=vp8_intra4x4_predict_armv6
#
# Postproc
#
......
......@@ -194,8 +194,8 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
int left_stride = dst_stride;
unsigned char top_left = Above[-1];
vp8_intra4x4_predict_d(Above, yleft, left_stride, b_mode,
dst, dst_stride, top_left);
vp8_intra4x4_predict(Above, yleft, left_stride, b_mode,
dst, dst_stride, top_left);
if (xd->eobs[i])
{
......
......@@ -205,8 +205,8 @@ static void mt_decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
else
top_left = Above[-1];
vp8_intra4x4_predict_d(Above, yleft, left_stride,
b_mode, dst, dst_stride, top_left);
vp8_intra4x4_predict(Above, yleft, left_stride,
b_mode, dst, dst_stride, top_left);
if (xd->eobs[i] )
{
......
......@@ -59,8 +59,8 @@ void vp8_encode_intra4x4block(MACROBLOCK *x, int ib)
unsigned char *yleft = dst - 1;
unsigned char top_left = Above[-1];
vp8_intra4x4_predict_d(Above, yleft, dst_stride, b->bmi.as_mode,
b->predictor, 16, top_left);
vp8_intra4x4_predict(Above, yleft, dst_stride, b->bmi.as_mode,
b->predictor, 16, top_left);
vp8_subtract_b(be, b, 16);
......
......@@ -157,8 +157,8 @@ static int pick_intra4x4block(
rate = mode_costs[mode];
vp8_intra4x4_predict_d(Above, yleft, dst_stride, mode,
b->predictor, 16, top_left);
vp8_intra4x4_predict(Above, yleft, dst_stride, mode,
b->predictor, 16, top_left);
distortion = get_prediction_error(be, b);
this_rd = RDCOST(x->rdmult, x->rddiv, rate, distortion);
......
......@@ -666,8 +666,8 @@ static int rd_pick_intra4x4block(
rate = bmode_costs[mode];
vp8_intra4x4_predict_d(Above, yleft, dst_stride, mode,
b->predictor, 16, top_left);
vp8_intra4x4_predict(Above, yleft, dst_stride, mode,
b->predictor, 16, top_left);
vp8_subtract_b(be, b, 16);
x->short_fdct4x4(be->src_diff, be->coeff, 32);
x->quantize_b(be, b);
......
......@@ -148,7 +148,7 @@ VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/idct_v6$(ASM)
VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/loopfilter_v6$(ASM)
VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/simpleloopfilter_v6$(ASM)
VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/sixtappredict8x4_v6$(ASM)
VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/intra4x4_predict_v6$(ASM)
#VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/intra4x4_predict_v6$(ASM)
VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/dequant_idct_v6$(ASM)
VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/dequantize_v6$(ASM)
VP8_COMMON_SRCS-$(HAVE_MEDIA) += common/arm/armv6/idct_blk_v6.c
......
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