Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 267 void ReportError_Locked(PipelineStatus error); | 267 void ReportError_Locked(PipelineStatus error); |
| 268 | 268 |
| 269 // Returns true if any stream has seeked to a time without buffered data. | 269 // Returns true if any stream has seeked to a time without buffered data. |
| 270 bool IsSeekWaitingForData_Locked() const; | 270 bool IsSeekWaitingForData_Locked() const; |
| 271 | 271 |
| 272 // Returns true if all streams can successfully call EndOfStream, | 272 // Returns true if all streams can successfully call EndOfStream, |
| 273 // false if any can not. | 273 // false if any can not. |
| 274 bool CanEndOfStream_Locked() const; | 274 bool CanEndOfStream_Locked() const; |
| 275 | 275 |
| 276 // SourceState callbacks. | 276 // SourceState callbacks. |
| 277 void OnSourceInitDone(bool success, base::TimeDelta duration); | 277 void OnSourceInitDone(bool success, |
| 278 base::TimeDelta duration); | |
|
acolwell GONE FROM CHROMIUM
2014/03/18 00:21:54
nit: Revert this change since it fits on one line.
DaleCurtis
2014/03/18 01:26:56
Done.
| |
| 278 | 279 |
| 279 // Creates a DemuxerStream for the specified |type|. | 280 // Creates a DemuxerStream for the specified |type|. |
| 280 // Returns a new ChunkDemuxerStream instance if a stream of this type | 281 // Returns a new ChunkDemuxerStream instance if a stream of this type |
| 281 // has not been created before. Returns NULL otherwise. | 282 // has not been created before. Returns NULL otherwise. |
| 282 ChunkDemuxerStream* CreateDemuxerStream(DemuxerStream::Type type); | 283 ChunkDemuxerStream* CreateDemuxerStream(DemuxerStream::Type type); |
| 283 | 284 |
| 284 void OnNewTextTrack(ChunkDemuxerStream* text_stream, | 285 void OnNewTextTrack(ChunkDemuxerStream* text_stream, |
| 285 const TextTrackConfig& config); | 286 const TextTrackConfig& config); |
| 286 void OnNewMediaSegment(const std::string& source_id, | 287 void OnNewMediaSegment(const std::string& source_id, |
| 287 base::TimeDelta start_timestamp); | 288 base::TimeDelta start_timestamp); |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 365 // removed with RemoveID() but can not be re-added (yet). | 366 // removed with RemoveID() but can not be re-added (yet). |
| 366 std::string source_id_audio_; | 367 std::string source_id_audio_; |
| 367 std::string source_id_video_; | 368 std::string source_id_video_; |
| 368 | 369 |
| 369 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); | 370 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); |
| 370 }; | 371 }; |
| 371 | 372 |
| 372 } // namespace media | 373 } // namespace media |
| 373 | 374 |
| 374 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ | 375 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ |
| OLD | NEW |