mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-05-30 20:19:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: display: lock at extracting available image formates

Browse source 
When running several vaapi elements at the concurrently, at
initialization, there is a race condition when extractin the avaible
formats for images and subpictures.

This patch add a lock when the those arrays are filled.

https://bugzilla.gnome.org/show_bug.cgi?id=797039
This commit is contained in:
Víctor Manuel Jáquez Leal 2018-08-30 18:56:40 +02:00
parent f6d827f6ff
commit 1f0b2fb952
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -649,8 +649,11 @@ ensure_image_formats (GstVaapiDisplay * display)
gint i, n; gint i, n;
gboolean success = FALSE; gboolean success = FALSE;
if (priv->image_formats) GST_VAAPI_DISPLAY_LOCK (display);
if (priv->image_formats) {
GST_VAAPI_DISPLAY_UNLOCK (display);
return TRUE; return TRUE;
}
priv->image_formats = g_array_new (FALSE, FALSE, sizeof (GstVaapiFormatInfo)); priv->image_formats = g_array_new (FALSE, FALSE, sizeof (GstVaapiFormatInfo));
if (!priv->image_formats) if (!priv->image_formats)
@ -676,6 +679,7 @@ ensure_image_formats (GstVaapiDisplay * display)
cleanup: cleanup:
g_free (formats); g_free (formats);
GST_VAAPI_DISPLAY_UNLOCK (display);
return success; return success;
} }
@ -690,8 +694,11 @@ ensure_subpicture_formats (GstVaapiDisplay * display)
guint i, n; guint i, n;
gboolean success = FALSE; gboolean success = FALSE;
if (priv->subpicture_formats) GST_VAAPI_DISPLAY_LOCK (display);
if (priv->subpicture_formats) {
GST_VAAPI_DISPLAY_UNLOCK (display);
return TRUE; return TRUE;
}
priv->subpicture_formats = priv->subpicture_formats =
g_array_new (FALSE, FALSE, sizeof (GstVaapiFormatInfo)); g_array_new (FALSE, FALSE, sizeof (GstVaapiFormatInfo));
@ -725,6 +732,7 @@ ensure_subpicture_formats (GstVaapiDisplay * display)
cleanup: cleanup:
g_free (formats); g_free (formats);
g_free (flags); g_free (flags);
GST_VAAPI_DISPLAY_UNLOCK (display);
return success; return success;
} }