Remove debugging messages

[frescor/ffmpeg.git] / libavformat / oggenc.c

diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index 1c8507357274adbfa5481557854c423fbdb53576..bbbee0a9063181fb78386917fb94653f7a19f913 100644 (file)
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -19,10 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/crc.h"
+#include "libavcodec/xiph.h"
+#include "libavcodec/bytestream.h"
+#include "libavcodec/flac.h"
 #include "avformat.h"
-#include "crc.h"
-#include "xiph.h"
-#include "bytestream.h"
+#include "internal.h"
 
 typedef struct {
     int64_t duration;
@@ -33,11 +35,12 @@ typedef struct {
     int kfgshift;
     int64_t last_kf_pts;
     int vrev;
+    int eos;
 } OGGStreamContext;
 
-static void ogg_update_checksum(AVFormatContext *s, offset_t crc_offset)
+static void ogg_update_checksum(AVFormatContext *s, int64_t crc_offset)
 {
-    offset_t pos = url_ftell(s->pb);
+    int64_t pos = url_ftell(s->pb);
     uint32_t checksum = get_checksum(s->pb);
     url_fseek(s->pb, crc_offset, SEEK_SET);
     put_be32(s->pb, checksum);
@@ -48,10 +51,15 @@ static int ogg_write_page(AVFormatContext *s, const uint8_t *data, int size,
                           int64_t granule, int stream_index, int flags)
 {
     OGGStreamContext *oggstream = s->streams[stream_index]->priv_data;
-    offset_t crc_offset;
+    int64_t crc_offset;
     int page_segments, i;
 
-    size = FFMIN(size, 255*255);
+    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);
@@ -75,15 +83,17 @@ static int ogg_write_page(AVFormatContext *s, const uint8_t *data, int size,
     return size;
 }
 
-static int ogg_build_flac_headers(const uint8_t *extradata, int extradata_size,
+static int ogg_build_flac_headers(AVCodecContext *avctx,
                                   OGGStreamContext *oggstream, int bitexact)
 {
     const char *vendor = bitexact ? "ffmpeg" : LIBAVFORMAT_IDENT;
+    enum FLACExtradataFormat format;
+    uint8_t *streaminfo;
     uint8_t *p;
-    if (extradata_size != 34)
+    if (!ff_flac_is_extradata_valid(avctx, &format, &streaminfo))
         return -1;
-    oggstream->header_len[0] = 79;
-    oggstream->header[0] = av_mallocz(79); // per ogg flac specs
+    oggstream->header_len[0] = 51;
+    oggstream->header[0] = av_mallocz(51); // per ogg flac specs
     p = oggstream->header[0];
     bytestream_put_byte(&p, 0x7F);
     bytestream_put_buffer(&p, "FLAC", 4);
@@ -93,7 +103,7 @@ static int ogg_build_flac_headers(const uint8_t *extradata, int extradata_size,
     bytestream_put_buffer(&p, "fLaC", 4);
     bytestream_put_byte(&p, 0x00); // streaminfo
     bytestream_put_be24(&p, 34);
-    bytestream_put_buffer(&p, extradata, 34);
+    bytestream_put_buffer(&p, streaminfo, FLAC_STREAMINFO_SIZE);
     oggstream->header_len[1] = 1+3+4+strlen(vendor)+4;
     oggstream->header[1] = av_mallocz(oggstream->header_len[1]);
     p = oggstream->header[1];
@@ -129,7 +139,7 @@ static int ogg_write_header(AVFormatContext *s)
         oggstream = av_mallocz(sizeof(*oggstream));
         st->priv_data = oggstream;
         if (st->codec->codec_id == CODEC_ID_FLAC) {
-            if (ogg_build_flac_headers(st->codec->extradata, st->codec->extradata_size,
+            if (ogg_build_flac_headers(st->codec,
                                        oggstream, st->codec->flags & CODEC_FLAG_BITEXACT) < 0) {
                 av_log(s, AV_LOG_ERROR, "Extradata corrupted\n");
                 av_freep(&st->priv_data);
@@ -196,6 +206,56 @@ static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
+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];
+
+    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;
+}
+
+static int ogg_interleave_per_granule(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush)
+{
+    AVPacketList *pktl;
+    int stream_count = 0;
+    int streams[MAX_STREAMS] = {0};
+    int interleaved = 0;
+
+    if (pkt) {
+        ff_interleave_add_packet(s, pkt, ogg_compare_granule);
+    }
+
+    pktl = s->packet_buffer;
+    while (pktl) {
+        if (streams[pktl->pkt.stream_index] == 0)
+            stream_count++;
+        streams[pktl->pkt.stream_index]++;
+        // need to buffer at least one packet to set eos flag
+        if (streams[pktl->pkt.stream_index] == 2)
+            interleaved++;
+        pktl = pktl->next;
+    }
+
+    if ((s->nb_streams == stream_count && interleaved == stream_count) ||
+        (flush && stream_count)) {
+        pktl= s->packet_buffer;
+        *out= pktl->pkt;
+        s->packet_buffer = pktl->next;
+        if (flush && streams[out->stream_index] == 1) {
+            OGGStreamContext *ogg = s->streams[out->stream_index]->priv_data;
+            ogg->eos = 1;
+        }
+        av_freep(&pktl);
+        return 1;
+    } else {
+        av_init_packet(out);
+        return 0;
+    }
+}
 
 static int ogg_write_trailer(AVFormatContext *s)
 {
@@ -203,7 +263,6 @@ static int ogg_write_trailer(AVFormatContext *s)
     for (i = 0; i < s->nb_streams; i++) {
         AVStream *st = s->streams[i];
         OGGStreamContext *oggstream = st->priv_data;
-        ogg_write_page(s, NULL, 0, oggstream->duration, i, 4); // eos
         if (st->codec->codec_id == CODEC_ID_FLAC) {
             av_free(oggstream->header[0]);
             av_free(oggstream->header[1]);
@@ -215,13 +274,14 @@ static int ogg_write_trailer(AVFormatContext *s)
 
 AVOutputFormat ogg_muxer = {
     "ogg",
-    "Ogg format",
+    NULL_IF_CONFIG_SMALL("Ogg"),
     "application/ogg",
-    "ogg",
+    "ogg,ogv",
     0,
     CODEC_ID_FLAC,
     CODEC_ID_THEORA,
     ogg_write_header,
     ogg_write_packet,
     ogg_write_trailer,
+    .interleave_packet = ogg_interleave_per_granule,
 };