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

Side by Side Diff: webrtc/api/peerconnectionfactory.cc

Issue 2295493002: Add a switch to redetermine role when ICE restarts. (Closed)
Patch Set: . Created 4 years, 3 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 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2004 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 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 } 302 }
303 303
304 webrtc::MediaControllerInterface* PeerConnectionFactory::CreateMediaController( 304 webrtc::MediaControllerInterface* PeerConnectionFactory::CreateMediaController(
305 const cricket::MediaConfig& config) const { 305 const cricket::MediaConfig& config) const {
306 RTC_DCHECK(signaling_thread_->IsCurrent()); 306 RTC_DCHECK(signaling_thread_->IsCurrent());
307 return MediaControllerInterface::Create(config, worker_thread_, 307 return MediaControllerInterface::Create(config, worker_thread_,
308 channel_manager_.get()); 308 channel_manager_.get());
309 } 309 }
310 310
311 cricket::TransportController* PeerConnectionFactory::CreateTransportController( 311 cricket::TransportController* PeerConnectionFactory::CreateTransportController(
312 cricket::PortAllocator* port_allocator) { 312 cricket::PortAllocator* port_allocator,
313 bool redetermine_role_on_ice_restart) {
313 RTC_DCHECK(signaling_thread_->IsCurrent()); 314 RTC_DCHECK(signaling_thread_->IsCurrent());
314 return new cricket::TransportController(signaling_thread_, network_thread_, 315 return new cricket::TransportController(signaling_thread_, network_thread_,
315 port_allocator); 316 port_allocator,
317 redetermine_role_on_ice_restart);
pthatcher1 2016/08/29 22:18:07 Don't you need to change transportcontroller.h als
honghaiz3 2016/08/29 23:16:59 Taylor landed a CL to change the transportcontroll
pthatcher1 2016/08/29 23:27:42 Ah, it's not in cs.chromium.org yet.
316 } 318 }
317 319
318 rtc::Thread* PeerConnectionFactory::signaling_thread() { 320 rtc::Thread* PeerConnectionFactory::signaling_thread() {
319 // This method can be called on a different thread when the factory is 321 // This method can be called on a different thread when the factory is
320 // created in CreatePeerConnectionFactory(). 322 // created in CreatePeerConnectionFactory().
321 return signaling_thread_; 323 return signaling_thread_;
322 } 324 }
323 325
324 rtc::Thread* PeerConnectionFactory::worker_thread() { 326 rtc::Thread* PeerConnectionFactory::worker_thread() {
325 RTC_DCHECK(signaling_thread_->IsCurrent()); 327 RTC_DCHECK(signaling_thread_->IsCurrent());
326 return worker_thread_; 328 return worker_thread_;
327 } 329 }
328 330
329 rtc::Thread* PeerConnectionFactory::network_thread() { 331 rtc::Thread* PeerConnectionFactory::network_thread() {
330 return network_thread_; 332 return network_thread_;
331 } 333 }
332 334
333 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { 335 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() {
334 ASSERT(worker_thread_ == rtc::Thread::Current()); 336 ASSERT(worker_thread_ == rtc::Thread::Current());
335 return cricket::WebRtcMediaEngineFactory::Create( 337 return cricket::WebRtcMediaEngineFactory::Create(
336 default_adm_.get(), 338 default_adm_.get(),
337 audio_decoder_factory_, 339 audio_decoder_factory_,
338 video_encoder_factory_.get(), 340 video_encoder_factory_.get(),
339 video_decoder_factory_.get()); 341 video_decoder_factory_.get());
340 } 342 }
341 343
342 } // namespace webrtc 344 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698