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

Snap for 7017853 from 99938c3a36 to sc-release

Browse Source 
Change-Id: Ia7b80dc0f594d7d492d65844869a6909069aba43
This commit is contained in:
android-build-team Robot
2020-12-08 02:10:49 +00:00
parent 422527bffc 99938c3a36
commit b2e9ac5c66
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/core/src/crypto_session.cpp
View File

@@ -127,7 +127,7 @@ void AdvanceDestBuffer(OEMCrypto_DestBufferDesc* dest_buffer, size_t bytes) {
return; return;
} }
LOGE("Unrecognized OEMCryptoBufferType %u - doing nothing", LOGE("Unrecognized OEMCryptoBufferType %u - doing nothing",
dest_buffer->type); static_cast<unsigned int>(dest_buffer->type));
} }
bool GetGenericSigningAlgorithm(CdmSigningAlgorithm algorithm, bool GetGenericSigningAlgorithm(CdmSigningAlgorithm algorithm,

5
libwvdrmengine/cdm/core/src/initialization_data.cpp
View File

@@ -700,8 +700,9 @@ void InitializationData::DumpToLogs() const {
} }
if (pssh.has_protection_scheme()) { if (pssh.has_protection_scheme()) {
uint32_t scheme = pssh.protection_scheme(); uint32_t scheme = pssh.protection_scheme();
LOGD("InitData: Protection Scheme: %c%c%c%c", (scheme >> 24) & 0xFF, LOGD("InitData: Protection Scheme: %c%c%c%c",
(scheme >> 16) & 0xFF, (scheme >> 8) & 0xFF, (scheme >> 0) & 0xFF); static_cast<char>(scheme >> 24), static_cast<char>(scheme >> 16),
static_cast<char>(scheme >> 8), static_cast<char>(scheme >> 0));
} }
switch (pssh.type()) { switch (pssh.type()) {
case video_widevine::WidevinePsshData_Type_SINGLE: case video_widevine::WidevinePsshData_Type_SINGLE:

2
libwvdrmengine/cdm/util/include/log.h
View File

@@ -35,7 +35,7 @@ CORE_UTIL_EXPORT void InitLogging();
// Only enable format specifier warnings on LP64 systems. There is // Only enable format specifier warnings on LP64 systems. There is
// no easy portable method to handle format specifiers for int64_t. // no easy portable method to handle format specifiers for int64_t.
#if (defined(__gnuc__) || defined(__clang__)) && defined(__LP64__) #if (defined(__GNUC__) || defined(__clang__)) && defined(__LP64__)
[[gnu::format(printf, 5, 6)]] CORE_UTIL_EXPORT void Log(const char* file, [[gnu::format(printf, 5, 6)]] CORE_UTIL_EXPORT void Log(const char* file,
const char* function, const char* function,
int line, int line,

4
libwvdrmengine/cdm/util/src/string_conversions.cpp
View File

@@ -56,12 +56,12 @@ std::vector<uint8_t> a2b_hex(const std::string& byte) {
return array; return array;
} }
for (unsigned int i = 0; i < count / 2; ++i) { for (size_t i = 0; i < count / 2; ++i) {
unsigned char msb = 0; // most significant 4 bits unsigned char msb = 0; // most significant 4 bits
unsigned char lsb = 0; // least significant 4 bits unsigned char lsb = 0; // least significant 4 bits
if (!DecodeHexChar(byte[i * 2], &msb) || if (!DecodeHexChar(byte[i * 2], &msb) ||
!DecodeHexChar(byte[i * 2 + 1], &lsb)) { !DecodeHexChar(byte[i * 2 + 1], &lsb)) {
LOGE("Invalid hex value %c%c at index %d", byte[i * 2], byte[i * 2 + 1], LOGE("Invalid hex value %c%c at index %zu", byte[i * 2], byte[i * 2 + 1],
i); i);
return array; return array;
} }