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

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

Issue 1317353005: Adding PeerConnectionInterface::SetConfiguration method. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Deleting some unused code, and adding TODO for pending deletion Created 5 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 | « 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 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 // The |observer| callback will be called when done. 358 // The |observer| callback will be called when done.
359 virtual void SetLocalDescription(SetSessionDescriptionObserver* observer, 359 virtual void SetLocalDescription(SetSessionDescriptionObserver* observer,
360 SessionDescriptionInterface* desc) = 0; 360 SessionDescriptionInterface* desc) = 0;
361 // Sets the remote session description. 361 // Sets the remote session description.
362 // JsepInterface takes the ownership of |desc| even if it fails. 362 // JsepInterface takes the ownership of |desc| even if it fails.
363 // The |observer| callback will be called when done. 363 // The |observer| callback will be called when done.
364 virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer, 364 virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer,
365 SessionDescriptionInterface* desc) = 0; 365 SessionDescriptionInterface* desc) = 0;
366 // Restarts or updates the ICE Agent process of gathering local candidates 366 // Restarts or updates the ICE Agent process of gathering local candidates
367 // and pinging remote candidates. 367 // and pinging remote candidates.
368 // TODO(deadbeef): Remove once Chrome is moved over to SetConfiguration.
368 virtual bool UpdateIce(const IceServers& configuration, 369 virtual bool UpdateIce(const IceServers& configuration,
369 const MediaConstraintsInterface* constraints) = 0; 370 const MediaConstraintsInterface* constraints) = 0;
371 // Sets the PeerConnection's global configuration to |config|.
372 // Any changes to STUN/TURN servers or ICE candidate policy will affect the
373 // next gathering phase, and cause the next call to createOffer to generate
374 // new ICE credentials. Note that the BUNDLE and RTCP-multiplexing policies
375 // cannot be changed with this method.
376 virtual bool SetConfiguration(
377 const PeerConnectionInterface::RTCConfiguration& config) = 0;
370 // Provides a remote candidate to the ICE Agent. 378 // Provides a remote candidate to the ICE Agent.
371 // A copy of the |candidate| will be created and added to the remote 379 // A copy of the |candidate| will be created and added to the remote
372 // description. So the caller of this method still has the ownership of the 380 // description. So the caller of this method still has the ownership of the
373 // |candidate|. 381 // |candidate|.
374 // TODO(ronghuawu): Consider to change this so that the AddIceCandidate will 382 // TODO(ronghuawu): Consider to change this so that the AddIceCandidate will
375 // take the ownership of the |candidate|. 383 // take the ownership of the |candidate|.
376 virtual bool AddIceCandidate(const IceCandidateInterface* candidate) = 0; 384 virtual bool AddIceCandidate(const IceCandidateInterface* candidate) = 0;
377 385
378 virtual void RegisterUMAObserver(UMAObserver* observer) = 0; 386 virtual void RegisterUMAObserver(UMAObserver* observer) = 0;
379 387
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 CreatePeerConnectionFactory( 612 CreatePeerConnectionFactory(
605 rtc::Thread* worker_thread, 613 rtc::Thread* worker_thread,
606 rtc::Thread* signaling_thread, 614 rtc::Thread* signaling_thread,
607 AudioDeviceModule* default_adm, 615 AudioDeviceModule* default_adm,
608 cricket::WebRtcVideoEncoderFactory* encoder_factory, 616 cricket::WebRtcVideoEncoderFactory* encoder_factory,
609 cricket::WebRtcVideoDecoderFactory* decoder_factory); 617 cricket::WebRtcVideoDecoderFactory* decoder_factory);
610 618
611 } // namespace webrtc 619 } // namespace webrtc
612 620
613 #endif // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_ 621 #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