OLD | NEW |
---|---|
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 Loading... | |
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 | |
656 bool PeerConnection::UpdateIce(const IceServers& configuration, | 652 bool PeerConnection::UpdateIce(const IceServers& configuration, |
657 const MediaConstraintsInterface* constraints) { | 653 const MediaConstraintsInterface* constraints) { |
658 return false; | 654 return false; |
659 } | 655 } |
660 | 656 |
661 bool PeerConnection::UpdateIce(const RTCConfiguration& config) { | 657 bool PeerConnection::UpdateIce(const RTCConfiguration& config) { |
pthatcher2
2015/08/26 18:33:18
I think we need to handle it being updated here as
honghaiz3
2015/08/26 19:20:25
Done. Thanks!
| |
662 if (port_allocator_) { | 658 if (port_allocator_) { |
663 std::vector<PortAllocatorFactoryInterface::StunConfiguration> stuns; | 659 std::vector<PortAllocatorFactoryInterface::StunConfiguration> stuns; |
664 std::vector<PortAllocatorFactoryInterface::TurnConfiguration> turns; | 660 std::vector<PortAllocatorFactoryInterface::TurnConfiguration> turns; |
665 if (!ParseIceServers(config.servers, &stuns, &turns)) { | 661 if (!ParseIceServers(config.servers, &stuns, &turns)) { |
666 return false; | 662 return false; |
667 } | 663 } |
668 | 664 |
669 std::vector<rtc::SocketAddress> stun_hosts; | 665 std::vector<rtc::SocketAddress> stun_hosts; |
670 typedef std::vector<StunConfiguration>::const_iterator StunIt; | 666 typedef std::vector<StunConfiguration>::const_iterator StunIt; |
671 for (StunIt stun_it = stuns.begin(); stun_it != stuns.end(); ++stun_it) { | 667 for (StunIt stun_it = stuns.begin(); stun_it != stuns.end(); ++stun_it) { |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
904 if (ice_gathering_state_ != kIceGatheringComplete) { | 900 if (ice_gathering_state_ != kIceGatheringComplete) { |
905 ice_gathering_state_ = kIceGatheringComplete; | 901 ice_gathering_state_ = kIceGatheringComplete; |
906 observer_->OnIceGatheringChange(ice_gathering_state_); | 902 observer_->OnIceGatheringChange(ice_gathering_state_); |
907 } | 903 } |
908 } | 904 } |
909 observer_->OnSignalingChange(signaling_state_); | 905 observer_->OnSignalingChange(signaling_state_); |
910 observer_->OnStateChange(PeerConnectionObserver::kSignalingState); | 906 observer_->OnStateChange(PeerConnectionObserver::kSignalingState); |
911 } | 907 } |
912 | 908 |
913 } // namespace webrtc | 909 } // namespace webrtc |
OLD | NEW |