mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

plugins/elements/gstmultiqueue.c: Make sure we don't reference the buffer/event after we have given away ownership in...

Browse source 
Original commit message from CVS:
* plugins/elements/gstmultiqueue.c: (apply_buffer),
(gst_single_queue_push_one), (gst_multi_queue_chain),
(gst_multi_queue_sink_event):
Make sure we don't reference the buffer/event after we have given away
ownership in the queue.
This commit is contained in:
Wim Taymans 2007-06-18 16:44:07 +00:00
parent 8fb713783b
commit d6efd96ec4
2 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2007-06-18 Wim Taymans <wim@fluendo.com>
* plugins/elements/gstmultiqueue.c: (apply_buffer),
(gst_single_queue_push_one), (gst_multi_queue_chain),
(gst_multi_queue_sink_event):
Make sure we don't reference the buffer/event after we have given away
ownership in the queue.
2007-06-18 Wim Taymans <wim@fluendo.com> 2007-06-18 Wim Taymans <wim@fluendo.com>
* plugins/elements/gstmultiqueue.c: (gst_single_queue_flush), * plugins/elements/gstmultiqueue.c: (gst_single_queue_flush),

30
plugins/elements/gstmultiqueue.c
View file

@ -523,14 +523,9 @@ apply_segment (GstMultiQueue * mq, GstSingleQueue * sq, GstEvent * event,
/* take a buffer and update segment, updating the time level of the queue. */ /* take a buffer and update segment, updating the time level of the queue. */
static void static void
apply_buffer (GstMultiQueue * mq, GstSingleQueue * sq, GstBuffer * buffer, apply_buffer (GstMultiQueue * mq, GstSingleQueue * sq, GstClockTime timestamp,
GstSegment * segment) GstClockTime duration, GstSegment * segment)
{ {
GstClockTime duration, timestamp;
timestamp = GST_BUFFER_TIMESTAMP (buffer);
duration = GST_BUFFER_DURATION (buffer);
/* if no timestamp is set, assume it's continuous with the previous /* if no timestamp is set, assume it's continuous with the previous
* time */ * time */
if (timestamp == GST_CLOCK_TIME_NONE) if (timestamp == GST_CLOCK_TIME_NONE)
@ -557,10 +552,13 @@ gst_single_queue_push_one (GstMultiQueue * mq, GstSingleQueue * sq,
if (GST_IS_BUFFER (object)) { if (GST_IS_BUFFER (object)) {
GstBuffer *buffer; GstBuffer *buffer;
GstClockTime timestamp, duration;
buffer = GST_BUFFER_CAST (object); buffer = GST_BUFFER_CAST (object);
timestamp = GST_BUFFER_TIMESTAMP (buffer);
duration = GST_BUFFER_DURATION (buffer);
apply_buffer (mq, sq, buffer, &sq->src_segment); apply_buffer (mq, sq, timestamp, duration, &sq->src_segment);
result = gst_pad_push (sq->srcpad, buffer); result = gst_pad_push (sq->srcpad, buffer);
} else if (GST_IS_EVENT (object)) { } else if (GST_IS_EVENT (object)) {
@ -747,6 +745,7 @@ gst_multi_queue_chain (GstPad * pad, GstBuffer * buffer)
GstMultiQueueItem *item; GstMultiQueueItem *item;
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
guint32 curid; guint32 curid;
GstClockTime timestamp, duration;
sq = gst_pad_get_element_private (pad); sq = gst_pad_get_element_private (pad);
mq = (GstMultiQueue *) gst_pad_get_parent (pad); mq = (GstMultiQueue *) gst_pad_get_parent (pad);
@ -761,12 +760,15 @@ gst_multi_queue_chain (GstPad * pad, GstBuffer * buffer)
item = gst_multi_queue_item_new (GST_MINI_OBJECT_CAST (buffer), curid); item = gst_multi_queue_item_new (GST_MINI_OBJECT_CAST (buffer), curid);
timestamp = GST_BUFFER_TIMESTAMP (buffer);
duration = GST_BUFFER_DURATION (buffer);
if (!(gst_data_queue_push (sq->queue, (GstDataQueueItem *) item))) if (!(gst_data_queue_push (sq->queue, (GstDataQueueItem *) item)))
goto flushing; goto flushing;
/* update time level, we must do this after pushing the data in the queue so /* update time level, we must do this after pushing the data in the queue so
* that we never end up filling the queue first. */ * that we never end up filling the queue first. */
apply_buffer (mq, sq, buffer, &sq->sink_segment); apply_buffer (mq, sq, timestamp, duration, &sq->sink_segment);
done: done:
gst_object_unref (mq); gst_object_unref (mq);
@ -809,6 +811,7 @@ gst_multi_queue_sink_event (GstPad * pad, GstEvent * event)
GstMultiQueueItem *item; GstMultiQueueItem *item;
gboolean res; gboolean res;
GstEventType type; GstEventType type;
GstEvent *sref = NULL;
sq = (GstSingleQueue *) gst_pad_get_element_private (pad); sq = (GstSingleQueue *) gst_pad_get_element_private (pad);
mq = (GstMultiQueue *) gst_pad_get_parent (pad); mq = (GstMultiQueue *) gst_pad_get_parent (pad);
@ -833,6 +836,11 @@ gst_multi_queue_sink_event (GstPad * pad, GstEvent * event)
gst_single_queue_flush (mq, sq, FALSE); gst_single_queue_flush (mq, sq, FALSE);
goto done; goto done;
case GST_EVENT_NEWSEGMENT:
/* take ref because the queue will take ownership and we need the event
* afterwards to update the segment */
sref = gst_event_ref (event);
break;
default: default:
if (!(GST_EVENT_IS_SERIALIZED (event))) { if (!(GST_EVENT_IS_SERIALIZED (event))) {
@ -865,7 +873,7 @@ gst_multi_queue_sink_event (GstPad * pad, GstEvent * event)
sq->is_eos = TRUE; sq->is_eos = TRUE;
break; break;
case GST_EVENT_NEWSEGMENT: case GST_EVENT_NEWSEGMENT:
apply_segment (mq, sq, event, &sq->sink_segment); apply_segment (mq, sq, sref, &sq->sink_segment);
break; break;
default: default:
break; break;
@ -878,6 +886,8 @@ flushing:
{ {
GST_LOG_OBJECT (mq, "SingleQueue %d : exit because task paused, reason: %s", GST_LOG_OBJECT (mq, "SingleQueue %d : exit because task paused, reason: %s",
sq->id, gst_flow_get_name (sq->srcresult)); sq->id, gst_flow_get_name (sq->srcresult));
if (sref)
gst_event_unref (sref);
gst_multi_queue_item_destroy (item); gst_multi_queue_item_destroy (item);
goto done; goto done;
} }