shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Periodically update mode and mv costs"

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -295,13 +295,15 @@

   set_block_thresholds(cpi);

-  fill_token_costs(x->token_costs, cm->fc.coef_probs);

-

   if (!cpi->sf.use_pick_mode) {

+    fill_token_costs(x->token_costs, cm->fc.coef_probs);

+

     for (i = 0; i < PARTITION_CONTEXTS; i++)

       vp9_cost_tokens(x->partition_cost[i], get_partition_probs(cm, i),

                       vp9_partition_tree);

+  }

+  if (!cpi->sf.use_pick_mode || (cm->current_video_frame & 0x07) == 1) {

     fill_mode_costs(cpi);

     if (!frame_is_intra_only(cm)) {