Bug 1128113 - Skip mSharedDecoderManager which is part of MozMP4. r=jya, a=bustage
authorNaoki Hirata <nhirata@mozilla.com>
Sat, 31 Jan 2015 02:22:38 -0800
changeset 226931 6cb0a06f436dc2d0eedafbe11c1594d26119d4a7
parent 226930 b22ddf26ab471443e678d1f43fa7abca395ba922
child 226932 effe5db5c5b95d985824ed9569e2a548ae5d625d
child 226961 940118b1adcd83967fbd49c96217857a91a2b2d0
push id13590
push userkli@mozilla.com
push dateSun, 01 Feb 2015 13:10:51 +0000
treeherderb2g-inbound@6cb0a06f436d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya, bustage
bugs1128113
milestone38.0a1
Bug 1128113 - Skip mSharedDecoderManager which is part of MozMP4. r=jya, a=bustage
dom/media/mediasource/MediaSourceReader.cpp
--- a/dom/media/mediasource/MediaSourceReader.cpp
+++ b/dom/media/mediasource/MediaSourceReader.cpp
@@ -394,20 +394,22 @@ MediaSourceReader::ContinueShutdown()
     return;
   }
 
   mAudioTrack = nullptr;
   mAudioReader = nullptr;
   mVideoTrack = nullptr;
   mVideoReader = nullptr;
 
+#ifdef MOZ_FMP4
   if (mSharedDecoderManager) {
     mSharedDecoderManager->Shutdown();
     mSharedDecoderManager = nullptr;
   }
+#endif
 
   MOZ_ASSERT(mAudioPromise.IsEmpty());
   MOZ_ASSERT(mVideoPromise.IsEmpty());
 
   mAudioWaitPromise.RejectIfExists(WaitForDataRejectValue(MediaData::AUDIO_DATA, WaitForDataRejectValue::SHUTDOWN), __func__);
   mVideoWaitPromise.RejectIfExists(WaitForDataRejectValue(MediaData::VIDEO_DATA, WaitForDataRejectValue::SHUTDOWN), __func__);
 
   MediaDecoderReader::Shutdown()->ChainTo(mMediaSourceShutdownPromise.Steal(), __func__);