Clean-up more effectless code
Change-Id: I52edbf7c57bd8bf042046d970c8e9db6f84b6b7f
diff --git a/av1/common/reconinter.h b/av1/common/reconinter.h
index dbeb1d5..e607ab6 100644
--- a/av1/common/reconinter.h
+++ b/av1/common/reconinter.h
@@ -246,7 +246,6 @@
}
static INLINE int is_interintra_wedge_used(BLOCK_SIZE sb_type) {
- (void)sb_type;
return wedge_params_lookup[sb_type].bits > 0;
}
@@ -391,7 +390,6 @@
}
static INLINE int av1_is_interp_needed(const MACROBLOCKD *const xd) {
- (void)xd;
const MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
#if CONFIG_EXT_SKIP
if (mbmi->skip_mode) return 0;
diff --git a/av1/common/scan.h b/av1/common/scan.h
index eaf8350..c5cebc1 100644
--- a/av1/common/scan.h
+++ b/av1/common/scan.h
@@ -47,18 +47,12 @@
}
static INLINE const SCAN_ORDER *get_default_scan(TX_SIZE tx_size,
- TX_TYPE tx_type,
- int is_inter) {
- (void)is_inter;
+ TX_TYPE tx_type) {
return &av1_scan_orders[tx_size][tx_type];
}
-static INLINE const SCAN_ORDER *get_scan(const AV1_COMMON *cm, TX_SIZE tx_size,
- TX_TYPE tx_type,
- const MB_MODE_INFO *mbmi) {
- const int is_inter = is_inter_block(mbmi);
- (void)cm;
- return get_default_scan(tx_size, tx_type, is_inter);
+static INLINE const SCAN_ORDER *get_scan(TX_SIZE tx_size, TX_TYPE tx_type) {
+ return get_default_scan(tx_size, tx_type);
}
#ifdef __cplusplus
diff --git a/av1/decoder/decodetxb.c b/av1/decoder/decodetxb.c
index 19f9a7b..acc2145 100644
--- a/av1/decoder/decodetxb.c
+++ b/av1/decoder/decodetxb.c
@@ -165,7 +165,7 @@
IS_2D_TRANSFORM(tx_type)
? pd->seg_iqmatrix[mbmi->segment_id][qm_tx_size]
: cm->giqmatrix[NUM_QM_LEVELS - 1][0][qm_tx_size];
- const SCAN_ORDER *const scan_order = get_scan(cm, tx_size, tx_type, mbmi);
+ const SCAN_ORDER *const scan_order = get_scan(tx_size, tx_type);
const int16_t *const scan = scan_order->scan;
int dummy;
const int max_eob_pt = get_eob_pos_token(seg_eob, &dummy);
diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index fed2d2b..983215d 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -139,7 +139,7 @@
TX_TYPE tx_type = av1_get_tx_type(plane_type, xd, blk_row, blk_col, tx_size,
cm->reduced_tx_set_used);
- const SCAN_ORDER *const scan_order = get_scan(cm, tx_size, tx_type, mbmi);
+ const SCAN_ORDER *const scan_order = get_scan(tx_size, tx_type);
tran_low_t *const coeff = BLOCK_OFFSET(p->coeff, block);
tran_low_t *const qcoeff = BLOCK_OFFSET(p->qcoeff, block);
diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index 885dea8..bae39d0 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -396,12 +396,11 @@
aom_writer *w, int blk_row, int blk_col, int plane,
TX_SIZE tx_size, const tran_low_t *tcoeff,
uint16_t eob, TXB_CTX *txb_ctx) {
- MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
const PLANE_TYPE plane_type = get_plane_type(plane);
const TX_SIZE txs_ctx = get_txsize_entropy_ctx(tx_size);
const TX_TYPE tx_type = av1_get_tx_type(plane_type, xd, blk_row, blk_col,
tx_size, cm->reduced_tx_set_used);
- const SCAN_ORDER *const scan_order = get_scan(cm, tx_size, tx_type, mbmi);
+ const SCAN_ORDER *const scan_order = get_scan(tx_size, tx_type);
const int16_t *const scan = scan_order->scan;
const int seg_eob = av1_get_max_eob(tx_size);
int c;
@@ -637,7 +636,7 @@
const int bwl = get_txb_bwl(tx_size);
const int width = get_txb_wide(tx_size);
const int height = get_txb_high(tx_size);
- const SCAN_ORDER *const scan_order = get_scan(cm, tx_size, tx_type, mbmi);
+ const SCAN_ORDER *const scan_order = get_scan(tx_size, tx_type);
const int16_t *const scan = scan_order->scan;
uint8_t levels_buf[TX_PAD_2D];
uint8_t *const levels = set_levels(levels_buf, width);
@@ -2054,7 +2053,7 @@
const int width = get_txb_wide(tx_size);
const int height = get_txb_high(tx_size);
const int is_inter = is_inter_block(mbmi);
- const SCAN_ORDER *const scan_order = get_scan(cm, tx_size, tx_type, mbmi);
+ const SCAN_ORDER *const scan_order = get_scan(tx_size, tx_type);
const LV_MAP_COEFF_COST txb_costs = x->coeff_costs[txs_ctx][plane_type];
const int eob_multi_size = txsize_log2_minus4[tx_size];
const LV_MAP_EOB_COST txb_eob_costs =
@@ -2127,7 +2126,6 @@
ThreadData *const td = args->td;
MACROBLOCK *const x = &td->mb;
MACROBLOCKD *const xd = &x->e_mbd;
- MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
struct macroblock_plane *p = &x->plane[plane];
struct macroblockd_plane *pd = &xd->plane[plane];
const uint16_t eob = p->eobs[block];
@@ -2135,7 +2133,7 @@
const PLANE_TYPE plane_type = pd->plane_type;
const TX_TYPE tx_type = av1_get_tx_type(plane_type, xd, blk_row, blk_col,
tx_size, cm->reduced_tx_set_used);
- const SCAN_ORDER *const scan_order = get_scan(cm, tx_size, tx_type, mbmi);
+ const SCAN_ORDER *const scan_order = get_scan(tx_size, tx_type);
(void)plane_bsize;
int cul_level = av1_get_txb_entropy_context(qcoeff, scan_order, eob);
@@ -2161,7 +2159,7 @@
const int segment_id = mbmi->segment_id;
const TX_TYPE tx_type = av1_get_tx_type(plane_type, xd, blk_row, blk_col,
tx_size, cm->reduced_tx_set_used);
- const SCAN_ORDER *const scan_order = get_scan(cm, tx_size, tx_type, mbmi);
+ const SCAN_ORDER *const scan_order = get_scan(tx_size, tx_type);
const int16_t *const scan = scan_order->scan;
const int seg_eob = av1_get_tx_eob(&cpi->common.seg, segment_id, tx_size);
int c;
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 3fdec1b..8074aad 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1936,7 +1936,7 @@
continue;
}
- const SCAN_ORDER *scan_order = get_scan(cm, tx_size, tx_type, mbmi);
+ const SCAN_ORDER *scan_order = get_scan(tx_size, tx_type);
RD_STATS this_rd_stats;
av1_invalid_rd_stats(&this_rd_stats);
if (cpi->sf.optimize_coefficients != FULL_TRELLIS_OPT) {
@@ -2055,7 +2055,7 @@
const PLANE_TYPE plane_type = get_plane_type(plane);
const TX_TYPE tx_type = av1_get_tx_type(plane_type, xd, blk_row, blk_col,
tx_size, cm->reduced_tx_set_used);
- const SCAN_ORDER *scan_order = get_scan(cm, tx_size, tx_type, mbmi);
+ const SCAN_ORDER *scan_order = get_scan(tx_size, tx_type);
int rate_cost = 0;
// full forward transform and quantization
@@ -3756,8 +3756,7 @@
PLANE_TYPE plane_type = get_plane_type(plane);
TX_TYPE tx_type = av1_get_tx_type(plane_type, xd, blk_row, blk_col, tx_size,
cm->reduced_tx_set_used);
- const SCAN_ORDER *const scan_order =
- get_scan(cm, tx_size, tx_type, &xd->mi[0]->mbmi);
+ const SCAN_ORDER *const scan_order = get_scan(tx_size, tx_type);
BLOCK_SIZE txm_bsize = txsize_to_bsize[tx_size];
int bh = block_size_high[txm_bsize];
int bw = block_size_wide[txm_bsize];
diff --git a/av1/encoder/tokenize.c b/av1/encoder/tokenize.c
index 1258bf4..a6ad325 100644
--- a/av1/encoder/tokenize.c
+++ b/av1/encoder/tokenize.c
@@ -234,13 +234,12 @@
ThreadData *const td = args->td;
MACROBLOCK *const x = &td->mb;
MACROBLOCKD *const xd = &x->e_mbd;
- MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
struct macroblock_plane *p = &x->plane[plane];
struct macroblockd_plane *pd = &xd->plane[plane];
const PLANE_TYPE type = pd->plane_type;
const TX_TYPE tx_type = av1_get_tx_type(type, xd, blk_row, blk_col, tx_size,
cm->reduced_tx_set_used);
- const SCAN_ORDER *const scan_order = get_scan(cm, tx_size, tx_type, mbmi);
+ const SCAN_ORDER *const scan_order = get_scan(tx_size, tx_type);
const int rate = av1_cost_coeffs(
cpi, x, plane, blk_row, blk_col, block, tx_size, scan_order,
pd->above_context + blk_col, pd->left_context + blk_row, 0);
@@ -396,7 +395,7 @@
const int16_t *scan, *nb;
const TX_TYPE tx_type = av1_get_tx_type(type, xd, blk_row, blk_col, tx_size,
cm->reduced_tx_set_used);
- const SCAN_ORDER *const scan_order = get_scan(cm, tx_size, tx_type, mbmi);
+ const SCAN_ORDER *const scan_order = get_scan(tx_size, tx_type);
const int ref = is_inter_block(mbmi);
FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
aom_cdf_prob(
diff --git a/test/scan_test.cc b/test/scan_test.cc
index 213fa47..f54b3c5 100644
--- a/test/scan_test.cc
+++ b/test/scan_test.cc
@@ -124,9 +124,8 @@
assert(tx_class == TX_CLASS_HORIZ);
scan_mode = SCAN_MODE_COL_1D;
}
- int is_inter = 0;
const SCAN_ORDER *scan_order =
- get_default_scan((TX_SIZE)tx_size, (TX_TYPE)tx_type, is_inter);
+ get_default_scan((TX_SIZE)tx_size, (TX_TYPE)tx_type);
ASSERT_EQ(scan_order_test(scan_order, cols, rows, scan_mode), 0)
<< "scan mismatch tx_class " << tx_class << " tx_type " << tx_type
<< " tx_w " << org_cols << " tx_h " << org_rows << " scan_mode "
