@@ -20,7 +20,7 @@ version <next>:

 - selectivecolor filter

 - extensive native AAC encoder improvements

 - ADPCM PSX decoder

-- 3dostr, dcstr, genh, vag, xvag, ads, msf, svag & vpk demuxer

+- 3dostr, dcstr, fsb, genh, vag, xvag, ads, msf, svag & vpk demuxer

 - zscale filter

 - wve demuxer

 - zero-copy Intel QSV transcoding in ffmpeg

@@ -170,6 +170,7 @@ OBJS-$(CONFIG_FOURXM_DEMUXER)            += 4xm.o

 OBJS-$(CONFIG_FRAMECRC_MUXER)            += framecrcenc.o framehash.o

 OBJS-$(CONFIG_FRAMEMD5_MUXER)            += md5enc.o framehash.o

 OBJS-$(CONFIG_FRM_DEMUXER)               += frmdec.o

+OBJS-$(CONFIG_FSB_DEMUXER)               += fsb.o

 OBJS-$(CONFIG_GIF_MUXER)                 += gif.o

 OBJS-$(CONFIG_GIF_DEMUXER)               += gifdec.o

 OBJS-$(CONFIG_GSM_DEMUXER)               += gsmdec.o

@@ -138,6 +138,7 @@ void av_register_all(void)

     REGISTER_MUXER   (FRAMECRC,         framecrc);

     REGISTER_MUXER   (FRAMEMD5,         framemd5);

     REGISTER_DEMUXER (FRM,              frm);

+    REGISTER_DEMUXER (FSB,              fsb);

     REGISTER_MUXDEMUX(G722,             g722);

     REGISTER_MUXDEMUX(G723_1,           g723_1);

     REGISTER_DEMUXER (G729,             g729);

new file mode 100644

@@ -0,0 +1,210 @@

+/*

+ * FSB 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/avassert.h"

+#include "libavutil/intreadwrite.h"

+#include "avformat.h"

+#include "avio.h"

+#include "internal.h"

+

+static int fsb_probe(AVProbeData *p)

+{

+    if (memcmp(p->buf, "FSB", 3) || p->buf[3] - '0' < 1 || p->buf[3] - '0' > 5)

+        return 0;

+    if (AV_RL32(p->buf + 4) != 1)

+        return 0;

+    return AVPROBE_SCORE_MAX;

+}

+

+static int fsb_read_header(AVFormatContext *s)

+{

+    AVIOContext *pb = s->pb;

+    unsigned format, version, c;

+    int64_t offset;

+    AVCodecContext *codec;

+    AVStream *st = avformat_new_stream(s, NULL);

+

+    avio_skip(pb, 3); // "FSB"

+    version = avio_r8(pb) - '0';

+    if (version != 4 && version != 3) {

+        avpriv_request_sample(s, "version %d", version);

+        return AVERROR_PATCHWELCOME;

+    }

+

+    avio_skip(pb, 4);

+

+    if (!st)

+        return AVERROR(ENOMEM);

+    codec = st->codec;

+    codec->codec_type  = AVMEDIA_TYPE_AUDIO;

+    codec->codec_tag   = 0;

+

+    if (version == 3) {

+        offset = avio_rl32(pb) + 0x18;

+        avio_skip(pb, 44);

+        st->duration = avio_rl32(pb);

+        avio_skip(pb, 12);

+        format = avio_rl32(pb);

+        codec->sample_rate = avio_rl32(pb);

+        if (codec->sample_rate <= 0)

+            return AVERROR_INVALIDDATA;

+        avio_skip(pb, 6);

+        codec->channels    = avio_rl16(pb);

+        if (!codec->channels)

+            return AVERROR_INVALIDDATA;

+

+        if (format & 0x00000100) {

+            codec->codec_id    = AV_CODEC_ID_PCM_S16LE;

+            codec->block_align = 4096 * codec->channels;

+        } else if (format & 0x00400000) {

+            codec->bits_per_coded_sample = 4;

+            codec->codec_id    = AV_CODEC_ID_ADPCM_IMA_WAV;

+            codec->block_align = 36 * codec->channels;

+        } else if (format & 0x00800000) {

+            codec->codec_id    = AV_CODEC_ID_ADPCM_PSX;

+            codec->block_align = 16 * codec->channels;

+        } else if (format & 0x02000000) {

+            codec->codec_id    = AV_CODEC_ID_ADPCM_THP;

+            codec->block_align = 8 * codec->channels;

+            if (codec->channels > INT_MAX / 32)

+                return AVERROR_INVALIDDATA;

+            ff_alloc_extradata(codec, 32 * codec->channels);

+            if (!codec->extradata)

+                return AVERROR(ENOMEM);

+            avio_seek(pb, 0x68, SEEK_SET);

+            for (c = 0; c < codec->channels; c++) {

+                avio_read(pb, codec->extradata + 32 * c, 32);

+                avio_skip(pb, 14);

+            }

+        } else {

+            avpriv_request_sample(s, "format 0x%X", format);

+            return AVERROR_PATCHWELCOME;

+        }

+    } else if (version == 4) {

+        offset = avio_rl32(pb) + 0x30;

+        avio_skip(pb, 80);

+        st->duration = avio_rl32(pb);

+

+        format = avio_rb32(pb);

+        switch(format) {

+        case 0x40001001:

+        case 0x00001005:

+        case 0x40001081:

+        case 0x40200001:

+            codec->codec_id = AV_CODEC_ID_XMA2;

+            break;

+        case 0x40000802:

+            codec->codec_id = AV_CODEC_ID_ADPCM_THP;

+            break;

+        default:

+            avpriv_request_sample(s, "format 0x%X", format);

+            return AVERROR_PATCHWELCOME;

+        }

+

+        codec->sample_rate = avio_rl32(pb);

+        if (codec->sample_rate <= 0)

+            return AVERROR_INVALIDDATA;

+        avio_skip(pb, 6);

+

+        codec->channels    = avio_rl16(pb);

+        if (!codec->channels)

+            return AVERROR_INVALIDDATA;

+

+        switch (codec->codec_id) {

+        case AV_CODEC_ID_XMA2:

+            ff_alloc_extradata(codec, 34);

+            if (!codec->extradata)

+                return AVERROR(ENOMEM);

+            memset(codec->extradata, 0, 34);

+            codec->block_align = 2048;

+            break;

+        case AV_CODEC_ID_ADPCM_THP:

+            if (codec->channels > INT_MAX / 32)

+                return AVERROR_INVALIDDATA;

+            ff_alloc_extradata(codec, 32 * codec->channels);

+            if (!codec->extradata)

+                return AVERROR(ENOMEM);

+            avio_seek(pb, 0x80, SEEK_SET);

+            for (c = 0; c < codec->channels; c++) {

+                avio_read(pb, codec->extradata + 32 * c, 32);

+                avio_skip(pb, 14);

+            }

+            codec->block_align = 8 * codec->channels;

+            break;

+        }

+    } else {

+        av_assert0(0);

+    }

+

+    avio_skip(pb, offset - avio_tell(pb));

+    s->internal->data_offset = avio_tell(pb);

+

+    avpriv_set_pts_info(st, 64, 1, codec->sample_rate);

+

+    return 0;

+}

+

+static int fsb_read_packet(AVFormatContext *s, AVPacket *pkt)

+{

+    AVCodecContext *codec = s->streams[0]->codec;

+    int64_t pos;

+    int ret;

+

+    if (avio_feof(s->pb))

+        return AVERROR_EOF;

+

+    pos = avio_tell(s->pb);

+    if (codec->codec_id == AV_CODEC_ID_ADPCM_THP &&

+               codec->channels > 1) {

+        int i, ch;

+

+        ret = av_new_packet(pkt, codec->block_align);

+        if (ret < 0)

+            return ret;

+        for (i = 0; i < 4; i++) {

+            for (ch = 0; ch < codec->channels; ch++) {

+                pkt->data[ch * 8 + i * 2 + 0] = avio_r8(s->pb);

+                pkt->data[ch * 8 + i * 2 + 1] = avio_r8(s->pb);

+            }

+        }

+        ret = 0;

+    } else {

+        ret = av_get_packet(s->pb, pkt, codec->block_align);

+    }

+

+    if (codec->codec_id == AV_CODEC_ID_XMA2 && pkt->size >= 1)

+        pkt->duration = (pkt->data[0] >> 2) * 512;

+

+    pkt->pos = pos;

+    pkt->stream_index = 0;

+

+    return ret;

+}

+

+AVInputFormat ff_fsb_demuxer = {

+    .name        = "fsb",

+    .long_name   = NULL_IF_CONFIG_SMALL("FMOD Sample Bank"),

+    .read_probe  = fsb_probe,

+    .read_header = fsb_read_header,

+    .read_packet = fsb_read_packet,

+    .extensions  = "fsb",

+    .flags       = AVFMT_GENERIC_INDEX,

+};

@@ -30,7 +30,7 @@

 #include "libavutil/version.h"

 #define LIBAVFORMAT_VERSION_MAJOR  57

-#define LIBAVFORMAT_VERSION_MINOR  17

+#define LIBAVFORMAT_VERSION_MINOR  18

 #define LIBAVFORMAT_VERSION_MICRO 100

 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \