Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 09:45:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1447982 - Pass GraphImpl into ApplySettings. r=padenot

Browse Source 
MozReview-Commit-ID: GQlRUB3O1em

--HG--
extra : rebase_source : 80f6fc2f599a917f05de5af00103bbbff3f1caf0
This commit is contained in:
Andreas Pehrson 2018-03-26 12:18:35 +02:00
parent cb8419331d
commit deb26bcad0
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/media/webrtc/MediaEngineWebRTC.h
View File

@ -533,7 +533,8 @@ private:
void UpdateAGCSettingsIfNeeded(bool aEnable, webrtc::AgcModes aMode);
void UpdateNSSettingsIfNeeded(bool aEnable, webrtc::NsModes aMode);
void ApplySettings(const MediaEnginePrefs& aPrefs);
void ApplySettings(const MediaEnginePrefs& aPrefs,
RefPtr<MediaStreamGraphImpl> aGraph);
bool HasEnabledTrack() const;

20
dom/media/webrtc/MediaEngineWebRTCAudio.cpp
View File

@ -248,7 +248,9 @@ MediaEngineWebRTCMicrophoneSource::Reconfigure(const RefPtr<AllocationHandle>& a
return NS_ERROR_UNEXPECTED;
}
ApplySettings(mLastPrefs);
size_t i = mAllocations.IndexOf(aHandle, 0, AllocationHandleComparator());
MOZ_DIAGNOSTIC_ASSERT(i != mAllocations.NoIndex);
ApplySettings(mLastPrefs, mAllocations[i].mStream->GraphImpl());
return NS_OK;
}
@ -528,20 +530,14 @@ MediaEngineWebRTCMicrophoneSource::UpdateSingleSource(
#undef HANDLE_APM_ERROR
void
MediaEngineWebRTCMicrophoneSource::ApplySettings(const MediaEnginePrefs& aPrefs)
MediaEngineWebRTCMicrophoneSource::ApplySettings(const MediaEnginePrefs& aPrefs,
RefPtr<MediaStreamGraphImpl> aGraph)
{
AssertIsOnOwningThread();
MOZ_DIAGNOSTIC_ASSERT(aGraph);
RefPtr<MediaEngineWebRTCMicrophoneSource> that = this;
RefPtr<MediaStreamGraphImpl> graph;
for (const Allocation& allocation : mAllocations) {
if (allocation.mStream && allocation.mStream->GraphImpl()) {
graph = allocation.mStream->GraphImpl();
break;
}
}
MOZ_DIAGNOSTIC_ASSERT(graph);
NS_DispatchToMainThread(media::NewRunnableFrom([that, graph, aPrefs]() mutable {
NS_DispatchToMainThread(media::NewRunnableFrom([that, graph = Move(aGraph), aPrefs]() mutable {
that->mSettings->mEchoCancellation.Value() = aPrefs.mAecOn;
that->mSettings->mAutoGainControl.Value() = aPrefs.mAgcOn;
that->mSettings->mNoiseSuppression.Value() = aPrefs.mNoiseOn;
@ -734,7 +730,7 @@ MediaEngineWebRTCMicrophoneSource::Start(const RefPtr<const AllocationHandle>& a
mState = kStarted;
}
ApplySettings(mLastPrefs);
ApplySettings(mNetPrefs, allocation.mStream->GraphImpl());
return NS_OK;
}