| 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 1077 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1088 << " on " << transport_name << "."; | 1088 << " on " << transport_name << "."; |
| 1089 return true; | 1089 return true; |
| 1090 } | 1090 } |
| 1091 | 1091 |
| 1092 cricket::DtlsTransportInternal* rtp_dtls_transport = | 1092 cricket::DtlsTransportInternal* rtp_dtls_transport = |
| 1093 transport_controller_->CreateDtlsTransport( | 1093 transport_controller_->CreateDtlsTransport( |
| 1094 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); | 1094 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); |
| 1095 bool need_rtcp = (ch->rtcp_dtls_transport() != nullptr); | 1095 bool need_rtcp = (ch->rtcp_dtls_transport() != nullptr); |
| 1096 cricket::DtlsTransportInternal* rtcp_dtls_transport = nullptr; | 1096 cricket::DtlsTransportInternal* rtcp_dtls_transport = nullptr; |
| 1097 if (need_rtcp) { | 1097 if (need_rtcp) { |
| 1098 rtcp_dtls_transport = transport_controller_->CreateDtlsTransport_n( | 1098 rtcp_dtls_transport = transport_controller_->CreateDtlsTransport( |
| 1099 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); | 1099 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); |
| 1100 } | 1100 } |
| 1101 | 1101 |
| 1102 ch->SetTransports(rtp_dtls_transport, rtcp_dtls_transport); | 1102 ch->SetTransports(rtp_dtls_transport, rtcp_dtls_transport); |
| 1103 LOG(LS_INFO) << "Enabled BUNDLE for " << ch->content_name() << " on " | 1103 LOG(LS_INFO) << "Enabled BUNDLE for " << ch->content_name() << " on " |
| 1104 << transport_name << "."; | 1104 << transport_name << "."; |
| 1105 transport_controller_->DestroyDtlsTransport( | 1105 transport_controller_->DestroyDtlsTransport( |
| 1106 old_transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); | 1106 old_transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); |
| 1107 // If the channel needs rtcp, it means that the channel used to have a | 1107 // If the channel needs rtcp, it means that the channel used to have a |
| 1108 // rtcp transport which needs to be deleted now. | 1108 // rtcp transport which needs to be deleted now. |
| (...skipping 1294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2403 (rtp_data_channel_->rtcp_dtls_transport() != nullptr); | 2403 (rtp_data_channel_->rtcp_dtls_transport() != nullptr); |
| 2404 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release()); | 2404 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release()); |
| 2405 transport_controller_->DestroyDtlsTransport( | 2405 transport_controller_->DestroyDtlsTransport( |
| 2406 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); | 2406 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); |
| 2407 if (need_to_delete_rtcp) { | 2407 if (need_to_delete_rtcp) { |
| 2408 transport_controller_->DestroyDtlsTransport( | 2408 transport_controller_->DestroyDtlsTransport( |
| 2409 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); | 2409 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); |
| 2410 } | 2410 } |
| 2411 } | 2411 } |
| 2412 } // namespace webrtc | 2412 } // namespace webrtc |
| OLD | NEW |