From b17957ac52c833396dc220fa6bf61d02b8f5cbc1 Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Wed, 22 Mar 2023 13:21:44 +0100 Subject: [PATCH] Use an audio file when AudioConfig::input_file_name is specified. Change-Id: Ib4d400c8fbefc13556f9b47c62505cbb7f7c6dbc Bug: None Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/298741 Commit-Queue: Jeremy Leconte Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#39643} --- test/pc/e2e/peer_params_preprocessor.cc | 8 ++------ test/pc/e2e/test_peer_factory.cc | 15 ++++++--------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/test/pc/e2e/peer_params_preprocessor.cc b/test/pc/e2e/peer_params_preprocessor.cc index 05372125d2..fa3351adb3 100644 --- a/test/pc/e2e/peer_params_preprocessor.cc +++ b/test/pc/e2e/peer_params_preprocessor.cc @@ -200,12 +200,8 @@ void PeerParamsPreprocessor::ValidateParams(const PeerConfigurer& peer) { "video and one audio). Duplicate audio_config.sync_group=" << p.audio_config->sync_group.value(); } - // Check that if mode input file name specified only if mode is kFile. - if (p.audio_config.value().mode == AudioConfig::Mode::kGenerated) { - RTC_CHECK(!p.audio_config.value().input_file_name); - } - if (p.audio_config.value().mode == AudioConfig::Mode::kFile) { - RTC_CHECK(p.audio_config.value().input_file_name); + // Check that if input file name specified, the file actually exists. + if (p.audio_config.value().input_file_name) { RTC_CHECK( test::FileExists(p.audio_config.value().input_file_name.value())) << p.audio_config.value().input_file_name.value() << " doesn't exist"; diff --git a/test/pc/e2e/test_peer_factory.cc b/test/pc/e2e/test_peer_factory.cc index 9142ed5fb1..858676fd7a 100644 --- a/test/pc/e2e/test_peer_factory.cc +++ b/test/pc/e2e/test_peer_factory.cc @@ -114,15 +114,12 @@ std::unique_ptr CreateAudioCapturer( return TestAudioDeviceModule::CreatePulsedNoiseCapturer( kGeneratedAudioMaxAmplitude, kDefaultSamplingFrequencyInHz); } - - switch (audio_config->mode) { - case AudioConfig::Mode::kGenerated: - return TestAudioDeviceModule::CreatePulsedNoiseCapturer( - kGeneratedAudioMaxAmplitude, audio_config->sampling_frequency_in_hz); - case AudioConfig::Mode::kFile: - RTC_DCHECK(audio_config->input_file_name); - return TestAudioDeviceModule::CreateWavFileReader( - audio_config->input_file_name.value(), /*repeat=*/true); + if (audio_config->input_file_name) { + return TestAudioDeviceModule::CreateWavFileReader( + *audio_config->input_file_name, /*repeat=*/true); + } else { + return TestAudioDeviceModule::CreatePulsedNoiseCapturer( + kGeneratedAudioMaxAmplitude, audio_config->sampling_frequency_in_hz); } }