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

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

Issue 2050043002: Generate and assign media track ids in demuxers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-streamparser-trackid
Patch Set: rebase Created 4 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
OLDNEW
1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2016 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_MEDIA_SOURCE_STATE_H_ 5 #ifndef MEDIA_FILTERS_MEDIA_SOURCE_STATE_H_
6 #define MEDIA_FILTERS_MEDIA_SOURCE_STATE_H_ 6 #define MEDIA_FILTERS_MEDIA_SOURCE_STATE_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 184
185 // Valid only while |parsing_media_segment_| is true. These flags enable 185 // Valid only while |parsing_media_segment_| is true. These flags enable
186 // warning when at least one frame for each A/V track is not in a parsed media 186 // warning when at least one frame for each A/V track is not in a parsed media
187 // segment. 187 // segment.
188 bool media_segment_contained_audio_frame_; 188 bool media_segment_contained_audio_frame_;
189 bool media_segment_contained_video_frame_; 189 bool media_segment_contained_video_frame_;
190 190
191 // The object used to parse appended data. 191 // The object used to parse appended data.
192 std::unique_ptr<StreamParser> stream_parser_; 192 std::unique_ptr<StreamParser> stream_parser_;
193 193
194 std::unique_ptr<MediaTracks> media_tracks_;
195
196 ChunkDemuxerStream* audio_; // Not owned by |this|. 194 ChunkDemuxerStream* audio_; // Not owned by |this|.
197 ChunkDemuxerStream* video_; // Not owned by |this|. 195 ChunkDemuxerStream* video_; // Not owned by |this|.
198 196
199 typedef std::map<StreamParser::TrackId, ChunkDemuxerStream*> TextStreamMap; 197 typedef std::map<StreamParser::TrackId, ChunkDemuxerStream*> TextStreamMap;
200 TextStreamMap text_stream_map_; // |this| owns the map's stream pointers. 198 TextStreamMap text_stream_map_; // |this| owns the map's stream pointers.
201 199
202 std::unique_ptr<FrameProcessor> frame_processor_; 200 std::unique_ptr<FrameProcessor> frame_processor_;
203 scoped_refptr<MediaLog> media_log_; 201 scoped_refptr<MediaLog> media_log_;
204 StreamParser::InitCB init_cb_; 202 StreamParser::InitCB init_cb_;
205 203
(...skipping 13 matching lines...) Expand all
219 // TODO(wolenetz): Refactor this function while integrating April 29, 2014 217 // TODO(wolenetz): Refactor this function while integrating April 29, 2014
220 // changes to MSE spec. See http://crbug.com/371499. 218 // changes to MSE spec. See http://crbug.com/371499.
221 bool auto_update_timestamp_offset_; 219 bool auto_update_timestamp_offset_;
222 220
223 DISALLOW_COPY_AND_ASSIGN(MediaSourceState); 221 DISALLOW_COPY_AND_ASSIGN(MediaSourceState);
224 }; 222 };
225 223
226 } // namespace media 224 } // namespace media
227 225
228 #endif // MEDIA_FILTERS_MEDIA_SOURCE_STATE_H_ 226 #endif // MEDIA_FILTERS_MEDIA_SOURCE_STATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698