author | Mats Palmgren <mats@mozilla.com> |
Tue, 21 Jun 2016 13:23:29 +0200 | |
changeset 344271 | 24999edead4ee8f1fa54c2820a436ba4b266b38b |
parent 344270 | 3558f6ec301b0101d2e882ba8b25709f671bdd57 |
child 344272 | 20167cee53dcbb90a2af3142306c64331ebda025 |
child 344297 | 46178702a3cae1d9f18228c4d7a0af99a0b0ebcc |
push id | 1230 |
push user | jlund@mozilla.com |
push date | Mon, 31 Oct 2016 18:13:35 +0000 |
treeherder | mozilla-release@5e06e3766db2 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | cpearce |
bugs | 1280743 |
milestone | 50.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
|
--- a/dom/media/gmp/GMPParent.cpp +++ b/dom/media/gmp/GMPParent.cpp @@ -35,18 +35,20 @@ using CrashReporter::GetIDFromMinidump; #endif #include "mozilla/Telemetry.h" #ifdef XP_WIN #include "WMFDecoderModule.h" #endif +#ifdef MOZ_EME #include "mozilla/dom/WidevineCDMManifestBinding.h" #include "widevine-adapter/WidevineAdapter.h" +#endif namespace mozilla { #undef LOG #undef LOGD extern LogModule* GetGMPLog(); #define LOG(level, x, ...) MOZ_LOG(GetGMPLog(), (level), (x, ##__VA_ARGS__)) @@ -802,24 +804,28 @@ GMPParent::ReadGMPMetaData() return GenericPromise::CreateAndReject(rv, __func__); } infoFile->AppendRelativePath(mName + NS_LITERAL_STRING(".info")); if (FileExists(infoFile)) { return ReadGMPInfoFile(infoFile); } +#ifdef MOZ_EME // Maybe this is the Widevine adapted plugin? nsCOMPtr<nsIFile> manifestFile; rv = mDirectory->Clone(getter_AddRefs(manifestFile)); if (NS_FAILED(rv)) { return GenericPromise::CreateAndReject(rv, __func__); } manifestFile->AppendRelativePath(NS_LITERAL_STRING("manifest.json")); return ReadChromiumManifestFile(manifestFile); +#else + return GenericPromise::CreateAndReject(NS_ERROR_FAILURE, __func__); +#endif } RefPtr<GenericPromise> GMPParent::ReadGMPInfoFile(nsIFile* aFile) { GMPInfoFileParser parser; if (!parser.Init(aFile)) { return GenericPromise::CreateAndReject(NS_ERROR_FAILURE, __func__); @@ -923,16 +929,17 @@ GMPParent::ReadChromiumManifestFile(nsIF } RefPtr<GenericPromise> GMPParent::ParseChromiumManifest(nsString aJSON) { LOGD("%s: for '%s'", __FUNCTION__, NS_LossyConvertUTF16toASCII(aJSON).get()); MOZ_ASSERT(NS_IsMainThread()); +#ifdef MOZ_EME mozilla::dom::WidevineCDMManifest m; if (!m.Init(aJSON)) { return GenericPromise::CreateAndReject(NS_ERROR_FAILURE, __func__); } nsresult ignored; // Note: ToInteger returns 0 on failure. if (!WidevineAdapter::Supports(m.mX_cdm_module_versions.ToInteger(&ignored), m.mX_cdm_interface_versions.ToInteger(&ignored), @@ -955,16 +962,20 @@ GMPParent::ParseChromiumManifest(nsStrin MOZ_ASSERT(mName.EqualsLiteral("widevinecdm")); mAdapter = NS_LITERAL_STRING("widevine"); #ifdef XP_WIN mLibs = NS_LITERAL_CSTRING("dxva2.dll"); #endif return GenericPromise::CreateAndResolve(true, __func__); +#else + MOZ_ASSERT_UNREACHABLE("don't call me if EME isn't enabled"); + return GenericPromise::CreateAndReject(NS_ERROR_FAILURE, __func__); +#endif } bool GMPParent::CanBeSharedCrossNodeIds() const { return !mAsyncShutdownInProgress && mNodeId.IsEmpty() && // XXX bug 1159300 hack -- maybe remove after openh264 1.4