Bug 1357040: P1. Abort if demuxer initialisation isn't complete. r=jwwang
authorJean-Yves Avenard <jyavenard@mozilla.com>
Tue, 25 Apr 2017 15:28:31 +0200
changeset 357204 f0e461394f7e1ebce5c902fe42ef1e7269c64b76
parent 357203 c528edf75b2e506246c21602505164032fd69ebd
child 357205 23327af4c4c70b3d096029721414b2ba7ad9a0c7
push id31788
push userkwierso@gmail.com
push dateTue, 09 May 2017 20:48:49 +0000
treeherdermozilla-central@2b6f6881a24a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjwwang
bugs1357040
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1357040: P1. Abort if demuxer initialisation isn't complete. r=jwwang MozReview-Commit-ID: 9SSgQq272My
dom/media/MediaFormatReader.cpp
--- a/dom/media/MediaFormatReader.cpp
+++ b/dom/media/MediaFormatReader.cpp
@@ -2893,19 +2893,17 @@ MediaFormatReader::NotifyTrackDemuxers()
   }
 }
 
 void
 MediaFormatReader::NotifyDataArrived()
 {
   MOZ_ASSERT(OnTaskQueue());
 
-  if (mShutdown
-      || !mDemuxer
-      || (!mDemuxerInitDone && !mDemuxerInitRequest.Exists())) {
+  if (mShutdown || !mDemuxer || !mDemuxerInitDone) {
     return;
   }
 
   if (mNotifyDataArrivedPromise.Exists()) {
     // Already one in progress. Set the dirty flag so we can process it later.
     mPendingNotifyDataArrived = true;
     return;
   }