diff options
| author | gunsch <gunsch@chromium.org> | 2015-05-29 19:37:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-30 02:38:10 +0000 |
| commit | 0eaa37b5c618503c1ea1d1b467481714bcf92595 (patch) | |
| tree | 1aa2f34aba0d40e75bc01561d94c97e8ae2328f8 /chromecast | |
| parent | faf208b1a9e95b9f10c74246df9449dcc56fef75 (diff) | |
| download | chromium_src-0eaa37b5c618503c1ea1d1b467481714bcf92595.zip chromium_src-0eaa37b5c618503c1ea1d1b467481714bcf92595.tar.gz chromium_src-0eaa37b5c618503c1ea1d1b467481714bcf92595.tar.bz2 | |
Allows support for persistent session types in BrowserCdm.
Enables persistent session types for some Linux-based Cast builds.
BUG=492823
Review URL: https://codereview.chromium.org/1160983002
Cr-Commit-Position: refs/heads/master@{#332105}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/media/cdm/browser_cdm_cast.cc | 10 | ||||
| -rw-r--r-- | chromecast/media/cdm/browser_cdm_cast.h | 3 | ||||
| -rw-r--r-- | chromecast/renderer/key_systems_cast.cc | 6 |
3 files changed, 6 insertions, 13 deletions
diff --git a/chromecast/media/cdm/browser_cdm_cast.cc b/chromecast/media/cdm/browser_cdm_cast.cc index d00a96f..9f56a9d 100644 --- a/chromecast/media/cdm/browser_cdm_cast.cc +++ b/chromecast/media/cdm/browser_cdm_cast.cc @@ -54,16 +54,6 @@ void BrowserCdmCast::UnregisterPlayer(int registration_id) { player_tracker_impl_->UnregisterPlayer(registration_id); } -void BrowserCdmCast::LoadSession( - ::media::MediaKeys::SessionType session_type, - const std::string& session_id, - scoped_ptr<::media::NewSessionCdmPromise> promise) { - NOTREACHED() << "LoadSession not supported"; - legacy_session_error_cb_.Run( - session_id, ::media::MediaKeys::Exception::NOT_SUPPORTED_ERROR, 0, - std::string()); -} - ::media::CdmContext* BrowserCdmCast::GetCdmContext() { NOTREACHED(); return nullptr; diff --git a/chromecast/media/cdm/browser_cdm_cast.h b/chromecast/media/cdm/browser_cdm_cast.h index fe80b46..70d4ca0 100644 --- a/chromecast/media/cdm/browser_cdm_cast.h +++ b/chromecast/media/cdm/browser_cdm_cast.h @@ -55,9 +55,6 @@ class BrowserCdmCast : public ::media::BrowserCdm { void UnregisterPlayer(int registration_id) override; // ::media::BrowserCdm implementation: - void LoadSession(::media::MediaKeys::SessionType session_type, - const std::string& session_id, - scoped_ptr<::media::NewSessionCdmPromise> promise) override; ::media::CdmContext* GetCdmContext() override; // Returns the decryption context needed to decrypt frames encrypted with diff --git a/chromecast/renderer/key_systems_cast.cc b/chromecast/renderer/key_systems_cast.cc index bede018..bb27a6f 100644 --- a/chromecast/renderer/key_systems_cast.cc +++ b/chromecast/renderer/key_systems_cast.cc @@ -8,6 +8,7 @@ #include "base/command_line.h" #include "base/logging.h" +#include "build/build_config.h" #include "chromecast/media/base/key_systems_common.h" #include "components/cdm/renderer/widevine_key_systems.h" #include "media/base/eme_constants.h" @@ -31,8 +32,13 @@ void AddKeySystemWithCodecs( ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1; info.max_audio_robustness = ::media::EmeRobustness::EMPTY; info.max_video_robustness = ::media::EmeRobustness::EMPTY; +#if defined(OS_ANDROID) info.persistent_license_support = ::media::EmeSessionTypeSupport::NOT_SUPPORTED; +#else + info.persistent_license_support = + ::media::EmeSessionTypeSupport::SUPPORTED; +#endif info.persistent_release_message_support = ::media::EmeSessionTypeSupport::NOT_SUPPORTED; info.persistent_state_support = ::media::EmeFeatureSupport::ALWAYS_ENABLED; |