commit 5d2ed97a332a324760264ffd612cd8591df1d23d
author Jingning Han <jingning@google.com> Mon Mar 06 12:19:54 2017 -0800
committer Jingning Han <jingning@google.com> Mon Mar 06 21:04:07 2017 +0000
tree e69f09bb15411e47873a46c9abc4876a004c27a5
parent 606f646edd0c0035afe046421269723d0dfeb468

Skip tx_size count in lossless mode

Resolve an enc/dec mismatch issue when segmentation is in use.

BUG=aomedia:131

Change-Id: Id93dfc1b0d99a1cccc8c8408f9fb0dfcf83f0a7c

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 915218d..a92d39e 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -5748,7 +5748,7 @@
 #else
     TX_SIZE tx_size = mbmi->tx_size;
 #endif
-    if (cm->tx_mode == TX_MODE_SELECT &&
+    if (cm->tx_mode == TX_MODE_SELECT && !xd->lossless[mbmi->segment_id] &&
 #if CONFIG_CB4X4 && (CONFIG_VAR_TX || CONFIG_RECT_TX)
 #if CONFIG_RECT_TX
         mbmi->sb_type > BLOCK_4X4 &&