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

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

Issue 1861963008: Use StreamParser::TrackId instead of string for MediaTrack::byteStreamTrackId (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include <algorithm> into stream_parser_buffer.cc 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/ffmpeg_demuxer_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"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "media/base/demuxer_stream.h" 12 #include "media/base/demuxer_stream.h"
13 #include "media/base/media_export.h" 13 #include "media/base/media_export.h"
14 #include "media/base/media_log.h"
14 #include "media/base/stream_parser.h" 15 #include "media/base/stream_parser.h"
15 #include "media/base/stream_parser_buffer.h" 16 #include "media/base/stream_parser_buffer.h"
16 17
17 namespace media { 18 namespace media {
18 19
19 using base::TimeDelta; 20 using base::TimeDelta;
20 21
21 class ChunkDemuxerStream; 22 class ChunkDemuxerStream;
22 class FrameProcessor; 23 class FrameProcessor;
23 24
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 // TODO(wolenetz): Refactor this function while integrating April 29, 2014 219 // TODO(wolenetz): Refactor this function while integrating April 29, 2014
219 // changes to MSE spec. See http://crbug.com/371499. 220 // changes to MSE spec. See http://crbug.com/371499.
220 bool auto_update_timestamp_offset_; 221 bool auto_update_timestamp_offset_;
221 222
222 DISALLOW_COPY_AND_ASSIGN(MediaSourceState); 223 DISALLOW_COPY_AND_ASSIGN(MediaSourceState);
223 }; 224 };
224 225
225 } // namespace media 226 } // namespace media
226 227
227 #endif // MEDIA_FILTERS_MEDIA_SOURCE_STATE_H_ 228 #endif // MEDIA_FILTERS_MEDIA_SOURCE_STATE_H_
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/media_source_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698