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

queue2: set buffering-left to 0 on 100% buffering

Browse source 
Set the buffering-left field in the query to 0 when we are completely buffered.
Improve the debug.
This commit is contained in:
Wim Taymans 2012-07-19 12:42:05 +02:00
parent 60091bf225
commit b5caa93f6d
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plugins/elements/gstqueue2.c
View file

@ -2665,7 +2665,7 @@ gst_queue2_handle_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
gint64 start, stop, range_start, range_stop; gint64 start, stop, range_start, range_stop;
guint64 writing_pos; guint64 writing_pos;
gint percent; gint percent;
gint64 estimated_total = -1, buffering_left = -1; gint64 estimated_total, buffering_left;
gint64 duration; gint64 duration;
gboolean peer_res, is_buffering, is_eos; gboolean peer_res, is_buffering, is_eos;
gdouble byte_in_rate, byte_out_rate; gdouble byte_in_rate, byte_out_rate;
@ -2692,11 +2692,18 @@ gst_queue2_handle_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
GST_FORMAT_BYTES, &duration); GST_FORMAT_BYTES, &duration);
} }
GST_DEBUG_OBJECT (queue, "percent %d, duration %" G_GINT64_FORMAT
", writing %" G_GINT64_FORMAT, percent, duration, writing_pos);
/* calculate remaining and total download time */ /* calculate remaining and total download time */
if (peer_res && byte_in_rate > 0.0) if (peer_res && byte_in_rate > 0.0)
estimated_total = ((duration - writing_pos) * 1000) / byte_in_rate; estimated_total = ((duration - writing_pos) * 1000) / byte_in_rate;
else
estimated_total = -1;
/* calculate estimated remaining buffer time */ /* calculate estimated remaining buffer time */
buffering_left = (percent == 100 ? 0 : -1);
if (queue->use_rate_estimate) { if (queue->use_rate_estimate) {
guint64 max, cur; guint64 max, cur;
@ -2707,8 +2714,9 @@ gst_queue2_handle_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
buffering_left = (max - cur) / 1000000; buffering_left = (max - cur) / 1000000;
} }
GST_DEBUG_OBJECT (queue, "estimated %" G_GINT64_FORMAT ", left %" GST_DEBUG_OBJECT (queue, "estimated-total %" G_GINT64_FORMAT
G_GINT64_FORMAT, estimated_total, buffering_left); ", buffering-left %" G_GINT64_FORMAT, estimated_total,
buffering_left);
gst_query_parse_buffering_range (query, &format, NULL, NULL, NULL); gst_query_parse_buffering_range (query, &format, NULL, NULL, NULL);
@ -2718,10 +2726,6 @@ gst_queue2_handle_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
if (!peer_res) if (!peer_res)
goto peer_failed; goto peer_failed;
GST_DEBUG_OBJECT (queue,
"duration %" G_GINT64_FORMAT ", writing %" G_GINT64_FORMAT,
duration, writing_pos);
start = 0; start = 0;
/* get our available data relative to the duration */ /* get our available data relative to the duration */
if (duration != -1) if (duration != -1)