From 9ad20839fbc502d261a1e10f435e5ac673c61c20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Sat, 27 Sep 2025 02:34:21 +0200 Subject: [PATCH] avcodec/pixblockdsp: be consistent about restrict use in ff_{get,diff}_pixels MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suppresses warnings about function pointer mismatch. Signed-off-by: Kacper Michajłow --- libavcodec/aarch64/pixblockdsp_init_aarch64.c | 4 ++-- libavcodec/arm/pixblockdsp_init_arm.c | 12 ++++++------ libavcodec/dvenc.c | 2 +- libavcodec/riscv/pixblockdsp_init.c | 12 ++++++------ libavcodec/x86/dnxhdenc_init.c | 2 +- libavcodec/x86/pixblockdsp_init.c | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/libavcodec/aarch64/pixblockdsp_init_aarch64.c b/libavcodec/aarch64/pixblockdsp_init_aarch64.c index 404f3680a6..5f0bf477a5 100644 --- a/libavcodec/aarch64/pixblockdsp_init_aarch64.c +++ b/libavcodec/aarch64/pixblockdsp_init_aarch64.c @@ -23,9 +23,9 @@ #include "libavutil/aarch64/cpu.h" #include "libavcodec/pixblockdsp.h" -void ff_get_pixels_neon(int16_t *block, const uint8_t *pixels, +void ff_get_pixels_neon(int16_t *restrict block, const uint8_t *pixels, ptrdiff_t stride); -void ff_diff_pixels_neon(int16_t *block, const uint8_t *s1, +void ff_diff_pixels_neon(int16_t *restrict block, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride); av_cold void ff_pixblockdsp_init_aarch64(PixblockDSPContext *c, diff --git a/libavcodec/arm/pixblockdsp_init_arm.c b/libavcodec/arm/pixblockdsp_init_arm.c index 121338ad0c..9d817e400d 100644 --- a/libavcodec/arm/pixblockdsp_init_arm.c +++ b/libavcodec/arm/pixblockdsp_init_arm.c @@ -23,18 +23,18 @@ #include "libavutil/arm/cpu.h" #include "libavcodec/pixblockdsp.h" -void ff_get_pixels_armv6(int16_t *block, const uint8_t *pixels, +void ff_get_pixels_armv6(int16_t *restrict block, const uint8_t *pixels, ptrdiff_t stride); -void ff_diff_pixels_armv6(int16_t *block, const uint8_t *s1, +void ff_diff_pixels_armv6(int16_t *restrict block, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride); -void ff_get_pixels_neon(int16_t *block, const uint8_t *pixels, +void ff_get_pixels_neon(int16_t *restrict block, const uint8_t *pixels, ptrdiff_t stride); -void ff_get_pixels_unaligned_neon(int16_t *block, const uint8_t *pixels, +void ff_get_pixels_unaligned_neon(int16_t *restrict block, const uint8_t *pixels, ptrdiff_t stride); -void ff_diff_pixels_neon(int16_t *block, const uint8_t *s1, +void ff_diff_pixels_neon(int16_t *restrict block, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride); -void ff_diff_pixels_unaligned_neon(int16_t *block, const uint8_t *s1, +void ff_diff_pixels_unaligned_neon(int16_t *restrict block, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride); av_cold void ff_pixblockdsp_init_arm(PixblockDSPContext *c, diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index a477b84261..f25c3ddfee 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -56,7 +56,7 @@ typedef struct DVEncContext { AVCodecContext *avctx; uint8_t *buf; - void (*get_pixels)(int16_t *block, const uint8_t *pixels, ptrdiff_t linesize); + void (*get_pixels)(int16_t *restrict block, const uint8_t *pixels, ptrdiff_t linesize); void (*fdct[2])(int16_t *block); me_cmp_func ildct_cmp; diff --git a/libavcodec/riscv/pixblockdsp_init.c b/libavcodec/riscv/pixblockdsp_init.c index e59fba63cc..083873c0b0 100644 --- a/libavcodec/riscv/pixblockdsp_init.c +++ b/libavcodec/riscv/pixblockdsp_init.c @@ -26,18 +26,18 @@ #include "libavutil/riscv/cpu.h" #include "libavcodec/pixblockdsp.h" -void ff_get_pixels_8_rvi(int16_t *block, const uint8_t *pixels, +void ff_get_pixels_8_rvi(int16_t *restrict block, const uint8_t *pixels, ptrdiff_t stride); -void ff_get_pixels_16_rvi(int16_t *block, const uint8_t *pixels, +void ff_get_pixels_16_rvi(int16_t *restrict block, const uint8_t *pixels, ptrdiff_t stride); -void ff_get_pixels_8_rvv(int16_t *block, const uint8_t *pixels, +void ff_get_pixels_8_rvv(int16_t *restrict block, const uint8_t *pixels, ptrdiff_t stride); -void ff_get_pixels_unaligned_8_rvv(int16_t *block, const uint8_t *pixels, +void ff_get_pixels_unaligned_8_rvv(int16_t *restrict block, const uint8_t *pixels, ptrdiff_t stride); -void ff_diff_pixels_rvv(int16_t *block, const uint8_t *s1, +void ff_diff_pixels_rvv(int16_t *restrict block, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride); -void ff_diff_pixels_unaligned_rvv(int16_t *block, const uint8_t *s1, +void ff_diff_pixels_unaligned_rvv(int16_t *restrict block, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride); av_cold void ff_pixblockdsp_init_riscv(PixblockDSPContext *c, diff --git a/libavcodec/x86/dnxhdenc_init.c b/libavcodec/x86/dnxhdenc_init.c index fd6f15005a..3010986b3e 100644 --- a/libavcodec/x86/dnxhdenc_init.c +++ b/libavcodec/x86/dnxhdenc_init.c @@ -25,7 +25,7 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/dnxhdenc.h" -void ff_get_pixels_8x4_sym_sse2(int16_t *block, const uint8_t *pixels, +void ff_get_pixels_8x4_sym_sse2(int16_t *restrict block, const uint8_t *pixels, ptrdiff_t line_size); av_cold void ff_dnxhdenc_init_x86(DNXHDEncContext *ctx) diff --git a/libavcodec/x86/pixblockdsp_init.c b/libavcodec/x86/pixblockdsp_init.c index f105775c2b..650a0eb4f6 100644 --- a/libavcodec/x86/pixblockdsp_init.c +++ b/libavcodec/x86/pixblockdsp_init.c @@ -23,8 +23,8 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/pixblockdsp.h" -void ff_get_pixels_sse2(int16_t *block, const uint8_t *pixels, ptrdiff_t stride); -void ff_diff_pixels_sse2(int16_t *block, const uint8_t *s1, const uint8_t *s2, +void ff_get_pixels_sse2(int16_t *restrict block, const uint8_t *pixels, ptrdiff_t stride); +void ff_diff_pixels_sse2(int16_t *restrict block, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride); av_cold void ff_pixblockdsp_init_x86(PixblockDSPContext *c,