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

Turn off verbose logging

Browse Source 
This CL turns off the verbose logging if LOG_NDEBUG is 1, or if NDEBUG
is defined.  You can set the environment variable LOG_NDEBUG to 0 to
turn on verbose debugging for the CDM library on android.

Also, as in b/9672657, some applications call SelectKey when switching
between video and audio, which is much too verbose and affects
playback.  I have removed the log statements for SelectKey.

bug: 9672657

Change-Id: I635b997118996871356f7126852b4744fb05e810
This commit is contained in:
Fred Gylys-Colwell
2013-08-28 14:34:08 -07:00
parent b4dae0af49
commit 144f5ced83
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,12 +433,10 @@ bool CryptoSession::RefreshKeys(const std::string& message,
} }
bool CryptoSession::SelectKey(const std::string& key_id) { bool CryptoSession::SelectKey(const std::string& key_id) {
LOGV("CryptoSession::SelectKey: Lock");
AutoLock auto_lock(crypto_lock_); AutoLock auto_lock(crypto_lock_);
const uint8_t* key_id_string = const uint8_t* key_id_string =
reinterpret_cast<const uint8_t*>(key_id.data()); reinterpret_cast<const uint8_t*>(key_id.data());
LOGV("SelectKey: id=%ld", static_cast<uint32_t>(oec_session_id_));
OEMCryptoResult sts = OEMCryptoResult sts =
OEMCrypto_SelectKey(oec_session_id_, key_id_string, key_id.size()); OEMCrypto_SelectKey(oec_session_id_, key_id_string, key_id.size());
if (OEMCrypto_SUCCESS != sts) { if (OEMCrypto_SUCCESS != sts) {

18
libwvdrmengine/cdm/src/log.cpp
View File

@@ -2,6 +2,20 @@
// //
// Log - implemented using the standard Android logging mechanism // Log - implemented using the standard Android logging mechanism
/*
* Qutoing from system/core/include/log/log.h:
* Normally we strip ALOGV (VERBOSE messages) from release builds.
* You can modify this (for example with "#define LOG_NDEBUG 0"
* at the top of your source file) to change that behavior.
*/
#ifndef LOG_NDEBUG
#ifdef NDEBUG
#define LOG_NDEBUG 1
#else
#define LOG_NDEBUG 0
#endif
#endif
#define LOG_TAG "WVCdm" #define LOG_TAG "WVCdm"
#define LOG_BUF_SIZE 1024 #define LOG_BUF_SIZE 1024
@@ -26,7 +40,11 @@ void Log(const char* file, int line, LogPriority level, const char* fmt, ...) {
case LOG_WARN: prio = ANDROID_LOG_WARN; break; case LOG_WARN: prio = ANDROID_LOG_WARN; break;
case LOG_INFO: prio = ANDROID_LOG_INFO; break; case LOG_INFO: prio = ANDROID_LOG_INFO; break;
case LOG_DEBUG: prio = ANDROID_LOG_DEBUG; break; case LOG_DEBUG: prio = ANDROID_LOG_DEBUG; break;
#if LOG_NDEBUG
case LOG_VERBOSE: return;
#else
case LOG_VERBOSE: prio = ANDROID_LOG_VERBOSE; break; case LOG_VERBOSE: prio = ANDROID_LOG_VERBOSE; break;
#endif
} }
__android_log_write(prio, LOG_TAG, buf); __android_log_write(prio, LOG_TAG, buf);