From d56ab76d57948c317676079880930f0e6237a858 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 23 Jun 2005 17:09:21 +0000 Subject: [PATCH] gst/: No unsafe task pausing please. Original commit message from CVS: * gst/gstpad.c: (gst_pad_event_default): * gst/gstqueue.c: (gst_queue_loop): No unsafe task pausing please. --- ChangeLog | 6 ++++++ gst/gstpad.c | 6 ++---- gst/gstqueue.c | 4 ++-- plugins/elements/gstqueue.c | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ecd80cc..5bcdff6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2005-06-23 Wim Taymans + * gst/gstpad.c: (gst_pad_event_default): + * gst/gstqueue.c: (gst_queue_loop): + No unsafe task pausing please. + +2005-06-23 Wim Taymans + * gst/schedulers/threadscheduler.c: (gst_thread_scheduler_task_start), (gst_thread_scheduler_task_pause), (gst_thread_scheduler_func): diff --git a/gst/gstpad.c b/gst/gstpad.c index a441c4d..eb93418 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -2231,10 +2231,8 @@ gst_pad_event_default (GstPad * pad, GstEvent * event) switch (GST_EVENT_TYPE (event)) { case GST_EVENT_EOS: { - if (GST_PAD_TASK (pad)) { - GST_DEBUG_OBJECT (pad, "pausing task because of eos"); - gst_pad_pause_task (pad); - } + GST_DEBUG_OBJECT (pad, "pausing task because of eos"); + gst_pad_pause_task (pad); } default: break; diff --git a/gst/gstqueue.c b/gst/gstqueue.c index babe991..43645c5 100644 --- a/gst/gstqueue.c +++ b/gst/gstqueue.c @@ -733,11 +733,11 @@ restart: result = gst_pad_push (pad, GST_BUFFER (data)); GST_QUEUE_MUTEX_LOCK; if (result != GST_FLOW_OK) { - gst_task_pause (GST_PAD_TASK (queue->srcpad)); + gst_pad_pause_task (queue->srcpad); } } else { if (GST_EVENT_TYPE (data) == GST_EVENT_EOS) { - gst_task_pause (GST_PAD_TASK (queue->srcpad)); + gst_pad_pause_task (queue->srcpad); restart = FALSE; } GST_QUEUE_MUTEX_UNLOCK; diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c index babe991..43645c5 100644 --- a/plugins/elements/gstqueue.c +++ b/plugins/elements/gstqueue.c @@ -733,11 +733,11 @@ restart: result = gst_pad_push (pad, GST_BUFFER (data)); GST_QUEUE_MUTEX_LOCK; if (result != GST_FLOW_OK) { - gst_task_pause (GST_PAD_TASK (queue->srcpad)); + gst_pad_pause_task (queue->srcpad); } } else { if (GST_EVENT_TYPE (data) == GST_EVENT_EOS) { - gst_task_pause (GST_PAD_TASK (queue->srcpad)); + gst_pad_pause_task (queue->srcpad); restart = FALSE; } GST_QUEUE_MUTEX_UNLOCK; -- 2.7.4