diff options
| author | Robert Swain <robert.swain@collabora.co.uk> | 2010-05-26 04:11:48 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2010-08-13 16:38:52 +0200 |
| commit | bde816451e399aec85ff1dbca989976538a29913 (patch) | |
| tree | 3198d654117b88b3a5b1cc613baa5c3124bf45e5 /plugins | |
| parent | 68e2275bb98ed27a5d34bf5109bb6624f73a6388 (diff) | |
queue2: Fix conditions where behaviour should differ between ring
buffer and temp file
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/elements/gstqueue2.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/plugins/elements/gstqueue2.c b/plugins/elements/gstqueue2.c index 4bd84f9e8b..ef47f1ac75 100644 --- a/plugins/elements/gstqueue2.c +++ b/plugins/elements/gstqueue2.c @@ -1102,7 +1102,7 @@ gst_queue2_have_data (GstQueue2 * queue, guint64 offset, guint length) if (queue->is_eos) return TRUE; - if (offset + length < range->writing_pos) + if (offset + length <= range->writing_pos) return TRUE; else GST_DEBUG_OBJECT (queue, @@ -1837,8 +1837,8 @@ gst_queue2_handle_sink_event (GstPad * pad, GstEvent * event) case GST_EVENT_FLUSH_START: { GST_CAT_LOG_OBJECT (queue_dataflow, queue, "received flush start event"); - 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)) { /* forward 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"); - 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)) { /* forward event */ gst_pad_push_event (queue->srcpad, event); @@ -1929,7 +1929,8 @@ gst_queue2_is_empty (GstQueue2 * queue) if (queue->is_eos) 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; } else { if (queue->queue->length == 0) @@ -2244,8 +2245,8 @@ gst_queue2_handle_src_event (GstPad * pad, GstEvent * event) switch (GST_EVENT_TYPE (event)) { case GST_EVENT_FLUSH_START: - 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)) { /* just forward upstream */ res = gst_pad_push_event (queue->sinkpad, event); } else { @@ -2262,8 +2263,8 @@ gst_queue2_handle_src_event (GstPad * pad, GstEvent * event) } break; case GST_EVENT_FLUSH_STOP: - 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)) { /* just forward upstream */ res = gst_pad_push_event (queue->sinkpad, event); } else { @@ -2352,6 +2353,7 @@ gst_queue2_handle_src_query (GstPad * pad, GstQuery * query) GST_DEBUG_OBJECT (queue, "query buffering"); + /* FIXME - is this condition correct? what should ring buffer do? */ if (!(QUEUE_IS_USING_RING_BUFFER (queue) || QUEUE_IS_USING_TEMP_FILE (queue))) { /* no temp file, just forward to the peer */ |