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

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

Issue 2281843003: Move ownership of audio/video sinks to MojoRendererService. (Closed)
Patch Set: rebase 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
« no previous file with comments | « media/mojo/services/mojo_renderer_service.h ('k') | media/mojo/services/service_factory_impl.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 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/media_keys.h" 11 #include "media/base/media_keys.h"
11 #include "media/base/media_url_demuxer.h" 12 #include "media/base/media_url_demuxer.h"
12 #include "media/base/renderer.h" 13 #include "media/base/renderer.h"
14 #include "media/base/video_renderer_sink.h"
13 #include "media/mojo/services/demuxer_stream_provider_shim.h" 15 #include "media/mojo/services/demuxer_stream_provider_shim.h"
14 #include "media/mojo/services/mojo_cdm_service_context.h" 16 #include "media/mojo/services/mojo_cdm_service_context.h"
15 17
16 namespace media { 18 namespace media {
17 19
18 // Time interval to update media time. 20 // Time interval to update media time.
19 const int kTimeUpdateIntervalMs = 50; 21 const int kTimeUpdateIntervalMs = 50;
20 22
21 MojoRendererService::MojoRendererService( 23 MojoRendererService::MojoRendererService(
22 base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context, 24 base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context,
25 scoped_refptr<AudioRendererSink> audio_sink,
26 std::unique_ptr<VideoRendererSink> video_sink,
23 std::unique_ptr<media::Renderer> renderer, 27 std::unique_ptr<media::Renderer> renderer,
24 mojo::InterfaceRequest<mojom::Renderer> request) 28 mojo::InterfaceRequest<mojom::Renderer> request)
25 : binding_(this, std::move(request)), 29 : binding_(this, std::move(request)),
26 mojo_cdm_service_context_(mojo_cdm_service_context), 30 mojo_cdm_service_context_(mojo_cdm_service_context),
27 state_(STATE_UNINITIALIZED), 31 state_(STATE_UNINITIALIZED),
32 audio_sink_(std::move(audio_sink)),
33 video_sink_(std::move(video_sink)),
28 renderer_(std::move(renderer)), 34 renderer_(std::move(renderer)),
29 weak_factory_(this) { 35 weak_factory_(this) {
30 DVLOG(1) << __FUNCTION__; 36 DVLOG(1) << __FUNCTION__;
31 DCHECK(renderer_); 37 DCHECK(renderer_);
32 38
33 weak_this_ = weak_factory_.GetWeakPtr(); 39 weak_this_ = weak_factory_.GetWeakPtr();
34 } 40 }
35 41
36 MojoRendererService::~MojoRendererService() {} 42 MojoRendererService::~MojoRendererService() {}
37 43
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 bool success) { 224 bool success) {
219 DVLOG(1) << __FUNCTION__ << "(" << success << ")"; 225 DVLOG(1) << __FUNCTION__ << "(" << success << ")";
220 226
221 if (success) 227 if (success)
222 cdm_ = cdm; 228 cdm_ = cdm;
223 229
224 callback.Run(success); 230 callback.Run(success);
225 } 231 }
226 232
227 } // namespace media 233 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_renderer_service.h ('k') | media/mojo/services/service_factory_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698