Commit 0df77bfc authored by Wim Taymans's avatar Wim Taymans
Browse files

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.
parent 70ce70b2
2009-01-02 Wim Taymans <wim.taymans@collabora.co.uk>
* 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.
2009-01-02 Alessandro Decina <alessandro.d@gmail.com> 2009-01-02 Alessandro Decina <alessandro.d@gmail.com>
* ext/apexsink/Makefile.am: * ext/apexsink/Makefile.am:
......
...@@ -1633,7 +1633,7 @@ gst_rtp_session_event_send_rtp_sink (GstPad * pad, GstEvent * event) ...@@ -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); ret = gst_pad_push_event (rtpsession->send_rtp_src, event);
current_time = gst_clock_get_time (rtpsession->priv->sysclock); current_time = gst_clock_get_time (rtpsession->priv->sysclock);
GST_DEBUG_OBJECT (rtpsession, "scheduling BYE message"); 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); current_time);
break; break;
} }
......
...@@ -107,7 +107,7 @@ G_DEFINE_TYPE (RTPSession, rtp_session, G_TYPE_OBJECT); ...@@ -107,7 +107,7 @@ G_DEFINE_TYPE (RTPSession, rtp_session, G_TYPE_OBJECT);
static RTPSource *obtain_source (RTPSession * sess, guint32 ssrc, static RTPSource *obtain_source (RTPSession * sess, guint32 ssrc,
gboolean * created, RTPArrivalStats * arrival, gboolean rtp); 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); const gchar * reason, GstClockTime current_time);
static GstClockTime calculate_rtcp_interval (RTPSession * sess, static GstClockTime calculate_rtcp_interval (RTPSession * sess,
gboolean deterministic, gboolean first); gboolean deterministic, gboolean first);
...@@ -1109,7 +1109,7 @@ check_collision (RTPSession * sess, RTPSource * source, ...@@ -1109,7 +1109,7 @@ check_collision (RTPSession * sess, RTPSource * source,
GST_DEBUG ("Collision for SSRC %x", rtp_source_get_ssrc (source)); GST_DEBUG ("Collision for SSRC %x", rtp_source_get_ssrc (source));
on_ssrc_collision (sess, 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; sess->change_ssrc = TRUE;
} }
...@@ -2031,19 +2031,11 @@ calculate_rtcp_interval (RTPSession * sess, gboolean deterministic, ...@@ -2031,19 +2031,11 @@ calculate_rtcp_interval (RTPSession * sess, gboolean deterministic,
return result; return result;
} }
/** /* Stop the current @sess and schedule a BYE message for the other members.
* 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.
*
* One must have the session lock to call this function * One must have the session lock to call this function
*
* Returns: a #GstFlowReturn.
*/ */
static 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) GstClockTime current_time)
{ {
GstFlowReturn result = GST_FLOW_OK; GstFlowReturn result = GST_FLOW_OK;
...@@ -2087,19 +2079,17 @@ done: ...@@ -2087,19 +2079,17 @@ done:
} }
/** /**
* rtp_session_send_bye: * rtp_session_schedule_bye:
* @sess: an #RTPSession * @sess: an #RTPSession
* @reason: a reason or NULL * @reason: a reason or NULL
* @current_time: the current system time * @current_time: the current system time
* *
* 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. * Returns: a #GstFlowReturn.
*/ */
GstFlowReturn GstFlowReturn
rtp_session_send_bye (RTPSession * sess, const gchar * reason, rtp_session_schedule_bye (RTPSession * sess, const gchar * reason,
GstClockTime current_time) GstClockTime current_time)
{ {
GstFlowReturn result = GST_FLOW_OK; GstFlowReturn result = GST_FLOW_OK;
...@@ -2107,7 +2097,7 @@ rtp_session_send_bye (RTPSession * sess, const gchar * reason, ...@@ -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); g_return_val_if_fail (RTP_IS_SESSION (sess), GST_FLOW_ERROR);
RTP_SESSION_LOCK (sess); 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); RTP_SESSION_UNLOCK (sess);
return result; return result;
......
...@@ -292,7 +292,7 @@ GstFlowReturn rtp_session_send_rtp (RTPSession *sess, GstBuffer ...@@ -292,7 +292,7 @@ GstFlowReturn rtp_session_send_rtp (RTPSession *sess, GstBuffer
GstClockTime current_time, guint64 ntpnstime); GstClockTime current_time, guint64 ntpnstime);
/* stopping the session */ /* 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); GstClockTime current_time);
/* get interval for next RTCP interval */ /* get interval for next RTCP interval */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment