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

Unified Diff: media/mojo/services/mojo_media_application.cc

Issue 1209363004: media: Support RendererFactory in MojoMediaClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android build (hopefully) Created 5 years, 5 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
Index: media/mojo/services/mojo_media_application.cc
diff --git a/media/mojo/services/mojo_media_application.cc b/media/mojo/services/mojo_media_application.cc
index 72871e83de7cfe04bf2e2a3866aef6b86fb80546..6ecb0896ce6f851304b85a43117fd2dc3b78d3a8 100644
--- a/media/mojo/services/mojo_media_application.cc
+++ b/media/mojo/services/mojo_media_application.cc
@@ -5,7 +5,10 @@
#include "media/mojo/services/mojo_media_application.h"
#include "base/logging.h"
+#include "media/base/media_log.h"
+#include "media/base/renderer_factory.h"
#include "media/mojo/services/mojo_cdm_service.h"
+#include "media/mojo/services/mojo_media_client.h"
#include "media/mojo/services/mojo_renderer_service.h"
#include "mojo/application/public/cpp/application_connection.h"
#include "mojo/application/public/cpp/application_impl.h"
@@ -24,7 +27,8 @@ scoped_ptr<mojo::ApplicationDelegate> MojoMediaApplication::CreateApp() {
return scoped_ptr<mojo::ApplicationDelegate>(new MojoMediaApplication());
}
-MojoMediaApplication::MojoMediaApplication() {
+// TODO(xhwang): Hook up MediaLog when possible.
+MojoMediaApplication::MojoMediaApplication() : media_log_(new MediaLog()) {
}
MojoMediaApplication::~MojoMediaApplication() {
@@ -56,7 +60,14 @@ void MojoMediaApplication::Create(
mojo::ApplicationConnection* connection,
mojo::InterfaceRequest<mojo::MediaRenderer> request) {
// The created object is owned by the pipe.
- new MojoRendererService(&cdm_service_context_, request.Pass());
+ new MojoRendererService(&cdm_service_context_, GetRendererFactory(),
+ media_log_, request.Pass());
+}
+
+RendererFactory* MojoMediaApplication::GetRendererFactory() {
+ if (!renderer_factory_)
+ renderer_factory_ = MojoMediaClient::Get()->GetRendererFactory(media_log_);
+ return renderer_factory_.get();
}
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698