From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id CFE1B4F5B2 for ; Wed, 18 Jun 2025 01:40:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 2BCC068DD1F; Wed, 18 Jun 2025 04:39:40 +0300 (EEST) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 6FC2C68DCF3 for ; Wed, 18 Jun 2025 04:39:31 +0300 (EEST) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-748a42f718aso2925378b3a.2 for ; Tue, 17 Jun 2025 18:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750210769; x=1750815569; 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=9xCRf5JqjsDNPXBPFLTeW/zgOktfjTb5gPuqXWVzW7w=; b=HdVpbhNsRg0sOZMR9SWD5sNIKh7dtdC5NGwX285rc8oDaB4pYl4x4sq8I8Qo5eZI6f DusDgP/2nDe0+tiigEylBUlRvGw1KVANaOY1/lg4+l3oUVsZmIt+YHkpP94qkGju0Ekz 1v2KtglgJn1v859GmwGp3gd+gYQM45RUdOc5UfQ5q1Tt07L5qRspm7P1D6K1eBGkSgv6 cmqZcXyzBztf+S9CiIS1+kDMhYb0oDkZQIvZuSrnk83Y2LJpK7ZlRj2JvKzrXmEW8oa1 TNcZZmG9terwYqcEU0Uo4VJRZ43fgD1Qf6+HZRccRo+mZ40MaQO8FIMhGxVX0cTzF5oY h8IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750210769; x=1750815569; 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=9xCRf5JqjsDNPXBPFLTeW/zgOktfjTb5gPuqXWVzW7w=; b=nyOwT6dmPV5BEd9a7oITYpCiDCKiB0ICWqygB9w6ylN4WT9dvvO83x3e2wfq0Ap40r 4GGX7rojfesK0/ChTD8ah1i3FgzwAM2QltEmqekBImRnrLqByLzBsJYgpj0yZgzDuPZ2 G7QRjxMIsb2VvrLIfrGUIsydJbSlROZuDHHsp8o4XpY+8ZFrUp2eeQ9R3kmn2rIcZlw+ NjqC8e8uqXjb6GWHO4htiJq1e2Jo5GyYJ+ZmdYg+X5SsCkBrsgCkBKqxhGs0xDA4bSbP H4kcXW5TmofLIgcQguxzpIZ49VXtmOlOvtn1C/T182DcRNq4yqRSQvmLwUB01D5oYIBb UuBA== X-Gm-Message-State: AOJu0Yx2LuvkvF53Pk9W9G/TBGyAOXhnCT1Yr0v0Gbbz1TnXwloGFBtG yt8GFQ3YbZBca+lXuxLzBlN73n8VPL1tsl89nI1UlAmZU5virTWXL2KGjM0CGg== X-Gm-Gg: ASbGncuFF633q0G+mW4IvXsmQ/fZLcyJIl4MSWC+n9TeDUFAA8Lux3nhUZNA+5klPg7 JJsa9h3QxAZu1RvARnWuVCI715bDrQP30u2WNmBnpT6x2Ww9CB3Vt74neDq/YoNmxJX+8KppM0N GGNM5zc7Mf5EYVLhyo6X0H1JcD31NwcGMCsFtPbIKJL7VCvrYquaJ7DI6Vzc9M5wMUIj1aPli76 mdSnrFIYriu0qcNfR++ytTP1oGzef/G0PzOYlX9Wo0dwVWtxuc7sOUtj2gYvlGK4nAPUvWL51W0 XR2CSbsa241AqkJmkbNpUlm3YanaYk+2RqpBITcI5QdNAASIocIzF1nORTT/S2COzsRNOA== X-Google-Smtp-Source: AGHT+IHtczZMcZuh0grZuYLRunRva0IhjBouu+nfsxrDur6Xw/ikKdj8MsfLnmjYNYArvNGBG7sk2g== X-Received: by 2002:a05:6a00:2d06:b0:73e:30dc:bb9b with SMTP id d2e1a72fcca58-7489cf5aadamr19951913b3a.2.1750210768880; Tue, 17 Jun 2025 18:39:28 -0700 (PDT) Received: from Gryph ([2800:2121:b000:82e:746f:8b87:8ec9:3872]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-748e566bee6sm431865b3a.127.2025.06.17.18.39.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jun 2025 18:39:28 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Jun 2025 22:39:03 -0300 Message-ID: <20250618013904.15638-8-jamrial@gmail.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250618013904.15638-1-jamrial@gmail.com> References: <20250618013904.15638-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/9] avformat/iamf_writer: reindent after previous commit 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: Signed-off-by: James Almer --- libavformat/iamf_writer.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c index 37e75dc01a..ad40871fa1 100644 --- a/libavformat/iamf_writer.c +++ b/libavformat/iamf_writer.c @@ -758,14 +758,14 @@ static int iamf_write_audio_element(const IAMFContext *iamf, /* When the loudspeaker_layout of the (non-)scalable channel audio (i.e., num_layers = 1) is less than or equal to 3.1.2ch, * (i.e., Mono, Stereo, or 3.1.2ch), the type PARAMETER_DEFINITION_DEMIXING SHALL NOT be present. */ else if (element->nb_layers == 1 && (layout == 0 || layout == 1 || layout == 8)) - param_definition_types &= ~AV_IAMF_PARAMETER_DEFINITION_DEMIXING; - /* When num_layers > 1, the type PARAMETER_DEFINITION_RECON_GAIN SHALL be present */ - if (element->nb_layers > 1) - param_definition_types |= AV_IAMF_PARAMETER_DEFINITION_RECON_GAIN; - /* When codec_id = fLaC or ipcm, the type PARAMETER_DEFINITION_RECON_GAIN SHALL NOT be present. */ - if (codec_config->codec_tag == MKTAG('f','L','a','C') || - codec_config->codec_tag == MKTAG('i','p','c','m')) - param_definition_types &= ~AV_IAMF_PARAMETER_DEFINITION_RECON_GAIN; + param_definition_types &= ~AV_IAMF_PARAMETER_DEFINITION_DEMIXING; + /* When num_layers > 1, the type PARAMETER_DEFINITION_RECON_GAIN SHALL be present */ + if (element->nb_layers > 1) + param_definition_types |= AV_IAMF_PARAMETER_DEFINITION_RECON_GAIN; + /* When codec_id = fLaC or ipcm, the type PARAMETER_DEFINITION_RECON_GAIN SHALL NOT be present. */ + if (codec_config->codec_tag == MKTAG('f','L','a','C') || + codec_config->codec_tag == MKTAG('i','p','c','m')) + param_definition_types &= ~AV_IAMF_PARAMETER_DEFINITION_RECON_GAIN; if ((param_definition_types & AV_IAMF_PARAMETER_DEFINITION_DEMIXING) && !element->demixing_info) { if (element->nb_layers > 1) { get_loudspeaker_layout(element->layers[element->nb_layers-1], &layout, &expanded_layout); -- 2.50.0 _______________________________________________ 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".