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

Bug 1295541 - Move mInitPromise.DisconnectIfExists() into DecoderData::ShutdownDecoder(). r=jya

Browse Source 
MozReview-Commit-ID: 67MvFfSU73X

--HG--
extra : rebase_source : b959219122e8041745d3ef191e68fbfe7a2e1fb0
This commit is contained in:
JW Wang 2016-08-16 19:08:24 +08:00
parent 5695b2c3e7
commit ffe7c10202
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/media/MediaFormatReader.cpp
View File

@ -103,7 +103,6 @@ MediaFormatReader::Shutdown()
if (mAudio.HasPromise()) {
mAudio.RejectPromise(CANCELED, __func__);
}
mAudio.mInitPromise.DisconnectIfExists();
mAudio.ShutdownDecoder();
}
if (mAudio.mTrackDemuxer) {
@ -123,7 +122,6 @@ MediaFormatReader::Shutdown()
if (mVideo.HasPromise()) {
mVideo.RejectPromise(CANCELED, __func__);
}
mVideo.mInitPromise.DisconnectIfExists();
mVideo.ShutdownDecoder();
}
if (mVideo.mTrackDemuxer) {
@ -1971,10 +1969,7 @@ void MediaFormatReader::ReleaseMediaResources()
if (mVideoFrameContainer) {
mVideoFrameContainer->ClearCurrentFrame();
}
mVideo.mInitPromise.DisconnectIfExists();
mVideo.ShutdownDecoder();
mAudio.mInitPromise.DisconnectIfExists();
mAudio.ShutdownDecoder();
}

1
dom/media/MediaFormatReader.h
View File

@ -276,6 +276,7 @@ private:
const char* mDescription;
void ShutdownDecoder()
{
mInitPromise.DisconnectIfExists();
MonitorAutoLock mon(mMonitor);
if (mDecoder) {
mDecoder->Shutdown();