ref: 9e3bcdd135da34000697dfc175aab6e3c5862a2a
parent: 83ee80c045728863834ec476df1ea84c4a0c93f2
parent: ac008f0030dfea82690007d9faaf7d82cd6556d8
author: Dmitry Kovalev <dkovalev@google.com>
date: Thu Aug 8 08:16:57 EDT 2013
Merge "Removing unneeded intermediate entropy_nodes_adapt var."
--- a/vp9/common/vp9_entropy.c
+++ b/vp9/common/vp9_entropy.c
@@ -622,7 +622,6 @@
int t, i, j, k, l;
unsigned int branch_ct[UNCONSTRAINED_NODES][2];
vp9_prob coef_probs[UNCONSTRAINED_NODES];
- int entropy_nodes_adapt = UNCONSTRAINED_NODES;
for (i = 0; i < BLOCK_TYPES; ++i)
for (j = 0; j < REF_TYPES; ++j)
@@ -635,7 +634,7 @@
0);
branch_ct[0][1] = eob_branch_count[i][j][k][l] - branch_ct[0][0];
coef_probs[0] = get_binary_prob(branch_ct[0][0], branch_ct[0][1]);
- for (t = 0; t < entropy_nodes_adapt; ++t)
+ for (t = 0; t < UNCONSTRAINED_NODES; ++t)
dst_coef_probs[i][j][k][l][t] = merge_probs(
pre_coef_probs[i][j][k][l][t], coef_probs[t],
branch_ct[t], count_sat, update_factor);
--
⑨