commit 62a1579525afad6e874dbbfe5c2f6233257013aa
author Ronald S. Bultje <rsbultje@gmail.com> Wed Sep 30 18:45:08 2015 -0400
committer Ronald S. Bultje <rsbultje@gmail.com> Thu Oct 01 10:11:54 2015 -0400
tree 971ff71473c2cfc36d2a406b0fdffce47e54aae3
parent b1d85bf60f85a5b2f049d6a13c69f129ab740b7a

vp10: reimplement d45/4x4 to match vp8 instead of vp9.

This is more a proof of concept than anything else. The problem here
isn't so much how to code it, but rather where to place the resulting
code. All intrapred DSP code lives in vpx_dsp, so do we want the vp10
specific intra pred functions to live there, or in vp10/?

See issue 1015.

Change-Id: I675f7badcc8e18fd99a9553910ecf3ddf81f0a05

vp10/common/reconintra.c

diff --git a/vp10/common/reconintra.c b/vp10/common/reconintra.c
index 9350d67..52df2fe 100644
--- a/vp10/common/reconintra.c
+++ b/vp10/common/reconintra.c
@@ -55,16 +55,24 @@
 #endif  // CONFIG_VP9_HIGHBITDEPTH
 
 static void vp10_init_intra_predictors_internal(void) {
-#define INIT_ALL_SIZES(p, type) \
-  p[TX_4X4] = vpx_##type##_predictor_4x4; \
+#define INIT_NO_4X4(p, type) \
   p[TX_8X8] = vpx_##type##_predictor_8x8; \
   p[TX_16X16] = vpx_##type##_predictor_16x16; \
   p[TX_32X32] = vpx_##type##_predictor_32x32
 
+#define INIT_ALL_SIZES(p, type) \
+  p[TX_4X4] = vpx_##type##_predictor_4x4; \
+  INIT_NO_4X4(p, type)
+
   INIT_ALL_SIZES(pred[V_PRED], v);
   INIT_ALL_SIZES(pred[H_PRED], h);
   INIT_ALL_SIZES(pred[D207_PRED], d207);
+#if CONFIG_MISC_FIXES
+  pred[D45_PRED][TX_4X4] = vpx_d45e_predictor_4x4;
+  INIT_NO_4X4(pred[D45_PRED], d45);
+#else
   INIT_ALL_SIZES(pred[D45_PRED], d45);
+#endif
   INIT_ALL_SIZES(pred[D63_PRED], d63);
   INIT_ALL_SIZES(pred[D117_PRED], d117);
   INIT_ALL_SIZES(pred[D135_PRED], d135);
@@ -80,7 +88,12 @@
   INIT_ALL_SIZES(pred_high[V_PRED], highbd_v);
   INIT_ALL_SIZES(pred_high[H_PRED], highbd_h);
   INIT_ALL_SIZES(pred_high[D207_PRED], highbd_d207);
+#if CONFIG_MISC_FIXES
+  pred_high[D45_PRED][TX_4X4] = vpx_highbd_d45e_predictor_4x4;
+  INIT_NO_4X4(pred_high[D45_PRED], highbd_d45);
+#else
   INIT_ALL_SIZES(pred_high[D45_PRED], highbd_d45);
+#endif
   INIT_ALL_SIZES(pred_high[D63_PRED], highbd_d63);
   INIT_ALL_SIZES(pred_high[D117_PRED], highbd_d117);
   INIT_ALL_SIZES(pred_high[D135_PRED], highbd_d135);