wtay gst-plugins-bad: gst-plugins-bad/ gst-plugins-bad/gst/rtpmanager/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-bad
Changes by:     wtay
Date:           Fri Jan 02 2009  16:51:07 UTC

Log message:
* 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.

Modified files:
    .               : ChangeLog
    gst/rtpmanager  : gstrtpsession.c rtpsession.c rtpsession.h

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3847&r2=1.3848
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/rtpmanager/gstrtpsession.c.diff?r1=1.55&r2=1.56
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/rtpmanager/rtpsession.c.diff?r1=1.42&r2=1.43
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/rtpmanager/rtpsession.h.diff?r1=1.19&r2=1.20

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3847
retrieving revision 1.3848
diff -u -d -r1.3847 -r1.3848
--- ChangeLog	2 Jan 2009 11:00:14 -0000	1.3847
+++ ChangeLog	2 Jan 2009 16:50:51 -0000	1.3848
@@ -1,3 +1,13 @@
+2009-01-02  Wim Taymans  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* ext/apexsink/Makefile.am:
Index: gstrtpsession.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/rtpmanager/gstrtpsession.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- gstrtpsession.c	29 Dec 2008 15:49:37 -0000	1.55
+++ gstrtpsession.c	2 Jan 2009 16:50:53 -0000	1.56
@@ -1633,7 +1633,7 @@
       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;
     }
Index: rtpsession.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/rtpmanager/rtpsession.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- rtpsession.c	29 Dec 2008 15:49:37 -0000	1.42
+++ rtpsession.c	2 Jan 2009 16:50:53 -0000	1.43
@@ -107,7 +107,7 @@
 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 @@
       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 @@
   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 @@
 /**
- * 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,
@@ -2107,7 +2097,7 @@
   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);
Index: rtpsession.h
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/rtpmanager/rtpsession.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- rtpsession.h	20 Nov 2008 18:41:34 -0000	1.19
+++ rtpsession.h	2 Jan 2009 16:50:53 -0000	1.20
@@ -292,7 +292,7 @@
                                                     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 */

------------------------------------------------------------------------------