Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Side by Side Diff: chromecast/renderer/key_systems_cast.cc

Issue 772043004: Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix #endif Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
11 #include "chromecast/media/base/key_systems_common.h" 11 #include "chromecast/media/base/key_systems_common.h"
12 #include "components/cdm/renderer/widevine_key_systems.h" 12 #include "components/cdm/renderer/widevine_key_systems.h"
13 #include "media/base/eme_constants.h" 13 #include "media/base/eme_constants.h"
14 14
15 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 15 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
16 16
17 namespace chromecast { 17 namespace chromecast {
18 namespace shell { 18 namespace shell {
19 19
20 void AddKeySystemWithCodecs( 20 void AddKeySystemWithCodecs(
21 const std::string& key_system_name, 21 const std::string& key_system_name,
22 std::vector< ::media::KeySystemInfo>* concrete_key_systems) { 22 std::vector< ::media::KeySystemInfo>* concrete_key_systems) {
23 ::media::KeySystemInfo info(key_system_name); 23 ::media::KeySystemInfo info(key_system_name);
24 info.supported_codecs = ::media::EME_CODEC_MP4_ALL; 24 info.supported_codecs = ::media::EME_CODEC_MP4_ALL;
25 concrete_key_systems->push_back(info); 25 concrete_key_systems->push_back(info);
26 } 26 }
27 27
28 void AddChromecastKeySystems( 28 void AddChromecastKeySystems(
29 std::vector< ::media::KeySystemInfo>* key_systems_info) { 29 std::vector< ::media::KeySystemInfo>* key_systems_info) {
30 #if defined(WIDEVINE_CDM_AVAILABLE) 30 #if defined(ENABLE_WIDEVINE_CDM)
31 AddWidevineWithCodecs(cdm::WIDEVINE, 31 AddWidevineWithCodecs(cdm::WIDEVINE,
32 ::media::EME_CODEC_MP4_ALL, 32 ::media::EME_CODEC_MP4_ALL,
33 key_systems_info); 33 key_systems_info);
34 #endif 34 #endif
35 35
36 #if defined(PLAYREADY_CDM_AVAILABLE) 36 #if defined(PLAYREADY_CDM_AVAILABLE)
37 AddKeySystemWithCodecs(media::kChromecastPlayreadyKeySystem, 37 AddKeySystemWithCodecs(media::kChromecastPlayreadyKeySystem,
38 key_systems_info); 38 key_systems_info);
39 #endif 39 #endif
40 } 40 }
41 41
42 } // namespace shell 42 } // namespace shell
43 } // namespace chromecast 43 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/media/base/key_systems_common.cc ('k') | components/cdm/renderer/widevine_key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698