OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 1877 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1888 this, &WebRtcSession::OnDtlsSrtpSetupFailure); | 1888 this, &WebRtcSession::OnDtlsSrtpSetupFailure); |
1889 rtp_data_channel_->SignalSentPacket.connect(this, | 1889 rtp_data_channel_->SignalSentPacket.connect(this, |
1890 &WebRtcSession::OnSentPacket_w); | 1890 &WebRtcSession::OnSentPacket_w); |
1891 } | 1891 } |
1892 | 1892 |
1893 SignalDataChannelCreated(); | 1893 SignalDataChannelCreated(); |
1894 | 1894 |
1895 return true; | 1895 return true; |
1896 } | 1896 } |
1897 | 1897 |
1898 Call::Stats WebRtcSession::GetCallStats() { | |
1899 return call_->GetStats(); | |
hbos
2017/05/09 12:48:14
I suspect this is not safe? call_ is a raw pointer
holmer
2017/05/30 14:44:29
As discussed offline, I have no added thread check
| |
1900 } | |
1901 | |
1898 std::unique_ptr<SessionStats> WebRtcSession::GetStats_n( | 1902 std::unique_ptr<SessionStats> WebRtcSession::GetStats_n( |
1899 const ChannelNamePairs& channel_name_pairs) { | 1903 const ChannelNamePairs& channel_name_pairs) { |
1900 RTC_DCHECK(network_thread()->IsCurrent()); | 1904 RTC_DCHECK(network_thread()->IsCurrent()); |
1901 std::unique_ptr<SessionStats> session_stats(new SessionStats()); | 1905 std::unique_ptr<SessionStats> session_stats(new SessionStats()); |
1902 for (const auto channel_name_pair : { &channel_name_pairs.voice, | 1906 for (const auto channel_name_pair : { &channel_name_pairs.voice, |
1903 &channel_name_pairs.video, | 1907 &channel_name_pairs.video, |
1904 &channel_name_pairs.data }) { | 1908 &channel_name_pairs.data }) { |
1905 if (*channel_name_pair) { | 1909 if (*channel_name_pair) { |
1906 cricket::TransportStats transport_stats; | 1910 cricket::TransportStats transport_stats; |
1907 if (!transport_controller_->GetStats((*channel_name_pair)->transport_name, | 1911 if (!transport_controller_->GetStats((*channel_name_pair)->transport_name, |
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2388 (rtp_data_channel_->rtcp_dtls_transport() != nullptr); | 2392 (rtp_data_channel_->rtcp_dtls_transport() != nullptr); |
2389 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release()); | 2393 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release()); |
2390 transport_controller_->DestroyDtlsTransport( | 2394 transport_controller_->DestroyDtlsTransport( |
2391 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); | 2395 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); |
2392 if (need_to_delete_rtcp) { | 2396 if (need_to_delete_rtcp) { |
2393 transport_controller_->DestroyDtlsTransport( | 2397 transport_controller_->DestroyDtlsTransport( |
2394 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); | 2398 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); |
2395 } | 2399 } |
2396 } | 2400 } |
2397 } // namespace webrtc | 2401 } // namespace webrtc |
OLD | NEW |