| 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 <deque> | 8 #include <deque> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 // Stream duration. | 53 // Stream duration. |
| 54 base::TimeDelta duration; | 54 base::TimeDelta duration; |
| 55 | 55 |
| 56 // Indicates the source time associated with presentation timestamp 0. A | 56 // Indicates the source time associated with presentation timestamp 0. A |
| 57 // null Time is returned if no mapping to Time exists. | 57 // null Time is returned if no mapping to Time exists. |
| 58 base::Time timeline_offset; | 58 base::Time timeline_offset; |
| 59 | 59 |
| 60 // Indicates that timestampOffset should be updated based on the earliest | 60 // Indicates that timestampOffset should be updated based on the earliest |
| 61 // end timestamp (audio or video) provided during each NewBuffersCB. | 61 // end timestamp (audio or video) provided during each NewBuffersCB. |
| 62 bool auto_update_timestamp_offset; | 62 bool auto_update_timestamp_offset; |
| 63 |
| 64 // Indicates live stream. |
| 65 Demuxer::Liveness liveness; |
| 63 }; | 66 }; |
| 64 | 67 |
| 65 // Indicates completion of parser initialization. | 68 // Indicates completion of parser initialization. |
| 66 // success - True if initialization was successful. | 69 // success - True if initialization was successful. |
| 67 // params - Stream parameters, in case of successful initialization. | 70 // params - Stream parameters, in case of successful initialization. |
| 68 typedef base::Callback<void(bool success, | 71 typedef base::Callback<void(bool success, |
| 69 const InitParameters& params)> InitCB; | 72 const InitParameters& params)> InitCB; |
| 70 | 73 |
| 71 // Indicates when new stream configurations have been parsed. | 74 // Indicates when new stream configurations have been parsed. |
| 72 // First parameter - The new audio configuration. If the config is not valid | 75 // First parameter - The new audio configuration. If the config is not valid |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 // subtle issues with tie-breaking. See http://crbug.com/338484. | 153 // subtle issues with tie-breaking. See http://crbug.com/338484. |
| 151 MEDIA_EXPORT bool MergeBufferQueues( | 154 MEDIA_EXPORT bool MergeBufferQueues( |
| 152 const StreamParser::BufferQueue& audio_buffers, | 155 const StreamParser::BufferQueue& audio_buffers, |
| 153 const StreamParser::BufferQueue& video_buffers, | 156 const StreamParser::BufferQueue& video_buffers, |
| 154 const StreamParser::TextBufferQueueMap& text_buffers, | 157 const StreamParser::TextBufferQueueMap& text_buffers, |
| 155 StreamParser::BufferQueue* merged_buffers); | 158 StreamParser::BufferQueue* merged_buffers); |
| 156 | 159 |
| 157 } // namespace media | 160 } // namespace media |
| 158 | 161 |
| 159 #endif // MEDIA_BASE_STREAM_PARSER_H_ | 162 #endif // MEDIA_BASE_STREAM_PARSER_H_ |
| OLD | NEW |