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

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

Issue 19649007: Update the WebMediaSourceClientImpl & ChunkDemuxer to received explicit end of stream cancellation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make chromium style enforcers happy Created 7 years, 5 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 | « content/renderer/media/webmediasourceclient_impl.cc ('k') | 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 // Notifies the demuxer that the duration of the media has changed to 117 // Notifies the demuxer that the duration of the media has changed to
118 // |duration|. 118 // |duration|.
119 void SetDuration(double duration); 119 void SetDuration(double duration);
120 120
121 // Sets a time |offset| to be applied to subsequent buffers appended to the 121 // Sets a time |offset| to be applied to subsequent buffers appended to the
122 // source buffer assicated with |id|. Returns true if the offset is set 122 // source buffer assicated with |id|. Returns true if the offset is set
123 // properly, false if the offset cannot be applied because we're in the 123 // properly, false if the offset cannot be applied because we're in the
124 // middle of parsing a media segment. 124 // middle of parsing a media segment.
125 bool SetTimestampOffset(const std::string& id, base::TimeDelta offset); 125 bool SetTimestampOffset(const std::string& id, base::TimeDelta offset);
126 126
127 // Signals an EndOfStream request. 127 // Called to signal changes in the "end of stream"
128 void EndOfStream(PipelineStatus status); 128 // state. UnmarkEndOfStream() must not be called if a matching
129 // MarkEndOfStream() has not come before it.
130 void MarkEndOfStream(PipelineStatus status);
131 void UnmarkEndOfStream();
132
129 void Shutdown(); 133 void Shutdown();
130 134
131 void SetMemoryLimitsForTesting(int memory_limit); 135 void SetMemoryLimitsForTesting(int memory_limit);
132 136
133 private: 137 private:
134 enum State { 138 enum State {
135 WAITING_FOR_INIT, 139 WAITING_FOR_INIT,
136 INITIALIZING, 140 INITIALIZING,
137 INITIALIZED, 141 INITIALIZED,
138 ENDED, 142 ENDED,
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 // removed with RemoveID() but can not be re-added (yet). 249 // removed with RemoveID() but can not be re-added (yet).
246 std::string source_id_audio_; 250 std::string source_id_audio_;
247 std::string source_id_video_; 251 std::string source_id_video_;
248 252
249 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer); 253 DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
250 }; 254 };
251 255
252 } // namespace media 256 } // namespace media
253 257
254 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_ 258 #endif // MEDIA_FILTERS_CHUNK_DEMUXER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/webmediasourceclient_impl.cc ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698