mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 08:41:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

queue2: Fix bugs

Browse source 
update_buffering () needs to be called every time we write to the ring
buffer so that applications don't get stuck waiting for a 100% buffered
message while queue2 is waiting for space

_create_write () must only be called for temp file/ring buffer cases
This commit is contained in:
Robert Swain 2010-06-25 12:58:27 +02:00 committed by Wim Taymans
parent 9df54eb4ff
commit 602f4774c7
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/elements/gstqueue2.c
View file

@ -1659,6 +1659,9 @@ gst_queue2_create_write (GstQueue2 * queue, GstBuffer * buffer)
} }
update_cur_level (queue, queue->current); update_cur_level (queue, queue->current);
/* update the buffering status */
update_buffering (queue);
GST_INFO_OBJECT (queue, "cur_level.bytes %u (max %u)", GST_INFO_OBJECT (queue, "cur_level.bytes %u (max %u)",
queue->cur_level.bytes, QUEUE_MAX_BYTES (queue)); queue->cur_level.bytes, QUEUE_MAX_BYTES (queue));
@ -1719,8 +1722,10 @@ gst_queue2_locked_enqueue (GstQueue2 * queue, gpointer item)
/* update the byterate stats */ /* update the byterate stats */
update_in_rates (queue); update_in_rates (queue);
if (!QUEUE_IS_USING_QUEUE (queue)) {
/* FIXME - check return value? */ /* FIXME - check return value? */
gst_queue2_create_write (queue, buffer); gst_queue2_create_write (queue, buffer);
}
} else if (GST_IS_EVENT (item)) { } else if (GST_IS_EVENT (item)) {
GstEvent *event; GstEvent *event;
@ -1764,13 +1769,14 @@ gst_queue2_locked_enqueue (GstQueue2 * queue, gpointer item)
} }
if (item) { if (item) {
if (QUEUE_IS_USING_QUEUE (queue)) {
/* update the buffering status */ /* update the buffering status */
update_buffering (queue); update_buffering (queue);
if (QUEUE_IS_USING_QUEUE (queue))
g_queue_push_tail (queue->queue, item); g_queue_push_tail (queue->queue, item);
else } else {
gst_mini_object_unref (GST_MINI_OBJECT_CAST (item)); gst_mini_object_unref (GST_MINI_OBJECT_CAST (item));
}
if (!QUEUE_IS_USING_RING_BUFFER (queue)) if (!QUEUE_IS_USING_RING_BUFFER (queue))
GST_QUEUE2_SIGNAL_ADD (queue); GST_QUEUE2_SIGNAL_ADD (queue);