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

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

Issue 1369773003: Add a continual_gathering_policy in PeerConnection RTCConfiguration (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Rebase to master 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 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 relay_server.credentials = credentials; 689 relay_server.credentials = credentials;
690 LOG(LS_INFO) << "UpdateIce: TurnServer Address: " 690 LOG(LS_INFO) << "UpdateIce: TurnServer Address: "
691 << turns[i].server.ToString(); 691 << turns[i].server.ToString();
692 } else { 692 } else {
693 LOG(LS_WARNING) << "Ignoring TURN server " << turns[i].server << ". " 693 LOG(LS_WARNING) << "Ignoring TURN server " << turns[i].server << ". "
694 << "Reason= Incorrect " << turns[i].transport_type 694 << "Reason= Incorrect " << turns[i].transport_type
695 << " transport parameter."; 695 << " transport parameter.";
696 } 696 }
697 } 697 }
698 } 698 }
699 session_->SetIceConnectionReceivingTimeout( 699 session_->SetIceConfig(session_->ParseIceConfig(config));
700 config.ice_connection_receiving_timeout);
701 return session_->SetIceTransports(config.type); 700 return session_->SetIceTransports(config.type);
702 } 701 }
703 702
704 bool PeerConnection::AddIceCandidate( 703 bool PeerConnection::AddIceCandidate(
705 const IceCandidateInterface* ice_candidate) { 704 const IceCandidateInterface* ice_candidate) {
706 return session_->ProcessIceMessage(ice_candidate); 705 return session_->ProcessIceMessage(ice_candidate);
707 } 706 }
708 707
709 void PeerConnection::RegisterUMAObserver(UMAObserver* observer) { 708 void PeerConnection::RegisterUMAObserver(UMAObserver* observer) {
710 uma_observer_ = observer; 709 uma_observer_ = observer;
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 if (ice_gathering_state_ != kIceGatheringComplete) { 914 if (ice_gathering_state_ != kIceGatheringComplete) {
916 ice_gathering_state_ = kIceGatheringComplete; 915 ice_gathering_state_ = kIceGatheringComplete;
917 observer_->OnIceGatheringChange(ice_gathering_state_); 916 observer_->OnIceGatheringChange(ice_gathering_state_);
918 } 917 }
919 } 918 }
920 observer_->OnSignalingChange(signaling_state_); 919 observer_->OnSignalingChange(signaling_state_);
921 observer_->OnStateChange(PeerConnectionObserver::kSignalingState); 920 observer_->OnStateChange(PeerConnectionObserver::kSignalingState);
922 } 921 }
923 922
924 } // namespace webrtc 923 } // namespace webrtc
OLDNEW
« no previous file with comments | « talk/app/webrtc/java/src/org/webrtc/PeerConnection.java ('k') | talk/app/webrtc/peerconnectioninterface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698