[SCM] libav/experimental: Add D-Cinema audio muxer

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 51c3861e1663a1e4e9ea465176e68d82e98cc6e9
Author: Peter Ross <pross at xvid.org>
Date:   Mon Aug 4 07:35:07 2008 +0000

    Add D-Cinema audio muxer
    
    Originally committed as revision 14531 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Changelog b/Changelog
index 0adba1f..fb422e1 100644
--- a/Changelog
+++ b/Changelog
@@ -127,6 +127,7 @@ version <next>
 - Motion Pixels Video decoder
 - Motion Pixels MVI demuxer
 - removed animated GIF decoder/demuxer
+- D-Cinema audio muxer
 
 version 0.4.9-pre1:
 
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 2d681a7..8c62a36 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -33,6 +33,7 @@ OBJS-$(CONFIG_BFI_DEMUXER)               += bfi.o
 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 --git a/libavformat/allformats.c b/libavformat/allformats.c
index 6441ca9..eab3a92 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -68,7 +68,7 @@ void av_register_all(void)
     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 --git a/libavformat/daud.c b/libavformat/daud.c
index 5f04e7a..c0626df 100644
--- a/libavformat/daud.c
+++ b/libavformat/daud.c
@@ -47,6 +47,24 @@ static int daud_packet(AVFormatContext *s, AVPacket *pkt) {
     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 @@ AVInputFormat daud_demuxer = {
     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

-- 
Libav/FFmpeg packaging