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

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

Issue 1977173002: Rename media::interfaces to media::mojom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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/media_keys.h" 10 #include "media/base/media_keys.h"
11 #include "media/base/renderer.h" 11 #include "media/base/renderer.h"
12 #include "media/mojo/services/demuxer_stream_provider_shim.h" 12 #include "media/mojo/services/demuxer_stream_provider_shim.h"
13 #include "media/mojo/services/mojo_cdm_service_context.h" 13 #include "media/mojo/services/mojo_cdm_service_context.h"
14 14
15 namespace media { 15 namespace media {
16 16
17 // Time interval to update media time. 17 // Time interval to update media time.
18 const int kTimeUpdateIntervalMs = 50; 18 const int kTimeUpdateIntervalMs = 50;
19 19
20 MojoRendererService::MojoRendererService( 20 MojoRendererService::MojoRendererService(
21 base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context, 21 base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context,
22 std::unique_ptr<media::Renderer> renderer, 22 std::unique_ptr<media::Renderer> renderer,
23 mojo::InterfaceRequest<interfaces::Renderer> request) 23 mojo::InterfaceRequest<mojom::Renderer> request)
24 : binding_(this, std::move(request)), 24 : binding_(this, std::move(request)),
25 mojo_cdm_service_context_(mojo_cdm_service_context), 25 mojo_cdm_service_context_(mojo_cdm_service_context),
26 state_(STATE_UNINITIALIZED), 26 state_(STATE_UNINITIALIZED),
27 last_media_time_usec_(0), 27 last_media_time_usec_(0),
28 renderer_(std::move(renderer)), 28 renderer_(std::move(renderer)),
29 weak_factory_(this) { 29 weak_factory_(this) {
30 DVLOG(1) << __FUNCTION__; 30 DVLOG(1) << __FUNCTION__;
31 DCHECK(renderer_); 31 DCHECK(renderer_);
32 32
33 weak_this_ = weak_factory_.GetWeakPtr(); 33 weak_this_ = weak_factory_.GetWeakPtr();
34 } 34 }
35 35
36 MojoRendererService::~MojoRendererService() { 36 MojoRendererService::~MojoRendererService() {
37 } 37 }
38 38
39 void MojoRendererService::Initialize( 39 void MojoRendererService::Initialize(
40 interfaces::RendererClientPtr client, 40 mojom::RendererClientPtr client,
41 interfaces::DemuxerStreamPtr audio, 41 mojom::DemuxerStreamPtr audio,
42 interfaces::DemuxerStreamPtr video, 42 mojom::DemuxerStreamPtr video,
43 const mojo::Callback<void(bool)>& callback) { 43 const mojo::Callback<void(bool)>& callback) {
44 DVLOG(1) << __FUNCTION__; 44 DVLOG(1) << __FUNCTION__;
45 DCHECK_EQ(state_, STATE_UNINITIALIZED); 45 DCHECK_EQ(state_, STATE_UNINITIALIZED);
46 client_ = std::move(client); 46 client_ = std::move(client);
47 state_ = STATE_INITIALIZING; 47 state_ = STATE_INITIALIZING;
48 stream_provider_.reset(new DemuxerStreamProviderShim( 48 stream_provider_.reset(new DemuxerStreamProviderShim(
49 std::move(audio), std::move(video), 49 std::move(audio), std::move(video),
50 base::Bind(&MojoRendererService::OnStreamReady, weak_this_, callback))); 50 base::Bind(&MojoRendererService::OnStreamReady, weak_this_, callback)));
51 } 51 }
52 52
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 client_->OnError(); 109 client_->OnError();
110 } 110 }
111 111
112 void MojoRendererService::OnEnded() { 112 void MojoRendererService::OnEnded() {
113 DVLOG(1) << __FUNCTION__; 113 DVLOG(1) << __FUNCTION__;
114 CancelPeriodicMediaTimeUpdates(); 114 CancelPeriodicMediaTimeUpdates();
115 client_->OnEnded(); 115 client_->OnEnded();
116 } 116 }
117 117
118 void MojoRendererService::OnStatisticsUpdate(const PipelineStatistics& stats) { 118 void MojoRendererService::OnStatisticsUpdate(const PipelineStatistics& stats) {
119 // TODO(alokp): Plumb the event to interfaces::RendererClient. crbug/585287 119 // TODO(alokp): Plumb the event to mojom::RendererClient. crbug/585287
120 } 120 }
121 121
122 void MojoRendererService::OnBufferingStateChange(BufferingState state) { 122 void MojoRendererService::OnBufferingStateChange(BufferingState state) {
123 DVLOG(2) << __FUNCTION__ << "(" << state << ")"; 123 DVLOG(2) << __FUNCTION__ << "(" << state << ")";
124 client_->OnBufferingStateChange( 124 client_->OnBufferingStateChange(static_cast<mojom::BufferingState>(state));
125 static_cast<interfaces::BufferingState>(state));
126 } 125 }
127 126
128 void MojoRendererService::OnWaitingForDecryptionKey() { 127 void MojoRendererService::OnWaitingForDecryptionKey() {
129 // TODO(alokp): Plumb the event to interfaces::RendererClient. crbug/585287 128 // TODO(alokp): Plumb the event to mojom::RendererClient. crbug/585287
130 } 129 }
131 130
132 void MojoRendererService::OnStreamReady( 131 void MojoRendererService::OnStreamReady(
133 const mojo::Callback<void(bool)>& callback) { 132 const mojo::Callback<void(bool)>& callback) {
134 DCHECK_EQ(state_, STATE_INITIALIZING); 133 DCHECK_EQ(state_, STATE_INITIALIZING);
135 134
136 renderer_->Initialize( 135 renderer_->Initialize(
137 stream_provider_.get(), this, 136 stream_provider_.get(), this,
138 base::Bind(&MojoRendererService::OnRendererInitializeDone, weak_this_, 137 base::Bind(&MojoRendererService::OnRendererInitializeDone, weak_this_,
139 callback)); 138 callback));
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 bool success) { 191 bool success) {
193 DVLOG(1) << __FUNCTION__ << "(" << success << ")"; 192 DVLOG(1) << __FUNCTION__ << "(" << success << ")";
194 193
195 if (success) 194 if (success)
196 cdm_ = cdm; 195 cdm_ = cdm;
197 196
198 callback.Run(success); 197 callback.Run(success);
199 } 198 }
200 199
201 } // namespace media 200 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698