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 #include "media/base/media_tracks.h" | 5 #include "media/base/media_tracks.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
9 #include "media/base/audio_decoder_config.h" | 9 #include "media/base/audio_decoder_config.h" |
10 #include "media/base/video_decoder_config.h" | 10 #include "media/base/video_decoder_config.h" |
11 | 11 |
12 namespace media { | 12 namespace media { |
13 | 13 |
14 MediaTracks::MediaTracks() {} | 14 MediaTracks::MediaTracks() {} |
15 | 15 |
16 MediaTracks::~MediaTracks() {} | 16 MediaTracks::~MediaTracks() {} |
17 | 17 |
18 void MediaTracks::AddAudioTrack(const AudioDecoderConfig& config, | 18 const MediaTrack* MediaTracks::AddAudioTrack(const AudioDecoderConfig& config, |
19 const std::string& id, | 19 const std::string& id, |
chcunningham
2016/06/02 21:24:45
What are the plans for this "id"? Its a little con
servolk
2016/06/02 23:53:11
How about byteStreamTrackId?
Also, these are typic
chcunningham
2016/06/03 20:42:49
byteStreamTrackId sounds good
| |
20 const std::string& kind, | 20 const std::string& kind, |
21 const std::string& label, | 21 const std::string& label, |
22 const std::string& language) { | 22 const std::string& language) { |
23 DCHECK(config.IsValidConfig()); | 23 DCHECK(config.IsValidConfig()); |
24 CHECK(audio_configs_.find(id) == audio_configs_.end()); | 24 CHECK(audio_configs_.find(id) == audio_configs_.end()); |
25 std::unique_ptr<MediaTrack> track = base::WrapUnique( | 25 std::unique_ptr<MediaTrack> track = base::WrapUnique( |
26 new MediaTrack(MediaTrack::Audio, id, kind, label, language)); | 26 new MediaTrack(MediaTrack::Audio, id, kind, label, language)); |
27 tracks_.push_back(std::move(track)); | 27 tracks_.push_back(std::move(track)); |
28 audio_configs_[id] = config; | 28 audio_configs_[id] = config; |
29 return tracks_.back().get(); | |
29 } | 30 } |
30 | 31 |
31 void MediaTracks::AddVideoTrack(const VideoDecoderConfig& config, | 32 const MediaTrack* MediaTracks::AddVideoTrack(const VideoDecoderConfig& config, |
32 const std::string& id, | 33 const std::string& id, |
33 const std::string& kind, | 34 const std::string& kind, |
34 const std::string& label, | 35 const std::string& label, |
35 const std::string& language) { | 36 const std::string& language) { |
36 DCHECK(config.IsValidConfig()); | 37 DCHECK(config.IsValidConfig()); |
37 CHECK(video_configs_.find(id) == video_configs_.end()); | 38 CHECK(video_configs_.find(id) == video_configs_.end()); |
38 std::unique_ptr<MediaTrack> track = base::WrapUnique( | 39 std::unique_ptr<MediaTrack> track = base::WrapUnique( |
39 new MediaTrack(MediaTrack::Video, id, kind, label, language)); | 40 new MediaTrack(MediaTrack::Video, id, kind, label, language)); |
40 tracks_.push_back(std::move(track)); | 41 tracks_.push_back(std::move(track)); |
41 video_configs_[id] = config; | 42 video_configs_[id] = config; |
43 return tracks_.back().get(); | |
44 } | |
45 | |
46 void MediaTracks::SetDemuxerStreamForMediaTrack(const MediaTrack* track, | |
47 const DemuxerStream* stream) { | |
48 DCHECK(track_to_demux_stream_map_.find(track) == | |
chcunningham
2016/06/02 21:24:45
How are you deciding when to DCHECK vs CHECK? Both
servolk
2016/06/02 23:53:11
In this case dcheck are for things that might indi
chcunningham
2016/06/03 20:42:49
Acknowledged.
| |
49 track_to_demux_stream_map_.end()); | |
50 | |
51 bool track_found = false; | |
52 for (const auto& t : tracks_) { | |
53 if (t.get() == track) { | |
54 track_found = true; | |
55 break; | |
56 } | |
57 } | |
58 CHECK(track_found); | |
59 | |
60 track_to_demux_stream_map_[track] = stream; | |
61 } | |
62 | |
63 MediaTracks::TrackIdToDemuxStreamMap MediaTracks::OnTrackIdsAssigned( | |
64 const std::vector<unsigned>& track_ids) const { | |
65 TrackIdToDemuxStreamMap result; | |
66 CHECK_EQ(tracks().size(), track_ids.size()); | |
67 CHECK_EQ(track_to_demux_stream_map_.size(), tracks().size()); | |
68 for (size_t i = 0; i < track_ids.size(); ++i) { | |
69 const MediaTrack* track = tracks()[i].get(); | |
70 DCHECK(track); | |
71 const auto& it = track_to_demux_stream_map_.find(track); | |
72 CHECK(it != track_to_demux_stream_map_.end()); | |
73 DVLOG(3) << "OnTrackIdsAssigned track_id=" << track_ids[i] | |
74 << " DemuxerStream=" << it->second; | |
75 result[track_ids[i]] = it->second; | |
76 } | |
77 return result; | |
42 } | 78 } |
43 | 79 |
44 const AudioDecoderConfig& MediaTracks::getAudioConfig( | 80 const AudioDecoderConfig& MediaTracks::getAudioConfig( |
45 const std::string& id) const { | 81 const std::string& id) const { |
46 auto it = audio_configs_.find(id); | 82 auto it = audio_configs_.find(id); |
47 if (it != audio_configs_.end()) | 83 if (it != audio_configs_.end()) |
48 return it->second; | 84 return it->second; |
49 static AudioDecoderConfig invalidConfig; | 85 static AudioDecoderConfig invalidConfig; |
50 return invalidConfig; | 86 return invalidConfig; |
51 } | 87 } |
(...skipping 21 matching lines...) Expand all Loading... | |
73 for (const auto& track : tracks()) { | 109 for (const auto& track : tracks()) { |
74 if (track->type() == MediaTrack::Video) { | 110 if (track->type() == MediaTrack::Video) { |
75 return getVideoConfig(track->id()); | 111 return getVideoConfig(track->id()); |
76 } | 112 } |
77 } | 113 } |
78 static VideoDecoderConfig invalidConfig; | 114 static VideoDecoderConfig invalidConfig; |
79 return invalidConfig; | 115 return invalidConfig; |
80 } | 116 } |
81 | 117 |
82 } // namespace media | 118 } // namespace media |
OLD | NEW |