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

Merge "Report Rental duration remaining" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-01 00:50:13 +00:00
committed by Android (Google) Code Review
parent b7662fcbf2 2404500ceb
commit 4057559ae5
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/core/include/wv_cdm_constants.h
View File

@@ -69,6 +69,8 @@ static const std::string QUERY_KEY_LICENSE_DURATION_REMAINING =
"LicenseDurationRemaining"; // non-negative integer denoting seconds "LicenseDurationRemaining"; // non-negative integer denoting seconds
static const std::string QUERY_KEY_PLAYBACK_DURATION_REMAINING = static const std::string QUERY_KEY_PLAYBACK_DURATION_REMAINING =
"PlaybackDurationRemaining"; // non-negative integer denoting seconds "PlaybackDurationRemaining"; // non-negative integer denoting seconds
static const std::string QUERY_KEY_RENTAL_DURATION_REMAINING =
"RentalDurationRemaining"; // non-negative integer denoting seconds
static const std::string QUERY_KEY_RENEWAL_SERVER_URL = static const std::string QUERY_KEY_RENEWAL_SERVER_URL =
"RenewalServerUrl"; // url "RenewalServerUrl"; // url
static const std::string QUERY_KEY_OEMCRYPTO_SESSION_ID = static const std::string QUERY_KEY_OEMCRYPTO_SESSION_ID =

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

@@ -307,6 +307,8 @@ CdmResponseType PolicyEngine::Query(CdmQueryMap* query_response) {
: QUERY_VALUE_FALSE; : QUERY_VALUE_FALSE;
(*query_response)[QUERY_KEY_LICENSE_DURATION_REMAINING] = std::to_string( (*query_response)[QUERY_KEY_LICENSE_DURATION_REMAINING] = std::to_string(
policy_timers_->GetLicenseOrRentalDurationRemaining(current_time)); policy_timers_->GetLicenseOrRentalDurationRemaining(current_time));
(*query_response)[QUERY_KEY_RENTAL_DURATION_REMAINING] = std::to_string(
policy_timers_->GetLicenseOrRentalDurationRemaining(current_time));
(*query_response)[QUERY_KEY_PLAYBACK_DURATION_REMAINING] = std::to_string( (*query_response)[QUERY_KEY_PLAYBACK_DURATION_REMAINING] = std::to_string(
policy_timers_->GetPlaybackDurationRemaining(current_time)); policy_timers_->GetPlaybackDurationRemaining(current_time));
(*query_response)[QUERY_KEY_RENEWAL_SERVER_URL] = (*query_response)[QUERY_KEY_RENEWAL_SERVER_URL] =

7
libwvdrmengine/cdm/test/request_license_test.cpp
View File

@@ -5053,6 +5053,13 @@ TEST_F(WvCdmRequestLicenseTest, QueryKeyStatus) {
ss >> remaining_time; ss >> remaining_time;
ASSERT_FALSE(ss.fail()); ASSERT_FALSE(ss.fail());
EXPECT_LT(0, remaining_time); EXPECT_LT(0, remaining_time);
itr = query_info.find(wvcdm::QUERY_KEY_RENTAL_DURATION_REMAINING);
ASSERT_TRUE(itr != query_info.end());
ss.clear();
ss.str(itr->second);
ss >> remaining_time;
ASSERT_FALSE(ss.fail());
EXPECT_LT(0, remaining_time);
itr = query_info.find(wvcdm::QUERY_KEY_PLAYBACK_DURATION_REMAINING); itr = query_info.find(wvcdm::QUERY_KEY_PLAYBACK_DURATION_REMAINING);
ASSERT_TRUE(itr != query_info.end()); ASSERT_TRUE(itr != query_info.end());
ss.clear(); ss.clear();