Bug 1207439 - Don't use GMPVideoDecoderTrialCreator for Primetime. r=edwin,a=sylvestre
authorChris Pearce <cpearce@mozilla.com>
Fri, 25 Sep 2015 14:19:46 +1200
changeset 296148 f1b8f0d4fca2e01913abacd5fbedef3fdebc2959
parent 296147 862772e587267211efc6bd98af61de96ed432bb7
child 296149 68577583acedfc6c366cdf82c99444e08327fa36
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersedwin, sylvestre
bugs1207439
milestone43.0a2
Bug 1207439 - Don't use GMPVideoDecoderTrialCreator for Primetime. r=edwin,a=sylvestre
dom/media/eme/MediaKeySystemAccessManager.cpp
--- a/dom/media/eme/MediaKeySystemAccessManager.cpp
+++ b/dom/media/eme/MediaKeySystemAccessManager.cpp
@@ -75,28 +75,23 @@ MediaKeySystemAccessManager::Request(Det
   Sequence<MediaKeySystemOptions> optionsNotPassed;
   const auto& options = aOptions.WasPassed() ? aOptions.Value() : optionsNotPassed;
   Request(aPromise, aKeySystem, options, RequestType::Initial);
 }
 
 static bool
 ShouldTrialCreateGMP(const nsAString& aKeySystem)
 {
-  // Trial create where the CDM has a decoder;
-  // * ClearKey and Primetime on Windows Vista and later.
-  // * Primetime on MacOSX Lion and later.
-  return
-    Preferences::GetBool("media.gmp.trial-create.enabled", false) &&
+  // Trial create where the CDM has a Windows Media Foundation decoder.
 #ifdef XP_WIN
-    IsVistaOrLater();
-#elif defined(XP_MACOSX)
-    aKeySystem.EqualsLiteral("com.adobe.primetime") &&
-    nsCocoaFeatures::OnLionOrLater();
+  return Preferences::GetBool("media.gmp.trial-create.enabled", false) &&
+         aKeySystem.EqualsLiteral("org.w3.clearkey") &&
+         IsVistaOrLater();
 #else
-    false;
+  return false;
 #endif
 }
 
 void
 MediaKeySystemAccessManager::Request(DetailedPromise* aPromise,
                                      const nsAString& aKeySystem,
                                      const Sequence<MediaKeySystemOptions>& aOptions,
                                      RequestType aType)