Make q_adpt_probs work with CDF

Replace probablity tables with CDF tables.

Change-Id: I21e12dce7f1a3fc7aa84805e890342445e68ce29

av1/av1.cmake

@@ -501,6 +501,12 @@ 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 ()
+
 # Setup AV1 common/decoder/encoder targets. The libaom target must exist before
 # this function is called.
 function (setup_av1_targets)

av1/av1_common.mk

@@ -188,4 +188,8 @@ AV1_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/highbd_convolve_2d_ssse3.c
 endif
 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

@@ -28,8 +28,7 @@ extern "C" {
 #define GROUP_DIFF_UPDATE_PROB 252
 
 #if CONFIG_Q_ADAPT_PROBS
-#define QCTX_BIN_BITS 2
-#define QCTX_BINS (1 << QCTX_BIN_BITS)
+#define TOKEN_CDF_Q_CTXS 4
 #endif  // CONFIG_Q_ADAPT_PROBS
 
 // Coefficient token alphabet