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

Side by Side Diff: chrome/renderer/media/chrome_key_systems.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, 10 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 | chromecast/renderer/key_systems_cast.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/renderer/media/chrome_key_systems.h" 5 #include "chrome/renderer/media/chrome_key_systems.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 supported_codecs |= media::EME_CODEC_WEBM_VP8; 187 supported_codecs |= media::EME_CODEC_WEBM_VP8;
188 if (codecs[i] == kCdmSupportedCodecVp9) 188 if (codecs[i] == kCdmSupportedCodecVp9)
189 supported_codecs |= media::EME_CODEC_WEBM_VP9; 189 supported_codecs |= media::EME_CODEC_WEBM_VP9;
190 #if defined(USE_PROPRIETARY_CODECS) 190 #if defined(USE_PROPRIETARY_CODECS)
191 if (codecs[i] == kCdmSupportedCodecAvc1) 191 if (codecs[i] == kCdmSupportedCodecAvc1)
192 supported_codecs |= media::EME_CODEC_MP4_AVC1; 192 supported_codecs |= media::EME_CODEC_MP4_AVC1;
193 #endif // defined(USE_PROPRIETARY_CODECS) 193 #endif // defined(USE_PROPRIETARY_CODECS)
194 } 194 }
195 195
196 cdm::AddWidevineWithCodecs( 196 cdm::AddWidevineWithCodecs(
197 cdm::WIDEVINE, supported_codecs, 197 supported_codecs,
198 #if defined(OS_CHROMEOS) 198 #if defined(OS_CHROMEOS)
199 media::EmeRobustness::HW_SECURE_ALL, // Maximum audio robustness. 199 media::EmeRobustness::HW_SECURE_ALL, // Maximum audio robustness.
200 media::EmeRobustness::HW_SECURE_ALL, // Maximim video robustness. 200 media::EmeRobustness::HW_SECURE_ALL, // Maximim video robustness.
201 media::EmeSessionTypeSupport:: 201 media::EmeSessionTypeSupport::
202 SUPPORTED_WITH_IDENTIFIER, // Persistent-license. 202 SUPPORTED_WITH_IDENTIFIER, // Persistent-license.
203 media::EmeSessionTypeSupport:: 203 media::EmeSessionTypeSupport::
204 NOT_SUPPORTED, // Persistent-release-message. 204 NOT_SUPPORTED, // Persistent-release-message.
205 media::EmeFeatureSupport::REQUESTABLE, // Persistent state. 205 media::EmeFeatureSupport::REQUESTABLE, // Persistent state.
206 media::EmeFeatureSupport::REQUESTABLE, // Distinctive identifier. 206 media::EmeFeatureSupport::REQUESTABLE, // Distinctive identifier.
207 #else // (Desktop) 207 #else // (Desktop)
(...skipping 16 matching lines...) Expand all
224 224
225 #if defined(WIDEVINE_CDM_AVAILABLE) 225 #if defined(WIDEVINE_CDM_AVAILABLE)
226 AddPepperBasedWidevine(key_systems_info); 226 AddPepperBasedWidevine(key_systems_info);
227 #endif // defined(WIDEVINE_CDM_AVAILABLE) 227 #endif // defined(WIDEVINE_CDM_AVAILABLE)
228 #endif // defined(ENABLE_PEPPER_CDMS) 228 #endif // defined(ENABLE_PEPPER_CDMS)
229 229
230 #if defined(OS_ANDROID) 230 #if defined(OS_ANDROID)
231 cdm::AddAndroidWidevine(key_systems_info); 231 cdm::AddAndroidWidevine(key_systems_info);
232 #endif // defined(OS_ANDROID) 232 #endif // defined(OS_ANDROID)
233 } 233 }
OLDNEW
« no previous file with comments | « no previous file | chromecast/renderer/key_systems_cast.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698