From patchwork Mon Jul 6 09:24:58 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: 20851 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp20267ybm; Mon, 6 Jul 2020 02:25:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxH1XZa0+64uX88erOZoHSb/GO0AF6sFMNWdY89DRqYCMeOMAY+SPrwcWYRtUUEUG1HFk3w X-Received: by 2002:a05:6000:1283:: with SMTP id f3mr48386290wrx.106.1594027519936; Mon, 06 Jul 2020 02:25:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594027519; cv=none; d=google.com; s=arc-20160816; b=lbbKSPhtje8wcDYPo6BghVPRX7iCeZYGeULXj5Rvlgypgm4/Uv+1NhfEFtVbPswHvd GXQHeY40Sh2vL56ANIng5+Le5oQNJJW+UpDco6hleR8mtwdbZRidg69cY5FMSBmYcLhg QUpY35RC5h/a1TmwLZ48IYDxVxA/e2ChCUPWAr52NUOxxe8pA5oLXswkjiGuz+CvjfpN /9htOpwItl+6dk3e6N6wpmQl2wZxhmgUSZ1EeiHpICAzCzK/rwkiI3efmCD1PxKBkFss JdkR6ZD+HluxtFE++Es0pMhW+f47DI+Qr6S35RzxoEF2M3NNpNJUBxjzb+vGBabkwJRS S5TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:from:to :dkim-signature:date:delivered-to; bh=yHhvqm+nAvtGJG62DJZxhk+qLq3HoaS1T4YR+5nQChs=; b=V6DbQzkjUd1MrxM6r4gzZuXW/7v2sgI9x6Dki/EOq38cpdThRM7X8AcUqVIMTX2hlv Mr8Dly3+XClmbHvYgcywTb0EiCrNgLKg9Lb+KPsmtpZoAQ0fWEdv9cIUaxG64zfnJUvT +yavOtMmFJwJ3I0xKV92sNY/Qaby1mI5APxokYsxkHrp9WNi+kwfeU6rATBfYPAHpU+C 3Rkk8jGXkqMkmaULsrmDV0WA1/ZFdHW2nf+njj4CSoBlUBl002AEm5xB9djmtttMapZN WJ/KD5o5MoWZf4zm7QzOBe/HpJy81JapB8cgyswf+k6uttFOk8GFyXala3kTRUPpgu/2 ikNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=protonmail header.b=XG681hgs; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z21si17129017wmk.173.2020.07.06.02.25.19; Mon, 06 Jul 2020 02:25:19 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=protonmail header.b=XG681hgs; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 060E468B453; Mon, 6 Jul 2020 12:25:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40131.protonmail.ch (mail-40131.protonmail.ch [185.70.40.131]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4CD5E6899C9 for ; Mon, 6 Jul 2020 12:25:02 +0300 (EEST) Date: Mon, 06 Jul 2020 09:24:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1594027501; bh=XD9kvxW0Gvp4YmBRhVF2iLOq97RsjKFpO7h+D4OXgYo=; h=Date:To:From:Cc:Reply-To:Subject:From; b=XG681hgsYr/MQLRAuCwu3v6l84u3KUn6oMu3wAdsBYUuE5gLkZIMo2ATCWQ42s70i pD0BuVcGnGdnBUOinwxJ+vEQs+ixX0uxEkLw8O/hzlY0RFazdGG+9FtgPbodpTXJi+ A6NZQYZTB+wBk5IXw6hoVeWssA50q3tVlK4/o0Tg= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200706092347.102557-5-zane@zanevaniperen.com> 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=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH v5 4/6] avformat: add apm muxer 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" X-TUID: 0vZNoLAlsVUi Content-Length: 9014 Signed-off-by: Zane van Iperen --- Changelog | 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/apm.c | 110 ++++++++++++++++++++++++++++++++++++++- libavformat/version.h | 2 +- 5 files changed, 112 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index e986327172..d905e5dc45 100644 --- a/Changelog +++ b/Changelog @@ -6,6 +6,7 @@ version : - MacCaption demuxer - PGX decoder - ADPCM IMA Ubisoft APM encoder +- Rayman 2 APM muxer version 4.3: diff --git a/libavformat/Makefile b/libavformat/Makefile index a4113fe644..62d8cbb54e 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -94,6 +94,7 @@ OBJS-$(CONFIG_ANM_DEMUXER) += anm.o OBJS-$(CONFIG_APC_DEMUXER) += apc.o OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o img2.o OBJS-$(CONFIG_APM_DEMUXER) += apm.o +OBJS-$(CONFIG_APM_MUXER) += apm.o rawenc.o OBJS-$(CONFIG_APNG_DEMUXER) += apngdec.o OBJS-$(CONFIG_APNG_MUXER) += apngenc.o OBJS-$(CONFIG_APTX_DEMUXER) += aptxdec.o rawdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index f8527b1fd4..fd9e46e233 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -55,6 +55,7 @@ extern AVInputFormat ff_anm_demuxer; extern AVInputFormat ff_apc_demuxer; extern AVInputFormat ff_ape_demuxer; extern AVInputFormat ff_apm_demuxer; +extern AVOutputFormat ff_apm_muxer; extern AVInputFormat ff_apng_demuxer; extern AVOutputFormat ff_apng_muxer; extern AVInputFormat ff_aptx_demuxer; diff --git a/libavformat/apm.c b/libavformat/apm.c index 666cb97fd3..32558287f9 100644 --- a/libavformat/apm.c +++ b/libavformat/apm.c @@ -1,5 +1,5 @@ /* - * Rayman 2 APM Demuxer + * Rayman 2 APM (De)muxer * * Copyright (C) 2020 Zane van Iperen (zane@zanevaniperen.com) * @@ -21,6 +21,8 @@ */ #include "avformat.h" #include "internal.h" +#include "rawenc.h" +#include "libavutil/avassert.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" @@ -48,13 +50,14 @@ typedef struct APMExtraData { uint32_t magic; uint32_t file_size; uint32_t data_size; - uint32_t unk1; + int32_t unk1; uint32_t unk2; APMState state; uint32_t unk3[7]; uint32_t data; } APMExtraData; +#if CONFIG_APM_DEMUXER static void apm_parse_extradata(APMExtraData *ext, const uint8_t *buf) { ext->magic = AV_RL32(buf + 0); @@ -198,3 +201,106 @@ AVInputFormat ff_apm_demuxer = { .read_header = apm_read_header, .read_packet = apm_read_packet }; +#endif + +#if CONFIG_APM_MUXER +static int apm_write_init(AVFormatContext *s) +{ + AVCodecParameters *par; + + if (s->nb_streams != 1) { + av_log(s, AV_LOG_ERROR, "APM files have exactly one stream\n"); + return AVERROR(EINVAL); + } + + par = s->streams[0]->codecpar; + + if (par->codec_id != AV_CODEC_ID_ADPCM_IMA_APM) { + av_log(s, AV_LOG_ERROR, "%s codec not supported\n", + avcodec_get_name(par->codec_id)); + return AVERROR(EINVAL); + } + + if (par->channels > 2) { + av_log(s, AV_LOG_ERROR, "APM files only support up to 2 channels\n"); + return AVERROR(EINVAL); + } + + if (par->extradata_size != APM_EXTRADATA_SIZE) { + av_log(s, AV_LOG_ERROR, "Invalid/missing extradata\n"); + return AVERROR(EINVAL); + } + + if (!(s->pb->seekable & AVIO_SEEKABLE_NORMAL)) { + av_log(s, AV_LOG_ERROR, "Stream not seekable, unable to write output file\n"); + return AVERROR(EINVAL); + } + + return 0; +} + +static int apm_write_header(AVFormatContext *s) +{ + uint8_t buf[APM_FILE_EXTRADATA_SIZE] = { 0 }; + AVCodecParameters *par = s->streams[0]->codecpar; + + /* + * Bodge a WAVEFORMATEX manually, ff_put_wav_header() can't + * be used because of the extra 2 bytes. + */ + avio_wl16(s->pb, APM_TAG_CODEC); + avio_wl16(s->pb, par->channels); + avio_wl32(s->pb, par->sample_rate); + avio_wl32(s->pb, par->sample_rate * par->channels * 2); + avio_wl16(s->pb, par->block_align); + avio_wl16(s->pb, par->bits_per_coded_sample); + avio_wl16(s->pb, APM_FILE_EXTRADATA_SIZE); + + avio_wl16(s->pb, 0); /* pad */ + + /* + * Build the extradata. Assume the codec's given us correct data. + * File and data sizes are fixed later. + */ + AV_WL32(buf + 0, APM_TAG_VS12); /* magic */ + AV_WL32(buf + 12, -1); /* unk1, always seems to be -1 */ + memcpy( buf + 20, par->extradata, APM_EXTRADATA_SIZE); + AV_WL32(buf + 76, APM_TAG_DATA); /* data */ + + avio_write(s->pb, buf, APM_FILE_EXTRADATA_SIZE); + return 0; +} + +static int apm_write_trailer(AVFormatContext *s) +{ + int64_t file_size, data_size; + + file_size = avio_tell(s->pb); + data_size = file_size - (APM_FILE_HEADER_SIZE + 2 + APM_FILE_EXTRADATA_SIZE); + + if (file_size >= UINT32_MAX) { + av_log(s, AV_LOG_ERROR, + "Filesize %"PRId64" invalid for APM, output file will be broken\n", + file_size); + return AVERROR(ERANGE); + } + + avio_seek(s->pb, 24, SEEK_SET); + avio_wl32(s->pb, (uint32_t)file_size); + avio_wl32(s->pb, (uint32_t)data_size); + + return 0; +} + +AVOutputFormat ff_apm_muxer = { + .name = "apm", + .long_name = NULL_IF_CONFIG_SMALL("Ubisoft Rayman 2 APM"), + .extensions = "apm", + .audio_codec = AV_CODEC_ID_ADPCM_IMA_APM, + .video_codec = AV_CODEC_ID_NONE, + .init = apm_write_init, + .write_header = apm_write_header, + .write_packet = ff_raw_write_packet, + .write_trailer = apm_write_trailer +}; +#endif diff --git a/libavformat/version.h b/libavformat/version.h index 75c03fde0a..33cebed85e 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 48 +#define LIBAVFORMAT_VERSION_MINOR 49 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \