commit 84a6f201f5b1fcdf84c41729e6b867d1fd733b64
author Ryan <ryan.z.lei@intel.com> Mon Sep 25 12:37:33 2017 -0700
committer Ryan Lei <ryan.z.lei@intel.com> Wed Sep 27 15:59:20 2017 +0000
tree 52b7c03b9dc13dc7c10cd3dbf2d9da6bd3dde7ad
parent ea3dd3aa948353926941335c90b754608e4e8018

this change fix the bug reported in issue 819

inside the encode_super_block function, the tx_size decision logic is
different in the dry_run==0 and dry_run==1 case when segment is
lossless. this change fix the inconsistence.

BUG=aomedia:819

Change-Id: I2f4c5434d8c4ef722ac885a1ffd2d253863ae6d9

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index e2524b8..5b725a2 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -6328,15 +6328,21 @@
 #else
       mbmi->sb_type >= BLOCK_8X8 &&
 #endif
-      is_inter && !(mbmi->skip || seg_skip)) {
+      is_inter && !(mbmi->skip || seg_skip) &&
+      !xd->lossless[mbmi->segment_id]) {
     if (dry_run) tx_partition_set_contexts(cm, xd, bsize, mi_row, mi_col);
   } else {
     TX_SIZE tx_size = mbmi->tx_size;
     // The new intra coding scheme requires no change of transform size
-    if (is_inter)
-      tx_size = tx_size_from_tx_mode(bsize, cm->tx_mode, is_inter);
-    else
+    if (is_inter) {
+      if (xd->lossless[mbmi->segment_id]) {
+        tx_size = TX_4X4;
+      } else {
+        tx_size = tx_size_from_tx_mode(bsize, cm->tx_mode, is_inter);
+      }
+    } else {
       tx_size = (bsize > BLOCK_4X4) ? tx_size : TX_4X4;
+    }
     mbmi->tx_size = tx_size;
     set_txfm_ctxs(tx_size, xd->n8_w, xd->n8_h, (mbmi->skip || seg_skip), xd);
   }