OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/media_interface_provider.h" | 5 #include "content/renderer/media/media_interface_provider.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "media/mojo/interfaces/content_decryption_module.mojom.h" | 10 #include "media/mojo/interfaces/content_decryption_module.mojom.h" |
11 #include "media/mojo/interfaces/renderer.mojom.h" | 11 #include "media/mojo/interfaces/renderer.mojom.h" |
12 #include "mojo/public/cpp/bindings/interface_request.h" | 12 #include "mojo/public/cpp/bindings/interface_request.h" |
13 #include "services/service_manager/public/cpp/interface_provider.h" | 13 #include "services/service_manager/public/cpp/interface_provider.h" |
14 | 14 |
15 namespace content { | 15 namespace content { |
16 | 16 |
17 MediaInterfaceProvider::MediaInterfaceProvider( | 17 MediaInterfaceProvider::MediaInterfaceProvider( |
18 service_manager::InterfaceProvider* remote_interfaces) | 18 service_manager::InterfaceProvider* remote_interfaces) |
19 : remote_interfaces_(remote_interfaces) {} | 19 : remote_interfaces_(remote_interfaces), weak_factory_(this) { |
20 task_runner_ = base::ThreadTaskRunnerHandle::Get(); | |
DaleCurtis
2017/03/31 21:22:08
No point in having both a task_runner_ and thread_
servolk
2017/03/31 23:53:55
Done.
| |
21 weak_this_ = weak_factory_.GetWeakPtr(); | |
22 } | |
20 | 23 |
21 MediaInterfaceProvider::~MediaInterfaceProvider() { | 24 MediaInterfaceProvider::~MediaInterfaceProvider() { |
22 DCHECK(thread_checker_.CalledOnValidThread()); | 25 DCHECK(thread_checker_.CalledOnValidThread()); |
23 } | 26 } |
24 | 27 |
25 void MediaInterfaceProvider::GetInterface(const std::string& interface_name, | 28 void MediaInterfaceProvider::GetInterface(const std::string& interface_name, |
26 mojo::ScopedMessagePipeHandle pipe) { | 29 mojo::ScopedMessagePipeHandle pipe) { |
27 DVLOG(1) << __func__; | 30 DVLOG(1) << __func__; |
31 if (!task_runner_->BelongsToCurrentThread()) { | |
32 task_runner_->PostTask( | |
33 FROM_HERE, base::Bind(&MediaInterfaceProvider::GetInterface, weak_this_, | |
34 interface_name, base::Passed(&pipe))); | |
35 return; | |
36 } | |
37 | |
28 DCHECK(thread_checker_.CalledOnValidThread()); | 38 DCHECK(thread_checker_.CalledOnValidThread()); |
29 | 39 |
30 if (interface_name == media::mojom::ContentDecryptionModule::Name_) { | 40 if (interface_name == media::mojom::ContentDecryptionModule::Name_) { |
31 GetMediaInterfaceFactory()->CreateCdm( | 41 GetMediaInterfaceFactory()->CreateCdm( |
32 mojo::MakeRequest<media::mojom::ContentDecryptionModule>( | 42 mojo::MakeRequest<media::mojom::ContentDecryptionModule>( |
33 std::move(pipe))); | 43 std::move(pipe))); |
34 } else if (interface_name == media::mojom::Renderer::Name_) { | 44 } else if (interface_name == media::mojom::Renderer::Name_) { |
35 GetMediaInterfaceFactory()->CreateRenderer( | 45 GetMediaInterfaceFactory()->CreateRenderer( |
36 std::string(), | 46 std::string(), |
37 mojo::MakeRequest<media::mojom::Renderer>(std::move(pipe))); | 47 mojo::MakeRequest<media::mojom::Renderer>(std::move(pipe))); |
(...skipping 23 matching lines...) Expand all Loading... | |
61 } | 71 } |
62 | 72 |
63 void MediaInterfaceProvider::OnConnectionError() { | 73 void MediaInterfaceProvider::OnConnectionError() { |
64 DVLOG(1) << __func__; | 74 DVLOG(1) << __func__; |
65 DCHECK(thread_checker_.CalledOnValidThread()); | 75 DCHECK(thread_checker_.CalledOnValidThread()); |
66 | 76 |
67 media_interface_factory_.reset(); | 77 media_interface_factory_.reset(); |
68 } | 78 } |
69 | 79 |
70 } // namespace content | 80 } // namespace content |
OLD | NEW |