From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 993364814E for ; Mon, 11 Dec 2023 10:19:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D325868D194; Mon, 11 Dec 2023 12:19:40 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3742768D0FE for ; Mon, 11 Dec 2023 12:19:34 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id E85522405ED for ; Mon, 11 Dec 2023 11:19:33 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id RH9yh4hMHuXF for ; Mon, 11 Dec 2023 11:19:33 +0100 (CET) Received: from lain.khirnov.net (lain.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 3EED42400AC for ; Mon, 11 Dec 2023 11:19:33 +0100 (CET) Received: by lain.khirnov.net (Postfix, from userid 1000) id 1756B1601B9; Mon, 11 Dec 2023 11:19:33 +0100 (CET) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <20231205224402.14540-2-jamrial@gmail.com> References: <20231205224402.14540-1-jamrial@gmail.com> <20231205224402.14540-2-jamrial@gmail.com> Mail-Followup-To: FFmpeg development discussions and patches Date: Mon, 11 Dec 2023 11:19:33 +0100 Message-ID: <170228997306.8914.6096731525778212378@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 1/8] avutil: introduce an Immersive Audio Model and Formats API 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Quoting James Almer (2023-12-05 23:43:55) > diff --git a/libavutil/iamf.h b/libavutil/iamf.h > new file mode 100644 > index 0000000000..bc0363153d > --- /dev/null > +++ b/libavutil/iamf.h > +/** > + * @file > + * Immersive Audio Model and Formats API header > + * @see Immersive Audio Model and Formats > + */ > + > +#include > +#include > + > +#include "attributes.h" > +#include "avassert.h" > +#include "channel_layout.h" > +#include "dict.h" > +#include "rational.h" > + > +/** > + * @defgroup lavf_iamf_params Parameter Definition > + * @{ > + * Parameters as defined in section 3.6.1 and 3.8 of IAMF. > + * @} > + * @defgroup lavf_iamf_audio Audio Element > + * @{ > + * Audio Elements as defined in section 3.6 of IAMF. > + * @} > + * @defgroup lavf_iamf_mix Mix Presentation > + * @{ > + * Mix Presentations as defined in section 3.7 of IAMF. > + * @} > + * > + * @} > + * @addtogroup lavf_iamf_params > + * @{ > + */ > +enum AVIAMFAnimationType { > + AV_IAMF_ANIMATION_TYPE_STEP, > + AV_IAMF_ANIMATION_TYPE_LINEAR, > + AV_IAMF_ANIMATION_TYPE_BEZIER, > +}; > + > +/** > + * Mix Gain Parameter Data as defined in section 3.8.1 of IAMF. > + * > + * Subblocks in AVIAMFParamDefinition use this struct when the value or > + * @ref AVIAMFParamDefinition.param_definition_type param_definition_type is > + * AV_IAMF_PARAMETER_DEFINITION_MIX_GAIN. This is the wrong place for this second paragraph. IMO it should go into doxy for either param_definition_type, or AV_IAMF_PARAMETER_DEFINITION_MIX_GAIN. > +/** > + * Parameters as defined in section 3.6.1 of IAMF. It's not immediately obvious how the contents are structured, so I'd extend it with something like: The struct is allocated along with an array of subblocks, which are either AVIAMFMixGain, AVIAMFDemixingInfo, or AVIAMFReconGain depending on the value of param_definition_type. This array is placed subblocks_offset bytes after the start of this struct. > + */ > +typedef struct AVIAMFParamDefinition { > + const AVClass *av_class; > + > + size_t subblocks_offset; Offset in bytes from the start of this struct, at which the subblocks array is located. > + size_t subblock_size; Size in bytes of each element in the subblocks array. > + > + enum AVIAMFParamDefinitionType param_definition_type; This struct is already called ParamDefinition, so this could be just type. Also: Parameters type. Determines the type of the subblock elements. > + unsigned int nb_subblocks; Number of subblocks in the array. > + > + unsigned int parameter_id; > + unsigned int parameter_rate; > + unsigned int param_definition_mode; > + unsigned int duration; > + unsigned int constant_subblock_duration; These should be documented. > +typedef struct AVIAMFLayer { > + const AVClass *av_class; > + > + AVChannelLayout ch_layout; > + > + /** > + * A bitmask which may contain a combination of AV_IAMF_LAYER_FLAG_* flags. > + */ > + unsigned int flags; > + /** > + * Output gain channel flags as defined in section 3.6.2 of IAMF. > + * > + * This field is defined only if @ref AVIAMFAudioElement.audio_element_type > + * "the parent's Audio Element type" is AV_IAMF_AUDIO_ELEMENT_TYPE_CHANNEL, > + * must be 0 otherwise. > + */ > + unsigned int output_gain_flags; > + /** > + * Output gain as defined in section 3.6.2 of IAMF. > + * > + * Must be 0 if @ref output_gain_flags is 0. > + */ > + AVRational output_gain; > + /** > + * Ambisonics mode as defined in section 3.6.3 of IAMF. > + * > + * This field is defined only if @ref AVIAMFAudioElement.audio_element_type > + * "the parent's Audio Element type" is AV_IAMF_AUDIO_ELEMENT_TYPE_SCENE. > + * > + * If AV_IAMF_AMBISONICS_MODE_MONO, channel_mapping is defined implicitly > + * (Ambisonic Order) or explicitly (Custom Order with ambi channels) in > + * @ref ch_layout. > + * If AV_IAMF_AMBISONICS_MODE_PROJECTION, @ref demixing_matrix must be set. > + */ > + enum AVIAMFAmbisonicsMode ambisonics_mode; > + > + /** > + * Demixing matrix as defined in section 3.6.3 of IAMF. > + * > + * May be set only if @ref ambisonics_mode == AV_IAMF_AMBISONICS_MODE_PROJECTION, > + * must be NULL otherwise. > + */ > + AVRational *demixing_matrix; How many elements are in the array? -- Anton Khirnov _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".