Expose proto interface for element_gain_offset_config.

  - Add relevant test vectors.
  - b/391851526: Use a structure to be flexible between dB and Q7.8 input.

PiperOrigin-RevId: 856765912

Author: jwcullen

iamf/cli/proto/BUILD

@@ -38,6 +38,12 @@ proto_library(
     deps = [":obu_header_proto"],
 )
 
+proto_library(
+    name = "element_gain_offset_config_proto",
+    srcs = ["element_gain_offset_config.proto"],
+    deps = [":types_proto"],
+)
+
 proto_library(
     name = "encoder_control_metadata_proto",
     srcs = ["encoder_control_metadata.proto"],
@@ -54,6 +60,7 @@ proto_library(
     name = "mix_presentation_proto",
     srcs = ["mix_presentation.proto"],
     deps = [
+        ":element_gain_offset_config_proto",
         ":obu_header_proto",
         ":param_definitions_proto",
     ],
@@ -141,6 +148,11 @@ cc_proto_library(
     deps = [":codec_config_proto"],
 )
 
+cc_proto_library(
+    name = "element_gain_offset_config_cc_proto",
+    deps = [":element_gain_offset_config_proto"],
+)
+
 cc_proto_library(
     name = "encoder_control_metadata_cc_proto",
     deps = [":encoder_control_metadata_proto"],

iamf/cli/proto/element_gain_offset_config.proto

@@ -0,0 +1,35 @@
+// Copyright (c) 2026, Alliance for Open Media. All rights reserved
+//
+// This source code is subject to the terms of the BSD 3-Clause Clear License
+// and the Alliance for Open Media Patent License 1.0. If the BSD 3-Clause Clear
+// License was not distributed with this source code in the LICENSE file, you
+// can obtain it at www.aomedia.org/license/software-license/bsd-3-c-c. If the
+// Alliance for Open Media Patent License 1.0 was not distributed with this
+// source code in the PATENTS file, you can obtain it at
+// www.aomedia.org/license/patent.
+
+edition = "2023";
+
+package iamf_tools_cli_proto;
+
+import "iamf/cli/proto/types.proto";
+
+option java_outer_classname = "ElementGainOffsetConfig";
+option java_multiple_files = true;
+
+message ElementGainOffsetConfig {
+  message ValueType {
+    QFormatOrFloatingPoint element_gain_offset = 1;
+  }
+
+  message RangeType {
+    QFormatOrFloatingPoint default_element_gain_offset = 1;
+    QFormatOrFloatingPoint min_element_gain_offset = 2;
+    QFormatOrFloatingPoint max_element_gain_offset = 3;
+  }
+
+  oneof element_gain_offset_config_type {
+    ValueType value_type = 1;
+    RangeType range_type = 2;
+  }
+}

iamf/cli/proto/mix_presentation.proto

@@ -12,6 +12,7 @@ edition = "2023";
 
 package iamf_tools_cli_proto;
 
+import "iamf/cli/proto/element_gain_offset_config.proto";
 import "iamf/cli/proto/obu_header.proto";
 import "iamf/cli/proto/param_definitions.proto";
 
@@ -58,7 +59,10 @@ message RenderingConfig {
   uint32 rendering_config_extension_size = 3 [deprecated = true];
   repeated RenderingConfigParamDefinition rendering_config_param_definitions =
       5;
+  ElementGainOffsetConfig element_gain_offset_config = 6;
   bytes rendering_config_extension_bytes = 4;
+
+  // Next ID: 7
 }
 
 message SubMixAudioElement {

iamf/cli/proto_conversion/proto_to_obu/BUILD

@@ -149,9 +149,11 @@ cc_library(
     srcs = ["mix_presentation_generator.cc"],
     hdrs = ["mix_presentation_generator.h"],
     deps = [
+        "//iamf/cli/proto:element_gain_offset_config_cc_proto",
         "//iamf/cli/proto:mix_presentation_cc_proto",
         "//iamf/cli/proto:param_definitions_cc_proto",
         "//iamf/cli/proto:parameter_data_cc_proto",
+        "//iamf/cli/proto:types_cc_proto",
         "//iamf/cli/proto:user_metadata_cc_proto",
         "//iamf/cli/proto_conversion:lookup_tables",
         "//iamf/cli/proto_conversion:proto_utils",
@@ -160,6 +162,7 @@ cc_library(
         "//iamf/common/utils:map_utils",
         "//iamf/common/utils:numeric_utils",
         "//iamf/common/utils:validation_utils",
+        "//iamf/obu:element_gain_offset_config",
         "//iamf/obu:mix_presentation",
         "//iamf/obu:rendering_config",
         "//iamf/obu:types",

iamf/cli/proto_conversion/proto_to_obu/mix_presentation_generator.cc

@@ -26,16 +26,19 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
+#include "iamf/cli/proto/element_gain_offset_config.pb.h"
 #include "iamf/cli/proto/mix_presentation.pb.h"
 #include "iamf/cli/proto/param_definitions.pb.h"
 #include "iamf/cli/proto/parameter_data.pb.h"
+#include "iamf/cli/proto/types.pb.h"
 #include "iamf/cli/proto_conversion/lookup_tables.h"
 #include "iamf/cli/proto_conversion/proto_utils.h"
 #include "iamf/common/q_format_or_floating_point.h"
 #include "iamf/common/utils/macros.h"
 #include "iamf/common/utils/map_utils.h"
 #include "iamf/common/utils/numeric_utils.h"
 #include "iamf/common/utils/validation_utils.h"
+#include "iamf/obu/element_gain_offset_config.h"
 #include "iamf/obu/mix_presentation.h"
 #include "iamf/obu/param_definitions/cart16_param_definition.h"
 #include "iamf/obu/param_definitions/cart8_param_definition.h"
@@ -283,6 +286,46 @@ CreateRenderingConfigParamDefinition(
   }
 }
 
+absl::StatusOr<ElementGainOffsetConfig> CreateElementGainOffsetConfig(
+    const iamf_tools_cli_proto::ElementGainOffsetConfig&
+        input_element_gain_offset_config) {
+  if (input_element_gain_offset_config.has_value_type()) {
+    const auto element_gain_offset = ProtoToQFormatOrFloatingPoint(
+        input_element_gain_offset_config.value_type().element_gain_offset());
+    if (!element_gain_offset.ok()) {
+      return element_gain_offset.status();
+    }
+    return ElementGainOffsetConfig::MakeValueType(*element_gain_offset);
+  } else if (input_element_gain_offset_config.has_range_type()) {
+    const auto default_element_gain_offset = ProtoToQFormatOrFloatingPoint(
+        input_element_gain_offset_config.range_type()
+            .default_element_gain_offset());
+    if (!default_element_gain_offset.ok()) {
+      return default_element_gain_offset.status();
+    }
+    const auto min_element_gain_offset = ProtoToQFormatOrFloatingPoint(
+        input_element_gain_offset_config.range_type()
+            .min_element_gain_offset());
+    if (!min_element_gain_offset.ok()) {
+      return min_element_gain_offset.status();
+    }
+    const auto max_element_gain_offset = ProtoToQFormatOrFloatingPoint(
+        input_element_gain_offset_config.range_type()
+            .max_element_gain_offset());
+    if (!max_element_gain_offset.ok()) {
+      return max_element_gain_offset.status();
+    }
+
+    return ElementGainOffsetConfig::CreateRangeType(
+        *default_element_gain_offset, *min_element_gain_offset,
+        *max_element_gain_offset);
+  } else {
+    return absl::InvalidArgumentError(
+        "ElementGainOffsetConfig must have one of value_type or "
+        "range_type set.");
+  }
+}
+
 absl::Status FillRenderingConfig(
     const iamf_tools_cli_proto::RenderingConfig& input_rendering_config,
     RenderingConfig& rendering_config) {
@@ -333,6 +376,15 @@ absl::Status FillRenderingConfig(
         *rendering_config_param_definition);
   }
 
+  if (input_rendering_config.has_element_gain_offset_config()) {
+    auto element_gain_offset_config = CreateElementGainOffsetConfig(
+        input_rendering_config.element_gain_offset_config());
+    if (!element_gain_offset_config.ok()) {
+      return element_gain_offset_config.status();
+    }
+    rendering_config.element_gain_offset_config = *element_gain_offset_config;
+  }
+
   rendering_config.rendering_config_extension_bytes.resize(
       input_rendering_config.rendering_config_extension_bytes().size());
   return StaticCastSpanIfInRange(

iamf/cli/proto_conversion/proto_to_obu/tests/BUILD

@@ -156,10 +156,14 @@ cc_test(
     name = "mix_presentation_generator_test",
     srcs = ["mix_presentation_generator_test.cc"],
     deps = [
+        "//iamf/cli/proto:element_gain_offset_config_cc_proto",
         "//iamf/cli/proto:mix_presentation_cc_proto",
         "//iamf/cli/proto:param_definitions_cc_proto",
+        "//iamf/cli/proto:types_cc_proto",
         "//iamf/cli/proto_conversion/proto_to_obu:mix_presentation_generator",
         "//iamf/cli/tests:cli_test_utils",
+        "//iamf/common:q_format_or_floating_point",
+        "//iamf/obu:element_gain_offset_config",
         "//iamf/obu:mix_presentation",
         "//iamf/obu:rendering_config",
         "//iamf/obu:types",

iamf/cli/proto_conversion/proto_to_obu/tests/mix_presentation_generator_test.cc

@@ -25,9 +25,13 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "iamf/cli/proto/element_gain_offset_config.pb.h"
 #include "iamf/cli/proto/mix_presentation.pb.h"
 #include "iamf/cli/proto/param_definitions.pb.h"
+#include "iamf/cli/proto/types.pb.h"
 #include "iamf/cli/tests/cli_test_utils.h"
+#include "iamf/common/q_format_or_floating_point.h"
+#include "iamf/obu/element_gain_offset_config.h"
 #include "iamf/obu/mix_presentation.h"
 #include "iamf/obu/param_definitions/cart16_param_definition.h"
 #include "iamf/obu/param_definitions/cart8_param_definition.h"
@@ -1554,5 +1558,96 @@ TEST(CopyUserLayoutExtension, IgnoresDeprecatedInfoTypeSizeField) {
             std::vector<uint8_t>({'a', 'b', 'c'}));
 }
 
+TEST(Generate, CopiesRenderingConfigWithElementGainOffsetValueQ78) {
+  MixPresentationObuMetadatas mix_presentation_metadata;
+  auto* first_mix_presentation_metadata = mix_presentation_metadata.Add();
+  FillMixPresentationMetadata(first_mix_presentation_metadata);
+  first_mix_presentation_metadata->mutable_sub_mixes(0)
+      ->mutable_audio_elements(0)
+      ->mutable_rendering_config()
+      ->mutable_element_gain_offset_config()
+      ->mutable_value_type()
+      ->mutable_element_gain_offset()
+      ->set_q7_dot8(256);
+
+  MixPresentationGenerator generator(mix_presentation_metadata);
+  std::list<MixPresentationObu> generated_obus;
+  EXPECT_THAT(generator.Generate(kAppendBuildInformationTag, generated_obus),
+              IsOk());
+
+  const auto& generated_rendering_config =
+      generated_obus.front().sub_mixes_[0].audio_elements[0].rendering_config;
+  EXPECT_EQ(generated_rendering_config.element_gain_offset_config,
+            ElementGainOffsetConfig::MakeValueType(
+                QFormatOrFloatingPoint::MakeFromQ7_8(256)));
+}
+
+TEST(Generate, CopiesRenderingConfigWithElementGainOffsetValueFloat) {
+  MixPresentationObuMetadatas mix_presentation_metadata;
+  auto* first_mix_presentation_metadata = mix_presentation_metadata.Add();
+  FillMixPresentationMetadata(first_mix_presentation_metadata);
+  first_mix_presentation_metadata->mutable_sub_mixes(0)
+      ->mutable_audio_elements(0)
+      ->mutable_rendering_config()
+      ->mutable_element_gain_offset_config()
+      ->mutable_value_type()
+      ->mutable_element_gain_offset()
+      ->set_floating_point(1.0);
+
+  MixPresentationGenerator generator(mix_presentation_metadata);
+  std::list<MixPresentationObu> generated_obus;
+  EXPECT_THAT(generator.Generate(kAppendBuildInformationTag, generated_obus),
+              IsOk());
+
+  const auto& generated_rendering_config =
+      generated_obus.front().sub_mixes_[0].audio_elements[0].rendering_config;
+  EXPECT_EQ(generated_rendering_config.element_gain_offset_config,
+            ElementGainOffsetConfig::MakeValueType(
+                *QFormatOrFloatingPoint::CreateFromFloatingPoint(1.0)));
+}
+
+TEST(Generate, CopiesRenderingConfigWithElementGainOffsetRangeQ78) {
+  MixPresentationObuMetadatas mix_presentation_metadata;
+  auto* first_mix_presentation_metadata = mix_presentation_metadata.Add();
+  FillMixPresentationMetadata(first_mix_presentation_metadata);
+  auto& range_type = *first_mix_presentation_metadata->mutable_sub_mixes(0)
+                          ->mutable_audio_elements(0)
+                          ->mutable_rendering_config()
+                          ->mutable_element_gain_offset_config()
+                          ->mutable_range_type();
+  range_type.mutable_default_element_gain_offset()->set_q7_dot8(256);
+  range_type.mutable_min_element_gain_offset()->set_q7_dot8(0);
+  range_type.mutable_max_element_gain_offset()->set_q7_dot8(512);
+
+  MixPresentationGenerator generator(mix_presentation_metadata);
+  std::list<MixPresentationObu> generated_obus;
+  EXPECT_THAT(generator.Generate(kAppendBuildInformationTag, generated_obus),
+              IsOk());
+
+  const auto& generated_rendering_config =
+      generated_obus.front().sub_mixes_[0].audio_elements[0].rendering_config;
+  EXPECT_EQ(generated_rendering_config.element_gain_offset_config,
+            *ElementGainOffsetConfig::CreateRangeType(
+                QFormatOrFloatingPoint::MakeFromQ7_8(256),
+                QFormatOrFloatingPoint::MakeFromQ7_8(0),
+                QFormatOrFloatingPoint::MakeFromQ7_8(512)));
+}
+
+TEST(Generate, ElementGainOffsetConfigMustHaveValueOrRangeType) {
+  MixPresentationObuMetadatas mix_presentation_metadata;
+  auto* first_mix_presentation_metadata = mix_presentation_metadata.Add();
+  FillMixPresentationMetadata(first_mix_presentation_metadata);
+  // Create an `element_gain_offset_config` but do not fill in any fields.
+  first_mix_presentation_metadata->mutable_sub_mixes(0)
+      ->mutable_audio_elements(0)
+      ->mutable_rendering_config()
+      ->mutable_element_gain_offset_config();
+  MixPresentationGenerator generator(mix_presentation_metadata);
+
+  std::list<MixPresentationObu> generated_obus;
+  EXPECT_THAT(generator.Generate(kAppendBuildInformationTag, generated_obus),
+              Not(IsOk()));
+}
+
 }  // namespace
 }  // namespace iamf_tools