From b3069634bd04cf2d9183574a953ebd7936b5a5fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@ocrete.ca>
Date: Fri, 10 Oct 2014 17:30:24 -0400
Subject: [PATCH] rtpmux: clock-base and seqnum-base -> timestamp-offset and
 seqnum-offset

These were renamed in GstRTPBasePayload in 1.0
---
 gst/rtpmanager/gstrtpmux.c    | 17 +++++++++--------
 gst/rtpmanager/gstrtpmux.h    |  4 ++--
 tests/check/elements/rtpmux.c |  6 +++---
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/gst/rtpmanager/gstrtpmux.c b/gst/rtpmanager/gstrtpmux.c
index 4f49c1d769..77c2a5ca9c 100644
--- a/gst/rtpmanager/gstrtpmux.c
+++ b/gst/rtpmanager/gstrtpmux.c
@@ -321,7 +321,7 @@ gst_rtp_mux_release_pad (GstElement * element, GstPad * pad)
   }
 }
 
-/* Put our own clock-base on the buffer */
+/* Put our own timestamp-offset on the buffer */
 static void
 gst_rtp_mux_readjust_rtp_timestamp_locked (GstRTPMux * rtp_mux,
     GstRTPMuxPadPrivate * padpriv, GstRTPBuffer * rtpbuffer)
@@ -329,8 +329,8 @@ gst_rtp_mux_readjust_rtp_timestamp_locked (GstRTPMux * rtp_mux,
   guint32 ts;
   guint32 sink_ts_base = 0;
 
-  if (padpriv && padpriv->have_clock_base)
-    sink_ts_base = padpriv->clock_base;
+  if (padpriv && padpriv->have_timestamp_offset)
+    sink_ts_base = padpriv->timestamp_offset;
 
   ts = gst_rtp_buffer_get_timestamp (rtpbuffer) - sink_ts_base +
       rtp_mux->ts_base;
@@ -541,16 +541,17 @@ gst_rtp_mux_setcaps (GstPad * pad, GstRTPMux * rtp_mux, GstCaps * caps)
   GST_OBJECT_LOCK (rtp_mux);
   padpriv = gst_pad_get_element_private (pad);
   if (padpriv &&
-      gst_structure_get_uint (structure, "clock-base", &padpriv->clock_base)) {
-    padpriv->have_clock_base = TRUE;
+      gst_structure_get_uint (structure, "timestamp-offset",
+          &padpriv->timestamp_offset)) {
+    padpriv->have_timestamp_offset = TRUE;
   }
   GST_OBJECT_UNLOCK (rtp_mux);
 
   caps = gst_caps_copy (caps);
 
   gst_caps_set_simple (caps,
-      "clock-base", G_TYPE_UINT, rtp_mux->ts_base,
-      "seqnum-base", G_TYPE_UINT, rtp_mux->seqnum_base, NULL);
+      "timestamp-offset", G_TYPE_UINT, rtp_mux->ts_base,
+      "seqnum-offset", G_TYPE_UINT, rtp_mux->seqnum_base, NULL);
 
   if (rtp_mux->send_stream_start) {
     gchar s_id[32];
@@ -837,7 +838,7 @@ gst_rtp_mux_ready_to_paused (GstRTPMux * rtp_mux)
 
   rtp_mux->last_stop = GST_CLOCK_TIME_NONE;
 
-  GST_DEBUG_OBJECT (rtp_mux, "set clock-base to %u", rtp_mux->ts_base);
+  GST_DEBUG_OBJECT (rtp_mux, "set timestamp-offset to %u", rtp_mux->ts_base);
 
   GST_OBJECT_UNLOCK (rtp_mux);
 }
diff --git a/gst/rtpmanager/gstrtpmux.h b/gst/rtpmanager/gstrtpmux.h
index 3582a75a56..4b71deeaf2 100644
--- a/gst/rtpmanager/gstrtpmux.h
+++ b/gst/rtpmanager/gstrtpmux.h
@@ -42,8 +42,8 @@ typedef struct _GstRTPMuxClass GstRTPMuxClass;
 
 typedef struct
 {
-  gboolean have_clock_base;
-  guint clock_base;
+  gboolean have_timestamp_offset;
+  guint timestamp_offset;
 
   GstSegment segment;
 
diff --git a/tests/check/elements/rtpmux.c b/tests/check/elements/rtpmux.c
index 60683b76e8..6f316f1092 100644
--- a/tests/check/elements/rtpmux.c
+++ b/tests/check/elements/rtpmux.c
@@ -154,11 +154,11 @@ test_basic (const gchar * elem_name, const gchar * sink2, int count,
           gst_event_new_stream_start ("stream2")));
 
   gst_caps_set_simple (sinkcaps,
-      "payload", G_TYPE_INT, 98, "seqnum-base", G_TYPE_UINT, 100,
-      "clock-base", G_TYPE_UINT, 1000, "ssrc", G_TYPE_UINT, 66, NULL);
+      "payload", G_TYPE_INT, 98, "seqnum-offset", G_TYPE_UINT, 100,
+      "timestamp-offset", G_TYPE_UINT, 1000, "ssrc", G_TYPE_UINT, 66, NULL);
   caps = gst_caps_new_simple ("application/x-rtp",
       "payload", G_TYPE_INT, 98, "clock-rate", G_TYPE_INT, 3,
-      "seqnum-base", G_TYPE_UINT, 56, "clock-base", G_TYPE_UINT, 57,
+      "seqnum-offset", G_TYPE_UINT, 56, "timestamp-offset", G_TYPE_UINT, 57,
       "ssrc", G_TYPE_UINT, 66, NULL);
   fail_unless (gst_pad_set_caps (src1, caps));