OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 #include "media/audio/audio_output_device.h" | 139 #include "media/audio/audio_output_device.h" |
140 #include "media/base/audio_renderer_mixer_input.h" | 140 #include "media/base/audio_renderer_mixer_input.h" |
141 #include "media/base/cdm_factory.h" | 141 #include "media/base/cdm_factory.h" |
142 #include "media/base/decoder_factory.h" | 142 #include "media/base/decoder_factory.h" |
143 #include "media/base/media.h" | 143 #include "media/base/media.h" |
144 #include "media/base/media_log.h" | 144 #include "media/base/media_log.h" |
145 #include "media/base/media_switches.h" | 145 #include "media/base/media_switches.h" |
146 #include "media/blink/url_index.h" | 146 #include "media/blink/url_index.h" |
147 #include "media/blink/webencryptedmediaclient_impl.h" | 147 #include "media/blink/webencryptedmediaclient_impl.h" |
148 #include "media/blink/webmediaplayer_impl.h" | 148 #include "media/blink/webmediaplayer_impl.h" |
| 149 #include "media/remoting/remoting_controller.h" |
| 150 #include "media/remoting/remoting_renderer_factory.h" |
149 #include "media/renderers/gpu_video_accelerator_factories.h" | 151 #include "media/renderers/gpu_video_accelerator_factories.h" |
150 #include "mojo/edk/js/core.h" | 152 #include "mojo/edk/js/core.h" |
151 #include "mojo/edk/js/support.h" | 153 #include "mojo/edk/js/support.h" |
152 #include "net/base/data_url.h" | 154 #include "net/base/data_url.h" |
153 #include "net/base/net_errors.h" | 155 #include "net/base/net_errors.h" |
154 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" | 156 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
155 #include "net/http/http_util.h" | 157 #include "net/http/http_util.h" |
156 #include "services/shell/public/cpp/interface_provider.h" | 158 #include "services/shell/public/cpp/interface_provider.h" |
157 #include "services/shell/public/cpp/interface_registry.h" | 159 #include "services/shell/public/cpp/interface_registry.h" |
158 #include "storage/common/data_element.h" | 160 #include "storage/common/data_element.h" |
(...skipping 2515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2674 return CreateAndroidWebMediaPlayer(client, encrypted_client, params); | 2676 return CreateAndroidWebMediaPlayer(client, encrypted_client, params); |
2675 } | 2677 } |
2676 #endif // defined(OS_ANDROID) | 2678 #endif // defined(OS_ANDROID) |
2677 | 2679 |
2678 #if defined(ENABLE_MOJO_RENDERER) | 2680 #if defined(ENABLE_MOJO_RENDERER) |
2679 std::unique_ptr<media::RendererFactory> media_renderer_factory( | 2681 std::unique_ptr<media::RendererFactory> media_renderer_factory( |
2680 new media::MojoRendererFactory( | 2682 new media::MojoRendererFactory( |
2681 base::Bind(&RenderThreadImpl::GetGpuFactories, | 2683 base::Bind(&RenderThreadImpl::GetGpuFactories, |
2682 base::Unretained(render_thread)), | 2684 base::Unretained(render_thread)), |
2683 GetMediaInterfaceProvider())); | 2685 GetMediaInterfaceProvider())); |
| 2686 media::MediaPlayerObserver* player_observer = nullptr; |
| 2687 media::RemotingController* remoting_controller_ptr = nullptr; |
2684 #else | 2688 #else |
2685 std::unique_ptr<media::RendererFactory> media_renderer_factory( | 2689 std::unique_ptr<media::RendererFactory> default_renderer_factory( |
2686 new media::DefaultRendererFactory( | 2690 new media::DefaultRendererFactory( |
2687 media_log, GetDecoderFactory(), | 2691 media_log, GetDecoderFactory(), |
2688 base::Bind(&RenderThreadImpl::GetGpuFactories, | 2692 base::Bind(&RenderThreadImpl::GetGpuFactories, |
2689 base::Unretained(render_thread)))); | 2693 base::Unretained(render_thread)))); |
| 2694 std::unique_ptr<media::RemotingController> remoting_controller( |
| 2695 new media::RemotingController(GetRemoterFactory())); |
| 2696 media::MediaPlayerObserver* player_observer = remoting_controller.get(); |
| 2697 media::RemotingController* remoting_controller_ptr = |
| 2698 remoting_controller.get(); |
| 2699 std::unique_ptr<media::RendererFactory> media_renderer_factory( |
| 2700 new media::RemotingRendererFactory(std::move(default_renderer_factory), |
| 2701 std::move(remoting_controller))); |
2690 #endif // defined(ENABLE_MOJO_RENDERER) | 2702 #endif // defined(ENABLE_MOJO_RENDERER) |
2691 | 2703 |
2692 if (!url_index_.get() || url_index_->frame() != frame_) | 2704 if (!url_index_.get() || url_index_->frame() != frame_) |
2693 url_index_.reset(new media::UrlIndex(frame_)); | 2705 url_index_.reset(new media::UrlIndex(frame_)); |
2694 | 2706 |
2695 // TODO(miu): In a soon-upcoming change, call GetRemoterFactory()->Create() to | |
2696 // allow the local media pipeline to receive notifications about when Media | |
2697 // Remoting can take place. Control logic in/around WebMediaPlayerImpl will | |
2698 // implement media.mojom.RemotingSource. http://crbug.com/643964 | |
2699 | |
2700 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( | 2707 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( |
2701 frame_, client, encrypted_client, | 2708 frame_, client, encrypted_client, |
2702 GetWebMediaPlayerDelegate()->AsWeakPtr(), | 2709 GetWebMediaPlayerDelegate()->AsWeakPtr(), |
2703 std::move(media_renderer_factory), url_index_, params); | 2710 std::move(media_renderer_factory), url_index_, player_observer, params); |
| 2711 |
| 2712 if (remoting_controller_ptr) { |
| 2713 remoting_controller_ptr->SetSwitchRenderCallback( |
| 2714 base::Bind(&media::WebMediaPlayerImpl::ScheduleRestart, |
| 2715 media_player->AsWeakPtr())); |
| 2716 } |
2704 | 2717 |
2705 #if defined(OS_ANDROID) // WMPI_CAST | 2718 #if defined(OS_ANDROID) // WMPI_CAST |
2706 media_player->SetMediaPlayerManager(GetMediaPlayerManager()); | 2719 media_player->SetMediaPlayerManager(GetMediaPlayerManager()); |
2707 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); | 2720 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); |
2708 #endif | 2721 #endif |
2709 | 2722 |
2710 return media_player; | 2723 return media_player; |
2711 } | 2724 } |
2712 | 2725 |
2713 blink::WebMediaSession* RenderFrameImpl::createMediaSession() { | 2726 blink::WebMediaSession* RenderFrameImpl::createMediaSession() { |
(...skipping 3716 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6430 // event target. Potentially a Pepper plugin will receive the event. | 6443 // event target. Potentially a Pepper plugin will receive the event. |
6431 // In order to tell whether a plugin gets the last mouse event and which it | 6444 // In order to tell whether a plugin gets the last mouse event and which it |
6432 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6445 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
6433 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6446 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
6434 // |pepper_last_mouse_event_target_|. | 6447 // |pepper_last_mouse_event_target_|. |
6435 pepper_last_mouse_event_target_ = nullptr; | 6448 pepper_last_mouse_event_target_ = nullptr; |
6436 #endif | 6449 #endif |
6437 } | 6450 } |
6438 | 6451 |
6439 } // namespace content | 6452 } // namespace content |
OLD | NEW |