# HG changeset patch
# User reimar
# Date 1125688739 0
# Node ID f5a33919749aafb00f38274fdbe77ac9f057286c
# Parent  fd1c2109505e62db9d74528b7567e2ebc03e2006
Support D-Cinema audio demuxing.

diff -r fd1c2109505e -r f5a33919749a Makefile
--- a/Makefile	Fri Sep 02 19:16:48 2005 +0000
+++ b/Makefile	Fri Sep 02 19:18:59 2005 +0000
@@ -17,7 +17,7 @@
       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 -r fd1c2109505e -r f5a33919749a allformats.c
--- a/allformats.c	Fri Sep 02 19:16:48 2005 +0000
+++ b/allformats.c	Fri Sep 02 19:18:59 2005 +0000
@@ -109,6 +109,7 @@
     sol_init();
     ea_init();
     nsvdec_init();
+    daud_init();
 
 #ifdef CONFIG_ENCODERS
     /* image formats */
diff -r fd1c2109505e -r f5a33919749a avformat.h
--- a/avformat.h	Fri Sep 02 19:16:48 2005 +0000
+++ b/avformat.h	Fri Sep 02 19:18:59 2005 +0000
@@ -546,6 +546,9 @@
 /* nsvdec.c */
 int nsvdec_init(void);
 
+/* daud.c */
+int daud_init(void);
+
 #include "rtp.h"
 
 #include "rtsp.h"
diff -r fd1c2109505e -r f5a33919749a daud.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/daud.c	Fri Sep 02 19:18:59 2005 +0000
@@ -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;
+}
+