From patchwork Sun Mar 15 18:22:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 18203 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D750244B9E5 for ; Sun, 15 Mar 2020 20:22:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C35A768AEE4; Sun, 15 Mar 2020 20:22:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A59E689DC8 for ; Sun, 15 Mar 2020 20:22:33 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id 25so15255081wmk.3 for ; Sun, 15 Mar 2020 11:22:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=zf0SOEFT08l2beb8euvRRe85nee9eR0TSQ+Wx4EqHBQ=; b=vHV5a2z0AI3DYhC6RDXljfY5XbynIlWQXOLfS9G/el8GZ6GzOXWOCpy3YDDCphX8Ca z26pNS+HA2fmwpHHkUTt0MydGF8bStPAHNYo1jkE4kFyB+HAVkixAQMk2A6UjuD4KezP tId1RURoj7IQXTny3KazAMwMqTFtynjW4zQY8qKiMfRIUFTWvQGC8OUXPTz5x1YOIcdd MmVHI5pCUiBZhOFC/iVqlsg2B3qw4qDfOBoIiOyvMK6CcUlcWiyItHcjxhC6U2YrQNZ2 c9dhbzzsDzamHyWQijJev1n2bstz0PqOJr4HlBJUT4ZOYXo8lFa9EXfQ69tpWJI6gt/F jjRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=zf0SOEFT08l2beb8euvRRe85nee9eR0TSQ+Wx4EqHBQ=; b=JZ/1eV/uvZZ/GiEGYt4Y5FqANZu74bxoDcW61NcKnJie+rlQPHeAoaOe8BrBXxpcc1 xsG5uz2Hy/DFFXihO2Hp3M+LuuZcvl7adSmj3aVpk+gbjad9X9/JZZQ4EJFema/uK3jc qAra3NRSXreglRK//XFWipGXc+rFPbt+kpP3D3sTuoedqMk76rxmJpp8Cu+AThf4S3yB p0Il9utPoj95f8iLR54sCAO+0tjgD45jHRLd8WVHQYGsDDWnj9xot24mQaPhnvvSG3ee x3EZtvrGfBxLvH33GYNkJiOeocmfWBpO5SxHsGNkTfxzcD3UjGmmMMWzYcnP0sDUBAbO mTJg== X-Gm-Message-State: ANhLgQ0fpOA2DXExrRwtwGyUhr3vyFsXthoU/Q9AI6LmhjPVaE1dHADZ qYLojb0wOaPQwGNFuoyageOCwX7i X-Google-Smtp-Source: ADFU+vs+8wV6yWYDY940NuEgCOnux/tBIik/zVIsjLEWbtVHryHgA4WeuzQIvvafvYfEsIS1iiTzMQ== X-Received: by 2002:a1c:ba04:: with SMTP id k4mr9590705wmf.165.1584296552296; Sun, 15 Mar 2020 11:22:32 -0700 (PDT) Received: from localhost.localdomain ([37.244.255.176]) by smtp.gmail.com with ESMTPSA id b203sm27363164wmc.45.2020.03.15.11.22.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 11:22:31 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Mar 2020 19:22:01 +0100 Message-Id: <20200315182206.20851-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200315182206.20851-1-onemda@gmail.com> References: <20200315182206.20851-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/7] avformat: add fwse demuxer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/fwse.c | 88 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 libavformat/fwse.c diff --git a/libavformat/Makefile b/libavformat/Makefile index f84becd30a..cd3e9163f5 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -198,6 +198,7 @@ OBJS-$(CONFIG_FRAMEHASH_MUXER) += hashenc.o framehash.o OBJS-$(CONFIG_FRAMEMD5_MUXER) += hashenc.o framehash.o OBJS-$(CONFIG_FRM_DEMUXER) += frmdec.o OBJS-$(CONFIG_FSB_DEMUXER) += fsb.o +OBJS-$(CONFIG_FWSE_DEMUXER) += fwse.o OBJS-$(CONFIG_GIF_MUXER) += gif.o OBJS-$(CONFIG_GIF_DEMUXER) += gifdec.o OBJS-$(CONFIG_GSM_DEMUXER) += gsmdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 08012ea208..d275c1017b 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -156,6 +156,7 @@ extern AVOutputFormat ff_framehash_muxer; extern AVOutputFormat ff_framemd5_muxer; extern AVInputFormat ff_frm_demuxer; extern AVInputFormat ff_fsb_demuxer; +extern AVInputFormat ff_fwse_demuxer; extern AVInputFormat ff_g722_demuxer; extern AVOutputFormat ff_g722_muxer; extern AVInputFormat ff_g723_1_demuxer; diff --git a/libavformat/fwse.c b/libavformat/fwse.c new file mode 100644 index 0000000000..00e2e13b11 --- /dev/null +++ b/libavformat/fwse.c @@ -0,0 +1,88 @@ +/* + * FWSE demuxer + * Copyright (c) 2020 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/intreadwrite.h" +#include "avformat.h" +#include "internal.h" +#include "pcm.h" + +static int fwse_probe(const AVProbeData *p) +{ + if (AV_RL32(p->buf) != MKTAG('F','W','S','E')) + return 0; + if (AV_RL32(p->buf+4) != 2 && AV_RL32(p->buf+4) != 3) + return 0; + if (AV_RL32(p->buf+16) != 1 && AV_RL32(p->buf+16) != 2) + return 0; + + return AVPROBE_SCORE_MAX / 4 * 3; +} + +static int fwse_read_header(AVFormatContext *s) +{ + unsigned start_offset, version; + AVIOContext *pb = s->pb; + AVCodecParameters *par; + AVStream *st; + + avio_skip(pb, 4); + version = avio_rl32(pb); + if (version != 2 && version != 3) + return AVERROR_INVALIDDATA; + avio_skip(pb, 4); + start_offset = avio_rl32(pb); + + 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_IMA_MTF; + par->format = AV_SAMPLE_FMT_S16; + par->channels = avio_rl32(pb); + if (par->channels != 1 && par->channels != 2) + return AVERROR_INVALIDDATA; + if (par->channels == 1) + par->channel_layout = AV_CH_LAYOUT_MONO; + else if (par->channels == 2) + par->channel_layout = AV_CH_LAYOUT_STEREO; + st->duration = avio_rl32(pb); + par->sample_rate = avio_rl32(pb); + if (par->sample_rate <= 0 || par->sample_rate > INT_MAX) + return AVERROR_INVALIDDATA; + + par->block_align = 1; + avio_skip(pb, start_offset - avio_tell(pb)); + + avpriv_set_pts_info(st, 64, 1, par->sample_rate); + + return 0; +} + +AVInputFormat ff_fwse_demuxer = { + .name = "fwse", + .long_name = NULL_IF_CONFIG_SMALL("Capcom's MT Framework sound"), + .read_probe = fwse_probe, + .read_header = fwse_read_header, + .read_packet = ff_pcm_read_packet, + .extensions = "fwse", +};