* [FFmpeg-devel] [PATCH] avfilter/vf_setparams: use YUV colorspace negotiation API
@ 2024-02-10 10:56 Niklas Haas
2024-02-11 20:48 ` Niklas Haas
0 siblings, 1 reply; 2+ messages in thread
From: Niklas Haas @ 2024-02-10 10:56 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Niklas Haas
From: Niklas Haas <git@haasn.dev>
When this filter overrides frame properties, the outgoing frames have
a different YUV colorspace than the incoming ones. This requires
signalling the new colorspace on the outlink, and in particular, making
sure it's *not* set to a common ref with the input - otherwise the point
of this filter would be destroyed.
Untouched fields will continue being passed through, so we don't need to
do anything there.
---
libavfilter/vf_setparams.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/libavfilter/vf_setparams.c b/libavfilter/vf_setparams.c
index ae4c937518..a33c35a942 100644
--- a/libavfilter/vf_setparams.c
+++ b/libavfilter/vf_setparams.c
@@ -23,6 +23,7 @@
#include "libavutil/pixfmt.h"
#include "libavutil/opt.h"
#include "avfilter.h"
+#include "formats.h"
#include "internal.h"
#include "video.h"
@@ -120,6 +121,29 @@ static const AVOption setparams_options[] = {
AVFILTER_DEFINE_CLASS(setparams);
+static int query_formats(AVFilterContext *ctx)
+{
+ SetParamsContext *s = ctx->priv;
+ AVFilterLink *outlink = ctx->outputs[0];
+ int ret;
+
+ if (s->colorspace >= 0) {
+ ret = ff_formats_ref(ff_make_formats_list_singleton(s->colorspace),
+ &outlink->incfg.color_spaces);
+ if (ret < 0)
+ return ret;
+ }
+
+ if (s->color_range >= 0) {
+ ret = ff_formats_ref(ff_make_formats_list_singleton(s->color_range),
+ &outlink->incfg.color_ranges);
+ if (ret < 0)
+ return ret;
+ }
+
+ return 0;
+}
+
static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
{
AVFilterContext *ctx = inlink->dst;
@@ -177,6 +201,7 @@ const AVFilter ff_vf_setparams = {
.flags = AVFILTER_FLAG_METADATA_ONLY,
FILTER_INPUTS(inputs),
FILTER_OUTPUTS(ff_video_default_filterpad),
+ FILTER_QUERY_FUNC(query_formats),
};
#if CONFIG_SETRANGE_FILTER
@@ -217,6 +242,7 @@ const AVFilter ff_vf_setrange = {
.flags = AVFILTER_FLAG_METADATA_ONLY,
FILTER_INPUTS(inputs),
FILTER_OUTPUTS(ff_video_default_filterpad),
+ FILTER_QUERY_FUNC(query_formats),
};
#endif /* CONFIG_SETRANGE_FILTER */
--
2.43.0
_______________________________________________
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
* Re: [FFmpeg-devel] [PATCH] avfilter/vf_setparams: use YUV colorspace negotiation API
2024-02-10 10:56 [FFmpeg-devel] [PATCH] avfilter/vf_setparams: use YUV colorspace negotiation API Niklas Haas
@ 2024-02-11 20:48 ` Niklas Haas
0 siblings, 0 replies; 2+ messages in thread
From: Niklas Haas @ 2024-02-11 20:48 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Niklas Haas
On Sat, 10 Feb 2024 11:56:29 +0100 Niklas Haas <ffmpeg@haasn.xyz> wrote:
> From: Niklas Haas <git@haasn.dev>
>
> When this filter overrides frame properties, the outgoing frames have
> a different YUV colorspace than the incoming ones. This requires
> signalling the new colorspace on the outlink, and in particular, making
> sure it's *not* set to a common ref with the input - otherwise the point
> of this filter would be destroyed.
>
> Untouched fields will continue being passed through, so we don't need to
> do anything there.
> ---
> libavfilter/vf_setparams.c | 26 ++++++++++++++++++++++++++
> 1 file changed, 26 insertions(+)
>
> diff --git a/libavfilter/vf_setparams.c b/libavfilter/vf_setparams.c
> index ae4c937518..a33c35a942 100644
> --- a/libavfilter/vf_setparams.c
> +++ b/libavfilter/vf_setparams.c
> @@ -23,6 +23,7 @@
> #include "libavutil/pixfmt.h"
> #include "libavutil/opt.h"
> #include "avfilter.h"
> +#include "formats.h"
> #include "internal.h"
> #include "video.h"
>
> @@ -120,6 +121,29 @@ static const AVOption setparams_options[] = {
>
> AVFILTER_DEFINE_CLASS(setparams);
>
> +static int query_formats(AVFilterContext *ctx)
> +{
> + SetParamsContext *s = ctx->priv;
> + AVFilterLink *outlink = ctx->outputs[0];
> + int ret;
> +
> + if (s->colorspace >= 0) {
> + ret = ff_formats_ref(ff_make_formats_list_singleton(s->colorspace),
> + &outlink->incfg.color_spaces);
> + if (ret < 0)
> + return ret;
> + }
> +
> + if (s->color_range >= 0) {
> + ret = ff_formats_ref(ff_make_formats_list_singleton(s->color_range),
> + &outlink->incfg.color_ranges);
> + if (ret < 0)
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
> {
> AVFilterContext *ctx = inlink->dst;
> @@ -177,6 +201,7 @@ const AVFilter ff_vf_setparams = {
> .flags = AVFILTER_FLAG_METADATA_ONLY,
> FILTER_INPUTS(inputs),
> FILTER_OUTPUTS(ff_video_default_filterpad),
> + FILTER_QUERY_FUNC(query_formats),
> };
>
> #if CONFIG_SETRANGE_FILTER
> @@ -217,6 +242,7 @@ const AVFilter ff_vf_setrange = {
> .flags = AVFILTER_FLAG_METADATA_ONLY,
> FILTER_INPUTS(inputs),
> FILTER_OUTPUTS(ff_video_default_filterpad),
> + FILTER_QUERY_FUNC(query_formats),
> };
> #endif /* CONFIG_SETRANGE_FILTER */
Will merge rather soon without objection, as this prevents vf_setparams
from working correctly.
_______________________________________________
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:[~2024-02-11 20:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-10 10:56 [FFmpeg-devel] [PATCH] avfilter/vf_setparams: use YUV colorspace negotiation API Niklas Haas
2024-02-11 20:48 ` Niklas Haas
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