mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-24 08:08:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

va: filter: don't destroy pipeline buffer

Browse source 
This was only required by i915 driver before libva-2.0 because it didn't
conform.

Also changes the way _destroy_filters() is called, now inside a locked block, so
it must not lock in it.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2006>
This commit is contained in:
Víctor Manuel Jáquez Leal 2021-02-02 16:23:28 +01:00
parent 599e16fde8
commit 6ae2494887
1 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sys/va/gstvafilter.c
View file

@ -902,7 +902,7 @@ fail:
} }
static gboolean static gboolean
_destroy_filters (GstVaFilter * self) _destroy_filters_unlocked (GstVaFilter * self)
{ {
VABufferID buffer; VABufferID buffer;
VADisplay dpy; VADisplay dpy;
@ -910,14 +910,10 @@ _destroy_filters (GstVaFilter * self)
gboolean ret = TRUE; gboolean ret = TRUE;
guint i; guint i;
if (!self->filters)
return TRUE;
GST_TRACE_OBJECT (self, "Destroy filter buffers"); GST_TRACE_OBJECT (self, "Destroy filter buffers");
dpy = gst_va_display_get_va_dpy (self->display); dpy = gst_va_display_get_va_dpy (self->display);
GST_OBJECT_LOCK (self);
for (i = 0; i < self->filters->len; i++) { for (i = 0; i < self->filters->len; i++) {
buffer = g_array_index (self->filters, VABufferID, i); buffer = g_array_index (self->filters, VABufferID, i);
@ -926,12 +922,12 @@ _destroy_filters (GstVaFilter * self)
gst_va_display_unlock (self->display); gst_va_display_unlock (self->display);
if (status != VA_STATUS_SUCCESS) { if (status != VA_STATUS_SUCCESS) {
ret = FALSE; ret = FALSE;
GST_WARNING ("Failed to destroy filter buffer: %s", vaErrorStr (status)); GST_WARNING_OBJECT (self, "Failed to destroy filter buffer: %s",
vaErrorStr (status));
} }
} }
self->filters = g_array_set_size (self->filters, 0); self->filters = g_array_set_size (self->filters, 0);
GST_OBJECT_UNLOCK (self);
return ret; return ret;
} }
@ -1102,22 +1098,13 @@ gst_va_filter_convert_surface (GstVaFilter * self, VASurfaceID in_surface,
ret = TRUE; ret = TRUE;
bail: bail:
gst_va_display_lock (self->display);
status = vaDestroyBuffer (dpy, buffer);
gst_va_display_unlock (self->display);
if (status != VA_STATUS_SUCCESS) {
ret = FALSE;
GST_WARNING ("Failed to destroy filter buffer: %s", vaErrorStr (status));
}
GST_OBJECT_LOCK (self); GST_OBJECT_LOCK (self);
if (self->filters) if (self->filters) {
g_array_unref (self->filters); g_array_unref (self->filters);
_destroy_filters_unlocked (self);
}
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
if (!_destroy_filters (self))
return FALSE;
return ret; return ret;
fail_end_pic: fail_end_pic: