Adds --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=1" to 'bazel build' command in moe_test.sh.
This flag also added to [] and [] ------------- CASDrmLicenseRequest at the proxy. ------------- CAS Proxy SDK version update to 1.1.2. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=231988012
This commit is contained in:
8
sdk/external/common/wvpl/wvpl_sdk_session.h
vendored
8
sdk/external/common/wvpl/wvpl_sdk_session.h
vendored
@@ -99,12 +99,14 @@ class WvPLSDKSession {
|
||||
* Returns the type of the message handled by this session.
|
||||
*
|
||||
* @return MessageType enumeration.
|
||||
* @deprecated use request_type instead.
|
||||
* @since end of Q1, 2019
|
||||
*/
|
||||
virtual MessageType message_type() const;
|
||||
|
||||
virtual PlatformVerificationStatus VerifyPlatform() = 0;
|
||||
|
||||
virtual LicenseRequestType request_type() const { return request_type_; }
|
||||
virtual WvPLRequestType request_type() const { return type_; }
|
||||
|
||||
/**
|
||||
* Returns true if the license type is offline, otherwise return false.
|
||||
@@ -164,7 +166,7 @@ class WvPLSDKSession {
|
||||
std::string license_request_from_cdm_;
|
||||
std::string remote_attestation_cert_serial_number_;
|
||||
std::unique_ptr<widevine::LicenseRequest> sdk_license_request_;
|
||||
LicenseRequestType request_type_;
|
||||
WvPLRequestType type_;
|
||||
bool has_session_state_ = false;
|
||||
bool has_encrypted_client_id_ = false;
|
||||
|
||||
@@ -244,6 +246,8 @@ class WvPLSDKSession {
|
||||
uint32_t system_id,
|
||||
widevine::ProvisionedDeviceInfo* provisioned_device_info) const;
|
||||
|
||||
virtual const std::string TrackTypeToString(TrackType track_type) const;
|
||||
|
||||
private:
|
||||
std::unique_ptr<uint32_t> system_id_;
|
||||
};
|
||||
|
||||
9
sdk/external/common/wvpl/wvpl_types.h
vendored
9
sdk/external/common/wvpl/wvpl_types.h
vendored
@@ -1015,12 +1015,13 @@ struct WvPLCasKey {
|
||||
|
||||
TrackType track_type() const { return track_type_; }
|
||||
|
||||
void set_output_protection(const WvPLOutputProtection& out_prot) {
|
||||
output_protection_ = out_prot;
|
||||
void set_output_protection(const WvPLOutputProtection& output_protection) {
|
||||
output_protection_ = output_protection;
|
||||
}
|
||||
|
||||
void set_requested_output_protection(const WvPLOutputProtection& out_prot) {
|
||||
requested_output_protection_ = out_prot;
|
||||
void set_requested_output_protection(
|
||||
const WvPLOutputProtection& output_protection) {
|
||||
requested_output_protection_ = output_protection;
|
||||
}
|
||||
|
||||
const WvPLOutputProtection& output_protection() const {
|
||||
|
||||
Reference in New Issue
Block a user