| 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_MP4_AAC_H_ | 5 #ifndef MEDIA_FORMATS_MP4_AAC_H_ |
| 6 #define MEDIA_FORMATS_MP4_AAC_H_ | 6 #define MEDIA_FORMATS_MP4_AAC_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 8 #include <vector> | 10 #include <vector> |
| 9 | 11 |
| 12 #include "build/build_config.h" |
| 10 #include "media/base/channel_layout.h" | 13 #include "media/base/channel_layout.h" |
| 11 #include "media/base/media_export.h" | 14 #include "media/base/media_export.h" |
| 12 #include "media/base/media_log.h" | 15 #include "media/base/media_log.h" |
| 13 | 16 |
| 14 namespace media { | 17 namespace media { |
| 15 | 18 |
| 16 class BitReader; | 19 class BitReader; |
| 17 | 20 |
| 18 namespace mp4 { | 21 namespace mp4 { |
| 19 | 22 |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 int frequency_; | 86 int frequency_; |
| 84 int extension_frequency_; | 87 int extension_frequency_; |
| 85 ChannelLayout channel_layout_; | 88 ChannelLayout channel_layout_; |
| 86 }; | 89 }; |
| 87 | 90 |
| 88 } // namespace mp4 | 91 } // namespace mp4 |
| 89 | 92 |
| 90 } // namespace media | 93 } // namespace media |
| 91 | 94 |
| 92 #endif // MEDIA_FORMATS_MP4_AAC_H_ | 95 #endif // MEDIA_FORMATS_MP4_AAC_H_ |
| 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