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

Side by Side Diff: media/mojo/services/mojo_renderer_service.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
« no previous file with comments | « media/mojo/services/mojo_renderer_impl.cc ('k') | media/renderers/audio_renderer_impl.cc » ('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 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_service.h" 5 #include "media/mojo/services/mojo_renderer_service.h"
6 6
7 #include <utility>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "media/base/renderer.h" 10 #include "media/base/renderer.h"
9 #include "media/mojo/services/demuxer_stream_provider_shim.h" 11 #include "media/mojo/services/demuxer_stream_provider_shim.h"
10 12
11 namespace media { 13 namespace media {
12 14
13 // Time interval to update media time. 15 // Time interval to update media time.
14 const int kTimeUpdateIntervalMs = 50; 16 const int kTimeUpdateIntervalMs = 50;
15 17
16 MojoRendererService::MojoRendererService( 18 MojoRendererService::MojoRendererService(
17 base::WeakPtr<CdmContextProvider> cdm_context_provider, 19 base::WeakPtr<CdmContextProvider> cdm_context_provider,
18 scoped_ptr<media::Renderer> renderer, 20 scoped_ptr<media::Renderer> renderer,
19 mojo::InterfaceRequest<interfaces::Renderer> request) 21 mojo::InterfaceRequest<interfaces::Renderer> request)
20 : binding_(this, request.Pass()), 22 : binding_(this, std::move(request)),
21 cdm_context_provider_(cdm_context_provider), 23 cdm_context_provider_(cdm_context_provider),
22 renderer_(renderer.Pass()), 24 renderer_(std::move(renderer)),
23 state_(STATE_UNINITIALIZED), 25 state_(STATE_UNINITIALIZED),
24 last_media_time_usec_(0), 26 last_media_time_usec_(0),
25 weak_factory_(this) { 27 weak_factory_(this) {
26 weak_this_ = weak_factory_.GetWeakPtr(); 28 weak_this_ = weak_factory_.GetWeakPtr();
27 DVLOG(1) << __FUNCTION__; 29 DVLOG(1) << __FUNCTION__;
28 } 30 }
29 31
30 MojoRendererService::~MojoRendererService() { 32 MojoRendererService::~MojoRendererService() {
31 } 33 }
32 34
33 void MojoRendererService::Initialize( 35 void MojoRendererService::Initialize(
34 interfaces::RendererClientPtr client, 36 interfaces::RendererClientPtr client,
35 interfaces::DemuxerStreamPtr audio, 37 interfaces::DemuxerStreamPtr audio,
36 interfaces::DemuxerStreamPtr video, 38 interfaces::DemuxerStreamPtr video,
37 const mojo::Callback<void(bool)>& callback) { 39 const mojo::Callback<void(bool)>& callback) {
38 DVLOG(1) << __FUNCTION__; 40 DVLOG(1) << __FUNCTION__;
39 DCHECK_EQ(state_, STATE_UNINITIALIZED); 41 DCHECK_EQ(state_, STATE_UNINITIALIZED);
40 client_ = client.Pass(); 42 client_ = std::move(client);
41 state_ = STATE_INITIALIZING; 43 state_ = STATE_INITIALIZING;
42 stream_provider_.reset(new DemuxerStreamProviderShim( 44 stream_provider_.reset(new DemuxerStreamProviderShim(
43 audio.Pass(), 45 std::move(audio), std::move(video),
44 video.Pass(),
45 base::Bind(&MojoRendererService::OnStreamReady, weak_this_, callback))); 46 base::Bind(&MojoRendererService::OnStreamReady, weak_this_, callback)));
46 } 47 }
47 48
48 void MojoRendererService::Flush(const mojo::Closure& callback) { 49 void MojoRendererService::Flush(const mojo::Closure& callback) {
49 DVLOG(2) << __FUNCTION__; 50 DVLOG(2) << __FUNCTION__;
50 DCHECK_EQ(state_, STATE_PLAYING); 51 DCHECK_EQ(state_, STATE_PLAYING);
51 52
52 state_ = STATE_FLUSHING; 53 state_ = STATE_FLUSHING;
53 CancelPeriodicMediaTimeUpdates(); 54 CancelPeriodicMediaTimeUpdates();
54 renderer_->Flush( 55 renderer_->Flush(
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 } 177 }
177 178
178 void MojoRendererService::OnCdmAttached( 179 void MojoRendererService::OnCdmAttached(
179 const mojo::Callback<void(bool)>& callback, 180 const mojo::Callback<void(bool)>& callback,
180 bool success) { 181 bool success) {
181 DVLOG(1) << __FUNCTION__ << "(" << success << ")"; 182 DVLOG(1) << __FUNCTION__ << "(" << success << ")";
182 callback.Run(success); 183 callback.Run(success);
183 } 184 }
184 185
185 } // namespace media 186 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_renderer_impl.cc ('k') | media/renderers/audio_renderer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698