commit bd99b38c7fced7901a278d7d8d719c1cf23cff95
author Angie Chiang <angiebird@google.com> Tue Jun 20 15:11:16 2017 -0700
committer Yi Luo <luoyi@google.com> Sat Jun 24 00:38:20 2017 +0000
tree fc7e026f96171d5e3421929c1fc99507762e5e6e
parent a3d70911c37b3f988dc79f6fd6ada26c08d0c4e6

Pass mbmi into get_scan()

This is to facilitate future experiment related to adapt_scan

Change-Id: I51628f3df81bd82db7f8f553d13da0ee5792d7d9

av1/common/scan.h

diff --git a/av1/common/scan.h b/av1/common/scan.h
index ecef113..3db6623 100644
--- a/av1/common/scan.h
+++ b/av1/common/scan.h
@@ -78,12 +78,14 @@
 }
 
 static INLINE const SCAN_ORDER *get_scan(const AV1_COMMON *cm, TX_SIZE tx_size,
-                                         TX_TYPE tx_type, int is_inter) {
+                                         TX_TYPE tx_type,
+                                         const MB_MODE_INFO *mbmi) {
 #if CONFIG_ADAPT_SCAN
-  (void)is_inter;
+  (void)mbmi;
   return &cm->fc->sc[tx_size][tx_type];
 #else   // CONFIG_ADAPT_SCAN
   (void)cm;
+  const int is_inter = is_inter_block(mbmi);
   return get_default_scan(tx_size, tx_type, is_inter);
 #endif  // CONFIG_ADAPT_SCAN
 }