OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/clients/mojo_cdm_factory.h" | 5 #include "media/mojo/clients/mojo_cdm_factory.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
10 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
| 11 #include "media/base/content_decryption_module.h" |
11 #include "media/base/key_systems.h" | 12 #include "media/base/key_systems.h" |
12 #include "media/cdm/aes_decryptor.h" | 13 #include "media/cdm/aes_decryptor.h" |
13 #include "media/mojo/clients/mojo_cdm.h" | 14 #include "media/mojo/clients/mojo_cdm.h" |
14 #include "services/service_manager/public/cpp/connect.h" | 15 #include "services/service_manager/public/cpp/connect.h" |
15 #include "services/service_manager/public/interfaces/interface_provider.mojom.h" | 16 #include "services/service_manager/public/interfaces/interface_provider.mojom.h" |
16 | 17 |
17 namespace media { | 18 namespace media { |
18 | 19 |
19 MojoCdmFactory::MojoCdmFactory( | 20 MojoCdmFactory::MojoCdmFactory( |
20 service_manager::mojom::InterfaceProvider* interface_provider) | 21 service_manager::mojom::InterfaceProvider* interface_provider) |
(...skipping 20 matching lines...) Expand all Loading... |
41 return; | 42 return; |
42 } | 43 } |
43 | 44 |
44 // When MojoRenderer is used, the real Renderer is running in a remote process, | 45 // When MojoRenderer is used, the real Renderer is running in a remote process, |
45 // which cannot use an AesDecryptor running locally. In this case, always | 46 // which cannot use an AesDecryptor running locally. In this case, always |
46 // create the MojoCdm, giving the remote CDM a chance to handle |key_system|. | 47 // create the MojoCdm, giving the remote CDM a chance to handle |key_system|. |
47 // Note: We should not run AesDecryptor in the browser process except for | 48 // Note: We should not run AesDecryptor in the browser process except for |
48 // testing. See http://crbug.com/441957 | 49 // testing. See http://crbug.com/441957 |
49 #if !defined(ENABLE_MOJO_RENDERER) | 50 #if !defined(ENABLE_MOJO_RENDERER) |
50 if (CanUseAesDecryptor(key_system)) { | 51 if (CanUseAesDecryptor(key_system)) { |
51 scoped_refptr<MediaKeys> cdm( | 52 scoped_refptr<ContentDecryptionModule> cdm( |
52 new AesDecryptor(security_origin, session_message_cb, session_closed_cb, | 53 new AesDecryptor(security_origin, session_message_cb, session_closed_cb, |
53 session_keys_change_cb)); | 54 session_keys_change_cb)); |
54 base::ThreadTaskRunnerHandle::Get()->PostTask( | 55 base::ThreadTaskRunnerHandle::Get()->PostTask( |
55 FROM_HERE, base::Bind(cdm_created_cb, cdm, "")); | 56 FROM_HERE, base::Bind(cdm_created_cb, cdm, "")); |
56 return; | 57 return; |
57 } | 58 } |
58 #endif | 59 #endif |
59 | 60 |
60 mojom::ContentDecryptionModulePtr cdm_ptr; | 61 mojom::ContentDecryptionModulePtr cdm_ptr; |
61 service_manager::GetInterface<mojom::ContentDecryptionModule>( | 62 service_manager::GetInterface<mojom::ContentDecryptionModule>( |
62 interface_provider_, &cdm_ptr); | 63 interface_provider_, &cdm_ptr); |
63 | 64 |
64 MojoCdm::Create(key_system, security_origin, cdm_config, std::move(cdm_ptr), | 65 MojoCdm::Create(key_system, security_origin, cdm_config, std::move(cdm_ptr), |
65 session_message_cb, session_closed_cb, session_keys_change_cb, | 66 session_message_cb, session_closed_cb, session_keys_change_cb, |
66 session_expiration_update_cb, cdm_created_cb); | 67 session_expiration_update_cb, cdm_created_cb); |
67 } | 68 } |
68 | 69 |
69 } // namespace media | 70 } // namespace media |
OLD | NEW |