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

Correct pssh

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/56540

The pssh in request_license_test had the wrong size field.

Test: tested as part of http://go/ag/4674759
Change-Id: I6fed0fc8d11aec0a360d300e500a4ef62b658dad
This commit is contained in:
Fred Gylys-Colwell
2018-07-31 21:15:38 -07:00
parent 7bd1d0ea51
commit 01ce294226
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -418,6 +418,16 @@ struct UsageInfoSubSampleInfo {
std::string app_id;
};
void PrintTo(UsageInfoSubSampleInfo* param, std::ostream* os) {
if (param) {
*os << "info=" << param->usage_info << ", "
<< "level=" << (param->security_level == wvcdm::kLevel3 ? "L3" : "L1")
<< " app_id=" << param->app_id;
} else {
*os << "<null ptr>";
}
}
UsageInfoSubSampleInfo usage_info_sub_sample_info[] = {
{&usage_info_sub_samples_icp[0], 1, wvcdm::kLevelDefault, ""},
{&usage_info_sub_samples_icp[0], 3, wvcdm::kLevelDefault, ""},
@@ -485,6 +495,14 @@ struct RenewWithClientIdTestConfiguration {
std::string test_description;
};
void PrintTo(RenewWithClientIdTestConfiguration* param, std::ostream* os) {
if (param) {
*os << param->test_description;
} else {
*os << "<null ptr>";
}
}
RenewWithClientIdTestConfiguration
streaming_renew_client_id_test_configuration[] = {
{false, false, false, false,
@@ -2502,7 +2520,7 @@ TEST_F(WvCdmRequestLicenseTest, StreamingLicenseRenewalProhibited) {
decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
&session_id_);
std::string key_id = a2bs_hex( // streaming_clip11
"000000427073736800000000" // blob size and pssh
"000000437073736800000000" // blob size and pssh
"EDEF8BA979D64ACEA3C827DCD51D21ED00000023" // Widevine system id
"08011a0d7769646576696e655f746573" // pssh data
"74221073747265616d696e675f636c69703131");
@@ -2864,7 +2882,7 @@ TEST_P(WvCdmUsageTest, WithClientId) {
if (config->always_include_client_id) {
key_id = a2bs_hex( // streaming_clip20
"000000427073736800000000" // blob size and pssh
"000000437073736800000000" // blob size and pssh
"EDEF8BA979D64ACEA3C827DCD51D21ED00000023" // Widevine system id
"08011a0d7769646576696e655f746573" // pssh data
"74221073747265616d696e675f636c69703230");