summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2008-10-07 10:02:20 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-10-07 10:02:20 +0000
commitbe12e7d67c453aa1253755b9a1061afd46f24f82 (patch)
tree7e0a5b1d66c5b7a4db0f12792a5e32b90ec34691
parent87c7a4648b380590b001cd8f1d3e6c2676172e08 (diff)
downloadgst-plugins-bad-be12e7d67c453aa1253755b9a1061afd46f24f82.tar.gz
gst-plugins-bad-be12e7d67c453aa1253755b9a1061afd46f24f82.tar.bz2
gst-plugins-bad-be12e7d67c453aa1253755b9a1061afd46f24f82.zip
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.
-rw-r--r--ChangeLog9
-rw-r--r--gst/rtpmanager/gstrtpjitterbuffer.c12
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 <wim.taymans@collabora.co.uk>
+
+ * 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 <ensonic@users.sf.net>
- * 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);