зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1638832 - Remove unused full duplex code r=padenot
Removed "media.navigator.audio.full_duplex" pref It was related to `MediaEnginePrefs::mFullDuplex` which wasn't used too, so the according code has been removed Differential Revision: https://phabricator.services.mozilla.com/D75993
This commit is contained in:
Родитель
b06ea134bf
Коммит
3f10a4c034
|
@ -1927,7 +1927,6 @@ MediaManager::MediaManager(UniquePtr<base::Thread> aMediaThread)
|
|||
mPrefs.mNoise = 0;
|
||||
mPrefs.mRoutingMode = 0;
|
||||
#endif
|
||||
mPrefs.mFullDuplex = false;
|
||||
mPrefs.mChannels = 0; // max channels default
|
||||
nsresult rv;
|
||||
nsCOMPtr<nsIPrefService> prefs =
|
||||
|
@ -1941,13 +1940,13 @@ MediaManager::MediaManager(UniquePtr<base::Thread> aMediaThread)
|
|||
LOG("%s: default prefs: %dx%d @%dfps, %dHz test tones, aec: %s,"
|
||||
"agc: %s, hpf: %s, noise: %s, aec level: %d, agc level: %d, noise level: "
|
||||
"%d, aec mobile routing mode: %d,"
|
||||
"%sfull_duplex, extended aec %s, delay_agnostic %s "
|
||||
"extended aec %s, delay_agnostic %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.mAec,
|
||||
mPrefs.mAgc, mPrefs.mNoise, mPrefs.mRoutingMode,
|
||||
mPrefs.mFullDuplex ? "" : "not ", mPrefs.mExtendedFilter ? "on" : "off",
|
||||
mPrefs.mExtendedFilter ? "on" : "off",
|
||||
mPrefs.mDelayAgnostic ? "on" : "off", mPrefs.mChannels);
|
||||
}
|
||||
|
||||
|
@ -2046,8 +2045,6 @@ MediaManager* MediaManager::Get() {
|
|||
false);
|
||||
prefs->AddObserver("media.navigator.audio.fake_frequency", sSingleton,
|
||||
false);
|
||||
prefs->AddObserver("media.navigator.audio.full_duplex", sSingleton,
|
||||
false);
|
||||
#ifdef MOZ_WEBRTC
|
||||
prefs->AddObserver("media.getusermedia.aec_enabled", sSingleton, false);
|
||||
prefs->AddObserver("media.getusermedia.aec", sSingleton, false);
|
||||
|
@ -3531,8 +3528,6 @@ void MediaManager::GetPrefs(nsIPrefBranch* aBranch, const char* aData) {
|
|||
}));
|
||||
}
|
||||
#endif
|
||||
GetPrefBool(aBranch, "media.navigator.audio.full_duplex", aData,
|
||||
&mPrefs.mFullDuplex);
|
||||
}
|
||||
|
||||
void MediaManager::Shutdown() {
|
||||
|
@ -3568,7 +3563,6 @@ void MediaManager::Shutdown() {
|
|||
this);
|
||||
prefs->RemoveObserver("media.getusermedia.channels", this);
|
||||
#endif
|
||||
prefs->RemoveObserver("media.navigator.audio.full_duplex", this);
|
||||
}
|
||||
|
||||
{
|
||||
|
|
|
@ -537,13 +537,6 @@ void MediaEncoder::ConnectMediaStreamTrack(MediaStreamTrack* aTrack) {
|
|||
LOG(LogLevel::Info, ("Connected to audio track %p", aTrack));
|
||||
|
||||
mAudioTrack = audio;
|
||||
// With full duplex we don't risk having audio come in late to the MTG
|
||||
// so we won't need a direct listener.
|
||||
const bool enableDirectListener =
|
||||
!Preferences::GetBool("media.navigator.audio.full_duplex", false);
|
||||
if (enableDirectListener) {
|
||||
audio->AddDirectListener(mAudioListener);
|
||||
}
|
||||
audio->AddListener(mAudioListener);
|
||||
} else if (VideoStreamTrack* video = aTrack->AsVideoStreamTrack()) {
|
||||
if (!mVideoEncoder) {
|
||||
|
|
|
@ -34,7 +34,6 @@ class MediaEnginePrefs {
|
|||
mAgc(0),
|
||||
mRoutingMode(0),
|
||||
mNoise(0),
|
||||
mFullDuplex(false),
|
||||
mExtendedFilter(false),
|
||||
mDelayAgnostic(false),
|
||||
mFakeDeviceChangeEventOn(false),
|
||||
|
@ -53,7 +52,6 @@ class MediaEnginePrefs {
|
|||
int32_t mAgc;
|
||||
int32_t mRoutingMode;
|
||||
int32_t mNoise;
|
||||
bool mFullDuplex;
|
||||
bool mExtendedFilter;
|
||||
bool mDelayAgnostic;
|
||||
bool mFakeDeviceChangeEventOn;
|
||||
|
|
|
@ -531,8 +531,6 @@ pref("media.videocontrols.picture-in-picture.video-toggle.min-video-secs", 45);
|
|||
pref("media.getusermedia.agc", 1); // kAdaptiveDigital
|
||||
pref("media.getusermedia.hpf_enabled", true);
|
||||
pref("media.getusermedia.aecm_output_routing", 3); // kSpeakerphone
|
||||
// full_duplex: enable cubeb full-duplex capture/playback
|
||||
pref("media.navigator.audio.full_duplex", true);
|
||||
#endif // MOZ_WEBRTC
|
||||
|
||||
#if !defined(ANDROID)
|
||||
|
|
Загрузка…
Ссылка в новой задаче