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

Source release 15.1.0

Browse Source
This commit is contained in:
John W. Bruce
2019-03-29 18:16:05 -07:00
parent 66628486b5
commit 2b26dee09c
44 changed files with 1371 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
metrics/src/metrics.proto
View File

@@ -94,7 +94,7 @@ message WvCdmMetrics {
// This contains metrics that were captured at the CryptoSession level. These
// include CryptoSession metrics and most OEMCrypto metrics.
// next id: 58
// next id: 73
message CryptoMetrics {
// Crypto Session Metrics.
optional ValueMetric crypto_session_security_level = 1;
@@ -111,8 +111,15 @@ message WvCdmMetrics {
repeated DistributionMetric crypto_session_open_time_us = 12;
optional ValueMetric crypto_session_system_id = 13;
repeated DistributionMetric crypto_session_update_usage_information_time_us = 14;
repeated DistributionMetric crypto_session_update_usage_entry_time_us = 56;
optional ValueMetric crypto_session_usage_information_support = 15;
// Usage Table Metrics
optional ValueMetric usage_table_header_initial_size = 58;
repeated CounterMetric usage_table_header_add_entry = 59;
repeated CounterMetric usage_table_header_delete_entry = 60;
repeated DistributionMetric usage_table_header_update_entry_time_us = 56;
repeated CounterMetric usage_table_header_load_entry = 61;
// OemCrypto metrics.
optional ValueMetric oemcrypto_api_version = 16;
repeated CounterMetric oemcrypto_close_session = 17;
@@ -155,6 +162,17 @@ message WvCdmMetrics {
optional ValueMetric oemcrypto_usage_table_support = 54;
repeated CounterMetric oemcrypto_update_usage_table = 55;
repeated CounterMetric oemcrypto_update_usage_entry = 57;
repeated CounterMetric oemcrypto_create_usage_table_header = 62;
repeated CounterMetric oemcrypto_load_usage_table_header = 63;
repeated CounterMetric oemcrypto_shrink_usage_table_header = 64;
repeated CounterMetric oemcrypto_create_new_usage_entry = 65;
repeated CounterMetric oemcrypto_load_usage_entry = 66;
repeated CounterMetric oemcrypto_move_entry = 67;
repeated CounterMetric oemcrypto_create_old_usage_entry = 68;
repeated CounterMetric oemcrypto_copy_old_usage_entry = 69;
optional ValueMetric oemcrypto_set_sandbox = 70;
repeated CounterMetric oemcrypto_set_decrypt_hash = 71;
optional ValueMetric oemcrypto_resource_rating_tier = 72;
}
// This contains metrics that were captured within a CdmSession. This contains
@@ -169,6 +187,8 @@ message WvCdmMetrics {
repeated CounterMetric cdm_session_restore_usage_session = 6;
repeated DistributionMetric cdm_session_license_request_latency_ms = 7;
optional ValueMetric oemcrypto_build_info = 8;
optional ValueMetric license_sdk_version = 9;
optional ValueMetric license_service_version = 10;
}
// These are metrics recorded at the Engine level. This includes CryptoSession

42
metrics/src/metrics_collections.cpp
View File

@@ -65,11 +65,21 @@ void CryptoMetrics::Serialize(WvCdmMetrics::CryptoMetrics *crypto_metrics)
crypto_session_update_usage_information_.ToProto(
crypto_metrics
->mutable_crypto_session_update_usage_information_time_us());
crypto_session_update_usage_entry_.ToProto(
crypto_metrics->mutable_crypto_session_update_usage_entry_time_us());
crypto_metrics->set_allocated_crypto_session_usage_information_support(
crypto_session_usage_information_support_.ToProto());
/* USAGE TABLE HEADER */
usage_table_header_add_entry_.ToProto(
crypto_metrics->mutable_usage_table_header_add_entry());
usage_table_header_delete_entry_.ToProto(
crypto_metrics->mutable_usage_table_header_delete_entry());
usage_table_header_update_entry_.ToProto(
crypto_metrics->mutable_usage_table_header_update_entry_time_us());
usage_table_header_load_entry_.ToProto(
crypto_metrics->mutable_usage_table_header_load_entry());
crypto_metrics->set_allocated_usage_table_header_initial_size(
usage_table_header_initial_size_.ToProto());
/* OEMCRYPTO */
crypto_metrics->set_allocated_oemcrypto_api_version(
oemcrypto_api_version_.ToProto());
@@ -151,7 +161,29 @@ void CryptoMetrics::Serialize(WvCdmMetrics::CryptoMetrics *crypto_metrics)
oemcrypto_update_usage_table_.ToProto(
crypto_metrics->mutable_oemcrypto_update_usage_table());
oemcrypto_update_usage_entry_.ToProto(
crypto_metrics->mutable_oemcrypto_update_usage_entry());
crypto_metrics->mutable_oemcrypto_update_usage_entry());
oemcrypto_create_usage_table_header_.ToProto(
crypto_metrics->mutable_oemcrypto_create_usage_table_header());
oemcrypto_load_usage_table_header_.ToProto(
crypto_metrics->mutable_oemcrypto_load_usage_table_header());
oemcrypto_shrink_usage_table_header_.ToProto(
crypto_metrics->mutable_oemcrypto_shrink_usage_table_header());
oemcrypto_create_new_usage_entry_.ToProto(
crypto_metrics->mutable_oemcrypto_create_new_usage_entry());
oemcrypto_load_usage_entry_.ToProto(
crypto_metrics->mutable_oemcrypto_load_usage_entry());
oemcrypto_move_entry_.ToProto(
crypto_metrics->mutable_oemcrypto_move_entry());
oemcrypto_create_old_usage_entry_.ToProto(
crypto_metrics->mutable_oemcrypto_create_old_usage_entry());
oemcrypto_copy_old_usage_entry_.ToProto(
crypto_metrics->mutable_oemcrypto_copy_old_usage_entry());
crypto_metrics->set_allocated_oemcrypto_set_sandbox(
oemcrypto_set_sandbox_.ToProto());
oemcrypto_set_decrypt_hash_.ToProto(
crypto_metrics->mutable_oemcrypto_set_decrypt_hash());
crypto_metrics->set_allocated_oemcrypto_resource_rating_tier(
oemcrypto_resource_rating_tier_.ToProto());
}
SessionMetrics::SessionMetrics() : session_id_(""), completed_(false) {}
@@ -181,6 +213,10 @@ void SessionMetrics::SerializeSessionMetrics(
session_metrics->mutable_cdm_session_license_request_latency_ms());
session_metrics->set_allocated_oemcrypto_build_info(
oemcrypto_build_info_.ToProto());
session_metrics->set_allocated_license_sdk_version(
license_sdk_version_.ToProto());
session_metrics->set_allocated_license_service_version(
license_service_version_.ToProto());
}
OemCryptoDynamicAdapterMetrics::OemCryptoDynamicAdapterMetrics()