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

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

Issue 10835044: Cancel pending seek in ChunkDemuxer when a new seek occurs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: response to CR Created 8 years, 4 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 | « no previous file | 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 <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 29 matching lines...) Expand all
40 const PipelineStatusCB& cb) OVERRIDE; 40 const PipelineStatusCB& cb) OVERRIDE;
41 virtual void Stop(const base::Closure& callback) OVERRIDE; 41 virtual void Stop(const base::Closure& callback) OVERRIDE;
42 virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE; 42 virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE;
43 virtual void OnAudioRendererDisabled() OVERRIDE; 43 virtual void OnAudioRendererDisabled() OVERRIDE;
44 virtual scoped_refptr<DemuxerStream> GetStream( 44 virtual scoped_refptr<DemuxerStream> GetStream(
45 DemuxerStream::Type type) OVERRIDE; 45 DemuxerStream::Type type) OVERRIDE;
46 virtual base::TimeDelta GetStartTime() const OVERRIDE; 46 virtual base::TimeDelta GetStartTime() const OVERRIDE;
47 47
48 // Methods used by an external object to control this demuxer. 48 // Methods used by an external object to control this demuxer.
49 void StartWaitingForSeek(); 49 void StartWaitingForSeek();
50 void CancelPendingSeek();
50 51
51 // Registers a new |id| to use for AppendData() calls. |type| indicates 52 // Registers a new |id| to use for AppendData() calls. |type| indicates
52 // the MIME type for the data that we intend to append for this ID. 53 // the MIME type for the data that we intend to append for this ID.
53 // kOk is returned if the demuxer has enough resources to support another ID 54 // kOk is returned if the demuxer has enough resources to support another ID
54 // and supports the format indicated by |type|. 55 // and supports the format indicated by |type|.
55 // kNotSupported is returned if |type| is not a supported format. 56 // kNotSupported is returned if |type| is not a supported format.
56 // kReachedIdLimit is returned if the demuxer cannot handle another ID right 57 // kReachedIdLimit is returned if the demuxer cannot handle another ID right
57 // now. 58 // now.
58 Status AddId(const std::string& id, const std::string& type, 59 Status AddId(const std::string& id, const std::string& type,
59 std::vector<std::string>& codecs); 60 std::vector<std::string>& codecs);
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 std::string source_id_video_; 184 std::string source_id_video_;
184 185
185 base::TimeDelta start_time_; 186 base::TimeDelta start_time_;
186 187
187 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); 188 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
188 }; 189 };
189 190
190 } // namespace media 191 } // namespace media
191 192
192 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ 193 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_
OLDNEW
« no previous file with comments | « no previous file | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698