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

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

Issue 1231913003: Add methods to set the ICE connection receiving_timeout values. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Address comments Created 5 years, 5 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/peerconnection.h ('k') | talk/app/webrtc/peerconnectioninterface.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 631 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 } 642 }
643 643
644 void PeerConnection::PostSetSessionDescriptionFailure( 644 void PeerConnection::PostSetSessionDescriptionFailure(
645 SetSessionDescriptionObserver* observer, 645 SetSessionDescriptionObserver* observer,
646 const std::string& error) { 646 const std::string& error) {
647 SetSessionDescriptionMsg* msg = new SetSessionDescriptionMsg(observer); 647 SetSessionDescriptionMsg* msg = new SetSessionDescriptionMsg(observer);
648 msg->error = error; 648 msg->error = error;
649 signaling_thread()->Post(this, MSG_SET_SESSIONDESCRIPTION_FAILED, msg); 649 signaling_thread()->Post(this, MSG_SET_SESSIONDESCRIPTION_FAILED, msg);
650 } 650 }
651 651
652 void PeerConnection::SetIceConnectionReceivingTimeout(int timeout_ms) {
653 session_->SetIceConnectionReceivingTimeout(timeout_ms);
654 }
655
652 bool PeerConnection::UpdateIce(const IceServers& configuration, 656 bool PeerConnection::UpdateIce(const IceServers& configuration,
653 const MediaConstraintsInterface* constraints) { 657 const MediaConstraintsInterface* constraints) {
654 return false; 658 return false;
655 } 659 }
656 660
657 bool PeerConnection::UpdateIce(const RTCConfiguration& config) { 661 bool PeerConnection::UpdateIce(const RTCConfiguration& config) {
658 if (port_allocator_) { 662 if (port_allocator_) {
659 std::vector<PortAllocatorFactoryInterface::StunConfiguration> stuns; 663 std::vector<PortAllocatorFactoryInterface::StunConfiguration> stuns;
660 std::vector<PortAllocatorFactoryInterface::TurnConfiguration> turns; 664 std::vector<PortAllocatorFactoryInterface::TurnConfiguration> turns;
661 if (!ParseIceServers(config.servers, &stuns, &turns)) { 665 if (!ParseIceServers(config.servers, &stuns, &turns)) {
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
900 if (ice_gathering_state_ != kIceGatheringComplete) { 904 if (ice_gathering_state_ != kIceGatheringComplete) {
901 ice_gathering_state_ = kIceGatheringComplete; 905 ice_gathering_state_ = kIceGatheringComplete;
902 observer_->OnIceGatheringChange(ice_gathering_state_); 906 observer_->OnIceGatheringChange(ice_gathering_state_);
903 } 907 }
904 } 908 }
905 observer_->OnSignalingChange(signaling_state_); 909 observer_->OnSignalingChange(signaling_state_);
906 observer_->OnStateChange(PeerConnectionObserver::kSignalingState); 910 observer_->OnStateChange(PeerConnectionObserver::kSignalingState);
907 } 911 }
908 912
909 } // namespace webrtc 913 } // namespace webrtc
OLDNEW
« no previous file with comments | « talk/app/webrtc/peerconnection.h ('k') | talk/app/webrtc/peerconnectioninterface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698