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

Side by Side Diff: media/base/android/media_drm_bridge.h

Issue 284183003: Add MediaDrmBridge::AddKeySystemUuidMapping(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed xhwang's comments. Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | media/base/android/media_drm_bridge.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 29 matching lines...) Expand all
40 // All other static methods check IsAvailable() internally. There's no need 40 // All other static methods check IsAvailable() internally. There's no need
41 // to check IsAvailable() explicitly before calling them. 41 // to check IsAvailable() explicitly before calling them.
42 static bool IsAvailable(); 42 static bool IsAvailable();
43 43
44 static bool IsSecurityLevelSupported(const std::string& key_system, 44 static bool IsSecurityLevelSupported(const std::string& key_system,
45 SecurityLevel security_level); 45 SecurityLevel security_level);
46 46
47 // Checks whether |key_system| is supported. 47 // Checks whether |key_system| is supported.
48 static bool IsKeySystemSupported(const std::string& key_system); 48 static bool IsKeySystemSupported(const std::string& key_system);
49 49
50 // Adds a new |key_system| with the associated |uuid|.
51 // This is used for other platforms to have a chance to register their
52 // own UUID mapping.
53 static void AddKeySystemUuidMapping(const std::string& key_system,
54 const std::vector<uint8>& uuid);
55
50 // Checks whether |key_system| is supported with |container_mime_type|. 56 // Checks whether |key_system| is supported with |container_mime_type|.
51 // |container_mime_type| must not be empty. 57 // |container_mime_type| must not be empty.
52 static bool IsKeySystemSupportedWithType( 58 static bool IsKeySystemSupportedWithType(
53 const std::string& key_system, 59 const std::string& key_system,
54 const std::string& container_mime_type); 60 const std::string& container_mime_type);
55 61
56 static bool IsSecureDecoderRequired(SecurityLevel security_level); 62 static bool IsSecureDecoderRequired(SecurityLevel security_level);
57 63
58 static bool RegisterMediaDrmBridge(JNIEnv* env); 64 static bool RegisterMediaDrmBridge(JNIEnv* env);
59 65
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 base::Closure media_crypto_ready_cb_; 157 base::Closure media_crypto_ready_cb_;
152 158
153 ResetCredentialsCB reset_credentials_cb_; 159 ResetCredentialsCB reset_credentials_cb_;
154 160
155 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge); 161 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge);
156 }; 162 };
157 163
158 } // namespace media 164 } // namespace media
159 165
160 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 166 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
OLDNEW
« no previous file with comments | « no previous file | media/base/android/media_drm_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698