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

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

Issue 16867010: Move pending seek cancellation logic from ChunkDemuxerStream to ChunkDemuxer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | « no previous file | media/filters/chunk_demuxer.cc » ('j') | media/filters/chunk_demuxer.cc » ('J')
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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 169
170 // Sets |duration_| to |new_duration|, sets |user_specified_duration_| to -1 170 // Sets |duration_| to |new_duration|, sets |user_specified_duration_| to -1
171 // and notifies |host_|. 171 // and notifies |host_|.
172 void UpdateDuration(base::TimeDelta new_duration); 172 void UpdateDuration(base::TimeDelta new_duration);
173 173
174 // Returns the ranges representing the buffered data in the demuxer. 174 // Returns the ranges representing the buffered data in the demuxer.
175 Ranges<base::TimeDelta> GetBufferedRanges() const; 175 Ranges<base::TimeDelta> GetBufferedRanges() const;
176 176
177 mutable base::Lock lock_; 177 mutable base::Lock lock_;
178 State state_; 178 State state_;
179 bool cancel_next_seek_;
179 180
180 DemuxerHost* host_; 181 DemuxerHost* host_;
181 base::Closure open_cb_; 182 base::Closure open_cb_;
182 NeedKeyCB need_key_cb_; 183 NeedKeyCB need_key_cb_;
183 AddTextTrackCB add_text_track_cb_; 184 AddTextTrackCB add_text_track_cb_;
184 // Callback used to report error strings that can help the web developer 185 // Callback used to report error strings that can help the web developer
185 // figure out what is wrong with the content. 186 // figure out what is wrong with the content.
186 LogCB log_cb_; 187 LogCB log_cb_;
187 188
188 PipelineStatusCB init_cb_; 189 PipelineStatusCB init_cb_;
(...skipping 22 matching lines...) Expand all
211 // removed with RemoveID() but can not be re-added (yet). 212 // removed with RemoveID() but can not be re-added (yet).
212 std::string source_id_audio_; 213 std::string source_id_audio_;
213 std::string source_id_video_; 214 std::string source_id_video_;
214 215
215 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); 216 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
216 }; 217 };
217 218
218 } // namespace media 219 } // namespace media
219 220
220 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ 221 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_
OLDNEW
« no previous file with comments | « no previous file | media/filters/chunk_demuxer.cc » ('j') | media/filters/chunk_demuxer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698