From 12c64e8fe114a98c65a716368dd075d48dbd5b4c Mon Sep 17 00:00:00 2001
From: Wan-Teh Chang <[EMAIL REDACTED]>
Date: Thu, 8 Aug 2024 16:02:19 -0700
Subject: [PATCH] Remove the INLINE macro
Just use the inline keyword.
Note the changes to build/cmake/aom_config_defaults.cmake and
build/cmake/generate_aom_config_templates.cmake. The rest of the CL was
generated by a series of find/sed commands like these:
find . -name "*.h" | xargs sed -i -e "s/ INLINE / inline /g"
find . -name "*.c" | xargs sed -i -e "s/ INLINE / inline /g"
find . -name "*.cc" | xargs sed -i -e "s/ INLINE / inline /g"
find . -name "*.h" | xargs sed -i -e "s/ INLINE$/ inline/g"
...
Bug: aomedia:358402891
Change-Id: I4c735408ffce6c5f3281a53f0082e2e68d9d495d
---
aom/src/aom_image.c | 2 +-
aom_dsp/aom_convolve.c | 8 +-
aom_dsp/aom_dsp_common.h | 14 +-
aom_dsp/arm/aom_convolve8_neon.c | 6 +-
aom_dsp/arm/aom_convolve8_neon.h | 12 +-
aom_dsp/arm/aom_convolve8_neon_dotprod.c | 22 +-
aom_dsp/arm/aom_convolve8_neon_i8mm.c | 22 +-
aom_dsp/arm/aom_filter.h | 2 +-
aom_dsp/arm/aom_neon_sve2_bridge.h | 2 +-
aom_dsp/arm/aom_neon_sve_bridge.h | 8 +-
aom_dsp/arm/aom_scaled_convolve8_neon.c | 4 +-
.../arm/aom_scaled_convolve8_neon_dotprod.c | 12 +-
aom_dsp/arm/aom_scaled_convolve8_neon_i8mm.c | 12 +-
aom_dsp/arm/blend_neon.h | 20 +-
aom_dsp/arm/blk_sse_sum_neon.c | 6 +-
aom_dsp/arm/blk_sse_sum_sve.c | 6 +-
aom_dsp/arm/dist_wtd_avg_neon.h | 8 +-
aom_dsp/arm/hadamard_neon.c | 2 +-
aom_dsp/arm/highbd_blend_a64_mask_neon.c | 4 +-
aom_dsp/arm/highbd_convolve8_neon.c | 20 +-
aom_dsp/arm/highbd_convolve8_neon.h | 10 +-
aom_dsp/arm/highbd_convolve8_sve.c | 26 +-
aom_dsp/arm/highbd_hadamard_neon.c | 4 +-
aom_dsp/arm/highbd_intrapred_neon.c | 90 ++---
aom_dsp/arm/highbd_loopfilter_neon.c | 36 +-
aom_dsp/arm/highbd_masked_sad_neon.c | 22 +-
aom_dsp/arm/highbd_obmc_sad_neon.c | 16 +-
aom_dsp/arm/highbd_obmc_variance_neon.c | 30 +-
aom_dsp/arm/highbd_quantize_neon.c | 20 +-
aom_dsp/arm/highbd_sad_neon.c | 30 +-
aom_dsp/arm/highbd_sadxd_neon.c | 34 +-
aom_dsp/arm/highbd_sse_neon.c | 18 +-
aom_dsp/arm/highbd_sse_sve.c | 16 +-
aom_dsp/arm/highbd_variance_neon.c | 26 +-
aom_dsp/arm/highbd_variance_neon_dotprod.c | 4 +-
aom_dsp/arm/highbd_variance_sve.c | 18 +-
aom_dsp/arm/intrapred_neon.c | 76 ++---
aom_dsp/arm/loopfilter_neon.c | 10 +-
aom_dsp/arm/masked_sad4d_neon.c | 32 +-
aom_dsp/arm/masked_sad_neon.c | 14 +-
aom_dsp/arm/mem_neon.h | 194 +++++------
aom_dsp/arm/obmc_sad_neon.c | 20 +-
aom_dsp/arm/obmc_variance_neon.c | 20 +-
aom_dsp/arm/sad_neon.c | 36 +-
aom_dsp/arm/sad_neon_dotprod.c | 28 +-
aom_dsp/arm/sadxd_neon.c | 30 +-
aom_dsp/arm/sadxd_neon_dotprod.c | 22 +-
aom_dsp/arm/sse_neon.c | 20 +-
aom_dsp/arm/sse_neon_dotprod.c | 20 +-
aom_dsp/arm/sum_neon.h | 48 +--
aom_dsp/arm/sum_squares_neon.c | 26 +-
aom_dsp/arm/sum_squares_neon_dotprod.c | 6 +-
aom_dsp/arm/sum_squares_sve.c | 22 +-
aom_dsp/arm/transpose_neon.h | 64 ++--
aom_dsp/arm/variance_neon.c | 20 +-
aom_dsp/arm/variance_neon_dotprod.c | 18 +-
aom_dsp/bitreader.h | 14 +-
aom_dsp/bitwriter.h | 12 +-
aom_dsp/fft.c | 12 +-
aom_dsp/flow_estimation/arm/disflow_neon.c | 6 +-
aom_dsp/flow_estimation/arm/disflow_neon.h | 8 +-
aom_dsp/flow_estimation/arm/disflow_sve.c | 6 +-
aom_dsp/flow_estimation/disflow.c | 18 +-
aom_dsp/flow_estimation/x86/disflow_avx2.c | 10 +-
aom_dsp/flow_estimation/x86/disflow_sse4.c | 10 +-
aom_dsp/grain_params.h | 2 +-
aom_dsp/intrapred.c | 50 +--
aom_dsp/loopfilter.c | 44 +--
aom_dsp/mathutils.h | 10 +-
aom_dsp/noise_model.c | 4 +-
aom_dsp/prob.h | 4 +-
aom_dsp/pyramid.c | 4 +-
aom_dsp/recenter.h | 8 +-
aom_dsp/sad.c | 6 +-
aom_dsp/sad_av1.c | 23 +-
aom_dsp/txfm_common.h | 2 +-
aom_dsp/variance.c | 10 +-
aom_dsp/x86/adaptive_quantize_avx2.c | 14 +-
aom_dsp/x86/aom_convolve_copy_avx2.c | 6 +-
aom_dsp/x86/aom_convolve_copy_sse2.c | 6 +-
aom_dsp/x86/aom_quantize_avx.c | 2 +-
aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c | 8 +-
aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c | 2 +-
aom_dsp/x86/avg_intrin_avx2.c | 8 +-
aom_dsp/x86/avg_intrin_sse2.c | 14 +-
aom_dsp/x86/bitdepth_conversion_avx2.h | 4 +-
aom_dsp/x86/bitdepth_conversion_sse2.h | 8 +-
aom_dsp/x86/blend_a64_mask_avx2.c | 64 ++--
aom_dsp/x86/blend_a64_mask_sse4.c | 44 +--
aom_dsp/x86/blend_a64_vmask_sse4.c | 4 +-
aom_dsp/x86/blend_mask_sse4.h | 20 +-
aom_dsp/x86/blend_sse4.h | 18 +-
aom_dsp/x86/blk_sse_sum_avx2.c | 8 +-
aom_dsp/x86/blk_sse_sum_sse2.c | 4 +-
aom_dsp/x86/common_avx2.h | 2 +-
aom_dsp/x86/convolve_avx2.h | 40 +--
aom_dsp/x86/convolve_common_intrin.h | 12 +-
aom_dsp/x86/convolve_sse2.h | 16 +-
aom_dsp/x86/convolve_sse4_1.h | 4 +-
aom_dsp/x86/convolve_ssse3.h | 4 +-
aom_dsp/x86/fft_avx2.c | 12 +-
aom_dsp/x86/fft_sse2.c | 18 +-
aom_dsp/x86/fwd_txfm_sse2.h | 20 +-
aom_dsp/x86/highbd_adaptive_quantize_avx2.c | 16 +-
aom_dsp/x86/highbd_adaptive_quantize_sse2.c | 12 +-
aom_dsp/x86/highbd_convolve_avx2.c | 58 ++--
aom_dsp/x86/highbd_intrapred_sse2.c | 34 +-
aom_dsp/x86/highbd_loopfilter_sse2.c | 20 +-
aom_dsp/x86/highbd_quantize_intrin_avx2.c | 8 +-
aom_dsp/x86/highbd_sad_avx2.c | 8 +-
aom_dsp/x86/highbd_variance_sse2.c | 2 +-
aom_dsp/x86/highbd_variance_sse4.c | 2 +-
aom_dsp/x86/intrapred_avx2.c | 32 +-
aom_dsp/x86/intrapred_sse2.c | 46 +--
aom_dsp/x86/intrapred_ssse3.c | 16 +-
aom_dsp/x86/intrapred_utils.h | 4 +-
aom_dsp/x86/intrapred_x86.h | 4 +-
aom_dsp/x86/jnt_variance_ssse3.c | 2 +-
aom_dsp/x86/loopfilter_avx2.c | 2 +-
aom_dsp/x86/loopfilter_sse2.c | 14 +-
aom_dsp/x86/lpf_common_sse2.h | 34 +-
aom_dsp/x86/masked_sad4d_ssse3.c | 2 +-
aom_dsp/x86/masked_sad_intrin_avx2.c | 12 +-
aom_dsp/x86/masked_sad_intrin_ssse3.c | 8 +-
aom_dsp/x86/masked_variance_intrin_ssse3.c | 10 +-
aom_dsp/x86/masked_variance_intrin_ssse3.h | 4 +-
aom_dsp/x86/mem_sse2.h | 38 +--
aom_dsp/x86/obmc_intrinsic_sse4.h | 2 +-
aom_dsp/x86/obmc_intrinsic_ssse3.h | 8 +-
aom_dsp/x86/obmc_sad_avx2.c | 8 +-
aom_dsp/x86/obmc_variance_avx2.c | 4 +-
aom_dsp/x86/obmc_variance_sse4.c | 12 +-
aom_dsp/x86/quantize_avx2.c | 10 +-
aom_dsp/x86/quantize_ssse3.c | 4 +-
aom_dsp/x86/quantize_x86.h | 28 +-
aom_dsp/x86/sad_avx2.c | 4 +-
aom_dsp/x86/sse_avx2.c | 18 +-
aom_dsp/x86/sse_sse4.c | 14 +-
aom_dsp/x86/subtract_avx2.c | 10 +-
aom_dsp/x86/sum_squares_sse2.c | 6 +-
aom_dsp/x86/synonyms.h | 32 +-
aom_dsp/x86/synonyms_avx2.h | 20 +-
aom_dsp/x86/transpose_sse2.h | 20 +-
aom_dsp/x86/txfm_common_avx2.h | 48 +--
aom_dsp/x86/txfm_common_sse2.h | 2 +-
aom_dsp/x86/variance_avx2.c | 44 +--
aom_dsp/x86/variance_sse2.c | 36 +-
aom_mem/aom_mem.h | 2 +-
aom_ports/aarch64_cpudetect.c | 2 +-
aom_ports/aom_timer.h | 12 +-
aom_ports/bitops.h | 12 +-
aom_ports/x86.h | 18 +-
aom_util/aom_pthread.h | 32 +-
aom_util/endian_inl.h | 6 +-
apps/aomdec.c | 2 +-
av1/av1_cx_iface.c | 4 +-
av1/av1_dx_iface.c | 2 +-
av1/common/alloccommon.c | 14 +-
av1/common/arm/av1_convolve_horiz_rs_neon.c | 4 +-
av1/common/arm/av1_convolve_scale_neon.c | 16 +-
.../arm/av1_convolve_scale_neon_dotprod.c | 12 +-
av1/common/arm/av1_convolve_scale_neon_i8mm.c | 12 +-
av1/common/arm/av1_inv_txfm_neon.c | 82 ++---
av1/common/arm/av1_inv_txfm_neon.h | 6 +-
av1/common/arm/cdef_block_neon.c | 12 +-
av1/common/arm/cfl_neon.c | 32 +-
av1/common/arm/compound_convolve_neon.c | 42 +--
av1/common/arm/compound_convolve_neon.h | 64 ++--
.../arm/compound_convolve_neon_dotprod.c | 16 +-
av1/common/arm/compound_convolve_neon_i8mm.c | 16 +-
av1/common/arm/convolve_neon.c | 56 +--
av1/common/arm/convolve_neon.h | 46 +--
av1/common/arm/convolve_neon_dotprod.c | 50 +--
av1/common/arm/convolve_neon_i8mm.c | 54 +--
av1/common/arm/convolve_neon_i8mm.h | 6 +-
av1/common/arm/convolve_scale_neon.h | 32 +-
av1/common/arm/convolve_sve2.c | 4 +-
.../arm/highbd_compound_convolve_neon.c | 98 +++---
.../arm/highbd_compound_convolve_neon.h | 8 +-
.../arm/highbd_compound_convolve_sve2.c | 52 +--
av1/common/arm/highbd_convolve_neon.c | 96 +++---
av1/common/arm/highbd_convolve_neon.h | 14 +-
av1/common/arm/highbd_convolve_scale_neon.c | 10 +-
av1/common/arm/highbd_convolve_sve2.c | 56 +--
av1/common/arm/highbd_convolve_sve2.h | 8 +-
av1/common/arm/highbd_inv_txfm_neon.c | 66 ++--
av1/common/arm/highbd_reconinter_neon.c | 2 +-
av1/common/arm/highbd_wiener_convolve_neon.c | 16 +-
av1/common/arm/resize_neon.c | 16 +-
av1/common/arm/selfguided_neon.c | 38 +--
av1/common/arm/wiener_convolve_neon.c | 16 +-
av1/common/av1_common_int.h | 94 ++---
av1/common/av1_inv_txfm1d.h | 4 +-
av1/common/av1_inv_txfm2d.c | 6 +-
av1/common/av1_txfm.h | 28 +-
av1/common/blockd.h | 126 +++----
av1/common/cdef.c | 6 +-
av1/common/cdef.h | 4 +-
av1/common/cdef_block.c | 2 +-
av1/common/cdef_block.h | 2 +-
av1/common/cdef_block_simd.h | 10 +-
av1/common/cfl.c | 18 +-
av1/common/cfl.h | 10 +-
av1/common/common.h | 2 +-
av1/common/convolve.c | 6 +-
av1/common/convolve.h | 6 +-
av1/common/entropy.h | 6 +-
av1/common/entropymode.h | 2 +-
av1/common/entropymv.h | 4 +-
av1/common/filter.h | 22 +-
av1/common/idct.h | 2 +-
av1/common/mv.h | 20 +-
av1/common/mvref_common.c | 2 +-
av1/common/mvref_common.h | 30 +-
av1/common/obmc.h | 4 +-
av1/common/ppc/cfl_ppc.c | 2 +-
av1/common/pred_common.h | 56 +--
av1/common/quant_common.c | 2 +-
av1/common/quant_common.h | 2 +-
av1/common/reconinter.c | 6 +-
av1/common/reconinter.h | 28 +-
av1/common/reconintra.c | 2 +-
av1/common/reconintra.h | 18 +-
av1/common/resize.h | 4 +-
av1/common/restoration.h | 4 +-
av1/common/scale.h | 12 +-
av1/common/scan.h | 4 +-
av1/common/seg_common.h | 6 +-
av1/common/thread_common.c | 16 +-
av1/common/txb_common.h | 22 +-
av1/common/x86/av1_inv_txfm_avx2.c | 74 ++--
av1/common/x86/av1_inv_txfm_avx2.h | 6 +-
av1/common/x86/av1_inv_txfm_ssse3.c | 72 ++--
av1/common/x86/av1_inv_txfm_ssse3.h | 8 +-
av1/common/x86/av1_txfm_sse2.h | 46 +--
av1/common/x86/av1_txfm_sse4.h | 6 +-
av1/common/x86/cdef_block_avx2.c | 8 +-
av1/common/x86/cfl_avx2.c | 12 +-
av1/common/x86/cfl_sse2.c | 4 +-
av1/common/x86/cfl_ssse3.c | 26 +-
av1/common/x86/convolve_sse2.c | 10 +-
av1/common/x86/filterintra_sse4.c | 6 +-
av1/common/x86/highbd_inv_txfm_avx2.c | 40 +--
av1/common/x86/highbd_inv_txfm_sse4.c | 36 +-
av1/common/x86/highbd_txfm_utility_sse4.h | 10 +-
av1/common/x86/highbd_warp_plane_sse4.c | 18 +-
av1/common/x86/jnt_convolve_avx2.c | 4 +-
av1/common/x86/reconinter_avx2.c | 10 +-
av1/common/x86/reconinter_sse4.c | 2 +-
av1/common/x86/resize_avx2.c | 4 +-
av1/common/x86/resize_sse2.c | 4 +-
av1/common/x86/resize_ssse3.c | 14 +-
av1/common/x86/selfguided_avx2.c | 8 +-
av1/common/x86/selfguided_sse4.c | 8 +-
av1/common/x86/warp_plane_avx2.c | 44 +--
av1/common/x86/warp_plane_sse4.c | 38 +--
av1/decoder/decodeframe.c | 26 +-
av1/decoder/decodemv.c | 14 +-
av1/decoder/decoder.h | 4 +-
av1/decoder/decodetxb.c | 8 +-
av1/decoder/grain_synthesis.c | 2 +-
av1/encoder/aq_cyclicrefresh.h | 4 +-
av1/encoder/arm/av1_highbd_quantize_neon.c | 6 +-
av1/encoder/arm/av1_temporal_denoiser_neon.c | 6 +-
av1/encoder/arm/cnn_neon.c | 8 +-
av1/encoder/arm/encodetxb_neon.c | 32 +-
av1/encoder/arm/highbd_pickrst_neon.c | 22 +-
av1/encoder/arm/highbd_pickrst_sve.c | 12 +-
av1/encoder/arm/highbd_temporal_filter_neon.c | 2 +-
av1/encoder/arm/pickrst_neon.c | 22 +-
av1/encoder/arm/pickrst_neon.h | 12 +-
av1/encoder/arm/pickrst_sve.c | 12 +-
av1/encoder/arm/pickrst_sve.h | 12 +-
av1/encoder/arm/quantize_neon.c | 8 +-
av1/encoder/arm/rdopt_neon.c | 2 +-
av1/encoder/arm/temporal_filter_neon.c | 4 +-
.../arm/temporal_filter_neon_dotprod.c | 2 +-
av1/encoder/av1_fwd_txfm2d.c | 6 +-
av1/encoder/av1_noise_estimate.c | 2 +-
av1/encoder/av1_quantize.c | 4 +-
av1/encoder/av1_temporal_denoiser.h | 2 +-
av1/encoder/bitstream.c | 16 +-
av1/encoder/block.h | 12 +-
av1/encoder/cnn.c | 10 +-
av1/encoder/compound_type.c | 34 +-
av1/encoder/cost.h | 2 +-
av1/encoder/encode_strategy.c | 2 +-
av1/encoder/encodeframe.c | 6 +-
av1/encoder/encodeframe_utils.c | 2 +-
av1/encoder/encodeframe_utils.h | 2 +-
av1/encoder/encodemb.h | 4 +-
av1/encoder/encodemv.h | 10 +-
av1/encoder/encoder.c | 12 +-
av1/encoder/encoder.h | 108 +++---
av1/encoder/encodetxb.c | 2 +-
av1/encoder/encodetxb.h | 2 +-
av1/encoder/firstpass.c | 2 +-
av1/encoder/firstpass.h | 4 +-
av1/encoder/global_motion.c | 4 +-
av1/encoder/hybrid_fwd_txfm.c | 4 +-
av1/encoder/interp_search.c | 22 +-
av1/encoder/intra_mode_search.c | 2 +-
av1/encoder/intra_mode_search_utils.h | 2 +-
av1/encoder/level.h | 2 +-
av1/encoder/mcomp.c | 58 ++--
av1/encoder/mcomp.h | 22 +-
av1/encoder/motion_search_facade.c | 2 +-
av1/encoder/nonrd_opt.c | 4 +-
av1/encoder/nonrd_opt.h | 16 +-
av1/encoder/nonrd_pickmode.c | 18 +-
av1/encoder/optical_flow.c | 4 +-
av1/encoder/palette.h | 4 +-
av1/encoder/partition_search.c | 14 +-
av1/encoder/partition_strategy.c | 8 +-
av1/encoder/partition_strategy.h | 6 +-
av1/encoder/pass2_strategy.c | 8 +-
av1/encoder/pickcdef.c | 10 +-
av1/encoder/pickcdef.h | 4 +-
av1/encoder/pickrst.c | 8 +-
av1/encoder/pickrst.h | 4 +-
av1/encoder/random.h | 10 +-
av1/encoder/ratectrl.c | 2 +-
av1/encoder/rd.c | 8 +-
av1/encoder/rd.h | 26 +-
av1/encoder/rdopt.c | 46 +--
av1/encoder/rdopt.h | 16 +-
av1/encoder/rdopt_utils.h | 24 +-
av1/encoder/reconinter_enc.c | 2 +-
av1/encoder/saliency_map.c | 12 +-
av1/encoder/sparse_linear_solver.c | 2 +-
av1/encoder/temporal_filter.c | 6 +-
av1/encoder/temporal_filter.h | 4 +-
av1/encoder/tokenize.h | 4 +-
av1/encoder/tpl_model.c | 2 +-
av1/encoder/tpl_model.h | 16 +-
av1/encoder/tx_search.c | 34 +-
av1/encoder/txb_rdopt.c | 4 +-
av1/encoder/txb_rdopt_utils.h | 18 +-
av1/encoder/x86/av1_fwd_txfm2d_avx2.c | 48 +--
av1/encoder/x86/av1_fwd_txfm2d_sse4.c | 10 +-
av1/encoder/x86/av1_fwd_txfm_avx2.h | 8 +-
av1/encoder/x86/av1_fwd_txfm_sse2.h | 14 +-
av1/encoder/x86/av1_highbd_quantize_avx2.c | 8 +-
av1/encoder/x86/av1_highbd_quantize_sse4.c | 8 +-
av1/encoder/x86/av1_quantize_avx2.c | 18 +-
av1/encoder/x86/av1_quantize_sse2.c | 10 +-
av1/encoder/x86/av1_temporal_denoiser_sse2.c | 6 +-
av1/encoder/x86/av1_txfm1d_sse4.h | 4 +-
av1/encoder/x86/cnn_avx2.c | 14 +-
av1/encoder/x86/encodetxb_sse2.c | 26 +-
av1/encoder/x86/error_intrin_avx2.c | 8 +-
av1/encoder/x86/highbd_fwd_txfm_avx2.c | 38 +--
av1/encoder/x86/highbd_fwd_txfm_sse4.c | 34 +-
av1/encoder/x86/ml_avx2.c | 8 +-
av1/encoder/x86/pickrst_avx2.c | 32 +-
av1/encoder/x86/pickrst_sse4.c | 22 +-
av1/encoder/x86/rdopt_avx2.c | 2 +-
av1/encoder/x86/rdopt_sse4.c | 2 +-
av1/encoder/x86/reconinter_enc_sse2.c | 2 +-
av1/encoder/x86/reconinter_enc_ssse3.c | 2 +-
av1/encoder/x86/wedge_utils_sse2.c | 2 +-
build/cmake/aom_config_defaults.cmake | 2 -
.../cmake/generate_aom_config_templates.cmake | 3 +-
test/av1_inv_txfm1d_test.cc | 2 +-
test/av1_txfm_test.h | 2 +-
test/tile_config_test.cc | 2 +-
test/util.h | 2 +-
third_party/SVT-AV1/EbMemory_AVX2.h | 22 +-
third_party/SVT-AV1/EbMemory_SSE4_1.h | 6 +-
third_party/SVT-AV1/convolve_avx2.h | 320 +++++++++---------
third_party/SVT-AV1/synonyms.h | 2 +-
tools/auto_refactor/av1_preprocess.py | 2 -
372 files changed, 3277 insertions(+), 3283 deletions(-)
diff --git a/aom/src/aom_image.c b/aom/src/aom_image.c
index 039a012ee3..0aab80c9de 100644
--- a/aom/src/aom_image.c
+++ b/aom/src/aom_image.c
@@ -19,7 +19,7 @@
#include "aom/internal/aom_image_internal.h"
#include "aom_mem/aom_mem.h"
-static INLINE unsigned int align_image_dimension(unsigned int d,
+static inline unsigned int align_image_dimension(unsigned int d,
unsigned int subsampling,
unsigned int size_align) {
unsigned int align;
diff --git a/aom_dsp/aom_convolve.c b/aom_dsp/aom_convolve.c
index 2c8a632f74..e139ba1fb8 100644
--- a/aom_dsp/aom_convolve.c
+++ b/aom_dsp/aom_convolve.c
@@ -20,13 +20,13 @@
#include "aom_dsp/aom_filter.h"
#include "aom_ports/mem.h"
-static INLINE int horz_scalar_product(const uint8_t *a, const int16_t *b) {
+static inline int horz_scalar_product(const uint8_t *a, const int16_t *b) {
int sum = 0;
for (int k = 0; k < SUBPEL_TAPS; ++k) sum += a[k] * b[k];
return sum;
}
-static INLINE int vert_scalar_product(const uint8_t *a, ptrdiff_t a_stride,
+static inline int vert_scalar_product(const uint8_t *a, ptrdiff_t a_stride,
const int16_t *b) {
int sum = 0;
for (int k = 0; k < SUBPEL_TAPS; ++k) sum += a[k * a_stride] * b[k];
@@ -163,7 +163,7 @@ void aom_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst,
}
#if CONFIG_AV1_HIGHBITDEPTH
-static INLINE int highbd_vert_scalar_product(const uint16_t *a,
+static inline int highbd_vert_scalar_product(const uint16_t *a,
ptrdiff_t a_stride,
const int16_t *b) {
int sum = 0;
@@ -171,7 +171,7 @@ static INLINE int highbd_vert_scalar_product(const uint16_t *a,
return sum;
}
-static INLINE int highbd_horz_scalar_product(const uint16_t *a,
+static inline int highbd_horz_scalar_product(const uint16_t *a,
const int16_t *b) {
int sum = 0;
for (int k = 0; k < SUBPEL_TAPS; ++k) sum += a[k] * b[k];
diff --git a/aom_dsp/aom_dsp_common.h b/aom_dsp/aom_dsp_common.h
index 7667704df3..c279ad1fc0 100644
--- a/aom_dsp/aom_dsp_common.h
+++ b/aom_dsp/aom_dsp_common.h
@@ -61,23 +61,23 @@ typedef uint8_t qm_val_t;
typedef int64_t tran_high_t;
typedef int32_t tran_low_t;
-static INLINE uint8_t clip_pixel(int val) {
+static inline uint8_t clip_pixel(int val) {
return (val > 255) ? 255 : (val < 0) ? 0 : val;
}
-static INLINE int clamp(int value, int low, int high) {
+static inline int clamp(int value, int low, int high) {
return value < low ? low : (value > high ? high : value);
}
-static INLINE int64_t clamp64(int64_t value, int64_t low, int64_t high) {
+static inline int64_t clamp64(int64_t value, int64_t low, int64_t high) {
return value < low ? low : (value > high ? high : value);
}
-static INLINE double fclamp(double value, double low, double high) {
+static inline double fclamp(double value, double low, double high) {
return value < low ? low : (value > high ? high : value);
}
-static INLINE uint16_t clip_pixel_highbd(int val, int bd) {
+static inline uint16_t clip_pixel_highbd(int val, int bd) {
switch (bd) {
case 8:
default: return (uint16_t)clamp(val, 0, 255);
@@ -90,12 +90,12 @@ static INLINE uint16_t clip_pixel_highbd(int val, int bd) {
// or max(0, value) and might be faster in some cases.
// Care should be taken since the behavior of right shifting signed type
// negative value is undefined by C standards and implementation defined,
-static INLINE unsigned int negative_to_zero(int value) {
+static inline unsigned int negative_to_zero(int value) {
return value & ~(value >> (sizeof(value) * 8 - 1));
}
// Returns the saturating cast of a double value to int.
-static INLINE int saturate_cast_double_to_int(double d) {
+static inline int saturate_cast_double_to_int(double d) {
if (d > INT_MAX) return INT_MAX;
return (int)d;
}
diff --git a/aom_dsp/arm/aom_convolve8_neon.c b/aom_dsp/arm/aom_convolve8_neon.c
index d2f13ff13e..ae4af9e96b 100644
--- a/aom_dsp/arm/aom_convolve8_neon.c
+++ b/aom_dsp/arm/aom_convolve8_neon.c
@@ -26,7 +26,7 @@
#include "aom_dsp/arm/transpose_neon.h"
#include "aom_ports/mem.h"
-static INLINE void convolve8_horiz_8tap_neon(const uint8_t *src,
+static inline void convolve8_horiz_8tap_neon(const uint8_t *src,
ptrdiff_t src_stride, uint8_t *dst,
ptrdiff_t dst_stride,
const int16_t *filter_x, int w,
@@ -195,7 +195,7 @@ static INLINE void convolve8_horiz_8tap_neon(const uint8_t *src,
}
}
-static INLINE void convolve8_horiz_4tap_neon(const uint8_t *src,
+static inline void convolve8_horiz_4tap_neon(const uint8_t *src,
ptrdiff_t src_stride, uint8_t *dst,
ptrdiff_t dst_stride,
const int16_t *filter_x, int w,
@@ -292,7 +292,7 @@ void aom_convolve8_horiz_neon(const uint8_t *src, ptrdiff_t src_stride,
}
}
-static INLINE void convolve8_vert_8tap_neon(const uint8_t *src,
+static inline void convolve8_vert_8tap_neon(const uint8_t *src,
ptrdiff_t src_stride, uint8_t *dst,
ptrdiff_t dst_stride,
const int16_t *filter_y, int w,
diff --git a/aom_dsp/arm/aom_convolve8_neon.h b/aom_dsp/arm/aom_convolve8_neon.h
index d1384a76ef..5ebffeb781 100644
--- a/aom_dsp/arm/aom_convolve8_neon.h
+++ b/aom_dsp/arm/aom_convolve8_neon.h
@@ -18,7 +18,7 @@
#include "aom_dsp/arm/mem_neon.h"
#include "config/aom_config.h"
-static INLINE int16x4_t convolve8_4(const int16x4_t s0, const int16x4_t s1,
+static inline int16x4_t convolve8_4(const int16x4_t s0, const int16x4_t s1,
const int16x4_t s2, const int16x4_t s3,
const int16x4_t s4, const int16x4_t s5,
const int16x4_t s6, const int16x4_t s7,
@@ -38,7 +38,7 @@ static INLINE int16x4_t convolve8_4(const int16x4_t s0, const int16x4_t s1,
return sum;
}
-static INLINE uint8x8_t convolve8_8(const int16x8_t s0, const int16x8_t s1,
+static inline uint8x8_t convolve8_8(const int16x8_t s0, const int16x8_t s1,
const int16x8_t s2, const int16x8_t s3,
const int16x8_t s4, const int16x8_t s5,
const int16x8_t s6, const int16x8_t s7,
@@ -59,7 +59,7 @@ static INLINE uint8x8_t convolve8_8(const int16x8_t s0, const int16x8_t s1,
return vqrshrun_n_s16(sum, FILTER_BITS - 1);
}
-static INLINE void convolve8_horiz_2tap_neon(const uint8_t *src,
+static inline void convolve8_horiz_2tap_neon(const uint8_t *src,
ptrdiff_t src_stride, uint8_t *dst,
ptrdiff_t dst_stride,
const int16_t *filter_x, int w,
@@ -146,7 +146,7 @@ static INLINE void convolve8_horiz_2tap_neon(const uint8_t *src,
}
}
-static INLINE uint8x8_t convolve4_8(const int16x8_t s0, const int16x8_t s1,
+static inline uint8x8_t convolve4_8(const int16x8_t s0, const int16x8_t s1,
const int16x8_t s2, const int16x8_t s3,
const int16x4_t filter) {
int16x8_t sum = vmulq_lane_s16(s0, filter, 0);
@@ -158,7 +158,7 @@ static INLINE uint8x8_t convolve4_8(const int16x8_t s0, const int16x8_t s1,
return vqrshrun_n_s16(sum, FILTER_BITS - 1);
}
-static INLINE void convolve8_vert_4tap_neon(const uint8_t *src,
+static inline void convolve8_vert_4tap_neon(const uint8_t *src,
ptrdiff_t src_stride, uint8_t *dst,
ptrdiff_t dst_stride,
const int16_t *filter_y, int w,
@@ -244,7 +244,7 @@ static INLINE void convolve8_vert_4tap_neon(const uint8_t *src,
}
}
-static INLINE void convolve8_vert_2tap_neon(const uint8_t *src,
+static inline void convolve8_vert_2tap_neon(const uint8_t *src,
ptrdiff_t src_stride, uint8_t *dst,
ptrdiff_t dst_stride,
const int16_t *filter_y, int w,
diff --git a/aom_dsp/arm/aom_convolve8_neon_dotprod.c b/aom_dsp/arm/aom_convolve8_neon_dotprod.c
index 04b3832b63..7fc9cb1857 100644
--- a/aom_dsp/arm/aom_convolve8_neon_dotprod.c
+++ b/aom_dsp/arm/aom_convolve8_neon_dotprod.c
@@ -44,7 +44,7 @@ DECLARE_ALIGNED(16, static const uint8_t, kDotProdMergeBlockTbl[48]) = {
3, 16, 17, 18, 7, 20, 21, 22, 11, 24, 25, 26, 15, 28, 29, 30
};
-static INLINE int16x4_t convolve8_4_h(const uint8x16_t samples,
+static inline int16x4_t convolve8_4_h(const uint8x16_t samples,
const int8x8_t filters,
const uint8x16x2_t permute_tbl) {
// Transform sample range to [-128, 127] for 8-bit signed dot product.
@@ -66,7 +66,7 @@ static INLINE int16x4_t convolve8_4_h(const uint8x16_t samples,
return vqmovn_s32(sum);
}
-static INLINE uint8x8_t convolve8_8_h(const uint8x16_t samples,
+static inline uint8x8_t convolve8_8_h(const uint8x16_t samples,
const int8x8_t filters,
const uint8x16x3_t permute_tbl) {
// Transform sample range to [-128, 127] for 8-bit signed dot product.
@@ -95,7 +95,7 @@ static INLINE uint8x8_t convolve8_8_h(const uint8x16_t samples,
return vqrshrun_n_s16(sum, FILTER_BITS);
}
-static INLINE void convolve8_horiz_8ta
(Patch may be truncated, please check the link at the top of this post.)