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

Side by Side Diff: media/mojo/services/mojo_renderer_impl.cc

Issue 1544313002: Convert Pass()→std::move() in //media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/mojo/services/mojo_renderer_impl.h" 5 #include "media/mojo/services/mojo_renderer_impl.h"
6 6
7 #include <utility>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
9 #include "base/location.h" 11 #include "base/location.h"
10 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
11 #include "media/base/bind_to_current_loop.h" 13 #include "media/base/bind_to_current_loop.h"
12 #include "media/base/demuxer_stream_provider.h" 14 #include "media/base/demuxer_stream_provider.h"
13 #include "media/mojo/services/mojo_demuxer_stream_impl.h" 15 #include "media/mojo/services/mojo_demuxer_stream_impl.h"
14 #include "mojo/application/public/cpp/connect.h" 16 #include "mojo/application/public/cpp/connect.h"
15 #include "mojo/application/public/interfaces/service_provider.mojom.h" 17 #include "mojo/application/public/interfaces/service_provider.mojom.h"
16 18
17 namespace media { 19 namespace media {
18 20
19 MojoRendererImpl::MojoRendererImpl( 21 MojoRendererImpl::MojoRendererImpl(
20 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 22 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
21 interfaces::RendererPtr remote_renderer) 23 interfaces::RendererPtr remote_renderer)
22 : task_runner_(task_runner), 24 : task_runner_(task_runner),
23 remote_renderer_(remote_renderer.Pass()), 25 remote_renderer_(std::move(remote_renderer)),
24 weak_factory_(this) { 26 weak_factory_(this) {
25 DVLOG(1) << __FUNCTION__; 27 DVLOG(1) << __FUNCTION__;
26 } 28 }
27 29
28 MojoRendererImpl::~MojoRendererImpl() { 30 MojoRendererImpl::~MojoRendererImpl() {
29 DVLOG(1) << __FUNCTION__; 31 DVLOG(1) << __FUNCTION__;
30 DCHECK(task_runner_->BelongsToCurrentThread()); 32 DCHECK(task_runner_->BelongsToCurrentThread());
31 // Connection to |remote_renderer_| will error-out here. 33 // Connection to |remote_renderer_| will error-out here.
32 } 34 }
33 35
(...skipping 28 matching lines...) Expand all
62 new MojoDemuxerStreamImpl(audio, GetProxy(&audio_stream)); 64 new MojoDemuxerStreamImpl(audio, GetProxy(&audio_stream));
63 65
64 interfaces::DemuxerStreamPtr video_stream; 66 interfaces::DemuxerStreamPtr video_stream;
65 if (video) 67 if (video)
66 new MojoDemuxerStreamImpl(video, GetProxy(&video_stream)); 68 new MojoDemuxerStreamImpl(video, GetProxy(&video_stream));
67 69
68 interfaces::RendererClientPtr client_ptr; 70 interfaces::RendererClientPtr client_ptr;
69 binding_.reset( 71 binding_.reset(
70 new mojo::Binding<RendererClient>(this, GetProxy(&client_ptr))); 72 new mojo::Binding<RendererClient>(this, GetProxy(&client_ptr)));
71 remote_renderer_->Initialize( 73 remote_renderer_->Initialize(
72 client_ptr.Pass(), audio_stream.Pass(), video_stream.Pass(), 74 std::move(client_ptr), std::move(audio_stream), std::move(video_stream),
73 BindToCurrentLoop(base::Bind(&MojoRendererImpl::OnInitialized, 75 BindToCurrentLoop(base::Bind(&MojoRendererImpl::OnInitialized,
74 weak_factory_.GetWeakPtr()))); 76 weak_factory_.GetWeakPtr())));
75 } 77 }
76 78
77 void MojoRendererImpl::SetCdm(CdmContext* cdm_context, 79 void MojoRendererImpl::SetCdm(CdmContext* cdm_context,
78 const CdmAttachedCB& cdm_attached_cb) { 80 const CdmAttachedCB& cdm_attached_cb) {
79 DVLOG(1) << __FUNCTION__; 81 DVLOG(1) << __FUNCTION__;
80 DCHECK(task_runner_->BelongsToCurrentThread()); 82 DCHECK(task_runner_->BelongsToCurrentThread());
81 83
82 int32_t cdm_id = cdm_context->GetCdmId(); 84 int32_t cdm_id = cdm_context->GetCdmId();
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 void MojoRendererImpl::OnInitialized(bool success) { 205 void MojoRendererImpl::OnInitialized(bool success) {
204 DVLOG(1) << __FUNCTION__; 206 DVLOG(1) << __FUNCTION__;
205 DCHECK(task_runner_->BelongsToCurrentThread()); 207 DCHECK(task_runner_->BelongsToCurrentThread());
206 DCHECK(!init_cb_.is_null()); 208 DCHECK(!init_cb_.is_null());
207 209
208 base::ResetAndReturn(&init_cb_) 210 base::ResetAndReturn(&init_cb_)
209 .Run(success ? PIPELINE_OK : PIPELINE_ERROR_INITIALIZATION_FAILED); 211 .Run(success ? PIPELINE_OK : PIPELINE_ERROR_INITIALIZATION_FAILED);
210 } 212 }
211 213
212 } // namespace media 214 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_renderer_factory.cc ('k') | media/mojo/services/mojo_renderer_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698