Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-09 04:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 779721. Part 3: Don't clean up streams on the MediaGraph thread during a forced shutdown. r=jesup

Browse Source 
This is actually a better fix for bug 774597. We can rely on main thread code to call
Destroy on all the MediaStreams normally. These Destroy calls can be handled even when the
MediaGraph thread has been shut down, since MediaStreamGraphImpl::AppendMessage will
call RunDuringShutdown on the Destroy messages.
This commit is contained in:
Robert O'Callahan 2012-08-09 23:29:47 +12:00
parent cd7044913d
commit 535a1d2f48
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
content/media/MediaStreamGraph.cpp
View File

@ -1261,7 +1261,7 @@ MediaStreamGraphImpl::RunThread()
{
// Not using MonitorAutoLock since we need to unlock in a way
// that doesn't match lexical scopes.
mMonitor.Lock();
MonitorAutoLock lock(mMonitor);
PrepareUpdatesToMainThreadState();
if (mForceShutDown || (IsEmpty() && mMessageQueue.IsEmpty())) {
// Enter shutdown mode. The stable-state handler will detect this
@ -1269,18 +1269,8 @@ MediaStreamGraphImpl::RunThread()
LOG(PR_LOG_DEBUG, ("MediaStreamGraph %p waiting for main thread cleanup", this));
// Commit to shutting down this graph object.
mLifecycleState = LIFECYCLE_WAITING_FOR_MAIN_THREAD_CLEANUP;
// Move mStreams to a temporary array, because after we unlock
// mMonitor, 'this' may be deleted by the main thread.
nsTArray<nsRefPtr<MediaStream> > streams;
mStreams.SwapElements(streams);
mMonitor.Unlock();
// Unlock mMonitor while destroying our streams, since
// SourceMediaStream::DestroyImpl needs to take its lock while
// we're not holding mMonitor.
for (PRUint32 i = 0; i < streams.Length(); ++i) {
streams[i]->DestroyImpl();
}
// No need to Destroy streams here. The main-thread owner of each
// stream is responsible for calling Destroy them.
return;
}
@ -1308,8 +1298,6 @@ MediaStreamGraphImpl::RunThread()
mWaitState = WAITSTATE_RUNNING;
mNeedAnotherIteration = false;
messageQueue.SwapElements(mMessageQueue);
mMonitor.Unlock();
}
}
}