Bug 1208922. Part 5 - MDSM can now query capabilities from CDMProxy without reader setting them in MediaInfo. r=cpearce.
authorJW Wang <jwwang@mozilla.com>
Sun, 27 Sep 2015 18:59:50 +0800
changeset 265107 f946f0d4e017c7fbbddc765e4db01e7eba86e3c8
parent 265106 20b1d715338b972874f8bed076a176425dcaec0d
child 265108 1abba55f3790e39fc2d4bd35545c87051f40805c
push id65846
push userjwwang@mozilla.com
push dateWed, 30 Sep 2015 02:40:13 +0000
treeherdermozilla-inbound@1abba55f3790 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce
bugs1208922
milestone44.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 1208922. Part 5 - MDSM can now query capabilities from CDMProxy without reader setting them in MediaInfo. r=cpearce.
dom/media/MediaFormatReader.cpp
--- a/dom/media/MediaFormatReader.cpp
+++ b/dom/media/MediaFormatReader.cpp
@@ -380,23 +380,17 @@ MediaFormatReader::EnsureDecodersCreated
     if (IsEncrypted()) {
 #ifdef MOZ_EME
       // We have encrypted audio or video. We'll need a CDM to decrypt and
       // possibly decode this. Wait until we've received a CDM from the
       // JavaScript player app. Note: we still go through the motions here
       // even if EME is disabled, so that if script tries and fails to create
       // a CDM, we can detect that and notify chrome and show some UI
       // explaining that we failed due to EME being disabled.
-      {
-        MOZ_ASSERT(mCDMProxy);
-        CDMCaps::AutoLock caps(mCDMProxy->Capabilites());
-        mInfo.mVideo.mIsRenderedExternally = caps.CanRenderVideo();
-        mInfo.mAudio.mIsRenderedExternally = caps.CanRenderAudio();
-      }
-
+      MOZ_ASSERT(mCDMProxy);
       mPlatform = PlatformDecoderModule::CreateCDMWrapper(mCDMProxy);
       NS_ENSURE_TRUE(mPlatform, false);
 #else
       // EME not supported.
       return false;
 #endif
     } else {
       mPlatform = PlatformDecoderModule::Create();