From: Peter de Rivaz <peter.derivaz@argondesign.com>
Date: Tue, 5 Jan 2016 15:35:43 +0000 (+0000)
Subject: Change to rd costing for CONFIG_VAR_TX
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f943131df660585c8fb4073ab34292ff303cb86;p=libvpx

Change to rd costing for CONFIG_VAR_TX

In select_tx_block I believe the rd cost was ignoring the bits
needed to encode the split bit.

Change-Id: Iacbf705b880db9a68967a994406ba90ecf693ab8
---

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index 661186846..bd7be7f38 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -2364,7 +2364,7 @@ static void select_tx_block(const VP10_COMP *cpi, MACROBLOCK *x,
       sum_dist += this_dist;
       sum_bsse += this_bsse;
       all_skip &= this_skip;
-      tmp_rd += RDCOST(x->rdmult, x->rddiv, this_rate, this_dist);
+      tmp_rd = RDCOST(x->rdmult, x->rddiv, sum_rate, sum_dist);
       if (this_rd < tmp_rd)
         break;
     }