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

OEMCrypto v16.1

Browse Source 
Merge of http://go/wvgerrit/93404

This CL updates the Widevine CDM to support OEMCrypto v16.1

Test: Tested in 16.2 CL
Bug: 141247171
Change-Id: I69bd993500f6fb63bf6010c8b0250dc7acc3d71b
This commit is contained in:
Fred Gylys-Colwell
2020-01-18 10:11:24 -08:00
parent 7e2619e379
commit 7665614b2e
132 changed files with 12331 additions and 9341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libwvdrmengine/cdm/metrics/src/metrics.proto
View File

@@ -93,7 +93,7 @@ message WvCdmMetrics {
// This contains metrics that were captured at the CryptoSession level. These
// include CryptoSession metrics and most OEMCrypto metrics.
// next id: 77
// next id: 83
message CryptoMetrics {
// Crypto Session Metrics.
optional ValueMetric crypto_session_security_level = 1;
@@ -179,6 +179,17 @@ message WvCdmMetrics {
optional ValueMetric oemcrypto_set_sandbox = 70;
repeated CounterMetric oemcrypto_set_decrypt_hash = 71;
optional ValueMetric oemcrypto_resource_rating_tier = 72;
// TODO(b/142684157): Remove this comment before closing bug.
// OemCrypto V16 metrics start at 77 (4 new metrics pending review).
repeated DistributionMetric
oemcrypto_prep_and_sign_license_request_time_us = 77;
repeated DistributionMetric
oemcrypto_prep_and_sign_renewal_request_time_us = 78;
repeated DistributionMetric
oemcrypto_prep_and_sign_provisioning_request_time_us = 79;
repeated DistributionMetric oemcrypto_load_license_time_us = 80;
repeated DistributionMetric oemcrypto_load_renewal_time_us = 81;
repeated DistributionMetric oemcrypto_load_provisioning_time_us = 82;
}
// This contains metrics that were captured within a CdmSession. This contains

15
libwvdrmengine/cdm/metrics/src/metrics_collections.cpp
View File

@@ -194,6 +194,21 @@ void CryptoMetrics::Serialize(WvCdmMetrics::CryptoMetrics *crypto_metrics)
crypto_metrics->mutable_oemcrypto_set_decrypt_hash());
crypto_metrics->set_allocated_oemcrypto_resource_rating_tier(
oemcrypto_resource_rating_tier_.ToProto());
oemcrypto_prep_and_sign_license_request_.ToProto(
crypto_metrics
->mutable_oemcrypto_prep_and_sign_license_request_time_us());
oemcrypto_prep_and_sign_renewal_request_.ToProto(
crypto_metrics
->mutable_oemcrypto_prep_and_sign_renewal_request_time_us());
oemcrypto_prep_and_sign_provisioning_request_.ToProto(
crypto_metrics
->mutable_oemcrypto_prep_and_sign_provisioning_request_time_us());
oemcrypto_load_license_.ToProto(
crypto_metrics->mutable_oemcrypto_load_license_time_us());
oemcrypto_load_renewal_.ToProto(
crypto_metrics->mutable_oemcrypto_load_renewal_time_us());
oemcrypto_load_provisioning_.ToProto(
crypto_metrics->mutable_oemcrypto_load_provisioning_time_us());
}
SessionMetrics::SessionMetrics() : session_id_(""), completed_(false) {}