Bug 1128113 - Skip mSharedDecoderManager which is part of MozMP4. r=jya, a=bajaj
authorNaoki Hirata <nhirata@mozilla.com>
Sat, 31 Jan 2015 02:22:38 -0800
changeset 232689 11d93135c678052715ec2cf53603511ddecb980a
parent 232688 ee6187bd28adf16e0527be176a337ec3f6dbfef6
child 232690 67dce4335ae9bbaf07497cc26219e348a5dff65a
push id93
push userkli@mozilla.com
push dateTue, 03 Feb 2015 03:45:14 +0000
treeherdermozilla-b2g37_v2_2@11d93135c678 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya, bajaj
bugs1128113
milestone37.0a2
Bug 1128113 - Skip mSharedDecoderManager which is part of MozMP4. r=jya, a=bajaj
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__);