From 3c208a5a5e48b5c44f53ed3dfb9dd047c3af4919 Mon Sep 17 00:00:00 2001 From: Johann Date: Tue, 31 Jul 2012 14:12:32 -0700 Subject: [PATCH] use RTCD pointer for intra4x4_predict Change-Id: I4161389ff02aa37636540ac0fe0fe9763d52ebdc --- vp8/common/reconintra4x4.c | 10 +++++----- vp8/common/rtcd_defs.sh | 2 ++ vp8/decoder/decodframe.c | 2 +- vp8/decoder/threading.c | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/vp8/common/reconintra4x4.c b/vp8/common/reconintra4x4.c index dcc35ec15..f35e719fc 100644 --- a/vp8/common/reconintra4x4.c +++ b/vp8/common/reconintra4x4.c @@ -300,9 +300,9 @@ void vp8_intra4x4_predict_c(unsigned char *src, int src_stride, { unsigned char *Above = src - src_stride; - vp8_intra4x4_predict_d_c(Above, - src - 1, src_stride, - b_mode, - dst, dst_stride, - Above[-1]); + 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 0805ede56..6651a3a16 100644 --- a/vp8/common/rtcd_defs.sh +++ b/vp8/common/rtcd_defs.sh @@ -145,6 +145,8 @@ prototype void vp8_build_intra_predictors_mbuv_s "struct macroblockd *x, unsigne 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" +# 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 diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index 677e22259..1694b489f 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -199,7 +199,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, left_stride = dst_stride; top_left = yabove[-1]; - vp8_intra4x4_predict_d_c(yabove, yleft, left_stride, + vp8_intra4x4_predict_d(yabove, yleft, left_stride, b_mode, base_dst + b->offset, dst_stride, top_left); diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c index 374958399..4d12b3ac3 100644 --- a/vp8/decoder/threading.c +++ b/vp8/decoder/threading.c @@ -205,7 +205,7 @@ static void mt_decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, else top_left = yabove[-1]; - vp8_intra4x4_predict_d_c(yabove, yleft, left_stride, + vp8_intra4x4_predict_d(yabove, yleft, left_stride, b_mode, base_dst + b->offset, dst_stride, top_left); -- 2.40.0