From 3c14c6021c3d2c9182d321592cf6bd119d019e42 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sun, 4 Aug 2013 23:12:50 +0200 Subject: [PATCH] session: Don't use ClockTimeDiff for unsigned delays --- gst/rtpmanager/rtpsession.c | 9 ++++----- gst/rtpmanager/rtpsession.h | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/gst/rtpmanager/rtpsession.c b/gst/rtpmanager/rtpsession.c index 48bb7b8..6c546b8 100644 --- a/gst/rtpmanager/rtpsession.c +++ b/gst/rtpmanager/rtpsession.c @@ -111,8 +111,7 @@ static void rtp_session_set_property (GObject * object, guint prop_id, static void rtp_session_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); -static void rtp_session_send_rtcp (RTPSession * sess, - GstClockTimeDiff max_delay); +static void rtp_session_send_rtcp (RTPSession * sess, GstClockTime max_delay); static guint rtp_session_signals[LAST_SIGNAL] = { 0 }; @@ -3190,7 +3189,7 @@ early: /* Apply the rules from RFC 4585 section 3.5.3 */ if (sess->stats.min_interval != 0 && !sess->first_rtcp) { - GstClockTimeDiff T_rr_current_interval = + GstClockTime T_rr_current_interval = g_random_double_range (0.5, 1.5) * sess->stats.min_interval; /* This will caused the RTCP to be suppressed if no FB packets are added */ @@ -3413,7 +3412,7 @@ done: */ void rtp_session_request_early_rtcp (RTPSession * sess, GstClockTime current_time, - GstClockTimeDiff max_delay) + GstClockTime max_delay) { GstClockTime T_dither_max; @@ -3505,7 +3504,7 @@ rtp_session_request_key_unit (RTPSession * sess, guint32 ssrc, GstClockTime now, } static void -rtp_session_send_rtcp (RTPSession * sess, GstClockTimeDiff max_delay) +rtp_session_send_rtcp (RTPSession * sess, GstClockTime max_delay) { GstClockTime now; diff --git a/gst/rtpmanager/rtpsession.h b/gst/rtpmanager/rtpsession.h index 76ee72d..6c51a2e 100644 --- a/gst/rtpmanager/rtpsession.h +++ b/gst/rtpmanager/rtpsession.h @@ -265,7 +265,7 @@ struct _RTPSessionClass { gboolean early); void (*on_feedback_rtcp) (RTPSession *sess, guint type, guint fbtype, guint sender_ssrc, guint media_ssrc, GstBuffer *fci); - void (*send_rtcp) (RTPSession *sess, GstClockTimeDiff max_delay); + void (*send_rtcp) (RTPSession *sess, GstClockTime max_delay); }; GType rtp_session_get_type (void); @@ -338,7 +338,7 @@ GstFlowReturn rtp_session_on_timeout (RTPSession *sess, GstClockTi /* request the transmittion of an early RTCP packet */ void rtp_session_request_early_rtcp (RTPSession * sess, GstClockTime current_time, - GstClockTimeDiff max_delay); + GstClockTime max_delay); /* Notify session of a request for a new key unit */ gboolean rtp_session_request_key_unit (RTPSession * sess, -- 2.7.4