Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chromecast/renderer/key_systems_cast.h" | 5 #include "chromecast/renderer/key_systems_cast.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 80 #if defined(PLAYREADY_CDM_AVAILABLE) | 80 #if defined(PLAYREADY_CDM_AVAILABLE) |
| 81 key_systems_properties->emplace_back(new PlayReadyKeySystemProperties()); | 81 key_systems_properties->emplace_back(new PlayReadyKeySystemProperties()); |
| 82 #endif // defined(PLAYREADY_CDM_AVAILABLE) | 82 #endif // defined(PLAYREADY_CDM_AVAILABLE) |
| 83 | 83 |
| 84 #if defined(WIDEVINE_CDM_AVAILABLE) | 84 #if defined(WIDEVINE_CDM_AVAILABLE) |
| 85 ::media::SupportedCodecs codecs = | 85 ::media::SupportedCodecs codecs = |
| 86 ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1 | | 86 ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1 | |
| 87 ::media::EME_CODEC_WEBM_VP8 | ::media::EME_CODEC_WEBM_VP9; | 87 ::media::EME_CODEC_WEBM_VP8 | ::media::EME_CODEC_WEBM_VP9; |
| 88 key_systems_properties->emplace_back(new cdm::WidevineKeySystemProperties( | 88 key_systems_properties->emplace_back(new cdm::WidevineKeySystemProperties( |
| 89 codecs, // Regular codecs. | 89 codecs, // Regular codecs. |
| 90 #if defined(OS_ANDROID) | |
| 91 codecs, // Hardware-secure codecs. | 90 codecs, // Hardware-secure codecs. |
|
ddorwin
2016/05/24 23:11:50
Do you mean to provide the same set of codecs on a
yucliu1
2016/05/25 00:43:21
Audio devices should use EME_CODEC_NONE. But the c
| |
| 92 #endif | |
| 93 EmeRobustness::HW_SECURE_ALL, // Max audio robustness. | 91 EmeRobustness::HW_SECURE_ALL, // Max audio robustness. |
| 94 EmeRobustness::HW_SECURE_ALL, // Max video robustness. | 92 EmeRobustness::HW_SECURE_ALL, // Max video robustness. |
| 95 EmeSessionTypeSupport::NOT_SUPPORTED, // persistent-license. | 93 EmeSessionTypeSupport::NOT_SUPPORTED, // persistent-license. |
| 96 EmeSessionTypeSupport::NOT_SUPPORTED, // persistent-release-message. | 94 EmeSessionTypeSupport::NOT_SUPPORTED, // persistent-release-message. |
| 97 // Note: On Chromecast, all CDMs may have persistent state. | 95 // Note: On Chromecast, all CDMs may have persistent state. |
| 98 EmeFeatureSupport::ALWAYS_ENABLED, // Persistent state. | 96 EmeFeatureSupport::ALWAYS_ENABLED, // Persistent state. |
| 99 EmeFeatureSupport::ALWAYS_ENABLED)); // Distinctive identifier. | 97 EmeFeatureSupport::ALWAYS_ENABLED)); // Distinctive identifier. |
| 100 #endif // defined(WIDEVINE_CDM_AVAILABLE) | 98 #endif // defined(WIDEVINE_CDM_AVAILABLE) |
| 101 } | 99 } |
| 102 | 100 |
| 103 } // namespace shell | 101 } // namespace shell |
| 104 } // namespace chromecast | 102 } // namespace chromecast |
| OLD | NEW |