| OLD | NEW |
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_HEVC_H_ | 5 #ifndef MEDIA_FORMATS_MP4_HEVC_H_ |
| 6 #define MEDIA_FORMATS_MP4_HEVC_H_ | 6 #define MEDIA_FORMATS_MP4_HEVC_H_ |
| 7 | 7 |
| 8 #include <stddef.h> |
| 9 #include <stdint.h> |
| 10 |
| 8 #include <vector> | 11 #include <vector> |
| 9 | 12 |
| 10 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 11 #include "media/base/media_export.h" | 14 #include "media/base/media_export.h" |
| 12 #include "media/formats/mp4/bitstream_converter.h" | 15 #include "media/formats/mp4/bitstream_converter.h" |
| 13 #include "media/formats/mp4/box_definitions.h" | 16 #include "media/formats/mp4/box_definitions.h" |
| 14 | 17 |
| 15 namespace media { | 18 namespace media { |
| 16 | 19 |
| 17 struct SubsampleEntry; | 20 struct SubsampleEntry; |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 | 101 |
| 99 private: | 102 private: |
| 100 ~HEVCBitstreamConverter() override; | 103 ~HEVCBitstreamConverter() override; |
| 101 scoped_ptr<HEVCDecoderConfigurationRecord> hevc_config_; | 104 scoped_ptr<HEVCDecoderConfigurationRecord> hevc_config_; |
| 102 }; | 105 }; |
| 103 | 106 |
| 104 } // namespace mp4 | 107 } // namespace mp4 |
| 105 } // namespace media | 108 } // namespace media |
| 106 | 109 |
| 107 #endif // MEDIA_FORMATS_MP4_HEVC_H_ | 110 #endif // MEDIA_FORMATS_MP4_HEVC_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