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

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

Issue 17261029: Fix ChunkDemuxer seek and init callback dispatch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address CR comment 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') | 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 SHUTDOWN, 117 SHUTDOWN,
118 }; 118 };
119 119
120 void ChangeState_Locked(State new_state); 120 void ChangeState_Locked(State new_state);
121 121
122 // Reports an error and puts the demuxer in a state where it won't accept more 122 // Reports an error and puts the demuxer in a state where it won't accept more
123 // data. 123 // data.
124 void ReportError_Locked(PipelineStatus error); 124 void ReportError_Locked(PipelineStatus error);
125 125
126 // Returns true if any stream has seeked to a time without buffered data. 126 // Returns true if any stream has seeked to a time without buffered data.
127 bool IsSeekPending_Locked() const; 127 bool IsSeekWaitingForData_Locked() const;
128 128
129 // Returns true if all streams can successfully call EndOfStream, 129 // Returns true if all streams can successfully call EndOfStream,
130 // false if any can not. 130 // false if any can not.
131 bool CanEndOfStream_Locked() const; 131 bool CanEndOfStream_Locked() const;
132 132
133 // SourceState callbacks. 133 // SourceState callbacks.
134 void OnSourceInitDone(bool success, base::TimeDelta duration); 134 void OnSourceInitDone(bool success, base::TimeDelta duration);
135 bool OnNewConfigs(bool has_audio, bool has_video, 135 bool OnNewConfigs(bool has_audio, bool has_video,
136 const AudioDecoderConfig& audio_config, 136 const AudioDecoderConfig& audio_config,
137 const VideoDecoderConfig& video_config); 137 const VideoDecoderConfig& video_config);
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 // removed with RemoveID() but can not be re-added (yet). 211 // removed with RemoveID() but can not be re-added (yet).
212 std::string source_id_audio_; 212 std::string source_id_audio_;
213 std::string source_id_video_; 213 std::string source_id_video_;
214 214
215 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); 215 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
216 }; 216 };
217 217
218 } // namespace media 218 } // namespace media
219 219
220 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ 220 #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