mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 07:28:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

multiqueue: avoid shadowing function argument

Browse source 
Don't shadow the sq argument in the underrun_cb function but use
a different variable name to iterate the other queues.
Use the same variable name in the overrun_cb function.
This commit is contained in:
Wim Taymans 2009-10-21 14:15:05 -04:00 committed by Wim Taymans
parent 814ee012e7
commit 606852c586
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
plugins/elements/gstmultiqueue.c
View file

@ -1335,13 +1335,13 @@ single_queue_overrun_cb (GstDataQueue * dq, GstSingleQueue * sq)
GST_MULTI_QUEUE_MUTEX_LOCK (mq); GST_MULTI_QUEUE_MUTEX_LOCK (mq);
for (tmp = mq->queues; tmp; tmp = g_list_next (tmp)) { for (tmp = mq->queues; tmp; tmp = g_list_next (tmp)) {
GstSingleQueue *ssq = (GstSingleQueue *) tmp->data; GstSingleQueue *oq = (GstSingleQueue *) tmp->data;
GstDataQueueSize ssize; GstDataQueueSize ssize;
GST_LOG_OBJECT (mq, "Checking Queue %d", ssq->id); GST_LOG_OBJECT (mq, "Checking Queue %d", oq->id);
if (gst_data_queue_is_empty (ssq->queue)) { if (gst_data_queue_is_empty (oq->queue)) {
GST_LOG_OBJECT (mq, "Queue %d is empty", ssq->id); GST_LOG_OBJECT (mq, "Queue %d is empty", oq->id);
if (IS_FILLED (sq, visible, size.visible)) { if (IS_FILLED (sq, visible, size.visible)) {
sq->max_size.visible = size.visible + 1; sq->max_size.visible = size.visible + 1;
GST_DEBUG_OBJECT (mq, GST_DEBUG_OBJECT (mq,
@ -1352,17 +1352,17 @@ single_queue_overrun_cb (GstDataQueue * dq, GstSingleQueue * sq)
goto beach; goto beach;
} }
/* check if we reached the hard time/bytes limits */ /* check if we reached the hard time/bytes limits */
gst_data_queue_get_level (ssq->queue, &ssize); gst_data_queue_get_level (oq->queue, &ssize);
GST_DEBUG_OBJECT (mq, GST_DEBUG_OBJECT (mq,
"queue %d: visible %u/%u, bytes %u/%u, time %" G_GUINT64_FORMAT "/%" "queue %d: visible %u/%u, bytes %u/%u, time %" G_GUINT64_FORMAT "/%"
G_GUINT64_FORMAT, ssq->id, ssize.visible, sq->max_size.visible, G_GUINT64_FORMAT, oq->id, ssize.visible, sq->max_size.visible,
ssize.bytes, sq->max_size.bytes, sq->cur_time, sq->max_size.time); ssize.bytes, sq->max_size.bytes, sq->cur_time, sq->max_size.time);
/* if this queue is filled completely we must signal overrun */ /* if this queue is filled completely we must signal overrun */
if (sq->is_eos || IS_FILLED (sq, bytes, ssize.bytes) || if (sq->is_eos || IS_FILLED (sq, bytes, ssize.bytes) ||
IS_FILLED (sq, time, sq->cur_time)) { IS_FILLED (sq, time, sq->cur_time)) {
GST_LOG_OBJECT (mq, "Queue %d is filled", ssq->id); GST_LOG_OBJECT (mq, "Queue %d is filled", oq->id);
filled = TRUE; filled = TRUE;
} }
} }
@ -1391,21 +1391,21 @@ single_queue_underrun_cb (GstDataQueue * dq, GstSingleQueue * sq)
GST_MULTI_QUEUE_MUTEX_LOCK (mq); GST_MULTI_QUEUE_MUTEX_LOCK (mq);
for (tmp = mq->queues; tmp; tmp = g_list_next (tmp)) { for (tmp = mq->queues; tmp; tmp = g_list_next (tmp)) {
GstSingleQueue *sq = (GstSingleQueue *) tmp->data; GstSingleQueue *oq = (GstSingleQueue *) tmp->data;
if (gst_data_queue_is_full (sq->queue)) { if (gst_data_queue_is_full (oq->queue)) {
GstDataQueueSize size; GstDataQueueSize size;
gst_data_queue_get_level (sq->queue, &size); gst_data_queue_get_level (oq->queue, &size);
if (IS_FILLED (sq, visible, size.visible)) { if (IS_FILLED (oq, visible, size.visible)) {
sq->max_size.visible = size.visible + 1; oq->max_size.visible = size.visible + 1;
GST_DEBUG_OBJECT (mq, GST_DEBUG_OBJECT (mq,
"queue %d is filled, bumping its max visible to %d", sq->id, "queue %d is filled, bumping its max visible to %d", oq->id,
sq->max_size.visible); oq->max_size.visible);
gst_data_queue_limits_changed (sq->queue); gst_data_queue_limits_changed (oq->queue);
} }
} }
if (!gst_data_queue_is_empty (sq->queue)) if (!gst_data_queue_is_empty (oq->queue))
empty = FALSE; empty = FALSE;
} }
GST_MULTI_QUEUE_MUTEX_UNLOCK (mq); GST_MULTI_QUEUE_MUTEX_UNLOCK (mq);