Disable adapt_scan when large_scale_tile = 1

In EXT_TILE experiment, disabled adapt_scan when large_scale_tile = 1.

Change-Id: If3b20d5fe3a6674aefba3e37b2458137ca7918ff

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 305bb32..335dcb5 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -3271,7 +3271,12 @@
   cm->reduced_tx_set_used = aom_rb_read_bit(rb);
 
 #if CONFIG_ADAPT_SCAN
-  cm->use_adapt_scan = aom_rb_read_bit(rb);
+#if CONFIG_EXT_TILE
+  if (cm->large_scale_tile)
+    cm->use_adapt_scan = 0;
+  else
+#endif  // CONFIG_EXT_TILE
+    cm->use_adapt_scan = aom_rb_read_bit(rb);
   // TODO(angiebird): call av1_init_scan_order only when use_adapt_scan
   // switches from 1 to 0
   if (cm->use_adapt_scan == 0) av1_init_scan_order(cm);

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index d8d8e7b..94c6ca4 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -4095,7 +4095,12 @@
   aom_wb_write_bit(wb, cm->reduced_tx_set_used);
 
 #if CONFIG_ADAPT_SCAN
-  aom_wb_write_bit(wb, cm->use_adapt_scan);
+#if CONFIG_EXT_TILE
+  if (cm->large_scale_tile)
+    assert(cm->use_adapt_scan == 0);
+  else
+#endif  // CONFIG_EXT_TILE
+    aom_wb_write_bit(wb, cm->use_adapt_scan);
 #endif
 
   if (!frame_is_intra_only(cm)) write_global_motion(cpi, wb);

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 0a653f4..505480a 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4268,7 +4268,12 @@
   // rather than the potential full set of 16 transforms
   cm->reduced_tx_set_used = 0;
 #if CONFIG_ADAPT_SCAN
-  cm->use_adapt_scan = 1;
+#if CONFIG_EXT_TILE
+  if (cm->large_scale_tile)
+    cm->use_adapt_scan = 0;
+  else
+#endif  // CONFIG_EXT_TILE
+    cm->use_adapt_scan = 1;
   // TODO(angiebird): call av1_init_scan_order only when use_adapt_scan
   // switches from 1 to 0
   if (cm->use_adapt_scan == 0) av1_init_scan_order(cm);