| 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" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 std::vector<uint8> video_extra_data; | 32 std::vector<uint8> video_extra_data; |
| 33 | 33 |
| 34 base::TimeDelta duration; | 34 base::TimeDelta duration; |
| 35 }; | 35 }; |
| 36 | 36 |
| 37 struct MEDIA_EXPORT AccessUnit { | 37 struct MEDIA_EXPORT AccessUnit { |
| 38 AccessUnit(); | 38 AccessUnit(); |
| 39 ~AccessUnit(); | 39 ~AccessUnit(); |
| 40 | 40 |
| 41 DemuxerStream::Status status; | 41 DemuxerStream::Status status; |
| 42 bool end_of_stream; | 42 bool is_end_of_stream; |
| 43 // TODO(ycheo): Use the shared memory to transfer the block data. | 43 // TODO(ycheo): Use the shared memory to transfer the block data. |
| 44 std::vector<uint8> data; | 44 std::vector<uint8> data; |
| 45 base::TimeDelta timestamp; | 45 base::TimeDelta timestamp; |
| 46 std::vector<char> key_id; | 46 std::vector<char> key_id; |
| 47 std::vector<char> iv; | 47 std::vector<char> iv; |
| 48 std::vector<media::SubsampleEntry> subsamples; | 48 std::vector<media::SubsampleEntry> subsamples; |
| 49 bool is_key_frame; |
| 49 }; | 50 }; |
| 50 | 51 |
| 51 struct MEDIA_EXPORT DemuxerData { | 52 struct MEDIA_EXPORT DemuxerData { |
| 52 DemuxerData(); | 53 DemuxerData(); |
| 53 ~DemuxerData(); | 54 ~DemuxerData(); |
| 54 | 55 |
| 55 DemuxerStream::Type type; | 56 DemuxerStream::Type type; |
| 56 std::vector<AccessUnit> access_units; | 57 std::vector<AccessUnit> access_units; |
| 57 // If the last entry in |access_units| has a status equal to |kConfigChanged|, | 58 // If the last entry in |access_units| has a status equal to |kConfigChanged|, |
| 58 // a corresponding DemuxerConfigs is added into this vector. The | 59 // a corresponding DemuxerConfigs is added into this vector. The |
| 59 // DemuxerConfigs should only contain information of the stream that is | 60 // DemuxerConfigs should only contain information of the stream that is |
| 60 // specified by |type|. This solves the issue that we need multiple IPCs when | 61 // specified by |type|. This solves the issue that we need multiple IPCs when |
| 61 // demuxer configs change. | 62 // demuxer configs change. |
| 62 std::vector<DemuxerConfigs> demuxer_configs; | 63 std::vector<DemuxerConfigs> demuxer_configs; |
| 63 }; | 64 }; |
| 64 | 65 |
| 65 }; // namespace media | 66 }; // namespace media |
| 66 | 67 |
| 67 #endif // MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ | 68 #endif // MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ |
| OLD | NEW |