diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-01-05 21:34:27 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-01-05 21:34:27 +0000 |
| commit | 0eab4deab0674b1819cde231eb490632109026d2 (patch) | |
| tree | 29bac653d81121622d9fcfa49b8b32beaed11607 /modules | |
| parent | 6e8e467cc9a32b058167122b0c8c6a539f33b45d (diff) | |
| parent | 532b8c71a81702ec336f7ff0a78f3679e83f1efb (diff) | |
| download | gtk+-0eab4deab0674b1819cde231eb490632109026d2.tar.gz | |
Merge branch 'media-caps' into 'master'
media: Be more specific in our caps
See merge request GNOME/gtk!3037
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/media/gtkgstsink.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/modules/media/gtkgstsink.c b/modules/media/gtkgstsink.c index 43a83713e0..1fb6719ee4 100644 --- a/modules/media/gtkgstsink.c +++ b/modules/media/gtkgstsink.c @@ -49,13 +49,18 @@ GST_DEBUG_CATEGORY (gtk_debug_gst_sink); #define FORMATS "{ BGRA, ARGB, RGBA, ABGR, RGB, BGR }" #define NOGL_CAPS GST_VIDEO_CAPS_MAKE (FORMATS) -#define GL_CAPS GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_GL_MEMORY, "RGBA") static GstStaticPadTemplate gtk_gst_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GL_CAPS "; " NOGL_CAPS) + GST_STATIC_CAPS ("video/x-raw(" GST_CAPS_FEATURE_MEMORY_GL_MEMORY "), " + "format = (string) RGBA, " + "width = " GST_VIDEO_SIZE_RANGE ", " + "height = " GST_VIDEO_SIZE_RANGE ", " + "framerate = " GST_VIDEO_FPS_RANGE ", " + "texture-target = (string) 2D" + "; " NOGL_CAPS) ); G_DEFINE_TYPE_WITH_CODE (GtkGstSink, gtk_gst_sink, |