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

Side by Side Diff: webrtc/api/peerconnectioninterface.h

Issue 2306833003: Provide a default implementation for PeerConnectionInterface::ice_state(). (Closed)
Patch Set: Created 4 years, 3 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 | « no previous file | no next file » | 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 * 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 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 } 500 }
501 501
502 virtual void RegisterUMAObserver(UMAObserver* observer) = 0; 502 virtual void RegisterUMAObserver(UMAObserver* observer) = 0;
503 503
504 // Returns the current SignalingState. 504 // Returns the current SignalingState.
505 virtual SignalingState signaling_state() = 0; 505 virtual SignalingState signaling_state() = 0;
506 506
507 // TODO(bemasc): Remove ice_state when callers are changed to 507 // TODO(bemasc): Remove ice_state when callers are changed to
508 // IceConnection/GatheringState. 508 // IceConnection/GatheringState.
509 // Returns the current IceState. 509 // Returns the current IceState.
510 virtual IceState ice_state() = 0; 510 virtual IceState ice_state() {
511 RTC_NOTREACHED();
512 return kIceNew;
513 }
511 virtual IceConnectionState ice_connection_state() = 0; 514 virtual IceConnectionState ice_connection_state() = 0;
512 virtual IceGatheringState ice_gathering_state() = 0; 515 virtual IceGatheringState ice_gathering_state() = 0;
513 516
514 // Starts RtcEventLog using existing file. Takes ownership of |file| and 517 // Starts RtcEventLog using existing file. Takes ownership of |file| and
515 // passes it on to Call, which will take the ownership. If the 518 // passes it on to Call, which will take the ownership. If the
516 // operation fails the file will be closed. The logging will stop 519 // operation fails the file will be closed. The logging will stop
517 // automatically after 10 minutes have passed, or when the StopRtcEventLog 520 // automatically after 10 minutes have passed, or when the StopRtcEventLog
518 // function is called. 521 // function is called.
519 // TODO(ivoc): Make this pure virtual when Chrome is updated. 522 // TODO(ivoc): Make this pure virtual when Chrome is updated.
520 virtual bool StartRtcEventLog(rtc::PlatformFile file, 523 virtual bool StartRtcEventLog(rtc::PlatformFile file,
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 cricket::WebRtcVideoEncoderFactory* encoder_factory, 759 cricket::WebRtcVideoEncoderFactory* encoder_factory,
757 cricket::WebRtcVideoDecoderFactory* decoder_factory) { 760 cricket::WebRtcVideoDecoderFactory* decoder_factory) {
758 return CreatePeerConnectionFactory( 761 return CreatePeerConnectionFactory(
759 worker_and_network_thread, worker_and_network_thread, signaling_thread, 762 worker_and_network_thread, worker_and_network_thread, signaling_thread,
760 default_adm, encoder_factory, decoder_factory); 763 default_adm, encoder_factory, decoder_factory);
761 } 764 }
762 765
763 } // namespace webrtc 766 } // namespace webrtc
764 767
765 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 768 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698