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

queue2: Use explicit limit checking

Browse source 
When we know we'll only be checking the real limits, use a clearer/simpler
macro.

CID #1037148

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/464>
This commit is contained in:
Edward Hervey 2020-05-06 08:04:28 +02:00 committed by Edward Hervey
parent c740c10404
commit d854fb12e9
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
plugins/elements/gstqueue2.c
View file

@ -2806,7 +2806,11 @@ gst_queue2_is_filled (GstQueue2 * queue)
if (queue->is_eos)
return TRUE;
#define CHECK_FILLED(format,alt_max) ((queue->max_level.format) > 0 && \
/* Check the levels if non-null */
#define CHECK_FILLED_REAL(format) \
((queue->max_level.format) > 0 && (queue->cur_level.format) >= ((queue->max_level.format)))
/* Check the levels if non-null (use the alternative max if non-zero) */
#define CHECK_FILLED_ALT(format,alt_max) ((queue->max_level.format) > 0 && \
(queue->cur_level.format) >= ((alt_max) ? \
MIN ((queue->max_level.format), (alt_max)) : (queue->max_level.format)))
@ -2817,7 +2821,7 @@ gst_queue2_is_filled (GstQueue2 * queue)
GST_DEBUG_OBJECT (queue,
"max bytes %u, rb size %" G_GUINT64_FORMAT ", cur bytes %u",
queue->max_level.bytes, rb_size, queue->cur_level.bytes);
return CHECK_FILLED (bytes, rb_size);
return CHECK_FILLED_ALT (bytes, rb_size);
}
/* if using file, we're never filled if we don't have EOS */
@ -2829,15 +2833,16 @@ gst_queue2_is_filled (GstQueue2 * queue)
return FALSE;
/* we are filled if one of the current levels exceeds the max */
res = CHECK_FILLED (buffers, 0) || CHECK_FILLED (bytes, 0)
|| CHECK_FILLED (time, 0);
res = CHECK_FILLED_REAL (buffers) || CHECK_FILLED_REAL (bytes)
|| CHECK_FILLED_REAL (time);
/* if we need to, use the rate estimate to check against the max time we are
* allowed to queue */
if (queue->use_rate_estimate)
res |= CHECK_FILLED (rate_time, 0);
res |= CHECK_FILLED_REAL (rate_time);
#undef CHECK_FILLED
#undef CHECK_FILLED_REAL
#undef CHECK_FILLED_ALT
return res;
}