gst/playback/gstqueue2.c: Use other metrics as well when estimating the buffer level.

Original commit message from CVS:
* gst/playback/gstqueue2.c: (apply_segment), (update_buffering):
Use other metrics as well when estimating the buffer level.
This commit is contained in:
Wim Taymans 2007-06-28 11:06:56 +00:00
parent aac5185f3e
commit 8c05f2ebc9
2 changed files with 12 additions and 7 deletions

View file

@ -1,3 +1,8 @@
2007-06-28 Wim Taymans <wim@fluendo.com>
* gst/playback/gstqueue2.c: (apply_segment), (update_buffering):
Use other metrics as well when estimating the buffer level.
2007-06-28 Wim Taymans <wim@fluendo.com>
* gst/playback/gstplaybasebin.c: (make_decoder), (setup_source):

View file

@ -664,13 +664,13 @@ update_buffering (GstQueue * queue)
percent = 100;
} else {
/* figure out the percent we are filled, we take the max of all formats. */
if (queue->use_rate_estimate) {
percent = GET_PERCENT (rate_time);
} else {
percent = GET_PERCENT (bytes);
percent = MAX (percent, GET_PERCENT (time));
percent = MAX (percent, GET_PERCENT (buffers));
}
percent = GET_PERCENT (bytes);
percent = MAX (percent, GET_PERCENT (time));
percent = MAX (percent, GET_PERCENT (buffers));
/* also apply the rate estimate when we need to */
if (queue->use_rate_estimate)
percent = MAX (percent, GET_PERCENT (rate_time));
}
if (queue->is_buffering) {