OLD | NEW |
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 <stddef.h> |
| 9 #include <stdint.h> |
| 10 |
8 #include <deque> | 11 #include <deque> |
9 #include <map> | 12 #include <map> |
10 #include <string> | 13 #include <string> |
11 #include <vector> | 14 #include <vector> |
12 | 15 |
13 #include "base/callback_forward.h" | 16 #include "base/callback_forward.h" |
14 #include "base/macros.h" | 17 #include "base/macros.h" |
15 #include "base/memory/ref_counted.h" | 18 #include "base/memory/ref_counted.h" |
16 #include "base/memory/scoped_ptr.h" | 19 #include "base/memory/scoped_ptr.h" |
17 #include "base/time/time.h" | 20 #include "base/time/time.h" |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 // subtle issues with tie-breaking. See http://crbug.com/338484. | 158 // subtle issues with tie-breaking. See http://crbug.com/338484. |
156 MEDIA_EXPORT bool MergeBufferQueues( | 159 MEDIA_EXPORT bool MergeBufferQueues( |
157 const StreamParser::BufferQueue& audio_buffers, | 160 const StreamParser::BufferQueue& audio_buffers, |
158 const StreamParser::BufferQueue& video_buffers, | 161 const StreamParser::BufferQueue& video_buffers, |
159 const StreamParser::TextBufferQueueMap& text_buffers, | 162 const StreamParser::TextBufferQueueMap& text_buffers, |
160 StreamParser::BufferQueue* merged_buffers); | 163 StreamParser::BufferQueue* merged_buffers); |
161 | 164 |
162 } // namespace media | 165 } // namespace media |
163 | 166 |
164 #endif // MEDIA_BASE_STREAM_PARSER_H_ | 167 #endif // MEDIA_BASE_STREAM_PARSER_H_ |
OLD | NEW |