Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2204673004: WIP - WebMediaPlayer switch media renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/BUILD.gn ('k') | media/BUILD.gn » ('j') | media/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 59744b0aeab929bfaacf17af84890c70b2d58437..4d3a7083a272b66eabdbe1467011fbacb1c0384b 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -146,6 +146,8 @@
#include "media/blink/url_index.h"
#include "media/blink/webencryptedmediaclient_impl.h"
#include "media/blink/webmediaplayer_impl.h"
+#include "media/remoting/remoting_controller.h"
+#include "media/remoting/remoting_renderer_factory.h"
#include "media/renderers/gpu_video_accelerator_factories.h"
#include "mojo/edk/js/core.h"
#include "mojo/edk/js/support.h"
@@ -2689,12 +2691,19 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
base::Bind(&RenderThreadImpl::GetGpuFactories,
base::Unretained(render_thread)),
GetMediaInterfaceProvider()));
+ media::MediaPlayerObserver* player_observer = nullptr;
#else
- std::unique_ptr<media::RendererFactory> media_renderer_factory(
+ std::unique_ptr<media::RendererFactory> default_renderer_factory(
new media::DefaultRendererFactory(
media_log, GetDecoderFactory(),
base::Bind(&RenderThreadImpl::GetGpuFactories,
base::Unretained(render_thread))));
+ std::unique_ptr<media::RemotingController> remoting_controller(
+ new media::RemotingController(GetRemoterFactory()));
+ media::MediaPlayerObserver* player_observer = remoting_controller.get();
+ std::unique_ptr<media::RendererFactory> media_renderer_factory(
+ new media::RemotingRendererFactory(std::move(default_renderer_factory),
+ std::move(remoting_controller)));
#endif // defined(ENABLE_MOJO_RENDERER)
if (!url_index_.get() || url_index_->frame() != frame_)
@@ -2708,7 +2717,7 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
frame_, client, encrypted_client,
GetWebMediaPlayerDelegate()->AsWeakPtr(),
- std::move(media_renderer_factory), url_index_, params);
+ std::move(media_renderer_factory), url_index_, player_observer, params);
#if defined(OS_ANDROID) // WMPI_CAST
media_player->SetMediaPlayerManager(GetMediaPlayerManager());
« no previous file with comments | « content/renderer/BUILD.gn ('k') | media/BUILD.gn » ('j') | media/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698