Chromium Code Reviews| Index: chromecast/media/cdm/cast_cdm_factory.cc |
| diff --git a/chromecast/media/cdm/cast_cdm_factory.cc b/chromecast/media/cdm/cast_cdm_factory.cc |
| index 750863245d11077793ccd15902017d2861cea0fc..a0b1b5f86e544955fff29237f3fed924e0a3b4bf 100644 |
| --- a/chromecast/media/cdm/cast_cdm_factory.cc |
| +++ b/chromecast/media/cdm/cast_cdm_factory.cc |
| @@ -43,16 +43,14 @@ void CastCdmFactory::Create( |
| ::media::CdmCreatedCB bound_cdm_created_cb = |
| ::media::BindToCurrentLoop(cdm_created_cb); |
| - DCHECK(!cdm_config.use_hw_secure_codecs) |
| - << "Chromecast does not use |use_hw_secure_codecs|"; |
| - |
| CastKeySystem cast_key_system(GetKeySystemByName(key_system)); |
| scoped_refptr<chromecast::media::CastCdm> cast_cdm; |
| if (cast_key_system == chromecast::media::KEY_SYSTEM_CLEAR_KEY) { |
| // TODO(gunsch): handle ClearKey decryption. See crbug.com/441957 |
| } else { |
| - cast_cdm = CreatePlatformBrowserCdm(cast_key_system, security_origin); |
| + cast_cdm = |
| + CreatePlatformBrowserCdm(cast_key_system, security_origin, cdm_config); |
| } |
| if (!cast_cdm) { |
| @@ -80,7 +78,8 @@ void CastCdmFactory::Create( |
| scoped_refptr<CastCdm> CastCdmFactory::CreatePlatformBrowserCdm( |
|
slan
2016/11/03 19:06:52
Unrelated: All references to "Browser" should be r
|
| const CastKeySystem& cast_key_system, |
| - const GURL& security_origin) { |
| + const GURL& security_origin, |
| + const ::media::CdmConfig& cdm_config) { |
| return nullptr; |
| } |