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

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

Issue 1737213002: EME: Remove WidevineCdmType. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@parent
Patch Set: Fix Cast build. Created 4 years, 9 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
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 ::media::EmeFeatureSupport::ALWAYS_ENABLED; 46 ::media::EmeFeatureSupport::ALWAYS_ENABLED;
47 key_systems_info->push_back(info); 47 key_systems_info->push_back(info);
48 } 48 }
49 49
50 void AddChromecastKeySystems( 50 void AddChromecastKeySystems(
51 std::vector<::media::KeySystemInfo>* key_systems_info) { 51 std::vector<::media::KeySystemInfo>* key_systems_info) {
52 #if defined(WIDEVINE_CDM_AVAILABLE) 52 #if defined(WIDEVINE_CDM_AVAILABLE)
53 ::media::SupportedCodecs codecs = 53 ::media::SupportedCodecs codecs =
54 ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1 | 54 ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1 |
55 ::media::EME_CODEC_WEBM_VP8 | ::media::EME_CODEC_WEBM_VP9; 55 ::media::EME_CODEC_WEBM_VP8 | ::media::EME_CODEC_WEBM_VP9;
56 AddWidevineWithCodecs( 56 cdm::AddWidevineWithCodecs(
57 cdm::WIDEVINE,
58 codecs, // Regular codecs. 57 codecs, // Regular codecs.
59 #if defined(OS_ANDROID) 58 #if defined(OS_ANDROID)
60 codecs, // Hardware-secure codecs. 59 codecs, // Hardware-secure codecs.
61 #endif // defined(OS_ANDROID) 60 #endif // defined(OS_ANDROID)
62 EmeRobustness::HW_SECURE_ALL, // Max audio robustness. 61 EmeRobustness::HW_SECURE_ALL, // Max audio robustness.
63 EmeRobustness::HW_SECURE_ALL, // Max video robustness. 62 EmeRobustness::HW_SECURE_ALL, // Max video robustness.
64 EmeSessionTypeSupport::NOT_SUPPORTED, // persistent-license. 63 EmeSessionTypeSupport::NOT_SUPPORTED, // persistent-license.
65 EmeSessionTypeSupport::NOT_SUPPORTED, // persistent-release-message. 64 EmeSessionTypeSupport::NOT_SUPPORTED, // persistent-release-message.
66 // Note: On Chromecast, all CDMs may have persistent state. 65 // Note: On Chromecast, all CDMs may have persistent state.
67 EmeFeatureSupport::ALWAYS_ENABLED, // Persistent state. 66 EmeFeatureSupport::ALWAYS_ENABLED, // Persistent state.
68 EmeFeatureSupport::ALWAYS_ENABLED, // Distinctive identifier. 67 EmeFeatureSupport::ALWAYS_ENABLED, // Distinctive identifier.
69 key_systems_info); 68 key_systems_info);
70 #endif // defined(WIDEVINE_CDM_AVAILABLE) 69 #endif // defined(WIDEVINE_CDM_AVAILABLE)
71 70
72 #if defined(PLAYREADY_CDM_AVAILABLE) 71 #if defined(PLAYREADY_CDM_AVAILABLE)
73 AddKeySystemWithCodecs(media::kChromecastPlayreadyKeySystem, 72 AddKeySystemWithCodecs(media::kChromecastPlayreadyKeySystem,
74 key_systems_info); 73 key_systems_info);
75 #endif // defined(PLAYREADY_CDM_AVAILABLE) 74 #endif // defined(PLAYREADY_CDM_AVAILABLE)
76 } 75 }
77 76
78 } // namespace shell 77 } // namespace shell
79 } // namespace chromecast 78 } // namespace chromecast
OLDNEW
« no previous file with comments | « chrome/renderer/media/chrome_key_systems.cc ('k') | components/cdm/renderer/android_key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698