mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-10 03:19:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: display: remove parent member

Browse source 
Parent was a crumb left from display cache.

https://bugzilla.gnome.org/show_bug.cgi?id=782212
This commit is contained in:
Víctor Manuel Jáquez Leal 2017-09-28 16:12:23 +02:00
parent 8a0e22a5bb
commit dcf135e2a5
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -813,8 +813,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;
} }
@ -829,8 +828,6 @@ 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_internal (&priv->parent, NULL);
} }
static gboolean static gboolean
@ -885,10 +882,8 @@ 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);
@ -908,8 +903,6 @@ 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);
} }
@ -918,8 +911,6 @@ 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);
} }

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

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