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

debug

Browse Source 
Signed-off-by: m0_54007497 <liyangyang87@h-partners.com>
This commit is contained in:
m0_54007497
2025-10-24 16:18:36 +08:00
parent b35437c7bd
commit e7f0ae2deb
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/drm_service/server/src/drm_host_manager.cpp
+4 -2
View File
@@ -800,10 +800,12 @@ void DrmHostManager::WaitForNetwork()
}
void DrmHostManager::SetIsNetWork(const bool &isNetWork){
void DrmHostManager::SetIsNetWork(const bool &isNetWork)
{
this->isNetWork = isNetWork;
}
bool DrmHostManager::GetIsNetWork(){
bool DrmHostManager::GetIsNetWork()
{
return this->isNetWork;
}
} // namespace DrmStandard
services/drm_service/server/src/mediakeysystemfactory_service.cpp
+1 -2
View File
@@ -470,8 +470,7 @@ int32_t MediaKeySystemFactoryService::WriteDumpInfo(int32_t fd, std::string &dum
int32_t MediaKeySystemFactoryService::StartDrmNetObserver()
{
sptr<DrmNetObserver> drmNetObserverService_ = new DrmNetObserver();
int32_t ret;
ret = drmNetObserverService_->SetDrmHostManager(drmHostManager_);
int32_t ret = drmNetObserverService_->SetDrmHostManager(drmHostManager_);
DRM_CHECK_AND_RETURN_RET_LOG(ret != DRM_INNER_ERR_OK, DRM_INNER_ERR_INVALID_VAL, "Set drmHostManager failed");
drmNetObserverService_->StartObserver();
return ret;
services/utils/drm_net_observer.cpp
+22 -11
View File
@@ -30,14 +30,19 @@ using namespace OHOS::NetManagerStandard;
static constexpr int32_t RETRY_MAX_TIMES = 10;
static constexpr int32_t RETRY_INTERVAL_S = 1;
DrmNetObserver::~DrmNetObserver() {
DRM_CHECK_AND_RETURN_RET_LOG(startFuture_.valid(), , "startFuture_ not valid");
DrmNetObserver::~DrmNetObserver()
{
if (!startFuture_.valid()) {
DRM_WARNING_LOG("startFuture_ not valid");
return;
}
stopRequested_ = true;
StopObserver();
startFuture_.wait();
}
void DrmNetObserver::StartObserver() {
void DrmNetObserver::StartObserver()
{
DRM_INFO_LOG("DRM NetObserver Start");
stopRequested_ = false;
startFuture_ = std::async(std::launch::async, [self = sptr<DrmNetObserver>(this)]() {
@@ -46,7 +51,10 @@ void DrmNetObserver::StartObserver() {
netAllCapabilities.netCaps_.insert(NetCap::NET_CAPABILITY_INTERNET);
netSpecifier.ident_ = "";
netSpecifier.netCapabilities_ = netAllCapabilities;
sptr<NetSpecifier> specifier = new NetSpecifier(netSpecifier);
sptr<NetSpecifier> specifier = new (std::nothrow) NetSpecifier(netSpecifier);
DRM_CHECK_AND_RETURN_RET_LOG(specifier != nullptr,
DRM_INNER_ERR_MEMORY_ALLOC,
"NetSpecifier new failed");
int32_t retryCount = 0;
int32_t ret = NetConnResultCode::NET_CONN_SUCCESS;
@@ -69,7 +77,8 @@ void DrmNetObserver::StartObserver() {
});
}
int32_t DrmNetObserver::StopObserver() {
int32_t DrmNetObserver::StopObserver()
{
sptr<INetConnCallback> callbackCopy;
{
std::lock_guard<std::mutex> lock(netCallbackMutex_);
@@ -79,26 +88,27 @@ int32_t DrmNetObserver::StopObserver() {
DRM_CHECK_AND_RETURN_RET_LOG(callbackCopy, DRM_INNER_ERR_UNKNOWN, "no registered callback");
int32_t ret = NetConnClient::GetInstance().UnregisterNetConnCallback(callbackCopy);
DRM_CHECK_AND_RETURN_RET_LOG(ret == NetConnResultCode::NET_CONN_SUCCESS, DRM_INNER_ERR_UNKNOWN, "Unregister Error, ret=%d", ret);
DRM_CHECK_AND_RETURN_RET_LOG(ret == NetConnResultCode::NET_CONN_SUCCESS,
DRM_INNER_ERR_UNKNOWN, "Unregister Error, ret=%d", ret);
DRM_INFO_LOG("Unregister Success");
return DRM_INNER_ERR_OK;
}
int32_t DrmNetObserver::NetCapabilitiesChange(sptr<NetHandle>& netHandle,
const sptr<NetAllCapabilities>& netAllCap) {
const sptr<NetAllCapabilities>& netAllCap)
{
(void)netHandle;
DRM_INFO_LOG("NetCapabilitiesChange");
DRM_CHECK_AND_RETURN_RET_LOG(netAllCap, DRM_INNER_ERR_INVALID_VAL, "NetAllCap is nullptr");
return HandleNetAllCap(*netAllCap);
}
int32_t DrmNetObserver::HandleNetAllCap(const NetAllCapabilities& netAllCap) {
int32_t DrmNetObserver::HandleNetAllCap(const NetAllCapabilities& netAllCap)
{
DRM_CHECK_AND_RETURN_RET_LOG(m_drmHostManager, DRM_INNER_ERR_INVALID_VAL, "drmHostManager is nullptr");
bool hasInternet = netAllCap.netCaps_.count(NetCap::NET_CAPABILITY_INTERNET) &&
netAllCap.netCaps_.count(NetCap::NET_CAPABILITY_VALIDATED);
bool isChecking = netAllCap.netCaps_.count(NetCap::NET_CAPABILITY_CHECKING_CONNECTIVITY);
if (hasInternet && !isChecking) {
DRM_INFO_LOG("DrmNetwork OK, trigger CertDownload");
m_drmHostManager->SetIsNetWork(true);
@@ -114,7 +124,8 @@ int32_t DrmNetObserver::HandleNetAllCap(const NetAllCapabilities& netAllCap) {
return DRM_INNER_ERR_UNKNOWN;
}
int32_t DrmNetObserver::SetDrmHostManager(const sptr<DrmHostManager>& drmHostManager) {
int32_t DrmNetObserver::SetDrmHostManager(const sptr<DrmHostManager>& drmHostManager)
{
DRM_CHECK_AND_RETURN_RET_LOG(drmHostManager, DRM_INNER_ERR_INVALID_VAL, "drmHostManager is nullptr");
m_drmHostManager = drmHostManager;
return DRM_INNER_ERR_OK;