Bug 1357040: P1. Abort if demuxer initialisation isn't complete. r?jwwang draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Tue, 25 Apr 2017 15:28:31 +0200
changeset 574685 1a5b2cab4d3427553b490535608883816b22fb73
parent 574684 8114d5990604b54ac6c42b296ab290826439fb89
child 574686 237420895fe75407c68d36048e732a2722ba24f0
push id57801
push userbmo:jyavenard@mozilla.com
push dateTue, 09 May 2017 09:52:33 +0000
reviewersjwwang
bugs1357040
milestone55.0a1
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;
   }