| 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/websourcebuffer_impl.h" | 5 #include "content/renderer/media/websourcebuffer_impl.h" |
| 6 | 6 |
| 7 #include "base/float_util.h" | 7 #include "base/float_util.h" |
| 8 #include "media/filters/chunk_demuxer.h" | 8 #include "media/filters/chunk_demuxer.h" |
| 9 | 9 |
| 10 namespace content { | 10 namespace content { |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 blink::WebTimeRanges WebSourceBufferImpl::buffered() { | 52 blink::WebTimeRanges WebSourceBufferImpl::buffered() { |
| 53 media::Ranges<base::TimeDelta> ranges = demuxer_->GetBufferedRanges(id_); | 53 media::Ranges<base::TimeDelta> ranges = demuxer_->GetBufferedRanges(id_); |
| 54 blink::WebTimeRanges result(ranges.size()); | 54 blink::WebTimeRanges result(ranges.size()); |
| 55 for (size_t i = 0; i < ranges.size(); i++) { | 55 for (size_t i = 0; i < ranges.size(); i++) { |
| 56 result[i].start = ranges.start(i).InSecondsF(); | 56 result[i].start = ranges.start(i).InSecondsF(); |
| 57 result[i].end = ranges.end(i).InSecondsF(); | 57 result[i].end = ranges.end(i).InSecondsF(); |
| 58 } | 58 } |
| 59 return result; | 59 return result; |
| 60 } | 60 } |
| 61 | 61 |
| 62 void WebSourceBufferImpl::append(const unsigned char* data, unsigned length) { | |
| 63 append(data, length, NULL); | |
| 64 } | |
| 65 | |
| 66 void WebSourceBufferImpl::append( | 62 void WebSourceBufferImpl::append( |
| 67 const unsigned char* data, | 63 const unsigned char* data, |
| 68 unsigned length, | 64 unsigned length, |
| 69 double* timestamp_offset) { | 65 double* timestamp_offset) { |
| 70 demuxer_->AppendData(id_, data, length, timestamp_offset); | 66 demuxer_->AppendData(id_, data, length, timestamp_offset); |
| 71 } | 67 } |
| 72 | 68 |
| 73 void WebSourceBufferImpl::abort() { | 69 void WebSourceBufferImpl::abort() { |
| 74 demuxer_->Abort(id_); | 70 demuxer_->Abort(id_); |
| 75 } | 71 } |
| (...skipping 15 matching lines...) Expand all Loading... |
| 91 void WebSourceBufferImpl::setAppendWindowEnd(double end) { | 87 void WebSourceBufferImpl::setAppendWindowEnd(double end) { |
| 92 demuxer_->SetAppendWindowEnd(id_, DoubleToTimeDelta(end)); | 88 demuxer_->SetAppendWindowEnd(id_, DoubleToTimeDelta(end)); |
| 93 } | 89 } |
| 94 | 90 |
| 95 void WebSourceBufferImpl::removedFromMediaSource() { | 91 void WebSourceBufferImpl::removedFromMediaSource() { |
| 96 demuxer_->RemoveId(id_); | 92 demuxer_->RemoveId(id_); |
| 97 demuxer_ = NULL; | 93 demuxer_ = NULL; |
| 98 } | 94 } |
| 99 | 95 |
| 100 } // namespace content | 96 } // namespace content |
| OLD | NEW |