mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 00:01:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

queue2: adjust input data rate estimation

Browse source 
... being aware of possible initial higher burst rate.
This commit is contained in:
Mark Nauwelaerts 2011-04-19 20:05:07 +02:00
parent 76ccd2a1e9
commit fe1dcbe6fa
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plugins/elements/gstqueue2.c
View file

@ -898,6 +898,7 @@ reset_rate_timer (GstQueue2 * queue)
queue->bytes_in = 0; queue->bytes_in = 0;
queue->bytes_out = 0; queue->bytes_out = 0;
queue->byte_in_rate = 0.0; queue->byte_in_rate = 0.0;
queue->byte_in_period = 0;
queue->byte_out_rate = 0.0; queue->byte_out_rate = 0.0;
queue->last_in_elapsed = 0.0; queue->last_in_elapsed = 0.0;
queue->last_out_elapsed = 0.0; queue->last_out_elapsed = 0.0;
@ -910,8 +911,11 @@ reset_rate_timer (GstQueue2 * queue)
/* Tuning for rate estimation. We use a large window for the input rate because /* Tuning for rate estimation. We use a large window for the input rate because
* it should be stable when connected to a network. The output rate is less * it should be stable when connected to a network. The output rate is less
* stable (the elements preroll, queues behind a demuxer fill, ...) and should * stable (the elements preroll, queues behind a demuxer fill, ...) and should
* therefore adapt more quickly. */ * therefore adapt more quickly.
#define AVG_IN(avg,val) ((avg) * 15.0 + (val)) / 16.0 * However, initial input rate may be subject to a burst, and should therefore
* initially also adapt more quickly to changes, and only later on give higher
* weight to previous values. */
#define AVG_IN(avg,val,w1,w2) ((avg) * (w1) + (val) * (w2)) / ((w1) + (w2))
#define AVG_OUT(avg,val) ((avg) * 3.0 + (val)) / 4.0 #define AVG_OUT(avg,val) ((avg) * 3.0 + (val)) / 4.0
static void static void
@ -933,14 +937,20 @@ update_in_rates (GstQueue2 * queue)
period = elapsed - queue->last_in_elapsed; period = elapsed - queue->last_in_elapsed;
GST_DEBUG_OBJECT (queue, GST_DEBUG_OBJECT (queue,
"rates: period %f, in %" G_GUINT64_FORMAT, period, queue->bytes_in); "rates: period %f, in %" G_GUINT64_FORMAT ", global period %f",
period, queue->bytes_in, queue->byte_in_period);
byte_in_rate = queue->bytes_in / period; byte_in_rate = queue->bytes_in / period;
if (queue->byte_in_rate == 0.0) if (queue->byte_in_rate == 0.0)
queue->byte_in_rate = byte_in_rate; queue->byte_in_rate = byte_in_rate;
else else
queue->byte_in_rate = AVG_IN (queue->byte_in_rate, byte_in_rate); queue->byte_in_rate = AVG_IN (queue->byte_in_rate, byte_in_rate,
(double) queue->byte_in_period, period);
/* another data point, cap at 16 for long time running average */
if (queue->byte_in_period < 16 * RATE_INTERVAL)
queue->byte_in_period += period;
/* reset the values to calculate rate over the next interval */ /* reset the values to calculate rate over the next interval */
queue->last_in_elapsed = elapsed; queue->last_in_elapsed = elapsed;

1
plugins/elements/gstqueue2.h
View file

@ -116,6 +116,7 @@ struct _GstQueue2
gdouble last_in_elapsed; gdouble last_in_elapsed;
guint64 bytes_in; guint64 bytes_in;
gdouble byte_in_rate; gdouble byte_in_rate;
gdouble byte_in_period;
GTimer *out_timer; GTimer *out_timer;
gboolean out_timer_started; gboolean out_timer_started;