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

Side by Side Diff: webkit/media/webmediaplayer_ms.cc

Issue 13431009: Add xxxFloat() methods to WebMediaPlayer implementations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
« no previous file with comments | « webkit/media/webmediaplayer_ms.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "webkit/media/webmediaplayer_ms.h" 5 #include "webkit/media/webmediaplayer_ms.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 bool WebMediaPlayerMS::supportsFullscreen() const { 177 bool WebMediaPlayerMS::supportsFullscreen() const {
178 DCHECK(thread_checker_.CalledOnValidThread()); 178 DCHECK(thread_checker_.CalledOnValidThread());
179 return true; 179 return true;
180 } 180 }
181 181
182 bool WebMediaPlayerMS::supportsSave() const { 182 bool WebMediaPlayerMS::supportsSave() const {
183 DCHECK(thread_checker_.CalledOnValidThread()); 183 DCHECK(thread_checker_.CalledOnValidThread());
184 return false; 184 return false;
185 } 185 }
186 186
187 void WebMediaPlayerMS::seekFloat(float seconds) {
188 seek(seconds);
189 }
190
187 void WebMediaPlayerMS::seek(float seconds) { 191 void WebMediaPlayerMS::seek(float seconds) {
188 DCHECK(thread_checker_.CalledOnValidThread()); 192 DCHECK(thread_checker_.CalledOnValidThread());
189 } 193 }
190 194
195 void WebMediaPlayerMS::setEndTimeFloat(float seconds) {
196 setEndTime(seconds);
197 }
198
191 void WebMediaPlayerMS::setEndTime(float seconds) { 199 void WebMediaPlayerMS::setEndTime(float seconds) {
192 DCHECK(thread_checker_.CalledOnValidThread()); 200 DCHECK(thread_checker_.CalledOnValidThread());
193 } 201 }
194 202
203 void WebMediaPlayerMS::setRateFloat(float rate) {
204 setRate(rate);
205 }
206
195 void WebMediaPlayerMS::setRate(float rate) { 207 void WebMediaPlayerMS::setRate(float rate) {
196 DCHECK(thread_checker_.CalledOnValidThread()); 208 DCHECK(thread_checker_.CalledOnValidThread());
197 } 209 }
198 210
211 void WebMediaPlayerMS::setVolumeFloat(float volume) {
212 setVolume(volume);
213 }
214
199 void WebMediaPlayerMS::setVolume(float volume) { 215 void WebMediaPlayerMS::setVolume(float volume) {
200 DCHECK(thread_checker_.CalledOnValidThread()); 216 DCHECK(thread_checker_.CalledOnValidThread());
201 if (!audio_renderer_) 217 if (!audio_renderer_)
202 return; 218 return;
203 DVLOG(1) << "WebMediaPlayerMS::setVolume(volume=" << volume << ")"; 219 DVLOG(1) << "WebMediaPlayerMS::setVolume(volume=" << volume << ")";
204 audio_renderer_->SetVolume(volume); 220 audio_renderer_->SetVolume(volume);
205 } 221 }
206 222
207 void WebMediaPlayerMS::setVisible(bool visible) { 223 void WebMediaPlayerMS::setVisible(bool visible) {
208 DCHECK(thread_checker_.CalledOnValidThread()); 224 DCHECK(thread_checker_.CalledOnValidThread());
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 bool WebMediaPlayerMS::paused() const { 256 bool WebMediaPlayerMS::paused() const {
241 DCHECK(thread_checker_.CalledOnValidThread()); 257 DCHECK(thread_checker_.CalledOnValidThread());
242 return paused_; 258 return paused_;
243 } 259 }
244 260
245 bool WebMediaPlayerMS::seeking() const { 261 bool WebMediaPlayerMS::seeking() const {
246 DCHECK(thread_checker_.CalledOnValidThread()); 262 DCHECK(thread_checker_.CalledOnValidThread());
247 return false; 263 return false;
248 } 264 }
249 265
266 float WebMediaPlayerMS::durationFloat() const {
267 return duration();
268 }
269
250 float WebMediaPlayerMS::duration() const { 270 float WebMediaPlayerMS::duration() const {
251 DCHECK(thread_checker_.CalledOnValidThread()); 271 DCHECK(thread_checker_.CalledOnValidThread());
252 return std::numeric_limits<float>::infinity(); 272 return std::numeric_limits<float>::infinity();
253 } 273 }
254 274
275 float WebMediaPlayerMS::currentTimeFloat() const {
276 return currentTime();
277 }
278
255 float WebMediaPlayerMS::currentTime() const { 279 float WebMediaPlayerMS::currentTime() const {
256 DCHECK(thread_checker_.CalledOnValidThread()); 280 DCHECK(thread_checker_.CalledOnValidThread());
257 if (current_frame_.get()) { 281 if (current_frame_.get()) {
258 return current_frame_->GetTimestamp().InSecondsF(); 282 return current_frame_->GetTimestamp().InSecondsF();
259 } else if (audio_renderer_) { 283 } else if (audio_renderer_) {
260 return audio_renderer_->GetCurrentRenderTime().InSecondsF(); 284 return audio_renderer_->GetCurrentRenderTime().InSecondsF();
261 } 285 }
262 return 0.0f; 286 return 0.0f;
263 } 287 }
264 288
(...skipping 12 matching lines...) Expand all
277 DCHECK(thread_checker_.CalledOnValidThread()); 301 DCHECK(thread_checker_.CalledOnValidThread());
278 DVLOG(1) << "WebMediaPlayerMS::readyState, state:" << ready_state_; 302 DVLOG(1) << "WebMediaPlayerMS::readyState, state:" << ready_state_;
279 return ready_state_; 303 return ready_state_;
280 } 304 }
281 305
282 const WebKit::WebTimeRanges& WebMediaPlayerMS::buffered() { 306 const WebKit::WebTimeRanges& WebMediaPlayerMS::buffered() {
283 DCHECK(thread_checker_.CalledOnValidThread()); 307 DCHECK(thread_checker_.CalledOnValidThread());
284 return buffered_; 308 return buffered_;
285 } 309 }
286 310
311 float WebMediaPlayerMS::maxTimeSeekableFloat() const {
312 return maxTimeSeekable();
313 }
314
287 float WebMediaPlayerMS::maxTimeSeekable() const { 315 float WebMediaPlayerMS::maxTimeSeekable() const {
288 DCHECK(thread_checker_.CalledOnValidThread()); 316 DCHECK(thread_checker_.CalledOnValidThread());
289 return 0.0f; 317 return 0.0f;
290 } 318 }
291 319
292 bool WebMediaPlayerMS::didLoadingProgress() const { 320 bool WebMediaPlayerMS::didLoadingProgress() const {
293 DCHECK(thread_checker_.CalledOnValidThread()); 321 DCHECK(thread_checker_.CalledOnValidThread());
294 return true; 322 return true;
295 } 323 }
296 324
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 bool WebMediaPlayerMS::didPassCORSAccessCheck() const { 356 bool WebMediaPlayerMS::didPassCORSAccessCheck() const {
329 DCHECK(thread_checker_.CalledOnValidThread()); 357 DCHECK(thread_checker_.CalledOnValidThread());
330 return true; 358 return true;
331 } 359 }
332 360
333 WebMediaPlayer::MovieLoadType WebMediaPlayerMS::movieLoadType() const { 361 WebMediaPlayer::MovieLoadType WebMediaPlayerMS::movieLoadType() const {
334 DCHECK(thread_checker_.CalledOnValidThread()); 362 DCHECK(thread_checker_.CalledOnValidThread());
335 return WebMediaPlayer::MovieLoadTypeUnknown; 363 return WebMediaPlayer::MovieLoadTypeUnknown;
336 } 364 }
337 365
366 float WebMediaPlayerMS::mediaTimeForTimeValueFloat(float timeValue) const {
367 return mediaTimeForTimeValue(timeValue);
368 }
369
338 float WebMediaPlayerMS::mediaTimeForTimeValue(float timeValue) const { 370 float WebMediaPlayerMS::mediaTimeForTimeValue(float timeValue) const {
339 return ConvertSecondsToTimestamp(timeValue).InSecondsF(); 371 return ConvertSecondsToTimestamp(timeValue).InSecondsF();
340 } 372 }
341 373
342 unsigned WebMediaPlayerMS::decodedFrameCount() const { 374 unsigned WebMediaPlayerMS::decodedFrameCount() const {
343 DCHECK(thread_checker_.CalledOnValidThread()); 375 DCHECK(thread_checker_.CalledOnValidThread());
344 DVLOG(1) << "WebMediaPlayerMS::decodedFrameCount, " << total_frame_count_; 376 DVLOG(1) << "WebMediaPlayerMS::decodedFrameCount, " << total_frame_count_;
345 return total_frame_count_; 377 return total_frame_count_;
346 } 378 }
347 379
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 GetClient()->readyStateChanged(); 499 GetClient()->readyStateChanged();
468 } 500 }
469 501
470 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { 502 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() {
471 DCHECK(thread_checker_.CalledOnValidThread()); 503 DCHECK(thread_checker_.CalledOnValidThread());
472 DCHECK(client_); 504 DCHECK(client_);
473 return client_; 505 return client_;
474 } 506 }
475 507
476 } // namespace webkit_media 508 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/media/webmediaplayer_ms.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698