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" | 14 #include "media/base/media_log.h" |
| 15 #include "media/base/video_decoder_config.h" |
15 #include "media/formats/mp4/aac.h" | 16 #include "media/formats/mp4/aac.h" |
16 #include "media/formats/mp4/avc.h" | 17 #include "media/formats/mp4/avc.h" |
17 #include "media/formats/mp4/box_reader.h" | 18 #include "media/formats/mp4/box_reader.h" |
18 #include "media/formats/mp4/fourccs.h" | 19 #include "media/formats/mp4/fourccs.h" |
19 | 20 |
20 namespace media { | 21 namespace media { |
21 namespace mp4 { | 22 namespace mp4 { |
22 | 23 |
23 enum TrackType { | 24 enum TrackType { |
24 kInvalid = 0, | 25 kInvalid = 0, |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 DECLARE_BOX_METHODS(VideoSampleEntry); | 201 DECLARE_BOX_METHODS(VideoSampleEntry); |
201 | 202 |
202 FourCC format; | 203 FourCC format; |
203 uint16 data_reference_index; | 204 uint16 data_reference_index; |
204 uint16 width; | 205 uint16 width; |
205 uint16 height; | 206 uint16 height; |
206 | 207 |
207 PixelAspectRatioBox pixel_aspect; | 208 PixelAspectRatioBox pixel_aspect; |
208 ProtectionSchemeInfo sinf; | 209 ProtectionSchemeInfo sinf; |
209 | 210 |
| 211 VideoCodec video_codec; |
| 212 VideoCodecProfile video_codec_profile; |
| 213 |
210 bool IsFormatValid() const; | 214 bool IsFormatValid() const; |
211 | 215 |
212 scoped_refptr<BitstreamConverter> frame_bitstream_converter; | 216 scoped_refptr<BitstreamConverter> frame_bitstream_converter; |
213 }; | 217 }; |
214 | 218 |
215 struct MEDIA_EXPORT ElementaryStreamDescriptor : Box { | 219 struct MEDIA_EXPORT ElementaryStreamDescriptor : Box { |
216 DECLARE_BOX_METHODS(ElementaryStreamDescriptor); | 220 DECLARE_BOX_METHODS(ElementaryStreamDescriptor); |
217 | 221 |
218 uint8 object_type; | 222 uint8 object_type; |
219 AAC aac; | 223 AAC aac; |
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
428 std::vector<TrackFragment> tracks; | 432 std::vector<TrackFragment> tracks; |
429 std::vector<ProtectionSystemSpecificHeader> pssh; | 433 std::vector<ProtectionSystemSpecificHeader> pssh; |
430 }; | 434 }; |
431 | 435 |
432 #undef DECLARE_BOX | 436 #undef DECLARE_BOX |
433 | 437 |
434 } // namespace mp4 | 438 } // namespace mp4 |
435 } // namespace media | 439 } // namespace media |
436 | 440 |
437 #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ | 441 #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ |
OLD | NEW |