From 56a3a3f01ca5dd4e894729a4e4561601aa0f605c Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sun, 3 Apr 2016 12:10:09 +0200 Subject: avformat: add musx demuxer Signed-off-by: Paul B Mahol --- Changelog | 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/musx.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++ libavformat/version.h | 4 +- 5 files changed, 182 insertions(+), 2 deletions(-) create mode 100644 libavformat/musx.c diff --git a/Changelog b/Changelog index fa9d018fb0..fa4edd4a1d 100644 --- a/Changelog +++ b/Changelog @@ -19,6 +19,7 @@ version : - libdcadec removed - bitstream filter for extracting DTS core - ADPCM IMA DAT4 decoder +- musx demuxer version 3.0: - Common Encryption (CENC) MP4 encoding and decoding support diff --git a/libavformat/Makefile b/libavformat/Makefile index a54e6cbd1b..0b8388d57e 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -296,6 +296,7 @@ OBJS-$(CONFIG_MSF_DEMUXER) += msf.o OBJS-$(CONFIG_MPSUB_DEMUXER) += mpsubdec.o subtitles.o OBJS-$(CONFIG_MSNWC_TCP_DEMUXER) += msnwc_tcp.o OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o +OBJS-$(CONFIG_MUSX_DEMUXER) += musx.o OBJS-$(CONFIG_MV_DEMUXER) += mvdec.o OBJS-$(CONFIG_MVI_DEMUXER) += mvi.o OBJS-$(CONFIG_MXF_DEMUXER) += mxfdec.o mxf.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 94f258d2ea..1d6402f028 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -207,6 +207,7 @@ void av_register_all(void) REGISTER_DEMUXER (MSF, msf); REGISTER_DEMUXER (MSNWC_TCP, msnwc_tcp); REGISTER_DEMUXER (MTV, mtv); + REGISTER_DEMUXER (MUSX, musx); REGISTER_DEMUXER (MV, mv); REGISTER_DEMUXER (MVI, mvi); REGISTER_MUXDEMUX(MXF, mxf); diff --git a/libavformat/musx.c b/libavformat/musx.c new file mode 100644 index 0000000000..ca43254028 --- /dev/null +++ b/libavformat/musx.c @@ -0,0 +1,177 @@ +/* + * MUSX demuxer + * Copyright (c) 2016 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 "avformat.h" +#include "internal.h" + +static int musx_probe(AVProbeData *p) +{ + if (memcmp(p->buf, "MUSX", 4)) + return 0; + + return AVPROBE_SCORE_MAX / 5 * 2; +} + +static int musx_read_header(AVFormatContext *s) +{ + unsigned type, version, coding, offset; + AVStream *st; + + avio_skip(s->pb, 8); + version = avio_rl32(s->pb); + if (version != 10 && + version != 6 && + version != 5 && + version != 4 && + version != 201) { + avpriv_request_sample(s, "Unsupported version: %d", version); + return AVERROR_PATCHWELCOME; + } + avio_skip(s->pb, 4); + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + if (version == 201) { + avio_skip(s->pb, 8); + offset = avio_rl32(s->pb); + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codec->codec_id = AV_CODEC_ID_ADPCM_PSX; + st->codec->channels = 2; + st->codec->sample_rate = 32000; + st->codec->block_align = 0x80 * st->codec->channels; + } else if (version == 10) { + type = avio_rl32(s->pb); + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + offset = 0x800; + switch (type) { + case MKTAG('P', 'S', '3', '_'): + st->codec->channels = 2; + st->codec->sample_rate = 44100; + avio_skip(s->pb, 44); + coding = avio_rl32(s->pb); + if (coding == MKTAG('D', 'A', 'T', '4') || + coding == MKTAG('D', 'A', 'T', '8')) { + avio_skip(s->pb, 4); + st->codec->channels = avio_rl32(s->pb); + if (st->codec->channels <= 0 || + st->codec->channels > INT_MAX / 0x20) + return AVERROR_INVALIDDATA; + st->codec->sample_rate = avio_rl32(s->pb); + } + st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_DAT4; + st->codec->block_align = 0x20 * st->codec->channels; + break; + case MKTAG('W', 'I', 'I', '_'): + avio_skip(s->pb, 44); + coding = avio_rl32(s->pb); + if (coding != MKTAG('D', 'A', 'T', '4') && + coding != MKTAG('D', 'A', 'T', '8')) { + avpriv_request_sample(s, "Unsupported coding: %X", coding); + return AVERROR_PATCHWELCOME; + } + avio_skip(s->pb, 4); + st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_DAT4; + st->codec->channels = avio_rl32(s->pb); + if (st->codec->channels <= 0 || + st->codec->channels > INT_MAX / 0x20) + return AVERROR_INVALIDDATA; + st->codec->sample_rate = avio_rl32(s->pb); + st->codec->block_align = 0x20 * st->codec->channels; + break; + case MKTAG('X', 'E', '_', '_'): + st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_DAT4; + st->codec->channels = 2; + st->codec->sample_rate = 32000; + st->codec->block_align = 0x20 * st->codec->channels; + break; + case MKTAG('P', 'S', 'P', '_'): + st->codec->codec_id = AV_CODEC_ID_ADPCM_PSX; + st->codec->channels = 2; + st->codec->sample_rate = 32768; + st->codec->block_align = 0x80 * st->codec->channels; + break; + case MKTAG('P', 'S', '2', '_'): + st->codec->codec_id = AV_CODEC_ID_ADPCM_PSX; + st->codec->channels = 2; + st->codec->sample_rate = 32000; + st->codec->block_align = 0x80 * st->codec->channels; + break; + default: + avpriv_request_sample(s, "Unsupported type: %X", type); + return AVERROR_PATCHWELCOME; + } + } else if (version == 6 || version == 5 || version == 4) { + type = avio_rl32(s->pb); + avio_skip(s->pb, 20); + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codec->channels = 2; + switch (type) { + case MKTAG('G', 'C', '_', '_'): + st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_DAT4; + st->codec->block_align = 0x20 * st->codec->channels; + st->codec->sample_rate = 32000; + offset = avio_rb32(s->pb); + break; + case MKTAG('P', 'S', '2', '_'): + st->codec->codec_id = AV_CODEC_ID_ADPCM_PSX; + st->codec->block_align = 0x80 * st->codec->channels; + st->codec->sample_rate = 32000; + offset = avio_rl32(s->pb); + break; + case MKTAG('X', 'B', '_', '_'): + st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_DAT4; + st->codec->block_align = 0x20 * st->codec->channels; + st->codec->sample_rate = 44100; + offset = avio_rl32(s->pb); + break; + default: + avpriv_request_sample(s, "Unsupported type: %X", type); + return AVERROR_PATCHWELCOME; + } + } else { + av_assert0(0); + } + + avio_seek(s->pb, offset, SEEK_SET); + + avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); + + return 0; +} + +static int musx_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + AVCodecContext *codec = s->streams[0]->codec; + + return av_get_packet(s->pb, pkt, codec->block_align); +} + +AVInputFormat ff_musx_demuxer = { + .name = "musx", + .long_name = NULL_IF_CONFIG_SMALL("Eurocom MUSX"), + .read_probe = musx_probe, + .read_header = musx_read_header, + .read_packet = musx_read_packet, + .extensions = "musx", +}; diff --git a/libavformat/version.h b/libavformat/version.h index 42ab8f5cc4..99d7638917 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,8 +30,8 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 29 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MINOR 30 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ -- cgit v1.2.3