dany/clapper
1
0
Fork 0
mirror of https://github.com/Rafostar/clapper.git synced 2025-08-29 23:32:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

plugin: gluploader: Check for formats actually supported

Browse Source 
Do not assume that HW can do every format that GLUpload/GLColorConvert can.
Check what video formats GL context actually supports and advertise that,
so a format that HW cannot do will never be picked up.
This commit is contained in:
Rafał Dzięgiel
2022-06-12 21:11:06 +02:00
parent 04a028d689
commit 8ebf4e3b2f
1 changed files with 52 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
lib/gst/plugin/importers/gstclappergluploader.c vendored
View File

@@ -22,11 +22,6 @@
#endif #endif
#include "gstclappergluploader.h" #include "gstclappergluploader.h"
#include "gst/plugin/gstgtkutils.h"
#if GST_CLAPPER_GL_CONTEXT_HANDLER_HAVE_X11
#include <gdk/x11/gdkx.h>
#endif
#define GST_CAT_DEFAULT gst_clapper_gl_uploader_debug #define GST_CAT_DEFAULT gst_clapper_gl_uploader_debug
GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
@@ -259,61 +254,75 @@ make_importer (GPtrArray *context_handlers)
return GST_CLAPPER_IMPORTER_CAST (self); return GST_CLAPPER_IMPORTER_CAST (self);
} }
#if GST_CLAPPER_GL_CONTEXT_HANDLER_HAVE_X11 static GstCaps *
static gboolean _make_actual_caps (GstClapperGLContextHandler *gl_handler)
_filter_glx_caps_cb (GstCapsFeatures *features,
GstStructure *structure, gpointer user_data)
{ {
return !gst_caps_features_contains (features, "memory:DMABuf"); GstGLUpload *upload;
} GstCaps *gdk_sink_caps, *color_sink_caps, *upload_sink_caps, *actual;
guint i;
static gboolean /* Having "gst_context" means we also have all other contexts and
_update_glx_caps_on_main (GstCaps *caps) * display as they are used to create it, so no need to check */
{ if (!gl_handler->gst_context)
GdkDisplay *gdk_display; return NULL;
if (!gtk_init_check ()) gdk_sink_caps = gst_clapper_gl_context_handler_make_gdk_gl_caps (
return FALSE; GST_CAPS_FEATURE_MEMORY_GL_MEMORY, TRUE);
gdk_display = gdk_display_get_default (); color_sink_caps = gst_gl_color_convert_transform_caps (gl_handler->gst_context,
if (G_UNLIKELY (!gdk_display)) GST_PAD_SRC, gdk_sink_caps, NULL);
return FALSE; gst_caps_unref (gdk_sink_caps);
if (GDK_IS_X11_DISPLAY (gdk_display)) { upload = gst_gl_upload_new (NULL);
gboolean using_glx = TRUE;
#if GST_CLAPPER_GL_CONTEXT_HANDLER_HAVE_X11_EGL upload_sink_caps = gst_gl_upload_transform_caps (upload, gl_handler->gst_context,
using_glx = (gdk_x11_display_get_egl_display (gdk_display) == NULL); GST_PAD_SRC, color_sink_caps, NULL);
#endif gst_caps_unref (color_sink_caps);
if (using_glx) { gst_object_unref (upload);
gst_caps_filter_and_map_in_place (caps,
(GstCapsFilterMapFunc) _filter_glx_caps_cb, NULL); /* Check for existence and remove duplicated structures,
} * they may contain unsupported by our GL context formats */
actual = gst_caps_new_empty ();
for (i = 0; i < gst_caps_get_size (upload_sink_caps); i++) {
GstCaps *tmp = gst_caps_copy_nth (upload_sink_caps, i);
if (!gst_caps_can_intersect (actual, tmp))
gst_caps_append (actual, tmp);
else
gst_caps_unref (tmp);
} }
gst_caps_unref (upload_sink_caps);
return TRUE; if (G_UNLIKELY (gst_caps_is_empty (actual)))
gst_clear_caps (&actual);
return actual;
} }
#endif
GstCaps * GstCaps *
make_caps (gboolean is_template, GstRank *rank, GPtrArray *context_handlers) make_caps (gboolean is_template, GstRank *rank, GPtrArray *context_handlers)
{ {
GstCaps *caps = gst_gl_upload_get_input_template_caps (); GstCaps *caps = NULL;
#if GST_CLAPPER_GL_CONTEXT_HANDLER_HAVE_X11_GLX if (is_template) {
if (!is_template && !(! !gst_gtk_invoke_on_main ((GThreadFunc) (GCallback) caps = gst_gl_upload_get_input_template_caps ();
_update_glx_caps_on_main, caps))) } else if (context_handlers) {
gst_clear_caps (&caps); GstClapperGLContextHandler *gl_handler;
#endif
if (G_UNLIKELY (!caps)) /* Add GL context handler if not already present */
return NULL;
*rank = GST_RANK_MARGINAL + 1;
if (!is_template && context_handlers)
gst_clapper_gl_context_handler_add_handler (context_handlers); gst_clapper_gl_context_handler_add_handler (context_handlers);
if ((gl_handler = GST_CLAPPER_GL_CONTEXT_HANDLER_CAST (
gst_clapper_context_handler_obtain_with_type (context_handlers,
GST_TYPE_CLAPPER_GL_CONTEXT_HANDLER)))) {
caps = _make_actual_caps (gl_handler);
gst_object_unref (gl_handler);
}
}
if (caps)
*rank = GST_RANK_MARGINAL + 1;
return caps; return caps;
} }