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

Merge "Address compilation warnings" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-13 02:43:45 +00:00
committed by Android (Google) Code Review
parent 16c704fa09 094fabed5a
commit 6ee9f49e5c
5 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,13 +53,13 @@ namespace {
const int kHttpOk = 200;
const wvcdm::CdmIdentifier kExampleIdentifier = {
wvcdm::EMPTY_SPOID, "com.example", "com.example", 7};
wvcdm::EMPTY_SPOID, "com.example", "com.example", 7, 9};
const wvcdm::CdmIdentifier kAlternateCdmIdentifier1 = {
"alternate_spoid_1", "alternate_origin_1", "com.alternate1.url", 8};
"alternate_spoid_1", "alternate_origin_1", "com.alternate1.url", 8, 10};
const wvcdm::CdmIdentifier kAlternateCdmIdentifier2 = {
"alternate_spoid_2", "" /* empty origin */, "com.alternate2.url", 8};
"alternate_spoid_2", "" /* empty origin */, "com.alternate2.url", 9, 11};
const std::string kEmptyServiceCertificate;
const std::string kComma = ",";

4
libwvdrmengine/cdm/test/wv_cdm_metrics_test.cpp
View File

@@ -145,10 +145,10 @@ TEST_F(WvContentDecryptionModuleMetricsTest,
CdmSessionId session_id;
wvcdm::CdmKeySystem key_system("com.widevine");
CdmIdentifier identifiers[] = {kDefaultCdmIdentifier,
{"foo", "bar", "baz", 7},
{"foo", "bar", "baz", 7, 10},
// Note that this has all the same parameters
// as the one above except for the unique_id.
{"foo", "bar", "baz", 8}};
{"foo", "bar", "baz", 8, 11}};
const int cdm_engine_count = 3;
// Force Unprovision.