Enable ext-intra-mod by default

Provisionally adopted on 2017-10-31

(Also an asan warning fix + few non-functional changes)

Change-Id: I2ff4f34f8b20d2eeb567f2e5b1e57b296a97be82

av1/common/entropymode.c

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index dcf52a1..43c4799 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -5680,7 +5680,7 @@
 #endif  // CONFIG_LPF_SB
 
 #if CONFIG_EXT_INTRA_MOD
-const aom_cdf_prob default_angle_delta_cdf[DIRECTIONAL_MODES][CDF_SIZE(
+static const aom_cdf_prob default_angle_delta_cdf[DIRECTIONAL_MODES][CDF_SIZE(
     2 * MAX_ANGLE_DELTA + 1)] = {
   { AOM_ICDF(2340), AOM_ICDF(5327), AOM_ICDF(7611), AOM_ICDF(23102),
     AOM_ICDF(27196), AOM_ICDF(30546), AOM_ICDF(32768), 0 },

av1/common/reconintra.c

diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index a10928a..a63deb0 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -1472,8 +1472,12 @@
 
 #if CONFIG_INTRA_EDGE
 static int is_smooth(MB_MODE_INFO *mbmi) {
+#if CONFIG_SMOOTH_HV
   return (mbmi->mode == SMOOTH_PRED || mbmi->mode == SMOOTH_V_PRED ||
           mbmi->mode == SMOOTH_H_PRED);
+#else
+  return mbmi->mode == SMOOTH_PRED;
+#endif
 }
 
 static int get_filt_type(const MACROBLOCKD *xd) {
@@ -1589,7 +1593,7 @@
 }
 
 #if CONFIG_EXT_INTRA_MOD
-void av1_filter_intra_edge_corner(uint8_t *p_above, uint8_t *p_left) {
+static void av1_filter_intra_edge_corner(uint8_t *p_above, uint8_t *p_left) {
   const int kernel[3] = { 5, 6, 5 };
 
   int s = (p_left[0] * kernel[0]) + (p_above[-1] * kernel[1]) +
@@ -1625,7 +1629,8 @@
 }
 
 #if CONFIG_EXT_INTRA_MOD
-void av1_filter_intra_edge_corner_high(uint16_t *p_above, uint16_t *p_left) {
+static void av1_filter_intra_edge_corner_high(uint16_t *p_above,
+                                              uint16_t *p_left) {
   const int kernel[3] = { 5, 6, 5 };
 
   int s = (p_left[0] * kernel[0]) + (p_above[-1] * kernel[1]) +

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 5e4552f..426dc19 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4356,7 +4356,7 @@
                            xd->plane[1].subsampling_y))
     return;
 #if CONFIG_EXT_INTRA && CONFIG_EXT_INTRA_MOD
-  if (av1_is_directional_mode(mbmi->uv_mode, bsize) &&
+  if (av1_is_directional_mode(get_uv_mode(mbmi->uv_mode), bsize) &&
       av1_use_angle_delta(bsize)) {
 #if CONFIG_ENTROPY_STATS
     ++counts->angle_delta[mbmi->uv_mode - V_PRED]

build/cmake/aom_config_defaults.cmake

diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index a7d5164..88e5575 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -136,7 +136,7 @@
 set(CONFIG_EXT_COMP_REFS 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_EXT_DELTA_Q 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_EXT_INTRA 1 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_EXT_INTRA_MOD 0 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_EXT_INTRA_MOD 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_EXT_PARTITION 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_EXT_PARTITION_TYPES 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_EXT_PARTITION_TYPES_AB 0 CACHE NUMBER "AV1 experiment flag.")

configure

diff --git a/configure b/configure
index 509bb76..d62e4a7 100755
--- a/configure
+++ b/configure
@@ -527,6 +527,7 @@
       soft_enable frame_marker
       soft_enable kf_ctx
       soft_enable striped_loop_restoration
+      soft_enable ext_intra_mod
     fi
 
     # Enable low-bitdepth pixel pipeline by default