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

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

Powered by Google App Engine
This is Rietveld 408576698