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

Snap for 7163758 from 82b5bc00cb to tm-release

Browse Source 
Change-Id: Ie97e18b1758f52289e79a7008aa30f7fdf4d9f0a
This commit is contained in:
android-build-team Robot
2021-02-23 04:17:29 +00:00
parent 401a9bdb38 82b5bc00cb
commit cda8bd5ced
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libwvdrmengine/include_hidl/TypeConvert.h
View File

@@ -30,6 +30,24 @@ namespace drm {
namespace V1_2 {
namespace widevine {
inline ::drm::V1_4::LogPriority toHidlPriority(wvcdm::LogPriority p) {
switch (p) {
case wvcdm::LogPriority::LOG_ERROR:
return ::drm::V1_4::LogPriority::ERROR;
case wvcdm::LogPriority::LOG_WARN:
return ::drm::V1_4::LogPriority::WARN;
case wvcdm::LogPriority::LOG_INFO:
return ::drm::V1_4::LogPriority::INFO;
case wvcdm::LogPriority::LOG_DEBUG:
return ::drm::V1_4::LogPriority::DEBUG;
case wvcdm::LogPriority::LOG_VERBOSE:
return ::drm::V1_4::LogPriority::VERBOSE;
default:
return ::drm::V1_4::LogPriority::UNKNOWN;
}
return ::drm::V1_4::LogPriority::UNKNOWN;
}
template<typename T, typename U>
hidl_vec<T> toHidlVec(const std::vector<U> &vec);
@@ -40,7 +58,7 @@ inline hidl_vec<::drm::V1_4::LogMessage> toHidlVec(const std::vector<wvcdm::LogM
const auto& msg = vec[i];
hLogs[i] = {
msg.time_ms_,
static_cast<::drm::V1_4::LogPriority>(msg.priority_),
toHidlPriority(msg.priority_),
msg.message_,
};
}

1
libwvdrmengine/oemcrypto/include/OEMCryptoCENC.h
View File

@@ -1667,7 +1667,6 @@ OEMCryptoResult OEMCrypto_LoadKeys(
* @param[in] signature: pointer to memory containing the signature.
* @param[in] signature_length: length of the signature, in bytes.
*
* @retval OEMCrypto_SUCCESS success OEMCrypto_ERROR_NO_DEVICE_KEY
* @retval OEMCrypto_SUCCESS success
* @retval OEMCrypto_ERROR_NO_DEVICE_KEY
* @retval OEMCrypto_ERROR_INVALID_SESSION