Hi,
patch attached.
From b0617ee2686f903a2e98cf19243a39f4fa97ef3d Mon Sep 17 00:00:00 2001
From: Paul B Mahol <one...@gmail.com>
Date: Sun, 3 Apr 2016 12:10:09 +0200
Subject: [PATCH 2/2] avformat: add musx demuxer
Signed-off-by: Paul B Mahol <one...@gmail.com>
---
libavformat/Makefile | 1 +
libavformat/allformats.c | 1 +
libavformat/musx.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 99 insertions(+)
create mode 100644 libavformat/musx.c
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 05ea090..a3f8eb1 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -297,6 +297,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 504a557..d673132 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -208,6 +208,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 0000000..8a56b9e
--- /dev/null
+++ b/libavformat/musx.c
@@ -0,0 +1,97 @@
+/*
+ * 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 "avformat.h"
+#include "internal.h"
+
+static int musx_probe(AVProbeData *p)
+{
+ if (memcmp(p->buf, "MUSX", 4))
+ return 0;
+
+ return AVPROBE_SCORE_MAX;
+}
+
+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) {
+ 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);
+
+ type = avio_rl32(s->pb);
+ switch (type) {
+ 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_type = AVMEDIA_TYPE_AUDIO;
+ 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;
+ offset = 0x800;
+ break;
+ default:
+ avpriv_request_sample(s, "Unsupported type: %X", type);
+ return AVERROR_PATCHWELCOME;
+ }
+
+ 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("MUSX"),
+ .read_probe = musx_probe,
+ .read_header = musx_read_header,
+ .read_packet = musx_read_packet,
+ .extensions = "musx",
+};
--
2.5.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
