commit db4c9ba32c82a9bdd8cabd6632d6555f29f801e1
author Jingning Han <jingning@google.com> Wed Nov 30 10:00:25 2016 -0800
committer Jingning Han <jingning@google.com> Wed Nov 30 18:51:02 2016 +0000
tree 95bbe11ed8607069469bb6dceb5d803add0c98bc
parent 4629661c89e77872d43b05727ad60b34480d28c9

Turn off trellis optimization in the lossless mode

The trellis optimization would incur information loss. It needs to
be disabled in the lossless mode.

Change-Id: I3e73f2f466631b61729cadc38a2ed74656f73529

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 195f3d3..7863514 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1230,7 +1230,7 @@
                     coeff_ctx, AV1_XFORM_QUANT_FP);
 #endif  // CONFIG_NEW_QUANT
 #if !CONFIG_PVQ
-    if (x->plane[plane].eobs[block])
+    if (x->plane[plane].eobs[block] && !xd->lossless[mbmi->segment_id])
       av1_optimize_b(cm, x, plane, block, tx_size, coeff_ctx);
 #endif
     dist_block(args->cpi, x, plane, block, blk_row, blk_col, tx_size,