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/examples/peerconnection/client/conductor.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/webrtcsessiondescriptionfactory.cc ('k') | webrtc/base/sslidentity.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 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 { 144 {
145 constraints.AddOptional(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp, 145 constraints.AddOptional(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp,
146 "false"); 146 "false");
147 } 147 }
148 148
149 peer_connection_ = 149 peer_connection_ =
150 peer_connection_factory_->CreatePeerConnection(servers, 150 peer_connection_factory_->CreatePeerConnection(servers,
151 &constraints, 151 &constraints,
152 NULL, 152 NULL,
153 NULL, 153 NULL,
154 rtc::KT_DEFAULT,
154 this); 155 this);
155 return peer_connection_.get() != NULL; 156 return peer_connection_.get() != NULL;
156 } 157 }
157 158
158 void Conductor::DeletePeerConnection() { 159 void Conductor::DeletePeerConnection() {
159 peer_connection_ = NULL; 160 peer_connection_ = NULL;
160 active_streams_.clear(); 161 active_streams_.clear();
161 main_wnd_->StopLocalRenderer(); 162 main_wnd_->StopLocalRenderer();
162 main_wnd_->StopRemoteRenderer(); 163 main_wnd_->StopRemoteRenderer();
163 peer_connection_factory_ = NULL; 164 peer_connection_factory_ = NULL;
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 } 551 }
551 552
552 void Conductor::OnFailure(const std::string& error) { 553 void Conductor::OnFailure(const std::string& error) {
553 LOG(LERROR) << error; 554 LOG(LERROR) << error;
554 } 555 }
555 556
556 void Conductor::SendMessage(const std::string& json_object) { 557 void Conductor::SendMessage(const std::string& json_object) {
557 std::string* msg = new std::string(json_object); 558 std::string* msg = new std::string(json_object);
558 main_wnd_->QueueUIThreadCallback(SEND_MESSAGE_TO_PEER, msg); 559 main_wnd_->QueueUIThreadCallback(SEND_MESSAGE_TO_PEER, msg);
559 } 560 }
OLDNEW
« no previous file with comments | « talk/app/webrtc/webrtcsessiondescriptionfactory.cc ('k') | webrtc/base/sslidentity.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698