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

queue: Remove unused boolean parameter from internal functions

Browse source
This commit is contained in:
Sebastian Dröge 2015-02-18 11:05:19 +02:00
parent c102d02bd0
commit f2b27d3962
1 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
plugins/elements/gstqueue.c
View file

@ -596,7 +596,7 @@ apply_gap (GstQueue * queue, GstEvent * event,
/* take a buffer and update segment, updating the time level of the queue. */ /* take a buffer and update segment, updating the time level of the queue. */
static void static void
apply_buffer (GstQueue * queue, GstBuffer * buffer, GstSegment * segment, apply_buffer (GstQueue * queue, GstBuffer * buffer, GstSegment * segment,
gboolean with_duration, gboolean sink) gboolean sink)
{ {
GstClockTime duration, timestamp; GstClockTime duration, timestamp;
@ -609,7 +609,7 @@ apply_buffer (GstQueue * queue, GstBuffer * buffer, GstSegment * segment,
timestamp = segment->position; timestamp = segment->position;
/* add duration */ /* add duration */
if (with_duration && duration != GST_CLOCK_TIME_NONE) if (duration != GST_CLOCK_TIME_NONE)
timestamp += duration; timestamp += duration;
GST_LOG_OBJECT (queue, "position updated to %" GST_TIME_FORMAT, GST_LOG_OBJECT (queue, "position updated to %" GST_TIME_FORMAT,
@ -626,16 +626,10 @@ apply_buffer (GstQueue * queue, GstBuffer * buffer, GstSegment * segment,
update_time_level (queue); update_time_level (queue);
} }
typedef struct
{
GstClockTime timestamp;
gboolean with_duration;
} BufferListApplyTimeData;
static gboolean static gboolean
buffer_list_apply_time (GstBuffer ** buf, guint idx, gpointer user_data) buffer_list_apply_time (GstBuffer ** buf, guint idx, gpointer user_data)
{ {
BufferListApplyTimeData *data = user_data; GstClockTime *timestamp = user_data;
GST_TRACE ("buffer %u has ts %" GST_TIME_FORMAT GST_TRACE ("buffer %u has ts %" GST_TIME_FORMAT
" duration %" GST_TIME_FORMAT, idx, " duration %" GST_TIME_FORMAT, idx,
@ -643,12 +637,12 @@ buffer_list_apply_time (GstBuffer ** buf, guint idx, gpointer user_data)
GST_TIME_ARGS (GST_BUFFER_DURATION (*buf))); GST_TIME_ARGS (GST_BUFFER_DURATION (*buf)));
if (GST_BUFFER_TIMESTAMP_IS_VALID (*buf)) if (GST_BUFFER_TIMESTAMP_IS_VALID (*buf))
data->timestamp = GST_BUFFER_TIMESTAMP (*buf); *timestamp = GST_BUFFER_TIMESTAMP (*buf);
if (data->with_duration && GST_BUFFER_DURATION_IS_VALID (*buf)) if (GST_BUFFER_DURATION_IS_VALID (*buf))
data->timestamp += GST_BUFFER_DURATION (*buf); *timestamp += GST_BUFFER_DURATION (*buf);
GST_TRACE ("ts now %" GST_TIME_FORMAT, GST_TIME_ARGS (data->timestamp)); GST_TRACE ("ts now %" GST_TIME_FORMAT, GST_TIME_ARGS (*timestamp));
return TRUE; return TRUE;
} }
@ -656,20 +650,19 @@ buffer_list_apply_time (GstBuffer ** buf, guint idx, gpointer user_data)
/* take a buffer list and update segment, updating the time level of the queue */ /* take a buffer list and update segment, updating the time level of the queue */
static void static void
apply_buffer_list (GstQueue * queue, GstBufferList * buffer_list, apply_buffer_list (GstQueue * queue, GstBufferList * buffer_list,
GstSegment * segment, gboolean with_duration, gboolean sink) GstSegment * segment, gboolean sink)
{ {
BufferListApplyTimeData data; GstClockTime timestamp;
/* if no timestamp is set, assume it's continuous with the previous time */ /* if no timestamp is set, assume it's continuous with the previous time */
data.timestamp = segment->position; timestamp = segment->position;
data.with_duration = with_duration;
gst_buffer_list_foreach (buffer_list, buffer_list_apply_time, &data); gst_buffer_list_foreach (buffer_list, buffer_list_apply_time, &timestamp);
GST_DEBUG_OBJECT (queue, "position updated to %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (queue, "position updated to %" GST_TIME_FORMAT,
GST_TIME_ARGS (data.timestamp)); GST_TIME_ARGS (timestamp));
segment->position = data.timestamp; segment->position = timestamp;
if (sink) if (sink)
queue->sink_tainted = TRUE; queue->sink_tainted = TRUE;
@ -726,7 +719,7 @@ gst_queue_locked_enqueue_buffer (GstQueue * queue, gpointer item)
/* add buffer to the statistics */ /* add buffer to the statistics */
queue->cur_level.buffers++; queue->cur_level.buffers++;
queue->cur_level.bytes += bsize; queue->cur_level.bytes += bsize;
apply_buffer (queue, buffer, &queue->sink_segment, TRUE, TRUE); apply_buffer (queue, buffer, &queue->sink_segment, TRUE);
qitem = g_slice_new (GstQueueItem); qitem = g_slice_new (GstQueueItem);
qitem->item = item; qitem->item = item;
@ -760,7 +753,7 @@ gst_queue_locked_enqueue_buffer_list (GstQueue * queue, gpointer item)
/* add buffer to the statistics */ /* add buffer to the statistics */
queue->cur_level.buffers += gst_buffer_list_length (buffer_list); queue->cur_level.buffers += gst_buffer_list_length (buffer_list);
queue->cur_level.bytes += bsize; queue->cur_level.bytes += bsize;
apply_buffer_list (queue, buffer_list, &queue->sink_segment, TRUE, TRUE); apply_buffer_list (queue, buffer_list, &queue->sink_segment, TRUE);
qitem = g_slice_new (GstQueueItem); qitem = g_slice_new (GstQueueItem);
qitem->item = item; qitem->item = item;
@ -838,7 +831,7 @@ gst_queue_locked_dequeue (GstQueue * queue)
queue->cur_level.buffers--; queue->cur_level.buffers--;
queue->cur_level.bytes -= bufsize; queue->cur_level.bytes -= bufsize;
apply_buffer (queue, buffer, &queue->src_segment, TRUE, FALSE); apply_buffer (queue, buffer, &queue->src_segment, FALSE);
/* if the queue is empty now, update the other side */ /* if the queue is empty now, update the other side */
if (queue->cur_level.buffers == 0) if (queue->cur_level.buffers == 0)
@ -851,7 +844,7 @@ gst_queue_locked_dequeue (GstQueue * queue)
queue->cur_level.buffers -= gst_buffer_list_length (buffer_list); queue->cur_level.buffers -= gst_buffer_list_length (buffer_list);
queue->cur_level.bytes -= bufsize; queue->cur_level.bytes -= bufsize;
apply_buffer_list (queue, buffer_list, &queue->src_segment, TRUE, FALSE); apply_buffer_list (queue, buffer_list, &queue->src_segment, FALSE);
/* if the queue is empty now, update the other side */ /* if the queue is empty now, update the other side */
if (queue->cur_level.buffers == 0) if (queue->cur_level.buffers == 0)