From b93f738fde5d9eb626fc59d05e8300b8f411c099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
Date: Fri, 2 Sep 2005 19:18:59 +0000
Subject: [PATCH] Support D-Cinema audio demuxing.
Originally committed as revision 4549 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/Makefile | 2 +-
libavformat/allformats.c | 1 +
libavformat/avformat.h | 3 ++
libavformat/daud.c | 63 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 68 insertions(+), 1 deletion(-)
create mode 100644 libavformat/daud.c
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 6352f935d56..ea486a77dbf 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -17,7 +17,7 @@ OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o img2.o raw.o rm.o \
yuv4mpeg.o 4xm.o flvenc.o flvdec.o movenc.o psxstr.o idroq.o ipmovie.o \
nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o asf-enc.o \
- ogg2.o oggparsevorbis.o oggparsetheora.o oggparseflac.o
+ ogg2.o oggparsevorbis.o oggparsetheora.o oggparseflac.o daud.o
AMROBJS=
ifeq ($(AMR_NB),yes)
AMROBJS= amr.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 6fa9bc56cc8..5e8692167b6 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -109,6 +109,7 @@ void av_register_all(void)
sol_init();
ea_init();
nsvdec_init();
+ daud_init();
#ifdef CONFIG_ENCODERS
/* image formats */
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 8b751520c37..2245dc7b9ec 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -546,6 +546,9 @@ int ea_init(void);
/* nsvdec.c */
int nsvdec_init(void);
+/* daud.c */
+int daud_init(void);
+
#include "rtp.h"
#include "rtsp.h"
diff --git a/libavformat/daud.c b/libavformat/daud.c
new file mode 100644
index 00000000000..acaec9b0d8c
--- /dev/null
+++ b/libavformat/daud.c
@@ -0,0 +1,63 @@
+/*
+ * D-Cinema audio decoder.
+ * Copyright (c) 2005 Reimar Döffinger.
+ *
+ * This library 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 of the License, or (at your option) any later version.
+ *
+ * This library 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 this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include "avformat.h"
+
+static int daud_header(AVFormatContext *s, AVFormatParameters *ap) {
+ AVStream *st = av_new_stream(s, 0);
+ st->codec->codec_type = CODEC_TYPE_AUDIO;
+ st->codec->codec_id = CODEC_ID_PCM_S24DAUD;
+ st->codec->codec_tag = MKTAG('d', 'a', 'u', 'd');
+ st->codec->channels = 6;
+ st->codec->sample_rate = 96000;
+ st->codec->bit_rate = 3 * 6 * 96000 * 8;
+ st->codec->block_align = 3 * 6;
+ st->codec->bits_per_sample = 24;
+ return 0;
+}
+
+static int daud_packet(AVFormatContext *s, AVPacket *pkt) {
+ ByteIOContext *pb = &s->pb;
+ int ret, size;
+ if (url_feof(pb))
+ return AVERROR_IO;
+ size = get_be16(pb);
+ get_be16(pb); // unknown
+ ret = av_get_packet(pb, pkt, size);
+ pkt->stream_index = 0;
+ return ret;
+}
+
+static AVInputFormat daud_iformat = {
+ "daud",
+ "D-Cinema audio format",
+ 0,
+ NULL,
+ daud_header,
+ daud_packet,
+ NULL,
+ NULL,
+ .extensions = "302",
+};
+
+int daud_init(void)
+{
+ av_register_input_format(&daud_iformat);
+ return 0;
+}
+
--
GitLab