summaryrefslogtreecommitdiffstats
path: root/gst/rtpmanager/gstrtpsession.c
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2007-04-25 13:19:36 +0000
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2009-08-11 02:30:25 +0100
commitae536e0c8920ca75190d81ec45894f12faceb3c2 (patch)
tree0770b1d67fd10a1c8b84c9d979f197bf8a7e5e5d /gst/rtpmanager/gstrtpsession.c
parent23883be047f94d8bde7094b6210277e92e9df11c (diff)
gst/rtpmanager/gstrtpjitterbuffer.c: Report NO_PREROLL when going to PAUSED.
Original commit message from CVS: * gst/rtpmanager/gstrtpjitterbuffer.c: (gst_rtp_jitter_buffer_change_state): Report NO_PREROLL when going to PAUSED. * gst/rtpmanager/gstrtpsession.c: (rtcp_thread): Don't send RTCP right before we are shutting down. * gst/rtpmanager/rtpsession.c: (rtp_session_process_rtp), (rtp_session_process_sr), (session_report_blocks), (rtp_session_perform_reporting): Improve report blocks. * gst/rtpmanager/rtpsource.c: (calculate_jitter), (init_seq), (rtp_source_process_rtp), (rtp_source_process_sr), (rtp_source_process_rb), (rtp_source_get_last_sr), (rtp_source_get_last_rb): * gst/rtpmanager/rtpsource.h: * gst/rtpmanager/rtpstats.h: Cleanups, add methods to access stats.
Diffstat (limited to 'gst/rtpmanager/gstrtpsession.c')
-rw-r--r--gst/rtpmanager/gstrtpsession.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/gst/rtpmanager/gstrtpsession.c b/gst/rtpmanager/gstrtpsession.c
index b11dbbba..39c63e32 100644
--- a/gst/rtpmanager/gstrtpsession.c
+++ b/gst/rtpmanager/gstrtpsession.c
@@ -304,21 +304,27 @@ rtcp_thread (GstRTPSession * rtpsession)
while (!rtpsession->priv->stop_thread) {
gdouble timeout;
GstClockTime target;
+ GstClockReturn res;
timeout = rtp_session_get_reporting_interval (rtpsession->priv->session);
GST_DEBUG_OBJECT (rtpsession, "next RTCP timeout: %lf", timeout);
target = gst_clock_get_time (clock);
target += GST_SECOND * timeout;
+
+
id = rtpsession->priv->id = gst_clock_new_single_shot_id (clock, target);
GST_RTP_SESSION_UNLOCK (rtpsession);
- gst_clock_id_wait (id, NULL);
-
- GST_DEBUG_OBJECT (rtpsession, "got RTCP timeout");
+ res = gst_clock_id_wait (id, NULL);
+ if (res != GST_CLOCK_UNSCHEDULED) {
+ GST_DEBUG_OBJECT (rtpsession, "got RTCP timeout");
- /* make the session manager produce RTCP, we ignore the result. */
- rtp_session_perform_reporting (rtpsession->priv->session);
+ /* make the session manager produce RTCP, we ignore the result. */
+ rtp_session_perform_reporting (rtpsession->priv->session);
+ } else {
+ GST_DEBUG_OBJECT (rtpsession, "got unscheduled");
+ }
GST_RTP_SESSION_LOCK (rtpsession);
gst_clock_id_unref (id);