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

Merge "Return key request type none after key rotation" into qt-dev am: 999a466275 am: 4690da2bcb

Browse Source 
am: 4c9a3a6f02

Change-Id: Iddcac699401f64d920fcb8ff73053410019ec028
This commit is contained in:
Rahul Frias
2019-05-31 09:55:31 -07:00
committed by android-build-merger
parent ecf8a96970 4c9a3a6f02
commit 6c9c4697f0
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/core/include/wv_cdm_types.h
View File

@@ -38,6 +38,8 @@ enum CdmKeyRequestType {
kKeyRequestTypeInitial, kKeyRequestTypeInitial,
kKeyRequestTypeRenewal, kKeyRequestTypeRenewal,
kKeyRequestTypeRelease, kKeyRequestTypeRelease,
kKeyRequestTypeNone, // Keys are loaded and no license request is necessary
kKeyRequestTypeUpdate,
}; };
enum CdmOfflineLicenseState { enum CdmOfflineLicenseState {

8
libwvdrmengine/cdm/core/src/cdm_session.cpp
View File

@@ -443,10 +443,14 @@ CdmResponseType CdmSession::GenerateKeyRequestInternal(
} else if (license_received_) { } else if (license_received_) {
// A call to GenerateKeyRequest after the initial license has been received // A call to GenerateKeyRequest after the initial license has been received
// is either a renewal/release request or a key rotation event // is either a renewal/release request or a key rotation event
if (init_data.contains_entitled_keys()) if (init_data.contains_entitled_keys()) {
key_request->message.clear();
key_request->type = kKeyRequestTypeNone;
key_request->url.clear();
return license_parser_->HandleEmbeddedKeyData(init_data); return license_parser_->HandleEmbeddedKeyData(init_data);
else } else {
return GenerateRenewalRequest(key_request); return GenerateRenewalRequest(key_request);
}
} else { } else {
key_request->type = kKeyRequestTypeInitial; key_request->type = kKeyRequestTypeInitial;

1
libwvdrmengine/cdm/test/request_license_test.cpp
View File

@@ -1787,6 +1787,7 @@ class WvCdmRequestLicenseTest : public WvCdmTestBase {
&key_request); &key_request);
EXPECT_EQ(wvcdm::KEY_ADDED, status); EXPECT_EQ(wvcdm::KEY_ADDED, status);
EXPECT_TRUE(key_request.message.empty()); EXPECT_TRUE(key_request.message.empty());
EXPECT_EQ(kKeyRequestTypeNone, key_request.type);
EXPECT_TRUE(key_request.url.empty()); EXPECT_TRUE(key_request.url.empty());
return wvcdm::KEY_ADDED == status && key_request.message.empty() return wvcdm::KEY_ADDED == status && key_request.message.empty()
&& key_request.url.empty(); && key_request.url.empty();

3
libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
View File

@@ -84,16 +84,15 @@ KeyRequestType ConvertFromCdmKeyRequestType(
KeyRequestType_V1_1 ConvertFromCdmKeyRequestType_1_1( KeyRequestType_V1_1 ConvertFromCdmKeyRequestType_1_1(
CdmKeyRequestType keyRequestType) { CdmKeyRequestType keyRequestType) {
/* TODO - What happened to these?
switch (keyRequestType) { switch (keyRequestType) {
case wvcdm::kKeyRequestTypeNone: case wvcdm::kKeyRequestTypeNone:
return KeyRequestType_V1_1::NONE; return KeyRequestType_V1_1::NONE;
case wvcdm::kKeyRequestTypeUpdate: case wvcdm::kKeyRequestTypeUpdate:
return KeyRequestType_V1_1::UPDATE; return KeyRequestType_V1_1::UPDATE;
default: default:
*/
return static_cast<KeyRequestType_V1_1>( return static_cast<KeyRequestType_V1_1>(
ConvertFromCdmKeyRequestType(keyRequestType)); ConvertFromCdmKeyRequestType(keyRequestType));
}
} }
KeyRequestType toKeyRequestType_V1_0(KeyRequestType_V1_1 keyRequestType) { KeyRequestType toKeyRequestType_V1_0(KeyRequestType_V1_1 keyRequestType) {