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

Side by Side Diff: media/remoting/remoting_renderer_factory.cc

Issue 2457563002: Media Remoting: Add remoting control logic for encrypted contents. (Closed)
Patch Set: Addressed comments from PS#12. Fixed ASAN. Created 4 years, 1 month 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
« no previous file with comments | « media/remoting/remoting_renderer_factory.h ('k') | media/remoting/remoting_sink_observer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "media/remoting/remoting_renderer_factory.h" 5 #include "media/remoting/remoting_renderer_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/remoting/remote_renderer_impl.h" 8 #include "media/remoting/remote_renderer_impl.h"
9 9
10 namespace media { 10 namespace media {
11 11
12 RemotingRendererFactory::RemotingRendererFactory( 12 RemotingRendererFactory::RemotingRendererFactory(
13 std::unique_ptr<RendererFactory> default_renderer_factory, 13 std::unique_ptr<RendererFactory> default_renderer_factory,
14 std::unique_ptr<RemotingController> remoting_controller) 14 std::unique_ptr<RemotingRendererController> remoting_renderer_controller)
15 : default_renderer_factory_(std::move(default_renderer_factory)), 15 : default_renderer_factory_(std::move(default_renderer_factory)),
16 remoting_controller_(std::move(remoting_controller)) {} 16 remoting_renderer_controller_(std::move(remoting_renderer_controller)) {}
17 17
18 RemotingRendererFactory::~RemotingRendererFactory() {} 18 RemotingRendererFactory::~RemotingRendererFactory() {}
19 19
20 std::unique_ptr<Renderer> RemotingRendererFactory::CreateRenderer( 20 std::unique_ptr<Renderer> RemotingRendererFactory::CreateRenderer(
21 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 21 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
22 const scoped_refptr<base::TaskRunner>& worker_task_runner, 22 const scoped_refptr<base::TaskRunner>& worker_task_runner,
23 AudioRendererSink* audio_renderer_sink, 23 AudioRendererSink* audio_renderer_sink,
24 VideoRendererSink* video_renderer_sink, 24 VideoRendererSink* video_renderer_sink,
25 const RequestSurfaceCB& request_surface_cb) { 25 const RequestSurfaceCB& request_surface_cb) {
26 if (remoting_controller_ && remoting_controller_->is_remoting()) { 26 if (remoting_renderer_controller_ &&
27 remoting_renderer_controller_->remote_rendering_started()) {
27 VLOG(1) << "Create Remoting renderer."; 28 VLOG(1) << "Create Remoting renderer.";
28 return base::WrapUnique(new RemoteRendererImpl( 29 return base::WrapUnique(new RemoteRendererImpl(
29 media_task_runner, remoting_controller_->GetWeakPtr())); 30 media_task_runner, remoting_renderer_controller_->GetWeakPtr()));
30 } else { 31 } else {
31 VLOG(1) << "Create Local playback renderer."; 32 VLOG(1) << "Create Local playback renderer.";
32 return default_renderer_factory_->CreateRenderer( 33 return default_renderer_factory_->CreateRenderer(
33 media_task_runner, worker_task_runner, audio_renderer_sink, 34 media_task_runner, worker_task_runner, audio_renderer_sink,
34 video_renderer_sink, request_surface_cb); 35 video_renderer_sink, request_surface_cb);
35 } 36 }
36 } 37 }
37 38
38 } // namespace media 39 } // namespace media
OLDNEW
« no previous file with comments | « media/remoting/remoting_renderer_factory.h ('k') | media/remoting/remoting_sink_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698