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

Side by Side Diff: chromecast/media/base/key_systems_common.cc

Issue 1921823003: media: Move key_system_names to media/base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 months 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
« no previous file with comments | « no previous file | media/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/media/base/key_systems_common.h" 5 #include "chromecast/media/base/key_systems_common.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 8
9 #include "media/cdm/key_system_names.h" 9 #include "media/base/key_system_names.h"
10 10
11 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 11 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
12 12
13 namespace chromecast { 13 namespace chromecast {
14 namespace media { 14 namespace media {
15 15
16 #if defined(PLAYREADY_CDM_AVAILABLE) 16 #if defined(PLAYREADY_CDM_AVAILABLE)
17 const char kChromecastPlayreadyKeySystem[] = "com.chromecast.playready"; 17 const char kChromecastPlayreadyKeySystem[] = "com.chromecast.playready";
18 #endif // defined(PLAYREADY_CDM_AVAILABLE) 18 #endif // defined(PLAYREADY_CDM_AVAILABLE)
19 19
20 CastKeySystem GetKeySystemByName(const std::string& key_system_name) { 20 CastKeySystem GetKeySystemByName(const std::string& key_system_name) {
21 #if defined(WIDEVINE_CDM_AVAILABLE) 21 #if defined(WIDEVINE_CDM_AVAILABLE)
22 if (key_system_name.compare(kWidevineKeySystem) == 0) { 22 if (key_system_name.compare(kWidevineKeySystem) == 0) {
23 return KEY_SYSTEM_WIDEVINE; 23 return KEY_SYSTEM_WIDEVINE;
24 } 24 }
25 #endif // defined(WIDEVINE_CDM_AVAILABLE) 25 #endif // defined(WIDEVINE_CDM_AVAILABLE)
26 26
27 #if defined(PLAYREADY_CDM_AVAILABLE) 27 #if defined(PLAYREADY_CDM_AVAILABLE)
28 if (key_system_name.compare(kChromecastPlayreadyKeySystem) == 0) { 28 if (key_system_name.compare(kChromecastPlayreadyKeySystem) == 0) {
29 return KEY_SYSTEM_PLAYREADY; 29 return KEY_SYSTEM_PLAYREADY;
30 } 30 }
31 #endif // defined(PLAYREADY_CDM_AVAILABLE) 31 #endif // defined(PLAYREADY_CDM_AVAILABLE)
32 32
33 if (key_system_name.compare(::media::kClearKey) == 0) { 33 if (::media::IsClearKey(key_system_name)) {
34 return KEY_SYSTEM_CLEAR_KEY; 34 return KEY_SYSTEM_CLEAR_KEY;
35 } 35 }
36 36
37 return KEY_SYSTEM_NONE; 37 return KEY_SYSTEM_NONE;
38 } 38 }
39 39
40 } // namespace media 40 } // namespace media
41 } // namespace chromecast 41 } // namespace chromecast
OLDNEW
« no previous file with comments | « no previous file | media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698