OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ | 5 #ifndef MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ |
6 #define MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ | 6 #define MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "media/base/audio_decoder_config.h" | 10 #include "media/base/audio_decoder_config.h" |
11 #include "media/base/decrypt_config.h" | 11 #include "media/base/decrypt_config.h" |
12 #include "media/base/demuxer_stream.h" | 12 #include "media/base/demuxer_stream.h" |
13 #include "media/base/media_export.h" | 13 #include "media/base/media_export.h" |
14 #include "media/base/video_decoder_config.h" | 14 #include "media/base/video_decoder_config.h" |
15 #include "ui/gfx/geometry/size.h" | 15 #include "ui/gfx/geometry/size.h" |
16 | 16 |
17 namespace media { | 17 namespace media { |
18 | 18 |
19 struct MEDIA_EXPORT DemuxerConfigs { | 19 struct MEDIA_EXPORT DemuxerConfigs { |
20 DemuxerConfigs(); | 20 DemuxerConfigs(); |
21 ~DemuxerConfigs(); | 21 ~DemuxerConfigs(); |
22 | 22 |
23 AudioCodec audio_codec; | 23 AudioCodec audio_codec; |
24 int audio_channels; | 24 int audio_channels; |
25 int audio_sampling_rate; | 25 int audio_sampling_rate; |
26 bool is_audio_encrypted; | 26 bool is_audio_encrypted; |
27 std::vector<uint8> audio_extra_data; | 27 std::vector<uint8> audio_extra_data; |
| 28 int64 audio_codec_delay_ns; |
| 29 int64 audio_seek_preroll_ns; |
28 | 30 |
29 VideoCodec video_codec; | 31 VideoCodec video_codec; |
30 gfx::Size video_size; | 32 gfx::Size video_size; |
31 bool is_video_encrypted; | 33 bool is_video_encrypted; |
32 std::vector<uint8> video_extra_data; | 34 std::vector<uint8> video_extra_data; |
33 | 35 |
34 base::TimeDelta duration; | 36 base::TimeDelta duration; |
35 }; | 37 }; |
36 | 38 |
37 struct MEDIA_EXPORT AccessUnit { | 39 struct MEDIA_EXPORT AccessUnit { |
(...skipping 20 matching lines...) Expand all Loading... |
58 // a corresponding DemuxerConfigs is added into this vector. The | 60 // a corresponding DemuxerConfigs is added into this vector. The |
59 // DemuxerConfigs should only contain information of the stream that is | 61 // DemuxerConfigs should only contain information of the stream that is |
60 // specified by |type|. This solves the issue that we need multiple IPCs when | 62 // specified by |type|. This solves the issue that we need multiple IPCs when |
61 // demuxer configs change. | 63 // demuxer configs change. |
62 std::vector<DemuxerConfigs> demuxer_configs; | 64 std::vector<DemuxerConfigs> demuxer_configs; |
63 }; | 65 }; |
64 | 66 |
65 }; // namespace media | 67 }; // namespace media |
66 | 68 |
67 #endif // MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ | 69 #endif // MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ |
OLD | NEW |