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

Indicate support for initial_renewal_delay_base

Browse Source 
[ Merge of http://go/wvgerrit/174555 ]

This is only announced if OEMCrypto is v18+

Bug: 278751387
Test: Duration use case tests, wvts tests
Change-Id: I5cbfcc733ed2af2c940fde381b40a5be850e7e88
This commit is contained in:
Rahul Frias
2023-05-08 17:38:01 -07:00
parent 669fc9c7af
commit 0c288c1cda
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,8 @@ constexpr uint32_t RESOURCE_RATING_TIER_MAX = RESOURCE_RATING_TIER_VERY_HIGH;
// OEMCrypto features by version // OEMCrypto features by version
constexpr uint32_t OEM_CRYPTO_API_VERSION_SUPPORTS_RESOURCE_RATING_TIER = 15; constexpr uint32_t OEM_CRYPTO_API_VERSION_SUPPORTS_RESOURCE_RATING_TIER = 15;
constexpr uint32_t OEM_CRYPTO_API_VERSION_SUPPORTS_PROV40_CORE_MESSAGE = 18; constexpr uint32_t OEM_CRYPTO_API_VERSION_SUPPORTS_PROV40_CORE_MESSAGE = 18;
constexpr uint32_t OEM_CRYPTO_API_VERSION_SUPPORTS_INITIAL_RENEWAL_DELAY_BASE =
18;
constexpr char SESSION_ID_PREFIX[] = "sid"; constexpr char SESSION_ID_PREFIX[] = "sid";
constexpr char ATSC_KEY_SET_ID_PREFIX[] = "atscksid"; constexpr char ATSC_KEY_SET_ID_PREFIX[] = "atscksid";

5
libwvdrmengine/cdm/core/src/client_identification.cpp
View File

@@ -364,6 +364,11 @@ CdmResponseType ClientIdentification::Prepare(
} }
} }
if (api_version >=
OEM_CRYPTO_API_VERSION_SUPPORTS_INITIAL_RENEWAL_DELAY_BASE) {
client_capabilities->set_initial_renewal_delay_base(true);
}
return CdmResponseType(NO_ERROR); return CdmResponseType(NO_ERROR);
} }

3
libwvdrmengine/cdm/core/src/license_protocol.proto
View File

@@ -1149,6 +1149,9 @@ message ClientIdentification {
// Support is optional. // Support is optional.
// Value is only required to be set for license requests. // Value is only required to be set for license requests.
optional WatermarkingSupport watermarking_support = 13; optional WatermarkingSupport watermarking_support = 13;
// Indicate whether or not `initial_renewal_delay_base` is supported by the
// client.
optional bool initial_renewal_delay_base = 14 [default = false];
} }
message ClientCredentials { message ClientCredentials {