From 69202dfe80f5ab070b3ce2b04b5f15b9587693a8 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sun, 5 Jun 2005 09:07:32 +0000 Subject: [PATCH] gst/gstevent.c: Set invalid timestamp by default instead of zero on events. Original commit message from CVS: * gst/gstevent.c: (gst_event_new): Set invalid timestamp by default instead of zero on events. * gst/gstqueue.c: (gst_queue_chain), (gst_queue_get): Clear interrupt state after handling. --- ChangeLog | 7 +++++++ common | 2 +- gst/gstevent.c | 2 +- gst/gstqueue.c | 2 ++ plugins/elements/gstqueue.c | 2 ++ 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a78757c01c..03dd3a559b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-06-05 Ronald S. Bultje + + * gst/gstevent.c: (gst_event_new): + Set invalid timestamp by default instead of zero on events. + * gst/gstqueue.c: (gst_queue_chain), (gst_queue_get): + Clear interrupt state after handling. + 2005-06-03 Ronald S. Bultje * gst/gstvalue.c: (gst_value_list_append_value): diff --git a/common b/common index 67b7e6c0db..495d6e30b3 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 67b7e6c0db99415e0440d0c576495641b53e976a +Subproject commit 495d6e30b3e513aebbc98467707c609c49ea654d diff --git a/gst/gstevent.c b/gst/gstevent.c index 0d4a742a6f..d8d3ee532a 100644 --- a/gst/gstevent.c +++ b/gst/gstevent.c @@ -185,7 +185,7 @@ gst_event_new (GstEventType type) (GstDataCopyFunction) _gst_event_copy); GST_EVENT_TYPE (event) = type; - GST_EVENT_TIMESTAMP (event) = G_GINT64_CONSTANT (0); + GST_EVENT_TIMESTAMP (event) = GST_CLOCK_TIME_NONE; GST_EVENT_SRC (event) = NULL; GST_DATA_FLAG_SET (GST_DATA (event), GST_EVENT_COMMON_FLAG_NEED_RESPONSE); diff --git a/gst/gstqueue.c b/gst/gstqueue.c index 1e1b803ad0..af9fa30b4c 100644 --- a/gst/gstqueue.c +++ b/gst/gstqueue.c @@ -724,6 +724,7 @@ restart: g_cond_wait (queue->item_del, queue->qlock); STATUS (queue, "received item_del signal from thread using qlock"); } else { + queue->interrupt = FALSE; GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "Not waiting, just adding buffer, after interrupt (bad!)"); break; @@ -809,6 +810,7 @@ restart: GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "interrupted"); GST_QUEUE_MUTEX_UNLOCK; sched = gst_pad_get_scheduler (queue->srcpad); + queue->interrupt = FALSE; if (!sched || gst_scheduler_interrupt (sched, GST_ELEMENT (queue))) return GST_DATA (gst_event_new (GST_EVENT_INTERRUPT)); goto restart; diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c index 1e1b803ad0..af9fa30b4c 100644 --- a/plugins/elements/gstqueue.c +++ b/plugins/elements/gstqueue.c @@ -724,6 +724,7 @@ restart: g_cond_wait (queue->item_del, queue->qlock); STATUS (queue, "received item_del signal from thread using qlock"); } else { + queue->interrupt = FALSE; GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "Not waiting, just adding buffer, after interrupt (bad!)"); break; @@ -809,6 +810,7 @@ restart: GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "interrupted"); GST_QUEUE_MUTEX_UNLOCK; sched = gst_pad_get_scheduler (queue->srcpad); + queue->interrupt = FALSE; if (!sched || gst_scheduler_interrupt (sched, GST_ELEMENT (queue))) return GST_DATA (gst_event_new (GST_EVENT_INTERRUPT)); goto restart;