har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtpdec: Handle RTP header extension

Browse Source 
This fixes roundup issue 2270.

Patch by Robert Schlabbach, robert_s at gmx dot net

Originally committed as revision 25372 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Robert Schlabbach 2010-10-06 16:59:14 +00:00 committed by Martin Storsjö
parent 3ece3e4c56
commit 9446b4bbbc
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/rtpdec.c
View File

@ -421,10 +421,12 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt,
{ {
unsigned int ssrc, h; unsigned int ssrc, h;
int payload_type, seq, ret, flags = 0; int payload_type, seq, ret, flags = 0;
int ext;
AVStream *st; AVStream *st;
uint32_t timestamp; uint32_t timestamp;
int rv= 0; int rv= 0;
ext = buf[0] & 0x10;
payload_type = buf[1] & 0x7f; payload_type = buf[1] & 0x7f;
if (buf[1] & 0x80) if (buf[1] & 0x80)
flags |= RTP_FLAG_MARKER; flags |= RTP_FLAG_MARKER;
@ -451,6 +453,21 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt,
len -= 12; len -= 12;
buf += 12; buf += 12;
/* RFC 3550 Section 5.3.1 RTP Header Extension handling */
if (ext) {
if (len < 4)
return -1;
/* calculate the header extension length (stored as number
* of 32-bit words) */
ext = (AV_RB16(buf + 2) + 1) << 2;
if (len < ext)
return -1;
// skip past RTP header extension
len -= ext;
buf += ext;
}
if (!st) { if (!st) {
/* specific MPEG2TS demux support */ /* specific MPEG2TS demux support */
ret = ff_mpegts_parse_packet(s->ts, pkt, buf, len); ret = ff_mpegts_parse_packet(s->ts, pkt, buf, len);