Merge adaptive scan control panel

Change-Id: Ifb295cbcde5474d33c4eca008d89c9dda68d327e

Merge adaptive scan control panel
Change-Id: Ifb295cbcde5474d33c4eca008d89c9dda68d327e
e4a0b3c7 · Jingning Han · 2eba400e · e4a0b3c7 · e4a0b3c7
Commit e4a0b3c7 authored Nov 22, 2017 by Jingning Han
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

aom_dsp/prob.h aom_dsp/prob.h +0 -4

av1/common/scan.h av1/common/scan.h +1 -0

No files found.
--- a/aom_dsp/prob.h
+++ b/aom_dsp/prob.h
@@ -110,10 +110,6 @@ typedef uint16_t aom_cdf_prob;

 #define BR_NODE 1

-#if CONFIG_ADAPT_SCAN
-#define CACHE_SCAN_PROB 1
-#endif
-
 #define aom_prob_half ((aom_prob)128)

 typedef int8_t aom_tree_index;

--- a/av1/common/scan.h
+++ b/av1/common/scan.h
@@ -31,6 +31,7 @@ extern const SCAN_ORDER av1_inter_scan_orders[TX_SIZES_ALL][TX_TYPES];

 #if CONFIG_ADAPT_SCAN
 #define USE_2X2_PROB 1
+#define CACHE_SCAN_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,