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

Unified Diff: media/mojo/clients/mojo_renderer_factory.cc

Issue 2075303002: [DO NOT COMMIT] Initial MediaPlayerRenderer plumbing and basic features (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/clients/mojo_renderer_factory.cc
diff --git a/media/mojo/clients/mojo_renderer_factory.cc b/media/mojo/clients/mojo_renderer_factory.cc
index c86e19f40c54e151066592059a21ff0d1e10f63c..905fcc79bb3e1eafad5fd3c59da32c4eff3e9f9e 100644
--- a/media/mojo/clients/mojo_renderer_factory.cc
+++ b/media/mojo/clients/mojo_renderer_factory.cc
@@ -4,8 +4,10 @@
#include "media/mojo/clients/mojo_renderer_factory.h"
+#include "base/memory/ptr_util.h"
#include "base/single_thread_task_runner.h"
#include "media/mojo/clients/mojo_renderer_impl.h"
+#include "media/media_features.h"
#include "media/renderers/video_overlay_factory.h"
#include "services/shell/public/cpp/connect.h"
#include "services/shell/public/interfaces/interface_provider.mojom.h"
@@ -14,9 +16,11 @@ namespace media {
MojoRendererFactory::MojoRendererFactory(
const GetGpuFactoriesCB& get_gpu_factories_cb,
- shell::mojom::InterfaceProvider* interface_provider)
+ shell::mojom::InterfaceProvider* interface_provider,
+ const GURL& url)
: get_gpu_factories_cb_(get_gpu_factories_cb),
- interface_provider_(interface_provider) {
+ interface_provider_(interface_provider),
+ url_(url) {
DCHECK(!get_gpu_factories_cb_.is_null());
DCHECK(interface_provider_);
}
@@ -35,9 +39,15 @@ std::unique_ptr<Renderer> MojoRendererFactory::CreateRenderer(
mojom::RendererPtr renderer_ptr;
shell::GetInterface<mojom::Renderer>(interface_provider_, &renderer_ptr);
- return std::unique_ptr<Renderer>(
+ MojoRendererImpl* renderer =
new MojoRendererImpl(media_task_runner, std::move(overlay_factory),
- video_renderer_sink, std::move(renderer_ptr)));
+ video_renderer_sink, std::move(renderer_ptr));
+
+#if defined(FORCE_MOJO_MEDIA_PLAYER_RENDERER)
+ renderer->SetUrl(url_);
xhwang 2016/06/22 17:39:02 Now I see why you have |url| in MojoRendererFactor
+#endif
+
+ return base::WrapUnique(renderer);
}
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698