Re: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_tpad: accept hardware frames in clone-only mode

2023-05-05 Thread Thilo Borgmann 

Am 01.05.23 um 14:18 schrieb Marvin Scholz:

When no drawing is to be performed, tpad can work fine with
hardware frames, so advertise this in the query_formats
callback and ensure the drawing context is never initialised
when just cloning frames.
---
  libavfilter/vf_tpad.c | 14 +++---
  1 file changed, 11 insertions(+), 3 deletions(-)


LGTM if tested.

-Thilo

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/2] avfilter/vf_tpad: accept hardware frames in clone-only mode

2023-05-01 Thread Marvin Scholz 
When no drawing is to be performed, tpad can work fine with
hardware frames, so advertise this in the query_formats
callback and ensure the drawing context is never initialised
when just cloning frames.
---
 libavfilter/vf_tpad.c | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/libavfilter/vf_tpad.c b/libavfilter/vf_tpad.c
index 88c3c99de4..cabfe33685 100644
--- a/libavfilter/vf_tpad.c
+++ b/libavfilter/vf_tpad.c
@@ -71,7 +71,12 @@ AVFILTER_DEFINE_CLASS(tpad);
 
 static int query_formats(AVFilterContext *ctx)
 {
-return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
+TPadContext *s = ctx->priv;
+if ((s->stop_mode == MODE_ADD && s->pad_stop != 0) ||
+(s->start_mode == MODE_ADD && s->pad_start != 0))
+return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
+
+return ff_set_common_formats(ctx, ff_all_formats(AVMEDIA_TYPE_VIDEO));
 }
 
 static int activate(AVFilterContext *ctx)
@@ -190,8 +195,11 @@ static int config_input(AVFilterLink *inlink)
 AVFilterContext *ctx = inlink->dst;
 TPadContext *s = ctx->priv;
 
-ff_draw_init(>draw, inlink->format, 0);
-ff_draw_color(>draw, >color, s->rgba_color);
+if ((s->stop_mode == MODE_ADD && s->pad_stop != 0) ||
+(s->start_mode == MODE_ADD && s->pad_start != 0)) {
+ff_draw_init(>draw, inlink->format, 0);
+ff_draw_color(>draw, >color, s->rgba_color);
+}
 
 if (s->start_duration)
 s->pad_start = av_rescale_q(s->start_duration, inlink->frame_rate, 
av_inv_q(AV_TIME_BASE_Q));
-- 
2.37.0 (Apple Git-136)

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_tpad: accept hardware frames in clone-only mode

2023-04-19 Thread Marvin Scholz 


On 19 Apr 2023, at 12:42, Marvin Scholz wrote:

> When no drawing is to be performed, tpad can work fine with
> hardware frames, so advertise this in the query_formats
> callback and ensure the drawing context is never initialized
> when just cloning frames.
> ---
>  libavfilter/vf_tpad.c | 15 ---
>  1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/libavfilter/vf_tpad.c b/libavfilter/vf_tpad.c
> index 88c3c99de4..9a9d06a8b8 100644
> --- a/libavfilter/vf_tpad.c
> +++ b/libavfilter/vf_tpad.c
> @@ -71,7 +71,13 @@ AVFILTER_DEFINE_CLASS(tpad);
>
>  static int query_formats(AVFilterContext *ctx)
>  {
> -return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
> +TPadContext *s = ctx->priv;
> +if ((s->stop_mode == MODE_ADD && s->pad_stop != 0) ||
> +(s->start_mode == MODE_ADD && s->pad_start != 0))
> +return ff_set_common_formats(ctx, 
> ff_draw_supported_pixel_formats(0));
> +
> +fprintf(stderr, "ONLY COPY\n");

Apparently I am not fully awake yet and forgot to update the commit with the 
removal
of this debug output… Will obviously be removed in the next iteration.

> +return ff_set_common_formats(ctx, ff_all_formats(AVMEDIA_TYPE_VIDEO));
>  }
>
>  static int activate(AVFilterContext *ctx)
> @@ -190,8 +196,11 @@ static int config_input(AVFilterLink *inlink)
>  AVFilterContext *ctx = inlink->dst;
>  TPadContext *s = ctx->priv;
>
> -ff_draw_init(>draw, inlink->format, 0);
> -ff_draw_color(>draw, >color, s->rgba_color);
> +if ((s->stop_mode == MODE_ADD && s->pad_stop != 0) ||
> +(s->start_mode == MODE_ADD && s->pad_start != 0)) {
> +ff_draw_init(>draw, inlink->format, 0);
> +ff_draw_color(>draw, >color, s->rgba_color);
> +}
>
>  if (s->start_duration)
>  s->pad_start = av_rescale_q(s->start_duration, inlink->frame_rate, 
> av_inv_q(AV_TIME_BASE_Q));
> -- 
> 2.37.0 (Apple Git-136)
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/2] avfilter/vf_tpad: accept hardware frames in clone-only mode

2023-04-19 Thread Marvin Scholz 
When no drawing is to be performed, tpad can work fine with
hardware frames, so advertise this in the query_formats
callback and ensure the drawing context is never initialized
when just cloning frames.
---
 libavfilter/vf_tpad.c | 15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/libavfilter/vf_tpad.c b/libavfilter/vf_tpad.c
index 88c3c99de4..9a9d06a8b8 100644
--- a/libavfilter/vf_tpad.c
+++ b/libavfilter/vf_tpad.c
@@ -71,7 +71,13 @@ AVFILTER_DEFINE_CLASS(tpad);
 
 static int query_formats(AVFilterContext *ctx)
 {
-return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
+TPadContext *s = ctx->priv;
+if ((s->stop_mode == MODE_ADD && s->pad_stop != 0) ||
+(s->start_mode == MODE_ADD && s->pad_start != 0))
+return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
+
+fprintf(stderr, "ONLY COPY\n");
+return ff_set_common_formats(ctx, ff_all_formats(AVMEDIA_TYPE_VIDEO));
 }
 
 static int activate(AVFilterContext *ctx)
@@ -190,8 +196,11 @@ static int config_input(AVFilterLink *inlink)
 AVFilterContext *ctx = inlink->dst;
 TPadContext *s = ctx->priv;
 
-ff_draw_init(>draw, inlink->format, 0);
-ff_draw_color(>draw, >color, s->rgba_color);
+if ((s->stop_mode == MODE_ADD && s->pad_stop != 0) ||
+(s->start_mode == MODE_ADD && s->pad_start != 0)) {
+ff_draw_init(>draw, inlink->format, 0);
+ff_draw_color(>draw, >color, s->rgba_color);
+}
 
 if (s->start_duration)
 s->pad_start = av_rescale_q(s->start_duration, inlink->frame_rate, 
av_inv_q(AV_TIME_BASE_Q));
-- 
2.37.0 (Apple Git-136)

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".