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

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

Issue 134883002: Let WebSourceBufferImpl::setMode() update SourceState::sequence_mode_ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/media/websourcebuffer_impl.h ('k') | media/filters/chunk_demuxer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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
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 bool sequence_mode = false;
41 switch (mode) {
42 case WebSourceBuffer::AppendModeSegments:
43 break;
44 case WebSourceBuffer::AppendModeSequence:
45 sequence_mode = true;
46 break;
47 }
48
49 return demuxer_->SetSequenceMode(id_, sequence_mode);
50 }
51
39 blink::WebTimeRanges WebSourceBufferImpl::buffered() { 52 blink::WebTimeRanges WebSourceBufferImpl::buffered() {
40 media::Ranges<base::TimeDelta> ranges = demuxer_->GetBufferedRanges(id_); 53 media::Ranges<base::TimeDelta> ranges = demuxer_->GetBufferedRanges(id_);
41 blink::WebTimeRanges result(ranges.size()); 54 blink::WebTimeRanges result(ranges.size());
42 for (size_t i = 0; i < ranges.size(); i++) { 55 for (size_t i = 0; i < ranges.size(); i++) {
43 result[i].start = ranges.start(i).InSecondsF(); 56 result[i].start = ranges.start(i).InSecondsF();
44 result[i].end = ranges.end(i).InSecondsF(); 57 result[i].end = ranges.end(i).InSecondsF();
45 } 58 }
46 return result; 59 return result;
47 } 60 }
48 61
(...skipping 22 matching lines...) Expand all
71 void WebSourceBufferImpl::setAppendWindowEnd(double end) { 84 void WebSourceBufferImpl::setAppendWindowEnd(double end) {
72 demuxer_->SetAppendWindowEnd(id_, DoubleToTimeDelta(end)); 85 demuxer_->SetAppendWindowEnd(id_, DoubleToTimeDelta(end));
73 } 86 }
74 87
75 void WebSourceBufferImpl::removedFromMediaSource() { 88 void WebSourceBufferImpl::removedFromMediaSource() {
76 demuxer_->RemoveId(id_); 89 demuxer_->RemoveId(id_);
77 demuxer_ = NULL; 90 demuxer_ = NULL;
78 } 91 }
79 92
80 } // namespace content 93 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/websourcebuffer_impl.h ('k') | media/filters/chunk_demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698