| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright 2012 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 462 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 473   virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer, | 473   virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer, | 
| 474                                     SessionDescriptionInterface* desc) = 0; | 474                                     SessionDescriptionInterface* desc) = 0; | 
| 475   // Restarts or updates the ICE Agent process of gathering local candidates | 475   // Restarts or updates the ICE Agent process of gathering local candidates | 
| 476   // and pinging remote candidates. | 476   // and pinging remote candidates. | 
| 477   // TODO(deadbeef): Remove once Chrome is moved over to SetConfiguration. | 477   // TODO(deadbeef): Remove once Chrome is moved over to SetConfiguration. | 
| 478   virtual bool UpdateIce(const IceServers& configuration, | 478   virtual bool UpdateIce(const IceServers& configuration, | 
| 479                          const MediaConstraintsInterface* constraints) { | 479                          const MediaConstraintsInterface* constraints) { | 
| 480     return false; | 480     return false; | 
| 481   } | 481   } | 
| 482   virtual bool UpdateIce(const IceServers& configuration) { return false; } | 482   virtual bool UpdateIce(const IceServers& configuration) { return false; } | 
|  | 483   // TODO(deadbeef): Make this pure virtual once all Chrome subclasses of | 
|  | 484   // PeerConnectionInterface implement it. | 
|  | 485   virtual PeerConnectionInterface::RTCConfiguration GetConfiguration() { | 
|  | 486     return PeerConnectionInterface::RTCConfiguration(); | 
|  | 487   } | 
| 483   // Sets the PeerConnection's global configuration to |config|. | 488   // Sets the PeerConnection's global configuration to |config|. | 
| 484   // Any changes to STUN/TURN servers or ICE candidate policy will affect the | 489   // Any changes to STUN/TURN servers or ICE candidate policy will affect the | 
| 485   // next gathering phase, and cause the next call to createOffer to generate | 490   // next gathering phase, and cause the next call to createOffer to generate | 
| 486   // new ICE credentials. Note that the BUNDLE and RTCP-multiplexing policies | 491   // new ICE credentials. Note that the BUNDLE and RTCP-multiplexing policies | 
| 487   // cannot be changed with this method. | 492   // cannot be changed with this method. | 
| 488   // TODO(deadbeef): Make this pure virtual once all Chrome subclasses of | 493   // TODO(deadbeef): Make this pure virtual once all Chrome subclasses of | 
| 489   // PeerConnectionInterface implement it. | 494   // PeerConnectionInterface implement it. | 
| 490   virtual bool SetConfiguration( | 495   virtual bool SetConfiguration( | 
| 491       const PeerConnectionInterface::RTCConfiguration& config) { | 496       const PeerConnectionInterface::RTCConfiguration& config) { | 
| 492     return false; | 497     return false; | 
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 757     cricket::WebRtcVideoEncoderFactory* encoder_factory, | 762     cricket::WebRtcVideoEncoderFactory* encoder_factory, | 
| 758     cricket::WebRtcVideoDecoderFactory* decoder_factory) { | 763     cricket::WebRtcVideoDecoderFactory* decoder_factory) { | 
| 759   return CreatePeerConnectionFactory( | 764   return CreatePeerConnectionFactory( | 
| 760       worker_and_network_thread, worker_and_network_thread, signaling_thread, | 765       worker_and_network_thread, worker_and_network_thread, signaling_thread, | 
| 761       default_adm, encoder_factory, decoder_factory); | 766       default_adm, encoder_factory, decoder_factory); | 
| 762 } | 767 } | 
| 763 | 768 | 
| 764 }  // namespace webrtc | 769 }  // namespace webrtc | 
| 765 | 770 | 
| 766 #endif  // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 771 #endif  // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 
| OLD | NEW | 
|---|