Rename vp8_intra4x4_predict_d
predict_d has become canonical. Remove previous helper function.
Disable ARM assembly pending update.
Change-Id: Idd84ac8a28f9b0221ea97904a77de1e705d06a7d
diff --git a/vp8/common/reconintra4x4.c b/vp8/common/reconintra4x4.c
index f35e719..72375fd 100644
--- a/vp8/common/reconintra4x4.c
+++ b/vp8/common/reconintra4x4.c
@@ -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_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]);
-}
diff --git a/vp8/common/rtcd_defs.sh b/vp8/common/rtcd_defs.sh
index 6651a3a..e933376 100644
--- a/vp8/common/rtcd_defs.sh
+++ b/vp8/common/rtcd_defs.sh
@@ -144,13 +144,9 @@
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
#
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c
index 8853b35..4a33f5a 100644
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@ -194,8 +194,8 @@
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])
{
diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c
index 7520b58..cbc6a43 100644
--- a/vp8/decoder/threading.c
+++ b/vp8/decoder/threading.c
@@ -205,8 +205,8 @@
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] )
{
diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c
index a380367..340dd63 100644
--- a/vp8/encoder/encodeintra.c
+++ b/vp8/encoder/encodeintra.c
@@ -59,8 +59,8 @@
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);
diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c
index 4d4bbea..77d9152 100644
--- a/vp8/encoder/pickinter.c
+++ b/vp8/encoder/pickinter.c
@@ -157,8 +157,8 @@
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);
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 8179c9f..005f262 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -666,8 +666,8 @@
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);
diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk
index a328f46..bd971fa 100644
--- a/vp8/vp8_common.mk
+++ b/vp8/vp8_common.mk
@@ -148,7 +148,7 @@
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
