admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use an audio file when AudioConfig::input_file_name is specified.

Browse Source 
Change-Id: Ib4d400c8fbefc13556f9b47c62505cbb7f7c6dbc
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/298741
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39643}
This commit is contained in:
Jeremy Leconte 2023-03-22 13:21:44 +01:00 committed by WebRTC LUCI CQ
parent c61eee28f3
commit b17957ac52
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/pc/e2e/peer_params_preprocessor.cc
View File

@ -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";

15
test/pc/e2e/test_peer_factory.cc
View File

@ -114,15 +114,12 @@ std::unique_ptr<TestAudioDeviceModule::Capturer> 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);
}
}