commit 6c48b8c824cb4c61fb489d764094bf5a7e385eaf
author Yaowu Xu <yaowu@google.com> Thu Nov 17 15:53:54 2016 -0800
committer Yaowu Xu <yaowu@google.com> Fri Nov 18 01:10:58 2016 +0000
tree 73643cfceae2ebd0ee7c2611269a38ba6807d0f3
parent 52a17635d844f965b111679dcfaadf9d754d7d50

Add a define to fix compiling without daala-ec

BUG=aomedia:88

Change-Id: I216ae046bed89f1dc919fc9ebb5c191d491ba621

av1/encoder/subexp.c

diff --git a/av1/encoder/subexp.c b/av1/encoder/subexp.c
index ff213c5..916a947 100644
--- a/av1/encoder/subexp.c
+++ b/av1/encoder/subexp.c
@@ -200,12 +200,13 @@
                                     aom_prob *bestp, aom_prob upd, int n) {
   const int old_b = get_cost(ct, oldp, n);
   int bestsavings = 0;
+  const int upd_cost = av1_cost_one(upd) - av1_cost_zero(upd);
   aom_prob newp, bestnewp = oldp;
   const int step = *bestp > oldp ? -1 : 1;
 
   for (newp = *bestp; newp != oldp; newp += step) {
     const int new_b = get_cost(ct, newp, n);
-    const int update_b = prob_diff_update_cost(newp, oldp) + av1_cost_upd256;
+    const int update_b = prob_diff_update_cost(newp, oldp) + upd_cost;
     const int savings = old_b - new_b - update_b;
     if (savings > bestsavings) {
       bestsavings = savings;
@@ -224,6 +225,7 @@
   int newp;
   const int step_sign = *bestp > oldp[PIVOT_NODE] ? -1 : 1;
   const int step = stepsize * step_sign;
+  const int upd_cost = av1_cost_one(upd) - av1_cost_zero(upd);
   aom_prob bestnewp, newplist[ENTROPY_NODES], oldplist[ENTROPY_NODES];
   av1_model_to_full_probs(oldp, oldplist);
   memcpy(newplist, oldp, sizeof(aom_prob) * UNCONSTRAINED_NODES);
@@ -243,7 +245,7 @@
     for (i = UNCONSTRAINED_NODES, new_b = 0; i < ENTROPY_NODES; ++i)
       new_b += get_cost(ct[i], newplist[i], n);
     new_b += get_cost(ct[PIVOT_NODE], newplist[PIVOT_NODE], n);
-    update_b = prob_diff_update_cost(newp, oldp[PIVOT_NODE]) + av1_cost_upd256;
+    update_b = prob_diff_update_cost(newp, oldp[PIVOT_NODE]) + upd_cost;
     savings = old_b - new_b - update_b;
     if (savings > bestsavings) {
       bestsavings = savings;