From fe530085b7ba168bf16fa74d2d3bdfe842abb0d3 Mon Sep 17 00:00:00 2001
From: Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com>
Date: Thu, 23 Nov 2017 12:50:58 +0100
Subject: [PATCH] Remove dead member: intra_inter_prob

Change-Id: Id39e4231b5ba8e86b92f478185b61d1a5b9eeeeb
---
 av1/common/entropymode.c | 9 ---------
 av1/common/entropymode.h | 1 -
 2 files changed, 10 deletions(-)

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index c33da773d..a07850a1d 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -956,10 +956,6 @@ const aom_tree_index av1_compound_type_tree[TREE_SIZE(COMPOUND_TYPES)] = {
 };
 /* clang-format on */
 
-static const aom_prob default_intra_inter_p[INTRA_INTER_CONTEXTS] = {
-  6, 97, 151, 205,
-};
-
 static const aom_cdf_prob default_intra_inter_cdf[INTRA_INTER_CONTEXTS]
                                                  [CDF_SIZE(2)] = {
                                                    { AOM_CDF2(768) },
@@ -2978,7 +2974,6 @@ static const aom_cdf_prob default_angle_delta_cdf[DIRECTIONAL_MODES][CDF_SIZE(
 #endif  // CONFIG_EXT_INTRA_MOD
 
 static void init_mode_probs(FRAME_CONTEXT *fc) {
-  av1_copy(fc->intra_inter_prob, default_intra_inter_p);
   av1_copy(fc->comp_inter_prob, default_comp_inter_p);
   av1_copy(fc->palette_y_size_cdf, default_palette_y_size_cdf);
   av1_copy(fc->palette_uv_size_cdf, default_palette_uv_size_cdf);
@@ -3111,10 +3106,6 @@ void av1_adapt_inter_frame_probs(AV1_COMMON *cm) {
   const FRAME_CONTEXT *pre_fc = cm->pre_fc;
   const FRAME_COUNTS *counts = &cm->counts;
 
-  for (i = 0; i < INTRA_INTER_CONTEXTS; i++)
-    fc->intra_inter_prob[i] = av1_mode_mv_merge_probs(
-        pre_fc->intra_inter_prob[i], counts->intra_inter[i]);
-
   for (i = 0; i < COMP_INTER_CONTEXTS; i++)
     fc->comp_inter_prob[i] = av1_mode_mv_merge_probs(pre_fc->comp_inter_prob[i],
                                                      counts->comp_inter[i]);
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h
index 1b63db2f6..358be3a66 100644
--- a/av1/common/entropymode.h
+++ b/av1/common/entropymode.h
@@ -201,7 +201,6 @@ typedef struct frame_contexts {
   aom_cdf_prob motion_mode_cdf[BLOCK_SIZES_ALL][CDF_SIZE(MOTION_MODES)];
   aom_prob obmc_prob[BLOCK_SIZES_ALL];
   aom_cdf_prob obmc_cdf[BLOCK_SIZES_ALL][CDF_SIZE(2)];
-  aom_prob intra_inter_prob[INTRA_INTER_CONTEXTS];
   aom_prob comp_inter_prob[COMP_INTER_CONTEXTS];
   aom_cdf_prob palette_y_size_cdf[PALETTE_BLOCK_SIZES][CDF_SIZE(PALETTE_SIZES)];
   aom_cdf_prob palette_uv_size_cdf[PALETTE_BLOCK_SIZES]
-- 
GitLab