avformat: add WavArc demuxer

6 files changed, 131 insertions, 2 deletions

diff --git a/Changelog b/Changelog
index 2d2206e1ba..7c3bd7f80c 100644
--- a/Changelog
+++ b/Changelog
@@ -37,7 +37,7 @@ version <next>:
 - XMD ADPCM decoder and demuxer
 - media100 to mjpegb bsf
 - ffmpeg CLI new option: -fix_sub_duration_heartbeat
-- WavArc decoder
+- WavArc decoder and demuxer
 
 
 version 5.1:
diff --git a/doc/general_contents.texi b/doc/general_contents.texi
index 84df3432cf..33f3c18c7a 100644
--- a/doc/general_contents.texi
+++ b/doc/general_contents.texi
@@ -707,6 +707,7 @@ library:
     @tab Audio format used in Sony PS games.
 @item Marble WADY               @tab   @tab X
 @item WAV                       @tab X @tab X
+@item Waveform Archiver         @tab   @tab X
 @item WavPack                   @tab X @tab X
 @item WebM                      @tab X @tab X
 @item Windows Televison (WTV)   @tab X @tab X
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 0bb9e8c19a..d68b78ce34 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -598,6 +598,7 @@ OBJS-$(CONFIG_VQF_DEMUXER)               += vqf.o
 OBJS-$(CONFIG_W64_DEMUXER)               += wavdec.o w64.o pcm.o
 OBJS-$(CONFIG_W64_MUXER)                 += wavenc.o w64.o
 OBJS-$(CONFIG_WADY_DEMUXER)              += wady.o pcm.o
+OBJS-$(CONFIG_WAVARC_DEMUXER)            += wavarc.o rawdec.o
 OBJS-$(CONFIG_WAV_DEMUXER)               += wavdec.o pcm.o
 OBJS-$(CONFIG_WAV_MUXER)                 += wavenc.o
 OBJS-$(CONFIG_WC3_DEMUXER)               += wc3movie.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 2d31956fd5..b5a3d909bd 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -480,6 +480,7 @@ extern const AVInputFormat  ff_vqf_demuxer;
 extern const AVInputFormat  ff_w64_demuxer;
 extern const AVOutputFormat ff_w64_muxer;
 extern const AVInputFormat  ff_wady_demuxer;
+extern const AVInputFormat  ff_wavarc_demuxer;
 extern const AVInputFormat  ff_wav_demuxer;
 extern const AVOutputFormat ff_wav_muxer;
 extern const AVInputFormat  ff_wc3_demuxer;
diff --git a/libavformat/version.h b/libavformat/version.h
index 789859fbe2..134cdb2b89 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
 
 #include "version_major.h"
 
-#define LIBAVFORMAT_VERSION_MINOR  37
+#define LIBAVFORMAT_VERSION_MINOR  38
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
diff --git a/libavformat/wavarc.c b/libavformat/wavarc.c
new file mode 100644
index 0000000000..41ee817a1e
--- /dev/null
+++ b/libavformat/wavarc.c
@@ -0,0 +1,126 @@
+/*
+ * WavArc demuxer
+ * Copyright (c) 2023 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/channel_layout.h"
+#include "libavutil/intreadwrite.h"
+#include "avformat.h"
+#include "demux.h"
+#include "internal.h"
+#include "rawdec.h"
+
+static int wavarc_probe(const AVProbeData *p)
+{
+    int len = p->buf[0];
+    uint32_t id;
+
+    if (len == 0 || len + 6 >= p->buf_size)
+        return 0;
+
+    if (p->buf[len + 1] != 0)
+        return 0;
+
+    id = AV_RL32(p->buf + len + 2);
+    if (id != MKTAG('1','D','I','F') &&
+        id != MKTAG('2','S','L','P') &&
+        id != MKTAG('3','N','L','P') &&
+        id != MKTAG('4','A','L','P') &&
+        id != MKTAG('5','E','L','P'))
+        return 0;
+
+    return AVPROBE_SCORE_MAX / 3 * 2;
+}
+
+static int wavarc_read_header(AVFormatContext *s)
+{
+    AVIOContext *pb = s->pb;
+    AVCodecParameters *par;
+    int filename_len, fmt_len, ret;
+    uint8_t data[36];
+    AVStream *st;
+    uint32_t id;
+
+    filename_len = avio_r8(pb);
+    if (filename_len == 0)
+        return AVERROR_INVALIDDATA;
+    avio_skip(pb, filename_len);
+    if (avio_r8(pb))
+        return AVERROR_INVALIDDATA;
+    id = avio_rl32(pb);
+    if (avio_read(pb, data, sizeof(data)) != sizeof(data))
+        return AVERROR(EIO);
+    fmt_len = AV_RL32(data + 32);
+    if (fmt_len < 12)
+        return AVERROR_INVALIDDATA;
+
+    st = avformat_new_stream(s, NULL);
+    if (!st)
+        return AVERROR(ENOMEM);
+    par = st->codecpar;
+
+    ret = ff_alloc_extradata(par, fmt_len + sizeof(data));
+    if (ret < 0)
+        return ret;
+    memcpy(par->extradata, data, sizeof(data));
+    avio_read(pb, par->extradata + sizeof(data), fmt_len);
+
+    par->codec_type = AVMEDIA_TYPE_AUDIO;
+    par->codec_id   = AV_CODEC_ID_WAVARC;
+    par->codec_tag  = id;
+
+    do {
+        id = avio_rl32(pb);
+        if (id != MKTAG('d','a','t','a'))
+            avio_skip(pb, avio_rl32(pb));
+    } while (id != MKTAG('d','a','t','a'));
+    avio_skip(pb, 4);
+
+    if (AV_RL32(par->extradata + 16) != MKTAG('R','I','F','F'))
+        return AVERROR_INVALIDDATA;
+    if (AV_RL32(par->extradata + 24) != MKTAG('W','A','V','E'))
+        return AVERROR_INVALIDDATA;
+    if (AV_RL32(par->extradata + 28) != MKTAG('f','m','t',' '))
+        return AVERROR_INVALIDDATA;
+
+    av_channel_layout_default(&par->ch_layout, AV_RL16(par->extradata + 38));
+    par->sample_rate = AV_RL32(par->extradata + 40);
+    avpriv_set_pts_info(st, 64, 1, par->sample_rate);
+    st->start_time = 0;
+
+    switch (par->extradata[36]) {
+    case 0: par->format = AV_SAMPLE_FMT_U8P;  break;
+    case 1: par->format = AV_SAMPLE_FMT_S16P; break;
+    }
+
+    return 0;
+}
+
+const AVInputFormat ff_wavarc_demuxer = {
+    .name           = "wavarc",
+    .long_name      = NULL_IF_CONFIG_SMALL("Waveform Archiver"),
+    .read_probe     = wavarc_probe,
+    .read_packet    = ff_raw_read_partial_packet,
+    .flags          = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK | AVFMT_NOTIMESTAMPS,
+    .read_header    = wavarc_read_header,
+    .extensions     = "wa",
+    .raw_codec_id   = AV_CODEC_ID_WAVARC,
+    .priv_data_size = sizeof(FFRawDemuxerContext),
+    .priv_class     = &ff_raw_demuxer_class,
+};