[SCM] libav/experimental: daud: split muxer and demuxer

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 0955e57ad07640574fc20ce0bea3c0b83982ada1
Author: Nidhi Makhijani <nidhimj22 at gmail.com>
Date:   Mon Jun 23 09:33:50 2014 +0530

    daud: split muxer and demuxer
    
    Signed-off-by: Diego Biurrun <diego at biurrun.de>

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 89d2d42..c2d77b3 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -90,8 +90,8 @@ OBJS-$(CONFIG_CAVSVIDEO_MUXER)           += rawenc.o
 OBJS-$(CONFIG_CDG_DEMUXER)               += cdg.o
 OBJS-$(CONFIG_CDXL_DEMUXER)              += cdxl.o
 OBJS-$(CONFIG_CRC_MUXER)                 += crcenc.o
-OBJS-$(CONFIG_DAUD_DEMUXER)              += daud.o
-OBJS-$(CONFIG_DAUD_MUXER)                += daud.o
+OBJS-$(CONFIG_DAUD_DEMUXER)              += dauddec.o
+OBJS-$(CONFIG_DAUD_MUXER)                += daudenc.o
 OBJS-$(CONFIG_DFA_DEMUXER)               += dfa.o
 OBJS-$(CONFIG_DIRAC_DEMUXER)             += diracdec.o rawdec.o
 OBJS-$(CONFIG_DIRAC_MUXER)               += rawenc.o
diff --git a/libavformat/daud.c b/libavformat/dauddec.c
similarity index 66%
copy from libavformat/daud.c
copy to libavformat/dauddec.c
index bb7ab7f..1855e84 100644
--- a/libavformat/daud.c
+++ b/libavformat/dauddec.c
@@ -50,28 +50,6 @@ 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)
-{
-    if (pkt->size > 65535) {
-        av_log(s, AV_LOG_ERROR,
-               "Packet size too large for s302m. (%d > 65535)\n", pkt->size);
-        return -1;
-    }
-    avio_wb16(s->pb, pkt->size);
-    avio_wb16(s->pb, 0x8010); // unknown
-    avio_write(s->pb, pkt->data, pkt->size);
-    return 0;
-}
-
-#if CONFIG_DAUD_DEMUXER
 AVInputFormat ff_daud_demuxer = {
     .name           = "daud",
     .long_name      = NULL_IF_CONFIG_SMALL("D-Cinema audio"),
@@ -79,17 +57,3 @@ AVInputFormat ff_daud_demuxer = {
     .read_packet    = daud_packet,
     .extensions     = "302",
 };
-#endif
-
-#if CONFIG_DAUD_MUXER
-AVOutputFormat ff_daud_muxer = {
-    .name         = "daud",
-    .long_name    = NULL_IF_CONFIG_SMALL("D-Cinema audio"),
-    .extensions   = "302",
-    .audio_codec  = AV_CODEC_ID_PCM_S24DAUD,
-    .video_codec  = AV_CODEC_ID_NONE,
-    .write_header = daud_write_header,
-    .write_packet = daud_write_packet,
-    .flags        = AVFMT_NOTIMESTAMPS,
-};
-#endif
diff --git a/libavformat/daud.c b/libavformat/daudenc.c
similarity index 59%
rename from libavformat/daud.c
rename to libavformat/daudenc.c
index bb7ab7f..416e895 100644
--- a/libavformat/daud.c
+++ b/libavformat/daudenc.c
@@ -1,5 +1,5 @@
 /*
- * D-Cinema audio demuxer
+ * D-Cinema audio muxer
  * Copyright (c) 2005 Reimar Döffinger
  *
  * This file is part of Libav.
@@ -19,37 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/channel_layout.h"
 #include "avformat.h"
 
-static int daud_header(AVFormatContext *s) {
-    AVStream *st = avformat_new_stream(s, NULL);
-    if (!st)
-        return AVERROR(ENOMEM);
-    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-    st->codec->codec_id = AV_CODEC_ID_PCM_S24DAUD;
-    st->codec->codec_tag = MKTAG('d', 'a', 'u', 'd');
-    st->codec->channels = 6;
-    st->codec->channel_layout = AV_CH_LAYOUT_5POINT1;
-    st->codec->sample_rate = 96000;
-    st->codec->bit_rate = 3 * 6 * 96000 * 8;
-    st->codec->block_align = 3 * 6;
-    st->codec->bits_per_coded_sample = 24;
-    return 0;
-}
-
-static int daud_packet(AVFormatContext *s, AVPacket *pkt) {
-    AVIOContext *pb = s->pb;
-    int ret, size;
-    if (pb->eof_reached)
-        return AVERROR(EIO);
-    size = avio_rb16(pb);
-    avio_rb16(pb); // unknown
-    ret = av_get_packet(pb, pkt, size);
-    pkt->stream_index = 0;
-    return ret;
-}
-
 static int daud_write_header(struct AVFormatContext *s)
 {
     AVCodecContext *codec = s->streams[0]->codec;
@@ -71,17 +42,6 @@ static int daud_write_packet(struct AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-#if CONFIG_DAUD_DEMUXER
-AVInputFormat ff_daud_demuxer = {
-    .name           = "daud",
-    .long_name      = NULL_IF_CONFIG_SMALL("D-Cinema audio"),
-    .read_header    = daud_header,
-    .read_packet    = daud_packet,
-    .extensions     = "302",
-};
-#endif
-
-#if CONFIG_DAUD_MUXER
 AVOutputFormat ff_daud_muxer = {
     .name         = "daud",
     .long_name    = NULL_IF_CONFIG_SMALL("D-Cinema audio"),
@@ -92,4 +52,3 @@ AVOutputFormat ff_daud_muxer = {
     .write_packet = daud_write_packet,
     .flags        = AVFMT_NOTIMESTAMPS,
 };
-#endif

-- 
Libav/FFmpeg packaging