From patchwork Tue Dec 5 22:43:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 44937 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9153:b0:181:818d:5e7f with SMTP id x19csp659016pzc; Tue, 5 Dec 2023 14:44:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IGN5tY/cIeBZl9jhzGPw5oNx5AZsNYNvCdsAjSdpAeJZcrVP4kVUFArdal7SxcRbpvST8ff X-Received: by 2002:a50:f692:0:b0:54c:4837:9055 with SMTP id d18-20020a50f692000000b0054c48379055mr30450edn.77.1701816278387; Tue, 05 Dec 2023 14:44:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701816278; cv=none; d=google.com; s=arc-20160816; b=Em1hY6EbdT0MRGzBU1t26ABlmmB6r0N7aeIaSazlJTsDA/tLzCkTnMotzQFuJHKmaQ UB/9B1+p6hdEGv2mLQ7wEnHUeEp43AbNcHqWVJCMPk2SN9diZbSJkOoiQm2IeukRi3ot EzSinN91U3zZC35l2vVbmv1rXuMVDnzxfio2C/ImhE6q8zlDy+5fTHLr7v5WnEAe7yfH 8QEHscIVMh2LgqgmDrC1T6XQ7t3BbExPp6I9BMLRbGIovxcwltsD2ivpl23YA9tj3bn4 4xW4s80hotUa14Y9ezjA/Up3KaSW0KAOnlBfEvcO4RzkcddVm3leJtLpUvcP+ooZMtty j4tw== 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=qy1KQwAlYk+XOqPZ/0jKNRuKNr4MMVZXVDNzQ9D6fHM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=A5T9PhX6U5R6ep+bKMcAcGUEKpdnJApdfJDhhtPdPj4TuGsFlc4cdoBgml9wG+dKtc 27n4yQISL6uPdoEF6lXVfCSHeaLvolvjHqTNFWqvj/nt2pCH2B3+/1PeKCNrd9VQmiNY GrmNwNAz0chnI74tHskcns94lwDP2DOROypgtDVKGft60xurgKjttFNaWxUNJv8uoYEy 1nGiUKOXmVTn9lx4b+1IqiaLMTP7HfxYh3lUz9t7ZI9EL+T+gP3oj4nbk3mGy5WWYPn/ e0a6TaWwnOkf6s3eoseTLV68DD5beWusblh1qSIcRrvG7RsAXBr0ikyIv84HYAUW+ro8 kk+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=iq9njH1p; 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 s22-20020a50ab16000000b0054c5febab05si1353306edc.333.2023.12.05.14.44.36; Tue, 05 Dec 2023 14:44:38 -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=iq9njH1p; 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 524B468CF2C; Wed, 6 Dec 2023 00:43:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF18D68CEF7 for ; Wed, 6 Dec 2023 00:43:50 +0200 (EET) Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-6d9a6f756c3so1560439a34.2 for ; Tue, 05 Dec 2023 14:43:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701816228; x=1702421028; 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=2tkQy47363R1byuwNxSqzL7sZyukku8A9sA+O1dn8Ms=; b=iq9njH1p3l0SKSFedEvgKqfaDz4zd1yPwdszzNgxiqB3SwcSW06jaxsWHLNXSnv7gn BFFMkfgIMKI4HxD6whrSl6HSAFNSpC+41dXyJAbL079N8u5AERAOk99xyWspbDbg8pLU O3p7aNtS7gm/90jDtC+vhEHkIuskNZf9j3YrQ3r8YYPqXXz5BkoMcEgSCUPxLj0ht2dO lHZ178xTzuXqSbNO3tcki8mMUydjYqPccJNUwXNDSXxNaCemYsS4a9FAlQ2ljvxqoj4s oo2CrcZiJXes6uKR8MgEBWQGoCEAl0j5ZjfnSB5fM4C6Dd0pE5ojCrSagShjPgDLMV0m 2F9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701816228; x=1702421028; 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=2tkQy47363R1byuwNxSqzL7sZyukku8A9sA+O1dn8Ms=; b=hhsKi8nIkqSF3vkYYhgfOZw3yMfa9hzXEWKnLA5Cgzi5e+FgMpmt9V6rcp81IzkpFe ofLjT3yDkPIKSxE3qOq+q+wN0Kd0rk6VmBxSiMDOkvDYJz/isxnk5VLUs3O557kogazj rMfWnJ+faSZA3yiOevVkca8PZFTR7tbr4kngQAfEEvg8xLJHXEGE8mmj3UDX6j1yMk3y XNR+y+a6OUTwGxgBk5//G26cg6bPy6U9SPqKOySWNAYuHt0hiOuXhOSGXQ7LWFOo9rBL Z5EYaj2YFi500NdwYqoPwo8HJsEwVbpL+qiMHa+JM8/moCdUaB4tmAR76udH5iGsGpOs /KTA== X-Gm-Message-State: AOJu0Yz5RfqsDkx9uk7bzjxrhSjdchq1yL/PWFWYh6uFRmiPNhFGgM57 OFiEMy8xS/KGsLInmnWmVtWkvdrnBsk= X-Received: by 2002:a05:6830:154a:b0:6d8:ab64:7d81 with SMTP id l10-20020a056830154a00b006d8ab647d81mr23517otp.11.1701816228171; Tue, 05 Dec 2023 14:43:48 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id hq25-20020a056a00681900b0064fd4a6b306sm2037688pfb.76.2023.12.05.14.43.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 14:43:47 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Dec 2023 19:43:58 -0300 Message-ID: <20231205224402.14540-5-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231205224402.14540-1-jamrial@gmail.com> References: <20231205224402.14540-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/8] avcodec/packet: add IAMF Parameters side data types 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: kO6LCiezuQFR Signed-off-by: James Almer --- libavcodec/avpacket.c | 3 +++ libavcodec/packet.h | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index e29725c2d2..0f8c9b77ae 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -301,6 +301,9 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type) case AV_PKT_DATA_DOVI_CONF: return "DOVI configuration record"; case AV_PKT_DATA_S12M_TIMECODE: return "SMPTE ST 12-1:2014 timecode"; case AV_PKT_DATA_DYNAMIC_HDR10_PLUS: return "HDR10+ Dynamic Metadata (SMPTE 2094-40)"; + case AV_PKT_DATA_IAMF_MIX_GAIN_PARAM: return "IAMF Mix Gain Parameter Data"; + case AV_PKT_DATA_IAMF_DEMIXING_INFO_PARAM: return "IAMF Demixing Info Parameter Data"; + case AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM: return "IAMF Recon Gain Info Parameter Data"; } return NULL; } diff --git a/libavcodec/packet.h b/libavcodec/packet.h index b19409b719..2c57d262c6 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -299,6 +299,30 @@ enum AVPacketSideDataType { */ AV_PKT_DATA_DYNAMIC_HDR10_PLUS, + /** + * IAMF Mix Gain Parameter Data associated with the audio frame. This metadata + * is in the form of the AVIAMFParamDefinition struct and contains information + * defined in sections 3.6.1 and 3.8.1 of the Immersive Audio Model and + * Formats standard. + */ + AV_PKT_DATA_IAMF_MIX_GAIN_PARAM, + + /** + * IAMF Demixing Info Parameter Data associated with the audio frame. This + * metadata is in the form of the AVIAMFParamDefinition struct and contains + * information defined in sections 3.6.1 and 3.8.2 of the Immersive Audio Model + * and Formats standard. + */ + AV_PKT_DATA_IAMF_DEMIXING_INFO_PARAM, + + /** + * IAMF Recon Gain Info Parameter Data associated with the audio frame. This + * metadata is in the form of the AVIAMFParamDefinition struct and contains + * information defined in sections 3.6.1 and 3.8.3 of the Immersive Audio Model + * and Formats standard. + */ + AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM, + /** * The number of side data types. * This is not part of the public API/ABI in the sense that it may