parameter_block_generator: Remove obsolete code related to generati…

…ng stray parameter blocks. PiperOrigin-RevId: 631043919
AOMediaCodec · May 6, 2024 · d615759 · d615759
1 parent 151093c
commit d615759
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 61 deletions.
diff --git a/iamf/cli/BUILD b/iamf/cli/BUILD
@@ -429,7 +429,6 @@ cc_library(
         "//iamf/common:macros",
         "//iamf/common:obu_util",
         "//iamf/obu:audio_element",
-        "//iamf/obu:codec_config",
         "//iamf/obu:demixing_info_param_data",
         "//iamf/obu:ia_sequence_header",
         "//iamf/obu:leb128",

diff --git a/iamf/cli/parameter_block_generator.cc b/iamf/cli/parameter_block_generator.cc
@@ -39,7 +39,6 @@
 #include "iamf/common/macros.h"
 #include "iamf/common/obu_util.h"
 #include "iamf/obu/audio_element.h"
-#include "iamf/obu/codec_config.h"
 #include "iamf/obu/demixing_info_param_data.h"
 #include "iamf/obu/ia_sequence_header.h"
 #include "iamf/obu/leb128.h"
@@ -147,51 +146,14 @@ absl::Status GetPerIdMetadata(
         audio_elements,
     const absl::flat_hash_map<DecodedUleb128, const ParamDefinition*>&
         param_definitions,
-    const iamf_tools_cli_proto::ParameterBlockObuMetadata&
-        parameter_block_metadata,
     PerIdParameterMetadata& per_id_metadata) {
   // Initialize some fields that may not be set later.
   per_id_metadata.num_layers = 0;
 
-  // TODO(b/337184341): Simplify logic since stray parameter blocks in the
-  //                    metadata are not allowed.
   auto iter = param_definitions.find(target_parameter_id);
   if (iter == param_definitions.end()) {
-    LOG(WARNING) << "Found a stray parameter block with id: "
-                 << target_parameter_id
-                 << ". This is unusual, but allowed. Attempting to infer"
-                    " the user-implied settings.";
-    if (audio_elements.empty() ||
-        audio_elements.begin()->second.codec_config == nullptr) {
-      return absl::UnknownError(
-          "No matching Codec Config OBU found. Cannot infer parameter rate.");
-    }
-    per_id_metadata.param_definition.parameter_rate_ =
-        audio_elements.begin()->second.codec_config->GetOutputSampleRate();
-
-    per_id_metadata.param_definition.param_definition_mode_ = 1;
-    if (parameter_block_metadata.subblocks().empty()) {
-      LOG(ERROR) << "The stray parameter block had no subblocks. Cannot "
-                    "infer type.";
-      return absl::UnknownError("");
-    }
-
-    auto& param_definition_type = per_id_metadata.param_definition_type;
-    const auto& first_subblock = parameter_block_metadata.subblocks(0);
-    // Get the type of the parameter block based on the user input data.
-    if (first_subblock.has_mix_gain_parameter_data()) {
-      param_definition_type = ParamDefinition::kParameterDefinitionMixGain;
-    } else if (first_subblock.has_demixing_info_parameter_data()) {
-      param_definition_type = ParamDefinition::kParameterDefinitionDemixing;
-    } else if (first_subblock.has_recon_gain_info_parameter_data()) {
-      param_definition_type = ParamDefinition::kParameterDefinitionReconGain;
-    } else {
-      LOG(ERROR) << "The stray parameter block had an unknown type of "
-                    "parameter data. Cannot infer type.";
-      return absl::UnknownError("");
-    }
-
-    return absl::OkStatus();
+    return absl::InvalidArgumentError(absl::StrCat(
+        "Found a stray parameter block with id: ", target_parameter_id, "."));
   }
 
   const auto [parameter_id, param_definition] = *iter;
@@ -703,9 +665,8 @@ absl::Status ParameterBlockGenerator::Initialize(
     if (inserted) {
       // Create a new entry.
       auto& per_id_metadata = iter->second;
-      RETURN_IF_NOT_OK(
-          GetPerIdMetadata(parameter_id, audio_elements, param_definitions,
-                           parameter_block_metadata, per_id_metadata));
+      RETURN_IF_NOT_OK(GetPerIdMetadata(parameter_id, audio_elements,
+                                        param_definitions, per_id_metadata));
     }
 
     const auto param_definition_type = iter->second.param_definition_type;

diff --git a/iamf/cli/tests/parameter_block_generator_test.cc b/iamf/cli/tests/parameter_block_generator_test.cc
@@ -510,7 +510,7 @@ TEST(ParameterBlockGeneratorTest, GenerateReconGainParameterBlocks) {
                                 /*expected_end_timestamps=*/{8, 16});
 }
 
-TEST(Generate, FailsWhenGeneratingStrayParameterBlocks) {
+TEST(Initialize, FailsWhenThereAreStrayParameterBlocks) {
   iamf_tools_cli_proto::UserMetadata user_metadata;
   absl::flat_hash_map<uint32_t, PerIdParameterMetadata>
       parameter_id_to_metadata;
@@ -529,22 +529,10 @@ TEST(Generate, FailsWhenGeneratingStrayParameterBlocks) {
                                     kOverrideComputedReconGains,
                                     parameter_id_to_metadata);
   absl::flat_hash_map<uint32_t, const ParamDefinition*> param_definitions;
-  EXPECT_TRUE(generator
-                  .Initialize(ia_sequence_header_obu, audio_elements,
-                              mix_presentation_obus, param_definitions)
-                  .ok());
-
-  // Global timing Module; needed when calling `GenerateDemixing()`.
-  GlobalTimingModule global_timing_module;
-  ASSERT_TRUE(
-      global_timing_module
-          .Initialize(audio_elements, codec_config_obus, param_definitions)
-          .ok());
-
-  std::list<ParameterBlockWithData> output_parameter_blocks;
-  EXPECT_FALSE(
-      generator.GenerateDemixing(global_timing_module, output_parameter_blocks)
-          .ok());
+  EXPECT_FALSE(generator
+                   .Initialize(ia_sequence_header_obu, audio_elements,
+                               mix_presentation_obus, param_definitions)
+                   .ok());
 }
 
 }  // namespace