From 583b6ec5eb91c60d349953d1cf739160dfd126de Mon Sep 17 00:00:00 2001 From: Eugen Sawin Date: Mon, 19 Oct 2015 20:11:35 +0200 Subject: [PATCH] Bug 1211443 - Drop scheduled update if decoder initialization isn't done yet. r=jya --- dom/media/MediaFormatReader.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dom/media/MediaFormatReader.cpp b/dom/media/MediaFormatReader.cpp index afca7f79a570..01fd31b86705 100644 --- a/dom/media/MediaFormatReader.cpp +++ b/dom/media/MediaFormatReader.cpp @@ -1047,7 +1047,7 @@ MediaFormatReader::Update(TrackType aTrack) { MOZ_ASSERT(OnTaskQueue()); - if (mShutdown || !mInitDone) { + if (mShutdown) { return; } @@ -1058,6 +1058,10 @@ MediaFormatReader::Update(TrackType aTrack) auto& decoder = GetDecoderData(aTrack); decoder.mUpdateScheduled = false; + if (!mInitDone) { + return; + } + if (UpdateReceivedNewData(aTrack)) { LOGV("Nothing more to do"); return;