virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

rtpdec_asf: Handle RTSP-MS packet splitting

Browse Source 
Originally committed as revision 24389 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-07-21 17:17:35 +00:00
parent 2441339927
commit bcc4cb4681
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavformat/rtpdec_asf.c
View File

@ -168,12 +168,18 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf,
return -1; return -1;
if (len > 0) { if (len > 0) {
int off, out_len; int off, out_len = 0;
if (len < 4) if (len < 4)
return -1; return -1;
av_freep(&asf->buf);
init_put_byte(pb, buf, len, 0, NULL, NULL, NULL, NULL); init_put_byte(pb, buf, len, 0, NULL, NULL, NULL, NULL);
while (url_ftell(pb) + 4 < len) {
int start_off = url_ftell(pb);
mflags = get_byte(pb); mflags = get_byte(pb);
if (mflags & 0x80) if (mflags & 0x80)
flags |= RTP_FLAG_KEY; flags |= RTP_FLAG_KEY;
@ -186,7 +192,6 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf,
url_fskip(pb, 4); url_fskip(pb, 4);
off = url_ftell(pb); off = url_ftell(pb);
av_freep(&asf->buf);
if (!(mflags & 0x40)) { if (!(mflags & 0x40)) {
/** /**
* If 0x40 is not set, the len_off field specifies an offset of this * If 0x40 is not set, the len_off field specifies an offset of this
@ -206,6 +211,7 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf,
return AVERROR(EIO); return AVERROR(EIO);
put_buffer(asf->pktbuf, buf + off, len - off); put_buffer(asf->pktbuf, buf + off, len - off);
url_fskip(pb, len - off);
if (!(flags & RTP_FLAG_MARKER)) if (!(flags & RTP_FLAG_MARKER))
return -1; return -1;
out_len = url_close_dyn_buf(asf->pktbuf, &asf->buf); out_len = url_close_dyn_buf(asf->pktbuf, &asf->buf);
@ -218,14 +224,14 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf,
* less in case of packet splitting (i.e. multiple ASF packets in * less in case of packet splitting (i.e. multiple ASF packets in
* one RTP packet). * one RTP packet).
*/ */
if (len_off != len) {
av_log_missing_feature(s, int cur_len = start_off + len_off - off;
"RTSP-MS packet splitting", 1); int prev_len = out_len;
return -1; out_len += cur_len;
} asf->buf = av_realloc(asf->buf, out_len);
asf->buf = av_malloc(len - off); memcpy(asf->buf + prev_len, buf + off, cur_len);
out_len = len - off; url_fskip(pb, cur_len);
memcpy(asf->buf, buf + off, len - off); }
} }
init_packetizer(pb, asf->buf, out_len); init_packetizer(pb, asf->buf, out_len);