Source release 18.1.0
This commit is contained in:
@@ -12,10 +12,12 @@
|
||||
|
||||
#include "cdm.h"
|
||||
#include "log.h"
|
||||
#include "stderr_logger.h"
|
||||
#include "test_base.h"
|
||||
#include "test_host.h"
|
||||
|
||||
std::string g_sandbox_id = "";
|
||||
widevine::StderrLogger g_stderr_logger;
|
||||
std::string g_sandbox_id;
|
||||
|
||||
namespace widevine {
|
||||
namespace {
|
||||
@@ -30,7 +32,7 @@ constexpr char kExtraHelpText[] =
|
||||
} // namespace
|
||||
|
||||
int Main(Cdm::IStorage* storage, Cdm::IClock* clock, Cdm::ITimer* timer,
|
||||
int argc, char** argv) {
|
||||
Cdm::ILogger* logger, int argc, char** argv) {
|
||||
// Find and filter out the Sandbox ID, if any.
|
||||
std::vector<std::string> args(argv, argv + argc);
|
||||
auto sandbox_id_iter = std::find_if(std::begin(args) + 1, std::end(args),
|
||||
@@ -43,7 +45,7 @@ int Main(Cdm::IStorage* storage, Cdm::IClock* clock, Cdm::ITimer* timer,
|
||||
}
|
||||
|
||||
Cdm::Status status = Cdm::initialize(
|
||||
Cdm::kOpaqueHandle, storage, clock, timer,
|
||||
Cdm::kOpaqueHandle, storage, clock, timer, logger,
|
||||
static_cast<Cdm::LogLevel>(wvutil::g_cutoff), g_sandbox_id);
|
||||
(void)status; // status is now used when assertions are turned off.
|
||||
assert(status == Cdm::kSuccess);
|
||||
|
||||
Reference in New Issue
Block a user