OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_MEDIA_TRACKS_H_ | 5 #ifndef MEDIA_BASE_MEDIA_TRACKS_H_ |
6 #define MEDIA_BASE_MEDIA_TRACKS_H_ | 6 #define MEDIA_BASE_MEDIA_TRACKS_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 10 matching lines...) Expand all Loading... |
21 | 21 |
22 class MEDIA_EXPORT MediaTracks { | 22 class MEDIA_EXPORT MediaTracks { |
23 public: | 23 public: |
24 typedef std::vector<scoped_ptr<MediaTrack>> MediaTracksCollection; | 24 typedef std::vector<scoped_ptr<MediaTrack>> MediaTracksCollection; |
25 | 25 |
26 MediaTracks(); | 26 MediaTracks(); |
27 ~MediaTracks(); | 27 ~MediaTracks(); |
28 | 28 |
29 // Callers need to ensure that track id is unique. | 29 // Callers need to ensure that track id is unique. |
30 void AddAudioTrack(const AudioDecoderConfig& config, | 30 void AddAudioTrack(const AudioDecoderConfig& config, |
31 const std::string& id, | 31 StreamParser::TrackId id, |
32 const std::string& kind, | 32 const std::string& kind, |
33 const std::string& label, | 33 const std::string& label, |
34 const std::string& language); | 34 const std::string& language); |
35 // Callers need to ensure that track id is unique. | 35 // Callers need to ensure that track id is unique. |
36 void AddVideoTrack(const VideoDecoderConfig& config, | 36 void AddVideoTrack(const VideoDecoderConfig& config, |
37 const std::string& id, | 37 StreamParser::TrackId id, |
38 const std::string& kind, | 38 const std::string& kind, |
39 const std::string& label, | 39 const std::string& label, |
40 const std::string& language); | 40 const std::string& language); |
41 | 41 |
42 const MediaTracksCollection& tracks() const { return tracks_; } | 42 const MediaTracksCollection& tracks() const { return tracks_; } |
43 | 43 |
44 const AudioDecoderConfig& getAudioConfig(const std::string& id) const; | 44 const AudioDecoderConfig& getAudioConfig(StreamParser::TrackId id) const; |
45 const VideoDecoderConfig& getVideoConfig(const std::string& id) const; | 45 const VideoDecoderConfig& getVideoConfig(StreamParser::TrackId id) const; |
46 | 46 |
47 // TODO(servolk): These are temporary helpers useful until all code paths are | 47 // TODO(servolk): These are temporary helpers useful until all code paths are |
48 // converted to properly handle multiple media tracks. | 48 // converted to properly handle multiple media tracks. |
49 const AudioDecoderConfig& getFirstAudioConfig() const; | 49 const AudioDecoderConfig& getFirstAudioConfig() const; |
50 const VideoDecoderConfig& getFirstVideoConfig() const; | 50 const VideoDecoderConfig& getFirstVideoConfig() const; |
51 | 51 |
52 private: | 52 private: |
53 MediaTracksCollection tracks_; | 53 MediaTracksCollection tracks_; |
54 std::map<std::string, AudioDecoderConfig> audio_configs_; | 54 std::map<StreamParser::TrackId, AudioDecoderConfig> audio_configs_; |
55 std::map<std::string, VideoDecoderConfig> video_configs_; | 55 std::map<StreamParser::TrackId, VideoDecoderConfig> video_configs_; |
56 | 56 |
57 DISALLOW_COPY_AND_ASSIGN(MediaTracks); | 57 DISALLOW_COPY_AND_ASSIGN(MediaTracks); |
58 }; | 58 }; |
59 | 59 |
60 } // namespace media | 60 } // namespace media |
61 | 61 |
62 #endif // MEDIA_BASE_MEDIA_TRACKS_H_ | 62 #endif // MEDIA_BASE_MEDIA_TRACKS_H_ |
OLD | NEW |