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

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

Issue 2387293007: Register MediaPlayerRenderer service (Closed)
Patch Set: Typo. Created 4 years, 2 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 | « media/mojo/clients/mojo_renderer.cc ('k') | media/remoting/remoting_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 750b5140d69f0cc30b30ee8c678d93a6ccacdf38..31ba267404f079f8e2aa3d6d2fe27f1ab8384d82 100644
--- a/media/mojo/clients/mojo_renderer_factory.cc
+++ b/media/mojo/clients/mojo_renderer_factory.cc
@@ -17,7 +17,6 @@ MojoRendererFactory::MojoRendererFactory(
shell::mojom::InterfaceProvider* interface_provider)
: get_gpu_factories_cb_(get_gpu_factories_cb),
interface_provider_(interface_provider) {
- DCHECK(!get_gpu_factories_cb_.is_null());
DCHECK(interface_provider_);
}
@@ -29,8 +28,14 @@ std::unique_ptr<Renderer> MojoRendererFactory::CreateRenderer(
AudioRendererSink* /* audio_renderer_sink */,
VideoRendererSink* video_renderer_sink,
const RequestSurfaceCB& /* request_surface_cb */) {
- std::unique_ptr<VideoOverlayFactory> overlay_factory(
- new VideoOverlayFactory(get_gpu_factories_cb_.Run()));
+ std::unique_ptr<VideoOverlayFactory> overlay_factory;
+
+ // |get_gpu_factories_cb_| can be null in the HLS/MediaPlayerRenderer case,
+ // when we do not need to create video overlays.
+ if (!get_gpu_factories_cb_.is_null()) {
+ overlay_factory =
+ base::MakeUnique<VideoOverlayFactory>(get_gpu_factories_cb_.Run());
+ }
mojom::RendererPtr renderer_ptr;
shell::GetInterface<mojom::Renderer>(interface_provider_, &renderer_ptr);
« no previous file with comments | « media/mojo/clients/mojo_renderer.cc ('k') | media/remoting/remoting_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698