From patchwork Fri Sep 11 10:23:59 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: 22286 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 12D1044BD14 for ; Fri, 11 Sep 2020 13:24:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EAFE268BA47; Fri, 11 Sep 2020 13:24:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1275068B9D7 for ; Fri, 11 Sep 2020 13:24:08 +0300 (EEST) Received: by mail-ed1-f68.google.com with SMTP id a12so9356628eds.13 for ; Fri, 11 Sep 2020 03:24:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=+xWTCOjv7omvcv8FY/W0ROMRri/Gk8DQ/MDnw6IYTJA=; b=HgC569ut0aaaJHibCab05C0EeMz8SGoMDU2T1j1Gl3Hbilb7qk3hSsnE0U1aPFPCK9 qz6u/uXCsVxj4iU6fZsPURGFnVrATa43pBdD835OmPTb9GTcjLLzqr1GQpOgwtmzPg3f y6aGxYrYOxlcRspLhE9INDmKgGbWXCyf/Zyp3BcqxxKxw/5aRKZGYnEn6liGsJkrn9Vs YRjQKmlS0DaZ7O5JIRTKW5sqtTkK/hXwAYetZ5nHwu8gOM0xhsVCOiqssKQui6TaS69m /6vlxV9V1SvF6x/jFanq+j1nF6wqBPCFaIIt30h8ak0zfLBFnZeAGdwTYvqCoB3WRXzO gOiw== 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; bh=+xWTCOjv7omvcv8FY/W0ROMRri/Gk8DQ/MDnw6IYTJA=; b=HnIBtlHwofT/JSYjVSWwTEP1GQYOqawdCjDoRjSv27SNFEcLmD8XlPqLXip7sRQrVb BySVuhuh0de/kQDj3pQ9ZuhfHZg1LP2wqXv9ra8dkP98aZehOgQPbPgiLLRh+zz9Va7p /s8/OXMYaCWaxe0dNThjJl/S84YopPid43YGeZfwfjoIOrXxUvROGK9/NBjrKobbO0uz 6XN1jacsP2lZx8Ks2J68CKfwh3+sniuyf1Hq/wWwMP6HccISDT5vvruV2eBuEZOM7GZL n/Swa9/G+zG+b2CBL2nW2gXbq/6QVTyLFcvWzDYEvdQU+7l4fILn9Yix/ttnA+i7q3Aj oeRg== X-Gm-Message-State: AOAM533YzHgfQ6tily6QoL3cGsOkxAozBZ7ERQT3kvRYjSaUfnOyNA3h KRSKE+xiOS+RDqVgzaJT9FaMVqhg5xusCA== X-Google-Smtp-Source: ABdhPJzyYuakOiU6Wl6gqWakSV/Z/FwT5GvmFzt236gSkc38FJZv7NsqlGbeaLSAqLx8B7uJmQMVew== X-Received: by 2002:a05:6402:2d9:: with SMTP id b25mr1215459edx.131.1599819847132; Fri, 11 Sep 2020 03:24:07 -0700 (PDT) Received: from localhost.localdomain ([94.250.162.52]) by smtp.gmail.com with ESMTPSA id k8sm1240300ejz.60.2020.09.11.03.24.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2020 03:24:06 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Sep 2020 12:23:59 +0200 Message-Id: <20200911102359.8991-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avformat: add Square SVS 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/svs.c | 96 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+) create mode 100644 libavformat/svs.c diff --git a/libavformat/Makefile b/libavformat/Makefile index a1a2a7e0e1..5ce1e6464d 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -519,6 +519,7 @@ OBJS-$(CONFIG_SUBVIEWER_DEMUXER) += subviewerdec.o subtitles.o OBJS-$(CONFIG_SUP_DEMUXER) += supdec.o OBJS-$(CONFIG_SUP_MUXER) += supenc.o OBJS-$(CONFIG_SVAG_DEMUXER) += svag.o +OBJS-$(CONFIG_SVS_DEMUXER) += svs.o OBJS-$(CONFIG_SWF_DEMUXER) += swfdec.o swf.o OBJS-$(CONFIG_SWF_MUXER) += swfenc.o swf.o OBJS-$(CONFIG_TAK_DEMUXER) += takdec.o apetag.o img2.o rawdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 97e9be4269..82838e3c53 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -416,6 +416,7 @@ extern AVInputFormat ff_subviewer_demuxer; extern AVInputFormat ff_sup_demuxer; extern AVOutputFormat ff_sup_muxer; extern AVInputFormat ff_svag_demuxer; +extern AVInputFormat ff_svs_demuxer; extern AVInputFormat ff_swf_demuxer; extern AVOutputFormat ff_swf_muxer; extern AVInputFormat ff_tak_demuxer; diff --git a/libavformat/svs.c b/libavformat/svs.c new file mode 100644 index 0000000000..ed4c5f1287 --- /dev/null +++ b/libavformat/svs.c @@ -0,0 +1,96 @@ +/* + * SVS 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/channel_layout.h" +#include "libavutil/intreadwrite.h" +#include "avformat.h" +#include "internal.h" + +static int svs_probe(const AVProbeData *p) +{ + if (p->buf_size < 32) + return 0; + + if (memcmp(p->buf, "SVS\00", 4)) + return 0; + + if (AV_RL32(p->buf + 16) == 0) + return 0; + + return AVPROBE_SCORE_MAX / 3; +} + +static int svs_read_header(AVFormatContext *s) +{ + AVStream *st; + uint32_t pitch; + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + avio_skip(s->pb, 16); + pitch = avio_rl32(s->pb); + avio_skip(s->pb, 12); + + s->internal->data_offset = avio_tell(s->pb); + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; + st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + st->codecpar->channels = 2; + st->codecpar->sample_rate = av_rescale_rnd(pitch, 48000, 4096, AV_ROUND_INF); + st->codecpar->block_align = 32; + st->start_time = 0; + if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) + st->duration = av_get_audio_frame_duration2(st->codecpar, + avio_size(s->pb) - 32); + + avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); + + return 0; +} + +static int svs_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + int ret; + + if (avio_feof(s->pb)) + return AVERROR_EOF; + + ret = av_get_packet(s->pb, pkt, 32); + if (ret != 32) { + if (ret < 0) + return ret; + av_shrink_packet(pkt, ret); + } + pkt->stream_index = 0; + + return ret; +} + +AVInputFormat ff_svs_demuxer = { + .name = "svs", + .long_name = NULL_IF_CONFIG_SMALL("Square SVS"), + .read_probe = svs_probe, + .read_header = svs_read_header, + .read_packet = svs_read_packet, + .extensions = "svs", +};