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

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

Issue 1070853004: media: CdmFactory creates CDM (MediaKeys) asynchronously. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use ScopedVector Created 5 years, 8 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
« no previous file with comments | « media/blink/cdm_session_adapter.cc ('k') | media/blink/encrypted_media_player_support.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 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 #ifndef MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ 5 #ifndef MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_
6 #define MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ 6 #define MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 19 matching lines...) Expand all
30 30
31 class MediaPermission; 31 class MediaPermission;
32 class WebContentDecryptionModuleImpl; 32 class WebContentDecryptionModuleImpl;
33 33
34 // Provides support to prefixed EME implementation. 34 // Provides support to prefixed EME implementation.
35 // Do NOT add unprefixed EME functionality to this class! 35 // Do NOT add unprefixed EME functionality to this class!
36 // TODO(xhwang): When deprecating prefixed EME support, drop this whole file. 36 // TODO(xhwang): When deprecating prefixed EME support, drop this whole file.
37 class EncryptedMediaPlayerSupport 37 class EncryptedMediaPlayerSupport
38 : public base::SupportsWeakPtr<EncryptedMediaPlayerSupport> { 38 : public base::SupportsWeakPtr<EncryptedMediaPlayerSupport> {
39 public: 39 public:
40 typedef base::Callback<void(CdmContext*, const CdmAttachedCB&)> 40 using CdmContextReadyCB = ProxyDecryptor::CdmContextReadyCB;
41 SetCdmContextCB;
42 41
42 // |cdm_context_ready_cb| is called when the CDM instance creation completes.
43 EncryptedMediaPlayerSupport(CdmFactory* cdm_factory, 43 EncryptedMediaPlayerSupport(CdmFactory* cdm_factory,
44 blink::WebMediaPlayerClient* client, 44 blink::WebMediaPlayerClient* client,
45 MediaPermission* media_permission, 45 MediaPermission* media_permission,
46 const SetCdmContextCB& set_cdm_context_cb); 46 const CdmContextReadyCB& cdm_context_ready_cb);
47 ~EncryptedMediaPlayerSupport(); 47 ~EncryptedMediaPlayerSupport();
48 48
49 blink::WebMediaPlayer::MediaKeyException GenerateKeyRequest( 49 blink::WebMediaPlayer::MediaKeyException GenerateKeyRequest(
50 blink::WebLocalFrame* frame, 50 blink::WebLocalFrame* frame,
51 const blink::WebString& key_system, 51 const blink::WebString& key_system,
52 const unsigned char* init_data, 52 const unsigned char* init_data,
53 unsigned init_data_length); 53 unsigned init_data_length);
54 54
55 blink::WebMediaPlayer::MediaKeyException AddKey( 55 blink::WebMediaPlayer::MediaKeyException AddKey(
56 const blink::WebString& key_system, 56 const blink::WebString& key_system,
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 MediaPermission* media_permission_; 102 MediaPermission* media_permission_;
103 103
104 // The currently selected key system. Empty string means that no key system 104 // The currently selected key system. Empty string means that no key system
105 // has been selected. 105 // has been selected.
106 std::string current_key_system_; 106 std::string current_key_system_;
107 107
108 // We assume all streams are from the same container, thus have the same 108 // We assume all streams are from the same container, thus have the same
109 // init data type. 109 // init data type.
110 EmeInitDataType init_data_type_; 110 EmeInitDataType init_data_type_;
111 111
112 SetCdmContextCB set_cdm_context_cb_; 112 CdmContextReadyCB cdm_context_ready_cb_;
113 113
114 // Manages decryption keys and decrypts encrypted frames. 114 // Manages decryption keys and decrypts encrypted frames.
115 scoped_ptr<ProxyDecryptor> proxy_decryptor_; 115 scoped_ptr<ProxyDecryptor> proxy_decryptor_;
116 116
117 DISALLOW_COPY_AND_ASSIGN(EncryptedMediaPlayerSupport); 117 DISALLOW_COPY_AND_ASSIGN(EncryptedMediaPlayerSupport);
118 }; 118 };
119 119
120 } // namespace media 120 } // namespace media
121 121
122 #endif // MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ 122 #endif // MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_
OLDNEW
« no previous file with comments | « media/blink/cdm_session_adapter.cc ('k') | media/blink/encrypted_media_player_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698