Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-23 18:26:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1161443: Always read SDM::mWaitForInternalDrain while holding monitor. r=gerald

Browse Source
This commit is contained in:
Jean-Yves Avenard 2015-05-06 09:58:09 +10:00
parent dbf43400f9
commit aacb467ca4
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dom/media/fmp4/SharedDecoderManager.cpp
View File

@ -150,9 +150,16 @@ void
SharedDecoderManager::SetIdle(MediaDataDecoder* aProxy)
{
if (aProxy && mActiveProxy == aProxy) {
MonitorAutoLock mon(mMonitor);
mWaitForInternalDrain = true;
if (NS_SUCCEEDED(mActiveProxy->Drain())) {
MonitorAutoLock mon(mMonitor);
nsresult rv;
{
// We don't want to hold the lock while calling Drain() has some
// platform implementations call DrainComplete() immediately.
MonitorAutoUnlock mon(mMonitor);
rv = mActiveProxy->Drain();
}
if (NS_SUCCEEDED(rv)) {
while (mWaitForInternalDrain) {
mon.Wait();
}
@ -165,13 +172,15 @@ SharedDecoderManager::SetIdle(MediaDataDecoder* aProxy)
void
SharedDecoderManager::DrainComplete()
{
if (mWaitForInternalDrain) {
{
MonitorAutoLock mon(mMonitor);
mWaitForInternalDrain = false;
mon.NotifyAll();
} else {
mActiveCallback->DrainComplete();
if (mWaitForInternalDrain) {
mWaitForInternalDrain = false;
mon.NotifyAll();
return;
}
}
mActiveCallback->DrainComplete();
}
void