[intra-edge] Soft_enable by default

This experiment was provisionally adopted on 2017-9-12

The ResizeCspTest unit test is disabled when intra_edge is enabled,
as the PSNR of the first frame increases from 77dB to 100dB.
This results in a failure when later frames are compared with the
first one.

Change-Id: I4e9629d9657b01b5d3e64f2dfcfd82e47292c9c6
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index ef837a4..2fc8c11 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -157,7 +157,7 @@
 set(CONFIG_INTERINTRA 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_INTER_STATS_ONLY 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_INTRABC 0 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_INTRA_EDGE 0 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_INTRA_EDGE 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_INTRA_INTERP 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_JNT_COMP 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_LGT 0 CACHE NUMBER "AV1 experiment flag.")
diff --git a/configure b/configure
index 0b7e215..1a94589 100755
--- a/configure
+++ b/configure
@@ -512,6 +512,7 @@
     soft_enable ext_tx
     soft_enable cdef
     soft_enable ext_intra
+    soft_enable intra_edge
     soft_enable mv_compress
     soft_enable ext_refs
     soft_enable dual_filter
diff --git a/test/resize_test.cc b/test/resize_test.cc
index b12f283..de55b46 100644
--- a/test/resize_test.cc
+++ b/test/resize_test.cc
@@ -696,7 +696,8 @@
   }
 };
 
-#if defined(DISABLE_TRELLISQ_SEARCH) && DISABLE_TRELLISQ_SEARCH
+#if (defined(DISABLE_TRELLISQ_SEARCH) && DISABLE_TRELLISQ_SEARCH) || \
+    CONFIG_INTRA_EDGE
 TEST_P(ResizeCspTest, DISABLED_TestResizeCspWorks) {
 #else
 TEST_P(ResizeCspTest, TestResizeCspWorks) {