# HG changeset patch
# User pross
# Date 1217835307 0
# Node ID 0dd9806a26ea107366b108d364ae8865c993f21e
# Parent  3a7f7509bf3c995f4f453999cf666d12c5becd10
Add D-Cinema audio muxer

diff -r 3a7f7509bf3c -r 0dd9806a26ea Makefile
--- a/Makefile	Sun Aug 03 21:24:30 2008 +0000
+++ b/Makefile	Mon Aug 04 07:35:07 2008 +0000
@@ -33,6 +33,7 @@
 OBJS-$(CONFIG_C93_DEMUXER)               += c93.o vocdec.o voc.o
 OBJS-$(CONFIG_CRC_MUXER)                 += crcenc.o
 OBJS-$(CONFIG_DAUD_DEMUXER)              += daud.o
+OBJS-$(CONFIG_DAUD_MUXER)                += daud.o
 OBJS-$(CONFIG_DIRAC_DEMUXER)             += raw.o
 OBJS-$(CONFIG_DIRAC_MUXER)               += raw.o
 OBJS-$(CONFIG_DSICIN_DEMUXER)            += dsicin.o
diff -r 3a7f7509bf3c -r 0dd9806a26ea allformats.c
--- a/allformats.c	Sun Aug 03 21:24:30 2008 +0000
+++ b/allformats.c	Mon Aug 04 07:35:07 2008 +0000
@@ -68,7 +68,7 @@
     REGISTER_DEMUXER  (BFI, bfi);
     REGISTER_DEMUXER  (C93, c93);
     REGISTER_MUXER    (CRC, crc);
-    REGISTER_DEMUXER  (DAUD, daud);
+    REGISTER_MUXDEMUX (DAUD, daud);
     REGISTER_MUXDEMUX (DIRAC, dirac);
     REGISTER_DEMUXER  (DSICIN, dsicin);
     REGISTER_MUXDEMUX (DTS, dts);
diff -r 3a7f7509bf3c -r 0dd9806a26ea daud.c
--- a/daud.c	Sun Aug 03 21:24:30 2008 +0000
+++ b/daud.c	Mon Aug 04 07:35:07 2008 +0000
@@ -47,6 +47,24 @@
     return ret;
 }
 
+static int daud_write_header(struct AVFormatContext *s)
+{
+    AVCodecContext *codec = s->streams[0]->codec;
+    if (codec->channels!=6 || codec->sample_rate!=96000)
+        return -1;
+    return 0;
+}
+
+static int daud_write_packet(struct AVFormatContext *s, AVPacket *pkt)
+{
+    put_be16(s->pb, pkt->size);
+    put_be16(s->pb, 0x8010); // unknown
+    put_buffer(s->pb, pkt->data, pkt->size);
+    put_flush_packet(s->pb);
+    return 0;
+}
+
+#if CONFIG_DAUD_DEMUXER
 AVInputFormat daud_demuxer = {
     "daud",
     NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
@@ -58,3 +76,20 @@
     NULL,
     .extensions = "302",
 };
+#endif
+
+#ifdef CONFIG_DAUD_MUXER
+AVOutputFormat daud_muxer =
+{
+    "daud",
+    NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
+    NULL,
+    "302",
+    0,
+    CODEC_ID_PCM_S24DAUD,
+    CODEC_ID_NONE,
+    daud_write_header,
+    daud_write_packet,
+    .flags= AVFMT_NOTIMESTAMPS,
+};
+#endif