Chromium Code Reviews| 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 18 matching lines...) Expand all Loading... | |
| 29 const std::string& id, media::ChunkDemuxer* demuxer) | 29 const std::string& id, media::ChunkDemuxer* demuxer) |
| 30 : id_(id), | 30 : id_(id), |
| 31 demuxer_(demuxer) { | 31 demuxer_(demuxer) { |
| 32 DCHECK(demuxer_); | 32 DCHECK(demuxer_); |
| 33 } | 33 } |
| 34 | 34 |
| 35 WebSourceBufferImpl::~WebSourceBufferImpl() { | 35 WebSourceBufferImpl::~WebSourceBufferImpl() { |
| 36 DCHECK(!demuxer_) << "Object destroyed w/o removedFromMediaSource() call"; | 36 DCHECK(!demuxer_) << "Object destroyed w/o removedFromMediaSource() call"; |
| 37 } | 37 } |
| 38 | 38 |
| 39 bool WebSourceBufferImpl::setMode(WebSourceBuffer::AppendMode mode) { | |
| 40 media::ChunkDemuxer::AppendMode demuxerMode = media::ChunkDemuxer::kSegments; | |
| 41 switch (mode) { | |
| 42 case WebSourceBuffer::AppendModeSegments: | |
| 43 break; | |
| 44 case WebSourceBuffer::AppendModeSequence: | |
| 45 demuxerMode = media::ChunkDemuxer::kSequence; | |
| 46 break; | |
| 47 default: | |
|
acolwell GONE FROM CHROMIUM
2014/01/10 23:10:37
nit: Change switch to a cast and use COMPILE_ASSER
wolenetz
2014/01/11 00:55:44
Done using your other suggestion (use a bool |is_s
| |
| 48 NOTIMPLEMENTED(); | |
| 49 } | |
| 50 | |
| 51 return demuxer_->SetAppendMode(id_, demuxerMode); | |
| 52 } | |
| 53 | |
| 39 blink::WebTimeRanges WebSourceBufferImpl::buffered() { | 54 blink::WebTimeRanges WebSourceBufferImpl::buffered() { |
| 40 media::Ranges<base::TimeDelta> ranges = demuxer_->GetBufferedRanges(id_); | 55 media::Ranges<base::TimeDelta> ranges = demuxer_->GetBufferedRanges(id_); |
| 41 blink::WebTimeRanges result(ranges.size()); | 56 blink::WebTimeRanges result(ranges.size()); |
| 42 for (size_t i = 0; i < ranges.size(); i++) { | 57 for (size_t i = 0; i < ranges.size(); i++) { |
| 43 result[i].start = ranges.start(i).InSecondsF(); | 58 result[i].start = ranges.start(i).InSecondsF(); |
| 44 result[i].end = ranges.end(i).InSecondsF(); | 59 result[i].end = ranges.end(i).InSecondsF(); |
| 45 } | 60 } |
| 46 return result; | 61 return result; |
| 47 } | 62 } |
| 48 | 63 |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 71 void WebSourceBufferImpl::setAppendWindowEnd(double end) { | 86 void WebSourceBufferImpl::setAppendWindowEnd(double end) { |
| 72 demuxer_->SetAppendWindowEnd(id_, DoubleToTimeDelta(end)); | 87 demuxer_->SetAppendWindowEnd(id_, DoubleToTimeDelta(end)); |
| 73 } | 88 } |
| 74 | 89 |
| 75 void WebSourceBufferImpl::removedFromMediaSource() { | 90 void WebSourceBufferImpl::removedFromMediaSource() { |
| 76 demuxer_->RemoveId(id_); | 91 demuxer_->RemoveId(id_); |
| 77 demuxer_ = NULL; | 92 demuxer_ = NULL; |
| 78 } | 93 } |
| 79 | 94 |
| 80 } // namespace content | 95 } // namespace content |
| OLD | NEW |