Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out 7f1f85ee4ba6 (bug 1143278) for Win7 near-permaorange in test_eme_canvas_blocked.html

Browse Source
This commit is contained in:
Phil Ringnalda 2015-03-15 18:30:53 -07:00
parent f735ff5b59
commit 571ce099b4
3 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dom/media/eme/CDMCaps.cpp
View File

@ -51,38 +51,10 @@ CDMCaps::AutoLock::~AutoLock()
mData.Unlock();
}
#ifdef PR_LOGGING
static void
TestCap(uint64_t aFlag,
uint64_t aCaps,
const nsACString& aCapName,
nsACString& aCapStr)
{
if (!(aFlag & aCaps)) {
return;
}
if (!aCapStr.IsEmpty()) {
aCapStr.AppendLiteral(",");
}
aCapStr.Append(aCapName);
}
nsCString
CapsToString(uint64_t aCaps)
{
nsCString capsStr;
TestCap(GMP_EME_CAP_DECRYPT_AUDIO, aCaps, NS_LITERAL_CSTRING("DecryptAudio"), capsStr);
TestCap(GMP_EME_CAP_DECRYPT_VIDEO, aCaps, NS_LITERAL_CSTRING("DecryptVideo"), capsStr);
TestCap(GMP_EME_CAP_DECRYPT_AND_DECODE_AUDIO, aCaps, NS_LITERAL_CSTRING("DecryptAndDecodeAudio"), capsStr);
TestCap(GMP_EME_CAP_DECRYPT_AND_DECODE_VIDEO, aCaps, NS_LITERAL_CSTRING("DecryptAndDecodeVideo"), capsStr);
return capsStr;
}
#endif // PR_LOGGING
void
CDMCaps::AutoLock::SetCaps(uint64_t aCaps)
{
EME_LOG("SetCaps() %s", CapsToString(aCaps).get());
EME_LOG("SetCaps()");
mData.mMonitor.AssertCurrentThreadOwns();
mData.mCaps = aCaps;
for (size_t i = 0; i < mData.mWaitForCaps.Length(); i++) {

2
dom/media/gmp/gmp-api/gmp-decryption.h
View File

@ -99,7 +99,7 @@ typedef int64_t GMPTimestamp;
//
// Note: Gecko does not currently support the caps changing at runtime.
// Set them once per plugin initialization, during the startup of
// the GMPDecryptor.
// the GMPdecryptor.
// Capability; CDM can decrypt encrypted buffers and return still
// compressed buffers back to Gecko for decompression there.

6
media/gmp-clearkey/0.1/WMFUtils.cpp
View File

@ -73,11 +73,9 @@ EnsureLibs()
static bool sInitDone = false;
static bool sInitOk = false;
if (!sInitDone) {
// Note: For AAC decoding, we need to use msauddecmft.dll on Win8,
// and msmpeg2adec.dll on earlier Windows. So if we have at least
// one of these, assume we can decode.
sInitOk = LinkMfplat() &&
(!!GetModuleHandleA("msauddecmft.dll") || !!GetModuleHandleA("msmpeg2adec.dll")) &&
!!GetModuleHandleA("msauddecmft.dll") &&
!!GetModuleHandleA("msmpeg2adec.dll") &&
!!GetModuleHandleA("msmpeg2vdec.dll");
sInitDone = true;
}