Fix broken Apple Clang < 16.0.0 build: Avoid using parenthesized init…

…ialization of aggregates. - `AudioElementParam` is an aggregate, which can only be initialized with parentheses in C++20. This is not well supported on MacOS/Apple Clang. - b/338638106: Similar issue has shown up before, but now the most recent Apple Clang builds are claimed to support it (https://en.cppreference.com/w/cpp/compiler_support/20). - Don't bump Apple Clang version for this; avoid the syntax for now. PiperOrigin-RevId: 728256265
AOMediaCodec · Feb 18, 2025 · 00708c9 · 00708c9
1 parent a99a2e4
commit 00708c9
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/iamf/cli/proto_conversion/proto_to_obu/audio_element_generator.cc b/iamf/cli/proto_conversion/proto_to_obu/audio_element_generator.cc
@@ -163,7 +163,7 @@ absl::Status GenerateParameterDefinitions(
                      codec_config_obu.GetCodecConfig().num_samples_per_frame));
         }
         audio_element_obu.audio_element_params_.emplace_back(
-            demixing_param_definition);
+            AudioElementParam{demixing_param_definition});
         break;
       }
       case kParameterDefinitionReconGain: {
@@ -181,7 +181,7 @@ absl::Status GenerateParameterDefinitions(
                      codec_config_obu.GetCodecConfig().num_samples_per_frame));
         }
         audio_element_obu.audio_element_params_.emplace_back(
-            recon_gain_param_definition);
+            AudioElementParam{recon_gain_param_definition});
         break;
       }
       case kParameterDefinitionMixGain:
@@ -203,7 +203,7 @@ absl::Status GenerateParameterDefinitions(
             absl::MakeSpan(extended_param_definition.param_definition_bytes_)));
 
         audio_element_obu.audio_element_params_.emplace_back(
-            extended_param_definition);
+            AudioElementParam{extended_param_definition});
       } break;
     }
   }

diff --git a/iamf/cli/tests/cli_test_utils.cc b/iamf/cli/tests/cli_test_utils.cc
@@ -104,7 +104,8 @@ void AddParamDefinition(
 
   // Add to the Audio Element OBU.
   audio_element_obu.InitializeParams(audio_element_obu.num_parameters_ + 1);
-  audio_element_obu.audio_element_params_.emplace_back(param_definition);
+  audio_element_obu.audio_element_params_.emplace_back(
+      AudioElementParam{param_definition});
 
   // Insert the newly added param definition to the map `param_definitions`.
   if (param_definitions != nullptr) {

diff --git a/iamf/cli/tests/cli_util_test.cc b/iamf/cli/tests/cli_util_test.cc
@@ -468,8 +468,9 @@ TEST(CollectAndValidateParamDefinitions,
   // to determine the ID to store it or to use further processing.
   auto& audio_element = audio_elements.at(kAudioElementId);
   audio_element.obu.InitializeParams(1);
-  audio_element.obu.audio_element_params_.emplace_back(ExtendedParamDefinition(
-      ParamDefinition::kParameterDefinitionReservedStart));
+  audio_element.obu.audio_element_params_.emplace_back(
+      AudioElementParam{ExtendedParamDefinition(
+          ParamDefinition::kParameterDefinitionReservedStart)});
 
   absl::flat_hash_map<DecodedUleb128, const ParamDefinition*> result;
   EXPECT_THAT(CollectAndValidateParamDefinitions(

diff --git a/iamf/obu/tests/audio_element_test.cc b/iamf/obu/tests/audio_element_test.cc
@@ -101,8 +101,8 @@ class AudioElementObuTestBase : public ObuTestBase {
             .audio_element_params = {},
         }) {
     required_args_.audio_element_params.emplace_back(
-        CreateDemixingInfoParamDefinition(
-            DemixingInfoParameterData::kDMixPMode1));
+        AudioElementParam{CreateDemixingInfoParamDefinition(
+            DemixingInfoParameterData::kDMixPMode1)});
   }
 
   ~AudioElementObuTestBase() = default;
@@ -137,7 +137,7 @@ class AudioElementObuTestBase : public ObuTestBase {
     obu_->InitializeParams(required_args_.num_parameters);
     for (auto& audio_element_param : required_args_.audio_element_params) {
       obu_->audio_element_params_.emplace_back(
-          audio_element_param.param_definition);
+          AudioElementParam{audio_element_param.param_definition});
     }
   }
 };
@@ -341,8 +341,9 @@ TEST_F(AudioElementScalableChannelTest,
 
 TEST_F(AudioElementScalableChannelTest, ParamDefinitionExtensionZero) {
   required_args_.audio_element_params.clear();
-  required_args_.audio_element_params.emplace_back(ExtendedParamDefinition(
-      ParamDefinition::kParameterDefinitionReservedStart));
+  required_args_.audio_element_params.emplace_back(
+      AudioElementParam{ExtendedParamDefinition{
+          ParamDefinition::kParameterDefinitionReservedStart}});
 
   expected_header_ = {kObuIaAudioElement << 3, 15};
 
@@ -382,8 +383,9 @@ TEST_F(AudioElementScalableChannelTest, ParamDefinitionExtensionZero) {
 
 TEST_F(AudioElementScalableChannelTest, MaxParamDefinitionType) {
   required_args_.audio_element_params.clear();
-  required_args_.audio_element_params.emplace_back(ExtendedParamDefinition(
-      ParamDefinition::kParameterDefinitionReservedEnd));
+  required_args_.audio_element_params.emplace_back(
+      AudioElementParam{ExtendedParamDefinition{
+          ParamDefinition::kParameterDefinitionReservedEnd}});
 
   expected_header_ = {kObuIaAudioElement << 3, 19};
 
@@ -428,7 +430,8 @@ TEST_F(AudioElementScalableChannelTest, ParamDefinitionExtensionNonZero) {
   param_definition.param_definition_bytes_ = {'e', 'x', 't', 'r', 'a'};
 
   required_args_.audio_element_params.clear();
-  required_args_.audio_element_params.emplace_back(param_definition);
+  required_args_.audio_element_params.emplace_back(
+      AudioElementParam{param_definition});
 
   expected_header_ = {kObuIaAudioElement << 3, 20};
 
@@ -1053,7 +1056,8 @@ TEST_F(AudioElementScalableChannelTest,
   const auto demixing_param_definition =
       CreateDemixingInfoParamDefinition(DemixingInfoParameterData::kDMixPMode1);
   for (int i = 0; i < 2; i++) {
-    required_args_.audio_element_params.emplace_back(demixing_param_definition);
+    required_args_.audio_element_params.emplace_back(
+        AudioElementParam{demixing_param_definition});
   }
 
   InitExpectOk();