| 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_MP2T_MP2T_STREAM_PARSER_H_ | 5 #ifndef MEDIA_FORMATS_MP2T_MP2T_STREAM_PARSER_H_ |
| 6 #define MEDIA_FORMATS_MP2T_MP2T_STREAM_PARSER_H_ | 6 #define MEDIA_FORMATS_MP2T_MP2T_STREAM_PARSER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 8 #include <list> | 10 #include <list> |
| 9 #include <map> | 11 #include <map> |
| 10 | 12 |
| 11 #include "base/macros.h" | 13 #include "base/macros.h" |
| 12 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
| 13 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 14 #include "media/base/audio_decoder_config.h" | 16 #include "media/base/audio_decoder_config.h" |
| 15 #include "media/base/byte_queue.h" | 17 #include "media/base/byte_queue.h" |
| 16 #include "media/base/media_export.h" | 18 #include "media/base/media_export.h" |
| 17 #include "media/base/stream_parser.h" | 19 #include "media/base/stream_parser.h" |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 TimestampUnroller timestamp_unroller_; | 134 TimestampUnroller timestamp_unroller_; |
| 133 | 135 |
| 134 DISALLOW_COPY_AND_ASSIGN(Mp2tStreamParser); | 136 DISALLOW_COPY_AND_ASSIGN(Mp2tStreamParser); |
| 135 }; | 137 }; |
| 136 | 138 |
| 137 } // namespace mp2t | 139 } // namespace mp2t |
| 138 } // namespace media | 140 } // namespace media |
| 139 | 141 |
| 140 #endif | 142 #endif |
| 141 | 143 |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1542013004:
Switch to standard integer types in media/, take 2. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master