When converting ADM files, always use HEADPHONES_RENDERING_MODE_BINAU…

…RAL. PiperOrigin-RevId: 687393641
AOMediaCodec · Oct 18, 2024 · 3ed1e50 · 3ed1e50
1 parent ee675cc
commit 3ed1e50
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/iamf/cli/adm_to_user_metadata/iamf/mix_presentation_handler.cc b/iamf/cli/adm_to_user_metadata/iamf/mix_presentation_handler.cc
@@ -142,16 +142,8 @@ absl::Status SubMixAudioElementHandler(
     return input_layout.status();
   }
 
-  // Set 'headphones_rendering_mode' to HEADPHONES_RENDERING_MODE_BINAURAL if
-  // typeDefinition is binaural, else set it to
-  // HEADPHONES_RENDERING_MODE_STEREO.
-  if (*input_layout == IamfInputLayout::kBinaural) {
-    rendering_config->set_headphones_rendering_mode(
-        iamf_tools_cli_proto::HEADPHONES_RENDERING_MODE_BINAURAL);
-  } else {
-    rendering_config->set_headphones_rendering_mode(
-        iamf_tools_cli_proto::HEADPHONES_RENDERING_MODE_STEREO);
-  }
+  rendering_config->set_headphones_rendering_mode(
+      iamf_tools_cli_proto::HEADPHONES_RENDERING_MODE_BINAURAL);
 
   auto* mix_gain_param_definition =
       sub_mix_audio_element.mutable_element_mix_gain();

diff --git a/iamf/cli/adm_to_user_metadata/iamf/tests/mix_presentation_handler_test.cc b/iamf/cli/adm_to_user_metadata/iamf/tests/mix_presentation_handler_test.cc
@@ -124,15 +124,15 @@ TEST(PopulateMixPresentation, PopulatesStereoSubmix) {
   EXPECT_EQ(submix.output_mix_gain().default_mix_gain(), 0);
 }
 
-TEST(PopulateMixPresentation, SetsStereoRenderingModeForStereoAudioObject) {
+TEST(PopulateMixPresentation, SetsBinauralRenderingModeForStereoAudioObject) {
   const auto& mix_presentation_metadata =
       GetMixObuMetataExpectOk({GetStereoAudioObject()});
 
   EXPECT_EQ(mix_presentation_metadata.sub_mixes(0)
                 .audio_elements(0)
                 .rendering_config()
                 .headphones_rendering_mode(),
-            iamf_tools_cli_proto::HEADPHONES_RENDERING_MODE_STEREO);
+            iamf_tools_cli_proto::HEADPHONES_RENDERING_MODE_BINAURAL);
 }
 
 TEST(PopulateMixPresentation, SetsBinauralRenderingModeForBinauralAudioObject) {