mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 07:16:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpbasepayload: Store ptime from caps

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=606050
This commit is contained in:
Olivier Crête 2009-12-29 18:36:29 -05:00
parent 21151ba940
commit a4b0f2a1bd
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -530,6 +530,7 @@ gst_basertppayload_set_outcaps (GstBaseRTPPayload * payload, gchar * fieldname,
} }
payload->priv->caps_max_ptime = DEFAULT_MAX_PTIME; payload->priv->caps_max_ptime = DEFAULT_MAX_PTIME;
payload->abidata.ABI.ptime = 0;
/* the peer caps can override some of the defaults */ /* the peer caps can override some of the defaults */
peercaps = gst_pad_peer_get_caps (payload->srcpad); peercaps = gst_pad_peer_get_caps (payload->srcpad);
@ -547,7 +548,7 @@ gst_basertppayload_set_outcaps (GstBaseRTPPayload * payload, gchar * fieldname,
GstStructure *s, *d; GstStructure *s, *d;
const GValue *value; const GValue *value;
gint pt; gint pt;
guint max_ptime; gint max_ptime, ptime;
/* peer provides caps we can use to fixate, intersect. This always returns a /* peer provides caps we can use to fixate, intersect. This always returns a
* writable caps. */ * writable caps. */
@ -561,9 +562,12 @@ gst_basertppayload_set_outcaps (GstBaseRTPPayload * payload, gchar * fieldname,
/* get first structure */ /* get first structure */
s = gst_caps_get_structure (temp, 0); s = gst_caps_get_structure (temp, 0);
if (gst_structure_get_uint (s, "maxptime", &max_ptime)) if (gst_structure_get_int (s, "maxptime", &max_ptime) && max_ptime > 0)
payload->priv->caps_max_ptime = max_ptime * GST_MSECOND; payload->priv->caps_max_ptime = max_ptime * GST_MSECOND;
if (gst_structure_get_int (s, "ptime", &ptime) && ptime > 0)
payload->abidata.ABI.ptime = ptime;
if (gst_structure_get_int (s, "payload", &pt)) { if (gst_structure_get_int (s, "payload", &pt)) {
/* use peer pt */ /* use peer pt */
GST_BASE_RTP_PAYLOAD_PT (payload) = pt; GST_BASE_RTP_PAYLOAD_PT (payload) = pt;

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

@ -111,7 +111,12 @@ struct _GstBaseRTPPayload
/*< private >*/ /*< private >*/
GstBaseRTPPayloadPrivate *priv; GstBaseRTPPayloadPrivate *priv;
gpointer _gst_reserved[GST_PADDING - (sizeof(guint64)/sizeof(gpointer)) - 1]; union {
struct {
guint ptime; /* in ms */
} ABI;
gpointer _gst_reserved[GST_PADDING - (sizeof(guint64)/sizeof(gpointer)) - 1];
} abidata;
}; };
struct _GstBaseRTPPayloadClass struct _GstBaseRTPPayloadClass