CD+G demuxer and decoder

Patch by Michael Tison (gmail address: blackspike@....)

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

4 files changed, 69 insertions, 1 deletions

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 620223361d..2b3e186413 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -44,6 +44,7 @@ OBJS-$(CONFIG_BFI_DEMUXER)               += bfi.o
 OBJS-$(CONFIG_C93_DEMUXER)               += c93.o vocdec.o voc.o
 OBJS-$(CONFIG_CAF_DEMUXER)               += cafdec.o caf.o mov.o riff.o isom.o
 OBJS-$(CONFIG_CAVSVIDEO_DEMUXER)         += raw.o
+OBJS-$(CONFIG_CDG_DEMUXER)               += cdg.o
 OBJS-$(CONFIG_CRC_MUXER)                 += crcenc.o
 OBJS-$(CONFIG_DAUD_DEMUXER)              += daud.o
 OBJS-$(CONFIG_DAUD_MUXER)                += daud.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 0dfaa93b6c..d57376dd91 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -68,6 +68,7 @@ void av_register_all(void)
     REGISTER_DEMUXER  (C93, c93);
     REGISTER_DEMUXER  (CAF, caf);
     REGISTER_DEMUXER  (CAVSVIDEO, cavsvideo);
+    REGISTER_DEMUXER  (CDG, cdg);
     REGISTER_MUXER    (CRC, crc);
     REGISTER_MUXDEMUX (DAUD, daud);
     REGISTER_MUXDEMUX (DIRAC, dirac);
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 4cc2fa68c1..8e8ab91b2d 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -22,7 +22,7 @@
 #define AVFORMAT_AVFORMAT_H
 
 #define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 43
+#define LIBAVFORMAT_VERSION_MINOR 44
 #define LIBAVFORMAT_VERSION_MICRO  0
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
diff --git a/libavformat/cdg.c b/libavformat/cdg.c
new file mode 100644
index 0000000000..f40028d2f9
--- /dev/null
+++ b/libavformat/cdg.c
@@ -0,0 +1,66 @@
+/*
+ * CD Graphics Demuxer
+ * Copyright (c) 2009 Michael Tison
+ *
+ * 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 "avformat.h"
+
+#define CDG_PACKET_SIZE    24
+
+static int read_header(AVFormatContext *s, AVFormatParameters *ap)
+{
+    AVStream *vst;
+    int ret;
+
+    vst = av_new_stream(s, 0);
+    if (!vst)
+        return AVERROR(ENOMEM);
+
+    vst->codec->codec_type = CODEC_TYPE_VIDEO;
+    vst->codec->codec_id   = CODEC_ID_CDGRAPHICS;
+
+    /// 75 sectors/sec * 4 packets/sector = 300 packets/sec
+    av_set_pts_info(vst, 32, 1, 300);
+
+    ret = url_fsize(s->pb);
+    if (ret > 0)
+        vst->duration = (ret * vst->time_base.den) / (CDG_PACKET_SIZE * 300);
+
+    return 0;
+}
+
+static int read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    int ret;
+
+    ret = av_get_packet(s->pb, pkt, CDG_PACKET_SIZE);
+
+    pkt->stream_index = 0;
+    return ret;
+}
+
+AVInputFormat cdg_demuxer = {
+    "cdg",
+    NULL_IF_CONFIG_SMALL("CD Graphics Format"),
+    0,
+    NULL,
+    read_header,
+    read_packet,
+    .extensions = "cdg"
+};