nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1825142 - part9 : fix string leaking in testing. r=media-playback-reviewers,aosmond

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D197404
This commit is contained in:
alwu 2024-01-04 04:13:05 +00:00
parent d5a1d5c67a
commit 6a1da274be
1 changed files with 36 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

42
dom/media/eme/mediafoundation/WMFCDMImpl.cpp
View file

@ -8,6 +8,8 @@
#include <unordered_map>
#include "mozilla/AppShutdown.h"
#include "mozilla/ClearOnShutdown.h"
#include "mozilla/dom/MediaKeySession.h"
#include "mozilla/dom/KeySystemNames.h"
@ -15,27 +17,53 @@ namespace mozilla {
/* static */
bool WMFCDMImpl::Supports(const nsAString& aKeySystem) {
static std::map<nsString, bool> supports;
MOZ_ASSERT(NS_IsMainThread());
if (AppShutdown::IsInOrBeyond(ShutdownPhase::AppShutdownConfirmed)) {
return false;
}
static std::map<nsString, bool> sSupports;
static bool sSetRunOnShutdown = false;
if (!sSetRunOnShutdown) {
GetMainThreadSerialEventTarget()->Dispatch(
NS_NewRunnableFunction("WMFCDMImpl::Supports", [&] {
RunOnShutdown([&] { sSupports.clear(); },
ShutdownPhase::XPCOMShutdown);
}));
sSetRunOnShutdown = true;
}
nsString key(aKeySystem);
if (const auto& s = supports.find(key); s != supports.end()) {
if (const auto& s = sSupports.find(key); s != sSupports.end()) {
return s->second;
}
RefPtr<WMFCDMImpl> cdm = MakeRefPtr<WMFCDMImpl>(aKeySystem);
nsTArray<KeySystemConfig> configs;
bool s = cdm->GetCapabilities(configs);
supports[key] = s;
sSupports[key] = s;
return s;
}
bool WMFCDMImpl::GetCapabilities(nsTArray<KeySystemConfig>& aOutConfigs) {
nsCOMPtr<nsISerialEventTarget> backgroundTaskQueue;
NS_CreateBackgroundTaskQueue(__func__, getter_AddRefs(backgroundTaskQueue));
MOZ_ASSERT(NS_IsMainThread());
if (AppShutdown::IsInOrBeyond(ShutdownPhase::AppShutdownConfirmed)) {
return false;
}
// Retrieve result from our cached key system
static std::unordered_map<std::string, nsTArray<KeySystemConfig>>
sKeySystemConfigs{};
static bool sSetRunOnShutdown = false;
if (!sSetRunOnShutdown) {
GetMainThreadSerialEventTarget()->Dispatch(
NS_NewRunnableFunction("WMFCDMImpl::GetCapabilities", [&] {
RunOnShutdown([&] { sKeySystemConfigs.clear(); },
ShutdownPhase::XPCOMShutdown);
}));
sSetRunOnShutdown = true;
}
// Retrieve result from our cached key system
auto keySystem = std::string{NS_ConvertUTF16toUTF8(mKeySystem).get()};
if (auto rv = sKeySystemConfigs.find(keySystem);
rv != sKeySystemConfigs.end()) {
@ -49,6 +77,8 @@ bool WMFCDMImpl::GetCapabilities(nsTArray<KeySystemConfig>& aOutConfigs) {
}
// Not cached result, ask the remote process.
nsCOMPtr<nsISerialEventTarget> backgroundTaskQueue;
NS_CreateBackgroundTaskQueue(__func__, getter_AddRefs(backgroundTaskQueue));
if (!mCDM) {
mCDM = MakeRefPtr<MFCDMChild>(mKeySystem);
}