Add support for dirac in ogg

Originally committed as revision 21128 to svn://svn.ffmpeg.org/ffmpeg/trunk

6 files changed, 117 insertions, 1 deletions

diff --git a/configure b/configure
index 275fa88b27..8bccec5a71 100755
--- a/configure
+++ b/configure
@@ -1238,6 +1238,7 @@ mp3_demuxer_deps="mpegaudio_parser"
 mp4_muxer_select="mov_muxer"
 mpegtsraw_demuxer_select="mpegts_demuxer"
 mxf_d10_muxer_select="mxf_muxer"
+ogg_demuxer_select="golomb"
 psp_muxer_select="mov_muxer"
 rtp_muxer_deps="network rtp_protocol"
 rtsp_demuxer_deps="sdp_demuxer"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index d4734698cf..bfff7311fe 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -450,7 +450,8 @@ OBJS-$(CONFIG_MATROSKA_MUXER)          += xiph.o mpeg4audio.o \
 OBJS-$(CONFIG_MOV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
 OBJS-$(CONFIG_MPEGTS_MUXER)            += mpegvideo.o
 OBJS-$(CONFIG_NUT_MUXER)               += mpegaudiodata.o
-OBJS-$(CONFIG_OGG_DEMUXER)             += flacdec.o flacdata.o flac.o
+OBJS-$(CONFIG_OGG_DEMUXER)             += flacdec.o flacdata.o flac.o \
+                                          dirac.o mpeg12data.o
 OBJS-$(CONFIG_OGG_MUXER)               += xiph.o flacdec.o flacdata.o flac.o
 OBJS-$(CONFIG_RTP_MUXER)               += mpegvideo.o
 
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 9e52bc796c..d804728fcf 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -138,6 +138,7 @@ OBJS-$(CONFIG_NUT_DEMUXER)               += nutdec.o nut.o riff.o
 OBJS-$(CONFIG_NUT_MUXER)                 += nutenc.o nut.o riff.o
 OBJS-$(CONFIG_NUV_DEMUXER)               += nuv.o riff.o
 OBJS-$(CONFIG_OGG_DEMUXER)               += oggdec.o         \
+                                            oggparsedirac.o  \
                                             oggparseflac.o   \
                                             oggparseogm.o    \
                                             oggparsespeex.o  \
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 75afc84099..33b453c584 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -38,10 +38,12 @@
 #define DECODER_BUFFER_SIZE MAX_PAGE_SIZE
 
 static const struct ogg_codec * const ogg_codecs[] = {
+    &ff_dirac_codec,
     &ff_speex_codec,
     &ff_vorbis_codec,
     &ff_theora_codec,
     &ff_flac_codec,
+    &ff_old_dirac_codec,
     &ff_old_flac_codec,
     &ff_ogm_video_codec,
     &ff_ogm_audio_codec,
diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h
index 696233dd43..4db3fa6132 100644
--- a/libavformat/oggdec.h
+++ b/libavformat/oggdec.h
@@ -90,11 +90,13 @@ struct ogg {
 #define OGG_FLAG_BOS  2
 #define OGG_FLAG_EOS  4
 
+extern const struct ogg_codec ff_dirac_codec;
 extern const struct ogg_codec ff_flac_codec;
 extern const struct ogg_codec ff_ogm_audio_codec;
 extern const struct ogg_codec ff_ogm_old_codec;
 extern const struct ogg_codec ff_ogm_text_codec;
 extern const struct ogg_codec ff_ogm_video_codec;
+extern const struct ogg_codec ff_old_dirac_codec;
 extern const struct ogg_codec ff_old_flac_codec;
 extern const struct ogg_codec ff_speex_codec;
 extern const struct ogg_codec ff_theora_codec;
diff --git a/libavformat/oggparsedirac.c b/libavformat/oggparsedirac.c
new file mode 100644
index 0000000000..fc1a193205
--- /dev/null
+++ b/libavformat/oggparsedirac.c
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2008  David Conrad
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavcodec/get_bits.h"
+#include "libavcodec/dirac.h"
+#include "avformat.h"
+#include "oggdec.h"
+
+static int dirac_header(AVFormatContext *s, int idx)
+{
+    struct ogg *ogg = s->priv_data;
+    struct ogg_stream *os = ogg->streams + idx;
+    AVStream *st = s->streams[idx];
+    dirac_source_params source;
+    GetBitContext gb;
+
+    // already parsed the header
+    if (st->codec->codec_id == CODEC_ID_DIRAC)
+        return 0;
+
+    init_get_bits(&gb, os->buf + os->pstart + 13, (os->psize - 13) * 8);
+    if (ff_dirac_parse_sequence_header(st->codec, &gb, &source) < 0)
+        return -1;
+
+    st->codec->codec_type = CODEC_TYPE_VIDEO;
+    st->codec->codec_id = CODEC_ID_DIRAC;
+    // dirac in ogg always stores timestamps as though the video were interlaced
+    st->time_base = (AVRational){st->codec->time_base.num, 2*st->codec->time_base.den};
+    return 1;
+}
+
+// various undocument things: granule is signed (only for dirac!)
+static uint64_t dirac_gptopts(AVFormatContext *s, int idx, int64_t gp)
+{
+    struct ogg *ogg = s->priv_data;
+    struct ogg_stream *os = ogg->streams + idx;
+
+    unsigned dist  = ((gp >> 14) & 0xff00) | (gp & 0xff);
+    int64_t  dts   = (gp >> 31);
+    int64_t  pts   = dts + ((gp >> 9) & 0x1fff);
+
+    if (!dist)
+        os->pflags |= PKT_FLAG_KEY;
+
+    return pts;
+}
+
+static int old_dirac_header(AVFormatContext *s, int idx)
+{
+    struct ogg *ogg = s->priv_data;
+    struct ogg_stream *os = ogg->streams + idx;
+    AVStream *st = s->streams[idx];
+    uint8_t *buf = os->buf + os->pstart;
+
+    if (buf[0] != 'K')
+        return 0;
+
+    st->codec->codec_type = CODEC_TYPE_VIDEO;
+    st->codec->codec_id = CODEC_ID_DIRAC;
+    st->time_base.den = AV_RB32(buf+8);
+    st->time_base.num = AV_RB32(buf+12);
+    return 1;
+}
+
+static uint64_t old_dirac_gptopts(AVFormatContext *s, int idx, uint64_t gp)
+{
+    struct ogg *ogg = s->priv_data;
+    struct ogg_stream *os = ogg->streams + idx;
+    uint64_t iframe = gp >> 30;
+    uint64_t pframe = gp & 0x3fffffff;
+
+    if (!pframe)
+        os->pflags |= PKT_FLAG_KEY;
+
+    return iframe + pframe;
+}
+
+const struct ogg_codec ff_dirac_codec = {
+    .magic = "BBCD\0",
+    .magicsize = 5,
+    .header = dirac_header,
+    .gptopts = dirac_gptopts,
+    .granule_is_start = 1,
+};
+
+const struct ogg_codec ff_old_dirac_codec = {
+    .magic = "KW-DIRAC",
+    .magicsize = 8,
+    .header = old_dirac_header,
+    .gptopts = old_dirac_gptopts,
+    .granule_is_start = 1,
+};