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

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: 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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 183
184 // Valid only while |parsing_media_segment_| is true. These flags enable 184 // Valid only while |parsing_media_segment_| is true. These flags enable
185 // warning when at least one frame for each A/V track is not in a parsed media 185 // warning when at least one frame for each A/V track is not in a parsed media
186 // segment. 186 // segment.
187 bool media_segment_contained_audio_frame_; 187 bool media_segment_contained_audio_frame_;
188 bool media_segment_contained_video_frame_; 188 bool media_segment_contained_video_frame_;
189 189
190 // The object used to parse appended data. 190 // The object used to parse appended data.
191 std::unique_ptr<StreamParser> stream_parser_; 191 std::unique_ptr<StreamParser> stream_parser_;
192 192
193 std::unique_ptr<MediaTracks> media_tracks_;
194
195 ChunkDemuxerStream* audio_; // Not owned by |this|. 193 ChunkDemuxerStream* audio_; // Not owned by |this|.
196 ChunkDemuxerStream* video_; // Not owned by |this|. 194 ChunkDemuxerStream* video_; // Not owned by |this|.
197 195
198 typedef std::map<StreamParser::TrackId, ChunkDemuxerStream*> TextStreamMap; 196 typedef std::map<StreamParser::TrackId, ChunkDemuxerStream*> TextStreamMap;
199 TextStreamMap text_stream_map_; // |this| owns the map's stream pointers. 197 TextStreamMap text_stream_map_; // |this| owns the map's stream pointers.
200 198
201 std::unique_ptr<FrameProcessor> frame_processor_; 199 std::unique_ptr<FrameProcessor> frame_processor_;
202 scoped_refptr<MediaLog> media_log_; 200 scoped_refptr<MediaLog> media_log_;
203 StreamParser::InitCB init_cb_; 201 StreamParser::InitCB init_cb_;
204 202
(...skipping 13 matching lines...) Expand all
218 // TODO(wolenetz): Refactor this function while integrating April 29, 2014 216 // TODO(wolenetz): Refactor this function while integrating April 29, 2014
219 // changes to MSE spec. See http://crbug.com/371499. 217 // changes to MSE spec. See http://crbug.com/371499.
220 bool auto_update_timestamp_offset_; 218 bool auto_update_timestamp_offset_;
221 219
222 DISALLOW_COPY_AND_ASSIGN(MediaSourceState); 220 DISALLOW_COPY_AND_ASSIGN(MediaSourceState);
223 }; 221 };
224 222
225 } // namespace media 223 } // namespace media
226 224
227 #endif // MEDIA_FILTERS_MEDIA_SOURCE_STATE_H_ 225 #endif // MEDIA_FILTERS_MEDIA_SOURCE_STATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698