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

Restore Lost Formatting Fixes

Browse Source 
Due to merges happening out-of-order, some formatting fixes that had
previously been merged from the Widevine repository were subsequently
wiped out by later merges.

Change-Id: I9f02d281d276b0f5b5f93b02a699144400db7520
This commit is contained in:
John "Juce" Bruce
2015-03-10 15:48:45 -07:00
parent 1bd405fc40
commit 85daefb89d
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,8 @@ static const std::string QUERY_KEY_MAX_HDCP_LEVEL = "MaxHdcpLevel";
// maximum supported HDCP level // maximum supported HDCP level
static const std::string QUERY_KEY_USAGE_SUPPORT = "UsageSupport"; static const std::string QUERY_KEY_USAGE_SUPPORT = "UsageSupport";
// whether usage reporting is supported // whether usage reporting is supported
static const std::string QUERY_KEY_MAX_NUMBER_OF_SESSIONS = "MaxNumberOfSessions"; static const std::string QUERY_KEY_MAX_NUMBER_OF_SESSIONS =
"MaxNumberOfSessions";
static const std::string QUERY_VALUE_TRUE = "True"; static const std::string QUERY_VALUE_TRUE = "True";
static const std::string QUERY_VALUE_FALSE = "False"; static const std::string QUERY_VALUE_FALSE = "False";

12
libwvdrmengine/cdm/core/src/cdm_engine.cpp
View File

@@ -893,11 +893,11 @@ void CdmEngine::OnTimerEvent() {
AutoLock lock(session_list_lock_); AutoLock lock(session_list_lock_);
for (CdmSessionMap::iterator iter = sessions_.begin(); for (CdmSessionMap::iterator iter = sessions_.begin();
iter != sessions_.end(); ++iter) { iter != sessions_.end(); ++iter) {
is_initial_usage_update = is_initial_usage_update || is_initial_usage_update =
iter->second->is_initial_usage_update(); is_initial_usage_update || iter->second->is_initial_usage_update();
is_usage_update_needed = is_usage_update_needed || is_usage_update_needed =
iter->second->is_usage_update_needed(); is_usage_update_needed || iter->second->is_usage_update_needed();
iter->second->OnTimerEvent(usage_update_period_expired); iter->second->OnTimerEvent(usage_update_period_expired);
} }
@@ -906,7 +906,7 @@ void CdmEngine::OnTimerEvent() {
(usage_update_period_expired || is_initial_usage_update)) { (usage_update_period_expired || is_initial_usage_update)) {
bool has_usage_been_updated = false; bool has_usage_been_updated = false;
for (CdmSessionMap::iterator iter = sessions_.begin(); for (CdmSessionMap::iterator iter = sessions_.begin();
iter != sessions_.end(); ++iter) { iter != sessions_.end(); ++iter) {
iter->second->reset_usage_flags(); iter->second->reset_usage_flags();
if (!has_usage_been_updated) { if (!has_usage_been_updated) {
// usage is updated for all sessions so this needs to be // usage is updated for all sessions so this needs to be

4
libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
View File

@@ -140,7 +140,7 @@ typedef OEMCryptoResult (*L1_DeleteUsageEntry_t)(
const uint8_t* message, size_t message_length, const uint8_t* signature, const uint8_t* message, size_t message_length, const uint8_t* signature,
size_t signature_length); size_t signature_length);
typedef OEMCryptoResult (*L1_DeleteUsageTable_t)(); typedef OEMCryptoResult (*L1_DeleteUsageTable_t)();
typedef OEMCryptoResult (*L1_GetMaxNumberOfSessions_t)(size_t *maximum); typedef OEMCryptoResult (*L1_GetMaxNumberOfSessions_t)(size_t* maximum);
struct FunctionPointers { struct FunctionPointers {
uint32_t version; uint32_t version;
@@ -843,7 +843,7 @@ extern "C" OEMCryptoResult OEMCrypto_DeleteUsageTable() {
return sts; return sts;
} }
extern "C" OEMCryptoResult OEMCrypto_GetMaxNumberOfSessions(size_t *maximum) { extern "C" OEMCryptoResult OEMCrypto_GetMaxNumberOfSessions(size_t* maximum) {
if (!kAdapter) return OEMCrypto_ERROR_UNKNOWN_FAILURE; if (!kAdapter) return OEMCrypto_ERROR_UNKNOWN_FAILURE;
const FunctionPointers* fcn = kAdapter->get(kLevelDefault); const FunctionPointers* fcn = kAdapter->get(kLevelDefault);
if (!fcn) return OEMCrypto_ERROR_UNKNOWN_FAILURE; if (!fcn) return OEMCrypto_ERROR_UNKNOWN_FAILURE;

1
libwvdrmengine/cdm/core/test/timer_unittest.cpp
View File

@@ -48,5 +48,4 @@ TEST(TimerTest, TimerCheck) {
EXPECT_LE(duration - 1, handler.timer_events()); EXPECT_LE(duration - 1, handler.timer_events());
EXPECT_LE(handler.timer_events(), duration + 1); EXPECT_LE(handler.timer_events(), duration + 1);
} }
} }