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

Unified Diff: media/remoting/remoting_renderer_factory.cc

Issue 2406483002: WIP - Add EME (Closed)
Patch Set: Rebase. Split RemotingSourceImpl. Addressed comments. 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
Index: media/remoting/remoting_renderer_factory.cc
diff --git a/media/remoting/remoting_renderer_factory.cc b/media/remoting/remoting_renderer_factory.cc
index 52a5db8859da5c087c7f4931e1f5b903e5afde1c..c6e7a742b4d6b2a87cc5da86fc4f67f2b86b5a29 100644
--- a/media/remoting/remoting_renderer_factory.cc
+++ b/media/remoting/remoting_renderer_factory.cc
@@ -10,7 +10,7 @@ namespace media {
RemotingRendererFactory::RemotingRendererFactory(
std::unique_ptr<RendererFactory> default_renderer_factory,
- std::unique_ptr<RemotingController> remoting_controller)
+ std::unique_ptr<RemotingRendererController> remoting_controller)
: default_renderer_factory_(std::move(default_renderer_factory)),
remoting_controller_(std::move(remoting_controller)) {}
@@ -22,7 +22,8 @@ std::unique_ptr<Renderer> RemotingRendererFactory::CreateRenderer(
AudioRendererSink* audio_renderer_sink,
VideoRendererSink* video_renderer_sink,
const RequestSurfaceCB& request_surface_cb) {
- if (remoting_controller_ && remoting_controller_->is_remoting()) {
+ if (remoting_controller_ && (remoting_controller_->IsRemoting() ||
+ remoting_controller_->IsTerminated())) {
miu 2016/10/25 04:21:26 Seems like this should be: if (remoting_control
xjz 2016/10/26 22:00:27 Renamed IsRemoting() to IsRenderingRemotely(). I o
VLOG(1) << "Create Remoting renderer.";
// TODO(xjz): Merge this with Eric's implementation.
NOTIMPLEMENTED();

Powered by Google App Engine
This is Rietveld 408576698