From c5b175a6890115ba3f30520f844e10b841a92258 Mon Sep 17 00:00:00 2001 From: Olivier Crete Date: Thu, 14 Feb 2008 16:25:51 +0000 Subject: gst/rtpmanager/gstrtpbin.c: Ignore streams that did not receive an SR packet when doing synchronisation. Fixes #516160. Original commit message from CVS: Patch by: Olivier Crete * gst/rtpmanager/gstrtpbin.c: (gst_rtp_bin_associate): Ignore streams that did not receive an SR packet when doing synchronisation. Fixes #516160. --- ChangeLog | 8 ++++++++ gst/rtpmanager/gstrtpbin.c | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 36cf420d6..7ebb9ed44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-02-14 Wim Taymans + + Patch by: Olivier Crete + + * gst/rtpmanager/gstrtpbin.c: (gst_rtp_bin_associate): + Ignore streams that did not receive an SR packet when doing + synchronisation. Fixes #516160. + 2008-02-14 Sebastian Dröge * gst/dvdspu/gstdvdspu.c: (gst_dvd_spu_handle_new_spu_buf): diff --git a/gst/rtpmanager/gstrtpbin.c b/gst/rtpmanager/gstrtpbin.c index 7eb82446a..526cf9577 100644 --- a/gst/rtpmanager/gstrtpbin.c +++ b/gst/rtpmanager/gstrtpbin.c @@ -778,7 +778,7 @@ gst_rtp_bin_associate (GstRtpBin * bin, GstRtpBinStream * stream, guint8 len, for (walk = client->streams; walk; walk = g_slist_next (walk)) { GstRtpBinStream *ostream = (GstRtpBinStream *) walk->data; - if (ostream->unix_delta < min) + if (ostream->unix_delta && ostream->unix_delta < min) min = ostream->unix_delta; } @@ -789,6 +789,9 @@ gst_rtp_bin_associate (GstRtpBin * bin, GstRtpBinStream * stream, guint8 len, for (walk = client->streams; walk; walk = g_slist_next (walk)) { GstRtpBinStream *ostream = (GstRtpBinStream *) walk->data; + if (ostream->unix_delta == 0) + continue; + ostream->ts_offset = ostream->unix_delta - min; /* delta changed, see how much */ -- cgit v1.2.1