mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-29 23:32:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

queue2: avoid calculating fill levels multiple times

Browse source 
Macro expansion means we might calculate the fill level once
for the check and then possibly again for the return value.
This commit is contained in:
Tim-Philipp Müller 2016-01-06 19:51:44 +00:00
parent 8c6c0bef88
commit 61e2f1eab1
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
plugins/elements/gstqueue2.c
View file

@ -882,7 +882,7 @@ static gboolean
get_buffering_percent (GstQueue2 * queue, gboolean * is_buffering,
gint * percent)
{
gint perc;
gint perc, perc2;
if (queue->high_percent <= 0) {
if (percent)
@ -912,12 +912,18 @@ get_buffering_percent (GstQueue2 * queue, gboolean * is_buffering,
guint64 rb_size = queue->ring_buffer_max_size;
perc = GET_PERCENT (bytes, rb_size);
}
perc = MAX (perc, GET_PERCENT (time, 0));
perc = MAX (perc, GET_PERCENT (buffers, 0));
perc2 = GET_PERCENT (time, 0);
perc = MAX (perc, perc2);
perc2 = GET_PERCENT (buffers, 0);
perc = MAX (perc, perc2);
/* also apply the rate estimate when we need to */
if (queue->use_rate_estimate)
perc = MAX (perc, GET_PERCENT (rate_time, 0));
if (queue->use_rate_estimate) {
perc2 = GET_PERCENT (rate_time, 0);
perc = MAX (perc, perc2);
}
/* Don't get to 0% unless we're really empty */
if (queue->cur_level.bytes > 0)