Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: webrtc/pc/webrtcsession.cc

Issue 2761143002: Support encrypted RTP extensions (RFC 6904) (Closed)
Patch Set: Fix compile error on win_x64 bots. Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/pc/webrtcsdp_unittest.cc ('k') | webrtc/pc/webrtcsessiondescriptionfactory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 } 618 }
619 } 619 }
620 620
621 webrtc_session_desc_factory_->SignalCertificateReady.connect( 621 webrtc_session_desc_factory_->SignalCertificateReady.connect(
622 this, &WebRtcSession::OnCertificateReady); 622 this, &WebRtcSession::OnCertificateReady);
623 623
624 if (options.disable_encryption) { 624 if (options.disable_encryption) {
625 webrtc_session_desc_factory_->SetSdesPolicy(cricket::SEC_DISABLED); 625 webrtc_session_desc_factory_->SetSdesPolicy(cricket::SEC_DISABLED);
626 } 626 }
627 627
628 webrtc_session_desc_factory_->set_enable_encrypted_rtp_header_extensions(
629 options.crypto_options.enable_encrypted_rtp_header_extensions);
630
628 return true; 631 return true;
629 } 632 }
630 633
631 void WebRtcSession::Close() { 634 void WebRtcSession::Close() {
632 SetState(STATE_CLOSED); 635 SetState(STATE_CLOSED);
633 RemoveUnusedChannels(nullptr); 636 RemoveUnusedChannels(nullptr);
634 call_ = nullptr; 637 call_ = nullptr;
635 RTC_DCHECK(!voice_channel_); 638 RTC_DCHECK(!voice_channel_);
636 RTC_DCHECK(!video_channel_); 639 RTC_DCHECK(!video_channel_);
637 RTC_DCHECK(!rtp_data_channel_); 640 RTC_DCHECK(!rtp_data_channel_);
(...skipping 1762 matching lines...) Expand 10 before | Expand all | Expand 10 after
2400 (rtp_data_channel_->rtcp_dtls_transport() != nullptr); 2403 (rtp_data_channel_->rtcp_dtls_transport() != nullptr);
2401 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release()); 2404 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release());
2402 transport_controller_->DestroyDtlsTransport( 2405 transport_controller_->DestroyDtlsTransport(
2403 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); 2406 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
2404 if (need_to_delete_rtcp) { 2407 if (need_to_delete_rtcp) {
2405 transport_controller_->DestroyDtlsTransport( 2408 transport_controller_->DestroyDtlsTransport(
2406 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); 2409 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
2407 } 2410 }
2408 } 2411 }
2409 } // namespace webrtc 2412 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/pc/webrtcsdp_unittest.cc ('k') | webrtc/pc/webrtcsessiondescriptionfactory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698