* [FFmpeg-devel] [PATCH 1/3] avfilter/delogo: add parameter to switch on circular delogo
@ 2025-02-03 20:45 Jörg Habenicht via ffmpeg-devel
0 siblings, 0 replies; 2+ messages in thread
From: Jörg Habenicht via ffmpeg-devel @ 2025-02-03 20:45 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Jörg Habenicht
Add a parameter (boolean) r to switch the area from
rectangular (r=0) to circular(r=1) delogo.
Signed-off-by: Jörg Habenicht <j.habenicht@gmx.de>
---
libavfilter/vf_delogo.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c
index bfbf8e6f4c..7641c3b483 100644
--- a/libavfilter/vf_delogo.c
+++ b/libavfilter/vf_delogo.c
@@ -195,7 +195,7 @@ static void apply_delogo(uint8_t *dst, int dst_linesize,
typedef struct DelogoContext {
const AVClass *class;
- int x, y, w, h, band, show;
+ int x, y, w, h, band, show, round;
char *x_expr, *y_expr, *w_expr, *h_expr;
AVExpr *x_pexpr, *y_pexpr, *w_pexpr, *h_pexpr;
double var_values[VAR_VARS_NB];
@@ -209,6 +209,7 @@ static const AVOption delogo_options[]= {
{ "y", "set logo y position", OFFSET(y_expr),
AV_OPT_TYPE_STRING, { .str = "-1" }, 0, 0, FLAGS },
{ "w", "set logo width", OFFSET(w_expr),
AV_OPT_TYPE_STRING, { .str = "-1" }, 0, 0, FLAGS },
{ "h", "set logo height", OFFSET(h_expr),
AV_OPT_TYPE_STRING, { .str = "-1" }, 0, 0, FLAGS },
+ { "r", "logo is round/ellipse", OFFSET(round),
AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
{ "show", "show delogo area", OFFSET(show),
AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
{ NULL }
};
@@ -259,8 +260,8 @@ static av_cold int init(AVFilterContext *ctx)
s->band = 1;
- av_log(ctx, AV_LOG_VERBOSE, "x:%d y:%d, w:%d h:%d band:%d show:%d\n",
- s->x, s->y, s->w, s->h, s->band, s->show);
+ av_log(ctx, AV_LOG_VERBOSE, "x:%d y:%d, w:%d h:%d band:%d round:%d
show:%d\n",
+ s->x, s->y, s->w, s->h, s->band, s->round, s->show);
s->w += s->band*2;
s->h += s->band*2;
--
2.45.3
_______________________________________________
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".
^ permalink raw reply [flat|nested] 2+ messages in thread* [FFmpeg-devel] [PATCH 0/3] Patch to create a circular delogo area
@ 2025-02-04 19:53 Jörg Habenicht via ffmpeg-devel
2025-02-04 19:53 ` [FFmpeg-devel] [PATCH 1/3] avfilter/delogo: add parameter to switch on circular delogo Jörg Habenicht via ffmpeg-devel
0 siblings, 1 reply; 2+ messages in thread
From: Jörg Habenicht via ffmpeg-devel @ 2025-02-04 19:53 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Jörg Habenicht
Dear list,
sorry for the previous posting. I noticed the lines got mangled. So here
is a new try to get the patches right.
Old text:
I made a patch for the delogo filter. With this I can create a circular or
elliptic zone to apply the delogo algorithm. The borders are defined with
x,y,w,h parameter just like the rectangular area definition. To become
circular I added an additional parameter 'r'=0/1 defaulting to '0' i.e.
rectangular area definition.
I added a large comment to the function body describing the calculation
of the ellipse. Hope you don't mind.
The patch has been tested with 'make fate-rsync fate' and applies
clean to the master branch, commit 957eb2323a924aa0b148927889eae581185c367b .
Please have a look.
best regards
Jörg
Jörg Habenicht (3):
avfilter/delogo: add parameter to switch on circular delogo
avfilter/delogo: added circular delogo algorithm description
avfilter/delogo: added the circular delogo algorithm
libavfilter/vf_delogo.c | 59 +++++++++++++++++++++++++++++++++++++----
1 file changed, 54 insertions(+), 5 deletions(-)
--
2.45.3
_______________________________________________
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".
^ permalink raw reply [flat|nested] 2+ messages in thread
* [FFmpeg-devel] [PATCH 1/3] avfilter/delogo: add parameter to switch on circular delogo
2025-02-04 19:53 [FFmpeg-devel] [PATCH 0/3] Patch to create a circular delogo area Jörg Habenicht via ffmpeg-devel
@ 2025-02-04 19:53 ` Jörg Habenicht via ffmpeg-devel
0 siblings, 0 replies; 2+ messages in thread
From: Jörg Habenicht via ffmpeg-devel @ 2025-02-04 19:53 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Jörg Habenicht
Add a parameter (boolean) r to switch the area from
rectangular (r=0) to circular(r=1) delogo.
Signed-off-by: Jörg Habenicht <j.habenicht@gmx.de>
---
libavfilter/vf_delogo.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c
index bfbf8e6f4c..7641c3b483 100644
--- a/libavfilter/vf_delogo.c
+++ b/libavfilter/vf_delogo.c
@@ -195,7 +195,7 @@ static void apply_delogo(uint8_t *dst, int dst_linesize,
typedef struct DelogoContext {
const AVClass *class;
- int x, y, w, h, band, show;
+ int x, y, w, h, band, show, round;
char *x_expr, *y_expr, *w_expr, *h_expr;
AVExpr *x_pexpr, *y_pexpr, *w_pexpr, *h_pexpr;
double var_values[VAR_VARS_NB];
@@ -209,6 +209,7 @@ static const AVOption delogo_options[]= {
{ "y", "set logo y position", OFFSET(y_expr), AV_OPT_TYPE_STRING, { .str = "-1" }, 0, 0, FLAGS },
{ "w", "set logo width", OFFSET(w_expr), AV_OPT_TYPE_STRING, { .str = "-1" }, 0, 0, FLAGS },
{ "h", "set logo height", OFFSET(h_expr), AV_OPT_TYPE_STRING, { .str = "-1" }, 0, 0, FLAGS },
+ { "r", "logo is round/ellipse", OFFSET(round), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
{ "show", "show delogo area", OFFSET(show), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
{ NULL }
};
@@ -259,8 +260,8 @@ static av_cold int init(AVFilterContext *ctx)
s->band = 1;
- av_log(ctx, AV_LOG_VERBOSE, "x:%d y:%d, w:%d h:%d band:%d show:%d\n",
- s->x, s->y, s->w, s->h, s->band, s->show);
+ av_log(ctx, AV_LOG_VERBOSE, "x:%d y:%d, w:%d h:%d band:%d round:%d show:%d\n",
+ s->x, s->y, s->w, s->h, s->band, s->round, s->show);
s->w += s->band*2;
s->h += s->band*2;
--
2.45.3
_______________________________________________
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".
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-02-04 19:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-03 20:45 [FFmpeg-devel] [PATCH 1/3] avfilter/delogo: add parameter to switch on circular delogo Jörg Habenicht via ffmpeg-devel
2025-02-04 19:53 [FFmpeg-devel] [PATCH 0/3] Patch to create a circular delogo area Jörg Habenicht via ffmpeg-devel
2025-02-04 19:53 ` [FFmpeg-devel] [PATCH 1/3] avfilter/delogo: add parameter to switch on circular delogo Jörg Habenicht via ffmpeg-devel
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