Bug 1779498 - Remove config for the residual echo detector. r=padenot

Differential Revision: https://phabricator.services.mozilla.com/D181563
This commit is contained in:
Andreas Pehrson 2023-08-08 10:09:32 +00:00
parent 8b485608f9
commit d039143937
4 changed files with 2 additions and 18 deletions

View File

@ -2082,7 +2082,6 @@ MediaManager::MediaManager(already_AddRefed<TaskQueue> aMediaThread)
mPrefs.mHPFOn = false;
mPrefs.mNoiseOn = false;
mPrefs.mTransientOn = false;
mPrefs.mResidualEchoOn = false;
mPrefs.mAgc2Forced = false;
#ifdef MOZ_WEBRTC
mPrefs.mAgc =
@ -2105,13 +2104,12 @@ MediaManager::MediaManager(already_AddRefed<TaskQueue> aMediaThread)
}
LOG("%s: default prefs: %dx%d @%dfps, %dHz test tones, aec: %s,"
"agc: %s, hpf: %s, noise: %s, agc level: %d, agc version: %s, noise "
"level: %d, transient: %s, residual echo: %s, channels %d",
"level: %d, transient: %s, channels %d",
__FUNCTION__, mPrefs.mWidth, mPrefs.mHeight, mPrefs.mFPS, mPrefs.mFreq,
mPrefs.mAecOn ? "on" : "off", mPrefs.mAgcOn ? "on" : "off",
mPrefs.mHPFOn ? "on" : "off", mPrefs.mNoiseOn ? "on" : "off", mPrefs.mAgc,
mPrefs.mAgc2Forced ? "2" : "1", mPrefs.mNoise,
mPrefs.mTransientOn ? "on" : "off", mPrefs.mResidualEchoOn ? "on" : "off",
mPrefs.mChannels);
mPrefs.mTransientOn ? "on" : "off", mPrefs.mChannels);
}
NS_IMPL_ISUPPORTS(MediaManager, nsIMediaManagerService, nsIMemoryReporter,
@ -3330,8 +3328,6 @@ void MediaManager::GetPrefs(nsIPrefBranch* aBranch, const char* aData) {
&mPrefs.mNoiseOn);
GetPrefBool(aBranch, "media.getusermedia.transient_enabled", aData,
&mPrefs.mTransientOn);
GetPrefBool(aBranch, "media.getusermedia.residual_echo_enabled", aData,
&mPrefs.mResidualEchoOn);
GetPrefBool(aBranch, "media.getusermedia.agc2_forced", aData,
&mPrefs.mAgc2Forced);
GetPref(aBranch, "media.getusermedia.agc", aData, &mPrefs.mAgc);

View File

@ -34,7 +34,6 @@ class MediaEnginePrefs {
mHPFOn(false),
mNoiseOn(false),
mTransientOn(false),
mResidualEchoOn(false),
mAgc2Forced(false),
mAgc(0),
mNoise(0),
@ -50,7 +49,6 @@ class MediaEnginePrefs {
bool mHPFOn;
bool mNoiseOn;
bool mTransientOn;
bool mResidualEchoOn;
bool mAgc2Forced;
int32_t mAgc;
int32_t mNoise;

View File

@ -211,13 +211,6 @@ void MediaEngineWebRTCMicrophoneSource::ApplySettings(
mAudioProcessingConfig.high_pass_filter.enabled = aPrefs.mHPFOn;
// See https://bugs.chromium.org/p/webrtc/issues/detail?id=11539 for more
// info. Our pref defaults to false, and if this is truly as unhelpful
// as the upstream bug claim, we could delete the pref that drive this:
// media.getusermedia.residual_echo_enabled. See Bug 1779498.
// mAudioProcessingConfig.residual_echo_detector.enabled =
// aPrefs.mResidualEchoOn;
RefPtr<MediaEngineWebRTCMicrophoneSource> that = this;
CubebUtils::AudioDeviceID deviceID = mDeviceInfo->DeviceID();
NS_DispatchToMainThread(NS_NewRunnableFunction(
@ -991,8 +984,6 @@ void AudioInputProcessing::PacketizeAndProcess(MediaTrackGraphImpl* aGraph,
AddIfValue("%lf", divergent_filter_fraction);
AddIfValue("%d", delay_median_ms);
AddIfValue("%d", delay_standard_deviation_ms);
AddIfValue("%lf", residual_echo_likelihood);
AddIfValue("%lf", residual_echo_likelihood_recent_max);
AddIfValue("%d", delay_ms);
#undef AddIfValue
LOG("AudioProcessing statistics: %s", msg);

View File

@ -352,7 +352,6 @@ pref("media.peerconnection.dtls.version.min", 771);
pref("media.getusermedia.aec_enabled", true);
pref("media.getusermedia.aec", 1); // kModerateSuppression
pref("media.getusermedia.use_aec_mobile", false);
pref("media.getusermedia.residual_echo_enabled", false);
pref("media.getusermedia.noise_enabled", true);
pref("media.getusermedia.noise", 2); // kHigh
pref("media.getusermedia.agc_enabled", true);