commit 02c7974117aaefa1130df0848bfb42d08087ed94
author hui su <huisu@google.com> Tue May 16 17:19:04 2017 -0700
committer Hui Su <huisu@google.com> Wed May 17 18:09:13 2017 +0000
tree a40dee8f733b55ecd17c1f152ee9307565293fe7
parent efdad1f40070d09979b7d14c7f8453343581665c

Fix conflicts between alt-intra, ext-intra and filter-intra

Change-Id: I18dc1acf25977b42b2bba73eab00b461a66c49b6

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 5f89bc3..816bf5d 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -930,8 +930,14 @@
 #define MAX_ANGLE_DELTA 3
 #define ANGLE_STEP 3
 extern const int16_t dr_intra_derivative[90];
-static const uint8_t mode_to_angle_map[INTRA_MODES] = {
+static const uint8_t mode_to_angle_map[] = {
   0, 90, 180, 45, 135, 111, 157, 203, 67, 0,
+#if CONFIG_ALT_INTRA
+  0,
+#if CONFIG_SMOOTH_HV
+  0, 0,
+#endif  // CONFIG_SMOOTH_HV
+#endif  // CONFIG_ALT_INTRA
 };
 #if CONFIG_INTRA_INTERP
 // Returns whether filter selection is needed for a given

av1/common/entropy.c

diff --git a/av1/common/entropy.c b/av1/common/entropy.c
index f2695da..e553742 100644
--- a/av1/common/entropy.c
+++ b/av1/common/entropy.c
@@ -6018,8 +6018,6 @@
 #if CONFIG_EXT_INTRA && CONFIG_INTRA_INTERP
   AVERAGE_TILE_CDFS(intra_filter_cdf)
 #endif  // CONFIG_EXT_INTRA && CONFIG_INTRA_INTERP
-#if CONFIG_FILTER_INTRA
-#endif  // CONFIG_FILTER_INTRA
 }
 
 void av1_average_tile_inter_cdfs(AV1_COMMON *cm, FRAME_CONTEXT *fc,

av1/common/reconintra.c

diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index 6e202e7..7ce0aa6 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -558,6 +558,9 @@
 #endif  // CONFIG_HIGHBITDEPTH
 
 static void av1_init_intra_predictors_internal(void) {
+#if CONFIG_EXT_INTRA
+  assert(NELEMENTS(mode_to_angle_map) == INTRA_MODES);
+#endif  // CONFIG_EXT_INTRA
 #if CONFIG_TX64X64
 #define INIT_NO_4X4(p, type)                  \
   p[TX_8X8] = aom_##type##_predictor_8x8;     \
@@ -1204,7 +1207,7 @@
 
 #if CONFIG_FILTER_INTRA
 #if USE_3TAP_INTRA_FILTER
-int av1_filter_intra_taps_3[TX_SIZES][INTRA_MODES][3] = {
+int av1_filter_intra_taps_3[TX_SIZES][FILTER_INTRA_MODES][3] = {
 #if CONFIG_CB4X4
   {
       { 697, 836, -509 },
@@ -1283,7 +1286,7 @@
 #endif  // CONFIG_TX64X64
 };
 #else
-int av1_filter_intra_taps_4[TX_SIZES][INTRA_MODES][4] = {
+int av1_filter_intra_taps_4[TX_SIZES][FILTER_INTRA_MODES][4] = {
 #if CONFIG_CB4X4
   {
       { 735, 881, -537, -54 },

av1/common/reconintra.h

diff --git a/av1/common/reconintra.h b/av1/common/reconintra.h
index fa8865f..657afa1 100644
--- a/av1/common/reconintra.h
+++ b/av1/common/reconintra.h
@@ -81,7 +81,7 @@
 
 #if CONFIG_FILTER_INTRA
 #define FILTER_INTRA_PREC_BITS 10
-extern int av1_filter_intra_taps_4[TX_SIZES][INTRA_MODES][4];
+extern int av1_filter_intra_taps_4[TX_SIZES][FILTER_INTRA_MODES][4];
 #endif  // CONFIG_FILTER_INTRA
 
 #if CONFIG_EXT_INTRA