mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-06-03 05:59:44 +00:00
glbufferpool: protect release_buffer from multiple concurrent access
If two different threads attempt to release buffers at the same time, then the keep-alive-slightly-longer GQueue may become corrupted. Guard against that with some locking. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6504>
This commit is contained in:
parent
49a7424d1e
commit
3c5bb4bf5d
|
@ -293,11 +293,19 @@ gst_gl_buffer_pool_stop (GstBufferPool * pool)
|
||||||
GstGLBufferPool *glpool = GST_GL_BUFFER_POOL_CAST (pool);
|
GstGLBufferPool *glpool = GST_GL_BUFFER_POOL_CAST (pool);
|
||||||
GstGLBufferPoolPrivate *priv = glpool->priv;
|
GstGLBufferPoolPrivate *priv = glpool->priv;
|
||||||
GstBuffer *buffer;
|
GstBuffer *buffer;
|
||||||
|
GQueue *free_buffers;
|
||||||
|
|
||||||
while ((buffer = g_queue_pop_head (priv->free_cache_buffers))) {
|
GST_OBJECT_LOCK (pool);
|
||||||
|
free_buffers = priv->free_cache_buffers;
|
||||||
|
priv->free_cache_buffers = g_queue_new ();
|
||||||
|
GST_OBJECT_UNLOCK (pool);
|
||||||
|
|
||||||
|
while ((buffer = g_queue_pop_head (free_buffers))) {
|
||||||
GST_BUFFER_POOL_CLASS (parent_class)->release_buffer (pool, buffer);
|
GST_BUFFER_POOL_CLASS (parent_class)->release_buffer (pool, buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
g_clear_pointer (&free_buffers, g_queue_free);
|
||||||
|
|
||||||
return GST_BUFFER_POOL_CLASS (parent_class)->stop (pool);
|
return GST_BUFFER_POOL_CLASS (parent_class)->stop (pool);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -345,18 +353,35 @@ gst_gl_buffer_pool_release_buffer (GstBufferPool * pool, GstBuffer * buffer)
|
||||||
GstGLBufferPool *glpool = GST_GL_BUFFER_POOL_CAST (pool);
|
GstGLBufferPool *glpool = GST_GL_BUFFER_POOL_CAST (pool);
|
||||||
GstGLBufferPoolPrivate *priv = glpool->priv;
|
GstGLBufferPoolPrivate *priv = glpool->priv;
|
||||||
|
|
||||||
|
GST_OBJECT_LOCK (pool);
|
||||||
|
|
||||||
if (priv->free_queue_min_depth == 0
|
if (priv->free_queue_min_depth == 0
|
||||||
&& g_queue_get_length (priv->free_cache_buffers) == 0) {
|
&& g_queue_is_empty (priv->free_cache_buffers)) {
|
||||||
|
GST_OBJECT_UNLOCK (pool);
|
||||||
|
|
||||||
GST_BUFFER_POOL_CLASS (parent_class)->release_buffer (pool, buffer);
|
GST_BUFFER_POOL_CLASS (parent_class)->release_buffer (pool, buffer);
|
||||||
} else {
|
} else {
|
||||||
|
GPtrArray *free_buffers = g_ptr_array_new ();
|
||||||
|
guint q_len = g_queue_get_length (priv->free_cache_buffers);
|
||||||
|
guint i;
|
||||||
|
|
||||||
g_queue_push_tail (priv->free_cache_buffers, buffer);
|
g_queue_push_tail (priv->free_cache_buffers, buffer);
|
||||||
|
|
||||||
while (g_queue_get_length (priv->free_cache_buffers) >
|
while (q_len > priv->free_queue_min_depth) {
|
||||||
priv->free_queue_min_depth) {
|
|
||||||
GstBuffer *release_buffer = g_queue_pop_head (priv->free_cache_buffers);
|
GstBuffer *release_buffer = g_queue_pop_head (priv->free_cache_buffers);
|
||||||
|
g_ptr_array_add (free_buffers, release_buffer);
|
||||||
|
q_len -= 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
GST_OBJECT_UNLOCK (pool);
|
||||||
|
|
||||||
|
for (i = 0; i < free_buffers->len; i++) {
|
||||||
|
GstBuffer *release_buffer = g_ptr_array_index (free_buffers, i);
|
||||||
GST_BUFFER_POOL_CLASS (parent_class)->release_buffer (pool,
|
GST_BUFFER_POOL_CLASS (parent_class)->release_buffer (pool,
|
||||||
release_buffer);
|
release_buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
g_ptr_array_unref (free_buffers);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue