Source release 14.1.2

This commit is contained in:
John W. Bruce
2018-08-21 14:56:44 -07:00
parent 6fa4e50d60
commit c32e8d0490
5 changed files with 31 additions and 4 deletions

View File

@@ -231,6 +231,8 @@ class CdmTest : public Test, public Cdm::IEventListener {
if (result != OEMCrypto_ERROR_NOT_IMPLEMENTED) {
EXPECT_EQ(OEMCrypto_SUCCESS, result);
}
std::string oec_level = OEMCrypto_SecurityLevel();
is_oec_l1_ = (oec_level == "L1");
ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_Terminate());
// Reinit the library.
@@ -484,6 +486,7 @@ class CdmTest : public Test, public Cdm::IEventListener {
}
scoped_ptr<Cdm> cdm_;
bool is_oec_l1_;
};
@@ -631,6 +634,21 @@ TEST_F(CdmTest, Initialize) {
g_host, g_host, NULL, static_cast<Cdm::LogLevel>(g_cutoff));
EXPECT_EQ(Cdm::kTypeError, status);
// Try all output types.
status = Cdm::initialize(
Cdm::kDirectRender, working_client_info,
g_host, g_host, g_host, static_cast<Cdm::LogLevel>(g_cutoff));
EXPECT_EQ(Cdm::kSuccess, status);
status = Cdm::initialize(
Cdm::kOpaqueHandle, working_client_info,
g_host, g_host, g_host, static_cast<Cdm::LogLevel>(g_cutoff));
if (is_oec_l1_) {
EXPECT_EQ(Cdm::kSuccess, status);
} else {
EXPECT_EQ(Cdm::kNotSupported, status);
}
// One last init with everything correct and working.
status = Cdm::initialize(
Cdm::kNoSecureOutput, working_client_info,