diff --git a/libwvdrmengine/cdm/core/src/buffer_reader.cpp b/libwvdrmengine/cdm/core/src/buffer_reader.cpp index a548b8a9..f81b9a21 100644 --- a/libwvdrmengine/cdm/core/src/buffer_reader.cpp +++ b/libwvdrmengine/cdm/core/src/buffer_reader.cpp @@ -8,7 +8,7 @@ namespace wvcdm { bool BufferReader::Read1(uint8_t* v) { if (!HasBytes(1)) { - LOGE("BufferReader::Read1 : Failure while parsing: Not enough bytes (1)"); + LOGW("BufferReader::Read1 : Failure while parsing: Not enough bytes (1)"); return false; } @@ -19,7 +19,7 @@ bool BufferReader::Read1(uint8_t* v) { // Internal implementation of multi-byte reads template bool BufferReader::Read(T* v) { if (!HasBytes(sizeof(T))) { - LOGE("BufferReader::Read : Failure during parse: Not enough bytes (%u)", + LOGW("BufferReader::Read : Failure during parse: Not enough bytes (%u)", sizeof(T)); return false; } @@ -42,7 +42,7 @@ bool BufferReader::Read8s(int64_t* v) { return Read(v); } bool BufferReader::ReadString(std::string* str, int count) { if (!HasBytes(count)) { - LOGE("BufferReader::ReadString : Parse Failure: Not enough bytes (%d)", + LOGW("BufferReader::ReadString : Parse Failure: Not enough bytes (%d)", count); return false; } @@ -54,7 +54,7 @@ bool BufferReader::ReadString(std::string* str, int count) { bool BufferReader::ReadVec(std::vector* vec, int count) { if (!HasBytes(count)) { - LOGE("BufferReader::ReadVec : Parse Failure: Not enough bytes (%d)", count); + LOGW("BufferReader::ReadVec : Parse Failure: Not enough bytes (%d)", count); return false; } @@ -66,7 +66,7 @@ bool BufferReader::ReadVec(std::vector* vec, int count) { bool BufferReader::SkipBytes(int bytes) { if (!HasBytes(bytes)) { - LOGE("BufferReader::SkipBytes : Parse Failure: Not enough bytes (%d)", + LOGW("BufferReader::SkipBytes : Parse Failure: Not enough bytes (%d)", bytes); return false; } diff --git a/libwvdrmengine/src/WVCryptoFactory.cpp b/libwvdrmengine/src/WVCryptoFactory.cpp index 05de6c07..d2834986 100644 --- a/libwvdrmengine/src/WVCryptoFactory.cpp +++ b/libwvdrmengine/src/WVCryptoFactory.cpp @@ -25,7 +25,7 @@ WVCryptoFactory::WVCryptoFactory() mLegacyLibraryHandle = dlopen("libdrmdecrypt.so", RTLD_NOW); if (mLegacyLibraryHandle == NULL) { - ALOGE("Unable to locate libdrmdecrypt.so"); + ALOGW("Unable to locate libdrmdecrypt.so"); } else { typedef CryptoFactory* (*CreateCryptoFactoryFunc)(); @@ -34,13 +34,13 @@ WVCryptoFactory::WVCryptoFactory() "createCryptoFactory"); if (legacyCreateCryptoFactory == NULL) { - ALOGE("Unable to find legacy symbol 'createCryptoFactory'."); + ALOGW("Unable to find legacy symbol 'createCryptoFactory'."); dlclose(mLegacyLibraryHandle); mLegacyLibraryHandle = NULL; } else { mLegacyFactory = legacyCreateCryptoFactory(); if (mLegacyFactory == NULL) { - ALOGE("Legacy createCryptoFactory() failed."); + ALOGW("Legacy createCryptoFactory() failed."); dlclose(mLegacyLibraryHandle); mLegacyLibraryHandle = NULL; } @@ -74,6 +74,9 @@ status_t WVCryptoFactory::createPlugin(const uint8_t uuid[16], const void* data, // 0 size means they want an old-style Widevine plugin if (size == 0) { if (mLegacyFactory == NULL) { + ALOGE("Legacy crypto factory loading failed. Cannot create legacy " + "plugin. Look for warnings about this that were logged earlier, " + "during CryptoFactory instantiation."); return -EINVAL; }