diff options
| author | sandersd <sandersd@chromium.org> | 2015-05-14 21:21:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-15 04:22:14 +0000 |
| commit | d7411976f6467bf4519f66f32b4459717e7352d7 (patch) | |
| tree | c7d1fc7a2e2254e20c9f9af1695a0c77fba552d0 /chromecast | |
| parent | 55c065b684f16cee1c73e7ef803764f22a4fb281 (diff) | |
| download | chromium_src-d7411976f6467bf4519f66f32b4459717e7352d7.zip chromium_src-d7411976f6467bf4519f66f32b4459717e7352d7.tar.gz chromium_src-d7411976f6467bf4519f66f32b4459717e7352d7.tar.bz2 | |
Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.
This completes the path from the secure surface preference, through requestMediaKeySystemAccess() and finally to CDM creation on Android where secure codecs are enabled. With this change, configs requiring secure codes are rejected without the preference and the CDM is only configures to use hardware-secure codecs if the config requires it.
There is a separate bug (http://crbug.com/478185) for implementing similar plumbing for the use of secure surfaces.
BUG=467779
Committed: https://crrev.com/9ce0a551c7f1d79dea793b5691473ef9d5fb9326
Cr-Commit-Position: refs/heads/master@{#330008}
Review URL: https://codereview.chromium.org/1131753003
Cr-Commit-Position: refs/heads/master@{#330040}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/browser/media/cast_browser_cdm_factory.cc | 5 | ||||
| -rw-r--r-- | chromecast/browser/media/cast_browser_cdm_factory.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/chromecast/browser/media/cast_browser_cdm_factory.cc b/chromecast/browser/media/cast_browser_cdm_factory.cc index 10bcfd3..61d8001 100644 --- a/chromecast/browser/media/cast_browser_cdm_factory.cc +++ b/chromecast/browser/media/cast_browser_cdm_factory.cc @@ -17,13 +17,14 @@ namespace media { scoped_ptr<::media::BrowserCdm> CastBrowserCdmFactory::CreateBrowserCdm( const std::string& key_system_name, - bool use_secure_surface, + bool use_hw_secure_codecs, const ::media::SessionMessageCB& session_message_cb, const ::media::SessionClosedCB& session_closed_cb, const ::media::LegacySessionErrorCB& legacy_session_error_cb, const ::media::SessionKeysChangeCB& session_keys_change_cb, const ::media::SessionExpirationUpdateCB& session_expiration_update_cb) { - DCHECK(!use_secure_surface) << "Chromecast does not use |use_secure_surface|"; + DCHECK(!use_hw_secure_codecs) + << "Chromecast does not use |use_hw_secure_codecs|"; CastKeySystem key_system(GetKeySystemByName(key_system_name)); diff --git a/chromecast/browser/media/cast_browser_cdm_factory.h b/chromecast/browser/media/cast_browser_cdm_factory.h index 04a0537..ad59bed 100644 --- a/chromecast/browser/media/cast_browser_cdm_factory.h +++ b/chromecast/browser/media/cast_browser_cdm_factory.h @@ -22,7 +22,7 @@ class CastBrowserCdmFactory : public ::media::BrowserCdmFactory { // ::media::BrowserCdmFactory implementation: scoped_ptr<::media::BrowserCdm> CreateBrowserCdm( const std::string& key_system, - bool use_secure_surface, + bool use_hw_secure_codecs, const ::media::SessionMessageCB& session_message_cb, const ::media::SessionClosedCB& session_closed_cb, const ::media::LegacySessionErrorCB& legacy_session_error_cb, |