Signed-off-by: Paul B Mahol <one...@gmail.com>
---
libavformat/Makefile | 1 +
libavformat/allformats.c | 1 +
libavformat/msf.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 90 insertions(+)
create mode 100644 libavformat/msf.c
diff --git a/libavformat/Makefile b/libavformat/Makefile
index ded2d54..7886b05 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -280,6 +280,7 @@ OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += mpegvideodec.o
rawdec.o
OBJS-$(CONFIG_MPJPEG_DEMUXER) += mpjpegdec.o
OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o
OBJS-$(CONFIG_MPL2_DEMUXER) += mpl2dec.o subtitles.o
+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
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 40fea8e..f238118 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -206,6 +206,7 @@ void av_register_all(void)
REGISTER_MUXDEMUX(MPJPEG, mpjpeg);
REGISTER_DEMUXER (MPL2, mpl2);
REGISTER_DEMUXER (MPSUB, mpsub);
+ REGISTER_DEMUXER (MSF, msf);
REGISTER_DEMUXER (MSNWC_TCP, msnwc_tcp);
REGISTER_DEMUXER (MTV, mtv);
REGISTER_DEMUXER (MV, mv);
diff --git a/libavformat/msf.c b/libavformat/msf.c
new file mode 100644
index 0000000..292ae3c
--- /dev/null
+++ b/libavformat/msf.c
@@ -0,0 +1,88 @@
+/*
+ * MSF 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 "avformat.h"
+#include "internal.h"
+
+static int msf_probe(AVProbeData *p)
+{
+ if (memcmp(p->buf, "MSF", 3))
+ return 0;
+
+ return AVPROBE_SCORE_MAX;
+}
+
+static int msf_read_header(AVFormatContext *s)
+{
+ unsigned codec, align, size;
+ AVStream *st;
+
+ avio_skip(s->pb, 4);
+
+ st = avformat_new_stream(s, NULL);
+ if (!st)
+ return AVERROR(ENOMEM);
+
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ codec = avio_rb32(s->pb);
+ st->codec->channels = avio_rb32(s->pb);
+ if (st->codec->channels <= 0)
+ return AVERROR_INVALIDDATA;
+ size = avio_rb32(s->pb);
+ st->codec->sample_rate = avio_rb32(s->pb);
+ if (st->codec->sample_rate <= 0)
+ return AVERROR_INVALIDDATA;
+ align = avio_rb32(s->pb) ;
+ if (align > INT_MAX / st->codec->channels)
+ return AVERROR_INVALIDDATA;
+ st->codec->block_align = align;
+ st->duration = av_get_audio_frame_duration(st->codec, size);
+ switch (codec) {
+ case 0: st->codec->codec_id = AV_CODEC_ID_PCM_S16BE; break;
+ case 3: st->codec->block_align = 16 * st->codec->channels;
+ st->codec->codec_id = AV_CODEC_ID_ADPCM_PSX; break;
+ case 7: st->need_parsing = AVSTREAM_PARSE_FULL_RAW;
+ st->codec->codec_id = AV_CODEC_ID_MP3; break;
+ default:
+ avpriv_request_sample(s, "Codec %d", codec);
+ return AVERROR_PATCHWELCOME;
+ }
+ avio_skip(s->pb, 0x40 - avio_tell(s->pb));
+ avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
+
+ return 0;
+}
+
+static int msf_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ AVCodecContext *codec = s->streams[0]->codec;
+
+ return av_get_packet(s->pb, pkt, codec->block_align ? codec->block_align :
1024 * codec->channels);
+}
+
+AVInputFormat ff_msf_demuxer = {
+ .name = "msf",
+ .long_name = NULL_IF_CONFIG_SMALL("MSF"),
+ .read_probe = msf_probe,
+ .read_header = msf_read_header,
+ .read_packet = msf_read_packet,
+ .extensions = "msf",
+};
--
1.9.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
