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 "media/mojo/services/mojo_cdm_service.h" | 5 #include "media/mojo/services/mojo_cdm_service.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 base::Bind(&MojoCdmService::OnLegacySessionError, weak_this), | 119 base::Bind(&MojoCdmService::OnLegacySessionError, weak_this), |
120 base::Bind(&MojoCdmService::OnSessionKeysChange, weak_this), | 120 base::Bind(&MojoCdmService::OnSessionKeysChange, weak_this), |
121 base::Bind(&MojoCdmService::OnSessionExpirationUpdate, weak_this), | 121 base::Bind(&MojoCdmService::OnSessionExpirationUpdate, weak_this), |
122 base::Bind(&MojoCdmService::OnCdmCreated, weak_this, callback)); | 122 base::Bind(&MojoCdmService::OnCdmCreated, weak_this, callback)); |
123 } | 123 } |
124 | 124 |
125 void MojoCdmService::SetServerCertificate( | 125 void MojoCdmService::SetServerCertificate( |
126 mojo::Array<uint8_t> certificate_data, | 126 mojo::Array<uint8_t> certificate_data, |
127 const SetServerCertificateCallback& callback) { | 127 const SetServerCertificateCallback& callback) { |
128 DVLOG(2) << __FUNCTION__; | 128 DVLOG(2) << __FUNCTION__; |
129 cdm_->SetServerCertificate( | 129 cdm_->SetServerCertificate(certificate_data.storage(), |
130 certificate_data.storage(), | 130 base::MakeUnique<SimpleMojoCdmPromise>(callback)); |
131 base::WrapUnique(new SimpleMojoCdmPromise(callback))); | |
132 } | 131 } |
133 | 132 |
134 void MojoCdmService::CreateSessionAndGenerateRequest( | 133 void MojoCdmService::CreateSessionAndGenerateRequest( |
135 mojom::ContentDecryptionModule::SessionType session_type, | 134 mojom::ContentDecryptionModule::SessionType session_type, |
136 mojom::ContentDecryptionModule::InitDataType init_data_type, | 135 mojom::ContentDecryptionModule::InitDataType init_data_type, |
137 mojo::Array<uint8_t> init_data, | 136 mojo::Array<uint8_t> init_data, |
138 const CreateSessionAndGenerateRequestCallback& callback) { | 137 const CreateSessionAndGenerateRequestCallback& callback) { |
139 DVLOG(2) << __FUNCTION__; | 138 DVLOG(2) << __FUNCTION__; |
140 cdm_->CreateSessionAndGenerateRequest( | 139 cdm_->CreateSessionAndGenerateRequest( |
141 static_cast<MediaKeys::SessionType>(session_type), | 140 static_cast<MediaKeys::SessionType>(session_type), |
142 static_cast<EmeInitDataType>(init_data_type), init_data.storage(), | 141 static_cast<EmeInitDataType>(init_data_type), init_data.storage(), |
143 base::WrapUnique(new NewSessionMojoCdmPromise(callback))); | 142 base::MakeUnique<NewSessionMojoCdmPromise>(callback)); |
144 } | 143 } |
145 | 144 |
146 void MojoCdmService::LoadSession( | 145 void MojoCdmService::LoadSession( |
147 mojom::ContentDecryptionModule::SessionType session_type, | 146 mojom::ContentDecryptionModule::SessionType session_type, |
148 const mojo::String& session_id, | 147 const mojo::String& session_id, |
149 const LoadSessionCallback& callback) { | 148 const LoadSessionCallback& callback) { |
150 DVLOG(2) << __FUNCTION__; | 149 DVLOG(2) << __FUNCTION__; |
151 cdm_->LoadSession(static_cast<MediaKeys::SessionType>(session_type), | 150 cdm_->LoadSession(static_cast<MediaKeys::SessionType>(session_type), |
152 session_id.To<std::string>(), | 151 session_id.To<std::string>(), |
153 base::WrapUnique(new NewSessionMojoCdmPromise(callback))); | 152 base::MakeUnique<NewSessionMojoCdmPromise>(callback)); |
154 } | 153 } |
155 | 154 |
156 void MojoCdmService::UpdateSession(const mojo::String& session_id, | 155 void MojoCdmService::UpdateSession(const mojo::String& session_id, |
157 mojo::Array<uint8_t> response, | 156 mojo::Array<uint8_t> response, |
158 const UpdateSessionCallback& callback) { | 157 const UpdateSessionCallback& callback) { |
159 DVLOG(2) << __FUNCTION__; | 158 DVLOG(2) << __FUNCTION__; |
160 cdm_->UpdateSession( | 159 cdm_->UpdateSession( |
161 session_id.To<std::string>(), response.storage(), | 160 session_id.To<std::string>(), response.storage(), |
162 std::unique_ptr<SimpleCdmPromise>(new SimpleMojoCdmPromise(callback))); | 161 std::unique_ptr<SimpleCdmPromise>(new SimpleMojoCdmPromise(callback))); |
163 } | 162 } |
164 | 163 |
165 void MojoCdmService::CloseSession(const mojo::String& session_id, | 164 void MojoCdmService::CloseSession(const mojo::String& session_id, |
166 const CloseSessionCallback& callback) { | 165 const CloseSessionCallback& callback) { |
167 DVLOG(2) << __FUNCTION__; | 166 DVLOG(2) << __FUNCTION__; |
168 cdm_->CloseSession(session_id.To<std::string>(), | 167 cdm_->CloseSession(session_id.To<std::string>(), |
169 base::WrapUnique(new SimpleMojoCdmPromise(callback))); | 168 base::MakeUnique<SimpleMojoCdmPromise>(callback)); |
170 } | 169 } |
171 | 170 |
172 void MojoCdmService::RemoveSession(const mojo::String& session_id, | 171 void MojoCdmService::RemoveSession(const mojo::String& session_id, |
173 const RemoveSessionCallback& callback) { | 172 const RemoveSessionCallback& callback) { |
174 DVLOG(2) << __FUNCTION__; | 173 DVLOG(2) << __FUNCTION__; |
175 cdm_->RemoveSession(session_id.To<std::string>(), | 174 cdm_->RemoveSession(session_id.To<std::string>(), |
176 base::WrapUnique(new SimpleMojoCdmPromise(callback))); | 175 base::MakeUnique<SimpleMojoCdmPromise>(callback)); |
177 } | 176 } |
178 | 177 |
179 scoped_refptr<MediaKeys> MojoCdmService::GetCdm() { | 178 scoped_refptr<MediaKeys> MojoCdmService::GetCdm() { |
180 return cdm_; | 179 return cdm_; |
181 } | 180 } |
182 | 181 |
183 void MojoCdmService::OnCdmCreated(const InitializeCallback& callback, | 182 void MojoCdmService::OnCdmCreated(const InitializeCallback& callback, |
184 const scoped_refptr<MediaKeys>& cdm, | 183 const scoped_refptr<MediaKeys>& cdm, |
185 const std::string& error_message) { | 184 const std::string& error_message) { |
186 mojom::CdmPromiseResultPtr cdm_promise_result(mojom::CdmPromiseResult::New()); | 185 mojom::CdmPromiseResultPtr cdm_promise_result(mojom::CdmPromiseResult::New()); |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
268 | 267 |
269 void MojoCdmService::OnDecryptorConnectionError() { | 268 void MojoCdmService::OnDecryptorConnectionError() { |
270 DVLOG(2) << __FUNCTION__; | 269 DVLOG(2) << __FUNCTION__; |
271 | 270 |
272 // MojoDecryptorService has lost connectivity to it's client, so it can be | 271 // MojoDecryptorService has lost connectivity to it's client, so it can be |
273 // freed. | 272 // freed. |
274 decryptor_.reset(); | 273 decryptor_.reset(); |
275 } | 274 } |
276 | 275 |
277 } // namespace media | 276 } // namespace media |
OLD | NEW |