mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-08 13:18:52 +00:00
When trying to create a wayland display, it may fail because there is not actually display to connect. It this case NULL is returned but the created instance is not freed. This patch unrefs the failed display. https://bugzilla.gnome.org/show_bug.cgi?id=793483
174 lines
5.1 KiB
C
174 lines
5.1 KiB
C
/*
|
|
* GStreamer
|
|
* Copyright (C) 2013 Matthew Waters <ystreet00@gmail.com>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Library General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Library General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Library General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
|
* Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <gst/gl/wayland/gstgldisplay_wayland.h>
|
|
|
|
GST_DEBUG_CATEGORY_STATIC (gst_gl_display_debug);
|
|
#define GST_CAT_DEFAULT gst_gl_display_debug
|
|
|
|
G_DEFINE_TYPE (GstGLDisplayWayland, gst_gl_display_wayland,
|
|
GST_TYPE_GL_DISPLAY);
|
|
|
|
static void gst_gl_display_wayland_finalize (GObject * object);
|
|
static guintptr gst_gl_display_wayland_get_handle (GstGLDisplay * display);
|
|
|
|
static void
|
|
registry_handle_global (void *data, struct wl_registry *registry,
|
|
uint32_t name, const char *interface, uint32_t version)
|
|
{
|
|
GstGLDisplayWayland *display = data;
|
|
|
|
GST_DEBUG_CATEGORY_GET (gst_gl_display_debug, "gldisplay");
|
|
|
|
GST_TRACE_OBJECT (display, "registry_handle_global with registry %p, "
|
|
"interface %s, version %u", registry, interface, version);
|
|
|
|
if (g_strcmp0 (interface, "wl_compositor") == 0) {
|
|
display->compositor =
|
|
wl_registry_bind (registry, name, &wl_compositor_interface, 1);
|
|
} else if (g_strcmp0 (interface, "wl_subcompositor") == 0) {
|
|
display->subcompositor =
|
|
wl_registry_bind (registry, name, &wl_subcompositor_interface, 1);
|
|
} else if (g_strcmp0 (interface, "wl_shell") == 0) {
|
|
display->shell = wl_registry_bind (registry, name, &wl_shell_interface, 1);
|
|
}
|
|
}
|
|
|
|
static const struct wl_registry_listener registry_listener = {
|
|
registry_handle_global
|
|
};
|
|
|
|
static void
|
|
_connect_listeners (GstGLDisplayWayland * display)
|
|
{
|
|
display->registry = wl_display_get_registry (display->display);
|
|
wl_registry_add_listener (display->registry, ®istry_listener, display);
|
|
|
|
wl_display_roundtrip (display->display);
|
|
}
|
|
|
|
static void
|
|
gst_gl_display_wayland_class_init (GstGLDisplayWaylandClass * klass)
|
|
{
|
|
GST_GL_DISPLAY_CLASS (klass)->get_handle =
|
|
GST_DEBUG_FUNCPTR (gst_gl_display_wayland_get_handle);
|
|
|
|
G_OBJECT_CLASS (klass)->finalize = gst_gl_display_wayland_finalize;
|
|
}
|
|
|
|
static void
|
|
gst_gl_display_wayland_init (GstGLDisplayWayland * display_wayland)
|
|
{
|
|
GstGLDisplay *display = (GstGLDisplay *) display_wayland;
|
|
|
|
display->type = GST_GL_DISPLAY_TYPE_WAYLAND;
|
|
display_wayland->foreign_display = FALSE;
|
|
}
|
|
|
|
static void
|
|
gst_gl_display_wayland_finalize (GObject * object)
|
|
{
|
|
GstGLDisplayWayland *display_wayland = GST_GL_DISPLAY_WAYLAND (object);
|
|
|
|
/* Cause eglTerminate() to occur before wl_display_disconnect()
|
|
* https://bugzilla.gnome.org/show_bug.cgi?id=787293 */
|
|
g_object_set_data (object, "gst.gl.display.egl", NULL);
|
|
|
|
if (!display_wayland->foreign_display && display_wayland->display) {
|
|
wl_display_flush (display_wayland->display);
|
|
wl_display_disconnect (display_wayland->display);
|
|
}
|
|
|
|
G_OBJECT_CLASS (gst_gl_display_wayland_parent_class)->finalize (object);
|
|
}
|
|
|
|
/**
|
|
* gst_gl_display_wayland_new:
|
|
* @name: (allow-none): a display name
|
|
*
|
|
* Create a new #GstGLDisplayWayland from the wayland display name. See wl_display_connect()
|
|
* for details on what is a valid name.
|
|
*
|
|
* Returns: (transfer full): a new #GstGLDisplayWayland or %NULL
|
|
*/
|
|
GstGLDisplayWayland *
|
|
gst_gl_display_wayland_new (const gchar * name)
|
|
{
|
|
GstGLDisplayWayland *ret;
|
|
|
|
GST_DEBUG_CATEGORY_GET (gst_gl_display_debug, "gldisplay");
|
|
|
|
ret = g_object_new (GST_TYPE_GL_DISPLAY_WAYLAND, NULL);
|
|
gst_object_ref_sink (ret);
|
|
ret->display = wl_display_connect (name);
|
|
|
|
if (!ret->display) {
|
|
if (name != NULL) {
|
|
GST_ERROR ("Failed to open Wayland display connection with name \'%s\'",
|
|
name);
|
|
} else {
|
|
GST_INFO ("Failed to open Wayland display connection.");
|
|
}
|
|
gst_object_unref (ret);
|
|
return NULL;
|
|
}
|
|
|
|
_connect_listeners (ret);
|
|
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* gst_gl_display_wayland_new_with_display:
|
|
* @display: an existing, wayland display
|
|
*
|
|
* Creates a new display connection from a wl_display Display.
|
|
*
|
|
* Returns: (transfer full): a new #GstGLDisplayWayland
|
|
*/
|
|
GstGLDisplayWayland *
|
|
gst_gl_display_wayland_new_with_display (struct wl_display * display)
|
|
{
|
|
GstGLDisplayWayland *ret;
|
|
|
|
g_return_val_if_fail (display != NULL, NULL);
|
|
|
|
GST_DEBUG_CATEGORY_GET (gst_gl_display_debug, "gldisplay");
|
|
|
|
ret = g_object_new (GST_TYPE_GL_DISPLAY_WAYLAND, NULL);
|
|
gst_object_ref_sink (ret);
|
|
|
|
ret->display = display;
|
|
ret->foreign_display = TRUE;
|
|
|
|
_connect_listeners (ret);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static guintptr
|
|
gst_gl_display_wayland_get_handle (GstGLDisplay * display)
|
|
{
|
|
return (guintptr) GST_GL_DISPLAY_WAYLAND (display)->display;
|
|
}
|