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

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

Issue 282073003: Add return-by-value implementations of blink::WebMediaPlayer::buffered() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 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 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 media::Ranges<base::TimeDelta> buffered_time_ranges = 516 media::Ranges<base::TimeDelta> buffered_time_ranges =
517 pipeline_.GetBufferedTimeRanges(); 517 pipeline_.GetBufferedTimeRanges();
518 buffered_data_source_host_.AddBufferedTimeRanges( 518 buffered_data_source_host_.AddBufferedTimeRanges(
519 &buffered_time_ranges, pipeline_.GetMediaDuration()); 519 &buffered_time_ranges, pipeline_.GetMediaDuration());
520 blink::WebTimeRanges buffered_web_time_ranges( 520 blink::WebTimeRanges buffered_web_time_ranges(
521 ConvertToWebTimeRanges(buffered_time_ranges)); 521 ConvertToWebTimeRanges(buffered_time_ranges));
522 buffered_web_time_ranges_.swap(buffered_web_time_ranges); 522 buffered_web_time_ranges_.swap(buffered_web_time_ranges);
523 return buffered_web_time_ranges_; 523 return buffered_web_time_ranges_;
524 } 524 }
525 525
526 blink::WebTimeRanges WebMediaPlayerImpl::buffered() const {
527 DCHECK(main_loop_->BelongsToCurrentThread());
528 media::Ranges<base::TimeDelta> buffered_time_ranges =
529 pipeline_.GetBufferedTimeRanges();
530 buffered_data_source_host_.AddBufferedTimeRanges(
531 &buffered_time_ranges, pipeline_.GetMediaDuration());
532 return ConvertToWebTimeRanges(buffered_time_ranges);
533 }
534
526 double WebMediaPlayerImpl::maxTimeSeekable() const { 535 double WebMediaPlayerImpl::maxTimeSeekable() const {
527 DCHECK(main_loop_->BelongsToCurrentThread()); 536 DCHECK(main_loop_->BelongsToCurrentThread());
528 537
529 // If we haven't even gotten to ReadyStateHaveMetadata yet then just 538 // If we haven't even gotten to ReadyStateHaveMetadata yet then just
530 // return 0 so that the seekable range is empty. 539 // return 0 so that the seekable range is empty.
531 if (ready_state_ < WebMediaPlayer::ReadyStateHaveMetadata) 540 if (ready_state_ < WebMediaPlayer::ReadyStateHaveMetadata)
532 return 0.0; 541 return 0.0;
533 542
534 // We don't support seeking in streaming media. 543 // We don't support seeking in streaming media.
535 if (data_source_ && data_source_->IsStreaming()) 544 if (data_source_ && data_source_->IsStreaming())
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
1382 compositor_task_runner_->PostTask(FROM_HERE, 1391 compositor_task_runner_->PostTask(FROM_HERE,
1383 base::Bind(&GetCurrentFrameAndSignal, 1392 base::Bind(&GetCurrentFrameAndSignal,
1384 base::Unretained(compositor_), 1393 base::Unretained(compositor_),
1385 &video_frame, 1394 &video_frame,
1386 &event)); 1395 &event));
1387 event.Wait(); 1396 event.Wait();
1388 return video_frame; 1397 return video_frame;
1389 } 1398 }
1390 1399
1391 } // namespace content 1400 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webmediaplayer_impl.h ('k') | content/renderer/media/webmediaplayer_ms.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698