summaryrefslogtreecommitdiffstats
path: root/gst/rtpmanager
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2009-01-02 16:50:53 +0000
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2009-08-11 02:30:40 +0100
commit0ad92e7da6fbfe24d3f6642ee9463cab029b4bb0 (patch)
treeccbff72f219966c5fc26b5f2b9c62feac48960ac /gst/rtpmanager
parent06d1532024cefe9791032104eb2362999ed2e47a (diff)
gst/rtpmanager/: Rename a method to better reflect what it really does.
Original commit message from CVS: * gst/rtpmanager/gstrtpsession.c: (gst_rtp_session_event_send_rtp_sink), (gst_rtp_session_getcaps_send_rtp): * gst/rtpmanager/rtpsession.c: (check_collision), (rtp_session_schedule_bye_locked), (rtp_session_schedule_bye): * gst/rtpmanager/rtpsession.h: Rename a method to better reflect what it really does.
Diffstat (limited to 'gst/rtpmanager')
-rw-r--r--gst/rtpmanager/gstrtpsession.c2
-rw-r--r--gst/rtpmanager/rtpsession.c24
-rw-r--r--gst/rtpmanager/rtpsession.h2
3 files changed, 9 insertions, 19 deletions
diff --git a/gst/rtpmanager/gstrtpsession.c b/gst/rtpmanager/gstrtpsession.c
index e9af8977..c1ca0ebb 100644
--- a/gst/rtpmanager/gstrtpsession.c
+++ b/gst/rtpmanager/gstrtpsession.c
@@ -1633,7 +1633,7 @@ gst_rtp_session_event_send_rtp_sink (GstPad * pad, GstEvent * event)
ret = gst_pad_push_event (rtpsession->send_rtp_src, event);
current_time = gst_clock_get_time (rtpsession->priv->sysclock);
GST_DEBUG_OBJECT (rtpsession, "scheduling BYE message");
- rtp_session_send_bye (rtpsession->priv->session, "End of stream",
+ rtp_session_schedule_bye (rtpsession->priv->session, "End of stream",
current_time);
break;
}
diff --git a/gst/rtpmanager/rtpsession.c b/gst/rtpmanager/rtpsession.c
index 1b7f3a40..c57c9966 100644
--- a/gst/rtpmanager/rtpsession.c
+++ b/gst/rtpmanager/rtpsession.c
@@ -107,7 +107,7 @@ G_DEFINE_TYPE (RTPSession, rtp_session, G_TYPE_OBJECT);
static RTPSource *obtain_source (RTPSession * sess, guint32 ssrc,
gboolean * created, RTPArrivalStats * arrival, gboolean rtp);
-static GstFlowReturn rtp_session_send_bye_locked (RTPSession * sess,
+static GstFlowReturn rtp_session_schedule_bye_locked (RTPSession * sess,
const gchar * reason, GstClockTime current_time);
static GstClockTime calculate_rtcp_interval (RTPSession * sess,
gboolean deterministic, gboolean first);
@@ -1109,7 +1109,7 @@ check_collision (RTPSession * sess, RTPSource * source,
GST_DEBUG ("Collision for SSRC %x", rtp_source_get_ssrc (source));
on_ssrc_collision (sess, source);
- rtp_session_send_bye_locked (sess, "SSRC Collision", arrival->time);
+ rtp_session_schedule_bye_locked (sess, "SSRC Collision", arrival->time);
sess->change_ssrc = TRUE;
}
@@ -2031,19 +2031,11 @@ calculate_rtcp_interval (RTPSession * sess, gboolean deterministic,
return result;
}
-/**
- * rtp_session_send_bye_locked:
- * @sess: an #RTPSession
- * @reason: a reason or NULL
- *
- * Stop the current @sess and schedule a BYE message for the other members.
- *
+/* Stop the current @sess and schedule a BYE message for the other members.
* One must have the session lock to call this function
- *
- * Returns: a #GstFlowReturn.
*/
static GstFlowReturn
-rtp_session_send_bye_locked (RTPSession * sess, const gchar * reason,
+rtp_session_schedule_bye_locked (RTPSession * sess, const gchar * reason,
GstClockTime current_time)
{
GstFlowReturn result = GST_FLOW_OK;
@@ -2087,19 +2079,17 @@ done:
}
/**
- * rtp_session_send_bye:
+ * rtp_session_schedule_bye:
* @sess: an #RTPSession
* @reason: a reason or NULL
* @current_time: the current system time
*
* Stop the current @sess and schedule a BYE message for the other members.
*
- * One must have the session lock to call this function
- *
* Returns: a #GstFlowReturn.
*/
GstFlowReturn
-rtp_session_send_bye (RTPSession * sess, const gchar * reason,
+rtp_session_schedule_bye (RTPSession * sess, const gchar * reason,
GstClockTime current_time)
{
GstFlowReturn result = GST_FLOW_OK;
@@ -2107,7 +2097,7 @@ rtp_session_send_bye (RTPSession * sess, const gchar * reason,
g_return_val_if_fail (RTP_IS_SESSION (sess), GST_FLOW_ERROR);
RTP_SESSION_LOCK (sess);
- result = rtp_session_send_bye_locked (sess, reason, current_time);
+ result = rtp_session_schedule_bye_locked (sess, reason, current_time);
RTP_SESSION_UNLOCK (sess);
return result;
diff --git a/gst/rtpmanager/rtpsession.h b/gst/rtpmanager/rtpsession.h
index f923959a..7e327a7d 100644
--- a/gst/rtpmanager/rtpsession.h
+++ b/gst/rtpmanager/rtpsession.h
@@ -292,7 +292,7 @@ GstFlowReturn rtp_session_send_rtp (RTPSession *sess, GstBuffer
GstClockTime current_time, guint64 ntpnstime);
/* stopping the session */
-GstFlowReturn rtp_session_send_bye (RTPSession *sess, const gchar *reason,
+GstFlowReturn rtp_session_schedule_bye (RTPSession *sess, const gchar *reason,
GstClockTime current_time);
/* get interval for next RTCP interval */