| 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 1021 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1032 } | 1032 } |
| 1033 | 1033 |
| 1034 bool WebRtcSession::GetLocalCertificate( | 1034 bool WebRtcSession::GetLocalCertificate( |
| 1035 const std::string& transport_name, | 1035 const std::string& transport_name, |
| 1036 rtc::scoped_refptr<rtc::RTCCertificate>* certificate) { | 1036 rtc::scoped_refptr<rtc::RTCCertificate>* certificate) { |
| 1037 ASSERT(signaling_thread()->IsCurrent()); | 1037 ASSERT(signaling_thread()->IsCurrent()); |
| 1038 return transport_controller_->GetLocalCertificate(transport_name, | 1038 return transport_controller_->GetLocalCertificate(transport_name, |
| 1039 certificate); | 1039 certificate); |
| 1040 } | 1040 } |
| 1041 | 1041 |
| 1042 rtc::scoped_ptr<rtc::SSLCertificate> WebRtcSession::GetRemoteSSLCertificate( | 1042 std::unique_ptr<rtc::SSLCertificate> WebRtcSession::GetRemoteSSLCertificate( |
| 1043 const std::string& transport_name) { | 1043 const std::string& transport_name) { |
| 1044 ASSERT(signaling_thread()->IsCurrent()); | 1044 ASSERT(signaling_thread()->IsCurrent()); |
| 1045 return transport_controller_->GetRemoteSSLCertificate(transport_name); | 1045 return transport_controller_->GetRemoteSSLCertificate(transport_name); |
| 1046 } | 1046 } |
| 1047 | 1047 |
| 1048 bool WebRtcSession::EnableBundle(const cricket::ContentGroup& bundle) { | 1048 bool WebRtcSession::EnableBundle(const cricket::ContentGroup& bundle) { |
| 1049 const std::string* first_content_name = bundle.FirstContentName(); | 1049 const std::string* first_content_name = bundle.FirstContentName(); |
| 1050 if (!first_content_name) { | 1050 if (!first_content_name) { |
| 1051 LOG(LS_WARNING) << "Tried to BUNDLE with no contents."; | 1051 LOG(LS_WARNING) << "Tried to BUNDLE with no contents."; |
| 1052 return false; | 1052 return false; |
| (...skipping 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2155 } | 2155 } |
| 2156 } | 2156 } |
| 2157 | 2157 |
| 2158 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, | 2158 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, |
| 2159 const rtc::SentPacket& sent_packet) { | 2159 const rtc::SentPacket& sent_packet) { |
| 2160 RTC_DCHECK(worker_thread()->IsCurrent()); | 2160 RTC_DCHECK(worker_thread()->IsCurrent()); |
| 2161 media_controller_->call_w()->OnSentPacket(sent_packet); | 2161 media_controller_->call_w()->OnSentPacket(sent_packet); |
| 2162 } | 2162 } |
| 2163 | 2163 |
| 2164 } // namespace webrtc | 2164 } // namespace webrtc |
| OLD | NEW |