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

Side by Side Diff: talk/app/webrtc/webrtcsession.cc

Issue 1186083002: Ability to specify KeyType (RSA, ECDSA) in CreatePeerConnection (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: PeerConnectionFactoryInterface::CreatePeerConnection without KeyType Created 5 years, 6 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 | « talk/app/webrtc/webrtcsession.h ('k') | talk/app/webrtc/webrtcsession_unittest.cc » ('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 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 for (size_t i = 0; i < saved_candidates_.size(); ++i) { 514 for (size_t i = 0; i < saved_candidates_.size(); ++i) {
515 delete saved_candidates_[i]; 515 delete saved_candidates_[i];
516 } 516 }
517 delete identity(); 517 delete identity();
518 } 518 }
519 519
520 bool WebRtcSession::Initialize( 520 bool WebRtcSession::Initialize(
521 const PeerConnectionFactoryInterface::Options& options, 521 const PeerConnectionFactoryInterface::Options& options,
522 const MediaConstraintsInterface* constraints, 522 const MediaConstraintsInterface* constraints,
523 DTLSIdentityServiceInterface* dtls_identity_service, 523 DTLSIdentityServiceInterface* dtls_identity_service,
524 rtc::KeyType key_type,
524 const PeerConnectionInterface::RTCConfiguration& rtc_configuration) { 525 const PeerConnectionInterface::RTCConfiguration& rtc_configuration) {
525 bundle_policy_ = rtc_configuration.bundle_policy; 526 bundle_policy_ = rtc_configuration.bundle_policy;
526 rtcp_mux_policy_ = rtc_configuration.rtcp_mux_policy; 527 rtcp_mux_policy_ = rtc_configuration.rtcp_mux_policy;
527 SetSslMaxProtocolVersion(options.ssl_max_version); 528 SetSslMaxProtocolVersion(options.ssl_max_version);
528 529
529 // TODO(perkj): Take |constraints| into consideration. Return false if not all 530 // TODO(perkj): Take |constraints| into consideration. Return false if not all
530 // mandatory constraints can be fulfilled. Note that |constraints| 531 // mandatory constraints can be fulfilled. Note that |constraints|
531 // can be null. 532 // can be null.
532 bool value; 533 bool value;
533 534
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 JsepSessionDescription::kDefaultVideoCodecFramerate, 656 JsepSessionDescription::kDefaultVideoCodecFramerate,
656 JsepSessionDescription::kDefaultVideoCodecPreference); 657 JsepSessionDescription::kDefaultVideoCodecPreference);
657 channel_manager_->SetDefaultVideoEncoderConfig( 658 channel_manager_->SetDefaultVideoEncoderConfig(
658 cricket::VideoEncoderConfig(default_codec)); 659 cricket::VideoEncoderConfig(default_codec));
659 660
660 webrtc_session_desc_factory_.reset(new WebRtcSessionDescriptionFactory( 661 webrtc_session_desc_factory_.reset(new WebRtcSessionDescriptionFactory(
661 signaling_thread(), 662 signaling_thread(),
662 channel_manager_, 663 channel_manager_,
663 mediastream_signaling_, 664 mediastream_signaling_,
664 dtls_identity_service, 665 dtls_identity_service,
666 key_type,
665 this, 667 this,
666 id(), 668 id(),
667 data_channel_type_, 669 data_channel_type_,
668 dtls_enabled_)); 670 dtls_enabled_));
669 671
670 webrtc_session_desc_factory_->SignalIdentityReady.connect( 672 webrtc_session_desc_factory_->SignalIdentityReady.connect(
671 this, &WebRtcSession::OnIdentityReady); 673 this, &WebRtcSession::OnIdentityReady);
672 674
673 if (options.disable_encryption) { 675 if (options.disable_encryption) {
674 webrtc_session_desc_factory_->SetSdesPolicy(cricket::SEC_DISABLED); 676 webrtc_session_desc_factory_->SetSdesPolicy(cricket::SEC_DISABLED);
(...skipping 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after
1898 metrics_observer_->IncrementCounter(kBestConnections_IPv6); 1900 metrics_observer_->IncrementCounter(kBestConnections_IPv6);
1899 } else { 1901 } else {
1900 ASSERT(false); 1902 ASSERT(false);
1901 } 1903 }
1902 return; 1904 return;
1903 } 1905 }
1904 } 1906 }
1905 } 1907 }
1906 1908
1907 } // namespace webrtc 1909 } // namespace webrtc
OLDNEW
« no previous file with comments | « talk/app/webrtc/webrtcsession.h ('k') | talk/app/webrtc/webrtcsession_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698