summaryrefslogtreecommitdiff
authorWim Taymans <wim.taymans@collabora.co.uk>2011-02-10 13:17:12 (GMT)
committer Wim Taymans <wim.taymans@collabora.co.uk>2011-02-10 14:21:46 (GMT)
commitdad43fa0042bbdbb0e91e17a7735e9527c898fe5 (patch) (side-by-side diff)
tree093628fd95ee9a2a6531045bafcab0b35c6ef323
parent4ee5c61a2da379c6a4d5003b91989754c373322f (diff)
downloadgstreamer-dad43fa0042bbdbb0e91e17a7735e9527c898fe5.zip
gstreamer-dad43fa0042bbdbb0e91e17a7735e9527c898fe5.tar.gz
basesink: use new QoS type
Use the new QoS type and send throttling QoS messages.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libs/gst/base/gstbasesink.c27
1 files changed, 21 insertions, 6 deletions
diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index b4c5e73..498b0e9 100644
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -2590,7 +2590,7 @@ preroll_failed:
}
static gboolean
-gst_base_sink_send_qos (GstBaseSink * basesink,
+gst_base_sink_send_qos (GstBaseSink * basesink, GstQOSType type,
gdouble proportion, GstClockTime time, GstClockTimeDiff diff)
{
GstEvent *event;
@@ -2598,10 +2598,10 @@ gst_base_sink_send_qos (GstBaseSink * basesink,
/* generate Quality-of-Service event */
GST_CAT_DEBUG_OBJECT (GST_CAT_QOS, basesink,
- "qos: proportion: %lf, diff %" G_GINT64_FORMAT ", timestamp %"
- GST_TIME_FORMAT, proportion, diff, GST_TIME_ARGS (time));
+ "qos: type %d, proportion: %lf, diff %" G_GINT64_FORMAT ", timestamp %"
+ GST_TIME_FORMAT, type, proportion, diff, GST_TIME_ARGS (time));
- event = gst_event_new_qos (proportion, diff, time);
+ event = gst_event_new_qos_full (type, proportion, diff, time);
/* send upstream */
res = gst_pad_push_event (basesink->sinkpad, event);
@@ -2715,6 +2715,9 @@ gst_base_sink_perform_qos (GstBaseSink * sink, gboolean dropped)
if (priv->avg_rate >= 0.0) {
+ GstQOSType type;
+ GstClockTimeDiff diff;
+
/* if we have a valid rate, start sending QoS messages */
if (priv->current_jitter < 0) {
/* make sure we never go below 0 when adding the jitter to the
@@ -2722,8 +2725,20 @@ gst_base_sink_perform_qos (GstBaseSink * sink, gboolean dropped)
if (priv->current_rstart < -priv->current_jitter)
priv->current_jitter = -priv->current_rstart;
}
- gst_base_sink_send_qos (sink, priv->avg_rate, priv->current_rstart,
- priv->current_jitter);
+
+ if (priv->throttle_time > 0) {
+ diff = priv->throttle_time;
+ type = GST_QOS_TYPE_THROTTLE;
+ } else {
+ diff = priv->current_jitter;
+ if (diff <= 0)
+ type = GST_QOS_TYPE_OVERFLOW;
+ else
+ type = GST_QOS_TYPE_UNDERFLOW;
+ }
+
+ gst_base_sink_send_qos (sink, type, priv->avg_rate, priv->current_rstart,
+ diff);
}
/* record when this buffer will leave us */