Inlining vp9_init_mode_contexts function.

Change-Id: I21ee76bcae101cc9f6ef1d867622e50b7ae565fc

diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c
index 9b9c359a26ec7e6a0c1331b0b7a7d4f0a2908a65..ca188e4382f8c5533c931202c71e6d3e04ed0dd5 100644 (file)
--- a/vp9/common/vp9_entropymode.c
+++ b/vp9/common/vp9_entropymode.c
@@ -356,11 +356,6 @@ void vp9_entropy_mode_init() {
                               vp9_inter_mode_tree, NEARESTMV);
 }
 
-void vp9_init_mode_contexts(VP9_COMMON *pc) {
-  vp9_zero(pc->counts.inter_mode);
-  vp9_copy(pc->fc.inter_mode_probs, default_inter_mode_probs);
-}
-
 void vp9_accum_mv_refs(VP9_COMMON *pc,
                        MB_PREDICTION_MODE m,
                        const int context) {
@@ -527,15 +522,13 @@ void vp9_setup_past_independence(VP9_COMMON *cm, MACROBLOCKD *xd) {
   vp9_zero(xd->lf.last_mode_deltas);
   set_default_lf_deltas(xd);
 
-  vp9_default_coef_probs(cm);
-  vp9_init_mbmode_probs(cm);
-
-  vp9_init_mv_probs(cm);
-
   // To force update of the sharpness
   xd->lf.last_sharpness_level = -1;
 
-  vp9_init_mode_contexts(cm);
+  vp9_default_coef_probs(cm);
+  vp9_init_mbmode_probs(cm);
+  vp9_init_mv_probs(cm);
+  vp9_copy(cm->fc.inter_mode_probs, default_inter_mode_probs);
 
   if (cm->frame_type == KEY_FRAME ||
       cm->error_resilient_mode || cm->reset_frame_context == 3) {

diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h
index 68b996a4e6e72eb85a0e23140b38188bc47c7c7d..8c14e7e171ee78eece886047a2e4efead964d479 100644 (file)
--- a/vp9/common/vp9_entropymode.h
+++ b/vp9/common/vp9_entropymode.h
@@ -67,8 +67,6 @@ void vp9_setup_past_independence(struct VP9Common *cm, MACROBLOCKD *xd);
 
 void vp9_init_mbmode_probs(struct VP9Common *x);
 
-void vp9_init_mode_contexts(struct VP9Common *pc);
-
 void vp9_adapt_mode_context(struct VP9Common *pc);
 
 void vp9_adapt_mode_probs(struct VP9Common *);