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

Side by Side Diff: talk/app/webrtc/test/peerconnectiontestwrapper.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/proxy.h ('k') | talk/app/webrtc/webrtcsession.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 * libjingle 2 * libjingle
3 * Copyright 2013 Google Inc. 3 * Copyright 2013 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 90
91 // CreatePeerConnection with IceServers. 91 // CreatePeerConnection with IceServers.
92 webrtc::PeerConnectionInterface::IceServers ice_servers; 92 webrtc::PeerConnectionInterface::IceServers ice_servers;
93 webrtc::PeerConnectionInterface::IceServer ice_server; 93 webrtc::PeerConnectionInterface::IceServer ice_server;
94 ice_server.uri = "stun:stun.l.google.com:19302"; 94 ice_server.uri = "stun:stun.l.google.com:19302";
95 ice_servers.push_back(ice_server); 95 ice_servers.push_back(ice_server);
96 FakeIdentityService* dtls_service = 96 FakeIdentityService* dtls_service =
97 rtc::SSLStreamAdapter::HaveDtlsSrtp() ? 97 rtc::SSLStreamAdapter::HaveDtlsSrtp() ?
98 new FakeIdentityService() : NULL; 98 new FakeIdentityService() : NULL;
99 peer_connection_ = peer_connection_factory_->CreatePeerConnection( 99 peer_connection_ = peer_connection_factory_->CreatePeerConnection(
100 ice_servers, constraints, allocator_factory_.get(), dtls_service, this); 100 ice_servers, constraints, allocator_factory_.get(), dtls_service,
101 rtc::KT_DEFAULT, this);
101 102
102 return peer_connection_.get() != NULL; 103 return peer_connection_.get() != NULL;
103 } 104 }
104 105
105 rtc::scoped_refptr<webrtc::DataChannelInterface> 106 rtc::scoped_refptr<webrtc::DataChannelInterface>
106 PeerConnectionTestWrapper::CreateDataChannel( 107 PeerConnectionTestWrapper::CreateDataChannel(
107 const std::string& label, 108 const std::string& label,
108 const webrtc::DataChannelInit& init) { 109 const webrtc::DataChannelInit& init) {
109 return peer_connection_->CreateDataChannel(label, &init); 110 return peer_connection_->CreateDataChannel(label, &init);
110 } 111 }
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 peer_connection_factory_->CreateVideoSource( 289 peer_connection_factory_->CreateVideoSource(
289 new webrtc::FakePeriodicVideoCapturer(), &constraints); 290 new webrtc::FakePeriodicVideoCapturer(), &constraints);
290 std::string videotrack_label = label + kVideoTrackLabelBase; 291 std::string videotrack_label = label + kVideoTrackLabelBase;
291 rtc::scoped_refptr<webrtc::VideoTrackInterface> video_track( 292 rtc::scoped_refptr<webrtc::VideoTrackInterface> video_track(
292 peer_connection_factory_->CreateVideoTrack(videotrack_label, source)); 293 peer_connection_factory_->CreateVideoTrack(videotrack_label, source));
293 294
294 stream->AddTrack(video_track); 295 stream->AddTrack(video_track);
295 } 296 }
296 return stream; 297 return stream;
297 } 298 }
OLDNEW
« no previous file with comments | « talk/app/webrtc/proxy.h ('k') | talk/app/webrtc/webrtcsession.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698