Commit a5bcf030 authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review
Browse files

Merge "Use precise rate estimate for zero_token" into nextgenv2

parents 899a989d 019b7508
......@@ -312,13 +312,14 @@ int vp10_optimize_b(MACROBLOCK *mb, int plane, int block,
*/
t0 = tokens[next][0].token;
t1 = tokens[next][1].token;
pt = get_coef_context(nb, token_cache, i + 1);
/* Update the cost of each path if we're past the EOB token. */
if (t0 != EOB_TOKEN) {
tokens[next][0].rate += (*token_costs)[1][0][t0];
tokens[next][0].rate += (*token_costs)[1][pt][t0];
tokens[next][0].token = ZERO_TOKEN;
}
if (t1 != EOB_TOKEN) {
tokens[next][1].rate += (*token_costs)[1][0][t1];
tokens[next][1].rate += (*token_costs)[1][pt][t1];
tokens[next][1].token = ZERO_TOKEN;
}
best_index[i][0] = best_index[i][1] = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment