Remove redundant experiment.

restrict_compressed_hdr experiment is made redundant by
new_multisymbol.

BUG=aomedia:870

Change-Id: I86100d114ca641a453c32ffd09cabb736809abd1

av1/common/onyxc_int.h

diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index dbfbd94..06007c5 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -1371,13 +1371,11 @@
 
 static INLINE int use_compressed_header(const AV1_COMMON *cm) {
   (void)cm;
-#if CONFIG_RESTRICT_COMPRESSED_HDR && CONFIG_NEW_MULTISYMBOL
+#if CONFIG_NEW_MULTISYMBOL
   return 0;
-#elif CONFIG_RESTRICT_COMPRESSED_HDR
-  return cm->refresh_frame_context == REFRESH_FRAME_CONTEXT_FORWARD;
 #else
   return 1;
-#endif  // CONFIG_RESTRICT_COMPRESSED_HDR && CONFIG_NEW_MULTISYMBOL
+#endif  // CONFIG_NEW_MULTISYMBOL
 }
 
 #ifdef __cplusplus

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 65fa0da..bcb4b32 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -148,7 +148,7 @@
 #endif  // CONFIG_VAR_TX_NO_TX_MODE
 }
 
-#if !CONFIG_RESTRICT_COMPRESSED_HDR
+#if !CONFIG_NEW_MULTISYMBOL
 static void read_inter_mode_probs(FRAME_CONTEXT *fc, aom_reader *r) {
   int i;
   for (i = 0; i < NEWMV_MODE_CONTEXTS; ++i)
@@ -177,7 +177,7 @@
   }
 }
 
-#if !CONFIG_RESTRICT_COMPRESSED_HDR
+#if !CONFIG_NEW_MULTISYMBOL
 static void read_frame_reference_mode_probs(AV1_COMMON *cm, aom_reader *r) {
   FRAME_CONTEXT *const fc = cm->fc;
   int i;
@@ -3489,7 +3489,7 @@
 
 static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data,
                                   size_t partition_size) {
-#if CONFIG_RESTRICT_COMPRESSED_HDR
+#if CONFIG_NEW_MULTISYMBOL
   (void)pbi;
   (void)data;
   (void)partition_size;
@@ -3585,7 +3585,7 @@
   }
 
   return aom_reader_has_error(&r);
-#endif  // CONFIG_RESTRICT_COMPRESSED_HDR
+#endif  // CONFIG_NEW_MULTISYMBOL
 }
 
 #ifdef NDEBUG

build/cmake/aom_config_defaults.cmake

diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 8ef057a..668e007 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -190,7 +190,6 @@
 set(CONFIG_RECT_TX_EXT 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_REFERENCE_BUFFER 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_REF_ADAPT 0 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_RESTRICT_COMPRESSED_HDR 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_SEGMENT_ZEROMV 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_SIMPLE_BWD_ADAPT 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_SMOOTH_HV 1 CACHE NUMBER "AV1 experiment flag.")

configure

diff --git a/configure b/configure
index 29c2b4b..9251d09 100755
--- a/configure
+++ b/configure
@@ -345,7 +345,6 @@
     opt_ref_mv
     tmv
     ext_warped_motion
-    restrict_compressed_hdr
     horzonly_frame_superres
     simple_bwd_adapt
 "
@@ -562,7 +561,6 @@
     enabled lgt_from_pred && disable_feature mrc_tx
     enabled cfl && enable_feature smooth_hv
     enabled cdef_singlepass && enable_feature cdef
-    enabled new_multisymbol && enable_feature restrict_compressed_hdr
     enabled mfmv && enable_feature frame_marker
     enabled jnt_comp && enable_feature frame_marker
     enabled frame_sign_bias && enable_feature frame_marker