mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-30 04:00:37 +00:00
f803a9e746
This thread dispatches navigation events. It is needed to avoid deadlocks between window backend threads that emit navigation events (e.g. X11/GMainLoop thread) and consumers of navigation events such as glimagesink, see https://bugzilla.gnome.org/show_bug.cgi?id=733661 GstGlWindow_x11 thread is changed to invoke the navigation thread for navigation dispatching, instead of emiting the event itself. Othe backends beside X11 do not dispatch navigation events yet, but should use this thread when dispatching these events in the future. The navigation thread is currently part of GstGLWindow and not implemented in separate subclasses / backends. This will be needed in the future. gst_gl_window_x11_get_surface_dimensions is also changed to use a cached value of the window's width, height. These values are now retrieved in the X11 thread, function gst_gl_window_x11_handle_event. This change is needed because otherwise the XGetWindowAttributes gets called from the navigation thread, leading to xlib aborting due to multithreaded access (if XInitThreads is not called before, as is the case for gst-launch)
110 lines
3.1 KiB
C
110 lines
3.1 KiB
C
/*
|
|
* GStreamer
|
|
* Copyright (C) 2012 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.
|
|
*/
|
|
|
|
#ifndef __GST_GL_WINDOW_X11_H__
|
|
#define __GST_GL_WINDOW_X11_H__
|
|
|
|
#include <X11/Xlib.h>
|
|
#include <X11/Xutil.h>
|
|
|
|
#include <gst/gl/gl.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define GST_GL_TYPE_WINDOW_X11 (gst_gl_window_x11_get_type())
|
|
#define GST_GL_WINDOW_X11(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_X11, GstGLWindowX11))
|
|
#define GST_GL_WINDOW_X11_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_X11, GstGLWindowX11Class))
|
|
#define GST_GL_IS_WINDOW_X11(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_X11))
|
|
#define GST_GL_IS_WINDOW_X11_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_X11))
|
|
#define GST_GL_WINDOW_X11_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_X11, GstGLWindowX11Class))
|
|
|
|
typedef struct _GstGLWindowX11 GstGLWindowX11;
|
|
typedef struct _GstGLWindowX11Private GstGLWindowX11Private;
|
|
typedef struct _GstGLWindowX11Class GstGLWindowX11Class;
|
|
|
|
/**
|
|
* GstGLWindowX11:
|
|
*
|
|
* Opaque #GstGLWindowX11 object
|
|
*/
|
|
struct _GstGLWindowX11
|
|
{
|
|
/*< private >*/
|
|
GstGLWindow parent;
|
|
|
|
gboolean running;
|
|
gboolean visible;
|
|
gboolean allow_extra_expose_events;
|
|
|
|
/* opengl context */
|
|
Display *device;
|
|
Screen *screen;
|
|
gint screen_num;
|
|
Visual *visual;
|
|
Window root;
|
|
gulong white;
|
|
gulong black;
|
|
gint depth;
|
|
gint device_width;
|
|
gint device_height;
|
|
gint current_width;
|
|
gint current_height;
|
|
gint connection;
|
|
XVisualInfo *visual_info;
|
|
Window parent_win;
|
|
|
|
/* X window */
|
|
Window internal_win_id;
|
|
|
|
GSource *x11_source;
|
|
GMainContext *main_context;
|
|
GMainLoop *loop;
|
|
|
|
/*< private >*/
|
|
GstGLWindowX11Private *priv;
|
|
|
|
gpointer _reserved[GST_PADDING];
|
|
};
|
|
|
|
/**
|
|
* GstGLWindowX11Class:
|
|
*
|
|
* Opaque #GstGLWindowX11Class object
|
|
*/
|
|
struct _GstGLWindowX11Class {
|
|
/*< private >*/
|
|
GstGLWindowClass parent_class;
|
|
|
|
/*< private >*/
|
|
gpointer _reserved[GST_PADDING_LARGE];
|
|
};
|
|
|
|
GType gst_gl_window_x11_get_type (void);
|
|
|
|
GstGLWindowX11 * gst_gl_window_x11_new (GstGLDisplay * display);
|
|
|
|
void gst_gl_window_x11_trap_x_errors (void);
|
|
gint gst_gl_window_x11_untrap_x_errors (void);
|
|
|
|
gboolean gst_gl_window_x11_create_window (GstGLWindowX11 * window_x11);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __GST_GL_WINDOW_X11_H__ */
|