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

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

Issue 334163002: Revert of Fix seeking when the start time is non-zero. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | « 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 bool splice_frames_enabled); 154 bool splice_frames_enabled);
155 virtual ~ChunkDemuxer(); 155 virtual ~ChunkDemuxer();
156 156
157 // Demuxer implementation. 157 // Demuxer implementation.
158 virtual void Initialize(DemuxerHost* host, 158 virtual void Initialize(DemuxerHost* host,
159 const PipelineStatusCB& cb, 159 const PipelineStatusCB& cb,
160 bool enable_text_tracks) OVERRIDE; 160 bool enable_text_tracks) OVERRIDE;
161 virtual void Stop(const base::Closure& callback) OVERRIDE; 161 virtual void Stop(const base::Closure& callback) OVERRIDE;
162 virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE; 162 virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE;
163 virtual DemuxerStream* GetStream(DemuxerStream::Type type) OVERRIDE; 163 virtual DemuxerStream* GetStream(DemuxerStream::Type type) OVERRIDE;
164 virtual base::TimeDelta GetStartTime() const OVERRIDE;
164 virtual base::Time GetTimelineOffset() const OVERRIDE; 165 virtual base::Time GetTimelineOffset() const OVERRIDE;
165 virtual Liveness GetLiveness() const OVERRIDE; 166 virtual Liveness GetLiveness() const OVERRIDE;
166 167
167 // Methods used by an external object to control this demuxer. 168 // Methods used by an external object to control this demuxer.
168 // 169 //
169 // Indicates that a new Seek() call is on its way. Any pending Reads on the 170 // Indicates that a new Seek() call is on its way. Any pending Reads on the
170 // DemuxerStream objects should be aborted immediately inside this call and 171 // DemuxerStream objects should be aborted immediately inside this call and
171 // future Read calls should return kAborted until the Seek() call occurs. 172 // future Read calls should return kAborted until the Seek() call occurs.
172 // This method MUST ALWAYS be called before Seek() is called to signal that 173 // This method MUST ALWAYS be called before Seek() is called to signal that
173 // the next Seek() call represents the seek point we actually want to return 174 // the next Seek() call represents the seek point we actually want to return
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 389
389 // Indicates that splice frame generation is enabled. 390 // Indicates that splice frame generation is enabled.
390 const bool splice_frames_enabled_; 391 const bool splice_frames_enabled_;
391 392
392 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); 393 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
393 }; 394 };
394 395
395 } // namespace media 396 } // namespace media
396 397
397 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ 398 #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