| 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" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 | 44 |
| 45 // 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, |
| 46 // which cannot use an AesDecryptor running locally. In this case, always | 46 // which cannot use an AesDecryptor running locally. In this case, always |
| 47 // 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|. |
| 48 // 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 |
| 49 // testing. See http://crbug.com/441957 | 49 // testing. See http://crbug.com/441957 |
| 50 #if !defined(ENABLE_MOJO_RENDERER) | 50 #if !defined(ENABLE_MOJO_RENDERER) |
| 51 if (CanUseAesDecryptor(key_system)) { | 51 if (CanUseAesDecryptor(key_system)) { |
| 52 scoped_refptr<ContentDecryptionModule> cdm( | 52 scoped_refptr<ContentDecryptionModule> cdm( |
| 53 new AesDecryptor(security_origin, session_message_cb, session_closed_cb, | 53 new AesDecryptor(security_origin, session_message_cb, session_closed_cb, |
| 54 session_keys_change_cb)); | 54 session_keys_change_cb, session_expiration_update_cb)); |
| 55 base::ThreadTaskRunnerHandle::Get()->PostTask( | 55 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 56 FROM_HERE, base::Bind(cdm_created_cb, cdm, "")); | 56 FROM_HERE, base::Bind(cdm_created_cb, cdm, "")); |
| 57 return; | 57 return; |
| 58 } | 58 } |
| 59 #endif | 59 #endif |
| 60 | 60 |
| 61 mojom::ContentDecryptionModulePtr cdm_ptr; | 61 mojom::ContentDecryptionModulePtr cdm_ptr; |
| 62 service_manager::GetInterface<mojom::ContentDecryptionModule>( | 62 service_manager::GetInterface<mojom::ContentDecryptionModule>( |
| 63 interface_provider_, &cdm_ptr); | 63 interface_provider_, &cdm_ptr); |
| 64 | 64 |
| 65 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), |
| 66 session_message_cb, session_closed_cb, session_keys_change_cb, | 66 session_message_cb, session_closed_cb, session_keys_change_cb, |
| 67 session_expiration_update_cb, cdm_created_cb); | 67 session_expiration_update_cb, cdm_created_cb); |
| 68 } | 68 } |
| 69 | 69 |
| 70 } // namespace media | 70 } // namespace media |
| OLD | NEW |