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

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

Issue 2478453002: [Chromecast] Use CdmConfig to create CDM (Closed)
Patch Set: Nit Created 4 years, 1 month 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"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 private: 79 private:
80 const bool persistent_license_support_; 80 const bool persistent_license_support_;
81 }; 81 };
82 #endif // PLAYREADY_CDM_AVAILABLE 82 #endif // PLAYREADY_CDM_AVAILABLE
83 83
84 } // namespace 84 } // namespace
85 85
86 void AddChromecastKeySystems( 86 void AddChromecastKeySystems(
87 std::vector<std::unique_ptr<::media::KeySystemProperties>>* 87 std::vector<std::unique_ptr<::media::KeySystemProperties>>*
88 key_systems_properties, 88 key_systems_properties,
89 bool enable_persistent_license_support) { 89 bool enable_persistent_license_support,
90 bool force_software_crypto) {
90 #if defined(PLAYREADY_CDM_AVAILABLE) 91 #if defined(PLAYREADY_CDM_AVAILABLE)
91 #if defined(OS_ANDROID) 92 #if defined(OS_ANDROID)
92 CHECK(!enable_persistent_license_support); 93 CHECK(!enable_persistent_license_support);
93 #endif 94 #endif
94 key_systems_properties->emplace_back( 95 key_systems_properties->emplace_back(
95 new PlayReadyKeySystemProperties(enable_persistent_license_support)); 96 new PlayReadyKeySystemProperties(enable_persistent_license_support));
96 #endif // defined(PLAYREADY_CDM_AVAILABLE) 97 #endif // defined(PLAYREADY_CDM_AVAILABLE)
97 98
98 #if defined(WIDEVINE_CDM_AVAILABLE) 99 #if defined(WIDEVINE_CDM_AVAILABLE)
99 using Robustness = cdm::WidevineKeySystemProperties::Robustness; 100 using Robustness = cdm::WidevineKeySystemProperties::Robustness;
(...skipping 11 matching lines...) Expand all
111 EmeSessionTypeSupport::NOT_SUPPORTED, // persistent-license. 112 EmeSessionTypeSupport::NOT_SUPPORTED, // persistent-license.
112 EmeSessionTypeSupport::NOT_SUPPORTED, // persistent-release-message. 113 EmeSessionTypeSupport::NOT_SUPPORTED, // persistent-release-message.
113 // Note: On Chromecast, all CDMs may have persistent state. 114 // Note: On Chromecast, all CDMs may have persistent state.
114 EmeFeatureSupport::ALWAYS_ENABLED, // Persistent state. 115 EmeFeatureSupport::ALWAYS_ENABLED, // Persistent state.
115 EmeFeatureSupport::ALWAYS_ENABLED)); // Distinctive identifier. 116 EmeFeatureSupport::ALWAYS_ENABLED)); // Distinctive identifier.
116 #endif // defined(WIDEVINE_CDM_AVAILABLE) 117 #endif // defined(WIDEVINE_CDM_AVAILABLE)
117 } 118 }
118 119
119 } // namespace shell 120 } // namespace shell
120 } // namespace chromecast 121 } // namespace chromecast
OLDNEW
« chromecast/media/cdm/cast_cdm_factory.cc ('K') | « chromecast/renderer/key_systems_cast.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698