avformat: add acm demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>

6 files changed, 81 insertions, 1 deletions

diff --git a/Changelog b/Changelog
index c49e38323a..91955dabe2 100644
--- a/Changelog
+++ b/Changelog
@@ -29,6 +29,7 @@ version <next>:
 - vibrato filter
 - innoHeim/Rsupport Screen Capture Codec decoder
 - ADPCM AICA decoder
+- Interplay ACM demuxer and audio decoder
 
 
 version 2.8:
diff --git a/doc/general.texi b/doc/general.texi
index f647b81bf9..4d25224e37 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -242,6 +242,8 @@ library:
     @tab Multimedia format used in game Heart Of Darkness.
 @item Apple HTTP Live Streaming @tab   @tab X
 @item Artworx Data Format       @tab   @tab X
+@item Interplay ACM             @tab   @tab X
+    @tab Audio only format used in some Interplay games.
 @item ADP                       @tab   @tab X
     @tab Audio format used on the Nintendo Gamecube.
 @item AFC                       @tab   @tab X
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 27aefcb280..f2326dfb98 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -63,6 +63,7 @@ OBJS-$(CONFIG_AA_DEMUXER)                += aadec.o
 OBJS-$(CONFIG_AAC_DEMUXER)               += aacdec.o apetag.o img2.o rawdec.o
 OBJS-$(CONFIG_AC3_DEMUXER)               += ac3dec.o rawdec.o
 OBJS-$(CONFIG_AC3_MUXER)                 += rawenc.o
+OBJS-$(CONFIG_ACM_DEMUXER)               += acm.o rawdec.o
 OBJS-$(CONFIG_ACT_DEMUXER)               += act.o
 OBJS-$(CONFIG_ADF_DEMUXER)               += bintext.o sauce.o
 OBJS-$(CONFIG_ADP_DEMUXER)               += adp.o
diff --git a/libavformat/acm.c b/libavformat/acm.c
new file mode 100644
index 0000000000..afcafa8d7a
--- /dev/null
+++ b/libavformat/acm.c
@@ -0,0 +1,75 @@
+/*
+ * ACM demuxer
+ * Copyright (c) 2015 Paul B Mahol
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/intreadwrite.h"
+#include "avformat.h"
+#include "rawdec.h"
+#include "internal.h"
+
+static int acm_probe(AVProbeData *p)
+{
+    if (AV_RB32(p->buf) != 0x97280301)
+        return 0;
+
+    return AVPROBE_SCORE_MAX / 3 * 2;
+}
+
+static int acm_read_header(AVFormatContext *s)
+{
+    AVStream *st;
+    int ret;
+
+    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_INTERPLAY_ACM;
+
+    ff_alloc_extradata(st->codec, 14);
+    if (!st->codec->extradata)
+        return AVERROR(ENOMEM);
+    ret = avio_read(s->pb, st->codec->extradata, 14);
+    if (ret < 10)
+        return ret < 0 ? ret : AVERROR_EOF;
+
+    st->codec->channels    = AV_RL16(st->codec->extradata +  8);
+    st->codec->sample_rate = AV_RL16(st->codec->extradata + 10);
+    if (st->codec->channels <= 0 || st->codec->sample_rate <= 0)
+        return AVERROR_INVALIDDATA;
+    st->start_time         = 0;
+    st->duration           = AV_RL32(st->codec->extradata +  4) / st->codec->channels;
+    st->need_parsing       = AVSTREAM_PARSE_FULL_RAW;
+    avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
+
+    return 0;
+}
+
+AVInputFormat ff_acm_demuxer = {
+    .name           = "acm",
+    .long_name      = NULL_IF_CONFIG_SMALL("Interplay ACM"),
+    .read_probe     = acm_probe,
+    .read_header    = acm_read_header,
+    .read_packet    = ff_raw_read_partial_packet,
+    .flags          = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK | AVFMT_NOTIMESTAMPS,
+    .extensions     = "acm",
+    .raw_codec_id   = AV_CODEC_ID_INTERPLAY_ACM,
+};
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index fc42cb725e..92e321c353 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -63,6 +63,7 @@ void av_register_all(void)
     REGISTER_DEMUXER (AA,               aa);
     REGISTER_DEMUXER (AAC,              aac);
     REGISTER_MUXDEMUX(AC3,              ac3);
+    REGISTER_DEMUXER (ACM,              acm);
     REGISTER_DEMUXER (ACT,              act);
     REGISTER_DEMUXER (ADF,              adf);
     REGISTER_DEMUXER (ADP,              adp);
diff --git a/libavformat/version.h b/libavformat/version.h
index 45d9589ff3..4482360336 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,7 +30,7 @@
 #include "libavutil/version.h"
 
 #define LIBAVFORMAT_VERSION_MAJOR  57
-#define LIBAVFORMAT_VERSION_MINOR  13
+#define LIBAVFORMAT_VERSION_MINOR  14
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \