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

Fix deprecated and printf warnings.

Browse Source 
[ Merge of http://go/wvgerrit/118703 ]

Bug: 182058081
Test: WV unit/integration tests
Change-Id: I2d8995b8aab864a2d2f5161d12a473d34e67bad4
This commit is contained in:
Rahul Frias
2021-03-07 00:03:17 -08:00
parent 71cf45fb3f
commit 24e4c33262
5 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libwvdrmengine/cdm/core/test/initialization_data_unittest.cpp
View File

@@ -716,8 +716,13 @@ TEST_P(HlsConstructionTest, InitData) {
if (param.success_) {
WidevinePsshData cenc_header;
EXPECT_TRUE(cenc_header.ParseFromString(value));
CORE_UTIL_IGNORE_DEPRECATED
EXPECT_EQ(video_widevine::WidevinePsshData_Algorithm_AESCTR,
cenc_header.algorithm());
EXPECT_EQ(param.provider_, cenc_header.provider());
CORE_UTIL_RESTORE_WARNINGS
for (size_t i = 0; i < param.key_ids_.size(); ++i) {
bool key_id_found = false;
if (param.key_ids_[i].size() != 32) continue;
@@ -729,7 +734,6 @@ TEST_P(HlsConstructionTest, InitData) {
}
EXPECT_TRUE(key_id_found);
}
EXPECT_EQ(param.provider_, cenc_header.provider());
std::vector<uint8_t> param_content_id_vec(Base64Decode(param.content_id_));
EXPECT_EQ(
std::string(param_content_id_vec.begin(), param_content_id_vec.end()),
@@ -822,6 +826,8 @@ TEST_P(HlsParseTest, Parse) {
WidevinePsshData cenc_header;
EXPECT_TRUE(cenc_header.ParseFromString(init_data.data()));
CORE_UTIL_IGNORE_DEPRECATED
EXPECT_EQ(video_widevine::WidevinePsshData_Algorithm_AESCTR,
cenc_header.algorithm());
if (param.key_.compare(kJsonProvider) == 0) {
@@ -831,6 +837,7 @@ TEST_P(HlsParseTest, Parse) {
} else if (param.key_.compare(kJsonKeyIds) == 0) {
EXPECT_EQ(param.value_, b2a_hex(cenc_header.key_ids(0)));
}
CORE_UTIL_RESTORE_WARNINGS
EXPECT_EQ(kHlsIvHexValue, b2a_hex(init_data.hls_iv()));
} else {