Merge "Periodically update mode and mv costs"

4b3e44f9 · Jingning Han · Gerrit Code Review · 8e3ef6c0 · 836252bf · 4b3e44f9
Commit 4b3e44f9 authored Feb 22, 2014 by Jingning Han Committed by Gerrit Code Review Feb 22, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

vp9/encoder/vp9_rdopt.c vp9/encoder/vp9_rdopt.c +4 -2

No files found.
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -295,13 +295,15 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi) {

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