commit 4b1c561da146a6e031d993b613c6b567d585aa2f
author Hui Su <huisu@google.com> Mon Mar 19 20:04:57 2018 -0700
committer Yaowu Xu <yaowu@google.com> Tue Mar 20 04:36:11 2018 +0000
tree 909f1bac3f05950d9baf1308c101eda42ebdc95d
parent 45738ed7409352e38c996eadef2fe6de398c69b5

Properly decide whether to enable optimize_b

BUG=aomedia:1610

Change-Id: I38f7d39cb8658ee110ac8380394219c6cc3b8e45

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 51403f8..de25a21 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1984,7 +1984,7 @@
     const SCAN_ORDER *scan_order = get_scan(tx_size, tx_type);
     RD_STATS this_rd_stats;
     av1_invalid_rd_stats(&this_rd_stats);
-    if (cpi->sf.optimize_coefficients != FULL_TRELLIS_OPT) {
+    if (!cpi->optimize_seg_arr[mbmi->segment_id]) {
       av1_xform_quant(
           cm, x, plane, block, blk_row, blk_col, plane_bsize, tx_size,
           USE_B_QUANT_NO_TRELLIS ? AV1_XFORM_QUANT_B : AV1_XFORM_QUANT_FP);