avformat: add WADY demuxer

5 files changed, 91 insertions, 2 deletions

diff --git a/Changelog b/Changelog
index c50ebf9951..9679abce14 100644
--- a/Changelog
+++ b/Changelog
@@ -29,7 +29,7 @@ version <next>:
 - corr video filter
 - adrc audio filter
 - afdelaysrc audio filter
-- WADY DPCM decoder
+- WADY DPCM decoder and demuxer
 
 
 version 5.1:
diff --git a/libavformat/Makefile b/libavformat/Makefile
index fa71ec12f7..2d11bcd7a3 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -597,6 +597,7 @@ OBJS-$(CONFIG_VPLAYER_DEMUXER)           += vplayerdec.o subtitles.o
 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_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 62262ae935..bf8afe2078 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -479,6 +479,7 @@ extern const AVInputFormat  ff_vplayer_demuxer;
 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_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 f5a7f579b3..3970ec5cdd 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
 
 #include "version_major.h"
 
-#define LIBAVFORMAT_VERSION_MINOR  35
+#define LIBAVFORMAT_VERSION_MINOR  36
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
diff --git a/libavformat/wady.c b/libavformat/wady.c
new file mode 100644
index 0000000000..bd9b64f514
--- /dev/null
+++ b/libavformat/wady.c
@@ -0,0 +1,87 @@
+/*
+ * WADY 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 "pcm.h"
+
+static int wady_probe(const AVProbeData *p)
+{
+    if (AV_RL32(p->buf) != MKTAG('W','A','D','Y'))
+        return 0;
+    if (p->buf[4] != 0 || p->buf[5] == 0 ||
+        AV_RL16(p->buf+6) == 0 ||
+        AV_RL32(p->buf+8) == 0)
+        return 0;
+
+    return AVPROBE_SCORE_MAX / 3 * 2;
+}
+
+static int wady_read_header(AVFormatContext *s)
+{
+    AVIOContext *pb = s->pb;
+    AVCodecParameters *par;
+    int channels, ret;
+    AVStream *st;
+
+    avio_skip(pb, 4);
+
+    st = avformat_new_stream(s, NULL);
+    if (!st)
+        return AVERROR(ENOMEM);
+
+    avio_skip(pb, 1);
+    par              = st->codecpar;
+    par->codec_type  = AVMEDIA_TYPE_AUDIO;
+    par->codec_id    = AV_CODEC_ID_WADY_DPCM;
+    par->format      = AV_SAMPLE_FMT_S16;
+    if ((ret = ff_get_extradata(s, par, pb, 1)) < 0)
+        return ret;
+    channels         = avio_rl16(pb);
+    if (channels == 0)
+        return AVERROR_INVALIDDATA;
+    av_channel_layout_default(&par->ch_layout, channels);
+    par->sample_rate = avio_rl32(pb);
+    if (par->sample_rate <= 0)
+        return AVERROR_INVALIDDATA;
+    avio_skip(pb, 4);
+    st->duration = avio_rl32(pb);
+    par->block_align = channels;
+    avpriv_set_pts_info(st, 64, 1, par->sample_rate);
+
+    avio_seek(pb, 0x30, SEEK_SET);
+
+    return 0;
+}
+
+const AVInputFormat ff_wady_demuxer = {
+    .name           = "wady",
+    .long_name      = NULL_IF_CONFIG_SMALL("Marble WADY"),
+    .read_probe     = wady_probe,
+    .read_header    = wady_read_header,
+    .read_packet    = ff_pcm_read_packet,
+    .read_seek      = ff_pcm_read_seek,
+    .flags          = AVFMT_GENERIC_INDEX,
+    .extensions     = "way",
+};