| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 std::vector<char> iv; | 47 std::vector<char> iv; |
| 48 std::vector<media::SubsampleEntry> subsamples; | 48 std::vector<media::SubsampleEntry> subsamples; |
| 49 }; | 49 }; |
| 50 | 50 |
| 51 struct MEDIA_EXPORT DemuxerData { | 51 struct MEDIA_EXPORT DemuxerData { |
| 52 DemuxerData(); | 52 DemuxerData(); |
| 53 ~DemuxerData(); | 53 ~DemuxerData(); |
| 54 | 54 |
| 55 DemuxerStream::Type type; | 55 DemuxerStream::Type type; |
| 56 std::vector<AccessUnit> access_units; | 56 std::vector<AccessUnit> access_units; |
| 57 // If the last entry in |access_units| has a status equal to |kConfigChanged|, |
| 58 // a corresponding DemuxerConfigs is added into this vector. The |
| 59 // 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 // demuxer configs change. |
| 62 std::vector<DemuxerConfigs> demuxer_configs; |
| 57 }; | 63 }; |
| 58 | 64 |
| 59 }; // namespace media | 65 }; // namespace media |
| 60 | 66 |
| 61 #endif // MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ | 67 #endif // MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ |
| OLD | NEW |