commit 4450fa4cd92202755efb7b9120285cfd72a1272f
author Dmitry Kovalev <dkovalev@google.com> Wed Jul 24 17:02:35 2013 -0700
committer Dmitry Kovalev <dkovalev@google.com> Wed Jul 24 17:03:03 2013 -0700
tree 5593c74b9169fb78c0bbb6f20099943973b1aaba
parent fcc34796d2376575ecb34d0d381a84b03bc6ad81

Inlining vp9_init_mode_contexts function.

Change-Id: I21ee76bcae101cc9f6ef1d867622e50b7ae565fc

vp9/common/vp9_entropymode.c

diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c
index 9b9c359..ca188e4 100644
--- a/vp9/common/vp9_entropymode.c
+++ b/vp9/common/vp9_entropymode.c
@@ -356,11 +356,6 @@
                               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 @@
   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) {

vp9/common/vp9_entropymode.h

diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h
index 68b996a..8c14e7e 100644
--- a/vp9/common/vp9_entropymode.h
+++ b/vp9/common/vp9_entropymode.h
@@ -67,8 +67,6 @@
 
 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 *);