mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 11:32:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

queue2: Fix conditions where behaviour should differ between ring

Browse source 
buffer and temp file
This commit is contained in:
Robert Swain 2010-05-26 04:11:48 +02:00 committed by Wim Taymans
parent 68e2275bb9
commit bde816451e
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
plugins/elements/gstqueue2.c
View file

@ -1102,7 +1102,7 @@ gst_queue2_have_data (GstQueue2 * queue, guint64 offset, guint length)
if (queue->is_eos) if (queue->is_eos)
return TRUE; return TRUE;
if (offset + length < range->writing_pos) if (offset + length <= range->writing_pos)
return TRUE; return TRUE;
else else
GST_DEBUG_OBJECT (queue, GST_DEBUG_OBJECT (queue,
@ -1837,8 +1837,8 @@ gst_queue2_handle_sink_event (GstPad * pad, GstEvent * event)
case GST_EVENT_FLUSH_START: case GST_EVENT_FLUSH_START:
{ {
GST_CAT_LOG_OBJECT (queue_dataflow, queue, "received flush start event"); GST_CAT_LOG_OBJECT (queue_dataflow, queue, "received flush start event");
if (!(QUEUE_IS_USING_RING_BUFFER (queue) if (QUEUE_IS_USING_RING_BUFFER (queue)
|| QUEUE_IS_USING_TEMP_FILE (queue))) { || !QUEUE_IS_USING_TEMP_FILE (queue)) {
/* forward event */ /* forward event */
gst_pad_push_event (queue->srcpad, event); gst_pad_push_event (queue->srcpad, event);
@ -1862,8 +1862,8 @@ gst_queue2_handle_sink_event (GstPad * pad, GstEvent * event)
{ {
GST_CAT_LOG_OBJECT (queue_dataflow, queue, "received flush stop event"); GST_CAT_LOG_OBJECT (queue_dataflow, queue, "received flush stop event");
if (!(QUEUE_IS_USING_RING_BUFFER (queue) if (QUEUE_IS_USING_RING_BUFFER (queue)
|| QUEUE_IS_USING_TEMP_FILE (queue))) { || !QUEUE_IS_USING_TEMP_FILE (queue)) {
/* forward event */ /* forward event */
gst_pad_push_event (queue->srcpad, event); gst_pad_push_event (queue->srcpad, event);
@ -1929,7 +1929,8 @@ gst_queue2_is_empty (GstQueue2 * queue)
if (queue->is_eos) if (queue->is_eos)
return FALSE; return FALSE;
if (QUEUE_IS_USING_RING_BUFFER (queue) || QUEUE_IS_USING_TEMP_FILE (queue)) { if ((QUEUE_IS_USING_RING_BUFFER (queue) || QUEUE_IS_USING_TEMP_FILE (queue))
&& queue->current) {
return queue->current->writing_pos <= queue->current->max_reading_pos; return queue->current->writing_pos <= queue->current->max_reading_pos;
} else { } else {
if (queue->queue->length == 0) if (queue->queue->length == 0)
@ -2244,8 +2245,8 @@ gst_queue2_handle_src_event (GstPad * pad, GstEvent * event)
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_FLUSH_START: case GST_EVENT_FLUSH_START:
if (!(QUEUE_IS_USING_RING_BUFFER (queue) if (QUEUE_IS_USING_RING_BUFFER (queue)
|| QUEUE_IS_USING_TEMP_FILE (queue))) { || !QUEUE_IS_USING_TEMP_FILE (queue)) {
/* just forward upstream */ /* just forward upstream */
res = gst_pad_push_event (queue->sinkpad, event); res = gst_pad_push_event (queue->sinkpad, event);
} else { } else {
@ -2262,8 +2263,8 @@ gst_queue2_handle_src_event (GstPad * pad, GstEvent * event)
} }
break; break;
case GST_EVENT_FLUSH_STOP: case GST_EVENT_FLUSH_STOP:
if (!(QUEUE_IS_USING_RING_BUFFER (queue) if (QUEUE_IS_USING_RING_BUFFER (queue)
|| QUEUE_IS_USING_TEMP_FILE (queue))) { || !QUEUE_IS_USING_TEMP_FILE (queue)) {
/* just forward upstream */ /* just forward upstream */
res = gst_pad_push_event (queue->sinkpad, event); res = gst_pad_push_event (queue->sinkpad, event);
} else { } else {
@ -2352,6 +2353,7 @@ gst_queue2_handle_src_query (GstPad * pad, GstQuery * query)
GST_DEBUG_OBJECT (queue, "query buffering"); GST_DEBUG_OBJECT (queue, "query buffering");
/* FIXME - is this condition correct? what should ring buffer do? */
if (!(QUEUE_IS_USING_RING_BUFFER (queue) if (!(QUEUE_IS_USING_RING_BUFFER (queue)
|| QUEUE_IS_USING_TEMP_FILE (queue))) { || QUEUE_IS_USING_TEMP_FILE (queue))) {
/* no temp file, just forward to the peer */ /* no temp file, just forward to the peer */