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

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

Issue 2761143002: Support encrypted RTP extensions (RFC 6904) (Closed)
Patch Set: Created 3 years, 9 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
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 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 } 613 }
614 } 614 }
615 615
616 webrtc_session_desc_factory_->SignalCertificateReady.connect( 616 webrtc_session_desc_factory_->SignalCertificateReady.connect(
617 this, &WebRtcSession::OnCertificateReady); 617 this, &WebRtcSession::OnCertificateReady);
618 618
619 if (options.disable_encryption) { 619 if (options.disable_encryption) {
620 webrtc_session_desc_factory_->SetSdesPolicy(cricket::SEC_DISABLED); 620 webrtc_session_desc_factory_->SetSdesPolicy(cricket::SEC_DISABLED);
621 } 621 }
622 622
623 webrtc_session_desc_factory_->set_enable_rtp_header_encryption(
624 options.enable_rtp_header_encryption);
625
623 return true; 626 return true;
624 } 627 }
625 628
626 void WebRtcSession::Close() { 629 void WebRtcSession::Close() {
627 SetState(STATE_CLOSED); 630 SetState(STATE_CLOSED);
628 RemoveUnusedChannels(nullptr); 631 RemoveUnusedChannels(nullptr);
629 RTC_DCHECK(!voice_channel_); 632 RTC_DCHECK(!voice_channel_);
630 RTC_DCHECK(!video_channel_); 633 RTC_DCHECK(!video_channel_);
631 RTC_DCHECK(!rtp_data_channel_); 634 RTC_DCHECK(!rtp_data_channel_);
632 RTC_DCHECK(!sctp_transport_); 635 RTC_DCHECK(!sctp_transport_);
(...skipping 1750 matching lines...) Expand 10 before | Expand all | Expand 10 after
2383 (rtp_data_channel_->rtcp_dtls_transport() != nullptr); 2386 (rtp_data_channel_->rtcp_dtls_transport() != nullptr);
2384 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release()); 2387 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release());
2385 transport_controller_->DestroyDtlsTransport( 2388 transport_controller_->DestroyDtlsTransport(
2386 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); 2389 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
2387 if (need_to_delete_rtcp) { 2390 if (need_to_delete_rtcp) {
2388 transport_controller_->DestroyDtlsTransport( 2391 transport_controller_->DestroyDtlsTransport(
2389 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); 2392 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
2390 } 2393 }
2391 } 2394 }
2392 } // namespace webrtc 2395 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698