From patchwork Sat Feb 1 04:12:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 17638 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 5290E44AF23 for ; Sat, 1 Feb 2020 06:12:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 29AE968A659; Sat, 1 Feb 2020 06:12:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D1A6D68A659 for ; Sat, 1 Feb 2020 06:12:41 +0200 (EET) Date: Sat, 01 Feb 2020 04:12:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1580530360; bh=46E49OtEuD6uBasJGomo5U9L1pTCekJvpPPZ5AahiBw=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References: Feedback-ID:From; b=JmKamy8Yk391fOe0OcFDzv96jY9UayTahlWTZBYeaONYEwjqiHl4JB8vT0MqjwWhm qdjWbowJSKHzTGOoUFfiBHELqfHK5Mm28eL18yMtl9T7ynMwVX1FtTZgjqAGTuPHvY TgV7E01ktK1GrcGYHP68w9YuoOJ8Kw9ZQtsWpncY= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200201041220.9571-2-zane@zanevaniperen.com> In-Reply-To: <20200201041220.9571-1-zane@zanevaniperen.com> References: <20200201041220.9571-1-zane@zanevaniperen.com> Feedback-ID: xylLYHwBzJW7F28tHN-oL9EBm6h5yqtCqG6YwPpJ2oMwBYJT6-HxTnFTF6p18axLiSywX61iUfj4CElBGg8-GA==:Ext:ProtonMail MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH 1/2] avcodec: add decoder for Simon & Schuster Interactive's ADPCM variant 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 Cc: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Adds support for the ADPCM variant used by some Simon & Schuster Interactive games such as Real War, and Real War: Rogue States. Signed-off-by: Zane van Iperen --- libavcodec/Makefile | 1 + libavcodec/adpcm.c | 10 ++++++++++ libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 +++++++ libavcodec/version.h | 2 +- 6 files changed, 21 insertions(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a2fbb910a0..9072e5c7e6 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -844,6 +844,7 @@ OBJS-$(CONFIG_ADPCM_IMA_OKI_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_QT_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_QT_ENCODER) += adpcmenc.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_RAD_DECODER) += adpcm.o adpcm_data.o +OBJS-$(CONFIG_ADPCM_IMA_SSI_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_WAV_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_WAV_ENCODER) += adpcmenc.o adpcm_data.o diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index dad3da28d3..5ca6ad2760 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -13,6 +13,7 @@ * MAXIS EA ADPCM decoder by Robert Marston (rmarston@gmail.com) * THP ADPCM decoder by Marco Gerards (mgerards@xs4all.nl) * Argonaut Games ADPCM decoder by Zane van Iperen (zane@zanevaniperen.com) + * Simon & Schuster Interactive ADPCM decoder by Zane van Iperen (zane@zanevaniperen.com) * * This file is part of FFmpeg. * @@ -608,6 +609,7 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, case AV_CODEC_ID_ADPCM_IMA_WS: case AV_CODEC_ID_ADPCM_YAMAHA: case AV_CODEC_ID_ADPCM_AICA: + case AV_CODEC_ID_ADPCM_IMA_SSI: nb_samples = buf_size * 2 / ch; break; } @@ -1160,6 +1162,13 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, *samples++ = adpcm_ima_expand_nibble(&c->status[st], v & 0x0F, 3); } break; + case AV_CODEC_ID_ADPCM_IMA_SSI: + while (bytestream2_get_bytes_left(&gb) > 0) { + int v = bytestream2_get_byteu(&gb); + *samples++ = adpcm_ima_qt_expand_nibble(&c->status[0], v >> 4 , 3); + *samples++ = adpcm_ima_qt_expand_nibble(&c->status[st], v & 0x0F, 3); + } + break; case AV_CODEC_ID_ADPCM_IMA_OKI: while (bytestream2_get_bytes_left(&gb) > 0) { int v = bytestream2_get_byteu(&gb); @@ -1910,6 +1919,7 @@ ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_ISS, sample_fmts_s16, adpcm_ima_iss, ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_OKI, sample_fmts_s16, adpcm_ima_oki, "ADPCM IMA Dialogic OKI"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_QT, sample_fmts_s16p, adpcm_ima_qt, "ADPCM IMA QuickTime"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_RAD, sample_fmts_s16, adpcm_ima_rad, "ADPCM IMA Radical"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_SSI, sample_fmts_s16, adpcm_ima_ssi, "ADPCM IMA Simon & Schuster Interactive"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_SMJPEG, sample_fmts_s16, adpcm_ima_smjpeg, "ADPCM IMA Loki SDL MJPEG"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_WAV, sample_fmts_s16p, adpcm_ima_wav, "ADPCM IMA WAV"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_WS, sample_fmts_both, adpcm_ima_ws, "ADPCM IMA Westwood"); diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 01a083d06b..0ad3338f9a 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -609,6 +609,7 @@ extern AVCodec ff_adpcm_ima_oki_decoder; extern AVCodec ff_adpcm_ima_qt_encoder; extern AVCodec ff_adpcm_ima_qt_decoder; extern AVCodec ff_adpcm_ima_rad_decoder; +extern AVCodec ff_adpcm_ima_ssi_decoder; extern AVCodec ff_adpcm_ima_smjpeg_decoder; extern AVCodec ff_adpcm_ima_wav_encoder; extern AVCodec ff_adpcm_ima_wav_decoder; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0e7ca1db4d..77eb890549 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -546,6 +546,7 @@ enum AVCodecID { AV_CODEC_ID_ADPCM_MTAF, AV_CODEC_ID_ADPCM_AGM, AV_CODEC_ID_ADPCM_ARGO, + AV_CODEC_ID_ADPCM_IMA_SSI, /* AMR */ AV_CODEC_ID_AMR_NB = 0x12000, diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 32f573d58c..621a87cf34 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2304,6 +2304,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("ADPCM Argonaut Games"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_ADPCM_IMA_SSI, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_ssi", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Simon & Schuster Interactive"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, /* AMR */ { diff --git a/libavcodec/version.h b/libavcodec/version.h index 2fba26e8d0..4511556f41 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 67 +#define LIBAVCODEC_VERSION_MINOR 68 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ From patchwork Sat Feb 1 04:12:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 17640 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 4FE3144AF23 for ; Sat, 1 Feb 2020 06:12:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3C23868A8AA; Sat, 1 Feb 2020 06:12:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.protonmail.ch (mail1.protonmail.ch [185.70.40.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4CF1968A764 for ; Sat, 1 Feb 2020 06:12:45 +0200 (EET) Date: Sat, 01 Feb 2020 04:12:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1580530364; bh=+T1QS/AnWIY/qRK1TB8SKOuZqMm7ddTtus4WNVHdEcE=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References: Feedback-ID:From; b=U3CfMj+nsgK9J8ezsq6xWe/QIyYZ/Tq4mTBrH9bMNUyyNUjMTqngQBqUexiFGuG/t SC6t1mCJafDP+hRrMEF2Y9khMHrE/w+/76JtozE7uF9W+MA2wiOS+ItcRQfmvKjgoe dSTIyyemgj0BWaJ6r1rDkZAKYZXs+FVRxFTf85P8= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200201041220.9571-3-zane@zanevaniperen.com> In-Reply-To: <20200201041220.9571-1-zane@zanevaniperen.com> References: <20200201041220.9571-1-zane@zanevaniperen.com> Feedback-ID: xylLYHwBzJW7F28tHN-oL9EBm6h5yqtCqG6YwPpJ2oMwBYJT6-HxTnFTF6p18axLiSywX61iUfj4CElBGg8-GA==:Ext:ProtonMail MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH 2/2] avformat: add demuxer for Simon & Schuster Interactive's VAG format 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 Cc: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Adds support for the custom VAG container used by some Simon & Schuster Interactive games such as Real War, and Real War: Rogue States. Signed-off-by: Zane van Iperen --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/kvag.c | 149 +++++++++++++++++++++++++++++++++++++++ libavformat/version.h | 2 +- 4 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 libavformat/kvag.c diff --git a/libavformat/Makefile b/libavformat/Makefile index ba6ea8c4a6..710cc4d088 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -279,6 +279,7 @@ OBJS-$(CONFIG_JACOSUB_DEMUXER) += jacosubdec.o subtitles.o OBJS-$(CONFIG_JACOSUB_MUXER) += jacosubenc.o rawenc.o OBJS-$(CONFIG_JV_DEMUXER) += jvdec.o OBJS-$(CONFIG_KUX_DEMUXER) += flvdec.o +OBJS-$(CONFIG_KVAG_DEMUXER) += kvag.o OBJS-$(CONFIG_LATM_MUXER) += latmenc.o rawenc.o OBJS-$(CONFIG_LMLM4_DEMUXER) += lmlm4.o OBJS-$(CONFIG_LOAS_DEMUXER) += loasdec.o rawdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index fe74a32e47..3ea4100e85 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -214,6 +214,7 @@ extern AVInputFormat ff_jacosub_demuxer; extern AVOutputFormat ff_jacosub_muxer; extern AVInputFormat ff_jv_demuxer; extern AVInputFormat ff_kux_demuxer; +extern AVInputFormat ff_kvag_demuxer; extern AVOutputFormat ff_latm_muxer; extern AVInputFormat ff_lmlm4_demuxer; extern AVInputFormat ff_loas_demuxer; diff --git a/libavformat/kvag.c b/libavformat/kvag.c new file mode 100644 index 0000000000..fb58701fd7 --- /dev/null +++ b/libavformat/kvag.c @@ -0,0 +1,149 @@ +/* + * Simon & Schuster Interactive VAG demuxer + * + * Copyright (C) 2020 Zane van Iperen (zane@zanevaniperen.com) + * + * 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" +#include "libavutil/intreadwrite.h" + +#define KVAG_TAG MKTAG('K', 'V', 'A', 'G') +#define KVAG_HEADER_SIZE 14 + +typedef struct KVAGHeader { + uint32_t magic; + uint32_t data_size; + uint32_t sample_rate; + uint32_t stereo; +} KVAGHeader; + +typedef struct KVAGDemuxContext { + KVAGHeader hdr; + uint32_t samples_per_frame; + uint32_t bytes_read; +} KVAGDemuxContext; + +static int kvag_probe(const AVProbeData *p) +{ + if (AV_RL32(p->buf) != KVAG_TAG) + return 0; + + return AVPROBE_SCORE_EXTENSION + 1; +} + +static int kvag_read_header(AVFormatContext *s) +{ + int64_t ret; + AVIOContext *pb = s->pb; + AVStream *st; + KVAGDemuxContext *kvag = s->priv_data; + + uint8_t buf[KVAG_HEADER_SIZE]; + + if (!(st = avformat_new_stream(s, NULL))) + return AVERROR(ENOMEM); + + if ((ret = avio_read(pb, buf, KVAG_HEADER_SIZE)) < 0) + return ret; + else if (ret != KVAG_HEADER_SIZE) + return AVERROR(EIO); + + kvag->hdr.magic = AV_RL32(buf + 0); + kvag->hdr.data_size = AV_RL32(buf + 4); + kvag->hdr.sample_rate = AV_RL32(buf + 8); + kvag->hdr.stereo = AV_RL16(buf + 12); + + + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_id = AV_CODEC_ID_ADPCM_IMA_SSI; + st->codecpar->format = AV_SAMPLE_FMT_S16; + + if (kvag->hdr.stereo) { + st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + st->codecpar->channels = 2; + } else { + st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + st->codecpar->channels = 1; + } + + st->codecpar->sample_rate = kvag->hdr.sample_rate; + st->codecpar->bits_per_coded_sample = 4; + st->codecpar->bits_per_raw_sample = 16; + + /* + * The game doesn't use "frames", it just reads the whole file. + * 32 seems like a good number. + */ + st->codecpar->frame_size = 32; + st->codecpar->block_align = st->codecpar->frame_size; + st->codecpar->bit_rate = st->codecpar->channels * + st->codecpar->sample_rate * + st->codecpar->bits_per_coded_sample; + + avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); + st->start_time = 0; + st->nb_frames = ROUNDED_DIV(kvag->hdr.data_size, st->codecpar->frame_size); + + kvag->samples_per_frame = st->codecpar->frame_size * + (8 / st->codecpar->bits_per_coded_sample) / + st->codecpar->channels; + + st->duration = st->nb_frames * kvag->samples_per_frame; + return 0; +} + +static int kvag_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + int ret; + AVStream *st = s->streams[0]; + KVAGDemuxContext *kvag = s->priv_data; + + if (kvag->bytes_read >= kvag->hdr.data_size) { + return AVERROR_EOF; + } + + if ((ret = av_get_packet(s->pb, pkt, st->codecpar->frame_size)) < 0) { + return ret; + } else if (ret < st->codecpar->frame_size) { + if (!avio_feof(s->pb)) { + return AVERROR_INVALIDDATA; + } + + /* + * In some files, the actual size is less than the data size. The game + * just overreads the buffer. A truncated final "frame" is fine. + */ + pkt->flags &= ~AV_PKT_FLAG_CORRUPT; + } + + pkt->stream_index = st->index; + pkt->duration = kvag->samples_per_frame; + + kvag->bytes_read += ret; + return 0; +} + +AVInputFormat ff_kvag_demuxer = { + .name = "kvag", + .long_name = NULL_IF_CONFIG_SMALL("Simon & Schuster Interactive VAG"), + .priv_data_size = sizeof(KVAGDemuxContext), + .read_probe = kvag_probe, + .read_header = kvag_read_header, + .read_packet = kvag_read_packet +}; diff --git a/libavformat/version.h b/libavformat/version.h index 15fdb73e3e..be22abc010 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 -#define LIBAVFORMAT_VERSION_MINOR 37 +#define LIBAVFORMAT_VERSION_MINOR 38 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \