Add support for Cart16ParamDefinition in MixPresentationGenerator.

Implements `CreateCart16ParamDefinition` to convert from the proto representation to the OBU struct. Integrates Cart16ParamDefinition into the `CreateRenderingConfigParamDefinition` function. Adds a unit test to ensure correct conversion of Cart16ParamDefinition within a RenderingConfig.

PiperOrigin-RevId: 843818261

Author: Googler

iamf/cli/proto_conversion/proto_to_obu/BUILD

@@ -159,6 +159,7 @@ cc_library(
         "//iamf/obu:mix_presentation",
         "//iamf/obu:param_definitions",
         "//iamf/obu:types",
+        "//iamf/obu/param_definitions:cart16_param_definition",
         "//iamf/obu/param_definitions:cart8_param_definition",
         "//iamf/obu/param_definitions:dual_polar_param_definition",
         "//iamf/obu/param_definitions:polar_param_definition",

iamf/cli/proto_conversion/proto_to_obu/mix_presentation_generator.cc

@@ -37,6 +37,7 @@
 #include "iamf/common/utils/validation_utils.h"
 #include "iamf/obu/mix_presentation.h"
 #include "iamf/obu/param_definitions.h"
+#include "iamf/obu/param_definitions/cart16_param_definition.h"
 #include "iamf/obu/param_definitions/cart8_param_definition.h"
 #include "iamf/obu/param_definitions/dual_polar_param_definition.h"
 #include "iamf/obu/param_definitions/polar_param_definition.h"
@@ -134,6 +135,25 @@ Cart8ParamDefinition CreateCart8ParamDefinition(
   return param_definition;
 }
 
+Cart16ParamDefinition CreateCart16ParamDefinition(
+    const iamf_tools_cli_proto::Cart16ParamDefinition& input_param_definition) {
+  Cart16ParamDefinition param_definition;
+  param_definition.parameter_id_ =
+      input_param_definition.param_definition().parameter_id();
+  param_definition.parameter_rate_ =
+      input_param_definition.param_definition().parameter_rate();
+  param_definition.param_definition_mode_ =
+      input_param_definition.param_definition().param_definition_mode();
+  param_definition.duration_ =
+      input_param_definition.param_definition().duration();
+  param_definition.constant_subblock_duration_ =
+      input_param_definition.param_definition().constant_subblock_duration();
+  param_definition.default_x_ = input_param_definition.default_x();
+  param_definition.default_y_ = input_param_definition.default_y();
+  param_definition.default_z_ = input_param_definition.default_z();
+  return param_definition;
+}
+
 DualPolarParamDefinition CreateDualPolarParamDefinition(
     const iamf_tools_cli_proto::DualPolarParamDefinition&
         input_param_definition) {
@@ -182,6 +202,12 @@ CreateRenderingConfigParamDefinition(
           CreateCart8ParamDefinition(
               input_rendering_config_param_definition.cart8_param_definition()),
           /*param_definition_bytes=*/{});
+    case PARAM_DEFINITION_TYPE_CART_16:
+      return RenderingConfigParamDefinition::Create(
+          ParamDefinition::ParameterDefinitionType::kParameterDefinitionCart16,
+          CreateCart16ParamDefinition(input_rendering_config_param_definition
+                                          .cart16_param_definition()),
+          /*param_definition_bytes=*/{});
     case PARAM_DEFINITION_TYPE_DUAL_POLAR:
       return RenderingConfigParamDefinition::Create(
           ParamDefinition::ParameterDefinitionType::

iamf/cli/proto_conversion/proto_to_obu/tests/BUILD

@@ -160,6 +160,7 @@ cc_test(
         "//iamf/obu:mix_presentation",
         "//iamf/obu:param_definitions",
         "//iamf/obu:types",
+        "//iamf/obu/param_definitions:cart16_param_definition",
         "//iamf/obu/param_definitions:cart8_param_definition",
         "//iamf/obu/param_definitions:dual_polar_param_definition",
         "//iamf/obu/param_definitions:polar_param_definition",

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

@@ -30,6 +30,7 @@
 #include "iamf/cli/tests/cli_test_utils.h"
 #include "iamf/obu/mix_presentation.h"
 #include "iamf/obu/param_definitions.h"
+#include "iamf/obu/param_definitions/cart16_param_definition.h"
 #include "iamf/obu/param_definitions/cart8_param_definition.h"
 #include "iamf/obu/param_definitions/dual_polar_param_definition.h"
 #include "iamf/obu/param_definitions/polar_param_definition.h"
@@ -326,6 +327,60 @@ TEST(Generate, CopiesRenderingConfigWithCart8ParamDefinition) {
           .value());
 }
 
+TEST(Generate, CopiesRenderingConfigWithCart16ParamDefinition) {
+  MixPresentationObuMetadatas mix_presentation_metadata;
+  FillMixPresentationMetadata(mix_presentation_metadata.Add());
+  auto& first_rendering_config = *mix_presentation_metadata.at(0)
+                                      .mutable_sub_mixes(0)
+                                      ->mutable_audio_elements(0)
+                                      ->mutable_rendering_config();
+  first_rendering_config.set_headphones_rendering_mode(
+      HEADPHONES_RENDERING_MODE_RESERVED_3);
+  using iamf_tools_cli_proto::PARAM_DEFINITION_TYPE_CART_16;
+  auto& cart16_param_definition =
+      *first_rendering_config.add_rendering_config_param_definitions();
+  cart16_param_definition.set_param_definition_type(
+      PARAM_DEFINITION_TYPE_CART_16);
+  auto& cart16_param_definition_proto =
+      *cart16_param_definition.mutable_cart16_param_definition();
+  cart16_param_definition_proto.mutable_param_definition()->set_parameter_id(1);
+  cart16_param_definition_proto.mutable_param_definition()->set_parameter_rate(
+      16000);
+  cart16_param_definition_proto.mutable_param_definition()
+      ->set_param_definition_mode(1);
+  cart16_param_definition_proto.mutable_param_definition()->set_duration(1);
+  cart16_param_definition_proto.mutable_param_definition()
+      ->set_constant_subblock_duration(true);
+  cart16_param_definition_proto.set_default_x(1);
+  cart16_param_definition_proto.set_default_y(2);
+  cart16_param_definition_proto.set_default_z(3);
+
+  Cart16ParamDefinition expected_cart16_param_definition;
+  expected_cart16_param_definition.parameter_id_ = 1;
+  expected_cart16_param_definition.parameter_rate_ = 16000;
+  expected_cart16_param_definition.param_definition_mode_ = 1;
+  expected_cart16_param_definition.duration_ = 1;
+  expected_cart16_param_definition.constant_subblock_duration_ = true;
+  expected_cart16_param_definition.default_x_ = 1;
+  expected_cart16_param_definition.default_y_ = 2;
+  expected_cart16_param_definition.default_z_ = 3;
+
+  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_THAT(generated_rendering_config.rendering_config_param_definitions,
+              testing::SizeIs(1));
+  EXPECT_THAT(
+      generated_rendering_config.rendering_config_param_definitions[0],
+      RenderingConfigParamDefinition::Create(
+          ParamDefinition::ParameterDefinitionType::kParameterDefinitionCart16,
+          expected_cart16_param_definition, {})
+          .value());
+}
+
 TEST(Generate, CopiesRenderingConfigWithDualPolarParamDefinition) {
   MixPresentationObuMetadatas mix_presentation_metadata;
   FillMixPresentationMetadata(mix_presentation_metadata.Add());