From f17899a55cff8bf7ab61b4fe565d0f8e81a74751 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 15 Jun 2015 23:40:44 +0100 Subject: [PATCH] pcapparse: fix another regression Introduced by c4c9fe60b pcapparse: Take buffer directly from the adapter Using gst_adapter_take_buffer_fast() can lead to buffers that are made up of multiple memories with the first memory smaller than the RTP header size, which violates assumptions GstRtpBaseDepayloader makes, namely that the complete RTP header will be in the first memory. This leads to such packets being dropped when feeding them from pcapparse to RTP depayloaders. Use take_buffer() so we get buffers with a single memory. --- gst/pcapparse/gstpcapparse.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gst/pcapparse/gstpcapparse.c b/gst/pcapparse/gstpcapparse.c index 75d4cb9..fae2286 100644 --- a/gst/pcapparse/gstpcapparse.c +++ b/gst/pcapparse/gstpcapparse.c @@ -482,8 +482,11 @@ gst_pcap_parse_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) gst_adapter_unmap (self->adapter); gst_adapter_flush (self->adapter, offset); - out_buf = gst_adapter_take_buffer_fast (self->adapter, - payload_size); + /* we don't use _take_buffer_fast() on purpose here, we need a + * buffer with a single memory, since the RTP depayloaders expect + * the complete RTP header to be in the first memory if there are + * multiple ones and we can't guarantee that with _fast() */ + out_buf = gst_adapter_take_buffer (self->adapter, payload_size); gst_adapter_flush (self->adapter, self->cur_packet_size - offset - payload_size); -- 2.7.4