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

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

Issue 2590753002: Implement current/pending session description methods. (Closed)
Patch Set: Fixing null pointer deref. Created 3 years, 12 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 | « webrtc/api/peerconnection.cc ('k') | webrtc/api/peerconnectioninterface_unittest.cc » ('j') | 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 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 // break third party projects. As soon as they have been updated this should 492 // break third party projects. As soon as they have been updated this should
493 // be changed to "= 0;". 493 // be changed to "= 0;".
494 virtual void GetStats(RTCStatsCollectorCallback* callback) {} 494 virtual void GetStats(RTCStatsCollectorCallback* callback) {}
495 495
496 virtual rtc::scoped_refptr<DataChannelInterface> CreateDataChannel( 496 virtual rtc::scoped_refptr<DataChannelInterface> CreateDataChannel(
497 const std::string& label, 497 const std::string& label,
498 const DataChannelInit* config) = 0; 498 const DataChannelInit* config) = 0;
499 499
500 virtual const SessionDescriptionInterface* local_description() const = 0; 500 virtual const SessionDescriptionInterface* local_description() const = 0;
501 virtual const SessionDescriptionInterface* remote_description() const = 0; 501 virtual const SessionDescriptionInterface* remote_description() const = 0;
502 // A "current" description the one currently negotiated from a complete
503 // offer/answer exchange.
504 virtual const SessionDescriptionInterface* current_local_description() const {
505 return nullptr;
506 }
507 virtual const SessionDescriptionInterface* current_remote_description()
508 const {
509 return nullptr;
510 }
511 // A "pending" description is one that's part of an incomplete offer/answer
512 // exchange (thus, either an offer or a pranswer). Once the offer/answer
513 // exchange is finished, the "pending" description will become "current".
514 virtual const SessionDescriptionInterface* pending_local_description() const {
515 return nullptr;
516 }
517 virtual const SessionDescriptionInterface* pending_remote_description()
518 const {
519 return nullptr;
520 }
502 521
503 // Create a new offer. 522 // Create a new offer.
504 // The CreateSessionDescriptionObserver callback will be called when done. 523 // The CreateSessionDescriptionObserver callback will be called when done.
505 virtual void CreateOffer(CreateSessionDescriptionObserver* observer, 524 virtual void CreateOffer(CreateSessionDescriptionObserver* observer,
506 const MediaConstraintsInterface* constraints) {} 525 const MediaConstraintsInterface* constraints) {}
507 526
508 // TODO(jiayl): remove the default impl and the old interface when chromium 527 // TODO(jiayl): remove the default impl and the old interface when chromium
509 // code is updated. 528 // code is updated.
510 virtual void CreateOffer(CreateSessionDescriptionObserver* observer, 529 virtual void CreateOffer(CreateSessionDescriptionObserver* observer,
511 const RTCOfferAnswerOptions& options) {} 530 const RTCOfferAnswerOptions& options) {}
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 cricket::WebRtcVideoEncoderFactory* encoder_factory, 860 cricket::WebRtcVideoEncoderFactory* encoder_factory,
842 cricket::WebRtcVideoDecoderFactory* decoder_factory) { 861 cricket::WebRtcVideoDecoderFactory* decoder_factory) {
843 return CreatePeerConnectionFactory( 862 return CreatePeerConnectionFactory(
844 worker_and_network_thread, worker_and_network_thread, signaling_thread, 863 worker_and_network_thread, worker_and_network_thread, signaling_thread,
845 default_adm, encoder_factory, decoder_factory); 864 default_adm, encoder_factory, decoder_factory);
846 } 865 }
847 866
848 } // namespace webrtc 867 } // namespace webrtc
849 868
850 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 869 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « webrtc/api/peerconnection.cc ('k') | webrtc/api/peerconnectioninterface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698