virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

ogg: Provide an option to offset the serial number

Browse Source 
The ogg serial number doubles as codec id and sequence
value for concatenated samples.
This commit is contained in:
Luca Barbato 2015-01-30 17:29:22 +01:00
parent 22b985d59c
commit f726fc21ef
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/muxers.texi
View File

@ -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 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 situations, giving a small seek granularity at the cost of additional container
overhead. 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 @end table
@section segment @section segment

5
libavformat/oggenc.c
View File

@ -71,12 +71,15 @@ typedef struct {
OGGPageList *page_list; OGGPageList *page_list;
int pref_size; ///< preferred page size (0 => fill all segments) int pref_size; ///< preferred page size (0 => fill all segments)
int64_t pref_duration; ///< preferred page duration (0 => fill all segments) int64_t pref_duration; ///< preferred page duration (0 => fill all segments)
int serial_offset;
} OGGContext; } OGGContext;
#define OFFSET(x) offsetof(OGGContext, x) #define OFFSET(x) offsetof(OGGContext, x)
#define PARAM AV_OPT_FLAG_ENCODING_PARAM #define PARAM AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = { 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)", { "pagesize", "preferred page size in bytes (deprecated)",
OFFSET(pref_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, MAX_PAGE_SIZE, PARAM }, OFFSET(pref_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, MAX_PAGE_SIZE, PARAM },
{ "page_duration", "preferred page duration, in microseconds", { "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++) { for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->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_type == AVMEDIA_TYPE_AUDIO)
if (st->codec->codec_id == AV_CODEC_ID_OPUS) if (st->codec->codec_id == AV_CODEC_ID_OPUS)