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

Side by Side Diff: talk/app/webrtc/peerconnectioninterface.h

Issue 1361273002: Reland of Adding PeerConnectionInterface::SetConfiguration method. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing patch conflict. 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
« no previous file with comments | « talk/app/webrtc/peerconnection.cc ('k') | talk/app/webrtc/peerconnectionproxy.h » ('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 * 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 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 // The |observer| callback will be called when done. 372 // The |observer| callback will be called when done.
373 virtual void SetLocalDescription(SetSessionDescriptionObserver* observer, 373 virtual void SetLocalDescription(SetSessionDescriptionObserver* observer,
374 SessionDescriptionInterface* desc) = 0; 374 SessionDescriptionInterface* desc) = 0;
375 // Sets the remote session description. 375 // Sets the remote session description.
376 // JsepInterface takes the ownership of |desc| even if it fails. 376 // JsepInterface takes the ownership of |desc| even if it fails.
377 // The |observer| callback will be called when done. 377 // The |observer| callback will be called when done.
378 virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer, 378 virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer,
379 SessionDescriptionInterface* desc) = 0; 379 SessionDescriptionInterface* desc) = 0;
380 // Restarts or updates the ICE Agent process of gathering local candidates 380 // Restarts or updates the ICE Agent process of gathering local candidates
381 // and pinging remote candidates. 381 // and pinging remote candidates.
382 // TODO(deadbeef): Remove once Chrome is moved over to SetConfiguration.
382 virtual bool UpdateIce(const IceServers& configuration, 383 virtual bool UpdateIce(const IceServers& configuration,
383 const MediaConstraintsInterface* constraints) = 0; 384 const MediaConstraintsInterface* constraints) {
385 return false;
386 }
387 // Sets the PeerConnection's global configuration to |config|.
388 // Any changes to STUN/TURN servers or ICE candidate policy will affect the
389 // next gathering phase, and cause the next call to createOffer to generate
390 // new ICE credentials. Note that the BUNDLE and RTCP-multiplexing policies
391 // cannot be changed with this method.
392 // TODO(deadbeef): Make this pure virtual once all Chrome subclasses of
393 // PeerConnectionInterface implement it.
394 virtual bool SetConfiguration(
395 const PeerConnectionInterface::RTCConfiguration& config) {
396 return false;
397 }
384 // Provides a remote candidate to the ICE Agent. 398 // Provides a remote candidate to the ICE Agent.
385 // A copy of the |candidate| will be created and added to the remote 399 // A copy of the |candidate| will be created and added to the remote
386 // description. So the caller of this method still has the ownership of the 400 // description. So the caller of this method still has the ownership of the
387 // |candidate|. 401 // |candidate|.
388 // TODO(ronghuawu): Consider to change this so that the AddIceCandidate will 402 // TODO(ronghuawu): Consider to change this so that the AddIceCandidate will
389 // take the ownership of the |candidate|. 403 // take the ownership of the |candidate|.
390 virtual bool AddIceCandidate(const IceCandidateInterface* candidate) = 0; 404 virtual bool AddIceCandidate(const IceCandidateInterface* candidate) = 0;
391 405
392 virtual void RegisterUMAObserver(UMAObserver* observer) = 0; 406 virtual void RegisterUMAObserver(UMAObserver* observer) = 0;
393 407
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 CreatePeerConnectionFactory( 632 CreatePeerConnectionFactory(
619 rtc::Thread* worker_thread, 633 rtc::Thread* worker_thread,
620 rtc::Thread* signaling_thread, 634 rtc::Thread* signaling_thread,
621 AudioDeviceModule* default_adm, 635 AudioDeviceModule* default_adm,
622 cricket::WebRtcVideoEncoderFactory* encoder_factory, 636 cricket::WebRtcVideoEncoderFactory* encoder_factory,
623 cricket::WebRtcVideoDecoderFactory* decoder_factory); 637 cricket::WebRtcVideoDecoderFactory* decoder_factory);
624 638
625 } // namespace webrtc 639 } // namespace webrtc
626 640
627 #endif // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_ 641 #endif // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/peerconnection.cc ('k') | talk/app/webrtc/peerconnectionproxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698