From 8004734b46e6022783338e911f4a9320da527f07 Mon Sep 17 00:00:00 2001
From: Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com>
Date: Wed, 22 Nov 2017 16:14:57 +0100
Subject: [PATCH] Remove dead member: delta_q_prob

Change-Id: Iaed205ac520e6f4dbec8b406f15598f4f2fbd3f9
---
 av1/common/entropymode.c      | 5 -----
 av1/common/entropymode.h      | 1 -
 tools/aom_entropy_optimizer.c | 6 ------
 3 files changed, 12 deletions(-)

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 0322979df..f578dfdc5 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -909,7 +909,6 @@ static const aom_cdf_prob default_obmc_cdf[BLOCK_SIZES_ALL][CDF_SIZE(2)] = {
 #endif  // CONFIG_EXT_PARTITION
 };
 
-static const aom_prob default_delta_q_probs[DELTA_Q_PROBS] = { 220, 220, 220 };
 static const aom_cdf_prob default_delta_q_cdf[CDF_SIZE(DELTA_Q_PROBS + 1)] = {
   AOM_CDF4(28160, 32120, 32677)
 };
@@ -3083,7 +3082,6 @@ static void init_mode_probs(FRAME_CONTEXT *fc) {
     av1_copy(fc->seg.q_seg_cdf[i], default_q_seg_tree_cdf[i]);
 #endif
   av1_copy(fc->tx_size_cdf, default_tx_size_cdf);
-  av1_copy(fc->delta_q_prob, default_delta_q_probs);
   av1_copy(fc->delta_q_cdf, default_delta_q_cdf);
 #if CONFIG_EXT_DELTA_Q
   av1_copy(fc->delta_lf_prob, default_delta_lf_probs);
@@ -3210,9 +3208,6 @@ void av1_adapt_intra_frame_probs(AV1_COMMON *cm) {
                          counts->seg.tree_total, fc->seg.tree_probs);
   }
 
-  for (i = 0; i < DELTA_Q_PROBS; ++i)
-    fc->delta_q_prob[i] =
-        mode_mv_merge_probs(pre_fc->delta_q_prob[i], counts->delta_q[i]);
 #if CONFIG_EXT_DELTA_Q
 #if CONFIG_LOOPFILTER_LEVEL
   for (i = 0; i < FRAME_LF_COUNT; ++i)
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h
index ca92222d1..f1882ac17 100644
--- a/av1/common/entropymode.h
+++ b/av1/common/entropymode.h
@@ -304,7 +304,6 @@ typedef struct frame_contexts {
                                [CDF_SIZE(TX_TYPES)];
   aom_cdf_prob inter_ext_tx_cdf[EXT_TX_SETS_INTER][EXT_TX_SIZES]
                                [CDF_SIZE(TX_TYPES)];
-  aom_prob delta_q_prob[DELTA_Q_PROBS];
 #if CONFIG_EXT_DELTA_Q
 #if CONFIG_LOOPFILTER_LEVEL
   aom_prob delta_lf_multi_prob[FRAME_LF_COUNT][DELTA_LF_PROBS];
diff --git a/tools/aom_entropy_optimizer.c b/tools/aom_entropy_optimizer.c
index 3f73e5070..74ba07b9f 100644
--- a/tools/aom_entropy_optimizer.c
+++ b/tools/aom_entropy_optimizer.c
@@ -629,12 +629,6 @@ int main(int argc, const char **argv) {
       "static const aom_cdf_prob default_intrabc_cdf[CDF_SIZE(2)]");
 #endif
 
-  /* delta_q */
-  cts_each_dim[0] = DELTA_Q_PROBS;
-  cts_each_dim[1] = 2;
-  optimize_entropy_table(
-      &fc.delta_q[0][0], probsfile, 2, cts_each_dim, NULL, 1,
-      "static const aom_prob default_delta_q_probs[DELTA_Q_PROBS]");
 #if CONFIG_EXT_DELTA_Q
   cts_each_dim[0] = DELTA_LF_PROBS;
   cts_each_dim[1] = 2;
-- 
GitLab