From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH 3/9] avfilter/bwdifdsp: Constify
Date: Mon, 25 Sep 2023 20:04:51 +0200
Message-ID: <AS8P250MB074407B0BC8647CE06E3A0E18FFCA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <AS8P250MB0744D7FEB3A2719DC2D9F0EA8FFCA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavfilter/aarch64/vf_bwdif_init_aarch64.c | 12 ++---
libavfilter/bwdifdsp.c | 60 ++++++++++-----------
libavfilter/bwdifdsp.h | 12 ++---
libavfilter/x86/vf_bwdif_init.c | 12 ++---
4 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/libavfilter/aarch64/vf_bwdif_init_aarch64.c b/libavfilter/aarch64/vf_bwdif_init_aarch64.c
index 2b8d212de6..74530ed5b7 100644
--- a/libavfilter/aarch64/vf_bwdif_init_aarch64.c
+++ b/libavfilter/aarch64/vf_bwdif_init_aarch64.c
@@ -24,14 +24,14 @@
#include "libavfilter/bwdifdsp.h"
#include "libavutil/aarch64/cpu.h"
-void ff_bwdif_filter_edge_neon(void *dst1, void *prev1, void *cur1, void *next1,
+void ff_bwdif_filter_edge_neon(void *dst1, const void *prev1, const void *cur1, const void *next1,
int w, int prefs, int mrefs, int prefs2, int mrefs2,
int parity, int clip_max, int spat);
-void ff_bwdif_filter_intra_neon(void *dst1, void *cur1, int w, int prefs, int mrefs,
+void ff_bwdif_filter_intra_neon(void *dst1, const void *cur1, int w, int prefs, int mrefs,
int prefs3, int mrefs3, int parity, int clip_max);
-void ff_bwdif_filter_line_neon(void *dst1, void *prev1, void *cur1, void *next1,
+void ff_bwdif_filter_line_neon(void *dst1, const void *prev1, const void *cur1, const void *next1,
int w, int prefs, int mrefs, int prefs2, int mrefs2,
int prefs3, int mrefs3, int prefs4, int mrefs4,
int parity, int clip_max);
@@ -64,7 +64,7 @@ static void filter_line3_helper(void * dst1, int d_stride,
w - w0, parity, clip_max);
}
-static void filter_line_helper(void *dst1, void *prev1, void *cur1, void *next1,
+static void filter_line_helper(void *dst1, const void *prev1, const void *cur1, const void *next1,
int w, int prefs, int mrefs, int prefs2, int mrefs2,
int prefs3, int mrefs3, int prefs4, int mrefs4,
int parity, int clip_max)
@@ -79,7 +79,7 @@ static void filter_line_helper(void *dst1, void *prev1, void *cur1, void *next1,
w - w0, prefs, mrefs, prefs2, mrefs2, prefs3, mrefs3, prefs4, mrefs4, parity, clip_max);
}
-static void filter_edge_helper(void *dst1, void *prev1, void *cur1, void *next1,
+static void filter_edge_helper(void *dst1, const void *prev1, const void *cur1, const void *next1,
int w, int prefs, int mrefs, int prefs2, int mrefs2,
int parity, int clip_max, int spat)
{
@@ -94,7 +94,7 @@ static void filter_edge_helper(void *dst1, void *prev1, void *cur1, void *next1,
parity, clip_max, spat);
}
-static void filter_intra_helper(void *dst1, void *cur1, int w, int prefs, int mrefs,
+static void filter_intra_helper(void *dst1, const void *cur1, int w, int prefs, int mrefs,
int prefs3, int mrefs3, int parity, int clip_max)
{
const int w0 = clip_max != 255 ? 0 : w & ~15;
diff --git a/libavfilter/bwdifdsp.c b/libavfilter/bwdifdsp.c
index af217481a5..65bdbdc053 100644
--- a/libavfilter/bwdifdsp.c
+++ b/libavfilter/bwdifdsp.c
@@ -115,27 +115,27 @@ static const uint16_t coef_sp[2] = { 5077, 981 };
next2++; \
}
-void ff_bwdif_filter_intra_c(void *dst1, void *cur1, int w, int prefs, int mrefs,
+void ff_bwdif_filter_intra_c(void *dst1, const void *cur1, int w, int prefs, int mrefs,
int prefs3, int mrefs3, int parity, int clip_max)
{
uint8_t *dst = dst1;
- uint8_t *cur = cur1;
+ const uint8_t *cur = cur1;
int interpol, x;
FILTER_INTRA()
}
-void ff_bwdif_filter_line_c(void *dst1, void *prev1, void *cur1, void *next1,
+void ff_bwdif_filter_line_c(void *dst1, const void *prev1, const void *cur1, const void *next1,
int w, int prefs, int mrefs, int prefs2, int mrefs2,
int prefs3, int mrefs3, int prefs4, int mrefs4,
int parity, int clip_max)
{
uint8_t *dst = dst1;
- uint8_t *prev = prev1;
- uint8_t *cur = cur1;
- uint8_t *next = next1;
- uint8_t *prev2 = parity ? prev : cur ;
- uint8_t *next2 = parity ? cur : next;
+ const uint8_t *prev = prev1;
+ const uint8_t *cur = cur1;
+ const uint8_t *next = next1;
+ const uint8_t *prev2 = parity ? prev : cur ;
+ const uint8_t *next2 = parity ? cur : next;
int interpol, x;
FILTER1()
@@ -159,25 +159,25 @@ void ff_bwdif_filter_line3_c(void * dst1, int d_stride,
const uint8_t * cur = cur1;
const uint8_t * next = next1;
- ff_bwdif_filter_line_c(dst, (void*)prev, (void*)cur, (void*)next, w,
+ ff_bwdif_filter_line_c(dst, prev, cur, next, w,
prefs, -prefs, prefs * 2, - prefs * 2, prefs * 3, -prefs * 3, prefs * 4, -prefs * 4, parity, clip_max);
NEXT_LINE();
memcpy(dst, cur, w);
NEXT_LINE();
- ff_bwdif_filter_line_c(dst, (void*)prev, (void*)cur, (void*)next, w,
+ ff_bwdif_filter_line_c(dst, prev, cur, next, w,
prefs, -prefs, prefs * 2, - prefs * 2, prefs * 3, -prefs * 3, prefs * 4, -prefs * 4, parity, clip_max);
}
-void ff_bwdif_filter_edge_c(void *dst1, void *prev1, void *cur1, void *next1,
+void ff_bwdif_filter_edge_c(void *dst1, const void *prev1, const void *cur1, const void *next1,
int w, int prefs, int mrefs, int prefs2, int mrefs2,
int parity, int clip_max, int spat)
{
uint8_t *dst = dst1;
- uint8_t *prev = prev1;
- uint8_t *cur = cur1;
- uint8_t *next = next1;
- uint8_t *prev2 = parity ? prev : cur ;
- uint8_t *next2 = parity ? cur : next;
+ const uint8_t *prev = prev1;
+ const uint8_t *cur = cur1;
+ const uint8_t *next = next1;
+ const uint8_t *prev2 = parity ? prev : cur ;
+ const uint8_t *next2 = parity ? cur : next;
int interpol, x;
FILTER1()
@@ -185,27 +185,27 @@ void ff_bwdif_filter_edge_c(void *dst1, void *prev1, void *cur1, void *next1,
FILTER2()
}
-static void filter_intra_16bit(void *dst1, void *cur1, int w, int prefs, int mrefs,
+static void filter_intra_16bit(void *dst1, const void *cur1, int w, int prefs, int mrefs,
int prefs3, int mrefs3, int parity, int clip_max)
{
uint16_t *dst = dst1;
- uint16_t *cur = cur1;
+ const uint16_t *cur = cur1;
int interpol, x;
FILTER_INTRA()
}
-static void filter_line_c_16bit(void *dst1, void *prev1, void *cur1, void *next1,
+static void filter_line_c_16bit(void *dst1, const void *prev1, const void *cur1, const void *next1,
int w, int prefs, int mrefs, int prefs2, int mrefs2,
int prefs3, int mrefs3, int prefs4, int mrefs4,
int parity, int clip_max)
{
uint16_t *dst = dst1;
- uint16_t *prev = prev1;
- uint16_t *cur = cur1;
- uint16_t *next = next1;
- uint16_t *prev2 = parity ? prev : cur ;
- uint16_t *next2 = parity ? cur : next;
+ const uint16_t *prev = prev1;
+ const uint16_t *cur = cur1;
+ const uint16_t *next = next1;
+ const uint16_t *prev2 = parity ? prev : cur ;
+ const uint16_t *next2 = parity ? cur : next;
int interpol, x;
FILTER1()
@@ -213,16 +213,16 @@ static void filter_line_c_16bit(void *dst1, void *prev1, void *cur1, void *next1
FILTER2()
}
-static void filter_edge_16bit(void *dst1, void *prev1, void *cur1, void *next1,
+static void filter_edge_16bit(void *dst1, const void *prev1, const void *cur1, const void *next1,
int w, int prefs, int mrefs, int prefs2, int mrefs2,
int parity, int clip_max, int spat)
{
uint16_t *dst = dst1;
- uint16_t *prev = prev1;
- uint16_t *cur = cur1;
- uint16_t *next = next1;
- uint16_t *prev2 = parity ? prev : cur ;
- uint16_t *next2 = parity ? cur : next;
+ const uint16_t *prev = prev1;
+ const uint16_t *cur = cur1;
+ const uint16_t *next = next1;
+ const uint16_t *prev2 = parity ? prev : cur ;
+ const uint16_t *next2 = parity ? cur : next;
int interpol, x;
FILTER1()
diff --git a/libavfilter/bwdifdsp.h b/libavfilter/bwdifdsp.h
index 1ff810719f..4bf595355c 100644
--- a/libavfilter/bwdifdsp.h
+++ b/libavfilter/bwdifdsp.h
@@ -20,13 +20,13 @@
#define AVFILTER_BWDIFDSP_H
typedef struct BWDIFDSPContext {
- void (*filter_intra)(void *dst1, void *cur1, int w, int prefs, int mrefs,
+ void (*filter_intra)(void *dst1, const void *cur1, int w, int prefs, int mrefs,
int prefs3, int mrefs3, int parity, int clip_max);
- void (*filter_line)(void *dst, void *prev, void *cur, void *next,
+ void (*filter_line)(void *dst, const void *prev, const void *cur, const void *next,
int w, int prefs, int mrefs, int prefs2, int mrefs2,
int prefs3, int mrefs3, int prefs4, int mrefs4,
int parity, int clip_max);
- void (*filter_edge)(void *dst, void *prev, void *cur, void *next,
+ void (*filter_edge)(void *dst, const void *prev, const void *cur, const void *next,
int w, int prefs, int mrefs, int prefs2, int mrefs2,
int parity, int clip_max, int spat);
void (*filter_line3)(void *dst, int dstride,
@@ -38,14 +38,14 @@ void ff_bwdif_init_filter_line(BWDIFDSPContext *bwdif, int bit_depth);
void ff_bwdif_init_x86(BWDIFDSPContext *bwdif, int bit_depth);
void ff_bwdif_init_aarch64(BWDIFDSPContext *bwdif, int bit_depth);
-void ff_bwdif_filter_edge_c(void *dst1, void *prev1, void *cur1, void *next1,
+void ff_bwdif_filter_edge_c(void *dst1, const void *prev1, const void *cur1, const void *next1,
int w, int prefs, int mrefs, int prefs2, int mrefs2,
int parity, int clip_max, int spat);
-void ff_bwdif_filter_intra_c(void *dst1, void *cur1, int w, int prefs, int mrefs,
+void ff_bwdif_filter_intra_c(void *dst1, const void *cur1, int w, int prefs, int mrefs,
int prefs3, int mrefs3, int parity, int clip_max);
-void ff_bwdif_filter_line_c(void *dst1, void *prev1, void *cur1, void *next1,
+void ff_bwdif_filter_line_c(void *dst1, const void *prev1, const void *cur1, const void *next1,
int w, int prefs, int mrefs, int prefs2, int mrefs2,
int prefs3, int mrefs3, int prefs4, int mrefs4,
int parity, int clip_max);
diff --git a/libavfilter/x86/vf_bwdif_init.c b/libavfilter/x86/vf_bwdif_init.c
index b1d1d6a91c..69a70e3293 100644
--- a/libavfilter/x86/vf_bwdif_init.c
+++ b/libavfilter/x86/vf_bwdif_init.c
@@ -24,28 +24,28 @@
#include "libavutil/x86/cpu.h"
#include "libavfilter/bwdifdsp.h"
-void ff_bwdif_filter_line_sse2(void *dst, void *prev, void *cur, void *next,
+void ff_bwdif_filter_line_sse2(void *dst, const void *prev, const void *cur, const void *next,
int w, int prefs, int mrefs, int prefs2,
int mrefs2, int prefs3, int mrefs3, int prefs4,
int mrefs4, int parity, int clip_max);
-void ff_bwdif_filter_line_ssse3(void *dst, void *prev, void *cur, void *next,
+void ff_bwdif_filter_line_ssse3(void *dst, const void *prev, const void *cur, const void *next,
int w, int prefs, int mrefs, int prefs2,
int mrefs2, int prefs3, int mrefs3, int prefs4,
int mrefs4, int parity, int clip_max);
-void ff_bwdif_filter_line_avx2(void *dst, void *prev, void *cur, void *next,
+void ff_bwdif_filter_line_avx2(void *dst, const void *prev, const void *cur, const void *next,
int w, int prefs, int mrefs, int prefs2,
int mrefs2, int prefs3, int mrefs3, int prefs4,
int mrefs4, int parity, int clip_max);
-void ff_bwdif_filter_line_12bit_sse2(void *dst, void *prev, void *cur, void *next,
+void ff_bwdif_filter_line_12bit_sse2(void *dst, const void *prev, const void *cur, const void *next,
int w, int prefs, int mrefs, int prefs2,
int mrefs2, int prefs3, int mrefs3, int prefs4,
int mrefs4, int parity, int clip_max);
-void ff_bwdif_filter_line_12bit_ssse3(void *dst, void *prev, void *cur, void *next,
+void ff_bwdif_filter_line_12bit_ssse3(void *dst, const void *prev, const void *cur, const void *next,
int w, int prefs, int mrefs, int prefs2,
int mrefs2, int prefs3, int mrefs3, int prefs4,
int mrefs4, int parity, int clip_max);
-void ff_bwdif_filter_line_12bit_avx2(void *dst, void *prev, void *cur, void *next,
+void ff_bwdif_filter_line_12bit_avx2(void *dst, const void *prev, const void *cur, const void *next,
int w, int prefs, int mrefs, int prefs2,
int mrefs2, int prefs3, int mrefs3, int prefs4,
int mrefs4, int parity, int clip_max);
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2023-09-25 18:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-25 17:53 [FFmpeg-devel] [PATCH 1/9] avfilter/bwdif: Add proper BWDIFDSPContext Andreas Rheinhardt
2023-09-25 18:04 ` [FFmpeg-devel] [PATCH 2/9] avfilter/vf_bwdif: Move DSP code to a new file Andreas Rheinhardt
2023-09-25 18:04 ` Andreas Rheinhardt [this message]
2023-09-25 18:04 ` [FFmpeg-devel] [PATCH 4/9] avfilter/bwdifdsp: Avoid including ff_bwdif_filter_line3_c() Andreas Rheinhardt
2023-09-25 18:04 ` [FFmpeg-devel] [PATCH 5/9] checkasm/motion: Don't allocate AVCodecContext Andreas Rheinhardt
2023-09-25 18:04 ` [FFmpeg-devel] [PATCH 6/9] avcodec/snow: Split ff_snow_get_buffer() Andreas Rheinhardt
2023-09-25 18:04 ` [FFmpeg-devel] [PATCH 7/9] avcodec/snow: Move decoder parts out of ff_snow_common_init_after_header Andreas Rheinhardt
2023-09-25 18:04 ` [FFmpeg-devel] [PATCH 8/9] avcodec/aacsbrdata: Move ff_sbr_noise_table to sbrdsp_template.c Andreas Rheinhardt
2023-09-25 18:04 ` [FFmpeg-devel] [PATCH 9/9] avcodec/tests/.gitignore: Add bitstream test tools Andreas Rheinhardt
2023-09-26 22:11 ` [FFmpeg-devel] [PATCH 1/9] avfilter/bwdif: Add proper BWDIFDSPContext Andreas Rheinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AS8P250MB074407B0BC8647CE06E3A0E18FFCA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM \
--to=andreas.rheinhardt@outlook.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git