mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-02 12:45:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs/gst/base/gstbasesink.c: Add some debug.

Browse source 
Original commit message from CVS:
* libs/gst/base/gstbasesink.c: (gst_base_sink_set_async_enabled),
(gst_base_sink_set_ts_offset), (gst_base_sink_perform_qos):
Add some debug.
Make sure we don't generate invalid QoS messages.
This commit is contained in:
Wim Taymans 2008-06-04 11:47:16 +00:00
parent 0fff6fa810
commit f01c4d6201
2 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-06-04 Wim Taymans <wim.taymans@collabora.co.uk>
* libs/gst/base/gstbasesink.c: (gst_base_sink_set_async_enabled),
(gst_base_sink_set_ts_offset), (gst_base_sink_perform_qos):
Add some debug.
Make sure we don't generate invalid QoS messages.
2008-06-04 Wim Taymans <wim.taymans@collabora.co.uk> 2008-06-04 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/gstevent.c: (gst_event_new_qos): * gst/gstevent.c: (gst_event_new_qos):

29
libs/gst/base/gstbasesink.c
View file

@ -724,6 +724,7 @@ gst_base_sink_set_async_enabled (GstBaseSink * sink, gboolean enabled)
GST_PAD_PREROLL_LOCK (sink->sinkpad); GST_PAD_PREROLL_LOCK (sink->sinkpad);
sink->priv->async_enabled = enabled; sink->priv->async_enabled = enabled;
GST_LOG_OBJECT (sink, "set async enabled to %d", enabled);
GST_PAD_PREROLL_UNLOCK (sink->sinkpad); GST_PAD_PREROLL_UNLOCK (sink->sinkpad);
} }
@ -772,6 +773,7 @@ gst_base_sink_set_ts_offset (GstBaseSink * sink, GstClockTimeDiff offset)
GST_OBJECT_LOCK (sink); GST_OBJECT_LOCK (sink);
sink->priv->ts_offset = offset; sink->priv->ts_offset = offset;
GST_LOG_OBJECT (sink, "set time offset to %" G_GINT64_FORMAT, offset);
GST_OBJECT_UNLOCK (sink); GST_OBJECT_UNLOCK (sink);
} }
@ -1402,7 +1404,7 @@ out_of_segment:
} }
} }
/* with STREAM_LOCK, PREROLL_LOCK /* with STREAM_LOCK, PREROLL_LOCK, LOCK
* adjust a timestamp with the latency and timestamp offset */ * adjust a timestamp with the latency and timestamp offset */
static GstClockTime static GstClockTime
gst_base_sink_adjust_time (GstBaseSink * basesink, GstClockTime time) gst_base_sink_adjust_time (GstBaseSink * basesink, GstClockTime time)
@ -1810,10 +1812,19 @@ gst_base_sink_perform_qos (GstBaseSink * sink, gboolean dropped)
stop = priv->current_rstop; stop = priv->current_rstop;
jitter = priv->current_jitter; jitter = priv->current_jitter;
/* this is the time the buffer entered the sink */ if (jitter < 0) {
entered = start + jitter; /* this is the time the buffer entered the sink */
/* this is the time the buffer left the sink */ if (start < -jitter)
left = start + (jitter < 0 ? 0 : jitter); entered = 0;
else
entered = start + jitter;
left = start;
} else {
/* this is the time the buffer entered the sink */
entered = start + jitter;
/* this is the time the buffer left the sink */
left = start + jitter;
}
/* calculate duration of the buffer */ /* calculate duration of the buffer */
if (stop != -1) if (stop != -1)
@ -1881,8 +1892,14 @@ gst_base_sink_perform_qos (GstBaseSink * sink, gboolean dropped)
GST_TIME_ARGS (priv->avg_pt), priv->avg_rate); GST_TIME_ARGS (priv->avg_pt), priv->avg_rate);
/* if we have a valid rate, start sending QoS messages */
if (priv->avg_rate >= 0.0) { if (priv->avg_rate >= 0.0) {
/* 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
* timestamp. */
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, gst_base_sink_send_qos (sink, priv->avg_rate, priv->current_rstart,
priv->current_jitter); priv->current_jitter);
} }