diff options
| author | xhwang <xhwang@chromium.org> | 2014-11-20 22:30:31 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-21 06:30:48 +0000 |
| commit | d4dc81df18391b86aeccac802d383e672ccd91e2 (patch) | |
| tree | 1b8bb48538e6eb0d0ebf0e52636d266e90a4191c /media/blink | |
| parent | e5eb027f40c10856870fb024320060b7f6a42267 (diff) | |
| download | chromium_src-d4dc81df18391b86aeccac802d383e672ccd91e2.zip chromium_src-d4dc81df18391b86aeccac802d383e672ccd91e2.tar.gz chromium_src-d4dc81df18391b86aeccac802d383e672ccd91e2.tar.bz2 | |
Introduce CdmContext interface.
CdmContext is what a media pipeline needs from a CDM to decrypt (and decode) an
encrypted stream.
BUG=401264
Review URL: https://codereview.chromium.org/748473002
Cr-Commit-Position: refs/heads/master@{#305181}
Diffstat (limited to 'media/blink')
| -rw-r--r-- | media/blink/cdm_session_adapter.cc | 4 | ||||
| -rw-r--r-- | media/blink/cdm_session_adapter.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/media/blink/cdm_session_adapter.cc b/media/blink/cdm_session_adapter.cc index e54f43e..3804306 100644 --- a/media/blink/cdm_session_adapter.cc +++ b/media/blink/cdm_session_adapter.cc @@ -128,7 +128,7 @@ void CdmSessionAdapter::GetUsableKeyIds( } Decryptor* CdmSessionAdapter::GetDecryptor() { - return media_keys_->GetDecryptor(); + return media_keys_->GetCdmContext()->GetDecryptor(); } const std::string& CdmSessionAdapter::GetKeySystemUMAPrefix() const { @@ -137,7 +137,7 @@ const std::string& CdmSessionAdapter::GetKeySystemUMAPrefix() const { #if defined(ENABLE_BROWSER_CDMS) int CdmSessionAdapter::GetCdmId() const { - return media_keys_->GetCdmId(); + return media_keys_->GetCdmContext()->GetCdmId(); } #endif // defined(ENABLE_BROWSER_CDMS) diff --git a/media/blink/cdm_session_adapter.h b/media/blink/cdm_session_adapter.h index 9ff1c99..8721fc3 100644 --- a/media/blink/cdm_session_adapter.h +++ b/media/blink/cdm_session_adapter.h @@ -20,6 +20,7 @@ class GURL; namespace media { class CdmFactory; +class Decryptor; class WebContentDecryptionModuleSessionImpl; // Owns the CDM instance and makes calls from session objects to the CDM. |