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

Bug 1132342: Handle race should operation be aborted while reading metadata. r=karlt

Browse Source
This commit is contained in:
Jean-Yves Avenard 2015-02-24 16:38:41 +11:00
parent 18096462b2
commit 259aca3f47
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/media/mediasource/TrackBuffer.cpp
View File

@ -614,6 +614,10 @@ TrackBuffer::InitializeDecoder(SourceBufferDecoder* aDecoder)
MSE_DEBUG("was shut down while reading metadata. Aborting initialization."); MSE_DEBUG("was shut down while reading metadata. Aborting initialization.");
return; return;
} }
if (mCurrentDecoder != aDecoder) {
MSE_DEBUG("append was cancelled. Aborting initialization.");
return;
}
if (NS_SUCCEEDED(rv) && reader->IsWaitingOnCDMResource()) { if (NS_SUCCEEDED(rv) && reader->IsWaitingOnCDMResource()) {
mWaitingDecoders.AppendElement(aDecoder); mWaitingDecoders.AppendElement(aDecoder);