rtc: Clean-up unused variable tile_data in nonrd_pickmode.c
Removed unused variable TileDataEnc *tile_data in
nonrd_pickmode.c
Change-Id: I971192cf81f294b9ce8a8bf9b2f6e286b1745797
diff --git a/av1/encoder/nonrd_opt.h b/av1/encoder/nonrd_opt.h
index 0d0db81..01c3b8e 100644
--- a/av1/encoder/nonrd_opt.h
+++ b/av1/encoder/nonrd_opt.h
@@ -59,9 +59,6 @@
* \param[in] ref_frame Reference frame for which to find
* ref MVs
* \param[in] frame_mv Predicted MVs for a block
- * \param[in] tile_data Pointer to struct holding adaptive
- * data/contexts/models for the tile
- * during encoding
* \param[in] yv12_mb Buffer to hold predicted block
* \param[in] bsize Current block size
* \param[in] force_skip_low_temp_var Flag indicating possible mode search
@@ -71,18 +68,19 @@
* \remark Nothing is returned. Instead, predicted MVs are placed into
* \c frame_mv array
*/
-static INLINE void find_predictors(
- AV1_COMP *cpi, MACROBLOCK *x, MV_REFERENCE_FRAME ref_frame,
- int_mv frame_mv[MB_MODE_COUNT][REF_FRAMES], TileDataEnc *tile_data,
- struct buf_2d yv12_mb[8][MAX_MB_PLANE], BLOCK_SIZE bsize,
- int force_skip_low_temp_var, int skip_pred_mv) {
+static INLINE void find_predictors(AV1_COMP *cpi, MACROBLOCK *x,
+ MV_REFERENCE_FRAME ref_frame,
+ int_mv frame_mv[MB_MODE_COUNT][REF_FRAMES],
+ struct buf_2d yv12_mb[8][MAX_MB_PLANE],
+ BLOCK_SIZE bsize,
+ int force_skip_low_temp_var,
+ int skip_pred_mv) {
AV1_COMMON *const cm = &cpi->common;
MACROBLOCKD *const xd = &x->e_mbd;
MB_MODE_INFO *const mbmi = xd->mi[0];
MB_MODE_INFO_EXT *const mbmi_ext = &x->mbmi_ext;
const YV12_BUFFER_CONFIG *yv12 = get_ref_frame_yv12_buf(cm, ref_frame);
const int num_planes = av1_num_planes(cm);
- (void)tile_data;
x->pred_mv_sad[ref_frame] = INT_MAX;
x->pred_mv0_sad[ref_frame] = INT_MAX;
diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c
index 2fb4a28..2ae1124 100644
--- a/av1/encoder/nonrd_pickmode.c
+++ b/av1/encoder/nonrd_pickmode.c
@@ -3480,9 +3480,9 @@
// Function to setup parameters used for inter mode evaluation in non-rd.
static AOM_FORCE_INLINE void set_params_nonrd_pick_inter_mode(
AV1_COMP *cpi, MACROBLOCK *x, InterModeSearchStateNonrd *search_state,
- TileDataEnc *tile_data, PICK_MODE_CONTEXT *ctx, RD_STATS *rd_cost,
- int *force_skip_low_temp_var, int *skip_pred_mv, int mi_row, int mi_col,
- int gf_temporal_ref, unsigned char segment_id, BLOCK_SIZE bsize
+ PICK_MODE_CONTEXT *ctx, RD_STATS *rd_cost, int *force_skip_low_temp_var,
+ int *skip_pred_mv, int mi_row, int mi_col, int gf_temporal_ref,
+ unsigned char segment_id, BLOCK_SIZE bsize
#if CONFIG_AV1_TEMPORAL_DENOISING
,
int denoise_svc_pickmode
@@ -3541,7 +3541,7 @@
// Populate predicated motion vectors for LAST_FRAME
if (cpi->ref_frame_flags & AOM_LAST_FLAG)
- find_predictors(cpi, x, LAST_FRAME, search_state->frame_mv, tile_data,
+ find_predictors(cpi, x, LAST_FRAME, search_state->frame_mv,
search_state->yv12_mb, bsize, *force_skip_low_temp_var,
x->force_zeromv_skip_for_blk);
@@ -3560,7 +3560,7 @@
for (MV_REFERENCE_FRAME ref_frame_iter = LAST_FRAME + 1;
ref_frame_iter <= ALTREF_FRAME; ++ref_frame_iter) {
if (search_state->use_ref_frame_mask[ref_frame_iter]) {
- find_predictors(cpi, x, ref_frame_iter, search_state->frame_mv, tile_data,
+ find_predictors(cpi, x, ref_frame_iter, search_state->frame_mv,
search_state->yv12_mb, bsize, *force_skip_low_temp_var,
*skip_pred_mv);
}
@@ -4312,6 +4312,7 @@
InterModeSearchStateNonrd search_state;
av1_zero(search_state.use_ref_frame_mask);
BEST_PICKMODE *const best_pickmode = &search_state.best_pickmode;
+ (void)tile_data;
const int bh = block_size_high[bsize];
const int bw = block_size_wide[bsize];
@@ -4366,7 +4367,7 @@
// Setup parameters used for inter mode evaluation.
set_params_nonrd_pick_inter_mode(
- cpi, x, &search_state, tile_data, ctx, rd_cost, &force_skip_low_temp_var,
+ cpi, x, &search_state, ctx, rd_cost, &force_skip_low_temp_var,
&skip_pred_mv, mi_row, mi_col, gf_temporal_ref, segment_id, bsize
#if CONFIG_AV1_TEMPORAL_DENOISING
,
diff --git a/av1/encoder/partition_search.c b/av1/encoder/partition_search.c
index 89d517b..a41cc0c 100644
--- a/av1/encoder/partition_search.c
+++ b/av1/encoder/partition_search.c
@@ -2761,7 +2761,7 @@
x->color_sensitivity[COLOR_SENS_IDX(AOM_PLANE_U)] != 2 &&
x->color_sensitivity[COLOR_SENS_IDX(AOM_PLANE_V)] != 2);
- find_predictors(cpi, x, ref_frame, frame_mv, tile_data, yv12_mb, bsize,
+ find_predictors(cpi, x, ref_frame, frame_mv, yv12_mb, bsize,
force_skip_low_temp_var, skip_pred_mv);
int continue_merging = 1;
@@ -2777,8 +2777,8 @@
// calling find_predictors() again.
av1_set_offsets_without_segment_id(cpi, &tile_data->tile_info, x, mi_row,
mi_col, this_mi[0]->bsize);
- find_predictors(cpi, x, ref_frame, frame_mv, tile_data, yv12_mb,
- this_mi[0]->bsize, force_skip_low_temp_var, skip_pred_mv);
+ find_predictors(cpi, x, ref_frame, frame_mv, yv12_mb, this_mi[0]->bsize,
+ force_skip_low_temp_var, skip_pred_mv);
} else {
struct scale_factors *sf = get_ref_scale_factors(cm, ref_frame);
const int is_scaled = av1_is_scaled(sf);
