mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 01:02:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

queue2: various ring buffer fixes

Browse source 
- make _get_range () emit the del signal once a buffer has been read
- use do {} while (); for wait code as queue is locked and no data could
  have been read in the mean time so it makes no sense to check before
  waiting
- make _is_filled () more robust
This commit is contained in:
Robert Swain 2010-05-18 17:21:40 +02:00 committed by Wim Taymans
parent d1809558e5
commit 178821aace
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plugins/elements/gstqueue2.c
View file

@ -1577,10 +1577,10 @@ gst_queue2_write_buffer_to_ring_buffer (GstQueue2 * queue, GstBuffer * buffer)
GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, GST_CAT_DEBUG_OBJECT (queue_dataflow, queue,
"queue is full, waiting for free space"); "queue is full, waiting for free space");
while (gst_queue2_is_filled (queue)) { do {
/* Wait for space to be available, we could be unlocked because of a flush. */ /* Wait for space to be available, we could be unlocked because of a flush. */
GST_QUEUE2_WAIT_DEL_CHECK (queue, queue->sinkresult, out_flushing); GST_QUEUE2_WAIT_DEL_CHECK (queue, queue->sinkresult, out_flushing);
} } while (gst_queue2_is_filled (queue));
/* and continue if we were running before */ /* and continue if we were running before */
if (started) if (started)
@ -1912,9 +1912,15 @@ gst_queue2_is_filled (GstQueue2 * queue)
/* if using a ring buffer we're filled if all ring buffer space is used /* if using a ring buffer we're filled if all ring buffer space is used
* _by the current range_ */ * _by the current range_ */
if (QUEUE_IS_USING_RING_BUFFER (queue)) if (QUEUE_IS_USING_RING_BUFFER (queue)) {
return queue->cur_level.bytes >= MIN (queue->max_level.bytes, guint max_bytes = queue->max_level.bytes;
queue->ring_buffer_max_size); guint64 rb_size = queue->ring_buffer_max_size;
GST_DEBUG_OBJECT (queue,
"max bytes %u, rb size %" G_GUINT64_FORMAT ", cur bytes %u", max_bytes,
rb_size, queue->cur_level.bytes);
return queue->cur_level.bytes >= (max_bytes ? MIN (max_bytes,
rb_size) : rb_size);
}
/* if using file, we're never filled if we don't have EOS */ /* if using file, we're never filled if we don't have EOS */
if (QUEUE_IS_USING_TEMP_FILE (queue)) if (QUEUE_IS_USING_TEMP_FILE (queue))
@ -2438,6 +2444,8 @@ gst_queue2_get_range (GstPad * pad, guint64 offset, guint length,
/* FIXME - function will block when the range is not yet available */ /* FIXME - function will block when the range is not yet available */
ret = gst_queue2_create_read (queue, offset, length, buffer); ret = gst_queue2_create_read (queue, offset, length, buffer);
GST_QUEUE2_SIGNAL_DEL (queue);
GST_QUEUE2_MUTEX_UNLOCK (queue); GST_QUEUE2_MUTEX_UNLOCK (queue);
gst_object_unref (queue); gst_object_unref (queue);