avformat: add ads demuxer

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

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 6b6515c..c6d135c 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -66,6 +66,7 @@ OBJS-$(CONFIG_AC3_MUXER)                 += rawenc.o
 OBJS-$(CONFIG_ACT_DEMUXER)               += act.o
 OBJS-$(CONFIG_ADF_DEMUXER)               += bintext.o sauce.o
 OBJS-$(CONFIG_ADP_DEMUXER)               += adp.o
+OBJS-$(CONFIG_ADS_DEMUXER)               += ads.o
 OBJS-$(CONFIG_ADX_DEMUXER)               += adxdec.o
 OBJS-$(CONFIG_ADX_MUXER)                 += rawenc.o
 OBJS-$(CONFIG_ADTS_MUXER)                += adtsenc.o apetag.o img2.o \

diff --git a/libavformat/ads.c b/libavformat/ads.c
new file mode 100644 (file)
index 0000000..94f6428
--- /dev/null
+++ b/libavformat/ads.c
@@ -0,0 +1,89 @@
+/*
+ * ADS/SS2 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/channel_layout.h"
+#include "avformat.h"
+#include "internal.h"
+
+static int ads_probe(AVProbeData *p)
+{
+    if (memcmp(p->buf, "SShd", 4) ||
+        memcmp(p->buf+32, "SSbd", 4))
+        return 0;
+
+    return AVPROBE_SCORE_MAX / 3 * 2;
+}
+
+static int ads_read_header(AVFormatContext *s)
+{
+    int align, codec, size;
+    AVStream *st;
+
+    st = avformat_new_stream(s, NULL);
+    if (!st)
+        return AVERROR(ENOMEM);
+
+    avio_skip(s->pb, 8);
+    st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
+    codec                  = avio_rl32(s->pb);
+    st->codec->sample_rate = avio_rl32(s->pb);
+    if (st->codec->sample_rate <= 0)
+        return AVERROR_INVALIDDATA;
+    st->codec->channels    = avio_rl32(s->pb);
+    if (st->codec->channels <= 0)
+        return AVERROR_INVALIDDATA;
+    align                  = avio_rl32(s->pb);
+    if (align <= 0 || align > INT_MAX / st->codec->channels)
+        return AVERROR_INVALIDDATA;
+
+    if (codec == 1)
+        st->codec->codec_id = AV_CODEC_ID_PCM_S16LE_PLANAR;
+    else
+        st->codec->codec_id = AV_CODEC_ID_ADPCM_PSX;
+
+    st->codec->block_align = st->codec->channels * align;
+    avio_skip(s->pb, 12);
+    size = avio_rl32(s->pb);
+    if (st->codec->codec_id == AV_CODEC_ID_ADPCM_PSX)
+        st->duration = (size - 0x40) / 16 / st->codec->channels * 28;
+    avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
+
+    return 0;
+}
+
+static int ads_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    AVCodecContext *codec = s->streams[0]->codec;
+    int ret;
+
+    ret = av_get_packet(s->pb, pkt, codec->block_align);
+    pkt->stream_index = 0;
+    return ret;
+}
+
+AVInputFormat ff_ads_demuxer = {
+    .name           = "ads",
+    .long_name      = NULL_IF_CONFIG_SMALL("Sony ADS"),
+    .read_probe     = ads_probe,
+    .read_header    = ads_read_header,
+    .read_packet    = ads_read_packet,
+    .extensions     = "ads,ss2",
+};

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index ddac08e..302ced8 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -66,6 +66,7 @@ void av_register_all(void)
     REGISTER_DEMUXER (ACT,              act);
     REGISTER_DEMUXER (ADF,              adf);
     REGISTER_DEMUXER (ADP,              adp);
+    REGISTER_DEMUXER (ADS,              ads);
     REGISTER_MUXER   (ADTS,             adts);
     REGISTER_MUXDEMUX(ADX,              adx);
     REGISTER_DEMUXER (AEA,              aea);

diff --git a/libavformat/version.h b/libavformat/version.h
index f5bc032..4a36c4a 100644 (file)
--- 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   6
+#define LIBAVFORMAT_VERSION_MINOR   7
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \