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

Side by Side Diff: chromecast/renderer/key_systems_cast.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
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"
11 #include "chromecast/media/base/key_systems_common.h" 11 #include "chromecast/media/base/key_systems_common.h"
12 #include "components/cdm/renderer/widevine_key_systems.h" 12 #include "components/cdm/renderer/widevine_key_systems.h"
13 #include "media/base/eme_constants.h" 13 #include "media/base/eme_constants.h"
14 14
15 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 15 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
16 16
17 namespace chromecast { 17 namespace chromecast {
18 namespace shell { 18 namespace shell {
19 19
20 void AddKeySystemWithCodecs( 20 void AddKeySystemWithCodecs(
21 const std::string& key_system_name, 21 const std::string& key_system_name,
22 std::vector<::media::KeySystemInfo>* key_systems_info) { 22 std::vector<::media::KeySystemInfo>* key_systems_info) {
23 ::media::KeySystemInfo info; 23 ::media::KeySystemInfo info;
24 info.key_system = key_system_name; 24 info.key_system = key_system_name;
25 info.supported_init_data_types = ::media::EME_INIT_DATA_TYPE_CENC; 25 info.supported_init_data_types = ::media::kInitDataTypeMaskCenc;
26 info.supported_codecs = 26 info.supported_codecs =
27 ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1; 27 ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1;
28 info.max_audio_robustness = ::media::EmeRobustness::EMPTY; 28 info.max_audio_robustness = ::media::EmeRobustness::EMPTY;
29 info.max_video_robustness = ::media::EmeRobustness::EMPTY; 29 info.max_video_robustness = ::media::EmeRobustness::EMPTY;
30 info.persistent_license_support = ::media::EME_SESSION_TYPE_NOT_SUPPORTED; 30 info.persistent_license_support = ::media::EME_SESSION_TYPE_NOT_SUPPORTED;
31 info.persistent_release_message_support = 31 info.persistent_release_message_support =
32 ::media::EME_SESSION_TYPE_NOT_SUPPORTED; 32 ::media::EME_SESSION_TYPE_NOT_SUPPORTED;
33 info.persistent_state_support = ::media::EME_FEATURE_ALWAYS_ENABLED; 33 info.persistent_state_support = ::media::EME_FEATURE_ALWAYS_ENABLED;
34 info.distinctive_identifier_support = ::media::EME_FEATURE_ALWAYS_ENABLED; 34 info.distinctive_identifier_support = ::media::EME_FEATURE_ALWAYS_ENABLED;
35 key_systems_info->push_back(info); 35 key_systems_info->push_back(info);
(...skipping 15 matching lines...) Expand all
51 #endif 51 #endif
52 52
53 #if defined(PLAYREADY_CDM_AVAILABLE) 53 #if defined(PLAYREADY_CDM_AVAILABLE)
54 AddKeySystemWithCodecs(media::kChromecastPlayreadyKeySystem, 54 AddKeySystemWithCodecs(media::kChromecastPlayreadyKeySystem,
55 key_systems_info); 55 key_systems_info);
56 #endif 56 #endif
57 } 57 }
58 58
59 } // namespace shell 59 } // namespace shell
60 } // namespace chromecast 60 } // 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