Bug 1357040 - Part 1: Abort if demuxer initialisation isn't complete. r=jwwang, a=gchang
authorJean-Yves Avenard <jyavenard@mozilla.com>
Tue, 25 Apr 2017 15:28:31 +0200
changeset 396260 82aba3466ff1fbe40d30e6a74267a59da4106a71
parent 396259 de9ea8491a29b467e2624b4de28977b199536981
child 396261 4dc1982e436eb154ba3154f6df29585c41e47d22
push id1468
push userasasaki@mozilla.com
push dateMon, 05 Jun 2017 19:31:07 +0000
treeherdermozilla-release@0641fc6ee9d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjwwang, gchang
bugs1357040
milestone54.0
Bug 1357040 - Part 1: Abort if demuxer initialisation isn't complete. r=jwwang, a=gchang MozReview-Commit-ID: 9SSgQq272My
dom/media/MediaFormatReader.cpp
--- a/dom/media/MediaFormatReader.cpp
+++ b/dom/media/MediaFormatReader.cpp
@@ -2877,19 +2877,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;
   }