From be12e7d67c453aa1253755b9a1061afd46f24f82 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 7 Oct 2008 10:02:20 +0000 Subject: gst/rtpmanager/gstrtpjitterbuffer.c: Only update the seqnum-base when it was not already configured for the streams. Original commit message from CVS: * gst/rtpmanager/gstrtpjitterbuffer.c: (gst_jitter_buffer_sink_parse_caps): Only update the seqnum-base when it was not already configured for the streams. --- ChangeLog | 9 ++++++++- gst/rtpmanager/gstrtpjitterbuffer.c | 12 +++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f44ff49..c09e1570 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,13 @@ +2008-10-07 Wim Taymans + + * gst/rtpmanager/gstrtpjitterbuffer.c: + (gst_jitter_buffer_sink_parse_caps): + Only update the seqnum-base when it was not already configured for the + streams. + 2008-10-06 Stefan Kost - * configure.ac + * configure.ac * ext/metadata/README: * ext/metadata/metadataexif.c: * ext/metadata/metadatatags.c: diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c index d48bc40f..2e52a70b 100644 --- a/gst/rtpmanager/gstrtpjitterbuffer.c +++ b/gst/rtpmanager/gstrtpjitterbuffer.c @@ -482,11 +482,13 @@ gst_jitter_buffer_sink_parse_caps (GstRtpJitterBuffer * jitterbuffer, GST_DEBUG_OBJECT (jitterbuffer, "got clock-base %" G_GINT64_FORMAT, priv->clock_base); - /* first expected seqnum */ - if (gst_structure_get_uint (caps_struct, "seqnum-base", &val)) - priv->next_seqnum = val; - else - priv->next_seqnum = -1; + /* first expected seqnum, only update when we didn't have a previous base. */ + if (priv->next_seqnum == -1) { + if (gst_structure_get_uint (caps_struct, "seqnum-base", &val)) + priv->next_seqnum = val; + else + priv->next_seqnum = -1; + } GST_DEBUG_OBJECT (jitterbuffer, "got seqnum-base %d", priv->next_seqnum); -- cgit v1.2.1