Remove experimental flag of Q_ADAPT_PROBS

This experiment has been adopted, we can simplify the code
by dropping the associated preprocessor conditionals.

Change-Id: Idf52f49d953b422f7789247df966d238fc34299b

av1/av1.cmake

@@ -481,11 +481,9 @@ if (CONFIG_HASH_ME)
       "${AOM_ROOT}/third_party/vector/vector.c")
 endif ()
 
-if (CONFIG_Q_ADAPT_PROBS)
   set(AOM_AV1_COMMON_SOURCES
       ${AOM_AV1_COMMON_SOURCES}
       "${AOM_ROOT}/av1/common/token_cdfs.h")
-endif ()
 
 if (CONFIG_XIPHRC)
   set(AOM_AV1_ENCODER_SOURCES

av1/av1_common.mk

@@ -163,8 +163,6 @@ ifeq ($(CONFIG_LV_MAP),yes)
 AV1_COMMON_SRCS-$(HAVE_SSE2) += common/x86/txb_sse2.c
 endif
 
-ifeq ($(CONFIG_Q_ADAPT_PROBS),yes)
 AV1_COMMON_SRCS-yes += common/token_cdfs.h
-endif
 
 $(eval $(call rtcd_h_template,av1_rtcd,av1/common/av1_rtcd_defs.pl))

av1/common/entropy.h

@@ -27,9 +27,7 @@ extern "C" {
 #define DIFF_UPDATE_PROB 252
 #define GROUP_DIFF_UPDATE_PROB 252
 
-#if CONFIG_Q_ADAPT_PROBS
 #define TOKEN_CDF_Q_CTXS 4
-#endif  // CONFIG_Q_ADAPT_PROBS
 
 // Coefficient token alphabet
 #define ZERO_TOKEN 0        // 0     Extra Bits 0+0

av1/decoder/decodeframe.c

@@ -2983,12 +2983,10 @@ static size_t read_uncompressed_header(AV1Decoder *pbi,
   setup_quantization(cm, rb);
   xd->bd = (int)cm->bit_depth;
 
-#if CONFIG_Q_ADAPT_PROBS
   if (frame_is_intra_only(cm) || cm->error_resilient_mode) {
     av1_default_coef_probs(cm);
     av1_setup_frame_contexts(cm);
   }
-#endif  // CONFIG_Q_ADAPT_PROBS
 
   setup_segmentation(cm, rb);
 

av1/encoder/encoder.c

@@ -5523,14 +5523,12 @@ static void encode_with_recode_loop(AV1_COMP *cpi, size_t *size,
 
     if (loop_count == 0) setup_frame(cpi);
 
-#if CONFIG_Q_ADAPT_PROBS
     // Base q-index may have changed, so we need to assign proper default coef
     // probs before every iteration.
     if (frame_is_intra_only(cm) || cm->error_resilient_mode) {
       av1_default_coef_probs(cm);
       av1_setup_frame_contexts(cm);
     }
-#endif  // CONFIG_Q_ADAPT_PROBS
 
     // Variance adaptive and in frame q adjustment experiments are mutually
     // exclusive.

build/cmake/aom_config_defaults.cmake

@@ -170,7 +170,6 @@ set(CONFIG_OBU_NO_IVF 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_OPT_REF_MV 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_PALETTE_THROUGHPUT 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_PARALLEL_DEBLOCKING 1 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_Q_ADAPT_PROBS 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_RD_DEBUG 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_RECT_TX_EXT 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_RECT_TX_EXT_INTRA 1 CACHE NUMBER "AV1 experiment flag.")

configure

@@ -265,7 +265,6 @@ EXPERIMENT_LIST="
     ext_partition
     ext_partition_types
     ext_tile
-    q_adapt_probs
     inter_stats_only
     kf_ctx
     cfl
@@ -499,7 +498,6 @@ post_process_cmdline() {
       soft_enable ext_partition_types
 
       # Provisional adopted
-      soft_enable q_adapt_probs
       soft_enable reference_buffer
       soft_enable loopfiltering_across_tiles
       soft_enable palette_throughput