From d392defbd3c060b7a32cd9720635e919586fefce Mon Sep 17 00:00:00 2001 From: Olivier Crete Date: Tue, 5 Aug 2008 09:42:53 +0000 Subject: gst/rtpmanager/gstrtpjitterbuffer.c: Make the buffer metadata writable before inserting it in the jitterbuffer becaus... Original commit message from CVS: Based on patch by: Olivier Crete * gst/rtpmanager/gstrtpjitterbuffer.c: (gst_rtp_jitter_buffer_chain), (gst_rtp_jitter_buffer_loop): Make the buffer metadata writable before inserting it in the jitterbuffer because the jitterbuffer will modify the timestamps. * gst/rtpmanager/rtpjitterbuffer.c: Update method comment about requiring writable metadata on buffers. * gst/rtpmanager/rtpsession.c: (rtp_session_process_sr), (rtp_session_process_rtcp): Make the RTCP buffer metadata writable because we want to modify the metadata. Fixes #546312. --- gst/rtpmanager/gstrtpjitterbuffer.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gst/rtpmanager/gstrtpjitterbuffer.c') diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c index 52430ff2..b9b15691 100644 --- a/gst/rtpmanager/gstrtpjitterbuffer.c +++ b/gst/rtpmanager/gstrtpjitterbuffer.c @@ -927,6 +927,10 @@ gst_rtp_jitter_buffer_chain (GstPad * pad, GstBuffer * buffer) } } + /* we need to make the metadata writable before pushing it in the jitterbuffer + * because the jitterbuffer will update the timestamp */ + buffer = gst_buffer_make_metadata_writable (buffer); + /* now insert the packet into the queue in sorted order. This function returns * FALSE if a packet with the same seqnum was already in the queue, meaning we * have a duplicate. */ @@ -1236,8 +1240,8 @@ push_buffer: outbuf = rtp_jitter_buffer_pop (priv->jbuf); if (discont || priv->discont) { - /* set DISCONT flag when we missed a packet. */ - outbuf = gst_buffer_make_metadata_writable (outbuf); + /* set DISCONT flag when we missed a packet. We pushed the buffer writable + * into the jitterbuffer so we can modify now. */ GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT); priv->discont = FALSE; } -- cgit