openharmony/multimedia_drm_framework
1
0
Fork 0
mirror of https://github.com/openharmony/multimedia_drm_framework.git synced 2026-07-20 20:25:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

modify for lazy load

Browse Source 
Signed-off-by: bao92 <baoxianyue@hisilicon.com>
This commit is contained in:
bao92
2024-05-29 19:42:03 +08:00
parent c656134fb4
commit aa8bb3adbc
5 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/drm_service/server/include/key_session_service.h
+1 -1
View File
@@ -76,7 +76,7 @@ private:
StatisticsInfo statisticsInfo_;
std::string generationResult_;
std::string mediaKeyType_;
uint32_t generationDuration_;
uint32_t generationDuration_ = 0;
};
class IMediaKeySessionServiceOperatorsCallback : public virtual RefBase {
services/drm_service/server/include/mediakeysystem_service.h
+1 -1
View File
@@ -88,7 +88,7 @@ private:
sptr<OHOS::HDI::Drm::V1_0::IMediaKeySystem> hdiKeySystem_;
StatisticsInfo statisticsInfo_;
std::string generationResult_;
uint32_t generationDuration_;
uint32_t generationDuration_ = 0;
};
class IMediaKeySystemServiceOperatorsCallback : public virtual RefBase {
services/drm_service/server/src/drm_host_manager.cpp
+13 -11
View File
@@ -311,9 +311,12 @@ int32_t DrmHostManager::GetSevices(std::string &name, bool *isSurpported)
std::vector<std::string> serviceName;
/* The plugin service corresponding to name has been started, no need to reload, just mark the count. */
if (drmHostServieProxyMap[name] != nullptr) {
pluginCountMap[name]++;
DRM_DEBUG_LOG("DrmHostManager::GetSevices, the plugin service has been pulled up.");
return DRM_OK;
ret = drmHostServieProxyMap[name]->IsMediaKeySystemSupported(name, "", SECURE_UNKNOWN, *isSurpported);
if (ret == DRM_OK) {
pluginCountMap[name]++;
DRM_DEBUG_LOG("DrmHostManager::GetSevices, the plugin service has been pulled up.");
return DRM_OK;
}
}
auto servmgr = IServiceManager::Get();
ret = servmgr->ListServiceByInterfaceDesc(serviceName, "ohos.hdi.drm.v1_0.IMediaKeySystemFactory");
@@ -321,15 +324,15 @@ int32_t DrmHostManager::GetSevices(std::string &name, bool *isSurpported)
DRM_ERR_LOG("ListServiceByInterfaceDesc faild, return Code:%{public}d", ret);
return ret;
}
/*
* If the plugin is configured with lazy loading, read the service name from the configuration file.
* If lazy loading is not configured, traverse the service bound by the interface descriptor, and obtain
* the plugin service instance through the uuid and issuport interfaces
*/
loadPluginInfo(PLUGIN_LAZYLOAD_CONFIG_PATH);
if (lazyLoadPluginInfoMap.count(name) > 0) {
auto it = std::find(serviceName.begin(), serviceName.end(), lazyLoadPluginInfoMap[name]);
if (it == serviceName.end()) {
/*
* If the plugin is configured with lazy loading, read the service name from the configuration file.
* If lazy loading is not configured, traverse the service bound by the interface descriptor, and obtain
* the plugin service instance through the uuid and issuport interfaces
*/
loadPluginInfo(PLUGIN_LAZYLOAD_CONFIG_PATH);
sptr<IDeviceManager> deviceMgr = IDeviceManager::Get();
if (deviceMgr == nullptr) {
DRM_ERR_LOG("DrmHostManager:GetSevices deviceMgr == nullptr");
@@ -379,7 +382,6 @@ int32_t DrmHostManager::IsMediaKeySystemSupported(std::string &name, bool *isSur
ReleaseSevices(name);
return DRM_SERVICE_ERROR;
}
*isSurpported = true;
drmHostServieProxyMap[name] = nullptr;
ReleaseSevices(name);
DRM_INFO_LOG("DrmHostManager::IsMediaKeySystemSupported one parameters exit, isSurpported:%{public}d.",
@@ -463,7 +465,7 @@ int32_t DrmHostManager::CreateMediaKeySystem(std::string &name, sptr<IMediaKeySy
std::unique_lock<std::shared_mutex> lock(lazyLoadPluginInfoMapMtx);
int32_t ret = GetSevices(name, &isSurpported);
if (ret != DRM_OK || drmHostServieProxyMap[name] == nullptr) {
DRM_INFO_LOG("DrmHostManager::CreateMediaKeySystem faild.");
DRM_ERR_LOG("DrmHostManager::CreateMediaKeySystem faild.");
return ret;
}
drmHostDeathRecipient_ = new DrmHostDeathRecipient();
services/drm_service/server/src/key_session_service.cpp
+1 -1
View File
@@ -126,7 +126,7 @@ int32_t MediaKeySessionService::GenerateMediaKeyRequest(
ret = hdiMediaKeySession_->GenerateMediaKeyRequest(hdiMediaKeyRequestInfo, hdiMediaKeyRequest);
auto timeAfter = std::chrono::system_clock::now();
auto duration = timeAfter - timeBefore;
generationDuration_ = duration.count();
generationDuration_ = (uint32_t)duration.count();
if (ret != DRM_OK) {
generationResult_ = "failed";
DRM_ERR_LOG("MediaKeySessionService::GenerateMediaKeyRequest failed.");
services/drm_service/server/src/mediakeysystem_service.cpp
+1 -1
View File
@@ -118,7 +118,7 @@ int32_t MediaKeySystemService::GenerateKeySystemRequest(std::vector<uint8_t> &re
ret = hdiKeySystem_->GenerateKeySystemRequest(defaultUrl, request);
auto timeAfter = std::chrono::system_clock::now();
auto duration = timeAfter - timeBefore;
generationDuration_ = duration.count();
generationDuration_ = (uint32_t)duration.count();
if (ret != DRM_OK) {
DRM_ERR_LOG("MediaKeySystemService::GenerateKeySystemRequest failed.");
ReportFaultEvent(ret, "GenerateKeySystemRequest failed", "");