| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_ | 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_ |
| 6 #define MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_ | 6 #define MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| 11 #include <string> | 11 #include <string> |
| 12 | 12 |
| 13 #include "base/macros.h" |
| 13 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
| 14 #include "media/base/audio_decoder_config.h" | 15 #include "media/base/audio_decoder_config.h" |
| 15 #include "media/base/media_export.h" | 16 #include "media/base/media_export.h" |
| 16 #include "media/base/media_log.h" | 17 #include "media/base/media_log.h" |
| 17 #include "media/base/stream_parser.h" | 18 #include "media/base/stream_parser.h" |
| 18 #include "media/base/stream_parser_buffer.h" | 19 #include "media/base/stream_parser_buffer.h" |
| 19 #include "media/formats/webm/webm_parser.h" | 20 #include "media/formats/webm/webm_parser.h" |
| 20 #include "media/formats/webm/webm_tracks_parser.h" | 21 #include "media/formats/webm/webm_tracks_parser.h" |
| 21 | 22 |
| 22 namespace media { | 23 namespace media { |
| (...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 DecodeTimestamp ready_buffer_upper_bound_; | 317 DecodeTimestamp ready_buffer_upper_bound_; |
| 317 | 318 |
| 318 scoped_refptr<MediaLog> media_log_; | 319 scoped_refptr<MediaLog> media_log_; |
| 319 | 320 |
| 320 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMClusterParser); | 321 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMClusterParser); |
| 321 }; | 322 }; |
| 322 | 323 |
| 323 } // namespace media | 324 } // namespace media |
| 324 | 325 |
| 325 #endif // MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_ | 326 #endif // MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_ |
| OLD | NEW |