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

Side by Side Diff: chrome/renderer/media/chrome_key_systems.cc

Issue 1027363002: Change EmeInitDataType to be an enum class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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
« 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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 if (!IsPepperCdmAvailable(kExternalClearKeyPepperType, 69 if (!IsPepperCdmAvailable(kExternalClearKeyPepperType,
70 &additional_param_names, 70 &additional_param_names,
71 &additional_param_values)) { 71 &additional_param_values)) {
72 return; 72 return;
73 } 73 }
74 74
75 KeySystemInfo info; 75 KeySystemInfo info;
76 info.key_system = kExternalClearKeyKeySystem; 76 info.key_system = kExternalClearKeyKeySystem;
77 77
78 info.supported_init_data_types = 78 info.supported_init_data_types =
79 media::EME_INIT_DATA_TYPE_WEBM | media::EME_INIT_DATA_TYPE_KEYIDS; 79 media::kInitDataTypeMaskWebM | media::kInitDataTypeMaskKeyIds;
80 info.supported_codecs = media::EME_CODEC_WEBM_ALL; 80 info.supported_codecs = media::EME_CODEC_WEBM_ALL;
81 #if defined(USE_PROPRIETARY_CODECS) 81 #if defined(USE_PROPRIETARY_CODECS)
82 info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC; 82 info.supported_init_data_types |= media::kInitDataTypeMaskCenc;
83 info.supported_codecs |= media::EME_CODEC_MP4_ALL; 83 info.supported_codecs |= media::EME_CODEC_MP4_ALL;
84 #endif // defined(USE_PROPRIETARY_CODECS) 84 #endif // defined(USE_PROPRIETARY_CODECS)
85 85
86 info.max_audio_robustness = media::EmeRobustness::EMPTY; 86 info.max_audio_robustness = media::EmeRobustness::EMPTY;
87 info.max_video_robustness = media::EmeRobustness::EMPTY; 87 info.max_video_robustness = media::EmeRobustness::EMPTY;
88 88
89 // Persistent sessions are faked. 89 // Persistent sessions are faked.
90 info.persistent_license_support = media::EME_SESSION_TYPE_SUPPORTED; 90 info.persistent_license_support = media::EME_SESSION_TYPE_SUPPORTED;
91 info.persistent_release_message_support = 91 info.persistent_release_message_support =
92 media::EME_SESSION_TYPE_NOT_SUPPORTED; 92 media::EME_SESSION_TYPE_NOT_SUPPORTED;
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 220
221 #if defined(WIDEVINE_CDM_AVAILABLE) 221 #if defined(WIDEVINE_CDM_AVAILABLE)
222 AddPepperBasedWidevine(key_systems_info); 222 AddPepperBasedWidevine(key_systems_info);
223 #endif // defined(WIDEVINE_CDM_AVAILABLE) 223 #endif // defined(WIDEVINE_CDM_AVAILABLE)
224 #endif // defined(ENABLE_PEPPER_CDMS) 224 #endif // defined(ENABLE_PEPPER_CDMS)
225 225
226 #if defined(OS_ANDROID) 226 #if defined(OS_ANDROID)
227 cdm::AddAndroidWidevine(key_systems_info); 227 cdm::AddAndroidWidevine(key_systems_info);
228 #endif // defined(OS_ANDROID) 228 #endif // defined(OS_ANDROID)
229 } 229 }
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