From: mkver via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Cc: mkver <code@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH] avfilter/vf_waveform: Avoid relocations (PR #21262)
Date: Mon, 22 Dec 2025 12:53:32 -0000
Message-ID: <176640801274.60.16895930707842798197@2cb04c0e5124> (raw)
PR #21262 opened by mkver
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21262
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21262.patch
>From c5c5462ef6103ce413977d957863517bae71669b Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Mon, 22 Dec 2025 13:28:56 +0100
Subject: [PATCH 1/2] avfilter/vf_waveform: don't cast const away
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavfilter/vf_waveform.c | 98 +++++++++++++++++++--------------------
1 file changed, 49 insertions(+), 49 deletions(-)
diff --git a/libavfilter/vf_waveform.c b/libavfilter/vf_waveform.c
index a8e4e71bf6..199b5f9eb5 100644
--- a/libavfilter/vf_waveform.c
+++ b/libavfilter/vf_waveform.c
@@ -114,7 +114,7 @@ typedef struct WaveformContext {
int scale;
uint8_t grat_yuva_color[4];
int shift_w[4], shift_h[4];
- GraticuleLines *glines;
+ const GraticuleLines *glines;
int nb_glines;
int rgb;
float ftint[2];
@@ -3180,26 +3180,26 @@ static int config_input(AVFilterLink *inlink)
switch (s->scale) {
case DIGITAL:
switch (s->bits) {
- case 8: s->glines = (GraticuleLines *)digital8; s->nb_glines = FF_ARRAY_ELEMS(digital8); break;
- case 9: s->glines = (GraticuleLines *)digital9; s->nb_glines = FF_ARRAY_ELEMS(digital9); break;
- case 10: s->glines = (GraticuleLines *)digital10; s->nb_glines = FF_ARRAY_ELEMS(digital10); break;
- case 12: s->glines = (GraticuleLines *)digital12; s->nb_glines = FF_ARRAY_ELEMS(digital12); break;
+ case 8: s->glines = digital8; s->nb_glines = FF_ARRAY_ELEMS(digital8); break;
+ case 9: s->glines = digital9; s->nb_glines = FF_ARRAY_ELEMS(digital9); break;
+ case 10: s->glines = digital10; s->nb_glines = FF_ARRAY_ELEMS(digital10); break;
+ case 12: s->glines = digital12; s->nb_glines = FF_ARRAY_ELEMS(digital12); break;
}
break;
case MILLIVOLTS:
switch (s->bits) {
- case 8: s->glines = (GraticuleLines *)millivolts8; s->nb_glines = FF_ARRAY_ELEMS(millivolts8); break;
- case 9: s->glines = (GraticuleLines *)millivolts9; s->nb_glines = FF_ARRAY_ELEMS(millivolts9); break;
- case 10: s->glines = (GraticuleLines *)millivolts10; s->nb_glines = FF_ARRAY_ELEMS(millivolts10); break;
- case 12: s->glines = (GraticuleLines *)millivolts12; s->nb_glines = FF_ARRAY_ELEMS(millivolts12); break;
+ case 8: s->glines = millivolts8; s->nb_glines = FF_ARRAY_ELEMS(millivolts8); break;
+ case 9: s->glines = millivolts9; s->nb_glines = FF_ARRAY_ELEMS(millivolts9); break;
+ case 10: s->glines = millivolts10; s->nb_glines = FF_ARRAY_ELEMS(millivolts10); break;
+ case 12: s->glines = millivolts12; s->nb_glines = FF_ARRAY_ELEMS(millivolts12); break;
}
break;
case IRE:
switch (s->bits) {
- case 8: s->glines = (GraticuleLines *)ire8; s->nb_glines = FF_ARRAY_ELEMS(ire8); break;
- case 9: s->glines = (GraticuleLines *)ire9; s->nb_glines = FF_ARRAY_ELEMS(ire9); break;
- case 10: s->glines = (GraticuleLines *)ire10; s->nb_glines = FF_ARRAY_ELEMS(ire10); break;
- case 12: s->glines = (GraticuleLines *)ire12; s->nb_glines = FF_ARRAY_ELEMS(ire12); break;
+ case 8: s->glines = ire8; s->nb_glines = FF_ARRAY_ELEMS(ire8); break;
+ case 9: s->glines = ire9; s->nb_glines = FF_ARRAY_ELEMS(ire9); break;
+ case 10: s->glines = ire10; s->nb_glines = FF_ARRAY_ELEMS(ire10); break;
+ case 12: s->glines = ire12; s->nb_glines = FF_ARRAY_ELEMS(ire12); break;
}
break;
}
@@ -3208,26 +3208,26 @@ static int config_input(AVFilterLink *inlink)
switch (s->scale) {
case DIGITAL:
switch (s->bits) {
- case 8: s->glines = (GraticuleLines *)chroma_digital8; s->nb_glines = FF_ARRAY_ELEMS(chroma_digital8); break;
- case 9: s->glines = (GraticuleLines *)chroma_digital9; s->nb_glines = FF_ARRAY_ELEMS(chroma_digital9); break;
- case 10: s->glines = (GraticuleLines *)chroma_digital10; s->nb_glines = FF_ARRAY_ELEMS(chroma_digital10); break;
- case 12: s->glines = (GraticuleLines *)chroma_digital12; s->nb_glines = FF_ARRAY_ELEMS(chroma_digital12); break;
+ case 8: s->glines = chroma_digital8; s->nb_glines = FF_ARRAY_ELEMS(chroma_digital8); break;
+ case 9: s->glines = chroma_digital9; s->nb_glines = FF_ARRAY_ELEMS(chroma_digital9); break;
+ case 10: s->glines = chroma_digital10; s->nb_glines = FF_ARRAY_ELEMS(chroma_digital10); break;
+ case 12: s->glines = chroma_digital12; s->nb_glines = FF_ARRAY_ELEMS(chroma_digital12); break;
}
break;
case MILLIVOLTS:
switch (s->bits) {
- case 8: s->glines = (GraticuleLines *)millivolts8; s->nb_glines = FF_ARRAY_ELEMS(millivolts8); break;
- case 9: s->glines = (GraticuleLines *)millivolts9; s->nb_glines = FF_ARRAY_ELEMS(millivolts9); break;
- case 10: s->glines = (GraticuleLines *)millivolts10; s->nb_glines = FF_ARRAY_ELEMS(millivolts10); break;
- case 12: s->glines = (GraticuleLines *)millivolts12; s->nb_glines = FF_ARRAY_ELEMS(millivolts12); break;
+ case 8: s->glines = millivolts8; s->nb_glines = FF_ARRAY_ELEMS(millivolts8); break;
+ case 9: s->glines = millivolts9; s->nb_glines = FF_ARRAY_ELEMS(millivolts9); break;
+ case 10: s->glines = millivolts10; s->nb_glines = FF_ARRAY_ELEMS(millivolts10); break;
+ case 12: s->glines = millivolts12; s->nb_glines = FF_ARRAY_ELEMS(millivolts12); break;
}
break;
case IRE:
switch (s->bits) {
- case 8: s->glines = (GraticuleLines *)ire8; s->nb_glines = FF_ARRAY_ELEMS(ire8); break;
- case 9: s->glines = (GraticuleLines *)ire9; s->nb_glines = FF_ARRAY_ELEMS(ire9); break;
- case 10: s->glines = (GraticuleLines *)ire10; s->nb_glines = FF_ARRAY_ELEMS(ire10); break;
- case 12: s->glines = (GraticuleLines *)ire12; s->nb_glines = FF_ARRAY_ELEMS(ire12); break;
+ case 8: s->glines = ire8; s->nb_glines = FF_ARRAY_ELEMS(ire8); break;
+ case 9: s->glines = ire9; s->nb_glines = FF_ARRAY_ELEMS(ire9); break;
+ case 10: s->glines = ire10; s->nb_glines = FF_ARRAY_ELEMS(ire10); break;
+ case 12: s->glines = ire12; s->nb_glines = FF_ARRAY_ELEMS(ire12); break;
}
break;
}
@@ -3238,26 +3238,26 @@ static int config_input(AVFilterLink *inlink)
switch (s->scale) {
case DIGITAL:
switch (s->bits) {
- case 8: s->glines = (GraticuleLines *)aflat_digital8; s->nb_glines = FF_ARRAY_ELEMS(aflat_digital8); break;
- case 9: s->glines = (GraticuleLines *)aflat_digital9; s->nb_glines = FF_ARRAY_ELEMS(aflat_digital9); break;
- case 10: s->glines = (GraticuleLines *)aflat_digital10; s->nb_glines = FF_ARRAY_ELEMS(aflat_digital10); break;
- case 12: s->glines = (GraticuleLines *)aflat_digital12; s->nb_glines = FF_ARRAY_ELEMS(aflat_digital12); break;
+ case 8: s->glines = aflat_digital8; s->nb_glines = FF_ARRAY_ELEMS(aflat_digital8); break;
+ case 9: s->glines = aflat_digital9; s->nb_glines = FF_ARRAY_ELEMS(aflat_digital9); break;
+ case 10: s->glines = aflat_digital10; s->nb_glines = FF_ARRAY_ELEMS(aflat_digital10); break;
+ case 12: s->glines = aflat_digital12; s->nb_glines = FF_ARRAY_ELEMS(aflat_digital12); break;
}
break;
case MILLIVOLTS:
switch (s->bits) {
- case 8: s->glines = (GraticuleLines *)aflat_millivolts8; s->nb_glines = FF_ARRAY_ELEMS(aflat_millivolts8); break;
- case 9: s->glines = (GraticuleLines *)aflat_millivolts9; s->nb_glines = FF_ARRAY_ELEMS(aflat_millivolts9); break;
- case 10: s->glines = (GraticuleLines *)aflat_millivolts10; s->nb_glines = FF_ARRAY_ELEMS(aflat_millivolts10); break;
- case 12: s->glines = (GraticuleLines *)aflat_millivolts12; s->nb_glines = FF_ARRAY_ELEMS(aflat_millivolts12); break;
+ case 8: s->glines = aflat_millivolts8; s->nb_glines = FF_ARRAY_ELEMS(aflat_millivolts8); break;
+ case 9: s->glines = aflat_millivolts9; s->nb_glines = FF_ARRAY_ELEMS(aflat_millivolts9); break;
+ case 10: s->glines = aflat_millivolts10; s->nb_glines = FF_ARRAY_ELEMS(aflat_millivolts10); break;
+ case 12: s->glines = aflat_millivolts12; s->nb_glines = FF_ARRAY_ELEMS(aflat_millivolts12); break;
}
break;
case IRE:
switch (s->bits) {
- case 8: s->glines = (GraticuleLines *)aflat_ire8; s->nb_glines = FF_ARRAY_ELEMS(aflat_ire8); break;
- case 9: s->glines = (GraticuleLines *)aflat_ire9; s->nb_glines = FF_ARRAY_ELEMS(aflat_ire9); break;
- case 10: s->glines = (GraticuleLines *)aflat_ire10; s->nb_glines = FF_ARRAY_ELEMS(aflat_ire10); break;
- case 12: s->glines = (GraticuleLines *)aflat_ire12; s->nb_glines = FF_ARRAY_ELEMS(aflat_ire12); break;
+ case 8: s->glines = aflat_ire8; s->nb_glines = FF_ARRAY_ELEMS(aflat_ire8); break;
+ case 9: s->glines = aflat_ire9; s->nb_glines = FF_ARRAY_ELEMS(aflat_ire9); break;
+ case 10: s->glines = aflat_ire10; s->nb_glines = FF_ARRAY_ELEMS(aflat_ire10); break;
+ case 12: s->glines = aflat_ire12; s->nb_glines = FF_ARRAY_ELEMS(aflat_ire12); break;
}
break;
}
@@ -3266,26 +3266,26 @@ static int config_input(AVFilterLink *inlink)
switch (s->scale) {
case DIGITAL:
switch (s->bits) {
- case 8: s->glines = (GraticuleLines *)flat_digital8; s->nb_glines = FF_ARRAY_ELEMS(flat_digital8); break;
- case 9: s->glines = (GraticuleLines *)flat_digital9; s->nb_glines = FF_ARRAY_ELEMS(flat_digital9); break;
- case 10: s->glines = (GraticuleLines *)flat_digital10; s->nb_glines = FF_ARRAY_ELEMS(flat_digital10); break;
- case 12: s->glines = (GraticuleLines *)flat_digital12; s->nb_glines = FF_ARRAY_ELEMS(flat_digital12); break;
+ case 8: s->glines = flat_digital8; s->nb_glines = FF_ARRAY_ELEMS(flat_digital8); break;
+ case 9: s->glines = flat_digital9; s->nb_glines = FF_ARRAY_ELEMS(flat_digital9); break;
+ case 10: s->glines = flat_digital10; s->nb_glines = FF_ARRAY_ELEMS(flat_digital10); break;
+ case 12: s->glines = flat_digital12; s->nb_glines = FF_ARRAY_ELEMS(flat_digital12); break;
}
break;
case MILLIVOLTS:
switch (s->bits) {
- case 8: s->glines = (GraticuleLines *)flat_millivolts8; s->nb_glines = FF_ARRAY_ELEMS(flat_millivolts8); break;
- case 9: s->glines = (GraticuleLines *)flat_millivolts9; s->nb_glines = FF_ARRAY_ELEMS(flat_millivolts9); break;
- case 10: s->glines = (GraticuleLines *)flat_millivolts10; s->nb_glines = FF_ARRAY_ELEMS(flat_millivolts10); break;
- case 12: s->glines = (GraticuleLines *)flat_millivolts12; s->nb_glines = FF_ARRAY_ELEMS(flat_millivolts12); break;
+ case 8: s->glines = flat_millivolts8; s->nb_glines = FF_ARRAY_ELEMS(flat_millivolts8); break;
+ case 9: s->glines = flat_millivolts9; s->nb_glines = FF_ARRAY_ELEMS(flat_millivolts9); break;
+ case 10: s->glines = flat_millivolts10; s->nb_glines = FF_ARRAY_ELEMS(flat_millivolts10); break;
+ case 12: s->glines = flat_millivolts12; s->nb_glines = FF_ARRAY_ELEMS(flat_millivolts12); break;
}
break;
case IRE:
switch (s->bits) {
- case 8: s->glines = (GraticuleLines *)flat_ire8; s->nb_glines = FF_ARRAY_ELEMS(flat_ire8); break;
- case 9: s->glines = (GraticuleLines *)flat_ire9; s->nb_glines = FF_ARRAY_ELEMS(flat_ire9); break;
- case 10: s->glines = (GraticuleLines *)flat_ire10; s->nb_glines = FF_ARRAY_ELEMS(flat_ire10); break;
- case 12: s->glines = (GraticuleLines *)flat_ire12; s->nb_glines = FF_ARRAY_ELEMS(flat_ire12); break;
+ case 8: s->glines = flat_ire8; s->nb_glines = FF_ARRAY_ELEMS(flat_ire8); break;
+ case 9: s->glines = flat_ire9; s->nb_glines = FF_ARRAY_ELEMS(flat_ire9); break;
+ case 10: s->glines = flat_ire10; s->nb_glines = FF_ARRAY_ELEMS(flat_ire10); break;
+ case 12: s->glines = flat_ire12; s->nb_glines = FF_ARRAY_ELEMS(flat_ire12); break;
}
break;
}
--
2.49.1
>From 9af4039ee841be9d1f3afb1ac094da3841e5d073 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Mon, 22 Dec 2025 13:31:48 +0100
Subject: [PATCH 2/2] avfilter/vf_waveform: Avoid relocations
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavfilter/vf_waveform.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/vf_waveform.c b/libavfilter/vf_waveform.c
index 199b5f9eb5..3c1cfcdc20 100644
--- a/libavfilter/vf_waveform.c
+++ b/libavfilter/vf_waveform.c
@@ -77,7 +77,7 @@ enum GraticuleType {
};
typedef struct GraticuleLine {
- const char *name;
+ char name[6];
uint16_t pos;
} GraticuleLine;
--
2.49.1
_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org
reply other threads:[~2025-12-22 12:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=176640801274.60.16895930707842798197@2cb04c0e5124 \
--to=ffmpeg-devel@ffmpeg.org \
--cc=code@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