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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1873513003: Add video-rendering to mojo media pipeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: export VideoOverlayFactory Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2492 matching lines...) Expand 10 before | Expand all | Expand 10 after
2503 initial_cdm, media_surface_manager_, media_session); 2503 initial_cdm, media_surface_manager_, media_session);
2504 2504
2505 #if defined(OS_ANDROID) 2505 #if defined(OS_ANDROID)
2506 if (!UseWebMediaPlayerImpl(url)) { 2506 if (!UseWebMediaPlayerImpl(url)) {
2507 return CreateAndroidWebMediaPlayer(client, encrypted_client, params); 2507 return CreateAndroidWebMediaPlayer(client, encrypted_client, params);
2508 } 2508 }
2509 #endif // defined(OS_ANDROID) 2509 #endif // defined(OS_ANDROID)
2510 2510
2511 #if defined(ENABLE_MOJO_RENDERER) 2511 #if defined(ENABLE_MOJO_RENDERER)
2512 std::unique_ptr<media::RendererFactory> media_renderer_factory( 2512 std::unique_ptr<media::RendererFactory> media_renderer_factory(
2513 new media::MojoRendererFactory(GetMediaInterfaceProvider())); 2513 new media::MojoRendererFactory(
2514 base::Bind(&RenderThreadImpl::GetGpuFactories,
2515 base::Unretained(render_thread)),
2516 GetMediaInterfaceProvider()));
2514 #else 2517 #else
2515 std::unique_ptr<media::RendererFactory> media_renderer_factory = 2518 std::unique_ptr<media::RendererFactory> media_renderer_factory =
2516 GetContentClient()->renderer()->CreateMediaRendererFactory( 2519 GetContentClient()->renderer()->CreateMediaRendererFactory(
2517 this, render_thread->GetGpuFactories(), media_log); 2520 this, render_thread->GetGpuFactories(), media_log);
2518 2521
2519 if (!media_renderer_factory.get()) { 2522 if (!media_renderer_factory.get()) {
2520 media_renderer_factory.reset(new media::DefaultRendererFactory( 2523 media_renderer_factory.reset(new media::DefaultRendererFactory(
2521 media_log, GetDecoderFactory(), 2524 media_log, GetDecoderFactory(),
2522 base::Bind(&RenderThreadImpl::GetGpuFactories, 2525 base::Bind(&RenderThreadImpl::GetGpuFactories,
2523 base::Unretained(render_thread)), 2526 base::Unretained(render_thread)),
(...skipping 3585 matching lines...) Expand 10 before | Expand all | Expand 10 after
6109 // event target. Potentially a Pepper plugin will receive the event. 6112 // event target. Potentially a Pepper plugin will receive the event.
6110 // In order to tell whether a plugin gets the last mouse event and which it 6113 // In order to tell whether a plugin gets the last mouse event and which it
6111 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6114 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6112 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6115 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6113 // |pepper_last_mouse_event_target_|. 6116 // |pepper_last_mouse_event_target_|.
6114 pepper_last_mouse_event_target_ = nullptr; 6117 pepper_last_mouse_event_target_ = nullptr;
6115 #endif 6118 #endif
6116 } 6119 }
6117 6120
6118 } // namespace content 6121 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698