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_BOX_DEFINITIONS_H_ | 5 #ifndef MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ |
6 #define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ | 6 #define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
13 #include "media/base/media_export.h" | 13 #include "media/base/media_export.h" |
14 #include "media/base/media_log.h" | |
DaleCurtis
2015/05/15 18:59:16
Is this necessary?
wolenetz
2015/05/15 19:02:27
Only for style. LogCB was previously used, below,
| |
14 #include "media/formats/mp4/aac.h" | 15 #include "media/formats/mp4/aac.h" |
15 #include "media/formats/mp4/avc.h" | 16 #include "media/formats/mp4/avc.h" |
16 #include "media/formats/mp4/box_reader.h" | 17 #include "media/formats/mp4/box_reader.h" |
17 #include "media/formats/mp4/fourccs.h" | 18 #include "media/formats/mp4/fourccs.h" |
18 | 19 |
19 namespace media { | 20 namespace media { |
20 namespace mp4 { | 21 namespace mp4 { |
21 | 22 |
22 enum TrackType { | 23 enum TrackType { |
23 kInvalid = 0, | 24 kInvalid = 0, |
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
428 std::vector<TrackFragment> tracks; | 429 std::vector<TrackFragment> tracks; |
429 std::vector<ProtectionSystemSpecificHeader> pssh; | 430 std::vector<ProtectionSystemSpecificHeader> pssh; |
430 }; | 431 }; |
431 | 432 |
432 #undef DECLARE_BOX | 433 #undef DECLARE_BOX |
433 | 434 |
434 } // namespace mp4 | 435 } // namespace mp4 |
435 } // namespace media | 436 } // namespace media |
436 | 437 |
437 #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ | 438 #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ |
OLD | NEW |