mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 21:21:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: display: resurrect parent private member

Browse source 
This is, practically, a revert of commit dcf135e2.

The parent logic is useful for the EGL display, which is a decorator
of the real windowing subsystem (X11 or Wayland). Thus it is avoided
calling vaInitialize() and vaTerminate() twice.

https://bugzilla.gnome.org/show_bug.cgi?id=795391
This commit is contained in:
Víctor Manuel Jáquez Leal 2018-05-25 12:17:21 +02:00
parent ad974b4c82
commit b0bebebc01
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst-libs/gst/vaapi/gstvaapidisplay.c
View file

@ -827,6 +827,7 @@ gst_vaapi_display_destroy (GstVaapiDisplay * display)
} }
if (priv->display) { if (priv->display) {
if (!priv->parent)
vaTerminate (priv->display); vaTerminate (priv->display);
priv->display = NULL; priv->display = NULL;
} }
@ -842,6 +843,8 @@ gst_vaapi_display_destroy (GstVaapiDisplay * display)
g_free (priv->vendor_string); g_free (priv->vendor_string);
priv->vendor_string = NULL; priv->vendor_string = NULL;
gst_vaapi_display_replace (&priv->parent, NULL);
} }
static gboolean static gboolean
@ -888,8 +891,10 @@ gst_vaapi_display_create_unlocked (GstVaapiDisplay * display,
if (!priv->display) if (!priv->display)
return FALSE; return FALSE;
if (!priv->parent) {
if (!vaapi_initialize (priv->display)) if (!vaapi_initialize (priv->display))
return FALSE; return FALSE;
}
GST_INFO_OBJECT (display, "new display addr=%p", display); GST_INFO_OBJECT (display, "new display addr=%p", display);
g_free (priv->display_name); g_free (priv->display_name);
@ -909,6 +914,8 @@ gst_vaapi_display_lock_default (GstVaapiDisplay * display)
{ {
GstVaapiDisplayPrivate *priv = GST_VAAPI_DISPLAY_GET_PRIVATE (display); GstVaapiDisplayPrivate *priv = GST_VAAPI_DISPLAY_GET_PRIVATE (display);
if (priv->parent)
priv = GST_VAAPI_DISPLAY_GET_PRIVATE (priv->parent);
g_rec_mutex_lock (&priv->mutex); g_rec_mutex_lock (&priv->mutex);
} }
@ -917,6 +924,8 @@ gst_vaapi_display_unlock_default (GstVaapiDisplay * display)
{ {
GstVaapiDisplayPrivate *priv = GST_VAAPI_DISPLAY_GET_PRIVATE (display); GstVaapiDisplayPrivate *priv = GST_VAAPI_DISPLAY_GET_PRIVATE (display);
if (priv->parent)
priv = GST_VAAPI_DISPLAY_GET_PRIVATE (priv->parent);
g_rec_mutex_unlock (&priv->mutex); g_rec_mutex_unlock (&priv->mutex);
} }

5
gst-libs/gst/vaapi/gstvaapidisplay_egl.c
View file

@ -104,6 +104,7 @@ gst_vaapi_display_egl_bind_display (GstVaapiDisplay * base_display,
EGLDisplay *native_egl_display; EGLDisplay *native_egl_display;
guint gl_platform = EGL_PLATFORM_UNKNOWN; guint gl_platform = EGL_PLATFORM_UNKNOWN;
const InitParams *params = (InitParams *) native_params; const InitParams *params = (InitParams *) native_params;
GstVaapiDisplayPrivate *const priv = GST_VAAPI_DISPLAY_GET_PRIVATE (display);
native_vaapi_display = params->display; native_vaapi_display = params->display;
native_egl_display = params->gl_display; native_egl_display = params->gl_display;
@ -120,14 +121,14 @@ gst_vaapi_display_egl_bind_display (GstVaapiDisplay * base_display,
native_vaapi_display = gst_vaapi_display_wayland_new (NULL); native_vaapi_display = gst_vaapi_display_wayland_new (NULL);
#endif #endif
} else { } else {
/* thus it could be unrefed */ /* thus it could be assigned to parent */
gst_object_ref (native_vaapi_display); gst_object_ref (native_vaapi_display);
} }
if (!native_vaapi_display) if (!native_vaapi_display)
return FALSE; return FALSE;
gst_vaapi_display_replace (&display->display, native_vaapi_display); gst_vaapi_display_replace (&display->display, native_vaapi_display);
gst_object_unref (native_vaapi_display); priv->parent = native_vaapi_display;
switch (GST_VAAPI_DISPLAY_GET_CLASS_TYPE (display->display)) { switch (GST_VAAPI_DISPLAY_GET_CLASS_TYPE (display->display)) {
case GST_VAAPI_DISPLAY_TYPE_X11: case GST_VAAPI_DISPLAY_TYPE_X11:

1
gst-libs/gst/vaapi/gstvaapidisplay_priv.h
View file

@ -109,6 +109,7 @@ typedef enum _GstVaapiDisplayInitType GstVaapiDisplayInitType;
struct _GstVaapiDisplayPrivate struct _GstVaapiDisplayPrivate
{ {
GstVaapiDisplay *parent;
GRecMutex mutex; GRecMutex mutex;
gchar *display_name; gchar *display_name;
VADisplay display; VADisplay display;