diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-01 19:14:48 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-01 19:14:48 +0000 |
| commit | 635976cca5f309ff82ec044e6ee627bbc612f6d1 (patch) | |
| tree | f17b77db92ab3ef9d43c19229a372902659d93ad /media/cdm | |
| parent | c0c972ea1d455eb7dbc71df3afa9c5e22e3329e5 (diff) | |
| download | chromium_src-635976cca5f309ff82ec044e6ee627bbc612f6d1.zip chromium_src-635976cca5f309ff82ec044e6ee627bbc612f6d1.tar.gz chromium_src-635976cca5f309ff82ec044e6ee627bbc612f6d1.tar.bz2 | |
Fix OUTPUT_PROTECTION_ALL_EXTERNAL_LINKS_PROTECTED reporting.
BUG=390338
R=ddorwin@chromium.org, kcwu@chromium.org
Review URL: https://codereview.chromium.org/362633003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/cdm')
| -rw-r--r-- | media/cdm/ppapi/cdm_adapter.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/media/cdm/ppapi/cdm_adapter.cc b/media/cdm/ppapi/cdm_adapter.cc index 10feef7..8388f44 100644 --- a/media/cdm/ppapi/cdm_adapter.cc +++ b/media/cdm/ppapi/cdm_adapter.cc @@ -1131,7 +1131,14 @@ void CdmAdapter::ReportOutputProtectionQueryResult() { return; } - if ((output_protection_mask_ & external_links) == external_links) { + const uint32_t kProtectableLinks = + cdm::kLinkTypeHDMI | cdm::kLinkTypeDVI | cdm::kLinkTypeDisplayPort; + bool is_unprotectable_link_connected = external_links & ~kProtectableLinks; + bool is_hdcp_enabled_on_all_protectable_links = + output_protection_mask_ & cdm::kProtectionHDCP; + + if (!is_unprotectable_link_connected && + is_hdcp_enabled_on_all_protectable_links) { ReportOutputProtectionUMA( OUTPUT_PROTECTION_ALL_EXTERNAL_LINKS_PROTECTED); uma_for_output_protection_positive_result_reported_ = true; |