openharmony/multimedia_drm_framework
1
0
Fork 0
mirror of https://github.com/openharmony/multimedia_drm_framework.git synced 2026-08-27 21:49:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

!56 修改ipc通信顺序，解决客户端得不到数据的问题

Browse Source 
Merge pull request !56 from Gezhe/master
This commit is contained in:
openharmony_ci
2024-01-10 00:53:23 +00:00
committed by Gitee
parent 824663a133 ab6bc8273c
commit c42e83c932
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/drm_service/client/src/mediakeysystem_service_proxy.cpp
+3 -3
View File
@@ -62,7 +62,8 @@ int32_t MediaKeySystemServiceProxy::GenerateKeySystemRequest(std::vector<uint8_t
DRM_ERR_LOG("MediaKeySystemServiceProxy::GenerateKeySystemRequest failed, ret: %{public}d", ret);
return ret;
}
defaultUrl = reply.ReadString();
uint32_t requestSize = reply.ReadInt32();
DRM_CHECK_AND_RETURN_RET_LOG(requestSize < REQUEST_MAX_LEN, DRM_MEMORY_ERROR, "The size of request is too large.");
if (requestSize != 0) {
@@ -73,8 +74,7 @@ int32_t MediaKeySystemServiceProxy::GenerateKeySystemRequest(std::vector<uint8_t
}
request.assign(requestBuf, requestBuf + requestSize);
}
defaultUrl = reply.ReadString();
DRM_INFO_LOG("MediaKeySystemServiceProxy::GenerateKeySystemRequest exit.");
return ret;
}
services/drm_service/server/src/mediakeysystem_service_stub.cpp
+4 -4
View File
@@ -131,6 +131,10 @@ static int32_t ProcessKeySystemRequest(MediaKeySystemServiceStub *stub, MessageP
std::string defaultUrl;
int32_t ret = stub->GenerateKeySystemRequest(request, defaultUrl);
DRM_CHECK_AND_RETURN_RET_LOG(ret == DRM_OK, ret, "ProcessKeySystemRequest faild, errCode:%{public}d", ret);
if (!reply.WriteString(defaultUrl)) {
DRM_ERR_LOG("MediaKeySystemServiceStub Write GenerateKeySystemRequest failed");
return IPC_STUB_WRITE_PARCEL_ERR;
}
if (!reply.WriteInt32(request.size())) {
DRM_ERR_LOG("MediaKeySystemServiceStub Write request size failed");
return IPC_STUB_WRITE_PARCEL_ERR;
@@ -143,10 +147,6 @@ static int32_t ProcessKeySystemRequest(MediaKeySystemServiceStub *stub, MessageP
return IPC_STUB_WRITE_PARCEL_ERR;
}
}
if (!reply.WriteString(defaultUrl)) {
DRM_ERR_LOG("MediaKeySystemServiceStub Write GenerateKeySystemRequest failed");
return IPC_STUB_WRITE_PARCEL_ERR;
}
DRM_INFO_LOG("MediaKeySystemServiceStub MEDIA_KEY_SYSTEM_GENERATE_KEYSYSTEM_REQUEST exit.");
return ret;
}