Add support for DualCart16ParamDefinition in MixPresentationGenerator.

This change adds the necessary code to convert `DualCart16ParamDefinition` from the proto representation to the OBU struct representation within the `MixPresentationGenerator`. A new test case is added to verify the correct conversion of all fields.

PiperOrigin-RevId: 844487379

Author: Googler

iamf/cli/proto_conversion/proto_to_obu/BUILD

@@ -161,6 +161,7 @@ cc_library(
         "//iamf/obu:types",
         "//iamf/obu/param_definitions:cart16_param_definition",
         "//iamf/obu/param_definitions:cart8_param_definition",
+        "//iamf/obu/param_definitions:dual_cart16_param_definition",
         "//iamf/obu/param_definitions:dual_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

@@ -39,6 +39,7 @@
 #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_cart16_param_definition.h"
 #include "iamf/obu/param_definitions/dual_cart8_param_definition.h"
 #include "iamf/obu/param_definitions/dual_polar_param_definition.h"
 #include "iamf/obu/param_definitions/polar_param_definition.h"
@@ -210,6 +211,32 @@ DualCart8ParamDefinition CreateDualCart8ParamDefinition(
   return param_definition;
 }
 
+DualCart16ParamDefinition CreateDualCart16ParamDefinition(
+    const iamf_tools_cli_proto::DualCart16ParamDefinition&
+        input_param_definition) {
+  DualCart16ParamDefinition 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_first_x_ = input_param_definition.default_first_x();
+  param_definition.default_first_y_ = input_param_definition.default_first_y();
+  param_definition.default_first_z_ = input_param_definition.default_first_z();
+  param_definition.default_second_x_ =
+      input_param_definition.default_second_x();
+  param_definition.default_second_y_ =
+      input_param_definition.default_second_y();
+  param_definition.default_second_z_ =
+      input_param_definition.default_second_z();
+  return param_definition;
+}
+
 absl::StatusOr<RenderingConfigParamDefinition>
 CreateRenderingConfigParamDefinition(
     const iamf_tools_cli_proto::RenderingConfigParamDefinition&
@@ -249,6 +276,14 @@ CreateRenderingConfigParamDefinition(
           CreateDualCart8ParamDefinition(input_rendering_config_param_definition
                                              .dual_cart8_param_definition()),
           /*param_definition_bytes=*/{});
+    case PARAM_DEFINITION_TYPE_DUAL_CART_16:
+      return RenderingConfigParamDefinition::Create(
+          ParamDefinition::ParameterDefinitionType::
+              kParameterDefinitionDualCart16,
+          CreateDualCart16ParamDefinition(
+              input_rendering_config_param_definition
+                  .dual_cart16_param_definition()),
+          /*param_definition_bytes=*/{});
     default:
       return absl::InvalidArgumentError(absl::StrCat(
           "Unknown param_definition_type= ",

iamf/cli/proto_conversion/proto_to_obu/tests/BUILD

@@ -162,6 +162,7 @@ cc_test(
         "//iamf/obu:types",
         "//iamf/obu/param_definitions:cart16_param_definition",
         "//iamf/obu/param_definitions:cart8_param_definition",
+        "//iamf/obu/param_definitions:dual_cart16_param_definition",
         "//iamf/obu/param_definitions:dual_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

@@ -32,6 +32,7 @@
 #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_cart16_param_definition.h"
 #include "iamf/obu/param_definitions/dual_cart8_param_definition.h"
 #include "iamf/obu/param_definitions/dual_polar_param_definition.h"
 #include "iamf/obu/param_definitions/polar_param_definition.h"
@@ -504,6 +505,68 @@ TEST(Generate, CopiesRenderingConfigWithDualCart8ParamDefinition) {
                   .value());
 }
 
+TEST(Generate, CopiesRenderingConfigWithDualCart16ParamDefinition) {
+  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_DUAL_CART_16;
+  auto& dual_cart16_param_definition =
+      *first_rendering_config.add_rendering_config_param_definitions();
+  dual_cart16_param_definition.set_param_definition_type(
+      PARAM_DEFINITION_TYPE_DUAL_CART_16);
+  auto& dual_cart16_param_definition_proto =
+      *dual_cart16_param_definition.mutable_dual_cart16_param_definition();
+  dual_cart16_param_definition_proto.mutable_param_definition()
+      ->set_parameter_id(1);
+  dual_cart16_param_definition_proto.mutable_param_definition()
+      ->set_parameter_rate(16000);
+  dual_cart16_param_definition_proto.mutable_param_definition()
+      ->set_param_definition_mode(1);
+  dual_cart16_param_definition_proto.mutable_param_definition()->set_duration(
+      1);
+  dual_cart16_param_definition_proto.mutable_param_definition()
+      ->set_constant_subblock_duration(true);
+  dual_cart16_param_definition_proto.set_default_first_x(1);
+  dual_cart16_param_definition_proto.set_default_first_y(2);
+  dual_cart16_param_definition_proto.set_default_first_z(3);
+  dual_cart16_param_definition_proto.set_default_second_x(4);
+  dual_cart16_param_definition_proto.set_default_second_y(5);
+  dual_cart16_param_definition_proto.set_default_second_z(6);
+
+  DualCart16ParamDefinition expected_dual_cart16_param_definition;
+  expected_dual_cart16_param_definition.parameter_id_ = 1;
+  expected_dual_cart16_param_definition.parameter_rate_ = 16000;
+  expected_dual_cart16_param_definition.param_definition_mode_ = 1;
+  expected_dual_cart16_param_definition.duration_ = 1;
+  expected_dual_cart16_param_definition.constant_subblock_duration_ = true;
+  expected_dual_cart16_param_definition.default_first_x_ = 1;
+  expected_dual_cart16_param_definition.default_first_y_ = 2;
+  expected_dual_cart16_param_definition.default_first_z_ = 3;
+  expected_dual_cart16_param_definition.default_second_x_ = 4;
+  expected_dual_cart16_param_definition.default_second_y_ = 5;
+  expected_dual_cart16_param_definition.default_second_z_ = 6;
+
+  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::
+                      kParameterDefinitionDualCart16,
+                  expected_dual_cart16_param_definition, {})
+                  .value());
+}
+
 TEST(Generate, CopiesRenderingConfigExtension) {
   MixPresentationObuMetadatas mix_presentation_metadata;
   FillMixPresentationMetadata(mix_presentation_metadata.Add());