summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAleix Conchillo Flaqué <aleix@oblong.com>2018-10-08 13:56:56 -0700
committerOlivier Crête <olivier.crete@collabora.com>2018-10-10 12:02:44 -0400
commit50781168892e4f179cd37386d9fd3fcad6fb4d07 (patch)
tree0db6cadd84c57c1f40f9b5079ebdfcdc1bb55e63 /sys
parent84bcd148488fd19dc1c3e0f777c10b497722b8b6 (diff)
downloadgstreamer-plugins-bad-50781168892e4f179cd37386d9fd3fcad6fb4d07.tar.gz
shmsink: do not keep locking if element is unlocked
https://bugzilla.gnome.org/show_bug.cgi?id=797260
Diffstat (limited to 'sys')
-rw-r--r--sys/shm/gstshmsink.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/shm/gstshmsink.c b/sys/shm/gstshmsink.c
index 56374939f..7a0bcebc9 100644
--- a/sys/shm/gstshmsink.c
+++ b/sys/shm/gstshmsink.c
@@ -352,6 +352,7 @@ gst_shm_sink_init (GstShmSink * self)
{
g_cond_init (&self->cond);
self->size = DEFAULT_SIZE;
+ self->unlock = FALSE;
self->wait_for_connection = DEFAULT_WAIT_FOR_CONNECTION;
self->perms = DEFAULT_PERMS;
@@ -670,6 +671,11 @@ gst_shm_sink_render (GstBaseSink * bsink, GstBuffer * buf)
gsize written_bytes;
GST_OBJECT_LOCK (self);
+ if (self->unlock) {
+ GST_OBJECT_UNLOCK (self);
+ return GST_FLOW_FLUSHING;
+ }
+
while (self->wait_for_connection && !self->clients) {
g_cond_wait (&self->cond, GST_OBJECT_GET_LOCK (self));
if (self->unlock) {