| 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 "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "media/base/cdm_key_information.h" | 8 #include "media/base/cdm_key_information.h" |
| 9 #include "media/base/key_systems.h" | 9 #include "media/base/key_systems.h" |
| 10 #include "media/cdm/aes_decryptor.h" | 10 #include "media/cdm/aes_decryptor.h" |
| 11 #include "media/mojo/services/media_type_converters.h" | 11 #include "media/mojo/services/media_type_converters.h" |
| 12 #include "media/mojo/services/mojo_cdm_promise.h" | 12 #include "media/mojo/services/mojo_cdm_promise.h" |
| 13 #include "mojo/common/common_type_converters.h" | 13 #include "mojo/common/common_type_converters.h" |
| 14 #include "mojo/common/url_type_converters.h" |
| 14 | 15 |
| 15 namespace media { | 16 namespace media { |
| 16 | 17 |
| 17 typedef MojoCdmPromise<> SimpleMojoCdmPromise; | 18 typedef MojoCdmPromise<> SimpleMojoCdmPromise; |
| 18 typedef MojoCdmPromise<std::string> NewSessionMojoCdmPromise; | 19 typedef MojoCdmPromise<std::string> NewSessionMojoCdmPromise; |
| 19 | 20 |
| 20 MojoCdmService::MojoCdmService(const mojo::String& key_system) | 21 MojoCdmService::MojoCdmService(const mojo::String& key_system) |
| 21 : weak_factory_(this) { | 22 : weak_factory_(this) { |
| 22 base::WeakPtr<MojoCdmService> weak_this = weak_factory_.GetWeakPtr(); | 23 base::WeakPtr<MojoCdmService> weak_this = weak_factory_.GetWeakPtr(); |
| 23 | 24 |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 void MojoCdmService::OnSessionError(const std::string& session_id, | 146 void MojoCdmService::OnSessionError(const std::string& session_id, |
| 146 MediaKeys::Exception exception, | 147 MediaKeys::Exception exception, |
| 147 uint32_t system_code, | 148 uint32_t system_code, |
| 148 const std::string& error_message) { | 149 const std::string& error_message) { |
| 149 client_->OnSessionError(session_id, | 150 client_->OnSessionError(session_id, |
| 150 static_cast<mojo::CdmException>(exception), | 151 static_cast<mojo::CdmException>(exception), |
| 151 system_code, error_message); | 152 system_code, error_message); |
| 152 } | 153 } |
| 153 | 154 |
| 154 } // namespace media | 155 } // namespace media |
| OLD | NEW |