| OLD | NEW |
| 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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) { | 187 void WebMediaPlayerMS::seekFloat(float seconds) { |
| 188 seek(seconds); | 188 seek(seconds); |
| 189 } | 189 } |
| 190 | 190 |
| 191 void WebMediaPlayerMS::seek(float seconds) { | 191 void WebMediaPlayerMS::seek(double seconds) { |
| 192 DCHECK(thread_checker_.CalledOnValidThread()); | 192 DCHECK(thread_checker_.CalledOnValidThread()); |
| 193 } | 193 } |
| 194 | 194 |
| 195 void WebMediaPlayerMS::setEndTimeFloat(float seconds) { | 195 void WebMediaPlayerMS::setEndTimeFloat(float seconds) { |
| 196 setEndTime(seconds); | 196 setEndTime(seconds); |
| 197 } | 197 } |
| 198 | 198 |
| 199 void WebMediaPlayerMS::setEndTime(float seconds) { | 199 void WebMediaPlayerMS::setEndTime(double seconds) { |
| 200 DCHECK(thread_checker_.CalledOnValidThread()); | 200 DCHECK(thread_checker_.CalledOnValidThread()); |
| 201 } | 201 } |
| 202 | 202 |
| 203 void WebMediaPlayerMS::setRateFloat(float rate) { | 203 void WebMediaPlayerMS::setRateFloat(float rate) { |
| 204 setRate(rate); | 204 setRate(rate); |
| 205 } | 205 } |
| 206 | 206 |
| 207 void WebMediaPlayerMS::setRate(float rate) { | 207 void WebMediaPlayerMS::setRate(double rate) { |
| 208 DCHECK(thread_checker_.CalledOnValidThread()); | 208 DCHECK(thread_checker_.CalledOnValidThread()); |
| 209 } | 209 } |
| 210 | 210 |
| 211 void WebMediaPlayerMS::setVolumeFloat(float volume) { | 211 void WebMediaPlayerMS::setVolumeFloat(float volume) { |
| 212 setVolume(volume); | 212 setVolume(volume); |
| 213 } | 213 } |
| 214 | 214 |
| 215 void WebMediaPlayerMS::setVolume(float volume) { | 215 void WebMediaPlayerMS::setVolume(double volume) { |
| 216 DCHECK(thread_checker_.CalledOnValidThread()); | 216 DCHECK(thread_checker_.CalledOnValidThread()); |
| 217 if (!audio_renderer_) | 217 if (!audio_renderer_) |
| 218 return; | 218 return; |
| 219 DVLOG(1) << "WebMediaPlayerMS::setVolume(volume=" << volume << ")"; | 219 DVLOG(1) << "WebMediaPlayerMS::setVolume(volume=" << volume << ")"; |
| 220 audio_renderer_->SetVolume(volume); | 220 audio_renderer_->SetVolume(volume); |
| 221 } | 221 } |
| 222 | 222 |
| 223 void WebMediaPlayerMS::setVisible(bool visible) { | 223 void WebMediaPlayerMS::setVisible(bool visible) { |
| 224 DCHECK(thread_checker_.CalledOnValidThread()); | 224 DCHECK(thread_checker_.CalledOnValidThread()); |
| 225 } | 225 } |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 | 260 |
| 261 bool WebMediaPlayerMS::seeking() const { | 261 bool WebMediaPlayerMS::seeking() const { |
| 262 DCHECK(thread_checker_.CalledOnValidThread()); | 262 DCHECK(thread_checker_.CalledOnValidThread()); |
| 263 return false; | 263 return false; |
| 264 } | 264 } |
| 265 | 265 |
| 266 float WebMediaPlayerMS::durationFloat() const { | 266 float WebMediaPlayerMS::durationFloat() const { |
| 267 return duration(); | 267 return duration(); |
| 268 } | 268 } |
| 269 | 269 |
| 270 float WebMediaPlayerMS::duration() const { | 270 double WebMediaPlayerMS::duration() const { |
| 271 DCHECK(thread_checker_.CalledOnValidThread()); | 271 DCHECK(thread_checker_.CalledOnValidThread()); |
| 272 return std::numeric_limits<float>::infinity(); | 272 return std::numeric_limits<double>::infinity(); |
| 273 } | 273 } |
| 274 | 274 |
| 275 float WebMediaPlayerMS::currentTimeFloat() const { | 275 float WebMediaPlayerMS::currentTimeFloat() const { |
| 276 return currentTime(); | 276 return currentTime(); |
| 277 } | 277 } |
| 278 | 278 |
| 279 float WebMediaPlayerMS::currentTime() const { | 279 double WebMediaPlayerMS::currentTime() const { |
| 280 DCHECK(thread_checker_.CalledOnValidThread()); | 280 DCHECK(thread_checker_.CalledOnValidThread()); |
| 281 if (current_frame_.get()) { | 281 if (current_frame_.get()) { |
| 282 return current_frame_->GetTimestamp().InSecondsF(); | 282 return current_frame_->GetTimestamp().InSecondsF(); |
| 283 } else if (audio_renderer_) { | 283 } else if (audio_renderer_) { |
| 284 return audio_renderer_->GetCurrentRenderTime().InSecondsF(); | 284 return audio_renderer_->GetCurrentRenderTime().InSecondsF(); |
| 285 } | 285 } |
| 286 return 0.0f; | 286 return 0.0; |
| 287 } | 287 } |
| 288 | 288 |
| 289 int WebMediaPlayerMS::dataRate() const { | 289 int WebMediaPlayerMS::dataRate() const { |
| 290 DCHECK(thread_checker_.CalledOnValidThread()); | 290 DCHECK(thread_checker_.CalledOnValidThread()); |
| 291 return 0; | 291 return 0; |
| 292 } | 292 } |
| 293 | 293 |
| 294 WebMediaPlayer::NetworkState WebMediaPlayerMS::networkState() const { | 294 WebMediaPlayer::NetworkState WebMediaPlayerMS::networkState() const { |
| 295 DCHECK(thread_checker_.CalledOnValidThread()); | 295 DCHECK(thread_checker_.CalledOnValidThread()); |
| 296 DVLOG(1) << "WebMediaPlayerMS::networkState, state:" << network_state_; | 296 DVLOG(1) << "WebMediaPlayerMS::networkState, state:" << network_state_; |
| 297 return network_state_; | 297 return network_state_; |
| 298 } | 298 } |
| 299 | 299 |
| 300 WebMediaPlayer::ReadyState WebMediaPlayerMS::readyState() const { | 300 WebMediaPlayer::ReadyState WebMediaPlayerMS::readyState() const { |
| 301 DCHECK(thread_checker_.CalledOnValidThread()); | 301 DCHECK(thread_checker_.CalledOnValidThread()); |
| 302 DVLOG(1) << "WebMediaPlayerMS::readyState, state:" << ready_state_; | 302 DVLOG(1) << "WebMediaPlayerMS::readyState, state:" << ready_state_; |
| 303 return ready_state_; | 303 return ready_state_; |
| 304 } | 304 } |
| 305 | 305 |
| 306 const WebKit::WebTimeRanges& WebMediaPlayerMS::buffered() { | 306 const WebKit::WebTimeRanges& WebMediaPlayerMS::buffered() { |
| 307 DCHECK(thread_checker_.CalledOnValidThread()); | 307 DCHECK(thread_checker_.CalledOnValidThread()); |
| 308 return buffered_; | 308 return buffered_; |
| 309 } | 309 } |
| 310 | 310 |
| 311 float WebMediaPlayerMS::maxTimeSeekableFloat() const { | 311 float WebMediaPlayerMS::maxTimeSeekableFloat() const { |
| 312 return maxTimeSeekable(); | 312 return maxTimeSeekable(); |
| 313 } | 313 } |
| 314 | 314 |
| 315 float WebMediaPlayerMS::maxTimeSeekable() const { | 315 double WebMediaPlayerMS::maxTimeSeekable() const { |
| 316 DCHECK(thread_checker_.CalledOnValidThread()); | 316 DCHECK(thread_checker_.CalledOnValidThread()); |
| 317 return 0.0f; | 317 return 0.0; |
| 318 } | 318 } |
| 319 | 319 |
| 320 bool WebMediaPlayerMS::didLoadingProgress() const { | 320 bool WebMediaPlayerMS::didLoadingProgress() const { |
| 321 DCHECK(thread_checker_.CalledOnValidThread()); | 321 DCHECK(thread_checker_.CalledOnValidThread()); |
| 322 return true; | 322 return true; |
| 323 } | 323 } |
| 324 | 324 |
| 325 unsigned long long WebMediaPlayerMS::totalBytes() const { | 325 unsigned long long WebMediaPlayerMS::totalBytes() const { |
| 326 DCHECK(thread_checker_.CalledOnValidThread()); | 326 DCHECK(thread_checker_.CalledOnValidThread()); |
| 327 return 0; | 327 return 0; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 | 360 |
| 361 WebMediaPlayer::MovieLoadType WebMediaPlayerMS::movieLoadType() const { | 361 WebMediaPlayer::MovieLoadType WebMediaPlayerMS::movieLoadType() const { |
| 362 DCHECK(thread_checker_.CalledOnValidThread()); | 362 DCHECK(thread_checker_.CalledOnValidThread()); |
| 363 return WebMediaPlayer::MovieLoadTypeUnknown; | 363 return WebMediaPlayer::MovieLoadTypeUnknown; |
| 364 } | 364 } |
| 365 | 365 |
| 366 float WebMediaPlayerMS::mediaTimeForTimeValueFloat(float timeValue) const { | 366 float WebMediaPlayerMS::mediaTimeForTimeValueFloat(float timeValue) const { |
| 367 return mediaTimeForTimeValue(timeValue); | 367 return mediaTimeForTimeValue(timeValue); |
| 368 } | 368 } |
| 369 | 369 |
| 370 float WebMediaPlayerMS::mediaTimeForTimeValue(float timeValue) const { | 370 double WebMediaPlayerMS::mediaTimeForTimeValue(double timeValue) const { |
| 371 return ConvertSecondsToTimestamp(timeValue).InSecondsF(); | 371 return ConvertSecondsToTimestamp(timeValue).InSecondsF(); |
| 372 } | 372 } |
| 373 | 373 |
| 374 unsigned WebMediaPlayerMS::decodedFrameCount() const { | 374 unsigned WebMediaPlayerMS::decodedFrameCount() const { |
| 375 DCHECK(thread_checker_.CalledOnValidThread()); | 375 DCHECK(thread_checker_.CalledOnValidThread()); |
| 376 DVLOG(1) << "WebMediaPlayerMS::decodedFrameCount, " << total_frame_count_; | 376 DVLOG(1) << "WebMediaPlayerMS::decodedFrameCount, " << total_frame_count_; |
| 377 return total_frame_count_; | 377 return total_frame_count_; |
| 378 } | 378 } |
| 379 | 379 |
| 380 unsigned WebMediaPlayerMS::droppedFrameCount() const { | 380 unsigned WebMediaPlayerMS::droppedFrameCount() const { |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 GetClient()->readyStateChanged(); | 499 GetClient()->readyStateChanged(); |
| 500 } | 500 } |
| 501 | 501 |
| 502 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { | 502 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { |
| 503 DCHECK(thread_checker_.CalledOnValidThread()); | 503 DCHECK(thread_checker_.CalledOnValidThread()); |
| 504 DCHECK(client_); | 504 DCHECK(client_); |
| 505 return client_; | 505 return client_; |
| 506 } | 506 } |
| 507 | 507 |
| 508 } // namespace webkit_media | 508 } // namespace webkit_media |
| OLD | NEW |