Remove effectless code Change-Id: Id5ccbc80fc9f84632dd22e0b17f0766374fe76fd
diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c index ed68c34..f1f72f5 100644 --- a/av1/encoder/ratectrl.c +++ b/av1/encoder/ratectrl.c
@@ -87,7 +87,6 @@ // How many times less pixels there are to encode given the current scaling. // Temporary replacement for rcf_mult and rate_thresh_mult. static double resize_rate_factor(const AV1_COMP *cpi, int width, int height) { - (void)cpi; return (double)(cpi->oxcf.width * cpi->oxcf.height) / (width * height); }
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c index c70deae..4762ecd 100644 --- a/av1/encoder/rdopt.c +++ b/av1/encoder/rdopt.c
@@ -4300,8 +4300,8 @@ } // Used to set proper context for early termination with skip = 1. -static void set_skip_flag(const AV1_COMP *cpi, MACROBLOCK *x, - RD_STATS *rd_stats, int bsize, int64_t dist) { +static void set_skip_flag(MACROBLOCK *x, RD_STATS *rd_stats, int bsize, + int64_t dist) { MACROBLOCKD *const xd = &x->e_mbd; MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi; const int n4 = bsize_to_num_blk(bsize); @@ -4312,8 +4312,6 @@ memset(x->blk_skip[0], 1, sizeof(uint8_t) * n4); rd_stats->skip = 1; - (void)cpi; - // Rate. const int tx_size_ctx = get_txsize_entropy_ctx(tx_size); ENTROPY_CONTEXT ctxa[2 * MAX_MIB_SIZE]; @@ -4381,7 +4379,7 @@ int64_t dist; if (is_inter && cpi->sf.tx_type_search.use_skip_flag_prediction && predict_skip_flag(x, bsize, &dist, cm->reduced_tx_set_used)) { - set_skip_flag(cpi, x, rd_stats, bsize, dist); + set_skip_flag(x, rd_stats, bsize, dist); // Save the RD search results into tx_rd_record. if (within_border) save_tx_rd_info(n4, hash, x, rd_stats, mb_rd_record); return; @@ -5112,16 +5110,11 @@ static int check_best_zero_mv( const AV1_COMP *const cpi, const MACROBLOCK *const x, const int16_t mode_context[TOTAL_REFS_PER_FRAME], - const int16_t compound_mode_context[TOTAL_REFS_PER_FRAME], int_mv frame_mv[MB_MODE_COUNT][TOTAL_REFS_PER_FRAME], int this_mode, const MV_REFERENCE_FRAME ref_frames[2], const BLOCK_SIZE bsize, int mi_row, int mi_col) { int_mv zeromv[2] = { { .as_int = 0 } }; int comp_pred_mode = ref_frames[1] > INTRA_FRAME; - (void)mi_row; - (void)mi_col; - (void)cpi; - (void)compound_mode_context; if (this_mode == GLOBALMV || this_mode == GLOBAL_GLOBALMV) { for (int cur_frm = 0; cur_frm < 1 + comp_pred_mode; cur_frm++) { zeromv[cur_frm].as_int = @@ -8164,7 +8157,6 @@ int plane_block_width, plane_block_height, rows, cols; av1_get_block_dimensions(bsize, 1, xd, &plane_block_width, &plane_block_height, &rows, &cols); - (void)cpi; for (r = 0; r < rows; ++r) { for (c = 0; c < cols; ++c) { @@ -8787,8 +8779,7 @@ (!comp_pred || cm->global_motion[second_ref_frame].wmtype == IDENTITY)) { const MV_REFERENCE_FRAME ref_frames[2] = { ref_frame, second_ref_frame }; - if (!check_best_zero_mv(cpi, x, mbmi_ext->mode_context, - mbmi_ext->compound_mode_context, frame_mv, + if (!check_best_zero_mv(cpi, x, mbmi_ext->mode_context, frame_mv, this_mode, ref_frames, bsize, mi_row, mi_col)) continue; }