admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RTCStatsCollector: Get track IDs from senders/receivers instead of

Browse Source 
streams.

When addTrack/removeTrack is used instead of addStream/removeStream
we an end up with tracks that are not contained within any local or
remote stream.

If all track IDs are not mapped when we produce RTCRTPStreamStats
we'll hit a DCHECK.

BUG=chromium:741638

Review-Url: https://codereview.webrtc.org/2978793002
Cr-Commit-Position: refs/heads/master@{#18991}
This commit is contained in:
hbos 2017-07-12 16:22:34 -07:00 committed by Commit Bot
parent 23173a372b
commit 7b0c6fa274
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
webrtc/pc/rtcstatscollector.cc
View File

@ -1201,22 +1201,15 @@ std::map<MediaStreamTrackInterface*, std::string>
RTCStatsCollector::PrepareTrackToID_s() const {
RTC_DCHECK(signaling_thread_->IsCurrent());
std::map<MediaStreamTrackInterface*, std::string> track_to_id;
StreamCollectionInterface* local_and_remote_streams[] =
{ pc_->local_streams().get(), pc_->remote_streams().get() };
for (auto& streams : local_and_remote_streams) {
if (streams) {
for (size_t i = 0; i < streams->count(); ++i) {
MediaStreamInterface* stream = streams->at(i);
for (const rtc::scoped_refptr<AudioTrackInterface>& audio_track :
stream->GetAudioTracks()) {
track_to_id[audio_track.get()] = audio_track->id();
}
for (const rtc::scoped_refptr<VideoTrackInterface>& video_track :
stream->GetVideoTracks()) {
track_to_id[video_track.get()] = video_track->id();
}
}
}
for (auto sender : pc_->GetSenders()) {
auto track = sender->track();
if (track)
track_to_id[track.get()] = track->id();
}
for (auto receiver : pc_->GetReceivers()) {
auto track = receiver->track();
if (track)
track_to_id[track.get()] = track->id();
}
return track_to_id;
}