From aaed9272c1a5cc7dbdf8f23884bc90e3e6f17088 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Wed, 27 Sep 2023 13:55:33 +0200 Subject: [PATCH] video-filters: Fix passthrough with ANY caps feature With the support for DRM modifiers, passthrough caps must now include DMA_DRM format, otherwise pipeline using thhese filters unconditionally may fail to negotiate. Part-of: --- subprojects/gst-plugins-bad/ext/assrender/gstassrender.c | 2 +- subprojects/gst-plugins-bad/ext/qroverlay/gstbaseqroverlay.c | 2 +- subprojects/gst-plugins-bad/ext/ttml/gstttmlrender.c | 2 +- subprojects/gst-plugins-bad/gst/debugutils/gstfakevideosink.c | 2 +- .../gst-plugins-bad/gst/dvbsuboverlay/gstdvbsuboverlay.c | 2 +- .../gst/overlaycomposition/gstoverlaycomposition.c | 2 +- .../gst/videoconvertscale/gstvideoconvertscale.c | 2 +- subprojects/gst-plugins-good/gst/deinterlace/gstdeinterlace.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/subprojects/gst-plugins-bad/ext/assrender/gstassrender.c b/subprojects/gst-plugins-bad/ext/assrender/gstassrender.c index f1639ff906..9e531526b3 100644 --- a/subprojects/gst-plugins-bad/ext/assrender/gstassrender.c +++ b/subprojects/gst-plugins-bad/ext/assrender/gstassrender.c @@ -69,7 +69,7 @@ enum #define ASSRENDER_CAPS GST_VIDEO_CAPS_MAKE(FORMATS) #define ASSRENDER_ALL_CAPS ASSRENDER_CAPS ";" \ - GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", GST_VIDEO_FORMATS_ALL) + GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", GST_VIDEO_FORMATS_ANY) static GstStaticCaps sw_template_caps = GST_STATIC_CAPS (ASSRENDER_CAPS); diff --git a/subprojects/gst-plugins-bad/ext/qroverlay/gstbaseqroverlay.c b/subprojects/gst-plugins-bad/ext/qroverlay/gstbaseqroverlay.c index 04257e55a5..7988d899ba 100644 --- a/subprojects/gst-plugins-bad/ext/qroverlay/gstbaseqroverlay.c +++ b/subprojects/gst-plugins-bad/ext/qroverlay/gstbaseqroverlay.c @@ -71,7 +71,7 @@ struct _GstBaseQROverlayPrivate #define OVERLAY_COMPOSITION_CAPS GST_VIDEO_CAPS_MAKE (GST_VIDEO_OVERLAY_COMPOSITION_BLEND_FORMATS) #define ALL_CAPS OVERLAY_COMPOSITION_CAPS ";" \ - GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", GST_VIDEO_FORMATS_ALL) + GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", GST_VIDEO_FORMATS_ANY) static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, diff --git a/subprojects/gst-plugins-bad/ext/ttml/gstttmlrender.c b/subprojects/gst-plugins-bad/ext/ttml/gstttmlrender.c index 393258dcac..d04db4f67e 100644 --- a/subprojects/gst-plugins-bad/ext/ttml/gstttmlrender.c +++ b/subprojects/gst-plugins-bad/ext/ttml/gstttmlrender.c @@ -58,7 +58,7 @@ #define TTML_RENDER_CAPS GST_VIDEO_CAPS_MAKE (VIDEO_FORMATS) #define TTML_RENDER_ALL_CAPS TTML_RENDER_CAPS ";" \ - GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", GST_VIDEO_FORMATS_ALL) + GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", GST_VIDEO_FORMATS_ANY) GST_DEBUG_CATEGORY_EXTERN (ttmlrender_debug); #define GST_CAT_DEFAULT ttmlrender_debug diff --git a/subprojects/gst-plugins-bad/gst/debugutils/gstfakevideosink.c b/subprojects/gst-plugins-bad/gst/debugutils/gstfakevideosink.c index 3719036f9f..8c3275006d 100644 --- a/subprojects/gst-plugins-bad/gst/debugutils/gstfakevideosink.c +++ b/subprojects/gst-plugins-bad/gst/debugutils/gstfakevideosink.c @@ -162,7 +162,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", - "{ " GST_VIDEO_FORMATS_ALL_STR ", " "DMA_DRM" " }"))); + GST_VIDEO_FORMATS_ANY))); G_DEFINE_TYPE (GstFakeVideoSink, gst_fake_video_sink, GST_TYPE_BIN); GST_ELEMENT_REGISTER_DEFINE (fakevideosink, "fakevideosink", diff --git a/subprojects/gst-plugins-bad/gst/dvbsuboverlay/gstdvbsuboverlay.c b/subprojects/gst-plugins-bad/gst/dvbsuboverlay/gstdvbsuboverlay.c index d8ac5d6fdd..72936614f9 100644 --- a/subprojects/gst-plugins-bad/gst/dvbsuboverlay/gstdvbsuboverlay.c +++ b/subprojects/gst-plugins-bad/gst/dvbsuboverlay/gstdvbsuboverlay.c @@ -71,7 +71,7 @@ enum #define DVBSUB_OVERLAY_CAPS GST_VIDEO_CAPS_MAKE(VIDEO_FORMATS) #define DVBSUB_OVERLAY_ALL_CAPS DVBSUB_OVERLAY_CAPS ";" \ - GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", GST_VIDEO_FORMATS_ALL) + GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", GST_VIDEO_FORMATS_ANY) static GstStaticCaps sw_template_caps = GST_STATIC_CAPS (DVBSUB_OVERLAY_CAPS); diff --git a/subprojects/gst-plugins-base/gst/overlaycomposition/gstoverlaycomposition.c b/subprojects/gst-plugins-base/gst/overlaycomposition/gstoverlaycomposition.c index 14c29ed17a..467902638e 100644 --- a/subprojects/gst-plugins-base/gst/overlaycomposition/gstoverlaycomposition.c +++ b/subprojects/gst-plugins-base/gst/overlaycomposition/gstoverlaycomposition.c @@ -42,7 +42,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_overlay_composition_debug); #define OVERLAY_COMPOSITION_CAPS GST_VIDEO_CAPS_MAKE (GST_VIDEO_OVERLAY_COMPOSITION_BLEND_FORMATS) #define ALL_CAPS OVERLAY_COMPOSITION_CAPS ";" \ - GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", GST_VIDEO_FORMATS_ALL) + GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", GST_VIDEO_FORMATS_ANY) enum { diff --git a/subprojects/gst-plugins-base/gst/videoconvertscale/gstvideoconvertscale.c b/subprojects/gst-plugins-base/gst/videoconvertscale/gstvideoconvertscale.c index dcfc72250a..02ddea9cdc 100644 --- a/subprojects/gst-plugins-base/gst/videoconvertscale/gstvideoconvertscale.c +++ b/subprojects/gst-plugins-base/gst/videoconvertscale/gstvideoconvertscale.c @@ -181,7 +181,7 @@ enum static GstStaticCaps gst_video_convert_scale_format_caps = GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS) ";" - GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", GST_VIDEO_FORMATS)); + GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", GST_VIDEO_FORMATS_ANY)); static GQuark _size_quark; static GQuark _scale_quark; diff --git a/subprojects/gst-plugins-good/gst/deinterlace/gstdeinterlace.c b/subprojects/gst-plugins-good/gst/deinterlace/gstdeinterlace.c index 3457be020b..d1254a7d4b 100644 --- a/subprojects/gst-plugins-good/gst/deinterlace/gstdeinterlace.c +++ b/subprojects/gst-plugins-good/gst/deinterlace/gstdeinterlace.c @@ -297,7 +297,7 @@ gst_deinterlace_locking_get_type (void) #define DEINTERLACE_CAPS GST_VIDEO_CAPS_MAKE(DEINTERLACE_VIDEO_FORMATS) #define DEINTERLACE_ALL_CAPS DEINTERLACE_CAPS ";" \ - GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", GST_VIDEO_FORMATS_ALL) + GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", GST_VIDEO_FORMATS_ANY) static GstStaticCaps progressive_caps = GST_STATIC_CAPS ("video/x-raw(ANY),interlace-mode=(string)progressive");