widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Playback duration should override license duration" into mnc-dev

Browse Source
This commit is contained in:
Rahul Frias
2015-05-15 17:40:06 +00:00
committed by Android (Google) Code Review
parent 7fffdcdbd9 d4900bc9a2
commit 6e7339f40f
3 changed files with 190 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libwvdrmengine/cdm/core/src/policy_engine.cpp
View File

@@ -49,8 +49,8 @@ void PolicyEngine::OnTimerEvent() {
int64_t current_time = clock_->GetCurrentTime();
// License expiration trumps all.
if ((IsLicenseDurationExpired(current_time) ||
IsPlaybackDurationExpired(current_time)) &&
if ((IsPlaybackDurationExpired(current_time) ||
(IsLicenseDurationExpired(current_time) && !IsPlaybackStarted())) &&
license_state_ != kLicenseStateExpired) {
license_state_ = kLicenseStateExpired;
NotifyKeysChange(kKeyStatusExpired);
@@ -164,8 +164,8 @@ void PolicyEngine::UpdateLicense(const License& license) {
}
int64_t current_time = clock_->GetCurrentTime();
if (!policy_.can_play() || IsLicenseDurationExpired(current_time) ||
IsPlaybackDurationExpired(current_time)) {
if (!policy_.can_play() || IsPlaybackDurationExpired(current_time) ||
(IsLicenseDurationExpired(current_time) && !IsPlaybackStarted())) {
license_state_ = kLicenseStateExpired;
NotifyKeysChange(kKeyStatusExpired);
return;
@@ -348,8 +348,9 @@ void PolicyEngine::NotifyKeysChange(CdmKeyStatus new_status) {
}
void PolicyEngine::NotifyExpirationUpdate() {
int64_t expiry_time =
std::min(GetLicenseExpiryTime(), GetPlaybackExpiryTime());
int64_t expiry_time = IsPlaybackStarted() ? GetPlaybackExpiryTime()
: std::min(GetLicenseExpiryTime(),
GetPlaybackExpiryTime());
if (expiry_time != last_expiry_time_) {
last_expiry_time_ = expiry_time;
if (event_listener_)