mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 03:31:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

video-filters: Fix passthrough with ANY caps feature

Browse source 
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: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5386>
This commit is contained in:
Nicolas Dufresne 2023-09-27 13:55:33 +02:00 committed by GStreamer Marge Bot
parent 0fc63b58d0
commit aaed9272c1
8 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-plugins-bad/ext/assrender/gstassrender.c
View file

@ -69,7 +69,7 @@ enum
#define ASSRENDER_CAPS GST_VIDEO_CAPS_MAKE(FORMATS) #define ASSRENDER_CAPS GST_VIDEO_CAPS_MAKE(FORMATS)
#define ASSRENDER_ALL_CAPS ASSRENDER_CAPS ";" \ #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); static GstStaticCaps sw_template_caps = GST_STATIC_CAPS (ASSRENDER_CAPS);

2
subprojects/gst-plugins-bad/ext/qroverlay/gstbaseqroverlay.c
View file

@ -71,7 +71,7 @@ struct _GstBaseQROverlayPrivate
#define OVERLAY_COMPOSITION_CAPS GST_VIDEO_CAPS_MAKE (GST_VIDEO_OVERLAY_COMPOSITION_BLEND_FORMATS) #define OVERLAY_COMPOSITION_CAPS GST_VIDEO_CAPS_MAKE (GST_VIDEO_OVERLAY_COMPOSITION_BLEND_FORMATS)
#define ALL_CAPS OVERLAY_COMPOSITION_CAPS ";" \ #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", static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,

2
subprojects/gst-plugins-bad/ext/ttml/gstttmlrender.c
View file

@ -58,7 +58,7 @@
#define TTML_RENDER_CAPS GST_VIDEO_CAPS_MAKE (VIDEO_FORMATS) #define TTML_RENDER_CAPS GST_VIDEO_CAPS_MAKE (VIDEO_FORMATS)
#define TTML_RENDER_ALL_CAPS TTML_RENDER_CAPS ";" \ #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); GST_DEBUG_CATEGORY_EXTERN (ttmlrender_debug);
#define GST_CAT_DEFAULT ttmlrender_debug #define GST_CAT_DEFAULT ttmlrender_debug

2
subprojects/gst-plugins-bad/gst/debugutils/gstfakevideosink.c
View file

@ -162,7 +162,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", 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); G_DEFINE_TYPE (GstFakeVideoSink, gst_fake_video_sink, GST_TYPE_BIN);
GST_ELEMENT_REGISTER_DEFINE (fakevideosink, "fakevideosink", GST_ELEMENT_REGISTER_DEFINE (fakevideosink, "fakevideosink",

2
subprojects/gst-plugins-bad/gst/dvbsuboverlay/gstdvbsuboverlay.c
View file

@ -71,7 +71,7 @@ enum
#define DVBSUB_OVERLAY_CAPS GST_VIDEO_CAPS_MAKE(VIDEO_FORMATS) #define DVBSUB_OVERLAY_CAPS GST_VIDEO_CAPS_MAKE(VIDEO_FORMATS)
#define DVBSUB_OVERLAY_ALL_CAPS DVBSUB_OVERLAY_CAPS ";" \ #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); static GstStaticCaps sw_template_caps = GST_STATIC_CAPS (DVBSUB_OVERLAY_CAPS);

2
subprojects/gst-plugins-base/gst/overlaycomposition/gstoverlaycomposition.c
View file

@ -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 OVERLAY_COMPOSITION_CAPS GST_VIDEO_CAPS_MAKE (GST_VIDEO_OVERLAY_COMPOSITION_BLEND_FORMATS)
#define ALL_CAPS OVERLAY_COMPOSITION_CAPS ";" \ #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 enum
{ {

2
subprojects/gst-plugins-base/gst/videoconvertscale/gstvideoconvertscale.c
View file

@ -181,7 +181,7 @@ enum
static GstStaticCaps gst_video_convert_scale_format_caps = static GstStaticCaps gst_video_convert_scale_format_caps =
GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS) ";" 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 _size_quark;
static GQuark _scale_quark; static GQuark _scale_quark;

2
subprojects/gst-plugins-good/gst/deinterlace/gstdeinterlace.c
View file

@ -297,7 +297,7 @@ gst_deinterlace_locking_get_type (void)
#define DEINTERLACE_CAPS GST_VIDEO_CAPS_MAKE(DEINTERLACE_VIDEO_FORMATS) #define DEINTERLACE_CAPS GST_VIDEO_CAPS_MAKE(DEINTERLACE_VIDEO_FORMATS)
#define DEINTERLACE_ALL_CAPS DEINTERLACE_CAPS ";" \ #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 = static GstStaticCaps progressive_caps =
GST_STATIC_CAPS ("video/x-raw(ANY),interlace-mode=(string)progressive"); GST_STATIC_CAPS ("video/x-raw(ANY),interlace-mode=(string)progressive");