commit 63647c02cd471edd0c3846585cf791def9b6a918
author Angie Chiang <angiebird@google.com> Mon Oct 09 15:16:46 2017 -0700
committer Angie Chiang <angiebird@google.com> Tue Oct 10 17:15:50 2017 +0000
tree 49313e35ca3314b48c5c5e0aafab8f058edf4e2a
parent 4408aad9431197bcd463229515c848766a6ccc34

Turn off limit_nb_scan_distance() temporarily

Change-Id: Idb1a4bf4dd655bde22862d76f6fa70457381a770

av1/common/scan.c

diff --git a/av1/common/scan.c b/av1/common/scan.c
index 6ea119e..3c8f3d7 100644
--- a/av1/common/scan.c
+++ b/av1/common/scan.c
@@ -8312,6 +8312,7 @@
   neighbors[tx2d_size * MAX_NEIGHBORS + 1] = scan[0];
 }
 
+#if USE_LIMIT_SCAN_DISTANCE
 typedef struct SCAN_NB_QUEUE {
   int nb_ci_queue[COEFF_IDX_SIZE + 1];
   int pr_si_queue[COEFF_IDX_SIZE + 1];
@@ -8376,6 +8377,7 @@
   }
   assert(new_si == tx2d_size);
 }
+#endif  // USE_LIMIT_SCAN_DISTANCE
 
 #if USE_TOPOLOGICAL_SORT
 void av1_update_sort_order(TX_SIZE tx_size, TX_TYPE tx_type,
@@ -8488,7 +8490,9 @@
 #else
   av1_update_scan_order(tx_size, tx_type, non_zero_prob, scan, iscan);
 #endif
+#if USE_LIMIT_SCAN_DISTANCE
   limit_nb_scan_distance(tx_size, scan, iscan);
+#endif  // USE_LIMIT_SCAN_DISTANCE
   av1_update_neighbors(tx_size, scan, iscan, nb);
 }
 

av1/common/scan.h

diff --git a/av1/common/scan.h b/av1/common/scan.h
index 8bd4ca9..4c8dd50 100644
--- a/av1/common/scan.h
+++ b/av1/common/scan.h
@@ -32,6 +32,7 @@
 #if CONFIG_ADAPT_SCAN
 #define USE_2X2_PROB 1
 #define USE_TOPOLOGICAL_SORT 0
+#define USE_LIMIT_SCAN_DISTANCE 0
 void av1_update_scan_count_facade(AV1_COMMON *cm, FRAME_COUNTS *counts,
                                   TX_SIZE tx_size, TX_TYPE tx_type,
                                   const tran_low_t *dqcoeffs, int max_scan);