Chromium Code Reviews| 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> |
| 11 | 11 |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "media/base/media_export.h" | 14 #include "media/base/media_export.h" |
| 15 #include "media/base/media_track.h" | 15 #include "media/base/media_track.h" |
| 16 | 16 |
| 17 namespace media { | 17 namespace media { |
| 18 | 18 |
| 19 class AudioDecoderConfig; | 19 class AudioDecoderConfig; |
| 20 class DemuxerStream; | |
| 20 class VideoDecoderConfig; | 21 class VideoDecoderConfig; |
| 21 | 22 |
| 22 class MEDIA_EXPORT MediaTracks { | 23 class MEDIA_EXPORT MediaTracks { |
| 23 public: | 24 public: |
| 24 typedef std::vector<scoped_ptr<MediaTrack>> MediaTracksCollection; | 25 typedef std::vector<scoped_ptr<MediaTrack>> MediaTracksCollection; |
| 26 typedef std::map<unsigned, const DemuxerStream*> TrackIdToDemuxStreamMap; | |
| 25 | 27 |
| 26 MediaTracks(); | 28 MediaTracks(); |
| 27 ~MediaTracks(); | 29 ~MediaTracks(); |
| 28 | 30 |
| 29 // Callers need to ensure that track id is unique. | 31 // Callers need to ensure that track id is unique. |
| 30 void AddAudioTrack(const AudioDecoderConfig& config, | 32 const MediaTrack* AddAudioTrack(const AudioDecoderConfig& config, |
| 31 const std::string& id, | 33 const std::string& id, |
| 32 const std::string& kind, | 34 const std::string& kind, |
| 33 const std::string& label, | 35 const std::string& label, |
| 34 const std::string& language); | 36 const std::string& language); |
| 35 // Callers need to ensure that track id is unique. | 37 // Callers need to ensure that track id is unique. |
| 36 void AddVideoTrack(const VideoDecoderConfig& config, | 38 const MediaTrack* AddVideoTrack(const VideoDecoderConfig& config, |
| 37 const std::string& id, | 39 const std::string& id, |
| 38 const std::string& kind, | 40 const std::string& kind, |
| 39 const std::string& label, | 41 const std::string& label, |
| 40 const std::string& language); | 42 const std::string& language); |
| 41 | 43 |
| 42 const MediaTracksCollection& tracks() const { return tracks_; } | 44 const MediaTracksCollection& tracks() const { return tracks_; } |
| 43 | 45 |
| 46 // Notifies MediaTracks that a given media |track| object is backed by the | |
| 47 // given DemuxerStream |stream| object. | |
| 48 void SetDemuxerStreamForMediaTrack(const MediaTrack* track, | |
| 49 const DemuxerStream* stream); | |
| 50 // Notifies MediaTracks that external (blink) track ids have been assigned to | |
| 51 // the media |tracks_|. The size and ordering of |track_ids| must match the | |
|
wolenetz
2016/04/15 22:47:18
nit s/collection./collection, and |track_to_demux_
servolk
2016/04/15 23:26:31
Done.
| |
| 52 // size and ordering of tracks in the |tracks_| collection. | |
| 53 TrackIdToDemuxStreamMap OnTrackIdsAssigned( | |
| 54 const std::vector<unsigned>& track_ids) const; | |
| 55 | |
| 44 const AudioDecoderConfig& getAudioConfig(const std::string& id) const; | 56 const AudioDecoderConfig& getAudioConfig(const std::string& id) const; |
| 45 const VideoDecoderConfig& getVideoConfig(const std::string& id) const; | 57 const VideoDecoderConfig& getVideoConfig(const std::string& id) const; |
| 46 | 58 |
| 47 // TODO(servolk): These are temporary helpers useful until all code paths are | 59 // TODO(servolk): These are temporary helpers useful until all code paths are |
| 48 // converted to properly handle multiple media tracks. | 60 // converted to properly handle multiple media tracks. |
| 49 const AudioDecoderConfig& getFirstAudioConfig() const; | 61 const AudioDecoderConfig& getFirstAudioConfig() const; |
| 50 const VideoDecoderConfig& getFirstVideoConfig() const; | 62 const VideoDecoderConfig& getFirstVideoConfig() const; |
| 51 | 63 |
| 52 private: | 64 private: |
| 53 MediaTracksCollection tracks_; | 65 MediaTracksCollection tracks_; |
| 54 std::map<std::string, AudioDecoderConfig> audio_configs_; | 66 std::map<std::string, AudioDecoderConfig> audio_configs_; |
| 55 std::map<std::string, VideoDecoderConfig> video_configs_; | 67 std::map<std::string, VideoDecoderConfig> video_configs_; |
| 56 | 68 |
| 69 typedef std::map<const MediaTrack*, const DemuxerStream*> | |
| 70 TrackToDemuxStreamMap; | |
| 71 TrackToDemuxStreamMap track_to_demux_stream_map_; | |
| 72 | |
| 57 DISALLOW_COPY_AND_ASSIGN(MediaTracks); | 73 DISALLOW_COPY_AND_ASSIGN(MediaTracks); |
| 58 }; | 74 }; |
| 59 | 75 |
| 60 } // namespace media | 76 } // namespace media |
| 61 | 77 |
| 62 #endif // MEDIA_BASE_MEDIA_TRACKS_H_ | 78 #endif // MEDIA_BASE_MEDIA_TRACKS_H_ |
| OLD | NEW |