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

Side by Side Diff: media/blink/key_system_config_selector.h

Issue 1106263004: Support Android secure codecs in requestMediaKeySystemAccess(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 5 years, 7 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_ 5 #ifndef MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_
6 #define MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_ 6 #define MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 EmeMediaType media_type, 71 EmeMediaType media_type,
72 const blink::WebVector<blink::WebMediaKeySystemMediaCapability>& 72 const blink::WebVector<blink::WebMediaKeySystemMediaCapability>&
73 requested_media_capabilities, 73 requested_media_capabilities,
74 ConfigState* config_state, 74 ConfigState* config_state,
75 std::vector<blink::WebMediaKeySystemMediaCapability>* 75 std::vector<blink::WebMediaKeySystemMediaCapability>*
76 supported_media_capabilities); 76 supported_media_capabilities);
77 77
78 bool IsSupportedContentType(const std::string& key_system, 78 bool IsSupportedContentType(const std::string& key_system,
79 EmeMediaType media_type, 79 EmeMediaType media_type,
80 const std::string& container_mime_type, 80 const std::string& container_mime_type,
81 const std::string& codecs); 81 const std::string& codecs,
82 ConfigState* config_state);
82 83
83 const KeySystems* key_systems_; 84 const KeySystems* key_systems_;
84 MediaPermission* media_permission_; 85 MediaPermission* media_permission_;
85 base::WeakPtrFactory<KeySystemConfigSelector> weak_factory_; 86 base::WeakPtrFactory<KeySystemConfigSelector> weak_factory_;
86 87
87 DISALLOW_COPY_AND_ASSIGN(KeySystemConfigSelector); 88 DISALLOW_COPY_AND_ASSIGN(KeySystemConfigSelector);
88 }; 89 };
89 90
90 } // namespace media 91 } // namespace media
91 92
92 #endif // MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_ 93 #endif // MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698