From 280452a604103dbc1088bbeebaf533fdc4bc8eba Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Wed, 25 Jan 2023 19:16:03 +0100 Subject: [PATCH 2/2] avformat: add XMD demuxer Signed-off-by: Paul B Mahol --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/xmd.c | 80 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 libavformat/xmd.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 9052b023a7..89dbde9454 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -622,6 +622,7 @@ OBJS-$(CONFIG_WVE_DEMUXER) += wvedec.o pcm.o OBJS-$(CONFIG_WV_MUXER) += wvenc.o wv.o apetag.o img2.o OBJS-$(CONFIG_XA_DEMUXER) += xa.o OBJS-$(CONFIG_XBIN_DEMUXER) += bintext.o sauce.o +OBJS-$(CONFIG_XMD_DEMUXER) += xmd.o OBJS-$(CONFIG_XMV_DEMUXER) += xmv.o OBJS-$(CONFIG_XVAG_DEMUXER) += xvag.o OBJS-$(CONFIG_XWMA_DEMUXER) += xwma.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 7c01c7f098..b5a3d909bd 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -502,6 +502,7 @@ extern const AVInputFormat ff_wv_demuxer; extern const AVOutputFormat ff_wv_muxer; extern const AVInputFormat ff_xa_demuxer; extern const AVInputFormat ff_xbin_demuxer; +extern const AVInputFormat ff_xmd_demuxer; extern const AVInputFormat ff_xmv_demuxer; extern const AVInputFormat ff_xvag_demuxer; extern const AVInputFormat ff_xwma_demuxer; diff --git a/libavformat/xmd.c b/libavformat/xmd.c new file mode 100644 index 0000000000..3dd80f4fde --- /dev/null +++ b/libavformat/xmd.c @@ -0,0 +1,80 @@ +/* + * XMD demuxer + * Copyright (c) 2023 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 "libavutil/intreadwrite.h" +#include "avformat.h" +#include "demux.h" +#include "internal.h" +#include "pcm.h" + +static int xmd_probe(const AVProbeData *p) +{ + if ((AV_RL32(p->buf) & 0xFFFFFF) != MKTAG('x','m','d',0)) + return 0; + if (p->buf[3] == 0 || + AV_RL16(p->buf+4) == 0 || + AV_RL32(p->buf+6) == 0) + return 0; + + return AVPROBE_SCORE_MAX / 3; +} + +static int xmd_read_header(AVFormatContext *s) +{ + AVIOContext *pb = s->pb; + AVCodecParameters *par; + int channels; + AVStream *st; + + avio_skip(pb, 3); + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + par = st->codecpar; + par->codec_type = AVMEDIA_TYPE_AUDIO; + par->codec_id = AV_CODEC_ID_ADPCM_XMD; + channels = avio_r8(pb); + if (channels == 0) + return AVERROR_INVALIDDATA; + av_channel_layout_default(&par->ch_layout, channels); + par->sample_rate = avio_rl16(pb); + if (par->sample_rate <= 0) + return AVERROR_INVALIDDATA; + par->block_align = 21 * channels; + st->duration = (avio_rl32(pb) / par->block_align) * 32LL; + avpriv_set_pts_info(st, 64, 1, par->sample_rate); + avio_skip(pb, 7); + + return 0; +} + +const AVInputFormat ff_xmd_demuxer = { + .name = "xmd", + .long_name = NULL_IF_CONFIG_SMALL("Konami XMD"), + .read_probe = xmd_probe, + .read_header = xmd_read_header, + .read_packet = ff_pcm_read_packet, + .flags = AVFMT_GENERIC_INDEX, + .extensions = "xmd", +}; -- 2.39.1