CVS Root: /cvs/gstreamer
Module: gst-plugins-bad
Changes by: wtay
Date: Wed Nov 26 2008 12:02:35 UTC
Log message:
* gst/rtpmanager/gstrtpbin.c: (gst_rtp_bin_reset_sync),
(gst_rtp_bin_clear_pt_map):
Reset the sync parameters when clearing the payload type map too.
Fixes #562312.
Modified files:
. : ChangeLog
gst/rtpmanager : gstrtpbin.c
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3748&r2=1.3749
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/rtpmanager/gstrtpbin.c.diff?r1=1.64&r2=1.65
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3748
retrieving revision 1.3749
diff -u -d -r1.3748 -r1.3749
--- ChangeLog 26 Nov 2008 11:44:36 -0000 1.3748
+++ ChangeLog 26 Nov 2008 12:02:20 -0000 1.3749
@@ -1,5 +1,12 @@
2008-11-26 Wim Taymans <[email protected]>
+ * gst/rtpmanager/gstrtpbin.c: (gst_rtp_bin_reset_sync),
+ (gst_rtp_bin_clear_pt_map):
+ Reset the sync parameters when clearing the payload type map too.
+ Fixes #562312.
+
+2008-11-26 Wim Taymans <[email protected]>
* gst/rtpmanager/gstrtpbin.c: (get_client),
(gst_rtp_bin_reset_sync), (gst_rtp_bin_associate),
(gst_rtp_bin_handle_sync), (create_stream),
Index: gstrtpbin.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/rtpmanager/gstrtpbin.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- gstrtpbin.c 26 Nov 2008 11:44:37 -0000 1.64
+++ gstrtpbin.c 26 Nov 2008 12:02:21 -0000 1.65
@@ -686,6 +686,30 @@
}
static void
+gst_rtp_bin_reset_sync (GstRtpBin * rtpbin)
+{
+ GSList *clients, *streams;
+ GST_DEBUG_OBJECT (rtpbin, "Reset sync on all clients");
+ GST_RTP_BIN_LOCK (rtpbin);
+ for (clients = rtpbin->clients; clients; clients = g_slist_next (clients)) {
+ GstRtpBinClient *client = (GstRtpBinClient *) clients->data;
+ /* reset sync on all streams for this client */
+ for (streams = client->streams; streams; streams = g_slist_next (streams)) {
+ GstRtpBinStream *stream = (GstRtpBinStream *) streams->data;
+ /* make use require a new SR packet for this stream before we attempt new
+ * lip-sync */
+ stream->have_sync = FALSE;
+ stream->unix_delta = 0;
+ }
+ }
+ GST_RTP_BIN_UNLOCK (rtpbin);
+}
+static void
gst_rtp_bin_clear_pt_map (GstRtpBin * bin)
{
GSList *sessions, *streams;
@@ -711,6 +735,9 @@
GST_RTP_SESSION_UNLOCK (session);
}
GST_RTP_BIN_UNLOCK (bin);
+ /* reset sync too */
+ gst_rtp_bin_reset_sync (bin);
static RTPSession *
@@ -794,30 +821,6 @@
g_free (client);
-static void
-gst_rtp_bin_reset_sync (GstRtpBin * rtpbin)
-{
- GSList *clients, *streams;
-
- GST_DEBUG_OBJECT (rtpbin, "Reset sync on all clients");
- GST_RTP_BIN_LOCK (rtpbin);
- for (clients = rtpbin->clients; clients; clients = g_slist_next (clients)) {
- GstRtpBinClient *client = (GstRtpBinClient *) clients->data;
- /* reset sync on all streams for this client */
- for (streams = client->streams; streams; streams = g_slist_next (streams)) {
- GstRtpBinStream *stream = (GstRtpBinStream *) streams->data;
- /* make use require a new SR packet for this stream before we attempt new
- * lip-sync */
- stream->have_sync = FALSE;
- stream->unix_delta = 0;
- }
- }
- GST_RTP_BIN_UNLOCK (rtpbin);
-}
/* associate a stream to the given CNAME. This will make sure all streams for
* that CNAME are synchronized together.
* Must be called with GST_RTP_BIN_LOCK */
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.