mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-25 03:05:34 +00:00
Bug 1295541 - Move mInitPromise.DisconnectIfExists() into DecoderData::ShutdownDecoder(). r=jya
MozReview-Commit-ID: 67MvFfSU73X --HG-- extra : rebase_source : b959219122e8041745d3ef191e68fbfe7a2e1fb0
This commit is contained in:
parent
5695b2c3e7
commit
ffe7c10202
@ -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();
|
||||
}
|
||||
|
||||
|
@ -276,6 +276,7 @@ private:
|
||||
const char* mDescription;
|
||||
void ShutdownDecoder()
|
||||
{
|
||||
mInitPromise.DisconnectIfExists();
|
||||
MonitorAutoLock mon(mMonitor);
|
||||
if (mDecoder) {
|
||||
mDecoder->Shutdown();
|
||||
|
Loading…
Reference in New Issue
Block a user