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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 712463004: media: Support MojoRendererService in the browser process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased and Cleaned. Created 6 years 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
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 27fca3f3e236aa66420b26452fbf787dcb43d57a..f01a5d5ec412f3c2744928acedbd59c28791bf3a 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -101,6 +101,8 @@
#include "media/blink/webmediaplayer_params.h"
#include "media/filters/default_renderer_factory.h"
#include "media/filters/gpu_video_accelerator_factories.h"
+#include "media/mojo/interfaces/media_renderer.mojom.h"
+#include "media/mojo/services/mojo_renderer_factory.h"
#include "mojo/edk/js/core.h"
#include "mojo/edk/js/support.h"
#include "net/base/data_url.h"
@@ -1758,7 +1760,7 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
blink::WebLocalFrame* frame,
const blink::WebURL& url,
blink::WebMediaPlayerClient* client) {
- return createMediaPlayer(frame, url, client, NULL);
+ return createMediaPlayer(frame, url, client, nullptr);
}
blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
@@ -1812,6 +1814,10 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
*render_thread->GetAudioHardwareConfig()));
}
+ media_renderer_factory.reset(new media::MojoRendererFactory(
+ base::Bind(&ServiceRegistry::ConnectToRemoteService<mojo::MediaRenderer>,
+ base::Unretained(GetServiceRegistry()))));
xhwang 2014/12/15 21:32:30 ditto, we need a way (flag or ifdef) to figure out
+
return new media::WebMediaPlayerImpl(
frame, client, weak_factory_.GetWeakPtr(), media_renderer_factory.Pass(),
cdm_factory.Pass(), params);

Powered by Google App Engine
This is Rietveld 408576698