mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpasfdepay: fix fragmented packet handling and packet padding

Browse source 
Also remove a bogus assert.
This commit is contained in:
Mark Nauwelaerts 2011-06-06 12:41:03 +02:00
parent 2965dbac47
commit 3ba6d1588f
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/asfdemux/gstrtpasfdepay.c
View file

@ -456,21 +456,19 @@ gst_rtp_asf_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
return NULL; return NULL;
/* we need to pad with zeroes to packet_size if it's smaller */ /* we need to pad with zeroes to packet_size if it's smaller */
g_assert (packet_len == GST_BUFFER_SIZE (outbuf)); if (GST_BUFFER_SIZE (outbuf) < depay->packet_size) {
packet_len = GST_BUFFER_SIZE (outbuf);
if (packet_len < depay->packet_size) {
GstBuffer *tmp; GstBuffer *tmp;
gint plen = GST_BUFFER_SIZE (outbuf);
GST_LOG_OBJECT (depay, "padding buffer size %d to packet size %d", GST_LOG_OBJECT (depay, "padding buffer size %d to packet size %d",
packet_len, depay->packet_size); plen, depay->packet_size);
tmp = gst_buffer_new_and_alloc (depay->packet_size); tmp = gst_buffer_new_and_alloc (depay->packet_size);
memcpy (GST_BUFFER_DATA (tmp), GST_BUFFER_DATA (outbuf), packet_len); memcpy (GST_BUFFER_DATA (tmp), GST_BUFFER_DATA (outbuf), plen);
gst_buffer_copy_metadata (tmp, outbuf, GST_BUFFER_COPY_ALL);
gst_buffer_unref (outbuf); gst_buffer_unref (outbuf);
outbuf = tmp; outbuf = tmp;
memset (GST_BUFFER_DATA (outbuf) + packet_len, 0, memset (GST_BUFFER_DATA (outbuf) + plen, 0, depay->packet_size - plen);
depay->packet_size - packet_len); gst_rtp_asf_depay_set_padding (depay, outbuf, depay->packet_size - plen);
gst_rtp_asf_depay_set_padding (depay, outbuf,
depay->packet_size - packet_len);
} }
gst_buffer_set_caps (outbuf, GST_PAD_CAPS (depayload->srcpad)); gst_buffer_set_caps (outbuf, GST_PAD_CAPS (depayload->srcpad));