From 372b6f58875427c924ee21275e4be540cd628389 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sat, 6 Jan 2001 19:09:40 +0000 Subject: [PATCH] Rearranged the mutex locking, still have to think about it though... Original commit message from CVS: Rearranged the mutex locking, still have to think about it though... --- gst/elements/gstqueue.c | 4 ++-- plugins/elements/gstqueue.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gst/elements/gstqueue.c b/gst/elements/gstqueue.c index 754ebdd..5b16408 100644 --- a/gst/elements/gstqueue.c +++ b/gst/elements/gstqueue.c @@ -195,11 +195,11 @@ gst_queue_chain (GstPad *pad, GstBuffer *buf) while (queue->level_buffers >= queue->max_buffers) { GST_DEBUG (0,"queue: %s waiting %d\n", name, queue->level_buffers); STATUS("%s: O\n"); - GST_UNLOCK (queue); g_mutex_lock (queue->fulllock); + GST_UNLOCK (queue); g_cond_wait (queue->fullcond, queue->fulllock); - g_mutex_unlock (queue->fulllock); GST_LOCK (queue); + g_mutex_unlock (queue->fulllock); STATUS("%s: O+\n"); GST_DEBUG (0,"queue: %s waiting done %d\n", name, queue->level_buffers); } diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c index 754ebdd..5b16408 100644 --- a/plugins/elements/gstqueue.c +++ b/plugins/elements/gstqueue.c @@ -195,11 +195,11 @@ gst_queue_chain (GstPad *pad, GstBuffer *buf) while (queue->level_buffers >= queue->max_buffers) { GST_DEBUG (0,"queue: %s waiting %d\n", name, queue->level_buffers); STATUS("%s: O\n"); - GST_UNLOCK (queue); g_mutex_lock (queue->fulllock); + GST_UNLOCK (queue); g_cond_wait (queue->fullcond, queue->fulllock); - g_mutex_unlock (queue->fulllock); GST_LOCK (queue); + g_mutex_unlock (queue->fulllock); STATUS("%s: O+\n"); GST_DEBUG (0,"queue: %s waiting done %d\n", name, queue->level_buffers); } -- 2.7.4