From patchwork Tue Dec 26 15:52:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Tomas_H=C3=A4rdin?= X-Patchwork-Id: 45326 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp3111279pzh; Tue, 26 Dec 2023 07:52:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IFMOK31+vzwS0Zs6jm0mAhDVX80iENd0l2h08rvSFgFycJdP+0j47KuUcXbBnZbIXiTec6u X-Received: by 2002:a17:906:5305:b0:a27:37b8:2809 with SMTP id h5-20020a170906530500b00a2737b82809mr157203ejo.8.1703605978518; Tue, 26 Dec 2023 07:52:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703605978; cv=none; d=google.com; s=arc-20160816; b=01bma5vTpb8W6qK1LIllOICeA30iLxF2IkwiS0hhse6MpQ8LNRHLUABmzauyem3HdL ZPw1JTX1R5rR6t7RKzmTQeakpgGnXIaa85oiG7Hl4KUSXP06YwsWxpipQNqK+mvOSmHT BNoQk5sJ3Yxdk1HtWv29wFV7JBi+Q18l5gd71qWRU0OxvN//mtTNAmYGNiDnvAXXWQQS bu8rA7pRxKLjplbtvpAB/CK13Os6EcpgAhYJMWzlqCF9Cj3oIPr3ORrEctlvqvh1S8JV K5B/pG5pNLBm6NHhL9vGq3eWVvT07v7wrqYD3cFbjQglJ4kt3DWW69Xk1IeKzYBaOIQ3 3bLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:user-agent:references:in-reply-to:date:to:from :message-id:delivered-to; bh=9usCxtkp8ouWn/TR+hS7X6m2Jtc4LyzJG/z9wHoZxBw=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=A90R11x9J+WEmTLc1/MXh+gDqCB6eDjTqSBHL/S5PbAigyOQh8rB/GB/OUJ6x7EGei laTZgZxu4OxytX/PinHooPsQ306s5P9acieg1w4misstZssWggmt4FU6TgdUM/5OWaSo IgnWaaWzE5OQgaL5b0vL3nAGUFiAKOuP2odEffvrfp9YxstmqKcrdmYif7N4nwWZ2cab DHBbz/oQnMp3iPr5NFYyBBOslubYhAOwcldwcY8OHudq8BJRA97JBrUVoGZxRYIJmPP6 DehUrGGIdkCgGAQeB/355nTd+YjnsLo9/k+ywKOSksOVPqTCi6a8hhN4a5oEUoBTDUN9 74ig== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r11-20020a170906a20b00b00a26e21e4afbsi2591507ejy.118.2023.12.26.07.52.57; Tue, 26 Dec 2023 07:52:58 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 869D868CCC5; Tue, 26 Dec 2023 17:52:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from glom.nmugroup.com (glom.nmugroup.com [193.183.80.6]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EACE568CC6C for ; Tue, 26 Dec 2023 17:52:48 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by glom.nmugroup.com (Postfix) with ESMTP id 8CEF85422287 for ; Tue, 26 Dec 2023 16:52:48 +0100 (CET) Received: from [192.168.1.110] (81-226-156-116-no2430.tbcn.telia.com [81.226.156.116]) (Authenticated sender: git01) by glom.nmugroup.com (Postfix) with ESMTPSA id 5C0ED542138B for ; Tue, 26 Dec 2023 16:52:48 +0100 (CET) Message-ID: From: Tomas =?iso-8859-1?q?H=E4rdin?= To: FFmpeg development discussions and patches Date: Tue, 26 Dec 2023 16:52:47 +0100 In-Reply-To: References: User-Agent: Evolution 3.46.4-2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/6] Add CRYO APC muxer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ByPSZXrZJAY5 From 14f3dd40a49ebf5ea020465732511e9d79a2e14a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= Date: Tue, 26 Dec 2023 14:32:10 +0100 Subject: [PATCH 3/6] Add CRYO APC muxer --- Changelog | 1 + doc/general_contents.texi | 2 +- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/apcenc.c | 125 ++++++++++++++++++++++++++++++++++++++ libavformat/version.h | 2 +- 6 files changed, 130 insertions(+), 2 deletions(-) create mode 100644 libavformat/apcenc.c diff --git a/Changelog b/Changelog index ca38546262..344bf4d1cf 100644 --- a/Changelog +++ b/Changelog @@ -3,6 +3,7 @@ releases are sorted from youngest to oldest. version : - LEAD MCMP decoder +- CRYO APC muxer version 6.1: - libaribcaption decoder diff --git a/doc/general_contents.texi b/doc/general_contents.texi index 3328753acb..a43736e3a8 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -448,7 +448,7 @@ library: @item CRC testing format @tab X @tab @item Creative Voice @tab X @tab X @tab Created for the Sound Blaster Pro. -@item CRYO APC @tab @tab X +@item CRYO APC @tab X @tab X @tab Audio format used in some games by CRYO Interactive Entertainment. @item D-Cinema audio @tab X @tab X @item Deluxe Paint Animation @tab @tab X diff --git a/libavformat/Makefile b/libavformat/Makefile index 329055ccfd..d88a65d713 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -105,6 +105,7 @@ OBJS-$(CONFIG_AMV_MUXER) += amvenc.o OBJS-$(CONFIG_ANM_DEMUXER) += anm.o OBJS-$(CONFIG_APAC_DEMUXER) += apac.o rawdec.o OBJS-$(CONFIG_APC_DEMUXER) += apc.o +OBJS-$(CONFIG_APC_MUXER) += apcenc.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 diff --git a/libavformat/allformats.c b/libavformat/allformats.c index d4b505a5a3..ab74c2028f 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -60,6 +60,7 @@ extern const FFOutputFormat ff_amv_muxer; extern const AVInputFormat ff_anm_demuxer; extern const AVInputFormat ff_apac_demuxer; extern const AVInputFormat ff_apc_demuxer; +extern const FFOutputFormat ff_apc_muxer; extern const AVInputFormat ff_ape_demuxer; extern const AVInputFormat ff_apm_demuxer; extern const FFOutputFormat ff_apm_muxer; diff --git a/libavformat/apcenc.c b/libavformat/apcenc.c new file mode 100644 index 0000000000..ba024ead50 --- /dev/null +++ b/libavformat/apcenc.c @@ -0,0 +1,125 @@ +/* + * CRYO APC audio format muxer + * Copyright (c) 2023 Tomas Härdin + * + * 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 "avio_internal.h" +#include "internal.h" +#include "mux.h" + +#define APC_HEADER_SIZE (8*4) + +static int apc_write_header(AVFormatContext *s) +{ + AVIOContext *pb = s->pb; + AVCodecParameters *par; + AVStream *st; + + if (s->nb_streams != 1) { + av_log(s, AV_LOG_ERROR, "Must have exactly one stream\n"); + return AVERROR(EINVAL); + } + + st = s->streams[0]; + par = st->codecpar; + + if (par->ch_layout.nb_channels <= 0 || par->ch_layout.nb_channels > 2) { + av_log(s, AV_LOG_ERROR, "Must be mono or stereo\n"); + return AVERROR(EINVAL); + } + + if (par->extradata_size != 0 && par->extradata_size != 8) { + av_log(s, AV_LOG_ERROR, + "Must have exactly 0 or 8 bytes of extradata, got %i\n", + par->extradata_size); + return AVERROR(EINVAL); + } + + ffio_wfourcc(pb, "CRYO"); + ffio_wfourcc(pb, "_APC"); + ffio_wfourcc(pb, "1.20"); + avio_wl32(pb, 0); // number or samples + avio_wl32(pb, par->sample_rate); + + // write extradata if we have it (remuxing) + // else write dummy values and wait for AV_PKT_DATA_NEW_EXTRADATA (encoding) + if (par->extradata_size) { + avio_write(pb, par->extradata, par->extradata_size); + } else { + avio_wl64(pb, 0); + } + + avio_wl32(pb, par->ch_layout.nb_channels - 1); + avpriv_set_pts_info(st, 64, 1, par->sample_rate); + return 0; +} + +static int apc_write_packet(AVFormatContext *s, AVPacket *pkt) +{ + size_t extradata_size = 0; + const uint8_t *extradata = av_packet_get_side_data( + pkt, AV_PKT_DATA_NEW_EXTRADATA, &extradata_size); + + if (extradata_size == 8) { + // we got predictors from encoder + // try to seek back end write them + int64_t pos = avio_tell(s->pb), err; + if ((err = avio_seek(s->pb, 20, SEEK_SET)) >= 0) { + avio_write(s->pb, extradata, extradata_size); + avio_seek(s->pb, pos, SEEK_SET); + } else { + av_log(s, AV_LOG_ERROR, "Got predictors from encoder but couldn't seek back to write them\n"); + // fail since we should always be able to do this within the avio cache + // unless the encoder gave us predictors way too late for some reason + return err; + } + } + + avio_write(s->pb, pkt->data, pkt->size); + return 0; +} + +static int apc_write_trailer(AVFormatContext *s) +{ + int64_t file_size = avio_tell(s->pb); + + // write length, if we're able to seek back + if (avio_seek(s->pb, 12, SEEK_SET) >= 0) { + if (file_size - APC_HEADER_SIZE > + UINT32_MAX * s->streams[0]->codecpar->ch_layout.nb_channels / 2) { + av_log(s, AV_LOG_ERROR, "File too large\n"); + return AVERROR(EINVAL); + } + + avio_wl32(s->pb, (file_size - APC_HEADER_SIZE) * + 2 / s->streams[0]->codecpar->ch_layout.nb_channels); + } + return 0; +} + +const FFOutputFormat ff_apc_muxer = { + .p.name = "apc", + .p.long_name = NULL_IF_CONFIG_SMALL("CRYO APC"), + .p.extensions = "apc", + .p.audio_codec = AV_CODEC_ID_ADPCM_IMA_APC, + .write_header = apc_write_header, + .write_packet = apc_write_packet, + .write_trailer = apc_write_trailer, +}; + diff --git a/libavformat/version.h b/libavformat/version.h index 2a28a3bf40..6a80f3ac4e 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 17 +#define LIBAVFORMAT_VERSION_MINOR 18 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ -- 2.39.2