| 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_t> audio_extra_data; |
| 28 int64 audio_codec_delay_ns; | 28 int64_t audio_codec_delay_ns; |
| 29 int64 audio_seek_preroll_ns; | 29 int64_t audio_seek_preroll_ns; |
| 30 | 30 |
| 31 VideoCodec video_codec; | 31 VideoCodec video_codec; |
| 32 gfx::Size video_size; | 32 gfx::Size video_size; |
| 33 bool is_video_encrypted; | 33 bool is_video_encrypted; |
| 34 std::vector<uint8> video_extra_data; | 34 std::vector<uint8_t> video_extra_data; |
| 35 | 35 |
| 36 base::TimeDelta duration; | 36 base::TimeDelta duration; |
| 37 }; | 37 }; |
| 38 | 38 |
| 39 struct MEDIA_EXPORT AccessUnit { | 39 struct MEDIA_EXPORT AccessUnit { |
| 40 AccessUnit(); | 40 AccessUnit(); |
| 41 ~AccessUnit(); | 41 ~AccessUnit(); |
| 42 | 42 |
| 43 DemuxerStream::Status status; | 43 DemuxerStream::Status status; |
| 44 bool is_end_of_stream; | 44 bool is_end_of_stream; |
| 45 // TODO(ycheo): Use the shared memory to transfer the block data. | 45 // TODO(ycheo): Use the shared memory to transfer the block data. |
| 46 std::vector<uint8> data; | 46 std::vector<uint8_t> data; |
| 47 base::TimeDelta timestamp; | 47 base::TimeDelta timestamp; |
| 48 std::vector<char> key_id; | 48 std::vector<char> key_id; |
| 49 std::vector<char> iv; | 49 std::vector<char> iv; |
| 50 std::vector<media::SubsampleEntry> subsamples; | 50 std::vector<media::SubsampleEntry> subsamples; |
| 51 bool is_key_frame; | 51 bool is_key_frame; |
| 52 }; | 52 }; |
| 53 | 53 |
| 54 struct MEDIA_EXPORT DemuxerData { | 54 struct MEDIA_EXPORT DemuxerData { |
| 55 DemuxerData(); | 55 DemuxerData(); |
| 56 ~DemuxerData(); | 56 ~DemuxerData(); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 71 MEDIA_EXPORT | 71 MEDIA_EXPORT |
| 72 std::ostream& operator<<(std::ostream& os, media::DemuxerStream::Type type); | 72 std::ostream& operator<<(std::ostream& os, media::DemuxerStream::Type type); |
| 73 | 73 |
| 74 MEDIA_EXPORT | 74 MEDIA_EXPORT |
| 75 std::ostream& operator<<(std::ostream& os, const media::AccessUnit& au); | 75 std::ostream& operator<<(std::ostream& os, const media::AccessUnit& au); |
| 76 | 76 |
| 77 MEDIA_EXPORT | 77 MEDIA_EXPORT |
| 78 std::ostream& operator<<(std::ostream& os, const media::DemuxerConfigs& conf); | 78 std::ostream& operator<<(std::ostream& os, const media::DemuxerConfigs& conf); |
| 79 | 79 |
| 80 #endif // MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ | 80 #endif // MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ |
| OLD | NEW |