use RTCD pointer for intra4x4_predict

Change-Id: I4161389ff02aa37636540ac0fe0fe9763d52ebdc

diff --git a/vp8/common/reconintra4x4.c b/vp8/common/reconintra4x4.c
index dcc35ec..f35e719 100644 (file)
--- 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 0805ede..6651a3a 100644 (file)
--- 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 677e222..1694b48 100644 (file)
--- 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 3749583..4d12b3a 100644 (file)
--- 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);