virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

rtpdec: Read RTCP compound packets

Browse Source 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24963 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Josh Allmann 2010-08-29 10:19:44 +00:00 committed by Martin Storsjö
parent a1ba71aace
commit ff328c0225
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/rtpdec.c
View File

@ -74,12 +74,28 @@ void av_register_rtp_dynamic_payload_handlers(void)
static int rtcp_parse_packet(RTPDemuxContext *s, const unsigned char *buf, int len) static int rtcp_parse_packet(RTPDemuxContext *s, const unsigned char *buf, int len)
{ {
if (buf[1] != RTCP_SR) int payload_len;
return -1; while (len >= 2) {
switch (buf[1]) {
case RTCP_SR:
if (len < 16) {
av_log(NULL, AV_LOG_ERROR, "Invalid length for RTCP SR packet\n");
return AVERROR_INVALIDDATA;
}
payload_len = (AV_RB16(buf + 2) + 1) * 4;
s->last_rtcp_ntp_time = AV_RB64(buf + 8); s->last_rtcp_ntp_time = AV_RB64(buf + 8);
if (s->first_rtcp_ntp_time == AV_NOPTS_VALUE) if (s->first_rtcp_ntp_time == AV_NOPTS_VALUE)
s->first_rtcp_ntp_time = s->last_rtcp_ntp_time; s->first_rtcp_ntp_time = s->last_rtcp_ntp_time;
s->last_rtcp_timestamp = AV_RB32(buf + 16); s->last_rtcp_timestamp = AV_RB32(buf + 16);
buf += payload_len;
len -= payload_len;
break;
default:
return -1;
}
}
return 0; return 0;
} }