Mercurial > libavformat.hg
changeset 6297:241c4063d058 libavformat
Reindent, rewrap long comment lines to keep line length below 80 chars
| author | mstorsjo |
|---|---|
| date | Wed, 21 Jul 2010 17:25:09 +0000 |
| parents | 7e7f9248ec87 |
| children | eb7e896070d9 |
| files | rtpdec_asf.c |
| diffstat | 1 files changed, 51 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/rtpdec_asf.c Wed Jul 21 17:17:35 2010 +0000 +++ b/rtpdec_asf.c Wed Jul 21 17:25:09 2010 +0000 @@ -178,60 +178,61 @@ init_put_byte(pb, buf, len, 0, NULL, NULL, NULL, NULL); while (url_ftell(pb) + 4 < len) { - int start_off = url_ftell(pb); + 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); - 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); - 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); + 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);