avformat: add Square SVS demuxer

diff --git a/Changelog b/Changelog
index b058d912ea0a021e80e894b8b3105d49696368fe..f525dcaaae121f2f02884245fce0b59d3424ba75 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -23,6 +23,7 @@ version <next>:
 - PhotoCD decoder
 - MCA demuxer
 - AV1 decoder (Hardware acceleration used only)
+- SVS demuxer
 
 
 version 4.3:

diff --git a/libavformat/Makefile b/libavformat/Makefile
index a1a2a7e0e1a99aa2a66bbd873e3acc91d5ae41b0..5ce1e6464d5ef361fe552bbd1bccfb43012bcb1c 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -519,6 +519,7 @@ OBJS-$(CONFIG_SUBVIEWER_DEMUXER)         += subviewerdec.o subtitles.o
 OBJS-$(CONFIG_SUP_DEMUXER)               += supdec.o
 OBJS-$(CONFIG_SUP_MUXER)                 += supenc.o
 OBJS-$(CONFIG_SVAG_DEMUXER)              += svag.o
+OBJS-$(CONFIG_SVS_DEMUXER)               += svs.o
 OBJS-$(CONFIG_SWF_DEMUXER)               += swfdec.o swf.o
 OBJS-$(CONFIG_SWF_MUXER)                 += swfenc.o swf.o
 OBJS-$(CONFIG_TAK_DEMUXER)               += takdec.o apetag.o img2.o rawdec.o

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 97e9be42690ba4998f3a884dbd694118e475af17..82838e3c53d89ae8d1ae7d4790d4c6fb8b14c91a 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -416,6 +416,7 @@ extern AVInputFormat  ff_subviewer_demuxer;
 extern AVInputFormat  ff_sup_demuxer;
 extern AVOutputFormat ff_sup_muxer;
 extern AVInputFormat  ff_svag_demuxer;
+extern AVInputFormat  ff_svs_demuxer;
 extern AVInputFormat  ff_swf_demuxer;
 extern AVOutputFormat ff_swf_muxer;
 extern AVInputFormat  ff_tak_demuxer;

diff --git a/libavformat/svs.c b/libavformat/svs.c
new file mode 100644 (file)
index 0000000..d4285ed
--- /dev/null
+++ b/libavformat/svs.c
@@ -0,0 +1,97 @@
+/*
+ * SVS demuxer
+ * Copyright (c) 2020 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 "internal.h"
+
+static int svs_probe(const AVProbeData *p)
+{
+    if (p->buf_size < 32)
+        return 0;
+
+    if (memcmp(p->buf, "SVS\00", 4))
+        return 0;
+
+    if (AV_RL32(p->buf + 16) == 0)
+        return 0;
+
+    return AVPROBE_SCORE_MAX / 3;
+}
+
+static int svs_read_header(AVFormatContext *s)
+{
+    AVStream *st;
+    uint32_t pitch;
+
+    st = avformat_new_stream(s, NULL);
+    if (!st)
+        return AVERROR(ENOMEM);
+
+    avio_skip(s->pb, 16);
+    pitch = avio_rl32(s->pb);
+    avio_skip(s->pb, 12);
+
+    s->internal->data_offset     = avio_tell(s->pb);
+    st->codecpar->codec_type     = AVMEDIA_TYPE_AUDIO;
+    st->codecpar->codec_id       = AV_CODEC_ID_ADPCM_PSX;
+    st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO;
+    st->codecpar->channels       = 2;
+    st->codecpar->sample_rate    = av_rescale_rnd(pitch, 48000, 4096, AV_ROUND_INF);
+    st->codecpar->block_align    = 32;
+    st->start_time               = 0;
+    if (s->pb->seekable & AVIO_SEEKABLE_NORMAL)
+        st->duration = av_get_audio_frame_duration2(st->codecpar,
+                                                    avio_size(s->pb) - 32);
+
+    avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
+
+    return 0;
+}
+
+static int svs_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    int ret;
+
+    if (avio_feof(s->pb))
+        return AVERROR_EOF;
+
+    ret = av_get_packet(s->pb, pkt, 32 * 256);
+    if (ret != 32 * 256) {
+        if (ret < 0)
+            return ret;
+        av_shrink_packet(pkt, ret);
+        pkt->flags &= ~AV_PKT_FLAG_CORRUPT;
+    }
+    pkt->stream_index = 0;
+
+    return ret;
+}
+
+AVInputFormat ff_svs_demuxer = {
+    .name        = "svs",
+    .long_name   = NULL_IF_CONFIG_SMALL("Square SVS"),
+    .read_probe  = svs_probe,
+    .read_header = svs_read_header,
+    .read_packet = svs_read_packet,
+    .extensions  = "svs",
+};

diff --git a/libavformat/version.h b/libavformat/version.h
index 7771a6abf29b8f620c4d7f2d1520b8fd2e6e667d..ec3286e73aec8955d90d3d79d2e4599505f4f3e6 100644 (file)
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -32,7 +32,7 @@
 // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
 // Also please add any ticket numbers that you believe might be affected here
 #define LIBAVFORMAT_VERSION_MAJOR  58
-#define LIBAVFORMAT_VERSION_MINOR  54
+#define LIBAVFORMAT_VERSION_MINOR  55
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \