commit 682e67e9a4b88b748c946f49ce75f12e18e3b980
author Angie Chiang <angiebird@google.com> Fri Sep 22 14:44:47 2017 -0700
committer Angie Chiang <angiebird@google.com> Sun Sep 24 19:55:07 2017 +0000
tree e69abbcd94637933fbe88c56ec7aad57bddc7ddb
parent 692082602b6c45cf0e5d021dcde8dc3875b308b2

Fix coeff cost error incurred by to br_node

We calculate eob cost in the end of the outer for loop
However, The continue statement from br_node may lead to ignoring
eob cost

Change-Id: Ic80c88e034836eb4dc4ac8b87bf0b7b45bf5d097

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index b06c43d..489d3d2 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -460,21 +460,18 @@
       }
 
       if (level > NUM_BASE_LEVELS) {
-        int idx;
         int ctx;
         ctx = get_br_ctx(qcoeff, scan[c], bwl, height);
 #if BR_NODE
         int base_range = level - 1 - NUM_BASE_LEVELS;
         if (base_range < COEFF_BASE_RANGE) {
           cost += coeff_costs->lps_cost[ctx][base_range];
-          continue;
         } else {
           cost += coeff_costs->lps_cost[ctx][COEFF_BASE_RANGE];
         }
 
-        idx = COEFF_BASE_RANGE;
 #else
-        for (idx = 0; idx < COEFF_BASE_RANGE; ++idx) {
+        for (int idx = 0; idx < COEFF_BASE_RANGE; ++idx) {
           if (level == (idx + 1 + NUM_BASE_LEVELS)) {
             cost += coeff_costs->lps_cost[ctx][1];
             break;
@@ -482,7 +479,7 @@
           cost += coeff_costs->lps_cost[ctx][0];
         }
 #endif
-        if (idx >= COEFF_BASE_RANGE) {
+        if (level >= 1 + NUM_BASE_LEVELS + COEFF_BASE_RANGE) {
           // residual cost
           int r = level - COEFF_BASE_RANGE - NUM_BASE_LEVELS;
           int ri = r;