Add "copts = PUBLIC_COPTS" option

-------------
Use forward declaration in wvpl_sdk_session.h

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=227753690
This commit is contained in:
Widevine Buildbot
2019-01-03 22:54:57 +00:00
parent 230ce1099e
commit 40e46b6bdb
5 changed files with 27 additions and 31 deletions

Binary file not shown.

View File

@@ -11,15 +11,18 @@
#include <memory> #include <memory>
#include "sdk/external/common/wvpl/wvpl_types.h" #include "sdk/external/common/wvpl/wvpl_types.h"
#include "protos/public/client_identification.pb.h"
#include "protos/public/device_certificate_status.pb.h"
#include "protos/public/license_protocol.pb.h"
#include "protos/public/license_server_sdk.pb.h"
#include "protos/public/provisioned_device_info.pb.h"
namespace widevine { namespace widevine {
class ClientIdentification;
class DrmRootCertificate; class DrmRootCertificate;
class LicenseRequest;
class License_KeyContainer_OutputProtection;
class License_KeyContainer;
class License_Policy;
class ProvisionedDeviceInfo;
class SessionInit; class SessionInit;
class SessionState;
class SignedMessage;
} // namespace widevine } // namespace widevine
namespace widevine_server { namespace widevine_server {
namespace wv_pl_sdk { namespace wv_pl_sdk {
@@ -28,7 +31,7 @@ class WvPLSDKSession {
public: public:
explicit WvPLSDKSession( explicit WvPLSDKSession(
const widevine::DrmRootCertificate* drm_root_certificate); const widevine::DrmRootCertificate* drm_root_certificate);
virtual ~WvPLSDKSession() = 0; virtual ~WvPLSDKSession();
public: public:
// Add WvPLKey. // Add WvPLKey.
@@ -101,9 +104,7 @@ class WvPLSDKSession {
virtual PlatformVerificationStatus VerifyPlatform() = 0; virtual PlatformVerificationStatus VerifyPlatform() = 0;
virtual widevine::LicenseRequest::RequestType request_type() const { virtual LicenseRequestType request_type() const { return request_type_; }
return request_type_;
}
/** /**
* Returns true if the license type is offline, otherwise return false. * Returns true if the license type is offline, otherwise return false.
@@ -119,7 +120,7 @@ class WvPLSDKSession {
WvPLPlaybackPolicy policy_; WvPLPlaybackPolicy policy_;
WvPLSessionInit session_init_; WvPLSessionInit session_init_;
WvPLWidevinePsshData pssh_data_; WvPLWidevinePsshData pssh_data_;
widevine::ClientIdentification client_id_; std::unique_ptr<widevine::ClientIdentification> client_id_;
bool has_pssh_data_ = false; bool has_pssh_data_ = false;
bool has_client_id_ = false; bool has_client_id_ = false;
MessageType message_type_ = UNKNOWN; MessageType message_type_ = UNKNOWN;
@@ -130,7 +131,7 @@ class WvPLSDKSession {
std::string license_request_from_cdm_; std::string license_request_from_cdm_;
std::string remote_attestation_cert_serial_number_; std::string remote_attestation_cert_serial_number_;
std::unique_ptr<widevine::LicenseRequest> sdk_license_request_; std::unique_ptr<widevine::LicenseRequest> sdk_license_request_;
widevine::LicenseRequest::RequestType request_type_; LicenseRequestType request_type_;
virtual WvPLStatus VerifyRemoteAttestation(); virtual WvPLStatus VerifyRemoteAttestation();
// Returns the WvPL Client Capabilities information for the license request // Returns the WvPL Client Capabilities information for the license request
@@ -146,35 +147,23 @@ class WvPLSDKSession {
widevine::License_KeyContainer* sdk_key_container); widevine::License_KeyContainer* sdk_key_container);
virtual void CopySecurityLevel( virtual void CopySecurityLevel(
const WvPLOutputProtection& output_protection, TrackType track_type, const WvPLOutputProtection& output_protection, TrackType track_type,
widevine::License::KeyContainer* key_container); widevine::License_KeyContainer* key_container);
// Copies/translates the policy from a WvPL policy into an SDK policy. A // Copies/translates the policy from a WvPL policy into an SDK policy. A
// helper function for GenerateLicenseRequestAsJSON. // helper function for GenerateLicenseRequestAsJSON.
virtual void CopyPlaybackPolicy(const WvPLPlaybackPolicy& wvpl_policy, virtual void CopyPlaybackPolicy(const WvPLPlaybackPolicy& wvpl_policy,
widevine::License::Policy* sdk_policy); widevine::License_Policy* sdk_policy);
// Copy the |cgms_value| into the key container. A helper function for // Copy the |cgms_value| into the key container. A helper function for
// GenerateLicenseRequestAsJSON. // GenerateLicenseRequestAsJSON.
virtual void CopyCGMS(CGMS cgms_value, virtual void CopyCGMS(
widevine::License::KeyContainer::OutputProtection* CGMS cgms_value,
output_protection); widevine::License_KeyContainer_OutputProtection* output_protection);
// Copy the |hdcp_value| into the key container. // Copy the |hdcp_value| into the key container.
virtual void CopyHDCP(HDCP hdcp_value, virtual void CopyHDCP(
widevine::License::KeyContainer::OutputProtection* HDCP hdcp_value,
output_protection); widevine::License_KeyContainer_OutputProtection* output_protection);
// Copy the |hdcp_value| into the client_capabilities.
virtual void CopyHDCPToClientCapabilities(
widevine::ClientIdentification::ClientCapabilities::HdcpVersion
hdcp_value,
WvPLClientCapabilities* client_capabilities) const;
// Copy the |analog_output_capabilities| into the client_capabilities.
virtual void CopyAnalogOutputCapabilities(
widevine::ClientIdentification::ClientCapabilities::
AnalogOutputCapabilities analog_output_capabilities,
WvPLClientCapabilities* client_capabilities) const;
// Copy the WvPLSession Init into Session Init. // Copy the WvPLSession Init into Session Init.
virtual void CopySessionInit(const WvPLSessionInit& wvpl_session_init, virtual void CopySessionInit(const WvPLSessionInit& wvpl_session_init,

View File

@@ -59,6 +59,13 @@ enum CertificateKeyType {
RSA_3072 = 1, RSA_3072 = 1,
}; };
enum LicenseRequestType {
REQUEST_TYPE_UNSPECIFIED = 0,
NEW = 1,
RENEWAL = 2,
RELEASE = 3,
};
enum PlatformVerificationStatus { enum PlatformVerificationStatus {
PLATFORM_UNVERIFIED = 0, PLATFORM_UNVERIFIED = 0,
PLATFORM_TAMPERED = 1, PLATFORM_TAMPERED = 1,