* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <stdint.h>
+
#include "libavutil/crc.h"
#include "libavutil/mathematics.h"
#include "libavutil/opt.h"
#define MAX_PAGE_SIZE 65025
-typedef struct {
+typedef struct OGGPage {
+ int64_t start_granule;
int64_t granule;
int stream_index;
uint8_t flags;
uint16_t size;
} OGGPage;
-typedef struct {
+typedef struct OGGStreamContext {
unsigned page_counter;
uint8_t *header[3];
int header_len[3];
struct OGGPageList *next;
} OGGPageList;
-typedef struct {
+typedef struct OGGContext {
const AVClass *class;
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[] = {
- { "pagesize", "preferred page size in bytes",
+ { "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",
+ OFFSET(pref_duration), AV_OPT_TYPE_INT64, { .i64 = 1000000 }, 0, INT64_MAX, PARAM },
{ NULL },
};
-static const AVClass ogg_muxer_class = {
- .class_name = "Ogg muxer",
- .item_name = av_default_item_name,
- .option = options,
- .version = LIBAVUTIL_VERSION_INT,
+#define OGG_CLASS(flavor)\
+static const AVClass flavor ## _muxer_class = {\
+ .class_name = #flavor " muxer",\
+ .item_name = av_default_item_name,\
+ .option = options,\
+ .version = LIBAVUTIL_VERSION_INT,\
};
-
static void ogg_update_checksum(AVFormatContext *s, AVIOContext *pb, int64_t crc_offset)
{
int64_t pos = avio_tell(pb);
return AVERROR(ENOMEM);
l->page = oggstream->page;
+ oggstream->page.start_granule = oggstream->page.granule;
oggstream->page_count++;
ogg_reset_cur_page(oggstream);
flush = 1;
}
+ // avoid a continued page
+ if (!header && oggstream->page.size > 0 &&
+ MAX_PAGE_SIZE - oggstream->page.size < size) {
+ ogg_buffer_page(s, oggstream);
+ }
+
for (i = 0; i < total_segments; ) {
OGGPage *page = &oggstream->page;
if (i == total_segments)
page->granule = granule;
- if (!header && (page->segments_count == 255 ||
- (ogg->pref_size > 0 && page->size >= ogg->pref_size))) {
- ogg_buffer_page(s, oggstream);
+ if (!header) {
+ AVStream *st = s->streams[page->stream_index];
+
+ int64_t start = av_rescale_q(page->start_granule, st->time_base,
+ AV_TIME_BASE_Q);
+ int64_t next = av_rescale_q(page->granule, st->time_base,
+ AV_TIME_BASE_Q);
+
+ if (page->segments_count == 255 ||
+ (ogg->pref_size > 0 && page->size >= ogg->pref_size) ||
+ (ogg->pref_duration > 0 && next - start >= ogg->pref_duration)) {
+ ogg_buffer_page(s, oggstream);
+ }
}
}
const char *vendor = bitexact ? "Libav" : LIBAVFORMAT_IDENT;
int size;
uint8_t *p, *p0;
- unsigned int count;
ff_metadata_conv(m, ff_vorbiscomment_metadata_conv, NULL);
- size = offset + ff_vorbiscomment_length(*m, vendor, &count) + framing_bit;
+ size = offset + ff_vorbiscomment_length(*m, vendor) + framing_bit;
p = av_mallocz(size);
if (!p)
return NULL;
p0 = p;
p += offset;
- ff_vorbiscomment_write(&p, m, vendor, count);
+ ff_vorbiscomment_write(&p, m, vendor);
if (framing_bit)
bytestream_put_byte(&p, 1);
OGGStreamContext *oggstream, int bitexact,
AVDictionary **m)
{
- enum FLACExtradataFormat format;
- uint8_t *streaminfo;
uint8_t *p;
- if (!avpriv_flac_is_extradata_valid(avctx, &format, &streaminfo))
- return -1;
+ if (avctx->extradata_size < FLAC_STREAMINFO_SIZE)
+ return AVERROR(EINVAL);
// first packet: STREAMINFO
oggstream->header_len[0] = 51;
bytestream_put_buffer(&p, "fLaC", 4);
bytestream_put_byte(&p, 0x00); // streaminfo
bytestream_put_be24(&p, 34);
- bytestream_put_buffer(&p, streaminfo, FLAC_STREAMINFO_SIZE);
+ bytestream_put_buffer(&p, avctx->extradata, FLAC_STREAMINFO_SIZE);
// second packet: VorbisComment
p = ogg_write_vorbiscomment(4, bitexact, &oggstream->header_len[1], m, 0);
return 0;
}
+static void ogg_write_pages(AVFormatContext *s, int flush)
+{
+ OGGContext *ogg = s->priv_data;
+ OGGPageList *next, *p;
+
+ if (!ogg->page_list)
+ return;
+
+ for (p = ogg->page_list; p; ) {
+ OGGStreamContext *oggstream =
+ s->streams[p->page.stream_index]->priv_data;
+ if (oggstream->page_count < 2 && !flush)
+ break;
+ ogg_write_page(s, &p->page,
+ flush == 1 && oggstream->page_count == 1 ? 4 : 0); // eos
+ next = p->next;
+ av_freep(&p);
+ p = next;
+ }
+ ogg->page_list = p;
+}
+
static int ogg_write_header(AVFormatContext *s)
{
+ OGGContext *ogg = s->priv_data;
OGGStreamContext *oggstream;
int i, j;
+ if (ogg->pref_size)
+ av_log(s, AV_LOG_WARNING, "The pagesize option is deprecated\n");
+
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)
avpriv_set_pts_info(st, 64, 1, 48000);
else
avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
- else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
- avpriv_set_pts_info(st, 64, st->codec->time_base.num, st->codec->time_base.den);
+
if (st->codec->codec_id != AV_CODEC_ID_VORBIS &&
st->codec->codec_id != AV_CODEC_ID_THEORA &&
st->codec->codec_id != AV_CODEC_ID_SPEEX &&
return -1;
}
oggstream = av_mallocz(sizeof(*oggstream));
+ if (!oggstream)
+ return AVERROR(ENOMEM);
oggstream->page.stream_index = i;
- if (!(st->codec->flags & CODEC_FLAG_BITEXACT))
+ if (!(s->flags & AVFMT_FLAG_BITEXACT))
do {
serial_num = av_get_random_seed();
for (j = 0; j < i; j++) {
st->priv_data = oggstream;
if (st->codec->codec_id == AV_CODEC_ID_FLAC) {
int err = ogg_build_flac_headers(st->codec, oggstream,
- st->codec->flags & CODEC_FLAG_BITEXACT,
+ s->flags & AVFMT_FLAG_BITEXACT,
&s->metadata);
if (err) {
av_log(s, AV_LOG_ERROR, "Error writing FLAC headers\n");
}
} else if (st->codec->codec_id == AV_CODEC_ID_SPEEX) {
int err = ogg_build_speex_headers(st->codec, oggstream,
- st->codec->flags & CODEC_FLAG_BITEXACT,
+ s->flags & AVFMT_FLAG_BITEXACT,
&s->metadata);
if (err) {
av_log(s, AV_LOG_ERROR, "Error writing Speex headers\n");
}
} else if (st->codec->codec_id == AV_CODEC_ID_OPUS) {
int err = ogg_build_opus_headers(st->codec, oggstream,
- st->codec->flags & CODEC_FLAG_BITEXACT,
+ s->flags & AVFMT_FLAG_BITEXACT,
&s->metadata);
if (err) {
av_log(s, AV_LOG_ERROR, "Error writing Opus headers\n");
return -1;
}
- p = ogg_write_vorbiscomment(7, st->codec->flags & CODEC_FLAG_BITEXACT,
+ p = ogg_write_vorbiscomment(7, s->flags & AVFMT_FLAG_BITEXACT,
&oggstream->header_len[1], &s->metadata,
framing_bit);
oggstream->header[1] = p;
AVStream *st = s->streams[j];
OGGStreamContext *oggstream = st->priv_data;
for (i = 1; i < 3; i++) {
- if (oggstream && oggstream->header_len[i])
+ if (oggstream->header_len[i])
ogg_buffer_data(s, st, oggstream->header[i],
oggstream->header_len[i], 0, 1);
}
ogg_buffer_page(s, oggstream);
}
- return 0;
-}
-static void ogg_write_pages(AVFormatContext *s, int flush)
-{
- OGGContext *ogg = s->priv_data;
- OGGPageList *next, *p;
+ oggstream->page.start_granule = AV_NOPTS_VALUE;
- if (!ogg->page_list)
- return;
+ ogg_write_pages(s, 2);
- for (p = ogg->page_list; p; ) {
- OGGStreamContext *oggstream =
- s->streams[p->page.stream_index]->priv_data;
- if (oggstream->page_count < 2 && !flush)
- break;
- ogg_write_page(s, &p->page,
- flush && oggstream->page_count == 1 ? 4 : 0); // eos
- next = p->next;
- av_freep(&p);
- p = next;
- }
- ogg->page_list = p;
+ return 0;
}
-static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt)
+static int ogg_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
{
AVStream *st = s->streams[pkt->stream_index];
OGGStreamContext *oggstream = st->priv_data;
}
granule = (oggstream->last_kf_pts<<oggstream->kfgshift) | pframe_count;
} else if (st->codec->codec_id == AV_CODEC_ID_OPUS)
- granule = pkt->pts + pkt->duration + av_rescale_q(st->codec->delay, (AVRational){ 1, st->codec->sample_rate }, st->time_base);
+ granule = pkt->pts + pkt->duration +
+ av_rescale_q(st->codec->initial_padding,
+ (AVRational){ 1, st->codec->sample_rate },
+ st->time_base);
else
granule = pkt->pts + pkt->duration;
+ if (oggstream->page.start_granule == AV_NOPTS_VALUE)
+ oggstream->page.start_granule = pkt->pts;
+
ret = ogg_buffer_data(s, st, pkt->data, pkt->size, granule, 0);
if (ret < 0)
return ret;
return 0;
}
+static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ int i;
+
+ if (pkt)
+ return ogg_write_packet_internal(s, pkt);
+
+ for (i = 0; i < s->nb_streams; i++) {
+ OGGStreamContext *oggstream = s->streams[i]->priv_data;
+ if (oggstream->page.segments_count)
+ ogg_buffer_page(s, oggstream);
+ }
+
+ ogg_write_pages(s, 2);
+ return 0;
+}
+
static int ogg_write_trailer(AVFormatContext *s)
{
int i;
- /* flush current page */
- for (i = 0; i < s->nb_streams; i++)
- ogg_buffer_page(s, s->streams[i]->priv_data);
+ /* flush current page if needed */
+ for (i = 0; i < s->nb_streams; i++) {
+ OGGStreamContext *oggstream = s->streams[i]->priv_data;
+
+ if (oggstream->page.size > 0)
+ ogg_buffer_page(s, oggstream);
+ }
ogg_write_pages(s, 1);
return 0;
}
+#if CONFIG_OGG_MUXER
+OGG_CLASS(ogg)
AVOutputFormat ff_ogg_muxer = {
.name = "ogg",
.long_name = NULL_IF_CONFIG_SMALL("Ogg"),
.mime_type = "application/ogg",
- .extensions = "ogg,ogv,spx,opus",
+ .extensions = "ogg,ogv",
.priv_data_size = sizeof(OGGContext),
- .audio_codec = AV_CODEC_ID_FLAC,
+ .audio_codec = CONFIG_LIBVORBIS_ENCODER ?
+ AV_CODEC_ID_VORBIS : AV_CODEC_ID_FLAC,
.video_codec = AV_CODEC_ID_THEORA,
.write_header = ogg_write_header,
.write_packet = ogg_write_packet,
.write_trailer = ogg_write_trailer,
+ .flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH,
.priv_class = &ogg_muxer_class,
};
+#endif
+
+#if CONFIG_OGA_MUXER
+OGG_CLASS(oga)
+AVOutputFormat ff_oga_muxer = {
+ .name = "oga",
+ .long_name = NULL_IF_CONFIG_SMALL("Ogg Audio"),
+ .mime_type = "audio/ogg",
+ .extensions = "oga",
+ .priv_data_size = sizeof(OGGContext),
+ .audio_codec = CONFIG_LIBVORBIS_ENCODER ?
+ AV_CODEC_ID_VORBIS : AV_CODEC_ID_FLAC,
+ .write_header = ogg_write_header,
+ .write_packet = ogg_write_packet,
+ .write_trailer = ogg_write_trailer,
+ .flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH,
+ .priv_class = &oga_muxer_class,
+};
+#endif
+
+#if CONFIG_SPX_MUXER
+OGG_CLASS(spx)
+AVOutputFormat ff_spx_muxer = {
+ .name = "spx",
+ .long_name = NULL_IF_CONFIG_SMALL("Ogg Speex"),
+ .mime_type = "audio/ogg",
+ .extensions = "spx",
+ .priv_data_size = sizeof(OGGContext),
+ .audio_codec = AV_CODEC_ID_SPEEX,
+ .write_header = ogg_write_header,
+ .write_packet = ogg_write_packet,
+ .write_trailer = ogg_write_trailer,
+ .flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH,
+ .priv_class = &spx_muxer_class,
+};
+#endif
+
+#if CONFIG_OPUS_MUXER
+OGG_CLASS(opus)
+AVOutputFormat ff_opus_muxer = {
+ .name = "opus",
+ .long_name = NULL_IF_CONFIG_SMALL("Ogg Opus"),
+ .mime_type = "audio/ogg",
+ .extensions = "opus",
+ .priv_data_size = sizeof(OGGContext),
+ .audio_codec = AV_CODEC_ID_OPUS,
+ .write_header = ogg_write_header,
+ .write_packet = ogg_write_packet,
+ .write_trailer = ogg_write_trailer,
+ .flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH,
+ .priv_class = &opus_muxer_class,
+};
+#endif
projects / ffmpeg / blobdiff