Add some const qualifiers for BUFFER_SET variables Change-Id: I1cb389f6bb0e241db6186b9362d9ceed6a8612eb
diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c index ebc2c47..c2b6db5 100644 --- a/av1/common/reconinter.c +++ b/av1/common/reconinter.c
@@ -1142,8 +1142,8 @@ void av1_build_intra_predictors_for_interintra(const AV1_COMMON *cm, MACROBLOCKD *xd, BLOCK_SIZE bsize, int plane, - BUFFER_SET *ctx, uint8_t *dst, - int dst_stride) { + const BUFFER_SET *ctx, + uint8_t *dst, int dst_stride) { struct macroblockd_plane *const pd = &xd->plane[plane]; const int ssx = xd->plane[plane].subsampling_x; const int ssy = xd->plane[plane].subsampling_y; @@ -1185,7 +1185,7 @@ // build interintra_predictors for one plane void av1_build_interintra_predictors_sbp(const AV1_COMMON *cm, MACROBLOCKD *xd, uint8_t *pred, int stride, - BUFFER_SET *ctx, int plane, + const BUFFER_SET *ctx, int plane, BLOCK_SIZE bsize) { if (is_cur_buf_hbd(xd)) { DECLARE_ALIGNED(16, uint16_t, intrapredictor[MAX_SB_SQUARE]); @@ -1206,7 +1206,8 @@ void av1_build_interintra_predictors_sbuv(const AV1_COMMON *cm, MACROBLOCKD *xd, uint8_t *upred, uint8_t *vpred, int ustride, int vstride, - BUFFER_SET *ctx, BLOCK_SIZE bsize) { + const BUFFER_SET *ctx, + BLOCK_SIZE bsize) { av1_build_interintra_predictors_sbp(cm, xd, upred, ustride, ctx, 1, bsize); av1_build_interintra_predictors_sbp(cm, xd, vpred, vstride, ctx, 2, bsize); }
diff --git a/av1/common/reconinter.h b/av1/common/reconinter.h index b97f72c..fe06df6 100644 --- a/av1/common/reconinter.h +++ b/av1/common/reconinter.h
@@ -335,17 +335,18 @@ // build interintra_predictors for one plane void av1_build_interintra_predictors_sbp(const AV1_COMMON *cm, MACROBLOCKD *xd, uint8_t *pred, int stride, - BUFFER_SET *ctx, int plane, + const BUFFER_SET *ctx, int plane, BLOCK_SIZE bsize); void av1_build_interintra_predictors_sbuv(const AV1_COMMON *cm, MACROBLOCKD *xd, uint8_t *upred, uint8_t *vpred, int ustride, int vstride, - BUFFER_SET *ctx, BLOCK_SIZE bsize); + const BUFFER_SET *ctx, + BLOCK_SIZE bsize); void av1_build_intra_predictors_for_interintra( const AV1_COMMON *cm, MACROBLOCKD *xd, BLOCK_SIZE bsize, int plane, - BUFFER_SET *ctx, uint8_t *intra_pred, int intra_stride); + const BUFFER_SET *ctx, uint8_t *intra_pred, int intra_stride); void av1_combine_interintra(MACROBLOCKD *xd, BLOCK_SIZE bsize, int plane, const uint8_t *inter_pred, int inter_stride,
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c index f01b890..2c91f4a 100644 --- a/av1/decoder/decodeframe.c +++ b/av1/decoder/decodeframe.c
@@ -856,7 +856,7 @@ static void dec_build_inter_predictors_sby(const AV1_COMMON *cm, MACROBLOCKD *xd, int mi_row, - int mi_col, BUFFER_SET *ctx, + int mi_col, const BUFFER_SET *ctx, BLOCK_SIZE bsize) { dec_build_inter_predictors_for_planes(cm, xd, bsize, mi_row, mi_col, 0, 0); @@ -871,7 +871,7 @@ static void dec_build_inter_predictors_sbuv(const AV1_COMMON *cm, MACROBLOCKD *xd, int mi_row, - int mi_col, BUFFER_SET *ctx, + int mi_col, const BUFFER_SET *ctx, BLOCK_SIZE bsize) { dec_build_inter_predictors_for_planes(cm, xd, bsize, mi_row, mi_col, 1, MAX_MB_PLANE - 1);
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c index eba1827..e53bd01 100644 --- a/av1/encoder/rdopt.c +++ b/av1/encoder/rdopt.c
@@ -7171,10 +7171,9 @@ x->pred_mv[ref] = x->best_mv.as_mv; } -static INLINE void restore_dst_buf(MACROBLOCKD *xd, BUFFER_SET dst, +static INLINE void restore_dst_buf(MACROBLOCKD *xd, const BUFFER_SET dst, const int num_planes) { - int i; - for (i = 0; i < num_planes; i++) { + for (int i = 0; i < num_planes; i++) { xd->plane[i].dst.buf = dst.plane[i]; xd->plane[i].dst.stride = dst.stride[i]; } @@ -7811,7 +7810,7 @@ static int64_t build_and_cost_compound_type( const AV1_COMP *const cpi, MACROBLOCK *x, const int_mv *const cur_mv, const BLOCK_SIZE bsize, const PREDICTION_MODE this_mode, int *rs2, - int rate_mv, BUFFER_SET *ctx, int *out_rate_mv, uint8_t **preds0, + int rate_mv, const BUFFER_SET *ctx, int *out_rate_mv, uint8_t **preds0, uint8_t **preds1, int16_t *residual1, int16_t *diff10, int *strides, int mi_row, int mi_col, int mode_rate, int64_t ref_best_rd, int *calc_pred_masked_compound, int32_t *comp_rate, int64_t *comp_dist) { @@ -8099,10 +8098,11 @@ static INLINE int64_t interpolation_filter_rd( MACROBLOCK *const x, const AV1_COMP *const cpi, const TileDataEnc *tile_data, BLOCK_SIZE bsize, int mi_row, int mi_col, - BUFFER_SET *const orig_dst, int64_t *const rd, int *const switchable_rate, - int *const skip_txfm_sb, int64_t *const skip_sse_sb, - const BUFFER_SET *dst_bufs[2], int filter_idx, const int switchable_ctx[2], - const int skip_pred, int *rate, int64_t *dist) { + const BUFFER_SET *const orig_dst, int64_t *const rd, + int *const switchable_rate, int *const skip_txfm_sb, + int64_t *const skip_sse_sb, const BUFFER_SET *dst_bufs[2], int filter_idx, + const int switchable_ctx[2], const int skip_pred, int *rate, + int64_t *dist) { const AV1_COMMON *cm = &cpi->common; const int num_planes = av1_num_planes(cm); MACROBLOCKD *const xd = &x->e_mbd; @@ -8217,12 +8217,12 @@ static INLINE void pred_dual_interp_filter_rd( MACROBLOCK *const x, const AV1_COMP *const cpi, const TileDataEnc *tile_data, BLOCK_SIZE bsize, int mi_row, int mi_col, - BUFFER_SET *const orig_dst, int64_t *const rd, int *const switchable_rate, - int *const skip_txfm_sb, int64_t *const skip_sse_sb, - const BUFFER_SET *dst_bufs[2], InterpFilters filter_idx, - const int switchable_ctx[2], const int skip_pred, int *rate, int64_t *dist, - InterpFilters af_horiz, InterpFilters af_vert, InterpFilters lf_horiz, - InterpFilters lf_vert) { + const BUFFER_SET *const orig_dst, int64_t *const rd, + int *const switchable_rate, int *const skip_txfm_sb, + int64_t *const skip_sse_sb, const BUFFER_SET *dst_bufs[2], + InterpFilters filter_idx, const int switchable_ctx[2], const int skip_pred, + int *rate, int64_t *dist, InterpFilters af_horiz, InterpFilters af_vert, + InterpFilters lf_horiz, InterpFilters lf_vert) { if ((af_horiz == lf_horiz) && (af_horiz != SWITCHABLE)) { if (((af_vert == lf_vert) && (af_vert != SWITCHABLE))) { filter_idx = af_horiz + (af_vert * SWITCHABLE_FILTERS); @@ -8260,11 +8260,11 @@ static INLINE void find_best_non_dual_interp_filter( MACROBLOCK *const x, const AV1_COMP *const cpi, const TileDataEnc *tile_data, BLOCK_SIZE bsize, int mi_row, int mi_col, - BUFFER_SET *const orig_dst, int64_t *const rd, int *const switchable_rate, - int *const skip_txfm_sb, int64_t *const skip_sse_sb, - const BUFFER_SET *dst_bufs[2], const int switchable_ctx[2], - const int skip_ver, const int skip_hor, int *rate, int64_t *dist, - int filter_set_size) { + const BUFFER_SET *const orig_dst, int64_t *const rd, + int *const switchable_rate, int *const skip_txfm_sb, + int64_t *const skip_sse_sb, const BUFFER_SET *dst_bufs[2], + const int switchable_ctx[2], const int skip_ver, const int skip_hor, + int *rate, int64_t *dist, int filter_set_size) { int16_t i; // Regular filter evaluation should have been done and hence the same should @@ -8457,7 +8457,7 @@ static int64_t interpolation_filter_search( MACROBLOCK *const x, const AV1_COMP *const cpi, const TileDataEnc *tile_data, BLOCK_SIZE bsize, int mi_row, int mi_col, - const BUFFER_SET *const tmp_dst, BUFFER_SET *const orig_dst, + const BUFFER_SET *const tmp_dst, const BUFFER_SET *const orig_dst, InterpFilter (*const single_filter)[REF_FRAMES], int64_t *const rd, int *const switchable_rate, int *const skip_txfm_sb, int64_t *const skip_sse_sb, const int skip_build_pred, @@ -8851,7 +8851,7 @@ int mi_row, int mi_col, MB_MODE_INFO *mbmi, HandleInterModeArgs *args, int64_t ref_best_rd, int *rate_mv, - int *tmp_rate2, BUFFER_SET *orig_dst) { + int *tmp_rate2, const BUFFER_SET *orig_dst) { const AV1_COMMON *const cm = &cpi->common; const int num_planes = av1_num_planes(cm); MACROBLOCKD *xd = &x->e_mbd; @@ -9075,7 +9075,7 @@ BLOCK_SIZE bsize, RD_STATS *rd_stats, RD_STATS *rd_stats_y, RD_STATS *rd_stats_uv, int *disable_skip, int mi_row, int mi_col, HandleInterModeArgs *const args, int64_t ref_best_rd, const int *refs, - int *rate_mv, BUFFER_SET *orig_dst + int *rate_mv, const BUFFER_SET *orig_dst #if CONFIG_COLLECT_INTER_MODE_RD_STATS , int64_t *best_est_rd, int do_tx_search, InterModesInfo *inter_modes_info @@ -9442,7 +9442,7 @@ static int64_t skip_mode_rd(RD_STATS *rd_stats, const AV1_COMP *const cpi, MACROBLOCK *const x, BLOCK_SIZE bsize, int mi_row, - int mi_col, BUFFER_SET *const orig_dst) { + int mi_col, const BUFFER_SET *const orig_dst) { const AV1_COMMON *cm = &cpi->common; const int num_planes = av1_num_planes(cm); MACROBLOCKD *const xd = &x->e_mbd; @@ -9618,7 +9618,8 @@ static int compound_type_rd(const AV1_COMP *const cpi, MACROBLOCK *x, BLOCK_SIZE bsize, int mi_col, int mi_row, int_mv *cur_mv, int masked_compound_used, - BUFFER_SET *orig_dst, const BUFFER_SET *tmp_dst, + const BUFFER_SET *orig_dst, + const BUFFER_SET *tmp_dst, CompoundTypeRdBuffers *buffers, int *rate_mv, int64_t *rd, RD_STATS *rd_stats, int64_t ref_best_rd, int *is_luma_interp_done) { @@ -9828,7 +9829,7 @@ // one for future predictions. In the end, copy from tmp_buf to // dst if necessary. struct macroblockd_plane *p = xd->plane; - BUFFER_SET orig_dst = { + const BUFFER_SET orig_dst = { { p[0].dst.buf, p[1].dst.buf, p[2].dst.buf }, { p[0].dst.stride, p[1].dst.stride, p[2].dst.stride }, };
diff --git a/av1/encoder/reconinter_enc.c b/av1/encoder/reconinter_enc.c index 0fd67a7..c1d6c74 100644 --- a/av1/encoder/reconinter_enc.c +++ b/av1/encoder/reconinter_enc.c
@@ -258,14 +258,14 @@ } void av1_build_inter_predictors_sby(const AV1_COMMON *cm, MACROBLOCKD *xd, - int mi_row, int mi_col, BUFFER_SET *ctx, - BLOCK_SIZE bsize) { + int mi_row, int mi_col, + const BUFFER_SET *ctx, BLOCK_SIZE bsize) { av1_build_inter_predictors_sbp(cm, xd, mi_row, mi_col, ctx, bsize, 0); } void av1_build_inter_predictors_sbuv(const AV1_COMMON *cm, MACROBLOCKD *xd, - int mi_row, int mi_col, BUFFER_SET *ctx, - BLOCK_SIZE bsize) { + int mi_row, int mi_col, + const BUFFER_SET *ctx, BLOCK_SIZE bsize) { for (int plane_idx = 1; plane_idx < MAX_MB_PLANE; plane_idx++) { av1_build_inter_predictors_sbp(cm, xd, mi_row, mi_col, ctx, bsize, plane_idx); @@ -273,8 +273,9 @@ } void av1_build_inter_predictors_sbp(const AV1_COMMON *cm, MACROBLOCKD *xd, - int mi_row, int mi_col, BUFFER_SET *ctx, - BLOCK_SIZE bsize, int plane_idx) { + int mi_row, int mi_col, + const BUFFER_SET *ctx, BLOCK_SIZE bsize, + int plane_idx) { build_inter_predictors_for_planes(cm, xd, bsize, mi_row, mi_col, plane_idx, plane_idx); @@ -292,8 +293,8 @@ } void av1_build_inter_predictors_sb(const AV1_COMMON *cm, MACROBLOCKD *xd, - int mi_row, int mi_col, BUFFER_SET *ctx, - BLOCK_SIZE bsize) { + int mi_row, int mi_col, + const BUFFER_SET *ctx, BLOCK_SIZE bsize) { const int num_planes = av1_num_planes(cm); av1_build_inter_predictors_sby(cm, xd, mi_row, mi_col, ctx, bsize); if (num_planes > 1)
diff --git a/av1/encoder/reconinter_enc.h b/av1/encoder/reconinter_enc.h index 3476c51..fd2760e 100644 --- a/av1/encoder/reconinter_enc.h +++ b/av1/encoder/reconinter_enc.h
@@ -24,20 +24,21 @@ #endif void av1_build_inter_predictors_sby(const AV1_COMMON *cm, MACROBLOCKD *xd, - int mi_row, int mi_col, BUFFER_SET *ctx, - BLOCK_SIZE bsize); + int mi_row, int mi_col, + const BUFFER_SET *ctx, BLOCK_SIZE bsize); void av1_build_inter_predictors_sbuv(const AV1_COMMON *cm, MACROBLOCKD *xd, - int mi_row, int mi_col, BUFFER_SET *ctx, - BLOCK_SIZE bsize); + int mi_row, int mi_col, + const BUFFER_SET *ctx, BLOCK_SIZE bsize); void av1_build_inter_predictors_sbp(const AV1_COMMON *cm, MACROBLOCKD *xd, - int mi_row, int mi_col, BUFFER_SET *ctx, - BLOCK_SIZE bsize, int plane_idx); + int mi_row, int mi_col, + const BUFFER_SET *ctx, BLOCK_SIZE bsize, + int plane_idx); void av1_build_inter_predictors_sb(const AV1_COMMON *cm, MACROBLOCKD *xd, - int mi_row, int mi_col, BUFFER_SET *ctx, - BLOCK_SIZE bsize); + int mi_row, int mi_col, + const BUFFER_SET *ctx, BLOCK_SIZE bsize); void av1_build_inter_predictor(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, const MV *src_mv,