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

Optional: Use nullopt and implicit construction in /pc/rtcstatscollector.cc

Browse Source 
Changes places where we explicitly construct an Optional to instead use
nullopt or the requisite value type only.

This CL was uploaded by git cl split.

R=hbos@webrtc.org

Bug: None
Change-Id: I435258d0b16660bcc58c236158c19507ef60f57b
Reviewed-on: https://webrtc-review.googlesource.com/23609
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Oskar Sundbom <ossu@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20817}
This commit is contained in:
Oskar Sundbom 2017-11-16 10:56:31 +01:00 committed by Commit Bot
parent 7880758b90
commit 89e712649d
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pc/rtcstatscollector.cc
View File

@ -639,24 +639,23 @@ void RTCStatsCollector::GetStatsReport(
// |ProducePartialResultsOnNetworkThread|.
channel_name_pairs_.reset(new ChannelNamePairs());
if (pc_->voice_channel()) {
channel_name_pairs_->voice = rtc::Optional<ChannelNamePair>(
channel_name_pairs_->voice =
ChannelNamePair(pc_->voice_channel()->content_name(),
pc_->voice_channel()->transport_name()));
pc_->voice_channel()->transport_name());
}
if (pc_->video_channel()) {
channel_name_pairs_->video = rtc::Optional<ChannelNamePair>(
channel_name_pairs_->video =
ChannelNamePair(pc_->video_channel()->content_name(),
pc_->video_channel()->transport_name()));
pc_->video_channel()->transport_name());
}
if (pc_->rtp_data_channel()) {
channel_name_pairs_->data = rtc::Optional<ChannelNamePair>(
channel_name_pairs_->data =
ChannelNamePair(pc_->rtp_data_channel()->content_name(),
pc_->rtp_data_channel()->transport_name()));
pc_->rtp_data_channel()->transport_name());
}
if (pc_->sctp_content_name()) {
channel_name_pairs_->data =
rtc::Optional<ChannelNamePair>(ChannelNamePair(
*pc_->sctp_content_name(), *pc_->sctp_transport_name()));
channel_name_pairs_->data = ChannelNamePair(*pc_->sctp_content_name(),
*pc_->sctp_transport_name());
}
// Prepare |track_media_info_map_| for use in
// |ProducePartialResultsOnNetworkThread| and