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

Minor build updates

Browse Source 
This CL removes some unused variables, and changes some integers to
unsigned integers.  On some platforms, we were getting compiler errors
and unit test failures.

Merge from Widevine repo of http://go/wvgerrit/23840
    Use unsigned integer literals

Merge from Widevine repo of http://go/wvgerrit/23767
    Fix Gyp Files

Merge from Widevine repo of http://go/wvgerrit/23500
    Remove unused variables
    
bug: 31458046

Change-Id: I4dfec95ae49187262552fbbf322f3310ab777826
This commit is contained in:
Fred Gylys-Colwell
2017-02-09 14:59:15 -08:00
committed by Jeff Tinker
parent 1aac150100
commit eade07c7a9
7 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1841,7 +1841,7 @@ CdmResponseType CryptoSession::CreateUsageTableHeader(
usage_table_header->resize(kEstimatedInitialUsageTableHeader);
uint32_t usage_table_header_size = usage_table_header->size();
size_t usage_table_header_size = usage_table_header->size();
OEMCryptoResult result = OEMCrypto_CreateUsageTableHeader(
requested_security_level_,
reinterpret_cast<uint8_t*>(const_cast<char*>(usage_table_header->data())),

2
libwvdrmengine/cdm/metrics/include/event_metric.h
View File

@@ -95,7 +95,7 @@ class Pow2Bucket {
value >>= 1;
}
return 1 << (log - 1);
return 1u << (log - 1);
}
size_t value_;

5
libwvdrmengine/cdm/metrics/test/event_metric_test.cpp
View File

@@ -209,11 +209,11 @@ TEST_F(EventMetricTest, Pow2BucketTest) {
EXPECT_EQ("2", value.str());
value.str("");
value << Pow2Bucket(0xFFFFFFFF);
value << Pow2Bucket(0xFFFFFFFFu);
EXPECT_EQ("2147483648", value.str());
value.str("");
value << Pow2Bucket(0x80000000);
value << Pow2Bucket(0x80000000u);
EXPECT_EQ("2147483648", value.str());
value.str("");
@@ -223,4 +223,3 @@ TEST_F(EventMetricTest, Pow2BucketTest) {
} // namespace metrics
} // namespace wvcdm