ref: f4c29ae9ea16c502c980a81ca9683327d5051929
parent: ee83243daab6ce2643f5aa08b763090fec74d87d
parent: 7a4e0b22650ef57c7787903f55f01634ce9bc434
author: Jingning Han <jingning@google.com>
date: Thu Feb 12 04:14:49 EST 2015
Merge "Update partition rate cost in rtc speed 5"
--- a/vp9/encoder/vp9_rd.c
+++ b/vp9/encoder/vp9_rd.c
@@ -279,9 +279,11 @@
set_block_thresholds(cm, rd);
- if (!cpi->sf.use_nonrd_pick_mode || cm->frame_type == KEY_FRAME) {
+ if (!cpi->sf.use_nonrd_pick_mode || cm->frame_type == KEY_FRAME)
fill_token_costs(x->token_costs, cm->fc->coef_probs);
+ if (cpi->sf.partition_search_type != VAR_BASED_PARTITION ||
+ cm->frame_type == KEY_FRAME) {
for (i = 0; i < PARTITION_CONTEXTS; ++i)
vp9_cost_tokens(cpi->partition_cost[i], get_partition_probs(cm, i),
vp9_partition_tree);