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

OEMCrypto v16.2

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/93404

This is the unit tests, reference code, and documentation for
OEMCrypto v16.2. Backwards compatibility should work for a v15
OEMCrypto.

Some review comments will be addressed in future CLs.

Bug: 141247171
Test: Unit tests
Test: Media GTS tests on bonito
Change-Id: I9d427c07580e180c0a4cfdc4a68f538d351c0ddd
This commit is contained in:
Fred Gylys-Colwell
2020-01-18 10:18:50 -08:00
parent 7665614b2e
commit db2050dff1
62 changed files with 2947 additions and 2286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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: 83
// next id: 85
message CryptoMetrics {
// Crypto Session Metrics.
optional ValueMetric crypto_session_security_level = 1;
@@ -190,6 +190,8 @@ message WvCdmMetrics {
repeated DistributionMetric oemcrypto_load_license_time_us = 80;
repeated DistributionMetric oemcrypto_load_renewal_time_us = 81;
repeated DistributionMetric oemcrypto_load_provisioning_time_us = 82;
optional ValueMetric oemcrypto_minor_api_version = 83;
optional ValueMetric oemcrypto_maximum_usage_table_header_size = 84;
}
// This contains metrics that were captured within a CdmSession. This contains

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

@@ -209,6 +209,10 @@ void CryptoMetrics::Serialize(WvCdmMetrics::CryptoMetrics *crypto_metrics)
crypto_metrics->mutable_oemcrypto_load_renewal_time_us());
oemcrypto_load_provisioning_.ToProto(
crypto_metrics->mutable_oemcrypto_load_provisioning_time_us());
crypto_metrics->set_allocated_oemcrypto_minor_api_version(
oemcrypto_minor_api_version_.ToProto());
crypto_metrics->set_allocated_oemcrypto_maximum_usage_table_header_size(
oemcrypto_maximum_usage_table_header_size_.ToProto());
}
SessionMetrics::SessionMetrics() : session_id_(""), completed_(false) {}