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

Side by Side Diff: components/cdm/renderer/android_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: 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 "components/cdm/renderer/android_key_systems.h" 5 #include "components/cdm/renderer/android_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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 it != key_system_names.end(); ++it) { 73 it != key_system_names.end(); ++it) {
74 SupportedKeySystemResponse response = QueryKeySystemSupport(*it); 74 SupportedKeySystemResponse response = QueryKeySystemSupport(*it);
75 if (response.compositing_codecs != media::EME_CODEC_NONE) { 75 if (response.compositing_codecs != media::EME_CODEC_NONE) {
76 KeySystemInfo info; 76 KeySystemInfo info;
77 info.key_system = *it; 77 info.key_system = *it;
78 info.supported_codecs = response.compositing_codecs; 78 info.supported_codecs = response.compositing_codecs;
79 // Here we assume that support for a container implies support for the 79 // Here we assume that support for a container implies support for the
80 // associated initialization data type. KeySystems handles validating 80 // associated initialization data type. KeySystems handles validating
81 // |init_data_type| x |container| pairings. 81 // |init_data_type| x |container| pairings.
82 if (response.compositing_codecs & media::EME_CODEC_WEBM_ALL) 82 if (response.compositing_codecs & media::EME_CODEC_WEBM_ALL)
83 info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_WEBM; 83 info.supported_init_data_types |= media::kSupportedInitDataTypeWebM;
84 #if defined(USE_PROPRIETARY_CODECS) 84 #if defined(USE_PROPRIETARY_CODECS)
85 if (response.compositing_codecs & media::EME_CODEC_MP4_ALL) 85 if (response.compositing_codecs & media::EME_CODEC_MP4_ALL)
86 info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC; 86 info.supported_init_data_types |= media::kSupportedInitDataTypeCenc;
87 #endif // defined(USE_PROPRIETARY_CODECS) 87 #endif // defined(USE_PROPRIETARY_CODECS)
88 // Assume the worst case (from a user point of view). 88 // Assume the worst case (from a user point of view).
89 info.persistent_license_support = media::EME_SESSION_TYPE_NOT_SUPPORTED; 89 info.persistent_license_support = media::EME_SESSION_TYPE_NOT_SUPPORTED;
90 info.persistent_release_message_support = 90 info.persistent_release_message_support =
91 media::EME_SESSION_TYPE_NOT_SUPPORTED; 91 media::EME_SESSION_TYPE_NOT_SUPPORTED;
92 info.persistent_state_support = media::EME_FEATURE_ALWAYS_ENABLED; 92 info.persistent_state_support = media::EME_FEATURE_ALWAYS_ENABLED;
93 info.distinctive_identifier_support = media::EME_FEATURE_ALWAYS_ENABLED; 93 info.distinctive_identifier_support = media::EME_FEATURE_ALWAYS_ENABLED;
94 concrete_key_systems->push_back(info); 94 concrete_key_systems->push_back(info);
95 } 95 }
96 } 96 }
97 } 97 }
98 98
99 } // namespace cdm 99 } // namespace cdm
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698