commit a28c1734a9f10b9a9938f66cb03bb29afe4b31eb
author Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Wed Nov 29 10:54:37 2017 +0100
committer Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Wed Nov 29 21:52:57 2017 +0000
tree 184836b14b0128aa5fdce1dc74de0bfc6f187fe0
parent ca52fb5f369c825420b7f6483da602753bd6183c

Remove dead member: pred_probs

Change-Id: If64e376ceca387659f66185bab0928eaad156ffe

av1/common/entropymode.c

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index fe890b8..b13baf6 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -1196,9 +1196,6 @@
   128, 128, 128, 128, 128, 128, 128
 };
 // clang-format off
-static const aom_prob default_segment_pred_probs[PREDICTION_PROBS] = {
-  128, 128, 128
-};
 static const aom_cdf_prob
     default_segment_pred_cdf[PREDICTION_PROBS][CDF_SIZE(2)] = {
   { AOM_CDF2(128 * 128) },
@@ -2624,7 +2621,6 @@
   av1_copy(fc->wedge_interintra_cdf, default_wedge_interintra_cdf);
   av1_copy(fc->interintra_mode_cdf, default_interintra_mode_cdf);
   av1_copy(fc->seg.tree_probs, default_segment_tree_probs);
-  av1_copy(fc->seg.pred_probs, default_segment_pred_probs);
   av1_copy(fc->seg.pred_cdf, default_segment_pred_cdf);
 #if CONFIG_FILTER_INTRA
   av1_copy(fc->filter_intra_cdfs, default_filter_intra_cdfs);
@@ -2720,16 +2716,11 @@
 }
 
 void av1_adapt_intra_frame_probs(AV1_COMMON *cm) {
-  int i;
   FRAME_CONTEXT *fc = cm->fc;
   const FRAME_CONTEXT *pre_fc = cm->pre_fc;
   const FRAME_COUNTS *counts = &cm->counts;
 
   if (cm->seg.temporal_update) {
-    for (i = 0; i < PREDICTION_PROBS; i++)
-      fc->seg.pred_probs[i] = av1_mode_mv_merge_probs(pre_fc->seg.pred_probs[i],
-                                                      counts->seg.pred[i]);
-
     aom_tree_merge_probs(av1_segment_tree, pre_fc->seg.tree_probs,
                          counts->seg.tree_mispred, fc->seg.tree_probs);
   } else {

av1/common/pred_common.h

diff --git a/av1/common/pred_common.h b/av1/common/pred_common.h
index 7a7d990..5eaf1fa 100644
--- a/av1/common/pred_common.h
+++ b/av1/common/pred_common.h
@@ -81,11 +81,6 @@
   return above_sip + left_sip;
 }
 
-static INLINE aom_prob av1_get_pred_prob_seg_id(
-    const struct segmentation_probs *segp, const MACROBLOCKD *xd) {
-  return segp->pred_probs[av1_get_pred_context_seg_id(xd)];
-}
-
 #if CONFIG_JNT_COMP
 static INLINE int get_comp_index_context(const AV1_COMMON *cm,
                                          const MACROBLOCKD *xd) {

av1/common/seg_common.h

diff --git a/av1/common/seg_common.h b/av1/common/seg_common.h
index 6830dba..03276cb 100644
--- a/av1/common/seg_common.h
+++ b/av1/common/seg_common.h
@@ -75,7 +75,6 @@
 struct segmentation_probs {
   aom_prob tree_probs[SEG_TREE_PROBS];
   aom_cdf_prob tree_cdf[CDF_SIZE(MAX_SEGMENTS)];
-  aom_prob pred_probs[PREDICTION_PROBS];
   aom_cdf_prob pred_cdf[PREDICTION_PROBS][CDF_SIZE(2)];
 #if CONFIG_Q_SEGMENTATION
   aom_cdf_prob q_seg_cdf[Q_SEGMENT_CDF_COUNT][CDF_SIZE(MAX_SEGMENTS)];