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

Side by Side Diff: media/base/stream_parser.h

Issue 1535193003: Add missing macros includes in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/base/sinc_resampler.h ('k') | media/base/stream_parser_buffer.h » ('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_BASE_STREAM_PARSER_H_ 5 #ifndef MEDIA_BASE_STREAM_PARSER_H_
6 #define MEDIA_BASE_STREAM_PARSER_H_ 6 #define MEDIA_BASE_STREAM_PARSER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/callback_forward.h" 13 #include "base/callback_forward.h"
14 #include "base/macros.h"
14 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
16 #include "base/time/time.h" 17 #include "base/time/time.h"
17 #include "media/base/demuxer_stream.h" 18 #include "media/base/demuxer_stream.h"
18 #include "media/base/eme_constants.h" 19 #include "media/base/eme_constants.h"
19 #include "media/base/media_export.h" 20 #include "media/base/media_export.h"
20 #include "media/base/media_log.h" 21 #include "media/base/media_log.h"
21 22
22 namespace media { 23 namespace media {
23 24
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 // subtle issues with tie-breaking. See http://crbug.com/338484. 155 // subtle issues with tie-breaking. See http://crbug.com/338484.
155 MEDIA_EXPORT bool MergeBufferQueues( 156 MEDIA_EXPORT bool MergeBufferQueues(
156 const StreamParser::BufferQueue& audio_buffers, 157 const StreamParser::BufferQueue& audio_buffers,
157 const StreamParser::BufferQueue& video_buffers, 158 const StreamParser::BufferQueue& video_buffers,
158 const StreamParser::TextBufferQueueMap& text_buffers, 159 const StreamParser::TextBufferQueueMap& text_buffers,
159 StreamParser::BufferQueue* merged_buffers); 160 StreamParser::BufferQueue* merged_buffers);
160 161
161 } // namespace media 162 } // namespace media
162 163
163 #endif // MEDIA_BASE_STREAM_PARSER_H_ 164 #endif // MEDIA_BASE_STREAM_PARSER_H_
OLDNEW
« no previous file with comments | « media/base/sinc_resampler.h ('k') | media/base/stream_parser_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698