| 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 #if defined(GOOGLE_TV) | |
| 9 #include <string> | |
| 10 #endif // defined(GOOGLE_TV) | |
| 11 #include <vector> | 8 #include <vector> |
| 12 | 9 |
| 13 #include "media/base/audio_decoder_config.h" | 10 #include "media/base/audio_decoder_config.h" |
| 14 #include "media/base/decrypt_config.h" | 11 #include "media/base/decrypt_config.h" |
| 15 #include "media/base/demuxer_stream.h" | 12 #include "media/base/demuxer_stream.h" |
| 16 #include "media/base/media_export.h" | 13 #include "media/base/media_export.h" |
| 17 #include "media/base/video_decoder_config.h" | 14 #include "media/base/video_decoder_config.h" |
| 18 #include "ui/gfx/size.h" | 15 #include "ui/gfx/size.h" |
| 19 | 16 |
| 20 namespace media { | 17 namespace media { |
| 21 | 18 |
| 22 struct MEDIA_EXPORT DemuxerConfigs { | 19 struct MEDIA_EXPORT DemuxerConfigs { |
| 23 DemuxerConfigs(); | 20 DemuxerConfigs(); |
| 24 ~DemuxerConfigs(); | 21 ~DemuxerConfigs(); |
| 25 | 22 |
| 26 AudioCodec audio_codec; | 23 AudioCodec audio_codec; |
| 27 int audio_channels; | 24 int audio_channels; |
| 28 int audio_sampling_rate; | 25 int audio_sampling_rate; |
| 29 bool is_audio_encrypted; | 26 bool is_audio_encrypted; |
| 30 std::vector<uint8> audio_extra_data; | 27 std::vector<uint8> audio_extra_data; |
| 31 | 28 |
| 32 VideoCodec video_codec; | 29 VideoCodec video_codec; |
| 33 gfx::Size video_size; | 30 gfx::Size video_size; |
| 34 bool is_video_encrypted; | 31 bool is_video_encrypted; |
| 35 std::vector<uint8> video_extra_data; | 32 std::vector<uint8> video_extra_data; |
| 36 | 33 |
| 37 int duration_ms; | 34 int duration_ms; |
| 38 | |
| 39 #if defined(GOOGLE_TV) | |
| 40 std::string key_system; | |
| 41 #endif // defined(GOOGLE_TV) | |
| 42 }; | 35 }; |
| 43 | 36 |
| 44 struct MEDIA_EXPORT AccessUnit { | 37 struct MEDIA_EXPORT AccessUnit { |
| 45 AccessUnit(); | 38 AccessUnit(); |
| 46 ~AccessUnit(); | 39 ~AccessUnit(); |
| 47 | 40 |
| 48 DemuxerStream::Status status; | 41 DemuxerStream::Status status; |
| 49 bool end_of_stream; | 42 bool end_of_stream; |
| 50 // TODO(ycheo): Use the shared memory to transfer the block data. | 43 // TODO(ycheo): Use the shared memory to transfer the block data. |
| 51 std::vector<uint8> data; | 44 std::vector<uint8> data; |
| 52 base::TimeDelta timestamp; | 45 base::TimeDelta timestamp; |
| 53 std::vector<char> key_id; | 46 std::vector<char> key_id; |
| 54 std::vector<char> iv; | 47 std::vector<char> iv; |
| 55 std::vector<media::SubsampleEntry> subsamples; | 48 std::vector<media::SubsampleEntry> subsamples; |
| 56 }; | 49 }; |
| 57 | 50 |
| 58 struct MEDIA_EXPORT DemuxerData { | 51 struct MEDIA_EXPORT DemuxerData { |
| 59 DemuxerData(); | 52 DemuxerData(); |
| 60 ~DemuxerData(); | 53 ~DemuxerData(); |
| 61 | 54 |
| 62 DemuxerStream::Type type; | 55 DemuxerStream::Type type; |
| 63 std::vector<AccessUnit> access_units; | 56 std::vector<AccessUnit> access_units; |
| 64 }; | 57 }; |
| 65 | 58 |
| 66 }; // namespace media | 59 }; // namespace media |
| 67 | 60 |
| 68 #endif // MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ | 61 #endif // MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ |
| OLD | NEW |