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 1715 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1726 transport_controller_->CreateDtlsTransport( | 1726 transport_controller_->CreateDtlsTransport( |
1727 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); | 1727 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); |
1728 cricket::DtlsTransportInternal* rtcp_dtls_transport = nullptr; | 1728 cricket::DtlsTransportInternal* rtcp_dtls_transport = nullptr; |
1729 if (!require_rtcp_mux) { | 1729 if (!require_rtcp_mux) { |
1730 rtcp_dtls_transport = transport_controller_->CreateDtlsTransport( | 1730 rtcp_dtls_transport = transport_controller_->CreateDtlsTransport( |
1731 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); | 1731 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); |
1732 } | 1732 } |
1733 | 1733 |
1734 voice_channel_.reset(channel_manager_->CreateVoiceChannel( | 1734 voice_channel_.reset(channel_manager_->CreateVoiceChannel( |
1735 media_controller_, rtp_dtls_transport, rtcp_dtls_transport, | 1735 media_controller_, rtp_dtls_transport, rtcp_dtls_transport, |
1736 transport_controller_->signaling_thread(), content->name, | 1736 transport_controller_->signaling_thread(), content->name, SrtpRequired(), |
1737 bundle_transport, require_rtcp_mux, SrtpRequired(), audio_options_)); | 1737 audio_options_)); |
1738 if (!voice_channel_) { | 1738 if (!voice_channel_) { |
1739 transport_controller_->DestroyDtlsTransport( | 1739 transport_controller_->DestroyDtlsTransport( |
1740 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); | 1740 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); |
1741 if (rtcp_dtls_transport) { | 1741 if (rtcp_dtls_transport) { |
1742 transport_controller_->DestroyDtlsTransport( | 1742 transport_controller_->DestroyDtlsTransport( |
1743 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); | 1743 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); |
1744 } | 1744 } |
1745 return false; | 1745 return false; |
1746 } | 1746 } |
1747 | 1747 |
(...skipping 20 matching lines...) Expand all Loading... |
1768 transport_controller_->CreateDtlsTransport( | 1768 transport_controller_->CreateDtlsTransport( |
1769 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); | 1769 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); |
1770 cricket::DtlsTransportInternal* rtcp_dtls_transport = nullptr; | 1770 cricket::DtlsTransportInternal* rtcp_dtls_transport = nullptr; |
1771 if (!require_rtcp_mux) { | 1771 if (!require_rtcp_mux) { |
1772 rtcp_dtls_transport = transport_controller_->CreateDtlsTransport( | 1772 rtcp_dtls_transport = transport_controller_->CreateDtlsTransport( |
1773 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); | 1773 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); |
1774 } | 1774 } |
1775 | 1775 |
1776 video_channel_.reset(channel_manager_->CreateVideoChannel( | 1776 video_channel_.reset(channel_manager_->CreateVideoChannel( |
1777 media_controller_, rtp_dtls_transport, rtcp_dtls_transport, | 1777 media_controller_, rtp_dtls_transport, rtcp_dtls_transport, |
1778 transport_controller_->signaling_thread(), content->name, | 1778 transport_controller_->signaling_thread(), content->name, SrtpRequired(), |
1779 bundle_transport, require_rtcp_mux, SrtpRequired(), video_options_)); | 1779 video_options_)); |
1780 | 1780 |
1781 if (!video_channel_) { | 1781 if (!video_channel_) { |
1782 transport_controller_->DestroyDtlsTransport( | 1782 transport_controller_->DestroyDtlsTransport( |
1783 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); | 1783 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); |
1784 if (rtcp_dtls_transport) { | 1784 if (rtcp_dtls_transport) { |
1785 transport_controller_->DestroyDtlsTransport( | 1785 transport_controller_->DestroyDtlsTransport( |
1786 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); | 1786 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); |
1787 } | 1787 } |
1788 return false; | 1788 return false; |
1789 } | 1789 } |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1834 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); | 1834 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); |
1835 cricket::DtlsTransportInternal* rtcp_dtls_transport = nullptr; | 1835 cricket::DtlsTransportInternal* rtcp_dtls_transport = nullptr; |
1836 if (!require_rtcp_mux) { | 1836 if (!require_rtcp_mux) { |
1837 rtcp_dtls_transport = transport_controller_->CreateDtlsTransport( | 1837 rtcp_dtls_transport = transport_controller_->CreateDtlsTransport( |
1838 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); | 1838 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); |
1839 } | 1839 } |
1840 | 1840 |
1841 rtp_data_channel_.reset(channel_manager_->CreateRtpDataChannel( | 1841 rtp_data_channel_.reset(channel_manager_->CreateRtpDataChannel( |
1842 media_controller_, rtp_dtls_transport, rtcp_dtls_transport, | 1842 media_controller_, rtp_dtls_transport, rtcp_dtls_transport, |
1843 transport_controller_->signaling_thread(), content->name, | 1843 transport_controller_->signaling_thread(), content->name, |
1844 bundle_transport, require_rtcp_mux, SrtpRequired())); | 1844 SrtpRequired())); |
1845 | 1845 |
1846 if (!rtp_data_channel_) { | 1846 if (!rtp_data_channel_) { |
1847 transport_controller_->DestroyDtlsTransport( | 1847 transport_controller_->DestroyDtlsTransport( |
1848 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); | 1848 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); |
1849 if (rtcp_dtls_transport) { | 1849 if (rtcp_dtls_transport) { |
1850 transport_controller_->DestroyDtlsTransport( | 1850 transport_controller_->DestroyDtlsTransport( |
1851 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); | 1851 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); |
1852 } | 1852 } |
1853 return false; | 1853 return false; |
1854 } | 1854 } |
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2359 (rtp_data_channel_->rtcp_dtls_transport() != nullptr); | 2359 (rtp_data_channel_->rtcp_dtls_transport() != nullptr); |
2360 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release()); | 2360 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release()); |
2361 transport_controller_->DestroyDtlsTransport( | 2361 transport_controller_->DestroyDtlsTransport( |
2362 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); | 2362 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); |
2363 if (need_to_delete_rtcp) { | 2363 if (need_to_delete_rtcp) { |
2364 transport_controller_->DestroyDtlsTransport( | 2364 transport_controller_->DestroyDtlsTransport( |
2365 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); | 2365 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); |
2366 } | 2366 } |
2367 } | 2367 } |
2368 } // namespace webrtc | 2368 } // namespace webrtc |
OLD | NEW |