summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.co.uk>2010-01-18 21:16:32 -0500
committerWim Taymans <wim.taymans@collabora.co.uk>2010-01-21 10:46:17 +0100
commit8d2ac0b2ec386ede0e29a174b102574020072dcd (patch)
treec1a8433ab2e30afb5f7d201476c4ac2fbc447af8
parentdea7d352da6930c497dcae75184abd3b672f3b26 (diff)
basertppayload: ptime should be in nanoseconds
https://bugzilla.gnome.org/show_bug.cgi?id=607403
-rw-r--r--gst-libs/gst/rtp/gstbasertppayload.c2
-rw-r--r--gst-libs/gst/rtp/gstbasertppayload.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/gst-libs/gst/rtp/gstbasertppayload.c b/gst-libs/gst/rtp/gstbasertppayload.c
index ed5acccea..65c283fe0 100644
--- a/gst-libs/gst/rtp/gstbasertppayload.c
+++ b/gst-libs/gst/rtp/gstbasertppayload.c
@@ -571,7 +571,7 @@ gst_basertppayload_set_outcaps (GstBaseRTPPayload * payload, gchar * fieldname,
payload->priv->caps_max_ptime = max_ptime * GST_MSECOND;
if (gst_structure_get_int (s, "ptime", &ptime) && ptime > 0)
- payload->abidata.ABI.ptime = ptime;
+ payload->abidata.ABI.ptime = ptime * GST_MSECOND;
if (gst_structure_get_int (s, "payload", &pt)) {
/* use peer pt */
diff --git a/gst-libs/gst/rtp/gstbasertppayload.h b/gst-libs/gst/rtp/gstbasertppayload.h
index 1591c104e..4802ae88d 100644
--- a/gst-libs/gst/rtp/gstbasertppayload.h
+++ b/gst-libs/gst/rtp/gstbasertppayload.h
@@ -113,7 +113,7 @@ struct _GstBaseRTPPayload
union {
struct {
- guint ptime; /* in ms */
+ guint64 ptime; /* in ns */
} ABI;
gpointer _gst_reserved[GST_PADDING - (sizeof(guint64)/sizeof(gpointer)) - 1];
} abidata;