mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-02 08:42:32 +00:00
ff6442f6f9
failure to pass a display in 'handle' would result in uninitialized value being returned, which would often segfault later down the road when trying to initialize gstreamer context with it. Check the return value of gst_structure_get() to make sure we return valid data. Furthermore, the gstglimagesink in gst-plugins-base also has a similar mechanism but uses 'display' as field name to pass the value; instead of requiring the application to behave differently depending on what sink was automatically detected just try to read both values here, with display being the new default. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2292>
132 lines
3.9 KiB
C
132 lines
3.9 KiB
C
/*
|
|
* GStreamer Wayland Library
|
|
* Copyright (C) 2014 Collabora Ltd.
|
|
*
|
|
* 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/wayland/wayland.h>
|
|
#include <gst/video/videooverlay.h>
|
|
|
|
gboolean
|
|
gst_is_wayland_display_handle_need_context_message (GstMessage * msg)
|
|
{
|
|
const gchar *type = NULL;
|
|
|
|
g_return_val_if_fail (GST_IS_MESSAGE (msg), FALSE);
|
|
|
|
if (GST_MESSAGE_TYPE (msg) == GST_MESSAGE_NEED_CONTEXT &&
|
|
gst_message_parse_context_type (msg, &type)) {
|
|
return !g_strcmp0 (type, GST_WAYLAND_DISPLAY_HANDLE_CONTEXT_TYPE);
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
GstContext *
|
|
gst_wayland_display_handle_context_new (struct wl_display * display)
|
|
{
|
|
GstContext *context =
|
|
gst_context_new (GST_WAYLAND_DISPLAY_HANDLE_CONTEXT_TYPE, TRUE);
|
|
gst_structure_set (gst_context_writable_structure (context),
|
|
"display", G_TYPE_POINTER, display, NULL);
|
|
return context;
|
|
}
|
|
|
|
struct wl_display *
|
|
gst_wayland_display_handle_context_get_handle (GstContext * context)
|
|
{
|
|
const GstStructure *s;
|
|
struct wl_display *display;
|
|
|
|
g_return_val_if_fail (GST_IS_CONTEXT (context), NULL);
|
|
|
|
s = gst_context_get_structure (context);
|
|
if (gst_structure_get (s, "display", G_TYPE_POINTER, &display, NULL))
|
|
return display;
|
|
if (gst_structure_get (s, "handle", G_TYPE_POINTER, &display, NULL))
|
|
return display;
|
|
return NULL;
|
|
}
|
|
|
|
|
|
G_DEFINE_INTERFACE (GstWaylandVideo, gst_wayland_video, GST_TYPE_VIDEO_OVERLAY);
|
|
|
|
static void
|
|
gst_wayland_video_default_init (GstWaylandVideoInterface * klass)
|
|
{
|
|
(void) klass;
|
|
}
|
|
|
|
/**
|
|
* gst_wayland_video_begin_geometry_change:
|
|
*
|
|
* Notifies the video sink that we are about to change its
|
|
* geometry (probably using set_render_rectangle()). This is useful
|
|
* in order to allow the sink to synchronize resizing/moving of the
|
|
* video area with the parent surface and avoid glitches, in cases
|
|
* where the video area is being painted asynchronously from another
|
|
* thread, like in waylandsink.
|
|
*
|
|
* Please note that any calls to this method MUST be matched by
|
|
* calls to end_geometry_change() and AFTER the parent surface has
|
|
* committed its geometry changes.
|
|
*/
|
|
void
|
|
gst_wayland_video_begin_geometry_change (GstWaylandVideo * video)
|
|
{
|
|
GstWaylandVideoInterface *iface;
|
|
|
|
g_return_if_fail (video != NULL);
|
|
g_return_if_fail (GST_IS_WAYLAND_VIDEO (video));
|
|
|
|
iface = GST_WAYLAND_VIDEO_GET_INTERFACE (video);
|
|
|
|
if (iface->begin_geometry_change) {
|
|
iface->begin_geometry_change (video);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* gst_wayland_video_end_geometry_change:
|
|
*
|
|
* Notifies the video sink that we just finished changing the
|
|
* geometry of both itself and its parent surface. This should
|
|
* have been earlier preceded by a call to begin_geometry_change()
|
|
* which notified the sink before any of these changes had happened.
|
|
*
|
|
* It is important to call this method only AFTER the parent surface
|
|
* has committed its geometry changes, otherwise no synchronization
|
|
* is actually achieved.
|
|
*/
|
|
void
|
|
gst_wayland_video_end_geometry_change (GstWaylandVideo * video)
|
|
{
|
|
GstWaylandVideoInterface *iface;
|
|
|
|
g_return_if_fail (video != NULL);
|
|
g_return_if_fail (GST_IS_WAYLAND_VIDEO (video));
|
|
|
|
iface = GST_WAYLAND_VIDEO_GET_INTERFACE (video);
|
|
|
|
if (iface->end_geometry_change) {
|
|
iface->end_geometry_change (video);
|
|
}
|
|
}
|