widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wv hidl: map CdmResponseType to drm@1.4 Status" into sc-dev

Browse Source
This commit is contained in:
Robert Shih
2021-02-18 00:25:48 +00:00
committed by Android (Google) Code Review
parent 0450bfcda1 6ed2c30a0a
commit 9397f5b972
3 changed files with 316 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
View File

@@ -543,7 +543,7 @@ Return<void> WVDrmPlugin::getKeyRequest_1_2(
if (keyType == KeyType::RELEASE) {
// When releasing keys, we do not have a session ID.
status = mapCdmResponseType_1_2(res);
status = mapCdmResponseType<Status_V1_2>(res);
} else {
// For all other requests, we have a session ID.
status = mapAndNotifyOfCdmResponseType_1_2(scopeId, res);
@@ -704,7 +704,7 @@ Return<void> WVDrmPlugin::getProvisionRequest_1_2(
std::vector<uint8_t> request;
if (mPropertySet.use_atsc_mode()) {
_hidl_cb(mapCdmResponseType_1_2(wvcdm::PROVISIONING_NOT_ALLOWED_FOR_ATSC),
_hidl_cb(mapCdmResponseType<Status_V1_2>(wvcdm::PROVISIONING_NOT_ALLOWED_FOR_ATSC),
toHidlVec(request), hidl_string(defaultUrl));
return Void();
}
@@ -736,7 +736,7 @@ Return<void> WVDrmPlugin::getProvisionRequest_1_2(
defaultUrl.assign(cdmDefaultUrl.data(), cdmDefaultUrl.size());
}
_hidl_cb(mapCdmResponseType_1_2(res), toHidlVec(request),
_hidl_cb(mapCdmResponseType<Status_V1_2>(res), toHidlVec(request),
hidl_string(defaultUrl));
return Void();
}
@@ -2075,7 +2075,7 @@ Status WVDrmPlugin::mapAndNotifyOfCdmResponseType(
Status_V1_2 WVDrmPlugin::mapAndNotifyOfCdmResponseType_1_2(
const std::vector<uint8_t>& sessionId, CdmResponseType res) {
notifyOfCdmResponseType(sessionId, res);
return mapCdmResponseType_1_2(res);
return mapCdmResponseType<Status_V1_2>(res);
}
void WVDrmPlugin::notifyOfCdmResponseType(