Bug 1157203: Fix SharedDecoderProxy::IsWaitingMediaResources( . r=kentuckyfriedtakahe
authorJean-Yves Avenard <jyavenard@mozilla.com>
Fri, 01 May 2015 15:27:29 +1000
changeset 273347 0c193e833fc3ed166a3b5331bc8b1b7a5a22be3a
parent 273346 4b77e03a478830b6c62688fc5ac1117e3f684563
child 273348 5bb68945a86e326201d857d229c5874970b9559e
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskentuckyfriedtakahe
bugs1157203
milestone40.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 1157203: Fix SharedDecoderProxy::IsWaitingMediaResources( . r=kentuckyfriedtakahe Don't wait until the decoders has received data to check if it's ready or not.
dom/media/fmp4/SharedDecoderManager.cpp
--- a/dom/media/fmp4/SharedDecoderManager.cpp
+++ b/dom/media/fmp4/SharedDecoderManager.cpp
@@ -237,20 +237,17 @@ SharedDecoderProxy::Shutdown()
 {
   mManager->SetIdle(this);
   return NS_OK;
 }
 
 bool
 SharedDecoderProxy::IsWaitingMediaResources()
 {
-  if (mManager->mActiveProxy == this) {
-    return mManager->mDecoder->IsWaitingMediaResources();
-  }
-  return mManager->mActiveProxy != nullptr;
+  return mManager->mDecoder->IsWaitingMediaResources();
 }
 
 bool
 SharedDecoderProxy::IsHardwareAccelerated() const
 {
   return mManager->mDecoder->IsHardwareAccelerated();
 }