mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 23:48:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst-libs/gst/rtp/gstbasertppayload.*: Make timestamp offset configurable.

Browse source 
Original commit message from CVS:
* gst-libs/gst/rtp/gstbasertppayload.c:
(gst_basertppayload_class_init), (gst_basertppayload_init),
(gst_basertppayload_setcaps), (gst_basertppayload_chain),
(gst_basertppayload_set_options), (gst_basertppayload_set_outcaps),
(gst_basertppayload_push), (gst_basertppayload_set_property),
(gst_basertppayload_get_property),
(gst_basertppayload_change_state):
* gst-libs/gst/rtp/gstbasertppayload.h:
Make timestamp offset configurable.
This commit is contained in:
Wim Taymans 2005-09-20 11:50:20 +00:00
parent 6044583d32
commit 25e6dc6013
3 changed files with 42 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2005-09-20 Wim Taymans <wim@fluendo.com>
* gst-libs/gst/rtp/gstbasertppayload.c:
(gst_basertppayload_class_init), (gst_basertppayload_init),
(gst_basertppayload_setcaps), (gst_basertppayload_chain),
(gst_basertppayload_set_options), (gst_basertppayload_set_outcaps),
(gst_basertppayload_push), (gst_basertppayload_set_property),
(gst_basertppayload_get_property),
(gst_basertppayload_change_state):
* gst-libs/gst/rtp/gstbasertppayload.h:
Make timestamp offset configurable.
2005-09-20 Thomas Vander Stichele <thomas at apestaart dot org> 2005-09-20 Thomas Vander Stichele <thomas at apestaart dot org>
* check/pipelines/simple_launch_lines.c: (run_pipeline): * check/pipelines/simple_launch_lines.c: (run_pipeline):

41
gst-libs/gst/rtp/gstbasertppayload.c
View file

@ -32,9 +32,10 @@ enum
LAST_SIGNAL LAST_SIGNAL
}; };
#define DEFAULT_MTU 1024 #define DEFAULT_MTU 1024
#define DEFAULT_PT 96 #define DEFAULT_PT 96
#define DEFAULT_SSRC 0 #define DEFAULT_SSRC 0
#define DEFAULT_TIMESTAMP_OFFSET -1
enum enum
{ {
@ -42,6 +43,7 @@ enum
PROP_MTU, PROP_MTU,
PROP_PT, PROP_PT,
PROP_SSRC, PROP_SSRC,
PROP_TIMESTAMP_OFFSET,
PROP_TIMESTAMP, PROP_TIMESTAMP,
PROP_SEQNUM PROP_SEQNUM
}; };
@ -124,14 +126,19 @@ gst_basertppayload_class_init (GstBaseRTPPayloadClass * klass)
g_param_spec_uint ("ssrc", "SSRC", g_param_spec_uint ("ssrc", "SSRC",
"The SSRC of the packets (0 == random)", "The SSRC of the packets (0 == random)",
0, G_MAXUINT, DEFAULT_SSRC, G_PARAM_READWRITE)); 0, G_MAXUINT, DEFAULT_SSRC, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass),
PROP_TIMESTAMP_OFFSET, g_param_spec_int ("timestamp-offset",
"Timestamp Offset",
"Offset to add to all outgoing timestamps (-1 = random)", -1,
G_MAXINT, DEFAULT_TIMESTAMP_OFFSET, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_TIMESTAMP, g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_TIMESTAMP,
g_param_spec_uint ("timestamp", "Timestamp", g_param_spec_uint ("timestamp", "Timestamp",
"The RTP timestamp of the last processed packet", "The RTP timestamp of the last processed packet", 0, G_MAXUINT, 0,
0, G_MAXUINT, 0, G_PARAM_READABLE)); G_PARAM_READABLE));
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SEQNUM, g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SEQNUM,
g_param_spec_uint ("seqnum", "Sequence number", g_param_spec_uint ("seqnum", "Sequence number",
"The RTP sequence number of the last processed packet", "The RTP sequence number of the last processed packet", 0, G_MAXUINT,
0, G_MAXUINT, 0, G_PARAM_READABLE)); 0, G_PARAM_READABLE));
gstelement_class->change_state = gst_basertppayload_change_state; gstelement_class->change_state = gst_basertppayload_change_state;
@ -171,6 +178,7 @@ gst_basertppayload_init (GstBaseRTPPayload * basertppayload, gpointer g_class)
basertppayload->seqnum = basertppayload->seqnum =
g_rand_int_range (basertppayload->seq_rand, 0, G_MAXUINT16); g_rand_int_range (basertppayload->seq_rand, 0, G_MAXUINT16);
basertppayload->ssrc = DEFAULT_SSRC; basertppayload->ssrc = DEFAULT_SSRC;
basertppayload->ts_offset = DEFAULT_TIMESTAMP_OFFSET;
basertppayload->ts_base = g_rand_int (basertppayload->ts_rand); basertppayload->ts_base = g_rand_int (basertppayload->ts_rand);
basertppayload->clock_rate = 0; basertppayload->clock_rate = 0;
@ -265,11 +273,11 @@ gst_basertppayload_set_outcaps (GstBaseRTPPayload * payload, gchar * fieldname,
srccaps = gst_caps_new_simple ("application/x-rtp", srccaps = gst_caps_new_simple ("application/x-rtp",
"media", G_TYPE_STRING, payload->media, "media", G_TYPE_STRING, payload->media,
"payload", G_TYPE_INT, GST_BASE_RTP_PAYLOAD_PT (payload), "payload", G_TYPE_INT, GST_BASE_RTP_PAYLOAD_PT (payload),
"clock_rate", G_TYPE_INT, payload->clock_rate, "clock-rate", G_TYPE_INT, payload->clock_rate,
"encoding_name", G_TYPE_STRING, payload->encoding_name, "encoding-name", G_TYPE_STRING, payload->encoding_name,
"ssrc", G_TYPE_UINT, payload->current_ssrc, "ssrc", G_TYPE_UINT, payload->current_ssrc,
"clock_base", G_TYPE_UINT, payload->ts_base, "clock-base", G_TYPE_UINT, payload->ts_base,
"seqnum_base", G_TYPE_UINT, payload->seqnum_base, NULL); "seqnum-base", G_TYPE_UINT, payload->seqnum_base, NULL);
s = gst_caps_get_structure (srccaps, 0); s = gst_caps_get_structure (srccaps, 0);
if (fieldname) { if (fieldname) {
@ -348,6 +356,9 @@ gst_basertppayload_set_property (GObject * object, guint prop_id,
case PROP_SSRC: case PROP_SSRC:
basertppayload->ssrc = g_value_get_uint (value); basertppayload->ssrc = g_value_get_uint (value);
break; break;
case PROP_TIMESTAMP_OFFSET:
basertppayload->ts_offset = g_value_get_int (value);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -372,6 +383,9 @@ gst_basertppayload_get_property (GObject * object, guint prop_id,
case PROP_SSRC: case PROP_SSRC:
g_value_set_uint (value, basertppayload->ssrc); g_value_set_uint (value, basertppayload->ssrc);
break; break;
case PROP_TIMESTAMP_OFFSET:
g_value_set_int (value, basertppayload->ts_offset);
break;
case PROP_TIMESTAMP: case PROP_TIMESTAMP:
g_value_set_uint (value, basertppayload->timestamp); g_value_set_uint (value, basertppayload->timestamp);
break; break;
@ -404,7 +418,10 @@ gst_basertppayload_change_state (GstElement * element,
basertppayload->current_ssrc = g_rand_int (basertppayload->ssrc_rand); basertppayload->current_ssrc = g_rand_int (basertppayload->ssrc_rand);
else else
basertppayload->current_ssrc = basertppayload->ssrc; basertppayload->current_ssrc = basertppayload->ssrc;
basertppayload->ts_base = g_rand_int (basertppayload->ts_rand); if (basertppayload->ts_offset == -1)
basertppayload->ts_base = g_rand_int (basertppayload->ts_rand);
else
basertppayload->ts_base = basertppayload->ts_offset;
break; break;
default: default:
break; break;

1
gst-libs/gst/rtp/gstbasertppayload.h
View file

@ -66,6 +66,7 @@ struct _GstBaseRTPPayload
gboolean dynamic; gboolean dynamic;
guint32 clock_rate; guint32 clock_rate;
gint32 ts_offset;
guint32 timestamp; guint32 timestamp;
guint16 seqnum; guint16 seqnum;
guint pt; guint pt;