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