apply clang-format-21 (Debian clang-format version 21.1.8 (3)) No options in .clang-format needed to be updated. `ConstructorInitializerAllOnOneLineOrOnePerLine` is deprecated, but still functional. Bug: 569277013 Change-Id: Ia3c4d1536311febad5e1fe703bad5e941c342dce
diff --git a/aom_dsp/arm/highbd_subpel_variance_neon.c b/aom_dsp/arm/highbd_subpel_variance_neon.c index ac2440b..dc3b5ce 100644 --- a/aom_dsp/arm/highbd_subpel_variance_neon.c +++ b/aom_dsp/arm/highbd_subpel_variance_neon.c
@@ -715,11 +715,11 @@ #define HBD_MASKED_SUBPEL_VARIANCE_WXH_NEON(bitdepth, w, h) \ unsigned int \ - aom_highbd_##bitdepth##_masked_sub_pixel_variance##w##x##h##_neon( \ - const uint8_t *src, int src_stride, int xoffset, int yoffset, \ - const uint8_t *ref, int ref_stride, const uint8_t *second_pred, \ - const uint8_t *msk, int msk_stride, int invert_mask, \ - unsigned int *sse) { \ + aom_highbd_##bitdepth##_masked_sub_pixel_variance##w##x##h##_neon( \ + const uint8_t *src, int src_stride, int xoffset, int yoffset, \ + const uint8_t *ref, int ref_stride, const uint8_t *second_pred, \ + const uint8_t *msk, int msk_stride, int invert_mask, \ + unsigned int *sse) { \ uint16_t tmp0[w * (h + 1)]; \ uint16_t tmp1[w * (h + 1)]; \ uint16_t tmp2[w * h]; \ @@ -736,11 +736,11 @@ #define HBD_SPECIALIZED_MASKED_SUBPEL_VARIANCE_WXH_NEON(bitdepth, w, h) \ unsigned int \ - aom_highbd_##bitdepth##_masked_sub_pixel_variance##w##x##h##_neon( \ - const uint8_t *src, int src_stride, int xoffset, int yoffset, \ - const uint8_t *ref, int ref_stride, const uint8_t *second_pred, \ - const uint8_t *msk, int msk_stride, int invert_mask, \ - unsigned int *sse) { \ + aom_highbd_##bitdepth##_masked_sub_pixel_variance##w##x##h##_neon( \ + const uint8_t *src, int src_stride, int xoffset, int yoffset, \ + const uint8_t *ref, int ref_stride, const uint8_t *second_pred, \ + const uint8_t *msk, int msk_stride, int invert_mask, \ + unsigned int *sse) { \ uint16_t *src_ptr = CONVERT_TO_SHORTPTR(src); \ if (xoffset == 0) { \ uint16_t tmp0[w * h]; \ @@ -952,9 +952,9 @@ #if !CONFIG_REALTIME_ONLY #define HIGHBD_OBMC_SUBPEL_VARIANCE_WXH_NEON(bitdepth, w, h) \ unsigned int \ - aom_highbd_##bitdepth##_obmc_sub_pixel_variance##w##x##h##_neon( \ - const uint8_t *pre, int pre_stride, int xoffset, int yoffset, \ - const int32_t *wsrc, const int32_t *mask, unsigned int *sse) { \ + aom_highbd_##bitdepth##_obmc_sub_pixel_variance##w##x##h##_neon( \ + const uint8_t *pre, int pre_stride, int xoffset, int yoffset, \ + const int32_t *wsrc, const int32_t *mask, unsigned int *sse) { \ uint16_t *pre_ptr = CONVERT_TO_SHORTPTR(pre); \ uint16_t tmp0[w * (h + 1)]; \ uint16_t tmp1[w * h]; \ @@ -967,9 +967,9 @@ #define SPECIALIZED_HIGHBD_OBMC_SUBPEL_VARIANCE_WXH_NEON(bitdepth, w, h) \ unsigned int \ - aom_highbd_##bitdepth##_obmc_sub_pixel_variance##w##x##h##_neon( \ - const uint8_t *pre, int pre_stride, int xoffset, int yoffset, \ - const int32_t *wsrc, const int32_t *mask, unsigned int *sse) { \ + aom_highbd_##bitdepth##_obmc_sub_pixel_variance##w##x##h##_neon( \ + const uint8_t *pre, int pre_stride, int xoffset, int yoffset, \ + const int32_t *wsrc, const int32_t *mask, unsigned int *sse) { \ uint16_t *pre_ptr = CONVERT_TO_SHORTPTR(pre); \ if (xoffset == 0) { \ if (yoffset == 0) { \
diff --git a/aom_dsp/arm/reinterpret_neon.h b/aom_dsp/arm/reinterpret_neon.h index 7ea5ab3..22471e1 100644 --- a/aom_dsp/arm/reinterpret_neon.h +++ b/aom_dsp/arm/reinterpret_neon.h
@@ -19,8 +19,8 @@ #define REINTERPRET_NEON(u, to_sz, to_count, from_sz, from_count, n, q) \ static AOM_FORCE_INLINE u##int##to_sz##x##to_count##x##n##_t \ - aom_reinterpret##q##_##u##to_sz##_##u##from_sz##_x##n( \ - const u##int##from_sz##x##from_count##x##n##_t src) { \ + aom_reinterpret##q##_##u##to_sz##_##u##from_sz##_x##n( \ + const u##int##from_sz##x##from_count##x##n##_t src) { \ u##int##to_sz##x##to_count##x##n##_t ret; \ for (int i = 0; i < (n); ++i) { \ ret.val[i] = vreinterpret##q##_##u##to_sz##_##u##from_sz(src.val[i]); \
diff --git a/aom_dsp/noise_model.c b/aom_dsp/noise_model.c index 562252b..68c2e56 100644 --- a/aom_dsp/noise_model.c +++ b/aom_dsp/noise_model.c
@@ -222,7 +222,7 @@ if (!lut) return 0; if (num_points <= 0) return 0; lut->num_points = 0; - lut->points = (double(*)[2])aom_malloc(num_points * sizeof(*lut->points)); + lut->points = (double (*)[2])aom_malloc(num_points * sizeof(*lut->points)); if (!lut->points) return 0; lut->num_points = num_points; memset(lut->points, 0, sizeof(*lut->points) * num_points); @@ -724,7 +724,7 @@ } } model->n = n; - model->coords = (int(*)[2])aom_malloc(sizeof(*model->coords) * n); + model->coords = (int (*)[2])aom_malloc(sizeof(*model->coords) * n); if (!model->coords) { aom_noise_model_free(model); return 0; @@ -777,7 +777,7 @@ // entry (possibly downsampled) for (x, y) in the alt_data (e.g., luma). #define EXTRACT_AR_ROW(INT_TYPE, suffix) \ static double extract_ar_row_##suffix( \ - int(*coords)[2], int num_coords, const INT_TYPE *const data, \ + int (*coords)[2], int num_coords, const INT_TYPE *const data, \ const INT_TYPE *const denoised, int stride, int sub_log2[2], \ const INT_TYPE *const alt_data, const INT_TYPE *const alt_denoised, \ int alt_stride, int x, int y, double *buffer) { \ @@ -1216,7 +1216,7 @@ film_grain->num_cb_points = scaling_points[1].num_points; film_grain->num_cr_points = scaling_points[2].num_points; - int(*film_grain_scaling[3])[2] = { + int (*film_grain_scaling[3])[2] = { film_grain->scaling_points_y, film_grain->scaling_points_cb, film_grain->scaling_points_cr,
diff --git a/aom_dsp/x86/sum_squares_sse2.c b/aom_dsp/x86/sum_squares_sse2.c index 1061c15..a24b509 100644 --- a/aom_dsp/x86/sum_squares_sse2.c +++ b/aom_dsp/x86/sum_squares_sse2.c
@@ -111,9 +111,8 @@ // maintenance instructions in the common case of 4x4. __attribute__((noinline)) #endif -uint64_t -aom_sum_squares_2d_i16_nxn_sse2(const int16_t *src, int stride, int width, - int height) { +uint64_t aom_sum_squares_2d_i16_nxn_sse2(const int16_t *src, int stride, + int width, int height) { int r = 0; const __m128i v_zext_mask_q = _mm_set1_epi64x(~0u); @@ -161,9 +160,8 @@ // maintenance instructions in the common case of 4x4. __attribute__((noinline)) #endif -uint64_t -aom_sum_sse_2d_i16_nxn_sse2(const int16_t *src, int stride, int width, - int height, int *sum) { +uint64_t aom_sum_sse_2d_i16_nxn_sse2(const int16_t *src, int stride, int width, + int height, int *sum) { int r = 0; uint64_t result; const __m128i zero_reg = _mm_setzero_si128();
diff --git a/av1/encoder/partition_model_weights.h b/av1/encoder/partition_model_weights.h index 576b981..ed6b0a1 100644 --- a/av1/encoder/partition_model_weights.h +++ b/av1/encoder/partition_model_weights.h
@@ -7041,8 +7041,8 @@ #undef NUM_LAYER_0_UNITS_8 #undef NUM_LOGITS_8 -static const NN_CONFIG - *const av1_simple_motion_search_prune_rect_nn_config[5] = { +static const NN_CONFIG *const + av1_simple_motion_search_prune_rect_nn_config[5] = { &av1_simple_motion_search_prune_rect_nn_config_128, &av1_simple_motion_search_prune_rect_nn_config_64, &av1_simple_motion_search_prune_rect_nn_config_32,
diff --git a/av1/encoder/partition_strategy.c b/av1/encoder/partition_strategy.c index e3c4178..1689612 100644 --- a/av1/encoder/partition_strategy.c +++ b/av1/encoder/partition_strategy.c
@@ -1334,7 +1334,7 @@ const int mi_col = blk_params.mi_col; const BLOCK_SIZE bsize = blk_params.bsize; - int64_t(*rect_part_rd)[SUB_PARTITIONS_RECT] = part_state->rect_part_rd; + int64_t (*rect_part_rd)[SUB_PARTITIONS_RECT] = part_state->rect_part_rd; int64_t *split_rd = part_state->split_rd; if (ext_ml_model_decision_after_part_ab( cpi, x, bsize, part_ctx, best_rd, rect_part_rd, split_rd,
diff --git a/av1/encoder/pickcdef.c b/av1/encoder/pickcdef.c index 29f9928..71cfbb5 100644 --- a/av1/encoder/pickcdef.c +++ b/av1/encoder/pickcdef.c
@@ -914,7 +914,7 @@ uint64_t best_rd = UINT64_MAX; CdefInfo *const cdef_info = &cm->cdef_info; int sb_count = cdef_search_ctx->sb_count; - uint64_t(*mse[2])[TOTAL_STRENGTHS]; + uint64_t (*mse[2])[TOTAL_STRENGTHS]; mse[0] = cdef_search_ctx->mse[0]; mse[1] = cdef_search_ctx->mse[1]; /* Calculate the maximum number of bits required to signal CDEF strengths at
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c index a9e8cd7..3760b82 100644 --- a/av1/encoder/speed_features.c +++ b/av1/encoder/speed_features.c
@@ -2642,8 +2642,8 @@ rt_sf->skip_newmv_mode_sad_screen = 0; } -static fractional_mv_step_fp - *const fractional_mv_search[SUBPEL_SEARCH_METHODS] = { +static fractional_mv_step_fp *const + fractional_mv_search[SUBPEL_SEARCH_METHODS] = { av1_find_best_sub_pixel_tree, // SUBPEL_TREE = 0 av1_find_best_sub_pixel_tree_pruned, // SUBPEL_TREE_PRUNED = 1 av1_find_best_sub_pixel_tree_pruned_more // SUBPEL_TREE_PRUNED_MORE = 2
diff --git a/av1/encoder/txb_rdopt.c b/av1/encoder/txb_rdopt.c index aaa7498..a4df665 100644 --- a/av1/encoder/txb_rdopt.c +++ b/av1/encoder/txb_rdopt.c
@@ -470,9 +470,9 @@ ? 7 : (is_noise_pattern ? 6 : 5); - const int(*trellis_rd_mult)[2] = cpi->sf.tx_sf.use_chroma_trellis_rd_mult - ? plane_rd_mult_chroma - : plane_rd_mult; + const int (*trellis_rd_mult)[2] = cpi->sf.tx_sf.use_chroma_trellis_rd_mult + ? plane_rd_mult_chroma + : plane_rd_mult; const int64_t rdmult = ROUND_POWER_OF_TWO( (int64_t)x->rdmult * (8 - sharpness) * (trellis_rd_mult[is_inter][plane_type] << (2 * (xd->bd - 8))), @@ -609,7 +609,7 @@ av1_get_nz_map_contexts(levels, scan, eob, tx_size, tx_class, coeff_contexts); - const int(*lps_cost)[COEFF_BASE_RANGE + 1 + COEFF_BASE_RANGE + 1] = + const int (*lps_cost)[COEFF_BASE_RANGE + 1 + COEFF_BASE_RANGE + 1] = coeff_costs->lps_cost; int c = eob - 1; { @@ -636,7 +636,7 @@ } } } - const int(*base_cost)[8] = coeff_costs->base_cost; + const int (*base_cost)[8] = coeff_costs->base_cost; for (c = eob - 2; c >= 1; --c) { const int pos = scan[c]; const int coeff_ctx = coeff_contexts[pos];