Commit d87803b7 authored by gunsch's avatar gunsch Committed by Commit bot

Chromecast: adds AddKeySystemWithCodecs to key_systems_cast header.

This helper method is also used by internal Chromecast calls.

R=lcwu@chromium.org,byungchul@chromium.org
BUG=400914

Review URL: https://codereview.chromium.org/606483002

Cr-Commit-Position: refs/heads/master@{#296601}
parent a9851bf1
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
namespace { namespace chromecast {
namespace shell {
#if defined(PLAYREADY_CDM_AVAILABLE)
void AddKeySystemWithCodecs( void AddKeySystemWithCodecs(
const std::string& key_system_name, const std::string& key_system_name,
std::vector<content::KeySystemInfo>* concrete_key_systems) { std::vector<content::KeySystemInfo>* concrete_key_systems) {
...@@ -24,12 +24,6 @@ void AddKeySystemWithCodecs( ...@@ -24,12 +24,6 @@ void AddKeySystemWithCodecs(
info.supported_codecs = content::EME_CODEC_MP4_ALL; info.supported_codecs = content::EME_CODEC_MP4_ALL;
concrete_key_systems->push_back(info); concrete_key_systems->push_back(info);
} }
#endif // defined(PLAYREADY_CDM_AVAILABLE)
} // namespace
namespace chromecast {
namespace shell {
void AddChromecastKeySystems( void AddChromecastKeySystems(
std::vector<content::KeySystemInfo>* key_systems_info) { std::vector<content::KeySystemInfo>* key_systems_info) {
...@@ -40,7 +34,8 @@ void AddChromecastKeySystems( ...@@ -40,7 +34,8 @@ void AddChromecastKeySystems(
#endif #endif
#if defined(PLAYREADY_CDM_AVAILABLE) #if defined(PLAYREADY_CDM_AVAILABLE)
AddKeySystemWithCodecs(kChromecastPlayreadyKeySystem, key_systems_info); AddKeySystemWithCodecs(media::kChromecastPlayreadyKeySystem,
key_systems_info);
#endif #endif
} }
......
...@@ -12,6 +12,11 @@ ...@@ -12,6 +12,11 @@
namespace chromecast { namespace chromecast {
namespace shell { namespace shell {
// Adds a single key system by name.
void AddKeySystemWithCodecs(
const std::string& key_system_name,
std::vector<content::KeySystemInfo>* concrete_key_systems);
void AddChromecastKeySystems( void AddChromecastKeySystems(
std::vector<content::KeySystemInfo>* key_systems_info); std::vector<content::KeySystemInfo>* key_systems_info);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment