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_impl.h" | 5 #include "webkit/media/webmediaplayer_impl.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
649 } | 649 } |
650 | 650 |
651 bool WebMediaPlayerImpl::sourceRemoveId(const WebKit::WebString& id) { | 651 bool WebMediaPlayerImpl::sourceRemoveId(const WebKit::WebString& id) { |
652 DCHECK(!id.isEmpty()); | 652 DCHECK(!id.isEmpty()); |
653 proxy_->DemuxerRemoveId(id.utf8().data()); | 653 proxy_->DemuxerRemoveId(id.utf8().data()); |
654 return true; | 654 return true; |
655 } | 655 } |
656 | 656 |
657 WebKit::WebTimeRanges WebMediaPlayerImpl::sourceBuffered( | 657 WebKit::WebTimeRanges WebMediaPlayerImpl::sourceBuffered( |
658 const WebKit::WebString& id) { | 658 const WebKit::WebString& id) { |
659 media::ChunkDemuxer::Ranges buffered_ranges; | 659 media::Ranges<base::TimeDelta> buffered_ranges = |
Ami GONE FROM CHROMIUM
2012/06/19 17:40:37
dedup against buffered()?
acolwell GONE FROM CHROMIUM
2012/06/19 19:50:15
Done. Created a ConvertToWebTimeRanges() helper fu
| |
660 if (!proxy_->DemuxerBufferedRange(id.utf8().data(), &buffered_ranges)) | 660 proxy_->DemuxerBufferedRange(id.utf8().data()); |
661 return WebKit::WebTimeRanges(); | |
662 | 661 |
663 WebKit::WebTimeRanges ranges(buffered_ranges.size()); | 662 WebKit::WebTimeRanges ranges(buffered_ranges.size()); |
664 for (size_t i = 0; i < buffered_ranges.size(); i++) { | 663 for (size_t i = 0; i < buffered_ranges.size(); i++) { |
665 ranges[i].start = buffered_ranges[i].first.InSecondsF(); | 664 ranges[i].start = buffered_ranges.start(i).InSecondsF(); |
666 ranges[i].end = buffered_ranges[i].second.InSecondsF(); | 665 ranges[i].end = buffered_ranges.end(i).InSecondsF(); |
667 } | 666 } |
668 return ranges; | 667 return ranges; |
669 } | 668 } |
670 | 669 |
671 bool WebMediaPlayerImpl::sourceAppend(const unsigned char* data, | 670 bool WebMediaPlayerImpl::sourceAppend(const unsigned char* data, |
672 unsigned length) { | 671 unsigned length) { |
673 return sourceAppend(WebKit::WebString::fromUTF8("DefaultSourceId"), | 672 return sourceAppend(WebKit::WebString::fromUTF8("DefaultSourceId"), |
674 data, length); | 673 data, length); |
675 } | 674 } |
676 | 675 |
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1021 return audio_source_provider_; | 1020 return audio_source_provider_; |
1022 } | 1021 } |
1023 | 1022 |
1024 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { | 1023 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { |
1025 DCHECK_EQ(main_loop_, MessageLoop::current()); | 1024 DCHECK_EQ(main_loop_, MessageLoop::current()); |
1026 incremented_externally_allocated_memory_ = true; | 1025 incremented_externally_allocated_memory_ = true; |
1027 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); | 1026 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); |
1028 } | 1027 } |
1029 | 1028 |
1030 } // namespace webkit_media | 1029 } // namespace webkit_media |
OLD | NEW |