summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2008-04-11 01:25:01 +0000
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2009-10-29 11:17:16 +0100
commitca7828940d310d92a6015a40873b33347ee7805d (patch)
tree056e4f88c13a6a585d44fd2b52d488dcebe5efc1
parente9d3f791396f90692d031fe1beebec784b2c96ca (diff)
docs/design/draft-keyframe-force.txt: Fix typo.
Original commit message from CVS: * docs/design/draft-keyframe-force.txt: Fix typo. * gst/playback/gstqueue2.c: (update_buffering), (gst_queue_handle_src_query): Set buffering mode in the messages. Set buffering percent in the query. * tests/examples/seek/seek.c: (update_fill), (msg_state_changed), (do_stream_buffering), (do_download_buffering), (msg_buffering): Do some more fancy things based on the buffering method in use.
-rw-r--r--gst/playback/gstqueue2.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/gst/playback/gstqueue2.c b/gst/playback/gstqueue2.c
index e1b8a9ab23..73838c09b1 100644
--- a/gst/playback/gstqueue2.c
+++ b/gst/playback/gstqueue2.c
@@ -690,6 +690,7 @@ update_buffering (GstQueue * queue)
}
if (post) {
GstMessage *message;
+ GstBufferingMode mode;
/* scale to high percent so that it becomes the 100% mark */
percent = percent * 100 / queue->high_percent;
@@ -697,9 +698,14 @@ update_buffering (GstQueue * queue)
if (percent > 100)
percent = 100;
+ if (QUEUE_IS_USING_TEMP_FILE (queue))
+ mode = GST_BUFFERING_DOWNLOAD;
+ else
+ mode = GST_BUFFERING_STREAM;
+
GST_DEBUG_OBJECT (queue, "buffering %d percent", percent);
message = gst_message_new_buffering (GST_OBJECT_CAST (queue), percent);
- gst_message_set_buffering_stats (message, GST_BUFFERING_STREAM,
+ gst_message_set_buffering_stats (message, mode,
queue->byte_in_rate, queue->byte_out_rate, -1);
gst_element_post_message (GST_ELEMENT_CAST (queue), message);
@@ -1685,6 +1691,7 @@ gst_queue_handle_src_query (GstPad * pad, GstQuery * query)
stop = -1;
break;
}
+ gst_query_set_buffering_percent (query, queue->is_buffering, 100);
gst_query_set_buffering_range (query, format, start, stop, -1);
}
break;