diff options
author | Martin Storsjö <martin@martin.st> | 2010-07-21 21:25:09 +0400 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2010-07-21 21:25:09 +0400 |
commit | 4f5340a0b11c68dfa95e125df91ebeef3ec6503b (patch) | |
tree | 9eb98d717d03f32cdb6f3fd33473a968afdff9ab /libavformat | |
parent | bcc4cb4681aaf04bff1d10eee1eb24ae5ba7fb82 (diff) |
Reindent, rewrap long comment lines to keep line length below 80 chars
Originally committed as revision 24390 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/rtpdec_asf.c | 105 |
1 files changed, 53 insertions, 52 deletions
diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c index d63d705b41..d77dadf350 100644 --- a/libavformat/rtpdec_asf.c +++ b/libavformat/rtpdec_asf.c @@ -178,60 +178,61 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf, 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); - if (mflags & 0x80) - flags |= RTP_FLAG_KEY; - len_off = get_be24(pb); - if (mflags & 0x20) /**< relative timestamp */ - url_fskip(pb, 4); - if (mflags & 0x10) /**< has duration */ - url_fskip(pb, 4); - if (mflags & 0x8) /**< has location ID */ - url_fskip(pb, 4); - off = url_ftell(pb); - - if (!(mflags & 0x40)) { - /** - * If 0x40 is not set, the len_off field specifies an offset of this - * packet's payload data in the complete (reassembled) ASF packet. - * This is used to spread one ASF packet over multiple RTP packets. - */ - if (asf->pktbuf && len_off != url_ftell(asf->pktbuf)) { - uint8_t *p; - url_close_dyn_buf(asf->pktbuf, &p); + int start_off = url_ftell(pb); + + mflags = get_byte(pb); + if (mflags & 0x80) + flags |= RTP_FLAG_KEY; + len_off = get_be24(pb); + if (mflags & 0x20) /**< relative timestamp */ + url_fskip(pb, 4); + if (mflags & 0x10) /**< has duration */ + url_fskip(pb, 4); + if (mflags & 0x8) /**< has location ID */ + url_fskip(pb, 4); + off = url_ftell(pb); + + if (!(mflags & 0x40)) { + /** + * If 0x40 is not set, the len_off field specifies an offset + * of this packet's payload data in the complete (reassembled) + * ASF packet. This is used to spread one ASF packet over + * multiple RTP packets. + */ + if (asf->pktbuf && len_off != url_ftell(asf->pktbuf)) { + uint8_t *p; + url_close_dyn_buf(asf->pktbuf, &p); + asf->pktbuf = NULL; + av_free(p); + } + if (!len_off && !asf->pktbuf && + (res = url_open_dyn_buf(&asf->pktbuf)) < 0) + return res; + if (!asf->pktbuf) + return AVERROR(EIO); + + put_buffer(asf->pktbuf, buf + off, len - off); + url_fskip(pb, len - off); + if (!(flags & RTP_FLAG_MARKER)) + return -1; + out_len = url_close_dyn_buf(asf->pktbuf, &asf->buf); asf->pktbuf = NULL; - av_free(p); + } else { + /** + * If 0x40 is set, the len_off field specifies the length of + * the next ASF packet that can be read from this payload + * data alone. This is commonly the same as the payload size, + * but could be less in case of packet splitting (i.e. + * multiple ASF packets in one RTP packet). + */ + + int cur_len = start_off + len_off - off; + int prev_len = out_len; + out_len += cur_len; + asf->buf = av_realloc(asf->buf, out_len); + memcpy(asf->buf + prev_len, buf + off, cur_len); + url_fskip(pb, cur_len); } - if (!len_off && !asf->pktbuf && - (res = url_open_dyn_buf(&asf->pktbuf)) < 0) - return res; - if (!asf->pktbuf) - return AVERROR(EIO); - - put_buffer(asf->pktbuf, buf + off, len - off); - url_fskip(pb, len - off); - if (!(flags & RTP_FLAG_MARKER)) - return -1; - out_len = url_close_dyn_buf(asf->pktbuf, &asf->buf); - asf->pktbuf = NULL; - } else { - /** - * If 0x40 is set, the len_off field specifies the length of the - * next ASF packet that can be read from this payload data alone. - * This is commonly the same as the payload size, but could be - * less in case of packet splitting (i.e. multiple ASF packets in - * one RTP packet). - */ - - int cur_len = start_off + len_off - off; - int prev_len = out_len; - out_len += cur_len; - asf->buf = av_realloc(asf->buf, out_len); - memcpy(asf->buf + prev_len, buf + off, cur_len); - url_fskip(pb, cur_len); - } } init_packetizer(pb, asf->buf, out_len); |