tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "misc drm@1.2 vts fixes" am: 1d85278536 am: cf7622ccd6

Browse source 
Change-Id: I39bf388c5470e318876eff9097b7155ec3568b56
This commit is contained in:
Automerger Merge Worker 2020-01-23 00:20:49 +00:00
commit 861f5e15a8
5 changed files with 24 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drm/1.2/vts/functional/drm_hal_common.cpp
View file

@ -87,7 +87,7 @@ static DrmHalVTSVendorModule_V1* getModuleForInstance(const std::string& instanc
return new DrmHalVTSClearkeyModule();
}
return static_cast<DrmHalVTSVendorModule_V1*>(DrmHalTest::gVendorModules->getModule(instance));
return static_cast<DrmHalVTSVendorModule_V1*>(DrmHalTest::gVendorModules->getModuleByName(instance));
}
/**
@ -120,21 +120,12 @@ void DrmHalTest::SetUp() {
GTEST_SKIP() << "No vendor module installed";
}
if (instance == "clearkey") {
// TODO(b/147449315)
// Only the clearkey plugged into the "default" instance supports
// this test. Currently the "clearkey" instance fails some tests
// here.
GTEST_SKIP() << "Clearkey tests don't work with 'clearkey' instance yet.";
}
ASSERT_EQ(instance, vendorModule->getServiceName());
contentConfigurations = vendorModule->getContentConfigurations();
// If drm scheme not installed skip subsequent tests
if (drmFactory.get() == nullptr || !drmFactory->isCryptoSchemeSupported(getVendorUUID())) {
vendorModule->setInstalled(false);
return;
if (!drmFactory->isCryptoSchemeSupported(getVendorUUID())) {
GTEST_SKIP() << "vendor module drm scheme not supported";
}
ASSERT_NE(nullptr, drmPlugin.get()) << "Can't find " << vendorModule->getServiceName() << " drm@1.2 plugin";

16
drm/1.2/vts/functional/drm_hal_common.h
View file

@ -62,14 +62,6 @@ using std::vector;
#define EXPECT_OK(ret) EXPECT_TRUE(ret.isOk())
#define RETURN_IF_SKIPPED \
if (!vendorModule->isInstalled()) { \
GTEST_SKIP() << "This drm scheme not supported." \
<< " library:" << GetParam() \
<< " service-name:" << vendorModule->getServiceName() << std::endl; \
return; \
}
namespace android {
namespace hardware {
namespace drm {
@ -131,9 +123,11 @@ class DrmHalClearkeyTest : public DrmHalTest {
public:
virtual void SetUp() override {
DrmHalTest::SetUp();
if (vendorModule == nullptr) {
GTEST_SKIP() << "Instance not supported";
const uint8_t kClearKeyUUID[16] = {
0xE2, 0x71, 0x9D, 0x58, 0xA9, 0x85, 0xB3, 0xC9,
0x78, 0x1A, 0xB0, 0x30, 0xAF, 0x78, 0xD3, 0x0E};
if (!drmFactory->isCryptoSchemeSupported(kClearKeyUUID)) {
GTEST_SKIP() << "ClearKey not supported by " << GetParam();
}
}
virtual void TearDown() override {}

23
drm/1.2/vts/functional/drm_hal_test.cpp
View file

@ -53,7 +53,6 @@ static const SecurityLevel kSwSecureCrypto = SecurityLevel::SW_SECURE_CRYPTO;
* Ensure drm factory supports module UUID Scheme
*/
TEST_P(DrmHalTest, VendorUuidSupported) {
RETURN_IF_SKIPPED;
auto res = drmFactory->isCryptoSchemeSupported_1_2(getVendorUUID(), kVideoMp4, kSwSecureCrypto);
ALOGI("kVideoMp4 = %s res %d", kVideoMp4, (bool)res);
EXPECT_TRUE(res);
@ -63,7 +62,6 @@ TEST_P(DrmHalTest, VendorUuidSupported) {
* Ensure drm factory doesn't support an invalid scheme UUID
*/
TEST_P(DrmHalTest, InvalidPluginNotSupported) {
RETURN_IF_SKIPPED;
const uint8_t kInvalidUUID[16] = {
0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80,
0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80};
@ -74,7 +72,6 @@ TEST_P(DrmHalTest, InvalidPluginNotSupported) {
* Ensure drm factory doesn't support an empty UUID
*/
TEST_P(DrmHalTest, EmptyPluginUUIDNotSupported) {
RETURN_IF_SKIPPED;
hidl_array<uint8_t, 16> emptyUUID;
memset(emptyUUID.data(), 0, 16);
EXPECT_FALSE(drmFactory->isCryptoSchemeSupported_1_2(emptyUUID, kVideoMp4, kSwSecureCrypto));
@ -84,7 +81,6 @@ TEST_P(DrmHalTest, EmptyPluginUUIDNotSupported) {
* Ensure drm factory doesn't support an invalid mime type
*/
TEST_P(DrmHalTest, BadMimeNotSupported) {
RETURN_IF_SKIPPED;
EXPECT_FALSE(drmFactory->isCryptoSchemeSupported_1_2(getVendorUUID(), kBadMime, kSwSecureCrypto));
}
@ -101,7 +97,6 @@ TEST_P(DrmHalTest, BadMimeNotSupported) {
* that is delivered back to the HAL.
*/
TEST_P(DrmHalTest, DoProvisioning) {
RETURN_IF_SKIPPED;
hidl_string certificateType;
hidl_string certificateAuthority;
hidl_vec<uint8_t> provisionRequest;
@ -138,7 +133,6 @@ TEST_P(DrmHalTest, DoProvisioning) {
* A get key request should fail if no sessionId is provided
*/
TEST_P(DrmHalTest, GetKeyRequestNoSession) {
RETURN_IF_SKIPPED;
SessionId invalidSessionId;
hidl_vec<uint8_t> initData;
KeyedVector optionalParameters;
@ -156,7 +150,6 @@ TEST_P(DrmHalTest, GetKeyRequestNoSession) {
* invalid mime type
*/
TEST_P(DrmHalTest, GetKeyRequestBadMime) {
RETURN_IF_SKIPPED;
auto sessionId = openSession();
hidl_vec<uint8_t> initData;
KeyedVector optionalParameters;
@ -193,7 +186,6 @@ void checkKeySetIdState(Status status, OfflineLicenseState state) {
* Test drm plugin offline key support
*/
TEST_P(DrmHalTest, OfflineLicenseTest) {
RETURN_IF_SKIPPED;
auto sessionId = openSession();
hidl_vec<uint8_t> keySetId = loadKeys(sessionId, KeyType::OFFLINE);
@ -233,7 +225,6 @@ TEST_P(DrmHalTest, OfflineLicenseTest) {
* Test drm plugin offline key state
*/
TEST_P(DrmHalTest, OfflineLicenseStateTest) {
RETURN_IF_SKIPPED;
auto sessionId = openSession();
DrmHalVTSVendorModule_V1::ContentConfiguration content = getContent(KeyType::OFFLINE);
hidl_vec<uint8_t> keySetId = loadKeys(sessionId, content, KeyType::OFFLINE);
@ -258,7 +249,6 @@ TEST_P(DrmHalTest, OfflineLicenseStateTest) {
* Negative offline license test. Remove empty keySetId
*/
TEST_P(DrmHalTest, RemoveEmptyKeySetId) {
RETURN_IF_SKIPPED;
KeySetId emptyKeySetId;
Status err = drmPlugin->removeOfflineLicense(emptyKeySetId);
EXPECT_EQ(Status::BAD_VALUE, err);
@ -268,7 +258,6 @@ TEST_P(DrmHalTest, RemoveEmptyKeySetId) {
* Negative offline license test. Get empty keySetId state
*/
TEST_P(DrmHalTest, GetEmptyKeySetIdState) {
RETURN_IF_SKIPPED;
KeySetId emptyKeySetId;
auto res = drmPlugin->getOfflineLicenseState(emptyKeySetId, checkKeySetIdState<Status::BAD_VALUE, OfflineLicenseState::UNKNOWN>);
EXPECT_OK(res);
@ -278,7 +267,6 @@ TEST_P(DrmHalTest, GetEmptyKeySetIdState) {
* Test that the plugin returns valid connected and max HDCP levels
*/
TEST_P(DrmHalTest, GetHdcpLevels) {
RETURN_IF_SKIPPED;
auto res = drmPlugin->getHdcpLevels_1_2(
[&](StatusV1_2 status, const HdcpLevel &connectedLevel,
const HdcpLevel &maxLevel) {
@ -294,7 +282,6 @@ TEST_P(DrmHalTest, GetHdcpLevels) {
* the listener gets them.
*/
TEST_P(DrmHalTest, ListenerKeysChange) {
RETURN_IF_SKIPPED;
sp<DrmHalPluginListener> listener = new DrmHalPluginListener();
auto res = drmPlugin->setListener(listener);
EXPECT_OK(res);
@ -326,7 +313,6 @@ TEST_P(DrmHalTest, ListenerKeysChange) {
* Positive decrypt test. "Decrypt" a single clear segment
*/
TEST_P(DrmHalTest, ClearSegmentTest) {
RETURN_IF_SKIPPED;
for (const auto& config : contentConfigurations) {
for (const auto& key : config.keys) {
const size_t kSegmentSize = 1024;
@ -354,7 +340,6 @@ TEST_P(DrmHalTest, ClearSegmentTest) {
* Verify data matches.
*/
TEST_P(DrmHalTest, EncryptedAesCtrSegmentTest) {
RETURN_IF_SKIPPED;
for (const auto& config : contentConfigurations) {
for (const auto& key : config.keys) {
const size_t kSegmentSize = 1024;
@ -381,7 +366,6 @@ TEST_P(DrmHalTest, EncryptedAesCtrSegmentTest) {
* Negative decrypt test. Decrypted frame too large to fit in output buffer
*/
TEST_P(DrmHalTest, ErrorFrameTooLarge) {
RETURN_IF_SKIPPED;
for (const auto& config : contentConfigurations) {
for (const auto& key : config.keys) {
const size_t kSegmentSize = 1024;
@ -407,7 +391,6 @@ TEST_P(DrmHalTest, ErrorFrameTooLarge) {
* Negative decrypt test. Decrypt without loading keys.
*/
TEST_P(DrmHalTest, EncryptedAesCtrSegmentTestNoKeys) {
RETURN_IF_SKIPPED;
for (const auto& config : contentConfigurations) {
for (const auto& key : config.keys) {
vector<uint8_t> iv(AES_BLOCK_SIZE, 0);
@ -433,7 +416,6 @@ TEST_P(DrmHalTest, EncryptedAesCtrSegmentTestNoKeys) {
* Ensure clearkey drm factory doesn't support security level higher than supported
*/
TEST_P(DrmHalClearkeyTest, BadLevelNotSupported) {
RETURN_IF_SKIPPED;
const SecurityLevel kHwSecureAll = SecurityLevel::HW_SECURE_ALL;
EXPECT_FALSE(drmFactory->isCryptoSchemeSupported_1_2(getVendorUUID(), kVideoMp4, kHwSecureAll));
}
@ -442,7 +424,6 @@ TEST_P(DrmHalClearkeyTest, BadLevelNotSupported) {
* Test resource contention during attempt to generate key request
*/
TEST_P(DrmHalClearkeyTest, GetKeyRequestResourceContention) {
RETURN_IF_SKIPPED;
Status status = drmPlugin->setPropertyString(kDrmErrorTestKey, kDrmErrorResourceContention);
EXPECT_EQ(Status::OK, status);
auto sessionId = openSession();
@ -464,7 +445,6 @@ TEST_P(DrmHalClearkeyTest, GetKeyRequestResourceContention) {
* Test clearkey plugin offline key with mock error
*/
TEST_P(DrmHalClearkeyTest, OfflineLicenseInvalidState) {
RETURN_IF_SKIPPED;
auto sessionId = openSession();
hidl_vec<uint8_t> keySetId = loadKeys(sessionId, KeyType::OFFLINE);
Status status = drmPlugin->setPropertyString(kDrmErrorTestKey, kDrmErrorInvalidState);
@ -486,7 +466,6 @@ TEST_P(DrmHalClearkeyTest, OfflineLicenseInvalidState) {
* Test SessionLostState is triggered on error
*/
TEST_P(DrmHalClearkeyTest, SessionLostState) {
RETURN_IF_SKIPPED;
sp<DrmHalPluginListener> listener = new DrmHalPluginListener();
auto res = drmPlugin->setListener(listener);
EXPECT_OK(res);
@ -507,7 +486,6 @@ TEST_P(DrmHalClearkeyTest, SessionLostState) {
* Negative decrypt test. Decrypt with invalid key.
*/
TEST_P(DrmHalClearkeyTest, DecryptWithEmptyKey) {
RETURN_IF_SKIPPED;
vector<uint8_t> iv(AES_BLOCK_SIZE, 0);
const Pattern noPattern = {0, 0};
const uint32_t kClearBytes = 512;
@ -545,7 +523,6 @@ TEST_P(DrmHalClearkeyTest, DecryptWithEmptyKey) {
* Negative decrypt test. Decrypt with a key exceeds AES_BLOCK_SIZE.
*/
TEST_P(DrmHalClearkeyTest, DecryptWithKeyTooLong) {
RETURN_IF_SKIPPED;
vector<uint8_t> iv(AES_BLOCK_SIZE, 0);
const Pattern noPattern = {0, 0};
const uint32_t kClearBytes = 512;

11
drm/1.2/vts/functional/vendor_modules.cpp
View file

@ -23,6 +23,7 @@
#include <utils/String8.h>
#include <SharedLibrary.h>
#include "drm_hal_vendor_module_api.h"
#include "vendor_modules.h"
using std::string;
@ -69,4 +70,14 @@ DrmHalVTSVendorModule* VendorModules::getModule(const string& path) {
ModuleFactory moduleFactory = reinterpret_cast<ModuleFactory>(symbol);
return (*moduleFactory)();
}
DrmHalVTSVendorModule* VendorModules::getModuleByName(const string& name) {
for (const auto &path : mPathList) {
auto module = getModule(path);
if (module->getServiceName() == name) {
return module;
}
}
return NULL;
}
};

5
drm/1.2/vts/functional/vendor_modules.h
View file

@ -46,6 +46,11 @@ class VendorModules {
*/
DrmHalVTSVendorModule* getModule(const std::string& path);
/**
* Retrieve a DrmHalVTSVendorModule given a service name.
*/
DrmHalVTSVendorModule* getModuleByName(const std::string& name);
/**
* Return the list of paths to available vendor modules.
*/