| 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_ES_PARSER_ADTS_H_ | 5 #ifndef MEDIA_FORMATS_MP2T_ES_PARSER_ADTS_H_ |
| 6 #define MEDIA_FORMATS_MP2T_ES_PARSER_ADTS_H_ | 6 #define MEDIA_FORMATS_MP2T_ES_PARSER_ADTS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 8 #include <list> | 10 #include <list> |
| 9 #include <utility> | 11 #include <utility> |
| 10 | 12 |
| 11 #include "base/callback.h" | 13 #include "base/callback.h" |
| 12 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
| 13 #include "base/macros.h" | 15 #include "base/macros.h" |
| 14 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
| 15 #include "base/time/time.h" | 17 #include "base/time/time.h" |
| 16 #include "media/base/audio_decoder_config.h" | 18 #include "media/base/audio_decoder_config.h" |
| 17 #include "media/base/media_export.h" | 19 #include "media/base/media_export.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 // Last audio config. | 79 // Last audio config. |
| 78 AudioDecoderConfig last_audio_decoder_config_; | 80 AudioDecoderConfig last_audio_decoder_config_; |
| 79 | 81 |
| 80 DISALLOW_COPY_AND_ASSIGN(EsParserAdts); | 82 DISALLOW_COPY_AND_ASSIGN(EsParserAdts); |
| 81 }; | 83 }; |
| 82 | 84 |
| 83 } // namespace mp2t | 85 } // namespace mp2t |
| 84 } // namespace media | 86 } // namespace media |
| 85 | 87 |
| 86 #endif | 88 #endif |
| 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