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

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

Issue 2358413002: media: Use associated interface for mojo RendererClient (Closed)
Patch Set: more test update Created 4 years, 3 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_service.h" 5 #include "media/mojo/services/mojo_renderer_service.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "media/base/audio_renderer_sink.h" 10 #include "media/base/audio_renderer_sink.h"
(...skipping 22 matching lines...) Expand all
33 renderer_(std::move(renderer)), 33 renderer_(std::move(renderer)),
34 weak_factory_(this) { 34 weak_factory_(this) {
35 DVLOG(1) << __FUNCTION__; 35 DVLOG(1) << __FUNCTION__;
36 DCHECK(renderer_); 36 DCHECK(renderer_);
37 37
38 weak_this_ = weak_factory_.GetWeakPtr(); 38 weak_this_ = weak_factory_.GetWeakPtr();
39 } 39 }
40 40
41 MojoRendererService::~MojoRendererService() {} 41 MojoRendererService::~MojoRendererService() {}
42 42
43 void MojoRendererService::Initialize(mojom::RendererClientPtr client, 43 void MojoRendererService::Initialize(
44 mojom::DemuxerStreamPtr audio, 44 mojom::RendererClientAssociatedPtrInfo client,
45 mojom::DemuxerStreamPtr video, 45 mojom::DemuxerStreamPtr audio,
46 const base::Optional<GURL>& url, 46 mojom::DemuxerStreamPtr video,
47 const InitializeCallback& callback) { 47 const base::Optional<GURL>& url,
48 const InitializeCallback& callback) {
48 DVLOG(1) << __FUNCTION__; 49 DVLOG(1) << __FUNCTION__;
49 DCHECK_EQ(state_, STATE_UNINITIALIZED); 50 DCHECK_EQ(state_, STATE_UNINITIALIZED);
50 client_ = std::move(client); 51
52 client_.Bind(std::move(client));
51 state_ = STATE_INITIALIZING; 53 state_ = STATE_INITIALIZING;
52 54
53 if (url == base::nullopt) { 55 if (url == base::nullopt) {
54 stream_provider_.reset(new DemuxerStreamProviderShim( 56 stream_provider_.reset(new DemuxerStreamProviderShim(
55 std::move(audio), std::move(video), 57 std::move(audio), std::move(video),
56 base::Bind(&MojoRendererService::OnStreamReady, weak_this_, callback))); 58 base::Bind(&MojoRendererService::OnStreamReady, weak_this_, callback)));
57 return; 59 return;
58 } 60 }
59 61
60 DCHECK(!audio); 62 DCHECK(!audio);
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 bool success) { 232 bool success) {
231 DVLOG(1) << __FUNCTION__ << "(" << success << ")"; 233 DVLOG(1) << __FUNCTION__ << "(" << success << ")";
232 234
233 if (success) 235 if (success)
234 cdm_ = cdm; 236 cdm_ = cdm;
235 237
236 callback.Run(success); 238 callback.Run(success);
237 } 239 }
238 240
239 } // namespace media 241 } // namespace media
OLDNEW
« media/mojo/clients/mojo_renderer.cc ('K') | « media/mojo/services/mojo_renderer_service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698