Commit fee49825 authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review
Browse files

Merge "Remove unused get_intra/inter_scan() from scan.h" into nextgenv2

parents 1a0faab6 653102ab
...@@ -67,20 +67,6 @@ static INLINE int get_coef_context(const int16_t *neighbors, ...@@ -67,20 +67,6 @@ static INLINE int get_coef_context(const int16_t *neighbors,
1; 1;
} }
static INLINE const SCAN_ORDER *get_intra_scan(TX_SIZE tx_size,
TX_TYPE tx_type) {
return &av1_intra_scan_orders[tx_size][tx_type];
}
#if CONFIG_EXT_TX
extern const SCAN_ORDER av1_inter_scan_orders[TX_SIZES_ALL][TX_TYPES];
static INLINE const SCAN_ORDER *get_inter_scan(TX_SIZE tx_size,
TX_TYPE tx_type) {
return &av1_inter_scan_orders[tx_size][tx_type];
}
#endif // CONFIG_EXT_TX
static INLINE const SCAN_ORDER *get_scan(const AV1_COMMON *cm, TX_SIZE tx_size, 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, int is_inter) {
#if CONFIG_ADAPT_SCAN #if CONFIG_ADAPT_SCAN
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment