Mercurial > libavformat.hg
diff nutenc.c @ 3120:ea5623a8efde libavformat
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
of matroska and nut.
author | eugeni |
---|---|
date | Fri, 07 Mar 2008 19:25:09 +0000 |
parents | 88e032ac11e7 |
children | cf8df6a00eb5 |
line wrap: on
line diff
--- a/nutenc.c Thu Mar 06 20:44:44 2008 +0000 +++ b/nutenc.c Fri Mar 07 19:25:09 2008 +0000 @@ -472,6 +472,37 @@ return 0; } +static int write_streaminfo(NUTContext *nut, ByteIOContext *bc, int stream_id){ + AVFormatContext *s= nut->avf; + AVStream* st = s->streams[stream_id]; + ByteIOContext *dyn_bc; + uint8_t *dyn_buf=NULL; + int count=0, dyn_size, i; + int ret = url_open_dyn_buf(&dyn_bc); + if(ret < 0) + return ret; + + for (i=0; ff_nut_dispositions[i].flag; ++i) { + if (st->disposition & ff_nut_dispositions[i].flag) + count += add_info(dyn_bc, "Disposition", ff_nut_dispositions[i].str); + } + dyn_size = url_close_dyn_buf(dyn_bc, &dyn_buf); + + if (count) { + put_v(bc, stream_id + 1); //stream_id_plus1 + put_v(bc, 0); //chapter_id + put_v(bc, 0); //timestamp_start + put_v(bc, 0); //length + + put_v(bc, count); + + put_buffer(bc, dyn_buf, dyn_size); + } + + av_free(dyn_buf); + return count; +} + static int write_headers(NUTContext *nut, ByteIOContext *bc){ ByteIOContext *dyn_bc; int i, ret; @@ -498,6 +529,22 @@ write_globalinfo(nut, dyn_bc); put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE); + for (i = 0; i < nut->avf->nb_streams; i++) { + ret = url_open_dyn_buf(&dyn_bc); + if(ret < 0) + return ret; + ret = write_streaminfo(nut, dyn_bc, i); + if (ret < 0) + return ret; + if (ret > 0) + put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE); + else { + uint8_t* buf; + url_close_dyn_buf(dyn_bc, &buf); + av_free(buf); + } + } + nut->last_syncpoint_pos= INT_MIN; nut->header_count++; return 0;