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

Merge "Resolving Compiler Warnings"

Browse Source
This commit is contained in:
Aaron Vaage
2017-01-30 17:51:44 +00:00
committed by Android (Google) Code Review
parent be448ed24a 3a5fdd71a0
commit e8a138b11c
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/cdm/core/include/crypto_session.h
View File

@@ -198,6 +198,9 @@ class CryptoSession {
static bool initialized_; static bool initialized_;
static int session_count_; static int session_count_;
metrics::MetricsGroup* metrics_;
metrics::TimerMetric life_span_;
bool open_; bool open_;
CdmClientTokenType pre_provision_token_type_; CdmClientTokenType pre_provision_token_type_;
bool update_usage_table_after_close_session_; bool update_usage_table_after_close_session_;
@@ -212,9 +215,6 @@ class CryptoSession {
uint64_t request_id_base_; uint64_t request_id_base_;
static uint64_t request_id_index_; static uint64_t request_id_index_;
metrics::MetricsGroup* metrics_;
metrics::TimerMetric life_span_;
CdmCipherMode cipher_mode_; CdmCipherMode cipher_mode_;
CORE_DISALLOW_COPY_AND_ASSIGN(CryptoSession); CORE_DISALLOW_COPY_AND_ASSIGN(CryptoSession);

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

@@ -26,6 +26,7 @@ namespace wvcdm {
CdmSession::CdmSession(FileSystem* file_system) : CdmSession::CdmSession(FileSystem* file_system) :
initialized_(false), initialized_(false),
crypto_session_(new CryptoSession(&metrics_)),
file_handle_(new DeviceFiles(file_system)), file_handle_(new DeviceFiles(file_system)),
license_received_(false), license_received_(false),
is_offline_(false), is_offline_(false),
@@ -38,8 +39,7 @@ CdmSession::CdmSession(FileSystem* file_system) :
is_initial_usage_update_(true), is_initial_usage_update_(true),
is_usage_update_needed_(false), is_usage_update_needed_(false),
mock_license_parser_in_use_(false), mock_license_parser_in_use_(false),
mock_policy_engine_in_use_(false), mock_policy_engine_in_use_(false) {
crypto_session_(new CryptoSession(&metrics_)) {
life_span_.Start(); life_span_.Start();
} }

10
libwvdrmengine/cdm/metrics/include/distribution.h
View File

@@ -31,11 +31,11 @@ class Distribution {
// Return the value for each of the stats computed about the series of // Return the value for each of the stats computed about the series of
// values (min, max, count, etc.). // values (min, max, count, etc.).
const double Min() { return min_; } double Min() const { return min_; }
const double Max() { return max_; } double Max() const { return max_; }
const double Mean() { return mean_; } double Mean() const { return mean_; }
const int64_t Count() { return count_; } int64_t Count() const { return count_; }
const double Variance() { double Variance() const {
return count_ == 0 ? 0.0 : sum_squared_deviation_ / count_; return count_ == 0 ? 0.0 : sum_squared_deviation_ / count_;
} }

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

@@ -220,9 +220,9 @@ std::string MakeFieldNameString(const std::vector<std::string>& field_names,
// instances with no fields. // instances with no fields.
template<> template<>
inline std::string MakeFieldNameString<Unused, Unused, Unused, Unused>( inline std::string MakeFieldNameString<Unused, Unused, Unused, Unused>(
const std::vector<std::string>& field_names, const std::vector<std::string>& /* field_names */,
const Unused unused1, const Unused unused2, const Unused /* unused1 */, const Unused /* unused2 */,
const Unused unused3, const Unused unused4) { const Unused /* unused3 */, const Unused /* unused4 */) {
return ""; return "";
} }