OEMCrypto v15.2

See the file docs/Widevine_Modular_DRM_Version_15_Delta.pdf for
changes since version 15.1.

util/include/lock.h

@@ -1,53 +0,0 @@
-// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
-//
-// Lock - Platform independent interface for a Mutex class
-//
-#ifndef WVCDM_UTIL_LOCK_H_
-#define WVCDM_UTIL_LOCK_H_
-
-#include "disallow_copy_and_assign.h"
-
-namespace wvcdm {
-
-// Simple lock class. The implementation is platform dependent.
-//
-// The lock must be unlocked by the thread that locked it.
-// The lock is also not recursive (ie. cannot be taken multiple times).
-class Lock {
- public:
-  Lock();
-  ~Lock();
-
-  void Acquire();
-  void Release();
-
-  friend class AutoLock;
-
- private:
-  class Impl;
-  Impl* impl_;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(Lock);
-};
-
-// Manages the lock automatically. It will be locked when AutoLock
-// is constructed and release when AutoLock goes out of scope.
-class AutoLock {
- public:
-  explicit AutoLock(Lock& lock) : lock_(&lock) { lock_->Acquire(); }
-
-  explicit AutoLock(Lock* lock) : lock_(lock) { lock_->Acquire(); }
-
-  ~AutoLock() { lock_->Release(); }
-
- private:
-  Lock* lock_;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(AutoLock);
-};
-
-}  // namespace wvcdm
-
-#endif  // WVCDM_UTIL_LOCK_H_

util/include/log.h

@@ -14,11 +14,15 @@ namespace wvcdm {
 // Simple logging class. The implementation is platform dependent.
 
 typedef enum {
-  LOG_ERROR,
-  LOG_WARN,
-  LOG_INFO,
-  LOG_DEBUG,
-  LOG_VERBOSE
+  // This log level should only be used for |g_cutoff|, in order to silence all
+  // logging. It should never be passed to |Log()| as a log level.
+  LOG_SILENT = -1,
+
+  LOG_ERROR = 0,
+  LOG_WARN = 1,
+  LOG_INFO = 2,
+  LOG_DEBUG = 3,
+  LOG_VERBOSE = 4,
 } LogPriority;
 
 extern LogPriority g_cutoff;