diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2008-07-07 15:34:12 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-07-07 15:34:12 +0000 |
| commit | 0db3e69da91738f8ae84923ab3d78deb25bc2ca4 (patch) | |
| tree | 4d2b1628c1a592866cf87029fd7f0d049fc69165 | |
| parent | 9f886ee1f2d7437eb121c7049a4b358be25117a9 (diff) | |
gst/rtp/gstrtpspeexdepay.*: Revert last change: Only the jitterbuffer is able to convert RTP to
Original commit message from CVS:
* gst/rtp/gstrtpspeexdepay.c: (gst_rtp_speex_depay_init),
(gst_rtp_speex_depay_process):
* gst/rtp/gstrtpspeexdepay.h:
Revert last change: Only the jitterbuffer is able to convert RTP to
Gstreamer timestamps and normal (de)payloaders should simply copy it.
Reopens bug #541787.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gst/rtp/gstrtpspeexdepay.c | 10 | ||||
| -rw-r--r-- | gst/rtp/gstrtpspeexdepay.h | 1 |
3 files changed, 10 insertions, 10 deletions
@@ -1,3 +1,12 @@ +2008-07-07 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * gst/rtp/gstrtpspeexdepay.c: (gst_rtp_speex_depay_init), + (gst_rtp_speex_depay_process): + * gst/rtp/gstrtpspeexdepay.h: + Revert last change: Only the jitterbuffer is able to convert RTP to + Gstreamer timestamps and normal (de)payloaders should simply copy it. + Reopens bug #541787. + 2008-07-07 Stefan Kost <ensonic@users.sf.net> * gst/rtp/gstrtpvrawdepay.c: diff --git a/gst/rtp/gstrtpspeexdepay.c b/gst/rtp/gstrtpspeexdepay.c index db6cbd53..c18c5e22 100644 --- a/gst/rtp/gstrtpspeexdepay.c +++ b/gst/rtp/gstrtpspeexdepay.c @@ -105,7 +105,6 @@ gst_rtp_speex_depay_init (GstRtpSPEEXDepay * rtpspeexdepay, GstRtpSPEEXDepayClass * klass) { GST_BASE_RTP_DEPAYLOAD (rtpspeexdepay)->clock_rate = 8000; - rtpspeexdepay->start_ts = 0; } static gint @@ -203,15 +202,8 @@ gst_rtp_speex_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf) gst_rtp_buffer_get_marker (buf), gst_rtp_buffer_get_timestamp (buf), gst_rtp_buffer_get_seq (buf)); - GstRtpSPEEXDepay *speexdepayload = GST_RTP_SPEEX_DEPAY (depayload); - /* apply correct timestamp from rtp packet */ + /* nothing special to be done */ outbuf = gst_rtp_buffer_get_payload_buffer (buf); - if (speexdepayload->start_ts == 0) - speexdepayload->start_ts = gst_rtp_buffer_get_timestamp (buf); - GST_BUFFER_TIMESTAMP (outbuf) = - gst_util_uint64_scale (GST_SECOND, - gst_rtp_buffer_get_timestamp (buf) - speexdepayload->start_ts, - depayload->clock_rate); return outbuf; } diff --git a/gst/rtp/gstrtpspeexdepay.h b/gst/rtp/gstrtpspeexdepay.h index 705886c8..4a76a633 100644 --- a/gst/rtp/gstrtpspeexdepay.h +++ b/gst/rtp/gstrtpspeexdepay.h @@ -37,7 +37,6 @@ typedef struct _GstRtpSPEEXDepayClass GstRtpSPEEXDepayClass; struct _GstRtpSPEEXDepay { GstBaseRTPDepayload depayload; - guint64 start_ts; }; struct _GstRtpSPEEXDepayClass |