| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/webmediaplayer_impl.h" | 5 #include "content/renderer/media/webmediaplayer_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 504 WebMediaPlayer::NetworkState WebMediaPlayerImpl::networkState() const { | 504 WebMediaPlayer::NetworkState WebMediaPlayerImpl::networkState() const { |
| 505 DCHECK(main_loop_->BelongsToCurrentThread()); | 505 DCHECK(main_loop_->BelongsToCurrentThread()); |
| 506 return network_state_; | 506 return network_state_; |
| 507 } | 507 } |
| 508 | 508 |
| 509 WebMediaPlayer::ReadyState WebMediaPlayerImpl::readyState() const { | 509 WebMediaPlayer::ReadyState WebMediaPlayerImpl::readyState() const { |
| 510 DCHECK(main_loop_->BelongsToCurrentThread()); | 510 DCHECK(main_loop_->BelongsToCurrentThread()); |
| 511 return ready_state_; | 511 return ready_state_; |
| 512 } | 512 } |
| 513 | 513 |
| 514 const blink::WebTimeRanges& WebMediaPlayerImpl::buffered() { | |
| 515 DCHECK(main_loop_->BelongsToCurrentThread()); | |
| 516 media::Ranges<base::TimeDelta> buffered_time_ranges = | |
| 517 pipeline_.GetBufferedTimeRanges(); | |
| 518 buffered_data_source_host_.AddBufferedTimeRanges( | |
| 519 &buffered_time_ranges, pipeline_.GetMediaDuration()); | |
| 520 blink::WebTimeRanges buffered_web_time_ranges( | |
| 521 ConvertToWebTimeRanges(buffered_time_ranges)); | |
| 522 buffered_web_time_ranges_.swap(buffered_web_time_ranges); | |
| 523 return buffered_web_time_ranges_; | |
| 524 } | |
| 525 | |
| 526 blink::WebTimeRanges WebMediaPlayerImpl::buffered() const { | 514 blink::WebTimeRanges WebMediaPlayerImpl::buffered() const { |
| 527 DCHECK(main_loop_->BelongsToCurrentThread()); | 515 DCHECK(main_loop_->BelongsToCurrentThread()); |
| 528 media::Ranges<base::TimeDelta> buffered_time_ranges = | 516 media::Ranges<base::TimeDelta> buffered_time_ranges = |
| 529 pipeline_.GetBufferedTimeRanges(); | 517 pipeline_.GetBufferedTimeRanges(); |
| 530 buffered_data_source_host_.AddBufferedTimeRanges( | 518 buffered_data_source_host_.AddBufferedTimeRanges( |
| 531 &buffered_time_ranges, pipeline_.GetMediaDuration()); | 519 &buffered_time_ranges, pipeline_.GetMediaDuration()); |
| 532 return ConvertToWebTimeRanges(buffered_time_ranges); | 520 return ConvertToWebTimeRanges(buffered_time_ranges); |
| 533 } | 521 } |
| 534 | 522 |
| 535 double WebMediaPlayerImpl::maxTimeSeekable() const { | 523 double WebMediaPlayerImpl::maxTimeSeekable() const { |
| (...skipping 851 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1387 compositor_task_runner_->PostTask(FROM_HERE, | 1375 compositor_task_runner_->PostTask(FROM_HERE, |
| 1388 base::Bind(&GetCurrentFrameAndSignal, | 1376 base::Bind(&GetCurrentFrameAndSignal, |
| 1389 base::Unretained(compositor_), | 1377 base::Unretained(compositor_), |
| 1390 &video_frame, | 1378 &video_frame, |
| 1391 &event)); | 1379 &event)); |
| 1392 event.Wait(); | 1380 event.Wait(); |
| 1393 return video_frame; | 1381 return video_frame; |
| 1394 } | 1382 } |
| 1395 | 1383 |
| 1396 } // namespace content | 1384 } // namespace content |
| OLD | NEW |