mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-01 01:33:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstdepay: check for correct fragment offset

Browse source 
Make sure we only insert the rtp packet in the adapter when the
frag_offset matches. When the first packet of a fragment is dropped,
it avoids putting the remaining packets in the adapter and processing
the partial fragment.

Conflicts:
	gst/rtp/gstrtpgstdepay.c
This commit is contained in:
Wim Taymans 2012-11-01 11:58:57 +00:00
parent 8a402e0c06
commit c0713e4b80
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst/rtp/gstrtpgstdepay.c
View file

@ -190,7 +190,7 @@ gst_rtp_gst_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
GstBuffer *subbuf, *outbuf = NULL; GstBuffer *subbuf, *outbuf = NULL;
gint payload_len; gint payload_len;
guint8 *payload; guint8 *payload;
guint CV; guint CV, frag_offset, avail;
GstRTPBuffer rtp = { NULL }; GstRTPBuffer rtp = { NULL };
rtpgstdepay = GST_RTP_GST_DEPAY (depayload); rtpgstdepay = GST_RTP_GST_DEPAY (depayload);
@ -219,9 +219,12 @@ gst_rtp_gst_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
* | Frag_offset | * | Frag_offset |
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/ */
/* frag_offset = frag_offset =
* (payload[4] << 24) | (payload[5] << 16) | (payload[6] << 8) | payload[7]; (payload[4] << 24) | (payload[5] << 16) | (payload[6] << 8) | payload[7];
*/
avail = gst_adapter_available (rtpgstdepay->adapter);
if (avail != frag_offset)
goto wrong_frag;
/* subbuffer skipping the 8 header bytes */ /* subbuffer skipping the 8 header bytes */
subbuf = gst_rtp_buffer_get_payload_subbuffer (&rtp, 8, -1); subbuf = gst_rtp_buffer_get_payload_subbuffer (&rtp, 8, -1);
@ -324,6 +327,13 @@ empty_packet:
gst_rtp_buffer_unmap (&rtp); gst_rtp_buffer_unmap (&rtp);
return NULL; return NULL;
} }
wrong_frag:
{
gst_adapter_clear (rtpgstdepay->adapter);
gst_rtp_buffer_unmap (&rtp);
GST_LOG_OBJECT (rtpgstdepay, "wrong fragment, skipping");
return NULL;
}
too_small: too_small:
{ {
GST_ELEMENT_WARNING (rtpgstdepay, STREAM, DECODE, GST_ELEMENT_WARNING (rtpgstdepay, STREAM, DECODE,