Remove unused parameters and effectless code
Change-Id: Id0d0b4ffde80f01fdaae26cffd0e7fc2bfc963d6
diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index 751a816..955f1c9 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -319,7 +319,7 @@
mi_pos.row = row_offset;
mi_pos.col = col_offset;
- if (is_inside(tile, mi_col, mi_row, cm->mi_rows, cm, &mi_pos)) {
+ if (is_inside(tile, mi_col, mi_row, cm->mi_rows, &mi_pos)) {
const MODE_INFO *const candidate_mi =
xd->mi[mi_pos.row * xd->mi_stride + mi_pos.col];
const MB_MODE_INFO *const candidate = &candidate_mi->mbmi;
@@ -413,7 +413,7 @@
mi_pos.row = (mi_row & 0x01) ? blk_row : blk_row + 1;
mi_pos.col = (mi_col & 0x01) ? blk_col : blk_col + 1;
- if (!is_inside(&xd->tile, mi_col, mi_row, cm->mi_rows, cm, &mi_pos))
+ if (!is_inside(&xd->tile, mi_col, mi_row, cm->mi_rows, &mi_pos))
return coll_blk_count;
const TPL_MV_REF *prev_frame_mvs =
@@ -574,7 +574,7 @@
max_row_offset = -(2 << 1) + row_adj;
max_row_offset =
- find_valid_row_offset(tile, mi_row, cm->mi_rows, cm, max_row_offset);
+ find_valid_row_offset(tile, mi_row, cm->mi_rows, max_row_offset);
}
if (xd->left_available) {
@@ -1480,7 +1480,7 @@
has_top_right(cm, xd, mi_row, mi_col, AOMMAX(xd->n8_w, xd->n8_h))) {
POSITION trb_pos = { -1, xd->n8_w };
- if (is_inside(tile, mi_col, mi_row, cm->mi_rows, cm, &trb_pos)) {
+ if (is_inside(tile, mi_col, mi_row, cm->mi_rows, &trb_pos)) {
int mi_row_offset = -1;
int mi_col_offset = xd->n8_w;
diff --git a/av1/common/mvref_common.h b/av1/common/mvref_common.h
index 96ea161..9333c72 100644
--- a/av1/common/mvref_common.h
+++ b/av1/common/mvref_common.h
@@ -105,10 +105,8 @@
// Checks that the given mi_row, mi_col and search point
// are inside the borders of the tile.
static INLINE int is_inside(const TileInfo *const tile, int mi_col, int mi_row,
- int mi_rows, const AV1_COMMON *cm,
- const POSITION *mi_pos) {
+ int mi_rows, const POSITION *mi_pos) {
const int dependent_horz_tile_flag = 0;
- (void)cm;
if (dependent_horz_tile_flag && !tile->tg_horz_boundary) {
return !(mi_row + mi_pos->row < 0 ||
mi_col + mi_pos->col < tile->mi_col_start ||
@@ -123,10 +121,8 @@
}
static INLINE int find_valid_row_offset(const TileInfo *const tile, int mi_row,
- int mi_rows, const AV1_COMMON *cm,
- int row_offset) {
+ int mi_rows, int row_offset) {
const int dependent_horz_tile_flag = 0;
- (void)cm;
if (dependent_horz_tile_flag && !tile->tg_horz_boundary)
return clamp(row_offset, -mi_row, mi_rows - mi_row - 1);
else
diff --git a/av1/common/pred_common.c b/av1/common/pred_common.c
index 9a20c95..35d0ac3 100644
--- a/av1/common/pred_common.c
+++ b/av1/common/pred_common.c
@@ -148,16 +148,13 @@
#define CHECK_GOLDEN_OR_LAST3(ref_frame) \
(((ref_frame) == GOLDEN_FRAME) || ((ref_frame) == LAST3_FRAME))
-int av1_get_reference_mode_context(const AV1_COMMON *cm,
- const MACROBLOCKD *xd) {
+int av1_get_reference_mode_context(const MACROBLOCKD *xd) {
int ctx;
const MB_MODE_INFO *const above_mbmi = xd->above_mbmi;
const MB_MODE_INFO *const left_mbmi = xd->left_mbmi;
const int has_above = xd->up_available;
const int has_left = xd->left_available;
- (void)cm;
-
// Note:
// The mode info data structure has a one element border above and to the
// left of the entries corresponding to real macroblocks.
diff --git a/av1/common/pred_common.h b/av1/common/pred_common.h
index 4316bd2..c06571b 100644
--- a/av1/common/pred_common.h
+++ b/av1/common/pred_common.h
@@ -203,11 +203,10 @@
int av1_get_intra_inter_context(const MACROBLOCKD *xd);
-int av1_get_reference_mode_context(const AV1_COMMON *cm, const MACROBLOCKD *xd);
+int av1_get_reference_mode_context(const MACROBLOCKD *xd);
-static INLINE aom_cdf_prob *av1_get_reference_mode_cdf(const AV1_COMMON *cm,
- const MACROBLOCKD *xd) {
- return xd->tile_ctx->comp_inter_cdf[av1_get_reference_mode_context(cm, xd)];
+static INLINE aom_cdf_prob *av1_get_reference_mode_cdf(const MACROBLOCKD *xd) {
+ return xd->tile_ctx->comp_inter_cdf[av1_get_reference_mode_context(xd)];
}
int av1_get_comp_reference_type_context(const MACROBLOCKD *xd);
diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index 921b91b..5510ad5 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -904,8 +904,6 @@
is_global[ref] = is_global_mv_block(mi, wm->wmtype);
}
- (void)cm;
-
const BLOCK_SIZE bsize = mi->mbmi.sb_type;
const int ss_x = pd->subsampling_x;
const int ss_y = pd->subsampling_y;
diff --git a/av1/common/restoration.c b/av1/common/restoration.c
index 97fe80c..8b650e1 100644
--- a/av1/common/restoration.c
+++ b/av1/common/restoration.c
@@ -1407,7 +1407,6 @@
uint8_t *bdry_start = bdry_buf + (RESTORATION_EXTRA_HORZ << use_highbd);
const int bdry_stride = boundaries->stripe_boundary_stride << use_highbd;
uint8_t *bdry_rows = bdry_start + RESTORATION_CTX_VERT * stripe * bdry_stride;
- (void)cm;
// There is a rare case in which a processing stripe can end 1px above the
// crop border. In this case, we do want to use deblocked pixels from below
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 3ace49f..690a060 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -933,7 +933,7 @@
aom_reader *r) {
if (!is_comp_ref_allowed(xd->mi[0]->mbmi.sb_type)) return SINGLE_REFERENCE;
if (cm->reference_mode == REFERENCE_MODE_SELECT) {
- const int ctx = av1_get_reference_mode_context(cm, xd);
+ const int ctx = av1_get_reference_mode_context(xd);
const REFERENCE_MODE mode = (REFERENCE_MODE)aom_read_symbol(
r, xd->tile_ctx->comp_inter_cdf[ctx], 2, ACCT_STR);
return mode; // SINGLE_REFERENCE or COMPOUND_REFERENCE
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index a7f3356..5c1a94a 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -132,22 +132,19 @@
}
}
-static void write_inter_compound_mode(AV1_COMMON *cm, MACROBLOCKD *xd,
- aom_writer *w, PREDICTION_MODE mode,
+static void write_inter_compound_mode(MACROBLOCKD *xd, aom_writer *w,
+ PREDICTION_MODE mode,
const int16_t mode_ctx) {
assert(is_inter_compound_mode(mode));
- (void)cm;
aom_write_symbol(w, INTER_COMPOUND_OFFSET(mode),
xd->tile_ctx->inter_compound_mode_cdf[mode_ctx],
INTER_COMPOUND_MODES);
}
-static void write_tx_size_vartx(const AV1_COMMON *cm, MACROBLOCKD *xd,
- const MB_MODE_INFO *mbmi, TX_SIZE tx_size,
- int depth, int blk_row, int blk_col,
- aom_writer *w) {
+static void write_tx_size_vartx(MACROBLOCKD *xd, const MB_MODE_INFO *mbmi,
+ TX_SIZE tx_size, int depth, int blk_row,
+ int blk_col, aom_writer *w) {
FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
- (void)cm;
const int max_blocks_high = max_block_high(xd, mbmi->sb_type, 0);
const int max_blocks_wide = max_block_wide(xd, mbmi->sb_type, 0);
@@ -190,18 +187,15 @@
for (int col = 0; col < tx_size_wide_unit[tx_size]; col += bsw) {
int offsetr = blk_row + row;
int offsetc = blk_col + col;
- write_tx_size_vartx(cm, xd, mbmi, sub_txs, depth + 1, offsetr, offsetc,
- w);
+ write_tx_size_vartx(xd, mbmi, sub_txs, depth + 1, offsetr, offsetc, w);
}
}
}
-static void write_selected_tx_size(const AV1_COMMON *cm, const MACROBLOCKD *xd,
- aom_writer *w) {
+static void write_selected_tx_size(const MACROBLOCKD *xd, aom_writer *w) {
const MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
const BLOCK_SIZE bsize = mbmi->sb_type;
FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
- (void)cm;
if (block_signals_txsize(bsize)) {
const TX_SIZE tx_size = mbmi->tx_size;
const int tx_size_ctx = get_tx_size_context(xd);
@@ -287,14 +281,13 @@
}
}
-static void write_delta_qindex(const AV1_COMMON *cm, const MACROBLOCKD *xd,
- int delta_qindex, aom_writer *w) {
+static void write_delta_qindex(const MACROBLOCKD *xd, int delta_qindex,
+ aom_writer *w) {
int sign = delta_qindex < 0;
int abs = sign ? -delta_qindex : delta_qindex;
int rem_bits, thr;
int smallval = abs < DELTA_Q_SMALL ? 1 : 0;
FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
- (void)cm;
aom_write_symbol(w, AOMMIN(abs, DELTA_Q_SMALL), ec_ctx->delta_q_cdf,
DELTA_Q_PROBS + 1);
@@ -318,7 +311,6 @@
int rem_bits, thr;
int smallval = abs < DELTA_LF_SMALL ? 1 : 0;
FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
- (void)cm;
if (cm->delta_lf_multi) {
assert(lf_id >= 0 && lf_id < (av1_num_planes(cm) > 1 ? FRAME_LF_COUNT
@@ -524,7 +516,7 @@
// (if not specified at the frame/segment level)
if (cm->reference_mode == REFERENCE_MODE_SELECT) {
if (is_comp_ref_allowed(mbmi->sb_type))
- aom_write_symbol(w, is_compound, av1_get_reference_mode_cdf(cm, xd), 2);
+ aom_write_symbol(w, is_compound, av1_get_reference_mode_cdf(xd), 2);
} else {
assert((!is_compound) == (cm->reference_mode == SINGLE_REFERENCE));
}
@@ -1020,7 +1012,7 @@
assert(mbmi->current_q_index > 0);
int reduced_delta_qindex =
(mbmi->current_q_index - xd->prev_qindex) / cm->delta_q_res;
- write_delta_qindex(cm, xd, reduced_delta_qindex, w);
+ write_delta_qindex(xd, reduced_delta_qindex, w);
xd->prev_qindex = mbmi->current_q_index;
#if CONFIG_EXT_DELTA_Q
if (cm->delta_lf_present_flag) {
@@ -1089,7 +1081,7 @@
// If segment skip is not enabled code the mode.
if (!segfeature_active(seg, segment_id, SEG_LVL_SKIP)) {
if (is_inter_compound_mode(mode))
- write_inter_compound_mode(cm, xd, w, mode, mode_ctx);
+ write_inter_compound_mode(xd, w, mode, mode_ctx);
else if (is_inter_singleref_mode(mode))
write_inter_mode(w, mode, ec_ctx, mode_ctx);
@@ -1207,10 +1199,9 @@
}
}
-static void write_intrabc_info(AV1_COMMON *cm, MACROBLOCKD *xd,
+static void write_intrabc_info(MACROBLOCKD *xd,
const MB_MODE_INFO_EXT *mbmi_ext,
aom_writer *w) {
- (void)cm;
const MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
int use_intrabc = is_intrabc_block(mbmi);
FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
@@ -1264,7 +1255,7 @@
assert(mbmi->current_q_index > 0);
int reduced_delta_qindex =
(mbmi->current_q_index - xd->prev_qindex) / cm->delta_q_res;
- write_delta_qindex(cm, xd, reduced_delta_qindex, w);
+ write_delta_qindex(xd, reduced_delta_qindex, w);
xd->prev_qindex = mbmi->current_q_index;
#if CONFIG_EXT_DELTA_Q
if (cm->delta_lf_present_flag) {
@@ -1291,7 +1282,7 @@
}
if (av1_allow_intrabc(cm)) {
- write_intrabc_info(cm, xd, mbmi_ext, w);
+ write_intrabc_info(xd, mbmi_ext, w);
if (is_intrabc_block(mbmi)) return;
}
@@ -1614,9 +1605,9 @@
int idx, idy;
for (idy = 0; idy < height; idy += txbh)
for (idx = 0; idx < width; idx += txbw)
- write_tx_size_vartx(cm, xd, mbmi, max_tx_size, 0, idy, idx, w);
+ write_tx_size_vartx(xd, mbmi, max_tx_size, 0, idy, idx, w);
} else {
- write_selected_tx_size(cm, xd, w);
+ write_selected_tx_size(xd, w);
set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, 0, xd);
}
} else {
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 7640e3d..4b1e80c 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -308,11 +308,8 @@
}
}
-static void reset_intmv_filter_type(const AV1_COMMON *const cm, MACROBLOCKD *xd,
- MB_MODE_INFO *mbmi) {
+static void reset_intmv_filter_type(MB_MODE_INFO *mbmi) {
InterpFilter filters[2];
- (void)cm;
- (void)xd;
for (int dir = 0; dir < 2; ++dir) {
filters[dir] = av1_extract_interp_filter(mbmi->interp_filters, dir);
@@ -437,7 +434,7 @@
*mi_addr = *mi;
*x->mbmi_ext = ctx->mbmi_ext;
- reset_intmv_filter_type(cm, xd, mbmi);
+ reset_intmv_filter_type(mbmi);
rf_type = av1_ref_frame_type(mbmi->ref_frame);
if (x->mbmi_ext->ref_mv_count[rf_type] > 1) {
@@ -1032,12 +1029,12 @@
rdc->compound_ref_used_flag = 1;
if (is_comp_ref_allowed(bsize)) {
#if CONFIG_ENTROPY_STATS
- counts->comp_inter[av1_get_reference_mode_context(cm, xd)]
+ counts->comp_inter[av1_get_reference_mode_context(xd)]
[has_second_ref(mbmi)]++;
#endif // CONFIG_ENTROPY_STATS
if (allow_update_cdf) {
- update_cdf(av1_get_reference_mode_cdf(cm, xd),
- has_second_ref(mbmi), 2);
+ update_cdf(av1_get_reference_mode_cdf(xd), has_second_ref(mbmi),
+ 2);
}
}
}
@@ -4393,7 +4390,6 @@
}
static void make_consistent_compound_tools(AV1_COMMON *cm) {
- (void)cm;
if (frame_is_intra_only(cm)) cm->allow_interintra_compound = 0;
if (frame_is_intra_only(cm) || cm->reference_mode == SINGLE_REFERENCE)
cm->allow_masked_compound = 0;
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 6edd1cf..4301ca7 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -850,7 +850,6 @@
static void set_tile_info(AV1_COMP *cpi) {
AV1_COMMON *const cm = &cpi->common;
- (void)cm;
if (cpi->oxcf.large_scale_tile) {
if (cpi->oxcf.superblock_size != AOM_SUPERBLOCK_SIZE_64X64) {
cm->tile_width = clamp(cpi->oxcf.tile_columns, 1, 32);
@@ -887,7 +886,6 @@
}
} else {
set_tile_info_max_tile(cpi);
- (void)cm;
}
}
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 9ca7e11..eff3f09 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -8049,10 +8049,6 @@
int64_t dist_y = 0, dist_uv = 0;
TX_SIZE max_uv_tx_size;
- (void)cm;
- (void)mi_row;
- (void)mi_col;
-
ctx->skip = 0;
mbmi->ref_frame[0] = INTRA_FRAME;
mbmi->ref_frame[1] = NONE_FRAME;
@@ -8395,8 +8391,7 @@
int midx, best_mode_index = -1;
unsigned int ref_costs_single[TOTAL_REFS_PER_FRAME];
unsigned int ref_costs_comp[TOTAL_REFS_PER_FRAME][TOTAL_REFS_PER_FRAME];
- int *comp_inter_cost =
- x->comp_inter_cost[av1_get_reference_mode_context(cm, xd)];
+ int *comp_inter_cost = x->comp_inter_cost[av1_get_reference_mode_context(xd)];
int64_t best_intra_rd = INT64_MAX;
unsigned int best_pred_sse = UINT_MAX;
PREDICTION_MODE best_intra_mode = DC_PRED;
@@ -9923,8 +9918,7 @@
int64_t best_pred_diff[REFERENCE_MODES];
unsigned int ref_costs_single[TOTAL_REFS_PER_FRAME];
unsigned int ref_costs_comp[TOTAL_REFS_PER_FRAME][TOTAL_REFS_PER_FRAME];
- int *comp_inter_cost =
- x->comp_inter_cost[av1_get_reference_mode_context(cm, xd)];
+ int *comp_inter_cost = x->comp_inter_cost[av1_get_reference_mode_context(xd)];
InterpFilter best_filter = SWITCHABLE;
int64_t this_rd = INT64_MAX;
int rate2 = 0;
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 21cbff7..7b9dac6 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -382,7 +382,6 @@
const AV1EncoderConfig *const oxcf = &cpi->oxcf;
int i;
- (void)cm;
// best quality defaults
sf->frame_parameter_update = 1;
sf->mv.search_method = NSTEP;
