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

queue2: implement buffering query for all modes

Browse source 
Also implement the buffering query for STREAM mode.
This commit is contained in:
Wim Taymans 2012-12-20 11:59:54 +01:00
parent 7c056a9473
commit 6c968bbdf1
1 changed files with 25 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
plugins/elements/gstqueue2.c
View file

@ -836,6 +836,9 @@ get_buffering_percent (GstQueue2 * queue, gboolean * is_buffering,
if (percent) if (percent)
*percent = perc; *percent = perc;
GST_DEBUG_OBJECT (queue, "buffering %d, percent %d", queue->is_buffering,
perc);
return post; return post;
} }
@ -891,15 +894,12 @@ update_buffering (GstQueue2 * queue)
get_buffering_stats (queue, percent, &mode, &avg_in, &avg_out, get_buffering_stats (queue, percent, &mode, &avg_in, &avg_out,
&buffering_left); &buffering_left);
GST_DEBUG_OBJECT (queue, "buffering %d percent", (gint) percent);
message = gst_message_new_buffering (GST_OBJECT_CAST (queue), message = gst_message_new_buffering (GST_OBJECT_CAST (queue),
(gint) percent); (gint) percent);
gst_message_set_buffering_stats (message, mode, gst_message_set_buffering_stats (message, mode,
avg_in, avg_out, buffering_left); avg_in, avg_out, buffering_left);
gst_element_post_message (GST_ELEMENT_CAST (queue), message); gst_element_post_message (GST_ELEMENT_CAST (queue), message);
} else {
GST_DEBUG_OBJECT (queue, "filled %d percent", (gint) percent);
} }
} }
@ -2711,24 +2711,30 @@ gst_queue2_handle_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
} }
case GST_QUERY_BUFFERING: case GST_QUERY_BUFFERING:
{ {
GstFormat format; gint percent;
gboolean is_buffering;
GstBufferingMode mode;
gint avg_in, avg_out;
gint64 buffering_left;
GST_DEBUG_OBJECT (queue, "query buffering"); GST_DEBUG_OBJECT (queue, "query buffering");
/* FIXME - is this condition correct? what should ring buffer do? */ get_buffering_percent (queue, &is_buffering, &percent);
if (QUEUE_IS_USING_QUEUE (queue)) { gst_query_set_buffering_percent (query, is_buffering, percent);
/* no temp file, just forward to the peer */
if (!gst_pad_peer_query (queue->sinkpad, query)) get_buffering_stats (queue, percent, &mode, &avg_in, &avg_out,
goto peer_failed; &buffering_left);
GST_DEBUG_OBJECT (queue, "buffering forwarded to peer"); gst_query_set_buffering_stats (query, mode, avg_in, avg_out,
} else { buffering_left);
if (!QUEUE_IS_USING_QUEUE (queue)) {
/* add ranges for download and ringbuffer buffering */
GstFormat format;
gint64 start, stop, range_start, range_stop; gint64 start, stop, range_start, range_stop;
guint64 writing_pos; guint64 writing_pos;
gint percent; gint64 estimated_total;
gint64 estimated_total, buffering_left;
gint64 duration; gint64 duration;
gboolean peer_res, is_buffering, is_eos; gboolean peer_res, is_eos;
gdouble byte_in_rate, byte_out_rate;
GstQueue2Range *queued_ranges; GstQueue2Range *queued_ranges;
/* we need a current download region */ /* we need a current download region */
@ -2736,11 +2742,7 @@ gst_queue2_handle_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
return FALSE; return FALSE;
writing_pos = queue->current->writing_pos; writing_pos = queue->current->writing_pos;
byte_in_rate = queue->byte_in_rate;
byte_out_rate = queue->byte_out_rate;
is_buffering = queue->is_buffering;
is_eos = queue->is_eos; is_eos = queue->is_eos;
percent = queue->buffering_percent;
if (is_eos) { if (is_eos) {
/* we're EOS, we know the duration in bytes now */ /* we're EOS, we know the duration in bytes now */
@ -2756,27 +2758,13 @@ gst_queue2_handle_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
", writing %" G_GINT64_FORMAT, percent, duration, writing_pos); ", 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 && avg_in > 0.0)
estimated_total = ((duration - writing_pos) * 1000) / byte_in_rate; estimated_total = ((duration - writing_pos) * 1000) / avg_in;
else else
estimated_total = -1; estimated_total = -1;
/* calculate estimated remaining buffer time */ GST_DEBUG_OBJECT (queue, "estimated-total %" G_GINT64_FORMAT,
buffering_left = (percent == 100 ? 0 : -1); estimated_total);
if (queue->use_rate_estimate) {
guint64 max, cur;
max = queue->max_level.rate_time;
cur = queue->cur_level.rate_time;
if (percent != 100 && max > cur)
buffering_left = (max - cur) / 1000000;
}
GST_DEBUG_OBJECT (queue, "estimated-total %" G_GINT64_FORMAT
", 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);
@ -2839,9 +2827,6 @@ gst_queue2_handle_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
gst_query_add_buffering_range (query, range_start, range_stop); gst_query_add_buffering_range (query, range_start, range_stop);
} }
gst_query_set_buffering_percent (query, is_buffering, percent);
gst_query_set_buffering_stats (query, GST_BUFFERING_DOWNLOAD,
byte_in_rate, byte_out_rate, buffering_left);
gst_query_set_buffering_range (query, format, start, stop, gst_query_set_buffering_range (query, format, start, stop,
estimated_total); estimated_total);
} }