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

Merge "Exclude the default CDM from metrics history." into udc-dev

Browse Source
This commit is contained in:
Alex Dale
2023-05-03 18:44:06 +00:00
committed by Android (Google) Code Review
parent 82709ebab0 da6437fe5e
commit 2e84e8b5f7
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/include/cdm_identifier.h
View File

@@ -47,7 +47,7 @@ struct CdmIdentifier {
// to the default cdm. E.g. no spoid, origin or app package name. Use this // to the default cdm. E.g. no spoid, origin or app package name. Use this
// comparison in lieu of the == operator when checking to see if the // comparison in lieu of the == operator when checking to see if the
// identifier would cause the default provisioned certificate to be used. // identifier would cause the default provisioned certificate to be used.
bool IsEquivalentToDefault() { bool IsEquivalentToDefault() const {
return spoid == EMPTY_SPOID && origin == EMPTY_ORIGIN && return spoid == EMPTY_SPOID && origin == EMPTY_ORIGIN &&
app_package_name == EMPTY_APP_PACKAGE_NAME; app_package_name == EMPTY_APP_PACKAGE_NAME;
} }

4
libwvdrmengine/cdm/src/wv_content_decryption_module.cpp
View File

@@ -565,6 +565,10 @@ CdmResponseType WvContentDecryptionModule::GetCurrentMetricsInternal(
void WvContentDecryptionModule::SaveMetrics( void WvContentDecryptionModule::SaveMetrics(
const CdmIdentifier& identifier, drm_metrics::WvCdmMetrics&& metrics) { const CdmIdentifier& identifier, drm_metrics::WvCdmMetrics&& metrics) {
if (saved_metrics_snapshots_ == nullptr) return; if (saved_metrics_snapshots_ == nullptr) return;
// The DRM plugin opens and closes many CDMs using the default
// identifier. These metrics are not needed when checking the
// metric history.
if (identifier.IsEquivalentToDefault()) return;
saved_metrics_snapshots_->PushMetrics( saved_metrics_snapshots_->PushMetrics(
WvMetricsSnapshot::MakeSnapshot(identifier, std::move(metrics))); WvMetricsSnapshot::MakeSnapshot(identifier, std::move(metrics)));
} }