shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Removing redundant call of vp9_init_mbmode_probs()."

--- a/vp9/common/vp9_entropymode.c

+++ b/vp9/common/vp9_entropymode.c

@@ -329,6 +329,7 @@

   vp9_copy(cm->fc.single_ref_prob, default_single_ref_p);

   cm->fc.tx_probs = default_tx_probs;

   vp9_copy(cm->fc.mbskip_probs, default_mbskip_probs);

+  vp9_copy(cm->fc.inter_mode_probs, default_inter_mode_probs);

 }

 const vp9_tree_index vp9_switchable_interp_tree

@@ -466,7 +467,6 @@

   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) {

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -1949,10 +1949,6 @@

   xd->mode_info_stride = cm->mode_info_stride;

-  // reset intra mode contexts

-  if (frame_is_intra_only(cm))

-    vp9_init_mbmode_probs(cm);

-

   // Copy data over into macro block data structures.

   vp9_setup_src_planes(x, cpi->Source, 0, 0);

-- 

⑨