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

Side by Side Diff: media/filters/chunk_demuxer.h

Issue 575643002: Initialize media timeline correctly for positive start times. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments. Created 6 years, 3 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
« no previous file with comments | « media/base/pipeline_unittest.cc ('k') | media/filters/chunk_demuxer.cc » ('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 (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 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_ 5 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_
6 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_ 6 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 virtual ~ChunkDemuxer(); 157 virtual ~ChunkDemuxer();
158 158
159 // Demuxer implementation. 159 // Demuxer implementation.
160 virtual void Initialize(DemuxerHost* host, 160 virtual void Initialize(DemuxerHost* host,
161 const PipelineStatusCB& cb, 161 const PipelineStatusCB& cb,
162 bool enable_text_tracks) OVERRIDE; 162 bool enable_text_tracks) OVERRIDE;
163 virtual void Stop() OVERRIDE; 163 virtual void Stop() OVERRIDE;
164 virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE; 164 virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE;
165 virtual base::Time GetTimelineOffset() const OVERRIDE; 165 virtual base::Time GetTimelineOffset() const OVERRIDE;
166 virtual DemuxerStream* GetStream(DemuxerStream::Type type) OVERRIDE; 166 virtual DemuxerStream* GetStream(DemuxerStream::Type type) OVERRIDE;
167 virtual base::TimeDelta GetStartTime() const OVERRIDE;
167 virtual Liveness GetLiveness() const OVERRIDE; 168 virtual Liveness GetLiveness() const OVERRIDE;
168 169
169 // Methods used by an external object to control this demuxer. 170 // Methods used by an external object to control this demuxer.
170 // 171 //
171 // Indicates that a new Seek() call is on its way. Any pending Reads on the 172 // Indicates that a new Seek() call is on its way. Any pending Reads on the
172 // DemuxerStream objects should be aborted immediately inside this call and 173 // DemuxerStream objects should be aborted immediately inside this call and
173 // future Read calls should return kAborted until the Seek() call occurs. 174 // future Read calls should return kAborted until the Seek() call occurs.
174 // This method MUST ALWAYS be called before Seek() is called to signal that 175 // This method MUST ALWAYS be called before Seek() is called to signal that
175 // the next Seek() call represents the seek point we actually want to return 176 // the next Seek() call represents the seek point we actually want to return
176 // data for. 177 // data for.
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 392
392 // Indicates that splice frame generation is enabled. 393 // Indicates that splice frame generation is enabled.
393 const bool splice_frames_enabled_; 394 const bool splice_frames_enabled_;
394 395
395 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); 396 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
396 }; 397 };
397 398
398 } // namespace media 399 } // namespace media
399 400
400 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ 401 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_
OLDNEW
« no previous file with comments | « media/base/pipeline_unittest.cc ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698