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

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

Issue 1363573002: Wire up transport sequence number / send time callbacks to webrtc via libjingle. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Cleanup Created 5 years, 2 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 * 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 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 if (configuration.tcp_candidate_policy == kTcpCandidatePolicyDisabled) { 413 if (configuration.tcp_candidate_policy == kTcpCandidatePolicyDisabled) {
414 portallocator_flags |= cricket::PORTALLOCATOR_DISABLE_TCP; 414 portallocator_flags |= cricket::PORTALLOCATOR_DISABLE_TCP;
415 LOG(LS_INFO) << "TCP candidates are disabled."; 415 LOG(LS_INFO) << "TCP candidates are disabled.";
416 } 416 }
417 417
418 port_allocator_->set_flags(portallocator_flags); 418 port_allocator_->set_flags(portallocator_flags);
419 // No step delay is used while allocating ports. 419 // No step delay is used while allocating ports.
420 port_allocator_->set_step_delay(cricket::kMinimumStepDelay); 420 port_allocator_->set_step_delay(cricket::kMinimumStepDelay);
421 421
422 mediastream_signaling_.reset(new MediaStreamSignaling( 422 mediastream_signaling_.reset(new MediaStreamSignaling(
423 factory_->signaling_thread(), this, factory_->channel_manager())); 423 factory_->signaling_thread(), this,
424 factory_->media_controller()->channel_manager()));
424 425
425 session_.reset(new WebRtcSession(factory_->channel_manager(), 426 session_.reset(
426 factory_->signaling_thread(), 427 new WebRtcSession(factory_->media_controller(),
427 factory_->worker_thread(), 428 factory_->signaling_thread(), factory_->worker_thread(),
428 port_allocator_.get(), 429 port_allocator_.get(), mediastream_signaling_.get()));
429 mediastream_signaling_.get()));
430 stats_.reset(new StatsCollector(session_.get())); 430 stats_.reset(new StatsCollector(session_.get()));
431 431
432 // Initialize the WebRtcSession. It creates transport channels etc. 432 // Initialize the WebRtcSession. It creates transport channels etc.
433 if (!session_->Initialize(factory_->options(), constraints, 433 if (!session_->Initialize(factory_->options(), constraints,
434 dtls_identity_store.Pass(), configuration)) 434 dtls_identity_store.Pass(), configuration))
435 return false; 435 return false;
436 436
437 // Register PeerConnection as receiver of local ice candidates. 437 // Register PeerConnection as receiver of local ice candidates.
438 // All the callbacks will be posted to the application from PeerConnection. 438 // All the callbacks will be posted to the application from PeerConnection.
439 session_->RegisterIceObserver(this); 439 session_->RegisterIceObserver(this);
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
1010 std::vector<rtc::scoped_refptr<RtpReceiverInterface>>::iterator 1010 std::vector<rtc::scoped_refptr<RtpReceiverInterface>>::iterator
1011 PeerConnection::FindReceiverForTrack(MediaStreamTrackInterface* track) { 1011 PeerConnection::FindReceiverForTrack(MediaStreamTrackInterface* track) {
1012 return std::find_if( 1012 return std::find_if(
1013 receivers_.begin(), receivers_.end(), 1013 receivers_.begin(), receivers_.end(),
1014 [track](const rtc::scoped_refptr<RtpReceiverInterface>& receiver) { 1014 [track](const rtc::scoped_refptr<RtpReceiverInterface>& receiver) {
1015 return receiver->track() == track; 1015 return receiver->track() == track;
1016 }); 1016 });
1017 } 1017 }
1018 1018
1019 } // namespace webrtc 1019 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698