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

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

Issue 1978973002: Moves video frame callbacks from VideoFrameCompositor to Renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addresses comments 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 #include "mojo/converters/geometry/geometry_type_converters.h"
14 15
15 namespace media { 16 namespace media {
16 17
17 // Time interval to update media time. 18 // Time interval to update media time.
18 const int kTimeUpdateIntervalMs = 50; 19 const int kTimeUpdateIntervalMs = 50;
19 20
20 MojoRendererService::MojoRendererService( 21 MojoRendererService::MojoRendererService(
21 base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context, 22 base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context,
22 std::unique_ptr<media::Renderer> renderer, 23 std::unique_ptr<media::Renderer> renderer,
23 mojo::InterfaceRequest<interfaces::Renderer> request) 24 mojo::InterfaceRequest<interfaces::Renderer> request)
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 void MojoRendererService::OnBufferingStateChange(BufferingState state) { 123 void MojoRendererService::OnBufferingStateChange(BufferingState state) {
123 DVLOG(2) << __FUNCTION__ << "(" << state << ")"; 124 DVLOG(2) << __FUNCTION__ << "(" << state << ")";
124 client_->OnBufferingStateChange( 125 client_->OnBufferingStateChange(
125 static_cast<interfaces::BufferingState>(state)); 126 static_cast<interfaces::BufferingState>(state));
126 } 127 }
127 128
128 void MojoRendererService::OnWaitingForDecryptionKey() { 129 void MojoRendererService::OnWaitingForDecryptionKey() {
129 // TODO(alokp): Plumb the event to interfaces::RendererClient. crbug/585287 130 // TODO(alokp): Plumb the event to interfaces::RendererClient. crbug/585287
130 } 131 }
131 132
133 void MojoRendererService::OnVideoNaturalSizeChange(const gfx::Size& size) {
134 DVLOG(2) << __FUNCTION__ << "(" << size.ToString() << ")";
135 client_->OnVideoNaturalSizeChange(mojo::Size::From(size));
136 }
137
138 void MojoRendererService::OnVideoOpacityChange(bool opaque) {
139 DVLOG(2) << __FUNCTION__ << "(" << opaque << ")";
140 client_->OnVideoOpacityChange(opaque);
141 }
142
132 void MojoRendererService::OnStreamReady( 143 void MojoRendererService::OnStreamReady(
133 const mojo::Callback<void(bool)>& callback) { 144 const mojo::Callback<void(bool)>& callback) {
134 DCHECK_EQ(state_, STATE_INITIALIZING); 145 DCHECK_EQ(state_, STATE_INITIALIZING);
135 146
136 renderer_->Initialize( 147 renderer_->Initialize(
137 stream_provider_.get(), this, 148 stream_provider_.get(), this,
138 base::Bind(&MojoRendererService::OnRendererInitializeDone, weak_this_, 149 base::Bind(&MojoRendererService::OnRendererInitializeDone, weak_this_,
139 callback)); 150 callback));
140 } 151 }
141 152
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 bool success) { 203 bool success) {
193 DVLOG(1) << __FUNCTION__ << "(" << success << ")"; 204 DVLOG(1) << __FUNCTION__ << "(" << success << ")";
194 205
195 if (success) 206 if (success)
196 cdm_ = cdm; 207 cdm_ = cdm;
197 208
198 callback.Run(success); 209 callback.Run(success);
199 } 210 }
200 211
201 } // namespace media 212 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_renderer_service.h ('k') | media/renderers/audio_renderer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698