| 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 // See http://dev.w3.org/2011/webrtc/editor/webrtc.html#state-definitions . | 144 // See http://dev.w3.org/2011/webrtc/editor/webrtc.html#state-definitions . |
| 145 enum SignalingState { | 145 enum SignalingState { |
| 146 kStable, | 146 kStable, |
| 147 kHaveLocalOffer, | 147 kHaveLocalOffer, |
| 148 kHaveLocalPrAnswer, | 148 kHaveLocalPrAnswer, |
| 149 kHaveRemoteOffer, | 149 kHaveRemoteOffer, |
| 150 kHaveRemotePrAnswer, | 150 kHaveRemotePrAnswer, |
| 151 kClosed, | 151 kClosed, |
| 152 }; | 152 }; |
| 153 | 153 |
| 154 // TODO(bemasc): Remove IceState when callers are changed to | |
| 155 // IceConnection/GatheringState. | |
| 156 enum IceState { | |
| 157 kIceNew, | |
| 158 kIceGathering, | |
| 159 kIceWaiting, | |
| 160 kIceChecking, | |
| 161 kIceConnected, | |
| 162 kIceCompleted, | |
| 163 kIceFailed, | |
| 164 kIceClosed, | |
| 165 }; | |
| 166 | |
| 167 enum IceGatheringState { | 154 enum IceGatheringState { |
| 168 kIceGatheringNew, | 155 kIceGatheringNew, |
| 169 kIceGatheringGathering, | 156 kIceGatheringGathering, |
| 170 kIceGatheringComplete | 157 kIceGatheringComplete |
| 171 }; | 158 }; |
| 172 | 159 |
| 173 enum IceConnectionState { | 160 enum IceConnectionState { |
| 174 kIceConnectionNew, | 161 kIceConnectionNew, |
| 175 kIceConnectionChecking, | 162 kIceConnectionChecking, |
| 176 kIceConnectionConnected, | 163 kIceConnectionConnected, |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 virtual bool RemoveIceCandidates( | 467 virtual bool RemoveIceCandidates( |
| 481 const std::vector<cricket::Candidate>& candidates) { | 468 const std::vector<cricket::Candidate>& candidates) { |
| 482 return false; | 469 return false; |
| 483 } | 470 } |
| 484 | 471 |
| 485 virtual void RegisterUMAObserver(UMAObserver* observer) = 0; | 472 virtual void RegisterUMAObserver(UMAObserver* observer) = 0; |
| 486 | 473 |
| 487 // Returns the current SignalingState. | 474 // Returns the current SignalingState. |
| 488 virtual SignalingState signaling_state() = 0; | 475 virtual SignalingState signaling_state() = 0; |
| 489 | 476 |
| 490 // TODO(bemasc): Remove ice_state when callers are changed to | |
| 491 // IceConnection/GatheringState. | |
| 492 // Returns the current IceState. | |
| 493 virtual IceState ice_state() = 0; | |
| 494 virtual IceConnectionState ice_connection_state() = 0; | 477 virtual IceConnectionState ice_connection_state() = 0; |
| 495 virtual IceGatheringState ice_gathering_state() = 0; | 478 virtual IceGatheringState ice_gathering_state() = 0; |
| 496 | 479 |
| 497 // Starts RtcEventLog using existing file. Takes ownership of |file| and | 480 // Starts RtcEventLog using existing file. Takes ownership of |file| and |
| 498 // passes it on to Call, which will take the ownership. If the | 481 // passes it on to Call, which will take the ownership. If the |
| 499 // operation fails the file will be closed. The logging will stop | 482 // operation fails the file will be closed. The logging will stop |
| 500 // automatically after 10 minutes have passed, or when the StopRtcEventLog | 483 // automatically after 10 minutes have passed, or when the StopRtcEventLog |
| 501 // function is called. | 484 // function is called. |
| 502 // TODO(ivoc): Make this pure virtual when Chrome is updated. | 485 // TODO(ivoc): Make this pure virtual when Chrome is updated. |
| 503 virtual bool StartRtcEventLog(rtc::PlatformFile file, | 486 virtual bool StartRtcEventLog(rtc::PlatformFile file, |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 739 cricket::WebRtcVideoEncoderFactory* encoder_factory, | 722 cricket::WebRtcVideoEncoderFactory* encoder_factory, |
| 740 cricket::WebRtcVideoDecoderFactory* decoder_factory) { | 723 cricket::WebRtcVideoDecoderFactory* decoder_factory) { |
| 741 return CreatePeerConnectionFactory( | 724 return CreatePeerConnectionFactory( |
| 742 worker_and_network_thread, worker_and_network_thread, signaling_thread, | 725 worker_and_network_thread, worker_and_network_thread, signaling_thread, |
| 743 default_adm, encoder_factory, decoder_factory); | 726 default_adm, encoder_factory, decoder_factory); |
| 744 } | 727 } |
| 745 | 728 |
| 746 } // namespace webrtc | 729 } // namespace webrtc |
| 747 | 730 |
| 748 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 731 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ |
| OLD | NEW |