Skip to content

Commit

Permalink
No public description
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 638269795
  • Loading branch information
jwcullen committed Jun 5, 2024
1 parent 9b46203 commit fbf6e3b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
8 changes: 0 additions & 8 deletions iamf/cli/audio_frame_generator.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ class AudioFrameGenerator {
* \param audio_frame_metadata Input audio frame metadata.
* \param codec_config_metadata Input codec config metadata.
* \param audio_elements Input Audio Element OBUs with data.
* \param output_wav_directory Directory to write the output wav files.
* \param file_name_prefix Prefix of output wav file names.
* \param demixing_module Demixng module.
* \param parameters_manager Manager of parameters.
* \param global_timing_module Global Timing Module.
Expand All @@ -76,14 +74,10 @@ class AudioFrameGenerator {
iamf_tools_cli_proto::CodecConfigObuMetadata>& codec_config_metadata,
const absl::flat_hash_map<DecodedUleb128, AudioElementWithData>&
audio_elements,
const std::string& output_wav_directory,
const std::string& file_name_prefix,
const DemixingModule& demixing_module,
ParametersManager& parameters_manager,
GlobalTimingModule& global_timing_module)
: audio_elements_(audio_elements),
output_wav_directory_(output_wav_directory),
file_name_prefix_(file_name_prefix),
demixing_module_(demixing_module),
parameters_manager_(parameters_manager),
global_timing_module_(global_timing_module) {
Expand Down Expand Up @@ -177,8 +171,6 @@ class AudioFrameGenerator {
// to configure encoders.
absl::flat_hash_map<DecodedUleb128, iamf_tools_cli_proto::CodecConfig>
codec_config_metadata_;
const std::string output_wav_directory_;
const std::string file_name_prefix_;

// Mapping from audio substream IDs to encoders.
absl::flat_hash_map<uint32_t, std::unique_ptr<EncoderBase>>
Expand Down
4 changes: 1 addition & 3 deletions iamf/cli/encoder_main_lib.cc
Original file line number Diff line number Diff line change
Expand Up @@ -328,9 +328,7 @@ absl::Status GenerateObus(

AudioFrameGenerator audio_frame_generator(
user_metadata.audio_frame_metadata(),
user_metadata.codec_config_metadata(), audio_elements,
output_wav_directory,
user_metadata.test_vector_metadata().file_name_prefix(), demixing_module,
user_metadata.codec_config_metadata(), audio_elements, demixing_module,
parameters_manager, global_timing_module);
RETURN_IF_NOT_OK(audio_frame_generator.Initialize());

Expand Down
6 changes: 2 additions & 4 deletions iamf/cli/tests/audio_frame_generator_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,8 @@ void GenerateAudioFrameWithEightSamples(
// Generate the audio frames.
AudioFrameGenerator audio_frame_generator(
user_metadata.audio_frame_metadata(),
user_metadata.codec_config_metadata(), audio_elements,
output_wav_directory,
/*file_name_prefix=*/"test", demixing_module, parameters_manager,
global_timing_module);
user_metadata.codec_config_metadata(), audio_elements, demixing_module,
parameters_manager, global_timing_module);

// Initialize, iteratively add samples, generate frames, and finalize.
EXPECT_EQ(expected_initialize_is_ok, audio_frame_generator.Initialize().ok());
Expand Down

0 comments on commit fbf6e3b

Please sign in to comment.