On Sun, Feb 1, 2015 at 1:23 AM, Luca Barbato <[email protected]> wrote: > The ogg serial number doubles as codec id and sequence > value for concatenated samples. > --- > > Vittorio seems ok with it, the icecast people seem happier with > this option. > > doc/muxers.texi | 5 +++++ > libavformat/oggenc.c | 5 ++++- > 2 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/doc/muxers.texi b/doc/muxers.texi > index d71eb09..bcfdb49 100644 > --- a/doc/muxers.texi > +++ b/doc/muxers.texi > @@ -504,6 +504,11 @@ is 1 second. A value of 0 will fill all segments, making > pages as large as > possible. A value of 1 will effectively use 1 packet-per-page in most > situations, giving a small seek granularity at the cost of additional > container > overhead. > +@item -serial_offset @var{value} > +Serial value from which to set the streams serial number. > +Setting it to different and sufficiently large values ensures that the > produced > +ogg files can be safely chained. > + > @end table > > @section segment > diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c > index c7d6491..1b2644d 100644 > --- a/libavformat/oggenc.c > +++ b/libavformat/oggenc.c > @@ -71,12 +71,15 @@ typedef struct { > OGGPageList *page_list; > int pref_size; ///< preferred page size (0 => fill all segments) > int64_t pref_duration; ///< preferred page duration (0 => fill all > segments) > + int serial_offset; > } OGGContext; > > #define OFFSET(x) offsetof(OGGContext, x) > #define PARAM AV_OPT_FLAG_ENCODING_PARAM > > static const AVOption options[] = { > + { "serial_offset", "serial number offset", > + OFFSET(serial_offset), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, > PARAM }, > { "pagesize", "preferred page size in bytes (deprecated)", > OFFSET(pref_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, MAX_PAGE_SIZE, > PARAM }, > { "page_duration", "preferred page duration, in microseconds", > @@ -418,7 +421,7 @@ static int ogg_write_header(AVFormatContext *s) > > for (i = 0; i < s->nb_streams; i++) { > AVStream *st = s->streams[i]; > - unsigned serial_num = i; > + unsigned serial_num = i + ogg->serial_offset; > > if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) > if (st->codec->codec_id == AV_CODEC_ID_OPUS) > -- > 1.9.0
probably ok -- Vittorio _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
