mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-10 17:35:59 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpmux: clock-base and seqnum-base -> timestamp-offset and seqnum-offset

Browse source 
These were renamed in GstRTPBasePayload in 1.0
This commit is contained in:
Olivier Crête 2014-10-10 17:30:24 -04:00
parent cff880401d
commit b3069634bd
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst/rtpmanager/gstrtpmux.c
View file

@ -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 static void
gst_rtp_mux_readjust_rtp_timestamp_locked (GstRTPMux * rtp_mux, gst_rtp_mux_readjust_rtp_timestamp_locked (GstRTPMux * rtp_mux,
GstRTPMuxPadPrivate * padpriv, GstRTPBuffer * rtpbuffer) GstRTPMuxPadPrivate * padpriv, GstRTPBuffer * rtpbuffer)
@ -329,8 +329,8 @@ gst_rtp_mux_readjust_rtp_timestamp_locked (GstRTPMux * rtp_mux,
guint32 ts; guint32 ts;
guint32 sink_ts_base = 0; guint32 sink_ts_base = 0;
if (padpriv && padpriv->have_clock_base) if (padpriv && padpriv->have_timestamp_offset)
sink_ts_base = padpriv->clock_base; sink_ts_base = padpriv->timestamp_offset;
ts = gst_rtp_buffer_get_timestamp (rtpbuffer) - sink_ts_base + ts = gst_rtp_buffer_get_timestamp (rtpbuffer) - sink_ts_base +
rtp_mux->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); GST_OBJECT_LOCK (rtp_mux);
padpriv = gst_pad_get_element_private (pad); padpriv = gst_pad_get_element_private (pad);
if (padpriv && if (padpriv &&
gst_structure_get_uint (structure, "clock-base", &padpriv->clock_base)) { gst_structure_get_uint (structure, "timestamp-offset",
padpriv->have_clock_base = TRUE; &padpriv->timestamp_offset)) {
padpriv->have_timestamp_offset = TRUE;
} }
GST_OBJECT_UNLOCK (rtp_mux); GST_OBJECT_UNLOCK (rtp_mux);
caps = gst_caps_copy (caps); caps = gst_caps_copy (caps);
gst_caps_set_simple (caps, gst_caps_set_simple (caps,
"clock-base", G_TYPE_UINT, rtp_mux->ts_base, "timestamp-offset", G_TYPE_UINT, rtp_mux->ts_base,
"seqnum-base", G_TYPE_UINT, rtp_mux->seqnum_base, NULL); "seqnum-offset", G_TYPE_UINT, rtp_mux->seqnum_base, NULL);
if (rtp_mux->send_stream_start) { if (rtp_mux->send_stream_start) {
gchar s_id[32]; 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; 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); GST_OBJECT_UNLOCK (rtp_mux);
} }

4
gst/rtpmanager/gstrtpmux.h
View file

@ -42,8 +42,8 @@ typedef struct _GstRTPMuxClass GstRTPMuxClass;
typedef struct typedef struct
{ {
gboolean have_clock_base; gboolean have_timestamp_offset;
guint clock_base; guint timestamp_offset;
GstSegment segment; GstSegment segment;

6
tests/check/elements/rtpmux.c
View file

@ -154,11 +154,11 @@ test_basic (const gchar * elem_name, const gchar * sink2, int count,
gst_event_new_stream_start ("stream2"))); gst_event_new_stream_start ("stream2")));
gst_caps_set_simple (sinkcaps, gst_caps_set_simple (sinkcaps,
"payload", G_TYPE_INT, 98, "seqnum-base", G_TYPE_UINT, 100, "payload", G_TYPE_INT, 98, "seqnum-offset", G_TYPE_UINT, 100,
"clock-base", G_TYPE_UINT, 1000, "ssrc", G_TYPE_UINT, 66, NULL); "timestamp-offset", G_TYPE_UINT, 1000, "ssrc", G_TYPE_UINT, 66, NULL);
caps = gst_caps_new_simple ("application/x-rtp", caps = gst_caps_new_simple ("application/x-rtp",
"payload", G_TYPE_INT, 98, "clock-rate", G_TYPE_INT, 3, "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); "ssrc", G_TYPE_UINT, 66, NULL);
fail_unless (gst_pad_set_caps (src1, caps)); fail_unless (gst_pad_set_caps (src1, caps));