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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "media/mojo/interfaces/content_decryption_module.mojom.h" | 8 #include "media/mojo/interfaces/content_decryption_module.mojom.h" |
9 #include "media/mojo/interfaces/renderer.mojom.h" | 9 #include "media/mojo/interfaces/renderer.mojom.h" |
10 #include "mojo/public/cpp/bindings/interface_request.h" | 10 #include "mojo/public/cpp/bindings/interface_request.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 DVLOG(1) << __FUNCTION__; | 27 DVLOG(1) << __FUNCTION__; |
28 DCHECK(thread_checker_.CalledOnValidThread()); | 28 DCHECK(thread_checker_.CalledOnValidThread()); |
29 | 29 |
30 if (interface_name == media::interfaces::ContentDecryptionModule::Name_) { | 30 if (interface_name == media::interfaces::ContentDecryptionModule::Name_) { |
31 GetMediaServiceFactory()->CreateCdm( | 31 GetMediaServiceFactory()->CreateCdm( |
32 mojo::MakeRequest<media::interfaces::ContentDecryptionModule>( | 32 mojo::MakeRequest<media::interfaces::ContentDecryptionModule>( |
33 std::move(pipe))); | 33 std::move(pipe))); |
34 } else if (interface_name == media::interfaces::Renderer::Name_) { | 34 } else if (interface_name == media::interfaces::Renderer::Name_) { |
35 GetMediaServiceFactory()->CreateRenderer( | 35 GetMediaServiceFactory()->CreateRenderer( |
36 mojo::MakeRequest<media::interfaces::Renderer>(std::move(pipe))); | 36 mojo::MakeRequest<media::interfaces::Renderer>(std::move(pipe))); |
| 37 } else if (interface_name == media::interfaces::AudioDecoder::Name_) { |
| 38 GetMediaServiceFactory()->CreateAudioDecoder( |
| 39 mojo::MakeRequest<media::interfaces::AudioDecoder>(std::move(pipe))); |
37 } else { | 40 } else { |
38 NOTREACHED(); | 41 NOTREACHED(); |
39 } | 42 } |
40 } | 43 } |
41 | 44 |
42 media::interfaces::ServiceFactory* | 45 media::interfaces::ServiceFactory* |
43 MediaInterfaceProvider::GetMediaServiceFactory() { | 46 MediaInterfaceProvider::GetMediaServiceFactory() { |
44 DVLOG(1) << __FUNCTION__; | 47 DVLOG(1) << __FUNCTION__; |
45 DCHECK(thread_checker_.CalledOnValidThread()); | 48 DCHECK(thread_checker_.CalledOnValidThread()); |
46 | 49 |
47 if (!media_service_factory_) { | 50 if (!media_service_factory_) { |
48 mojo::shell::mojom::InterfaceProviderPtr interface_provider = | 51 mojo::shell::mojom::InterfaceProviderPtr interface_provider = |
49 connect_to_app_cb_.Run(GURL("mojo:media")); | 52 connect_to_app_cb_.Run(GURL("mojo:media")); |
50 mojo::GetInterface(interface_provider.get(), &media_service_factory_); | 53 mojo::GetInterface(interface_provider.get(), &media_service_factory_); |
51 media_service_factory_.set_connection_error_handler(base::Bind( | 54 media_service_factory_.set_connection_error_handler(base::Bind( |
52 &MediaInterfaceProvider::OnConnectionError, base::Unretained(this))); | 55 &MediaInterfaceProvider::OnConnectionError, base::Unretained(this))); |
53 } | 56 } |
54 | 57 |
55 return media_service_factory_.get(); | 58 return media_service_factory_.get(); |
56 } | 59 } |
57 | 60 |
58 void MediaInterfaceProvider::OnConnectionError() { | 61 void MediaInterfaceProvider::OnConnectionError() { |
59 DVLOG(1) << __FUNCTION__; | 62 DVLOG(1) << __FUNCTION__; |
60 DCHECK(thread_checker_.CalledOnValidThread()); | 63 DCHECK(thread_checker_.CalledOnValidThread()); |
61 | 64 |
62 media_service_factory_.reset(); | 65 media_service_factory_.reset(); |
63 } | 66 } |
64 | 67 |
65 } // namespace content | 68 } // namespace content |
OLD | NEW |