CAS Proxy SDK git checkin as per g3doc.
Adds support for specifying service type when creating a service certificate.
A recent change to the SDK allows for service certificates (DrmCertificate) to also specify a ServiceType indicating which type of service they are supposed to be used on. This CL adds certificate creation service support for this.
-------------
Fix typo in cas proxy SDK.
-------------
Migrate C++ proto_library rules to cc_proto_library.
We update dependency edges of cc_* rules on proto_library() rules to use a cc_proto_library() intermediary in preparation for eliminating proto_library()'s cc support as per []
More information: []
Tested:
TAP --sample for global presubmit queue
[]
-------------
Migrate cc proto_library to cc_proto_library. Also fixes build break introduced by []
-------------
Remove unnecessary #MOE directives
-------------
[Proxy_SDK] Move generateSignature in WvPLSDKEnvironment to signature_util.cc file.
-------------
[SDK]Add service_certificate type check in WVPL LSDK and PROXY SDK.
-------------
[Proxy_SDK] Add new API to get remote_attestation_cert_serial_number for proxy SDK.
-------------
[Proxy_SDK] Add getDrmDeviceId function
-------------
[Proxy_SDK] add getrequesttype function for proxy sdk
-------------
[SDK] Add videoFeature field to WvPLWidevinePsshData in WvPLWidevine.java and wvpl_type.h. Related to []
-------------
Allow specified devices to request licenses even if these devices are in TEST_ONLY state.
This will also override the global setting of TEST_ONLY devices not being allowed to
successfully receive licenses from Widevine License SDK.
-------------
[Proxy_SDK] Add ParseDCSL function and test case.
-------------
[Proxy_SDK] Return non-ok status for service_certificate_request when create proxy sdk session. Add test case in Java test.
-------------
[Proxy_SDK] Add video_feature parsing in GetPsshData function. Also check video_feature when geneateModularDrmLicenseRequest.
-------------
[SDK]Deprecated message_type() function, use request_type() instead.
-------------
Use JDK instead of JRE
The concept of a JRE is going away in JDK 11. The jre/ subdirectory in the JDK will no longer exist and the :jre targets will no longer make sense.
Currently in JDK 8, the JDK is a superset of the JRE (it contains all of the files in the JRE), so this is a safe change.
Tested:
TAP found no affected targets
[]
-------------
Renaming WvPLSDKSession.request_type() API.
Added LICENSE_TYPE_UNSPECIFIED enumeration to WvPLLicenseType.
-------------
Additional VLOG messaging for licensing with TEST_ONLY devices.
-------------
Remove forward declarations of absl names. The style guide bans this, and those names are not for external users to redeclare. External users should include the public headers instead.
-------------
Change Kokoro to use latest bazel version
-------------
Update the abseil build to the December 18 release.
This fixes a problem where the MOE build is failing because there was no definition for node_hash_map.
-------------
[CAS_Proxy]Add WvPLCASProxyEnvironmentJNI.cc and com_google_video_widevine_sdk_wvpl_WvPLCASProxyEnvironment.h file to implement JNI layer for WvPLCASProxyEnvironment.
-------------
Apply changes to sdk to match device certificate status list updates.
Cleans up some of the protos we're using for the new SignedDeviceInfo. Also, adjusts the sdk implementation to reflect the proto and service changes.
-------------
[CAS_PROXY]Add WvPLCASProxyEnvironment.java, WvPLCASProxySession.java and WvPLCASProxyTest.java file.
-------------
Add API to return the DRM service certificate by provider.
-------------
[CAS_PROXY]Implement SetDrmServiceCertificate and SetDeviceCertificateStatusList JNI layer.
-------------
Get DeviceInfo from request.
-------------
CAS Proxy SDK updated to 1.1.5.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=248640225
This commit is contained in:
@@ -11,9 +11,12 @@
|
||||
syntax = "proto2";
|
||||
|
||||
option java_package = "com.google.video.widevine.licensing";
|
||||
|
||||
import "protos/public/client_identification.proto";
|
||||
import "protos/public/license_protocol.proto";
|
||||
|
||||
import "protos/public/license_server_sdk.proto";
|
||||
|
||||
package widevine;
|
||||
|
||||
// TODO(user): refactor license_services.proto and sdk_stats.proto.
|
||||
@@ -79,6 +82,11 @@ message ModularDrmLicenseRequest {
|
||||
// be reported.
|
||||
repeated License.KeyContainer.VideoResolutionConstraint
|
||||
video_resolution_constraints = 10;
|
||||
|
||||
// Video feature associated with this key. Common value is HDR.
|
||||
// If specified and the key_id/key is not specified, this value will be
|
||||
// used to derive the key_id/key.
|
||||
optional string video_feature = 11;
|
||||
}
|
||||
|
||||
// Specifies a list of content keys and policies to be included in a license.
|
||||
@@ -207,6 +215,38 @@ message ModularDrmLicenseRequest {
|
||||
// field by using the ProxySDK(internally, RequestInspector) API.
|
||||
optional PlatformVerificationStatus platform_verification_status = 26
|
||||
[default = PLATFORM_NO_VERIFICATION];
|
||||
|
||||
// By default, a license request will fail if VMP status is unverified for
|
||||
// Chrome. Set this field to 'true' to allow license request to succeed when
|
||||
// VMP status is unverified for Chrome platforms.
|
||||
// TODO (b/126434032) Change the default to false once partners are notified
|
||||
optional bool allow_unverified_platform = 27 [default = true];
|
||||
|
||||
// By default, a license request will fail if VMP status is tampered for
|
||||
// Chrome. Set this field to 'true' to allow license request to succeed when
|
||||
// VMP status is tampered for Chrome platforms.
|
||||
// TODO (b/126434032) Change the default to false once partners are notified
|
||||
optional bool allow_tampered_platform = 28 [default = true];
|
||||
|
||||
// A shortcut for specifying whether to return keys for the video feature only
|
||||
// or to return all keys or ignore the video feature.
|
||||
// The VideoFeatureKeySet only applies when video feature is specified in the
|
||||
// PSSH.
|
||||
enum VideoFeatureKeySet {
|
||||
VF_UNSPECIFIED = 0;
|
||||
// License should not include keys for the video feature, instead only
|
||||
// include keys not associated with the video feature.
|
||||
VF_EXCLUDED = 1;
|
||||
// License should only include keys associated with the video feature
|
||||
// (e.g., HDR).
|
||||
VF_ONLY = 2;
|
||||
// License should include keys for the video feature and also for keys
|
||||
// not associated with the video feature (e.g., SDR keys).
|
||||
VF_INCLUDED = 3;
|
||||
}
|
||||
// This field is ignored if one or more content_key_specs is specified.
|
||||
optional VideoFeatureKeySet video_feature_key_set = 29
|
||||
[default = VF_EXCLUDED];
|
||||
}
|
||||
|
||||
|
||||
@@ -291,6 +331,7 @@ message ModularDrmLicenseResponse {
|
||||
message Track {
|
||||
optional string type = 1;
|
||||
optional bytes key_id = 2;
|
||||
optional string video_feature = 3;
|
||||
}
|
||||
// A subset of data from the Widevine PSSH.
|
||||
message Pssh {
|
||||
@@ -310,7 +351,7 @@ message ModularDrmLicenseResponse {
|
||||
optional bool remote_attestation_verified = 8;
|
||||
// Widevine-defined security level.
|
||||
optional uint32 security_level = 9;
|
||||
// Actual SDK license status as defined in widevine/server/sdk/error.proto.
|
||||
// Actual SDK license status as defined in widevine/protos/public/errors.proto
|
||||
optional uint32 internal_status = 10;
|
||||
// Usage report sent in a license release.
|
||||
optional SessionUsage session_usage = 11;
|
||||
@@ -342,7 +383,7 @@ message ModularDrmLicenseResponse {
|
||||
optional bool is_live = 24 [default = false];
|
||||
// Platform verification status
|
||||
optional PlatformVerificationStatus platform_verification_status = 25
|
||||
[default = PLATFORM_UNVERIFIED];
|
||||
[default = PLATFORM_UNVERIFIED];
|
||||
// The "provider" field in ModularDrmLicenseRequest.
|
||||
optional string content_owner = 26;
|
||||
// The "requesting_provider" in ModularDrmLicenseRequest. If
|
||||
|
||||
Reference in New Issue
Block a user