From patchwork Sat Feb 17 22:02:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46320 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp494274pzb; Sat, 17 Feb 2024 14:04:49 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXetkZdklWCJCeSlW8ejwRD8NjelscKC4c78Eq+4doCNuIBg7pavZxgZNeZQbO5uLW+xrZUDVOvAilppLvlTVhBvZRno7ARJqhKQw== X-Google-Smtp-Source: AGHT+IGH3QpV5vZdBXkGHQF3iCiahnagh+LAzQoNDNfP2Zo6H97Dih5kx7tCnGLzREpFPCFhdX5K X-Received: by 2002:a17:906:1858:b0:a3e:127b:690e with SMTP id w24-20020a170906185800b00a3e127b690emr1583327eje.70.1708207488725; Sat, 17 Feb 2024 14:04:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708207488; cv=none; d=google.com; s=arc-20160816; b=OqRoBsTIKFZAfBYNYfwkmK1NYEs2wKU1mRLGBR4j7/6bZYsUyNT2yuL2BJpV2uBIgr prnAELTOPZSmNg483pcHqXsPgLd5eJOIZFwnfxCD6Pve8/2VPKSGIxgUpdhwI/mW2b7c a0RLTy2HkkLh7uswMwgCnJi+EEsFbF7Buyx82+GvDic3zuimnQ3+FaVs+0W3X4nIePPM EJ4JAqmNHlkYA1cCOD+Bu5mt8MvDOVmC5DdAaN4rcsId/osJT3AFKYs9RB+ipOc4o+0+ YFuXKDKASmd0tUljrBzIkK6Zcr6ZFKACRFew+XZLQyHPlnyt3CwtpXpBNCDv/ASfjRNy QL4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=Kl9WG2+0vtVXGOIV8oBhyC7JNvLCmJ6ewbZnLsyiiNU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ajowR/e8T38PB4hLibgMNAI/wzNrSm/maVOdoauQKpkvEv5863KiaXwmy8H+PgITtX mOxXFR1jTNinGc01IYePOp8qlB+K8p86bFPo1CqJYYcMn1BiN4apWN5LcsgdOcOhoNJC 9CRP/oHct5Um62xe3Uxl+ET8xFYDwGKfOKiKRLbzwRA3+TexnuDJEJ4y8K0Cbc2e2GDL VKMEwfjaCF/kA88ZJoKT1tSw+Qsz6nX9GcSCI6qTHhTlqEfucz++V585z+8kucgSsnX7 kaJ1MJE5/IvAJEcw7OCFPHR3V+vaHQ7FPeOQXcLypS1vOHf2OvG1aeWI36qbCngcLrAS Y4jA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=O4j2ilHv; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fy9-20020a170906b7c900b00a3e40946c4asi487031ejb.558.2024.02.17.14.04.48; Sat, 17 Feb 2024 14:04:48 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=O4j2ilHv; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 41B7068D308; Sun, 18 Feb 2024 00:03:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9057F68D30B for ; Sun, 18 Feb 2024 00:03:44 +0200 (EET) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1dba177c596so14881175ad.0 for ; Sat, 17 Feb 2024 14:03:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708207422; x=1708812222; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7Mq68rJ2VBEUTehyfXrJMLuF7PbiC9h0FoUGEdWNvqM=; b=O4j2ilHvcrk1ZSN8bVrDABbC8odquvKRyOObLLFLQVS1CLGhzUBHv+/FH6cRYIDa+B VksP3dxw/Rc+xzKT7DiP9LePAowecWzYmdlmiVKJnA3VTLO6FezgcpO0Cp/O4VAFHtTM NadA+BTHQLEQChqKLPNq3IqMe8pBilMNa7DkDrWR1GusIKiI079oZ1NewEqxkf6FIjKh vhPKDhv/6Az2N2/gOV3SSV69m664PGKvxF1t+iys1Vq54mBPIqbRBk+tU/1BVrmwJokg HEhUrTAhhK6q0l89TOMm8l/tbSg19u6oQKyOltAKFxuFNc9DxxOYqe3e+FuQ10n+nYm5 Na0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708207422; x=1708812222; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7Mq68rJ2VBEUTehyfXrJMLuF7PbiC9h0FoUGEdWNvqM=; b=IQXYJOXMC8g7ActGbC8i/xMx9Nrhn9Fi/lFmnU095kRj5C07qmPI/+QqXVtz43Ux5n 3B3hpfgbXX/04PrgZ9bXW+05/jQIstrSk/mgHIPu4cjcC11bODMFtTrpEyaYsXFuDoAu LJm49hZ8vTHJUbGvYZVoVhDNwtPWwpGYCwaj5jJ1msexErnCqvSfEMOgcsIyjsh50w8S IxVe6Gp94xHdWEvslIjgqfrYTu8XgdnV024S7JwsRbJI8amdxyoFNihKPLaolifTkkic 5zMBq8MUBCTHU9BUissLq6UTx7aTDZTQahFikj3xdDYwQbXu8mtm+r4tCLhBF//1v8DO inPg== X-Gm-Message-State: AOJu0YzFyYz7zxdZNTLVpIkpcej8ObVTapmC7BkwAEOFBUtH58CJzwXs jqTzNzhKBV7aFbaG90fQwXiDCt1VgB/U7SSDS6dpFQgemotw+eH0iMYfxNDE X-Received: by 2002:a17:903:22ca:b0:1db:d9b7:ac55 with SMTP id y10-20020a17090322ca00b001dbd9b7ac55mr1552390plg.27.1708207421706; Sat, 17 Feb 2024 14:03:41 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id e6-20020a17090301c600b001d77a0e1374sm1850326plh.151.2024.02.17.14.03.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Feb 2024 14:03:41 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Feb 2024 19:02:40 -0300 Message-ID: <20240217220242.62035-6-jamrial@gmail.com> X-Mailer: git-send-email 2.43.1 In-Reply-To: <20240217220242.62035-1-jamrial@gmail.com> References: <20240217220242.62035-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/8] avformat/iamfenc: further split into shareable modules 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: y8KwFdRoLEgR Signed-off-by: James Almer --- configure | 4 +- libavformat/Makefile | 3 +- libavformat/iamf_writer.c | 239 ++++++++++++++++++++++++++++++++++++++ libavformat/iamf_writer.h | 7 ++ libavformat/iamfenc.c | 228 ++---------------------------------- 5 files changed, 258 insertions(+), 223 deletions(-) diff --git a/configure b/configure index 968f1ad198..adaeae2604 100755 --- a/configure +++ b/configure @@ -2517,6 +2517,7 @@ CONFIG_EXTRA=" huffyuvdsp huffyuvencdsp iamfdec + iamfenc idctdsp iirfilter inflate_wrapper @@ -3536,6 +3537,7 @@ hds_muxer_select="flv_muxer" hls_demuxer_select="adts_header ac3_parser mov_demuxer mpegts_demuxer" hls_muxer_select="mov_muxer mpegts_muxer" iamf_demuxer_select="iamfdec" +iamf_muxer_select="iamfenc" image2_alias_pix_demuxer_select="image2_demuxer" image2_brender_pix_demuxer_select="image2_demuxer" imf_demuxer_deps="libxml2" @@ -3552,7 +3554,7 @@ mlp_demuxer_select="mlp_parser" mmf_muxer_select="riffenc" mov_demuxer_select="iso_media riffdec iamfdec" mov_demuxer_suggest="zlib" -mov_muxer_select="iso_media riffenc rtpenc_chain vp9_superframe_bsf aac_adtstoasc_bsf ac3_parser" +mov_muxer_select="iamfenc iso_media riffenc rtpenc_chain vp9_superframe_bsf aac_adtstoasc_bsf ac3_parser" mp3_demuxer_select="mpegaudio_parser" mp3_muxer_select="mpegaudioheader" mp4_muxer_select="mov_muxer" diff --git a/libavformat/Makefile b/libavformat/Makefile index 3b83f5a685..4a380668bd 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -36,6 +36,7 @@ OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o # subsystems OBJS-$(CONFIG_ISO_MEDIA) += isom.o OBJS-$(CONFIG_IAMFDEC) += iamf_reader.o iamf_parse.o iamf.o +OBJS-$(CONFIG_IAMFENC) += iamf_writer.o iamf.o OBJS-$(CONFIG_NETWORK) += network.o OBJS-$(CONFIG_RIFFDEC) += riffdec.o OBJS-$(CONFIG_RIFFENC) += riffenc.o @@ -260,7 +261,7 @@ OBJS-$(CONFIG_HLS_DEMUXER) += hls.o hls_sample_encryption.o OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o hlsplaylist.o avc.o OBJS-$(CONFIG_HNM_DEMUXER) += hnm.o OBJS-$(CONFIG_IAMF_DEMUXER) += iamfdec.o -OBJS-$(CONFIG_IAMF_MUXER) += iamfenc.o iamf_writer.o iamf.o +OBJS-$(CONFIG_IAMF_MUXER) += iamfenc.o OBJS-$(CONFIG_ICO_DEMUXER) += icodec.o OBJS-$(CONFIG_ICO_MUXER) += icoenc.o OBJS-$(CONFIG_IDCIN_DEMUXER) += idcin.o diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c index 1a360dee2f..25e2fd9e8a 100644 --- a/libavformat/iamf_writer.c +++ b/libavformat/iamf_writer.c @@ -835,3 +835,242 @@ int ff_iamf_write_descriptors(const IAMFContext *iamf, AVIOContext *pb, void *lo return 0; } + +static int write_parameter_block(const IAMFContext *iamf, AVIOContext *pb, + const AVIAMFParamDefinition *param, void *log_ctx) +{ + uint8_t header[MAX_IAMF_OBU_HEADER_SIZE]; + IAMFParamDefinition *param_definition = ff_iamf_get_param_definition(iamf, param->parameter_id); + PutBitContext pbc; + AVIOContext *dyn_bc; + uint8_t *dyn_buf = NULL; + int dyn_size, ret; + + if (param->type > AV_IAMF_PARAMETER_DEFINITION_RECON_GAIN) { + av_log(log_ctx, AV_LOG_DEBUG, "Ignoring side data with unknown type %u\n", + param->type); + return 0; + } + + if (!param_definition) { + av_log(log_ctx, AV_LOG_ERROR, "Non-existent Parameter Definition with ID %u referenced by a packet\n", + param->parameter_id); + return AVERROR(EINVAL); + } + + if (param->type != param_definition->param->type) { + av_log(log_ctx, AV_LOG_ERROR, "Inconsistent values for Parameter Definition " + "with ID %u in a packet\n", + param->parameter_id); + return AVERROR(EINVAL); + } + + ret = avio_open_dyn_buf(&dyn_bc); + if (ret < 0) + return ret; + + // Sequence Header + init_put_bits(&pbc, header, sizeof(header)); + put_bits(&pbc, 5, IAMF_OBU_IA_PARAMETER_BLOCK); + put_bits(&pbc, 3, 0); + flush_put_bits(&pbc); + avio_write(pb, header, put_bytes_count(&pbc, 1)); + + ffio_write_leb(dyn_bc, param->parameter_id); + if (!param_definition->mode) { + ffio_write_leb(dyn_bc, param->duration); + ffio_write_leb(dyn_bc, param->constant_subblock_duration); + if (param->constant_subblock_duration == 0) + ffio_write_leb(dyn_bc, param->nb_subblocks); + } + + for (int i = 0; i < param->nb_subblocks; i++) { + const void *subblock = av_iamf_param_definition_get_subblock(param, i); + + switch (param->type) { + case AV_IAMF_PARAMETER_DEFINITION_MIX_GAIN: { + const AVIAMFMixGain *mix = subblock; + if (!param_definition->mode && param->constant_subblock_duration == 0) + ffio_write_leb(dyn_bc, mix->subblock_duration); + + ffio_write_leb(dyn_bc, mix->animation_type); + + avio_wb16(dyn_bc, rescale_rational(mix->start_point_value, 1 << 8)); + if (mix->animation_type >= AV_IAMF_ANIMATION_TYPE_LINEAR) + avio_wb16(dyn_bc, rescale_rational(mix->end_point_value, 1 << 8)); + if (mix->animation_type == AV_IAMF_ANIMATION_TYPE_BEZIER) { + avio_wb16(dyn_bc, rescale_rational(mix->control_point_value, 1 << 8)); + avio_w8(dyn_bc, av_clip_uint8(av_rescale(mix->control_point_relative_time.num, 1 << 8, + mix->control_point_relative_time.den))); + } + break; + } + case AV_IAMF_PARAMETER_DEFINITION_DEMIXING: { + const AVIAMFDemixingInfo *demix = subblock; + if (!param_definition->mode && param->constant_subblock_duration == 0) + ffio_write_leb(dyn_bc, demix->subblock_duration); + + avio_w8(dyn_bc, demix->dmixp_mode << 5); + break; + } + case AV_IAMF_PARAMETER_DEFINITION_RECON_GAIN: { + const AVIAMFReconGain *recon = subblock; + const AVIAMFAudioElement *audio_element = param_definition->audio_element->element; + + if (!param_definition->mode && param->constant_subblock_duration == 0) + ffio_write_leb(dyn_bc, recon->subblock_duration); + + if (!audio_element) { + av_log(log_ctx, AV_LOG_ERROR, "Invalid Parameter Definition with ID %u referenced by a packet\n", param->parameter_id); + return AVERROR(EINVAL); + } + + for (int j = 0; j < audio_element->nb_layers; j++) { + const AVIAMFLayer *layer = audio_element->layers[j]; + + if (layer->flags & AV_IAMF_LAYER_FLAG_RECON_GAIN) { + unsigned int recon_gain_flags = 0; + int k = 0; + + for (; k < 7; k++) + recon_gain_flags |= (1 << k) * !!recon->recon_gain[j][k]; + for (; k < 12; k++) + recon_gain_flags |= (2 << k) * !!recon->recon_gain[j][k]; + if (recon_gain_flags >> 8) + recon_gain_flags |= (1 << k); + + ffio_write_leb(dyn_bc, recon_gain_flags); + for (k = 0; k < 12; k++) { + if (recon->recon_gain[j][k]) + avio_w8(dyn_bc, recon->recon_gain[j][k]); + } + } + } + break; + } + default: + av_assert0(0); + } + } + + dyn_size = avio_get_dyn_buf(dyn_bc, &dyn_buf); + ffio_write_leb(pb, dyn_size); + avio_write(pb, dyn_buf, dyn_size); + ffio_free_dyn_buf(&dyn_bc); + + return 0; +} + +int ff_iamf_write_parameter_blocks(const IAMFContext *iamf, AVIOContext *pb, + AVPacket *pkt, void *log_ctx) +{ + AVIAMFParamDefinition *mix = + (AVIAMFParamDefinition *)av_packet_get_side_data(pkt, + AV_PKT_DATA_IAMF_MIX_GAIN_PARAM, + NULL); + AVIAMFParamDefinition *demix = + (AVIAMFParamDefinition *)av_packet_get_side_data(pkt, + AV_PKT_DATA_IAMF_DEMIXING_INFO_PARAM, + NULL); + AVIAMFParamDefinition *recon = + (AVIAMFParamDefinition *)av_packet_get_side_data(pkt, + AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM, + NULL); + + if (mix) { + int ret = write_parameter_block(iamf, pb, mix, log_ctx); + if (ret < 0) + return ret; + } + if (demix) { + int ret = write_parameter_block(iamf, pb, demix, log_ctx); + if (ret < 0) + return ret; + } + if (recon) { + int ret = write_parameter_block(iamf, pb, recon, log_ctx); + if (ret < 0) + return ret; + } + + return 0; +} + +int ff_iamf_write_audio_frame(const IAMFContext *iamf, AVIOContext *pb, + unsigned audio_substream_id, AVPacket *pkt) +{ + uint8_t header[MAX_IAMF_OBU_HEADER_SIZE]; + PutBitContext pbc; + AVIOContext *dyn_bc; + uint8_t *side_data, *dyn_buf = NULL; + unsigned int skip_samples = 0, discard_padding = 0; + size_t side_data_size; + int dyn_size, type = audio_substream_id <= 17 ? + audio_substream_id + IAMF_OBU_IA_AUDIO_FRAME_ID0 : IAMF_OBU_IA_AUDIO_FRAME; + int ret; + + if (!pkt->size) { + uint8_t *new_extradata = av_packet_get_side_data(pkt, + AV_PKT_DATA_NEW_EXTRADATA, + NULL); + + if (!new_extradata) + return AVERROR_INVALIDDATA; + + // TODO: update FLAC Streaminfo on seekable output + return 0; + } + + side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_SKIP_SAMPLES, + &side_data_size); + + if (side_data && side_data_size >= 10) { + skip_samples = AV_RL32(side_data); + discard_padding = AV_RL32(side_data + 4); + } + + ret = avio_open_dyn_buf(&dyn_bc); + if (ret < 0) + return ret; + + init_put_bits(&pbc, header, sizeof(header)); + put_bits(&pbc, 5, type); + put_bits(&pbc, 1, 0); // obu_redundant_copy + put_bits(&pbc, 1, skip_samples || discard_padding); + put_bits(&pbc, 1, 0); // obu_extension_flag + flush_put_bits(&pbc); + avio_write(pb, header, put_bytes_count(&pbc, 1)); + + if (skip_samples || discard_padding) { + ffio_write_leb(dyn_bc, discard_padding); + ffio_write_leb(dyn_bc, skip_samples); + } + + if (audio_substream_id > 17) + ffio_write_leb(dyn_bc, audio_substream_id); + + dyn_size = avio_get_dyn_buf(dyn_bc, &dyn_buf); + ffio_write_leb(pb, dyn_size + pkt->size); + avio_write(pb, dyn_buf, dyn_size); + ffio_free_dyn_buf(&dyn_bc); + avio_write(pb, pkt->data, pkt->size); + + return 0; +} + +void ff_iamf_write_deinit(IAMFContext *iamf) +{ + for (int i = 0; i < iamf->nb_audio_elements; i++) { + IAMFAudioElement *audio_element = iamf->audio_elements[i]; + audio_element->element = NULL; + } + + for (int i = 0; i < iamf->nb_mix_presentations; i++) { + IAMFMixPresentation *mix_presentation = iamf->mix_presentations[i]; + mix_presentation->mix = NULL; + } + + ff_iamf_uninit_context(iamf); + + return; +} diff --git a/libavformat/iamf_writer.h b/libavformat/iamf_writer.h index 24f1c14769..bc08bbc05a 100644 --- a/libavformat/iamf_writer.h +++ b/libavformat/iamf_writer.h @@ -24,6 +24,7 @@ #include +#include "libavcodec/packet.h" #include "avformat.h" #include "avio.h" #include "iamf.h" @@ -47,4 +48,10 @@ int ff_iamf_add_mix_presentation(IAMFContext *iamf, const AVStreamGroup *stg, vo int ff_iamf_write_descriptors(const IAMFContext *iamf, AVIOContext *pb, void *log_ctx); +int ff_iamf_write_parameter_blocks(const IAMFContext *iamf, AVIOContext *pb, + AVPacket *pkt, void *log_ctx); +int ff_iamf_write_audio_frame(const IAMFContext *iamf, AVIOContext *pb, + unsigned audio_substream_id, AVPacket *pkt); +void ff_iamf_write_deinit(IAMFContext *iamf); + #endif /* AVFORMAT_IAMF_WRITER_H */ diff --git a/libavformat/iamfenc.c b/libavformat/iamfenc.c index b588a507bb..a838cc77fe 100644 --- a/libavformat/iamfenc.c +++ b/libavformat/iamfenc.c @@ -133,239 +133,25 @@ static int iamf_write_header(AVFormatContext *s) return 0; } -static inline int rescale_rational(AVRational q, int b) -{ - return av_clip_int16(av_rescale(q.num, b, q.den)); -} - -static int write_parameter_block(AVFormatContext *s, const AVIAMFParamDefinition *param) -{ - const IAMFMuxContext *const c = s->priv_data; - const IAMFContext *const iamf = &c->iamf; - uint8_t header[MAX_IAMF_OBU_HEADER_SIZE]; - IAMFParamDefinition *param_definition = ff_iamf_get_param_definition(iamf, param->parameter_id); - PutBitContext pb; - AVIOContext *dyn_bc; - uint8_t *dyn_buf = NULL; - int dyn_size, ret; - - if (param->type > AV_IAMF_PARAMETER_DEFINITION_RECON_GAIN) { - av_log(s, AV_LOG_DEBUG, "Ignoring side data with unknown type %u\n", - param->type); - return 0; - } - - if (!param_definition) { - av_log(s, AV_LOG_ERROR, "Non-existent Parameter Definition with ID %u referenced by a packet\n", - param->parameter_id); - return AVERROR(EINVAL); - } - - if (param->type != param_definition->param->type) { - av_log(s, AV_LOG_ERROR, "Inconsistent values for Parameter Definition " - "with ID %u in a packet\n", - param->parameter_id); - return AVERROR(EINVAL); - } - - ret = avio_open_dyn_buf(&dyn_bc); - if (ret < 0) - return ret; - - // Sequence Header - init_put_bits(&pb, header, sizeof(header)); - put_bits(&pb, 5, IAMF_OBU_IA_PARAMETER_BLOCK); - put_bits(&pb, 3, 0); - flush_put_bits(&pb); - avio_write(s->pb, header, put_bytes_count(&pb, 1)); - - ffio_write_leb(dyn_bc, param->parameter_id); - if (!param_definition->mode) { - ffio_write_leb(dyn_bc, param->duration); - ffio_write_leb(dyn_bc, param->constant_subblock_duration); - if (param->constant_subblock_duration == 0) - ffio_write_leb(dyn_bc, param->nb_subblocks); - } - - for (int i = 0; i < param->nb_subblocks; i++) { - const void *subblock = av_iamf_param_definition_get_subblock(param, i); - - switch (param->type) { - case AV_IAMF_PARAMETER_DEFINITION_MIX_GAIN: { - const AVIAMFMixGain *mix = subblock; - if (!param_definition->mode && param->constant_subblock_duration == 0) - ffio_write_leb(dyn_bc, mix->subblock_duration); - - ffio_write_leb(dyn_bc, mix->animation_type); - - avio_wb16(dyn_bc, rescale_rational(mix->start_point_value, 1 << 8)); - if (mix->animation_type >= AV_IAMF_ANIMATION_TYPE_LINEAR) - avio_wb16(dyn_bc, rescale_rational(mix->end_point_value, 1 << 8)); - if (mix->animation_type == AV_IAMF_ANIMATION_TYPE_BEZIER) { - avio_wb16(dyn_bc, rescale_rational(mix->control_point_value, 1 << 8)); - avio_w8(dyn_bc, av_clip_uint8(av_rescale(mix->control_point_relative_time.num, 1 << 8, - mix->control_point_relative_time.den))); - } - break; - } - case AV_IAMF_PARAMETER_DEFINITION_DEMIXING: { - const AVIAMFDemixingInfo *demix = subblock; - if (!param_definition->mode && param->constant_subblock_duration == 0) - ffio_write_leb(dyn_bc, demix->subblock_duration); - - avio_w8(dyn_bc, demix->dmixp_mode << 5); - break; - } - case AV_IAMF_PARAMETER_DEFINITION_RECON_GAIN: { - const AVIAMFReconGain *recon = subblock; - const AVIAMFAudioElement *audio_element = param_definition->audio_element->element; - - if (!param_definition->mode && param->constant_subblock_duration == 0) - ffio_write_leb(dyn_bc, recon->subblock_duration); - - if (!audio_element) { - av_log(s, AV_LOG_ERROR, "Invalid Parameter Definition with ID %u referenced by a packet\n", param->parameter_id); - return AVERROR(EINVAL); - } - - for (int j = 0; j < audio_element->nb_layers; j++) { - const AVIAMFLayer *layer = audio_element->layers[j]; - - if (layer->flags & AV_IAMF_LAYER_FLAG_RECON_GAIN) { - unsigned int recon_gain_flags = 0; - int k = 0; - - for (; k < 7; k++) - recon_gain_flags |= (1 << k) * !!recon->recon_gain[j][k]; - for (; k < 12; k++) - recon_gain_flags |= (2 << k) * !!recon->recon_gain[j][k]; - if (recon_gain_flags >> 8) - recon_gain_flags |= (1 << k); - - ffio_write_leb(dyn_bc, recon_gain_flags); - for (k = 0; k < 12; k++) { - if (recon->recon_gain[j][k]) - avio_w8(dyn_bc, recon->recon_gain[j][k]); - } - } - } - break; - } - default: - av_assert0(0); - } - } - - dyn_size = avio_get_dyn_buf(dyn_bc, &dyn_buf); - ffio_write_leb(s->pb, dyn_size); - avio_write(s->pb, dyn_buf, dyn_size); - ffio_free_dyn_buf(&dyn_bc); - - return 0; -} - static int iamf_write_packet(AVFormatContext *s, AVPacket *pkt) { const IAMFMuxContext *const c = s->priv_data; AVStream *st = s->streams[pkt->stream_index]; - uint8_t header[MAX_IAMF_OBU_HEADER_SIZE]; - PutBitContext pb; - AVIOContext *dyn_bc; - uint8_t *side_data, *dyn_buf = NULL; - unsigned int skip_samples = 0, discard_padding = 0; - size_t side_data_size; - int dyn_size, type = st->id <= 17 ? st->id + IAMF_OBU_IA_AUDIO_FRAME_ID0 : IAMF_OBU_IA_AUDIO_FRAME; - int ret; + int ret = 0; - if (!pkt->size) { - uint8_t *new_extradata = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, NULL); - - if (!new_extradata) - return AVERROR_INVALIDDATA; - - // TODO: update FLAC Streaminfo on seekable output - return 0; - } - - if (s->nb_stream_groups && st->id == c->first_stream_id) { - AVIAMFParamDefinition *mix = - (AVIAMFParamDefinition *)av_packet_get_side_data(pkt, AV_PKT_DATA_IAMF_MIX_GAIN_PARAM, NULL); - AVIAMFParamDefinition *demix = - (AVIAMFParamDefinition *)av_packet_get_side_data(pkt, AV_PKT_DATA_IAMF_DEMIXING_INFO_PARAM, NULL); - AVIAMFParamDefinition *recon = - (AVIAMFParamDefinition *)av_packet_get_side_data(pkt, AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM, NULL); - - if (mix) { - ret = write_parameter_block(s, mix); - if (ret < 0) - return ret; - } - if (demix) { - ret = write_parameter_block(s, demix); - if (ret < 0) - return ret; - } - if (recon) { - ret = write_parameter_block(s, recon); - if (ret < 0) - return ret; - } - } - side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_SKIP_SAMPLES, - &side_data_size); + if (st->id == c->first_stream_id) + ret = ff_iamf_write_parameter_blocks(&c->iamf, s->pb, pkt, s); + if (!ret) + ret = ff_iamf_write_audio_frame(&c->iamf, s->pb, st->id, pkt); - if (side_data && side_data_size >= 10) { - skip_samples = AV_RL32(side_data); - discard_padding = AV_RL32(side_data + 4); - } - - ret = avio_open_dyn_buf(&dyn_bc); - if (ret < 0) - return ret; - - init_put_bits(&pb, header, sizeof(header)); - put_bits(&pb, 5, type); - put_bits(&pb, 1, 0); // obu_redundant_copy - put_bits(&pb, 1, skip_samples || discard_padding); - put_bits(&pb, 1, 0); // obu_extension_flag - flush_put_bits(&pb); - avio_write(s->pb, header, put_bytes_count(&pb, 1)); - - if (skip_samples || discard_padding) { - ffio_write_leb(dyn_bc, discard_padding); - ffio_write_leb(dyn_bc, skip_samples); - } - - if (st->id > 17) - ffio_write_leb(dyn_bc, st->id); - - dyn_size = avio_get_dyn_buf(dyn_bc, &dyn_buf); - ffio_write_leb(s->pb, dyn_size + pkt->size); - avio_write(s->pb, dyn_buf, dyn_size); - ffio_free_dyn_buf(&dyn_bc); - avio_write(s->pb, pkt->data, pkt->size); - - return 0; + return ret; } static void iamf_deinit(AVFormatContext *s) { IAMFMuxContext *const c = s->priv_data; - IAMFContext *const iamf = &c->iamf; - - for (int i = 0; i < iamf->nb_audio_elements; i++) { - IAMFAudioElement *audio_element = iamf->audio_elements[i]; - audio_element->element = NULL; - } - - for (int i = 0; i < iamf->nb_mix_presentations; i++) { - IAMFMixPresentation *mix_presentation = iamf->mix_presentations[i]; - mix_presentation->mix = NULL; - } - - ff_iamf_uninit_context(iamf); - return; + ff_iamf_write_deinit(&c->iamf); } static const AVCodecTag iamf_codec_tags[] = {