OLD | NEW |
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 "content/renderer/media/crypto/proxy_media_keys.h" | 5 #include "content/renderer/media/crypto/proxy_media_keys.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
| 12 #include "content/renderer/media/crypto/cdm_initialized_promise.h" |
12 #include "content/renderer/media/crypto/renderer_cdm_manager.h" | 13 #include "content/renderer/media/crypto/renderer_cdm_manager.h" |
13 #include "media/base/cdm_key_information.h" | 14 #include "media/base/cdm_key_information.h" |
14 #include "media/base/cdm_promise.h" | 15 #include "media/base/cdm_promise.h" |
15 #include "media/base/key_systems.h" | 16 #include "media/base/key_systems.h" |
16 | 17 |
17 namespace content { | 18 namespace content { |
18 | 19 |
19 scoped_ptr<ProxyMediaKeys> ProxyMediaKeys::Create( | 20 void ProxyMediaKeys::Create( |
20 const std::string& key_system, | 21 const std::string& key_system, |
21 const GURL& security_origin, | 22 const GURL& security_origin, |
22 RendererCdmManager* manager, | 23 RendererCdmManager* manager, |
23 const media::SessionMessageCB& session_message_cb, | 24 const media::SessionMessageCB& session_message_cb, |
24 const media::SessionClosedCB& session_closed_cb, | 25 const media::SessionClosedCB& session_closed_cb, |
25 const media::LegacySessionErrorCB& legacy_session_error_cb, | 26 const media::LegacySessionErrorCB& legacy_session_error_cb, |
26 const media::SessionKeysChangeCB& session_keys_change_cb, | 27 const media::SessionKeysChangeCB& session_keys_change_cb, |
27 const media::SessionExpirationUpdateCB& session_expiration_update_cb) { | 28 const media::SessionExpirationUpdateCB& session_expiration_update_cb, |
| 29 const media::CdmCreatedCB& cdm_created_cb) { |
28 DCHECK(manager); | 30 DCHECK(manager); |
29 scoped_ptr<ProxyMediaKeys> proxy_media_keys(new ProxyMediaKeys( | 31 scoped_ptr<ProxyMediaKeys> proxy_media_keys(new ProxyMediaKeys( |
30 manager, session_message_cb, session_closed_cb, legacy_session_error_cb, | 32 manager, session_message_cb, session_closed_cb, legacy_session_error_cb, |
31 session_keys_change_cb, session_expiration_update_cb)); | 33 session_keys_change_cb, session_expiration_update_cb)); |
32 proxy_media_keys->InitializeCdm(key_system, security_origin); | 34 |
33 return proxy_media_keys.Pass(); | 35 // ProxyMediaKeys ownership passed to the promise, but keep a copy in order |
| 36 // to call InitializeCdm(). |
| 37 ProxyMediaKeys* proxy_media_keys_copy = proxy_media_keys.get(); |
| 38 scoped_ptr<CdmInitializedPromise> promise( |
| 39 new CdmInitializedPromise(cdm_created_cb, proxy_media_keys.Pass())); |
| 40 proxy_media_keys_copy->InitializeCdm(key_system, security_origin, |
| 41 promise.Pass()); |
34 } | 42 } |
35 | 43 |
36 ProxyMediaKeys::~ProxyMediaKeys() { | 44 ProxyMediaKeys::~ProxyMediaKeys() { |
37 manager_->DestroyCdm(cdm_id_); | 45 manager_->DestroyCdm(cdm_id_); |
38 manager_->UnregisterMediaKeys(cdm_id_); | 46 manager_->UnregisterMediaKeys(cdm_id_); |
39 cdm_promise_adapter_.Clear(); | 47 cdm_promise_adapter_.Clear(); |
40 } | 48 } |
41 | 49 |
42 void ProxyMediaKeys::SetServerCertificate( | 50 void ProxyMediaKeys::SetServerCertificate( |
43 const std::vector<uint8_t>& certificate, | 51 const std::vector<uint8_t>& certificate, |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
186 const media::SessionExpirationUpdateCB& session_expiration_update_cb) | 194 const media::SessionExpirationUpdateCB& session_expiration_update_cb) |
187 : manager_(manager), | 195 : manager_(manager), |
188 session_message_cb_(session_message_cb), | 196 session_message_cb_(session_message_cb), |
189 session_closed_cb_(session_closed_cb), | 197 session_closed_cb_(session_closed_cb), |
190 legacy_session_error_cb_(legacy_session_error_cb), | 198 legacy_session_error_cb_(legacy_session_error_cb), |
191 session_keys_change_cb_(session_keys_change_cb), | 199 session_keys_change_cb_(session_keys_change_cb), |
192 session_expiration_update_cb_(session_expiration_update_cb) { | 200 session_expiration_update_cb_(session_expiration_update_cb) { |
193 cdm_id_ = manager->RegisterMediaKeys(this); | 201 cdm_id_ = manager->RegisterMediaKeys(this); |
194 } | 202 } |
195 | 203 |
196 void ProxyMediaKeys::InitializeCdm(const std::string& key_system, | 204 void ProxyMediaKeys::InitializeCdm( |
197 const GURL& security_origin) { | 205 const std::string& key_system, |
| 206 const GURL& security_origin, |
| 207 scoped_ptr<media::SimpleCdmPromise> promise) { |
| 208 // TODO(jrummell): |Pass promise| on. http://crbug.com/469003. |
198 manager_->InitializeCdm(cdm_id_, this, key_system, security_origin); | 209 manager_->InitializeCdm(cdm_id_, this, key_system, security_origin); |
| 210 promise->resolve(); |
199 } | 211 } |
200 | 212 |
201 } // namespace content | 213 } // namespace content |
OLD | NEW |