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

Merge "Run git-clang-format on log.{h,cpp}" into sc-dev am: bbfa2b4ff4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13580486

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a9559765e84ea8c561803ab37223c2bd1577cf5
This commit is contained in:
Robert Shih
2021-02-17 09:38:53 +00:00
committed by Automerger Merge Worker
parent d754094d27 bbfa2b4ff4
commit c3c84ea380
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,7 @@ class LogBuffer {
static const int MAX_CAPACITY = 100;
void addLog(const LogMessage& log);
std::vector<LogMessage> getLogs();
private:
std::deque<LogMessage> buffer_;
std::mutex mutex_;

12
libwvdrmengine/cdm/util/src/log.cpp
View File

@@ -42,13 +42,13 @@ namespace wvcdm {
namespace {
int64_t GetCurrentTimeMs() {
struct timeval tv{};
gettimeofday(&tv, NULL);
auto msec1 = static_cast<int64_t>(tv.tv_sec) * 1000;
auto msec2 = static_cast<int64_t>(tv.tv_usec) / 1000;
return msec1 + msec2;
}
struct timeval tv {};
gettimeofday(&tv, NULL);
auto msec1 = static_cast<int64_t>(tv.tv_sec) * 1000;
auto msec2 = static_cast<int64_t>(tv.tv_usec) / 1000;
return msec1 + msec2;
}
} // namespace
LogPriority g_cutoff = LOG_VERBOSE;