Merge "Offline playback failure for ATSC 3.0" into udc-widevine-dev
This commit is contained in:
@@ -263,8 +263,14 @@ CdmResponseType CdmSession::RestoreOfflineSession(const CdmKeySetId& key_set_id,
|
|||||||
usage_entry_ = std::move(license_data.usage_entry);
|
usage_entry_ = std::move(license_data.usage_entry);
|
||||||
usage_entry_index_ = license_data.usage_entry_index;
|
usage_entry_index_ = license_data.usage_entry_index;
|
||||||
|
|
||||||
CdmResponseType result = LoadPrivateOrLegacyKey(
|
// If ATSC mode is enabled, use ATSC DRM cert/private key, rather than any
|
||||||
license_data.drm_certificate, license_data.wrapped_private_key);
|
// cert/private key embedded in the license.
|
||||||
|
CdmResponseType result =
|
||||||
|
atsc_mode_enabled_
|
||||||
|
? LoadPrivateKey()
|
||||||
|
: LoadPrivateOrLegacyKey(license_data.drm_certificate,
|
||||||
|
license_data.wrapped_private_key);
|
||||||
|
|
||||||
if (result != NO_ERROR) return result;
|
if (result != NO_ERROR) return result;
|
||||||
|
|
||||||
// Attempts to restore a released offline license are treated as a release
|
// Attempts to restore a released offline license are treated as a release
|
||||||
|
|||||||
Reference in New Issue
Block a user