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

Side by Side Diff: trunk/src/content/renderer/media/crypto/key_systems.h

Issue 23708020: Revert 222074 "Refactor KeySystems code to call a function to po..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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
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 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "content/common/content_export.h" 12 #include "content/common/content_export.h"
13 13
14 namespace WebKit { 14 namespace WebKit {
15 class WebString; 15 class WebString;
16 } 16 }
17 17
18 // Definitions:
19 // * Key system
20 // https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypt ed-media.html#key-system
21 // * Concrete key system
22 // A key system string that can be instantiated, such as
23 // via the MediaKeys constructor. Examples include "org.w3.clearkey" and
24 // "com.widevine.alpha".
25 // * Abstract key system
26 // A key system string that cannot be instantiated like a concrete key system
27 // but is otherwise useful, such as in discovery using isTypeSupported().
28 // * Parent key system
29 // A key system string that is one level up from the child key system. It may
30 // be an abstract key system.
31 // As an example, "com.example" is the parent of "com.example.foo".
32
18 namespace content { 33 namespace content {
19 34
35 // Adds a concrete key system along with platform-specific information about how
36 // to instantiate it. Must be called before AddSupportedType().
37 // May only be called once per |concrete_key_system|.
38 // When not empty, |parent_key_system| will add a mapping to the
39 // |concrete_key_system| that can be used to check supported types.
40 // Only one parent key system is currently supported per concrete key system.
41 CONTENT_EXPORT void AddConcreteSupportedKeySystem(
42 const std::string& concrete_key_system,
43 bool use_aes_decryptor,
44 #if defined(ENABLE_PEPPER_CDMS)
45 const std::string& pepper_type,
46 #elif defined(OS_ANDROID)
47 const uint8 uuid[16],
48 #endif
49 const std::string& parent_key_system);
50
51 // Specifies the container and codec combinations supported by
52 // |concrete_key_system|.
53 // Multiple codecs can be listed. In all cases, the container
54 // without a codec is also supported.
55 // |concrete_key_system| must be a concrete supported key system previously
56 // added using AddConcreteSupportedKeySystem().
57 CONTENT_EXPORT void AddSupportedType(const std::string& concrete_key_system,
58 const std::string& mime_type,
59 const std::string& codecs_list);
60
20 // Returns whether |key_system| is a real supported key system that can be 61 // Returns whether |key_system| is a real supported key system that can be
21 // instantiated. 62 // instantiated.
22 // Abstract parent |key_system| strings will return false. 63 // Abstract parent |key_system| strings will return false.
23 // Call IsSupportedKeySystemWithMediaMimeType() to determine whether a 64 // Call IsSupportedKeySystemWithMediaMimeType() to determine whether a
24 // |key_system| supports a specific type of media or to check parent key 65 // |key_system| supports a specific type of media or to check parent key
25 // systems. 66 // systems.
26 CONTENT_EXPORT bool IsConcreteSupportedKeySystem( 67 CONTENT_EXPORT bool IsConcreteSupportedKeySystem(
27 const WebKit::WebString& key_system); 68 const WebKit::WebString& key_system);
28 69
29 // Returns whether |key_sytem| supports the specified media type and codec(s). 70 // Returns whether |key_sytem| supports the specified media type and codec(s).
(...skipping 16 matching lines...) Expand all
46 const std::string& concrete_key_system); 87 const std::string& concrete_key_system);
47 #elif defined(OS_ANDROID) 88 #elif defined(OS_ANDROID)
48 // Convert |concrete_key_system| to 16-byte Android UUID. 89 // Convert |concrete_key_system| to 16-byte Android UUID.
49 CONTENT_EXPORT std::vector<uint8> GetUUID( 90 CONTENT_EXPORT std::vector<uint8> GetUUID(
50 const std::string& concrete_key_system); 91 const std::string& concrete_key_system);
51 #endif 92 #endif
52 93
53 } // namespace content 94 } // namespace content
54 95
55 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_H_ 96 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_H_
OLDNEW
« no previous file with comments | « trunk/src/content/public/renderer/key_system_info.cc ('k') | trunk/src/content/renderer/media/crypto/key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698