*/
#include "libavutil/crc.h"
+#include "libavutil/random_seed.h"
#include "libavcodec/xiph.h"
#include "libavcodec/bytestream.h"
#include "libavcodec/flac.h"
#include "avformat.h"
#include "internal.h"
+#include "vorbiscomment.h"
+
+#define MAX_PAGE_SIZE 65025
+
+typedef struct {
+ int64_t granule;
+ int stream_index;
+ uint8_t flags;
+ uint8_t segments_count;
+ uint8_t segments[255];
+ uint8_t data[MAX_PAGE_SIZE];
+ uint16_t size;
+} OGGPage;
typedef struct {
- int64_t duration;
unsigned page_counter;
uint8_t *header[3];
int header_len[3];
int64_t last_kf_pts;
int vrev;
int eos;
- unsigned packet_count; ///< number of packet buffered
+ unsigned page_count; ///< number of page buffered
+ OGGPage page; ///< current page
+ unsigned serial_num; ///< serial number
} OGGStreamContext;
+typedef struct OGGPageList {
+ OGGPage page;
+ struct OGGPageList *next;
+} OGGPageList;
+
+typedef struct {
+ OGGPageList *page_list;
+} OGGContext;
+
static void ogg_update_checksum(AVFormatContext *s, int64_t crc_offset)
{
int64_t pos = url_ftell(s->pb);
url_fseek(s->pb, pos, SEEK_SET);
}
-static int ogg_write_page(AVFormatContext *s, const uint8_t *data, int size,
- int64_t granule, int stream_index, int flags)
+static void ogg_write_page(AVFormatContext *s, OGGPage *page, int extra_flags)
{
- OGGStreamContext *oggstream = s->streams[stream_index]->priv_data;
+ OGGStreamContext *oggstream = s->streams[page->stream_index]->priv_data;
int64_t crc_offset;
- int page_segments, i;
-
- if (size >= 255*255) {
- granule = -1;
- size = 255*255;
- } else if (oggstream->eos)
- flags |= 4;
-
- page_segments = FFMIN((size/255)+!!size, 255);
init_checksum(s->pb, ff_crc04C11DB7_update, 0);
put_tag(s->pb, "OggS");
put_byte(s->pb, 0);
- put_byte(s->pb, flags);
- put_le64(s->pb, granule);
- put_le32(s->pb, stream_index);
+ put_byte(s->pb, page->flags | extra_flags);
+ put_le64(s->pb, page->granule);
+ put_le32(s->pb, oggstream->serial_num);
put_le32(s->pb, oggstream->page_counter++);
crc_offset = url_ftell(s->pb);
put_le32(s->pb, 0); // crc
- put_byte(s->pb, page_segments);
- for (i = 0; i < page_segments-1; i++)
- put_byte(s->pb, 255);
- if (size) {
- put_byte(s->pb, size - (page_segments-1)*255);
- put_buffer(s->pb, data, size);
- }
+ put_byte(s->pb, page->segments_count);
+ put_buffer(s->pb, page->segments, page->segments_count);
+ put_buffer(s->pb, page->data, page->size);
+
ogg_update_checksum(s, crc_offset);
put_flush_packet(s->pb);
- return size;
+ oggstream->page_count--;
+}
+
+static int64_t ogg_granule_to_timestamp(OGGStreamContext *oggstream, OGGPage *page)
+{
+ if (oggstream->kfgshift)
+ return (page->granule>>oggstream->kfgshift) +
+ (page->granule & ((1<<oggstream->kfgshift)-1));
+ else
+ return page->granule;
+}
+
+static int ogg_compare_granule(AVFormatContext *s, OGGPage *next, OGGPage *page)
+{
+ AVStream *st2 = s->streams[next->stream_index];
+ AVStream *st = s->streams[page->stream_index];
+ int64_t next_granule, cur_granule;
+
+ if (next->granule == -1 || page->granule == -1)
+ return 0;
+
+ next_granule = av_rescale_q(ogg_granule_to_timestamp(st2->priv_data, next),
+ st2->time_base, AV_TIME_BASE_Q);
+ cur_granule = av_rescale_q(ogg_granule_to_timestamp(st->priv_data, page),
+ st ->time_base, AV_TIME_BASE_Q);
+ return next_granule > cur_granule;
+}
+
+static int ogg_reset_cur_page(OGGStreamContext *oggstream)
+{
+ oggstream->page.granule = -1;
+ oggstream->page.flags = 0;
+ oggstream->page.segments_count = 0;
+ oggstream->page.size = 0;
+ return 0;
+}
+
+static int ogg_buffer_page(AVFormatContext *s, OGGStreamContext *oggstream)
+{
+ OGGContext *ogg = s->priv_data;
+ OGGPageList **p = &ogg->page_list;
+ OGGPageList *l = av_mallocz(sizeof(*l));
+
+ if (!l)
+ return AVERROR(ENOMEM);
+ l->page = oggstream->page;
+
+ oggstream->page_count++;
+ ogg_reset_cur_page(oggstream);
+
+ while (*p) {
+ if (ogg_compare_granule(s, &(*p)->page, &l->page))
+ break;
+ p = &(*p)->next;
+ }
+ l->next = *p;
+ *p = l;
+
+ return 0;
+}
+
+static int ogg_buffer_data(AVFormatContext *s, AVStream *st,
+ uint8_t *data, unsigned size, int64_t granule)
+{
+ OGGStreamContext *oggstream = st->priv_data;
+ int total_segments = size / 255 + 1;
+ uint8_t *p = data;
+ int i, segments, len;
+
+ for (i = 0; i < total_segments; ) {
+ OGGPage *page = &oggstream->page;
+
+ segments = FFMIN(total_segments - i, 255 - page->segments_count);
+
+ if (i && !page->segments_count)
+ page->flags |= 1; // continued packet
+
+ memset(page->segments+page->segments_count, 255, segments - 1);
+ page->segments_count += segments - 1;
+
+ len = FFMIN(size, segments*255);
+ page->segments[page->segments_count++] = len - (segments-1)*255;
+ memcpy(page->data+page->size, p, len);
+ p += len;
+ size -= len;
+ i += segments;
+ page->size += len;
+
+ if (i == total_segments)
+ page->granule = granule;
+
+ if (page->segments_count == 255) {
+ ogg_buffer_page(s, oggstream);
+ }
+ }
+ return 0;
}
static uint8_t *ogg_write_vorbiscomment(int offset, int bitexact,
- int *header_len)
+ int *header_len, AVMetadata *m)
{
const char *vendor = bitexact ? "ffmpeg" : LIBAVFORMAT_IDENT;
int size;
uint8_t *p, *p0;
+ unsigned int count;
- size = offset + 4 + strlen(vendor) + 4;
+ size = offset + ff_vorbiscomment_length(m, vendor, &count);
p = av_mallocz(size);
if (!p)
return NULL;
p0 = p;
p += offset;
- bytestream_put_le32(&p, strlen(vendor));
- bytestream_put_buffer(&p, vendor, strlen(vendor));
- bytestream_put_le32(&p, 0); // user comment list length
+ ff_vorbiscomment_write(&p, m, vendor, count);
*header_len = size;
return p0;
}
static int ogg_build_flac_headers(AVCodecContext *avctx,
- OGGStreamContext *oggstream, int bitexact)
+ OGGStreamContext *oggstream, int bitexact,
+ AVMetadata *m)
{
enum FLACExtradataFormat format;
uint8_t *streaminfo;
oggstream->header[0] = av_mallocz(51); // per ogg flac specs
p = oggstream->header[0];
if (!p)
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
bytestream_put_byte(&p, 0x7F);
bytestream_put_buffer(&p, "FLAC", 4);
bytestream_put_byte(&p, 1); // major version
bytestream_put_buffer(&p, streaminfo, FLAC_STREAMINFO_SIZE);
// second packet: VorbisComment
- p = ogg_write_vorbiscomment(4, bitexact, &oggstream->header_len[1]);
+ p = ogg_write_vorbiscomment(4, bitexact, &oggstream->header_len[1], m);
if (!p)
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
oggstream->header[1] = p;
bytestream_put_byte(&p, 0x84); // last metadata block and vorbis comment
bytestream_put_be24(&p, oggstream->header_len[1] - 4);
#define SPEEX_HEADER_SIZE 80
static int ogg_build_speex_headers(AVCodecContext *avctx,
- OGGStreamContext *oggstream, int bitexact)
+ OGGStreamContext *oggstream, int bitexact,
+ AVMetadata *m)
{
uint8_t *p;
// first packet: Speex header
p = av_mallocz(SPEEX_HEADER_SIZE);
if (!p)
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
oggstream->header[0] = p;
oggstream->header_len[0] = SPEEX_HEADER_SIZE;
bytestream_put_buffer(&p, avctx->extradata, SPEEX_HEADER_SIZE);
AV_WL32(&oggstream->header[0][68], 0); // set extra_headers to 0
// second packet: VorbisComment
- p = ogg_write_vorbiscomment(0, bitexact, &oggstream->header_len[1]);
+ p = ogg_write_vorbiscomment(0, bitexact, &oggstream->header_len[1], m);
if (!p)
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
oggstream->header[1] = p;
return 0;
{
OGGStreamContext *oggstream;
int i, j;
+
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
- if (st->codec->codec_type == CODEC_TYPE_AUDIO)
+ unsigned serial_num = i;
+
+ if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
av_set_pts_info(st, 64, 1, st->codec->sample_rate);
- else if (st->codec->codec_type == CODEC_TYPE_VIDEO)
+ else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
av_set_pts_info(st, 64, st->codec->time_base.num, st->codec->time_base.den);
if (st->codec->codec_id != CODEC_ID_VORBIS &&
st->codec->codec_id != CODEC_ID_THEORA &&
return -1;
}
oggstream = av_mallocz(sizeof(*oggstream));
+ oggstream->page.stream_index = i;
+
+ if (!(st->codec->flags & CODEC_FLAG_BITEXACT))
+ do {
+ serial_num = av_get_random_seed();
+ for (j = 0; j < i; j++) {
+ OGGStreamContext *sc = s->streams[j]->priv_data;
+ if (serial_num == sc->serial_num)
+ break;
+ }
+ } while (j < i);
+ oggstream->serial_num = serial_num;
+
st->priv_data = oggstream;
if (st->codec->codec_id == CODEC_ID_FLAC) {
int err = ogg_build_flac_headers(st->codec, oggstream,
- st->codec->flags & CODEC_FLAG_BITEXACT);
+ st->codec->flags & CODEC_FLAG_BITEXACT,
+ s->metadata);
if (err) {
av_log(s, AV_LOG_ERROR, "Error writing FLAC headers\n");
av_freep(&st->priv_data);
}
} else if (st->codec->codec_id == CODEC_ID_SPEEX) {
int err = ogg_build_speex_headers(st->codec, oggstream,
- st->codec->flags & CODEC_FLAG_BITEXACT);
+ st->codec->flags & CODEC_FLAG_BITEXACT,
+ s->metadata);
if (err) {
av_log(s, AV_LOG_ERROR, "Error writing Speex headers\n");
av_freep(&st->priv_data);
}
}
}
- for (i = 0; i < 3; i++) {
- for (j = 0; j < s->nb_streams; j++) {
- AVStream *st = s->streams[j];
- OGGStreamContext *oggstream = st->priv_data;
- if (oggstream && oggstream->header_len[i]) {
- ogg_write_page(s, oggstream->header[i], oggstream->header_len[i],
- 0, st->index, i ? 0 : 2); // bos
- }
+
+ for (j = 0; j < s->nb_streams; j++) {
+ OGGStreamContext *oggstream = s->streams[j]->priv_data;
+ ogg_buffer_data(s, s->streams[j], oggstream->header[0],
+ oggstream->header_len[0], 0);
+ oggstream->page.flags |= 2; // bos
+ ogg_buffer_page(s, oggstream);
+ }
+ for (j = 0; j < s->nb_streams; j++) {
+ AVStream *st = s->streams[j];
+ OGGStreamContext *oggstream = st->priv_data;
+ for (i = 1; i < 3; i++) {
+ if (oggstream && oggstream->header_len[i])
+ ogg_buffer_data(s, st, oggstream->header[i],
+ oggstream->header_len[i], 0);
}
+ ogg_buffer_page(s, oggstream);
}
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 && oggstream->page_count == 1 ? 4 : 0); // eos
+ next = p->next;
+ av_freep(&p);
+ p = next;
+ }
+ ogg->page_list = p;
+}
+
static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt)
{
AVStream *st = s->streams[pkt->stream_index];
OGGStreamContext *oggstream = st->priv_data;
- uint8_t *ptr = pkt->data;
- int ret, size = pkt->size;
+ int ret;
int64_t granule;
if (st->codec->codec_id == CODEC_ID_THEORA) {
int64_t pts = oggstream->vrev < 1 ? pkt->pts : pkt->pts + pkt->duration;
int pframe_count;
- if (pkt->flags & PKT_FLAG_KEY)
+ if (pkt->flags & AV_PKT_FLAG_KEY)
oggstream->last_kf_pts = pts;
pframe_count = pts - oggstream->last_kf_pts;
// prevent frame count from overflow if key frame flag is not set
granule = (oggstream->last_kf_pts<<oggstream->kfgshift) | pframe_count;
} else
granule = pkt->pts + pkt->duration;
- oggstream->duration = granule;
- do {
- ret = ogg_write_page(s, ptr, size, granule, pkt->stream_index, ptr != pkt->data);
- ptr += ret; size -= ret;
- } while (size > 0 || ret == 255*255); // need to output a last nil page
- return 0;
-}
+ ret = ogg_buffer_data(s, st, pkt->data, pkt->size, granule);
+ if (ret < 0)
+ return ret;
-static int ogg_compare_granule(AVFormatContext *s, AVPacket *next, AVPacket *pkt)
-{
- AVStream *st2 = s->streams[next->stream_index];
- AVStream *st = s->streams[pkt ->stream_index];
+ ogg_write_pages(s, 0);
- int64_t next_granule = av_rescale_q(next->pts + next->duration,
- st2->time_base, AV_TIME_BASE_Q);
- int64_t cur_granule = av_rescale_q(pkt ->pts + pkt ->duration,
- st ->time_base, AV_TIME_BASE_Q);
- return next_granule > cur_granule;
+ return 0;
}
-static int ogg_interleave_per_granule(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush)
+static int ogg_write_trailer(AVFormatContext *s)
{
- OGGStreamContext *ogg;
- int i, stream_count = 0;
- int interleaved = 0;
-
- if (pkt) {
- ff_interleave_add_packet(s, pkt, ogg_compare_granule);
- ogg = s->streams[pkt->stream_index]->priv_data;
- ogg->packet_count++;
- }
-
- for (i = 0; i < s->nb_streams; i++) {
- ogg = s->streams[i]->priv_data;
- stream_count += !!ogg->packet_count;
- interleaved += ogg->packet_count > 1;
- }
-
- if ((s->nb_streams == stream_count && interleaved == stream_count) ||
- (flush && stream_count)) {
- AVPacketList *pktl= s->packet_buffer;
- *out= pktl->pkt;
- s->packet_buffer = pktl->next;
-
- ogg = s->streams[out->stream_index]->priv_data;
- if (flush && ogg->packet_count == 1)
- ogg->eos = 1;
- ogg->packet_count--;
-
- if(!s->packet_buffer)
- s->packet_buffer_end= NULL;
+ int i;
- if(s->streams[out->stream_index]->last_in_packet_buffer == pktl)
- s->streams[out->stream_index]->last_in_packet_buffer= NULL;
+ /* flush current page */
+ for (i = 0; i < s->nb_streams; i++)
+ ogg_buffer_page(s, s->streams[i]->priv_data);
- av_freep(&pktl);
- return 1;
- } else {
- av_init_packet(out);
- return 0;
- }
-}
+ ogg_write_pages(s, 1);
-static int ogg_write_trailer(AVFormatContext *s)
-{
- int i;
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
OGGStreamContext *oggstream = st->priv_data;
NULL_IF_CONFIG_SMALL("Ogg"),
"application/ogg",
"ogg,ogv,spx",
- 0,
+ sizeof(OGGContext),
CODEC_ID_FLAC,
CODEC_ID_THEORA,
ogg_write_header,
ogg_write_packet,
ogg_write_trailer,
- .interleave_packet = ogg_interleave_per_granule,
+ .metadata_conv = ff_vorbiscomment_metadata_conv,
};