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

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

Issue 110693007: Fix various operations in ChunkDemuxer that were not being applied to text tracks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « 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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 211
212 // Aborts pending reads on all DemuxerStreams. 212 // Aborts pending reads on all DemuxerStreams.
213 void AbortPendingReads(); 213 void AbortPendingReads();
214 214
215 // Completes any pending reads if it is possible to do so. 215 // Completes any pending reads if it is possible to do so.
216 void CompletePendingReadsIfPossible(); 216 void CompletePendingReadsIfPossible();
217 217
218 // Seeks all SourceBufferStreams to |seek_time|. 218 // Seeks all SourceBufferStreams to |seek_time|.
219 void SeekAllSources(base::TimeDelta seek_time); 219 void SeekAllSources(base::TimeDelta seek_time);
220 220
221 // Calls Shutdown() on all DemuxerStreams.
222 void ShutdownAllStreams();
223
221 mutable base::Lock lock_; 224 mutable base::Lock lock_;
222 State state_; 225 State state_;
223 bool cancel_next_seek_; 226 bool cancel_next_seek_;
224 227
225 DemuxerHost* host_; 228 DemuxerHost* host_;
226 base::Closure open_cb_; 229 base::Closure open_cb_;
227 NeedKeyCB need_key_cb_; 230 NeedKeyCB need_key_cb_;
228 bool enable_text_; 231 bool enable_text_;
229 // Callback used to report error strings that can help the web developer 232 // Callback used to report error strings that can help the web developer
230 // figure out what is wrong with the content. 233 // figure out what is wrong with the content.
(...skipping 29 matching lines...) Expand all
260 // removed with RemoveID() but can not be re-added (yet). 263 // removed with RemoveID() but can not be re-added (yet).
261 std::string source_id_audio_; 264 std::string source_id_audio_;
262 std::string source_id_video_; 265 std::string source_id_video_;
263 266
264 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); 267 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
265 }; 268 };
266 269
267 } // namespace media 270 } // namespace media
268 271
269 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ 272 #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