From 3c82de59f9c73c054a9303aceb28ebb10ec436a5 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Sun, 4 Aug 2013 23:18:29 +0200
Subject: [PATCH] session: use common send_rtcp method

Reuse the send_rtcp method that already asks for the current time when
requesting a keyframe.
---
 gst/rtpmanager/gstrtpsession.c |  2 +-
 gst/rtpmanager/rtpsession.c    | 30 +++++++++++++++---------------
 gst/rtpmanager/rtpsession.h    |  1 -
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/gst/rtpmanager/gstrtpsession.c b/gst/rtpmanager/gstrtpsession.c
index 19d95811fc..143f4a380d 100644
--- a/gst/rtpmanager/gstrtpsession.c
+++ b/gst/rtpmanager/gstrtpsession.c
@@ -1465,7 +1465,7 @@ gst_rtp_session_request_remote_key_unit (GstRtpSession * rtpsession,
 
     if (pli || fir)
       return rtp_session_request_key_unit (rtpsession->priv->session, ssrc,
-          gst_clock_get_time (rtpsession->priv->sysclock), fir, count);
+          fir, count);
   }
 
   return FALSE;
diff --git a/gst/rtpmanager/rtpsession.c b/gst/rtpmanager/rtpsession.c
index 6c546b8f75..f96a2235b1 100644
--- a/gst/rtpmanager/rtpsession.c
+++ b/gst/rtpmanager/rtpsession.c
@@ -3478,8 +3478,21 @@ dont_send:
   RTP_SESSION_UNLOCK (sess);
 }
 
+static void
+rtp_session_send_rtcp (RTPSession * sess, GstClockTime max_delay)
+{
+  GstClockTime now;
+
+  if (!sess->callbacks.send_rtcp)
+    return;
+
+  now = sess->callbacks.request_time (sess, sess->request_time_user_data);
+
+  rtp_session_request_early_rtcp (sess, now, max_delay);
+}
+
 gboolean
-rtp_session_request_key_unit (RTPSession * sess, guint32 ssrc, GstClockTime now,
+rtp_session_request_key_unit (RTPSession * sess, guint32 ssrc,
     gboolean fir, gint count)
 {
   RTPSource *src = find_source (sess, ssrc);
@@ -3498,20 +3511,7 @@ rtp_session_request_key_unit (RTPSession * sess, guint32 ssrc, GstClockTime now,
     src->send_pli = TRUE;
   }
 
-  rtp_session_request_early_rtcp (sess, now, 200 * GST_MSECOND);
+  rtp_session_send_rtcp (sess, 200 * GST_MSECOND);
 
   return TRUE;
 }
-
-static void
-rtp_session_send_rtcp (RTPSession * sess, GstClockTime max_delay)
-{
-  GstClockTime now;
-
-  if (!sess->callbacks.send_rtcp)
-    return;
-
-  now = sess->callbacks.request_time (sess, sess->request_time_user_data);
-
-  rtp_session_request_early_rtcp (sess, now, max_delay);
-}
diff --git a/gst/rtpmanager/rtpsession.h b/gst/rtpmanager/rtpsession.h
index 6c51a2e4db..1fa04ac939 100644
--- a/gst/rtpmanager/rtpsession.h
+++ b/gst/rtpmanager/rtpsession.h
@@ -343,7 +343,6 @@ void            rtp_session_request_early_rtcp     (RTPSession * sess, GstClockT
 /* Notify session of a request for a new key unit */
 gboolean        rtp_session_request_key_unit       (RTPSession * sess,
                                                     guint32 ssrc,
-                                                    GstClockTime now,
                                                     gboolean fir,
                                                     gint count);