zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing the intelligibility enhancer.

Browse Source 
The intelligibility enhancer is always disabled and it is the only non-test
target using the lapped transform in common_audio (which we planned to remove).

Bug: webrtc:9689, webrtc:5298
Change-Id: Ida65d3aa11ac366471e7e5cbc053108b376c67d8
Reviewed-on: https://webrtc-review.googlesource.com/96460
Commit-Queue: Alessio Bazzica <alessiob@webrtc.org>
Reviewed-by: Alex Loiko <aleloi@webrtc.org>
Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Per Åhgren <peah@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24504}
This commit is contained in:
Alessio Bazzica
2018-08-30 13:01:34 +02:00
committed by Commit Bot
parent fc173d00ec
commit cc22f51988
33 changed files with 17 additions and 1723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
modules/audio_processing/audio_processing_performance_unittest.cc
View File

@ -26,14 +26,6 @@
#include "test/gtest.h"
#include "test/testsupport/perf_test.h"
// Check to verify that the define for the intelligibility enhancer is properly
// set.
#if !defined(WEBRTC_INTELLIGIBILITY_ENHANCER) || \
(WEBRTC_INTELLIGIBILITY_ENHANCER != 0 && \
WEBRTC_INTELLIGIBILITY_ENHANCER != 1)
#error "Set WEBRTC_INTELLIGIBILITY_ENHANCER to either 0 or 1"
#endif
namespace webrtc {
namespace {
@ -49,7 +41,6 @@ enum class ProcessorType { kRender, kCapture };
enum class SettingsType {
kDefaultApmDesktop,
kDefaultApmMobile,
kDefaultApmDesktopAndIntelligibilityEnhancer,
kAllSubmodulesTurnedOff,
kDefaultApmDesktopWithoutDelayAgnostic,
kDefaultApmDesktopWithoutExtendedFilter
@ -99,20 +90,6 @@ struct SimulationConfig {
simulation_configs.push_back(SimulationConfig(sample_rate, settings));
}
}
#if WEBRTC_INTELLIGIBILITY_ENHANCER == 1
const SettingsType intelligibility_enhancer_settings[] = {
SettingsType::kDefaultApmDesktopAndIntelligibilityEnhancer};
const int intelligibility_enhancer_sample_rates[] = {8000, 16000, 32000,
48000};
for (auto sample_rate : intelligibility_enhancer_sample_rates) {
for (auto settings : intelligibility_enhancer_settings) {
simulation_configs.push_back(SimulationConfig(sample_rate, settings));
}
}
#endif
#endif
const SettingsType mobile_settings[] = {SettingsType::kDefaultApmMobile};
@ -137,9 +114,6 @@ struct SimulationConfig {
case SettingsType::kDefaultApmDesktop:
description = "DefaultApmDesktop";
break;
case SettingsType::kDefaultApmDesktopAndIntelligibilityEnhancer:
description = "DefaultApmDesktopAndIntelligibilityEnhancer";
break;
case SettingsType::kAllSubmodulesTurnedOff:
description = "AllSubmodulesOff";
break;
@ -538,16 +512,6 @@ class CallSimulator : public ::testing::TestWithParam<SimulationConfig> {
apm_->SetExtraOptions(config);
break;
}
case SettingsType::kDefaultApmDesktopAndIntelligibilityEnhancer: {
Config config;
config.Set<Intelligibility>(new Intelligibility(true));
add_default_desktop_config(&config);
apm_.reset(AudioProcessingBuilder().Create(config));
ASSERT_TRUE(!!apm_);
set_default_desktop_apm_runtime_settings(apm_.get());
apm_->SetExtraOptions(config);
break;
}
case SettingsType::kAllSubmodulesTurnedOff: {
apm_.reset(AudioProcessingBuilder().Create());
ASSERT_TRUE(!!apm_);