Added CDM support for Watermarking reporting.
[ Merge of http://go/wvgerrit/148552 ] Extended the CDM layer to report OEMCrypto's watermarking support. The reporting of watermarking comes in three (3) mechanisms: 1) ClientCapabilities in license requests 2) CryptoSession metrics when queried to OEMCrypto 3) String property query by apps If OEMCrypto implementents OEMCrypto_GetWatermarkingSupport(), then the reported watermarking support by the CDM will match that of OEMCrypto. If OEMCrypto does not implement OEMCrypto_GetWatermarkingSupport() or an error occurs, it is assumed that OEMCrypto does not support watermarking, and the CDM will report "Not Supported". Bug: 226443788 Test: run_x86_64_tests request_license_test and license_unittest Change-Id: Id929a356c395e6bcf45d371ee6887eec40d35329
This commit is contained in:
@@ -908,6 +908,13 @@ message ClientIdentification {
|
||||
ANALOG_OUTPUT_SUPPORTS_CGMS_A = 3;
|
||||
}
|
||||
|
||||
enum WatermarkingSupport {
|
||||
WATERMARKING_SUPPORT_UNKNOWN = 0;
|
||||
WATERMARKING_NOT_SUPPORTED = 1;
|
||||
WATERMARKING_CONFIGURABLE = 2;
|
||||
WATERMARKING_ALWAYS_ON = 3;
|
||||
}
|
||||
|
||||
optional bool client_token = 1 [default = false];
|
||||
optional bool session_token = 2 [default = false];
|
||||
optional bool video_resolution_constraints = 3 [default = false];
|
||||
@@ -932,6 +939,10 @@ message ClientIdentification {
|
||||
// the resource rating is unavailable or reporting erroneous values
|
||||
// for that device.
|
||||
optional uint32 resource_rating_tier = 12 [default = 0];
|
||||
// Watermarking support of OEMCrypto was introduced in v17.
|
||||
// Support is optional.
|
||||
// Value is only required to be set for license requests.
|
||||
optional WatermarkingSupport watermarking_support = 13;
|
||||
}
|
||||
|
||||
message ClientCredentials {
|
||||
|
||||
Reference in New Issue
Block a user