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

Side by Side Diff: content/renderer/media/audio_renderer_impl.cc

Issue 9718013: Merge FilterStatusCB into PipelineStatusCB. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/renderer/media/audio_renderer_impl.h" 5 #include "content/renderer/media/audio_renderer_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 119
120 void AudioRendererImpl::Pause(const base::Closure& callback) { 120 void AudioRendererImpl::Pause(const base::Closure& callback) {
121 AudioRendererBase::Pause(callback); 121 AudioRendererBase::Pause(callback);
122 if (stopped_) 122 if (stopped_)
123 return; 123 return;
124 124
125 DoPause(); 125 DoPause();
126 } 126 }
127 127
128 void AudioRendererImpl::Seek(base::TimeDelta time, 128 void AudioRendererImpl::Seek(base::TimeDelta time,
129 const media::FilterStatusCB& cb) { 129 const media::PipelineStatusCB& cb) {
130 AudioRendererBase::Seek(time, cb); 130 AudioRendererBase::Seek(time, cb);
131 if (stopped_) 131 if (stopped_)
132 return; 132 return;
133 133
134 DoSeek(); 134 DoSeek();
135 } 135 }
136 136
137 void AudioRendererImpl::Play(const base::Closure& callback) { 137 void AudioRendererImpl::Play(const base::Closure& callback) {
138 AudioRendererBase::Play(callback); 138 AudioRendererBase::Play(callback);
139 if (stopped_) 139 if (stopped_)
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 227
228 void AudioRendererImpl::OnRenderError() { 228 void AudioRendererImpl::OnRenderError() {
229 host()->DisableAudioRenderer(); 229 host()->DisableAudioRenderer();
230 } 230 }
231 231
232 void AudioRendererImpl::OnRenderEndOfStream() { 232 void AudioRendererImpl::OnRenderEndOfStream() {
233 // TODO(enal): schedule callback instead of polling. 233 // TODO(enal): schedule callback instead of polling.
234 if (base::Time::Now() >= earliest_end_time_) 234 if (base::Time::Now() >= earliest_end_time_)
235 SignalEndOfStream(); 235 SignalEndOfStream();
236 } 236 }
OLDNEW
« no previous file with comments | « content/renderer/media/audio_renderer_impl.h ('k') | content/renderer/media/capture_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698