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

Side by Side Diff: talk/app/webrtc/objc/public/RTCPeerConnection.h

Issue 1361263002: Revert of Adding PeerConnectionInterface::SetConfiguration method. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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/objc/RTCPeerConnection.mm ('k') | talk/app/webrtc/peerconnection.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 2013 Google Inc. 3 * Copyright 2013 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,
11 * this list of conditions and the following disclaimer in the documentation 11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution. 12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products 13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #import "RTCPeerConnectionDelegate.h" 28 #import "RTCPeerConnectionDelegate.h"
29 29
30 @class RTCConfiguration;
31 @class RTCDataChannel; 30 @class RTCDataChannel;
32 @class RTCDataChannelInit; 31 @class RTCDataChannelInit;
33 @class RTCICECandidate; 32 @class RTCICECandidate;
34 @class RTCICEServers; 33 @class RTCICEServers;
35 @class RTCMediaConstraints; 34 @class RTCMediaConstraints;
36 @class RTCMediaStream; 35 @class RTCMediaStream;
37 @class RTCMediaStreamTrack; 36 @class RTCMediaStreamTrack;
38 @class RTCSessionDescription; 37 @class RTCSessionDescription;
39 @protocol RTCSessionDescriptionDelegate; 38 @protocol RTCSessionDescriptionDelegate;
40 @protocol RTCStatsDelegate; 39 @protocol RTCStatsDelegate;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 - (void) 90 - (void)
92 setLocalDescriptionWithDelegate:(id<RTCSessionDescriptionDelegate>)delegate 91 setLocalDescriptionWithDelegate:(id<RTCSessionDescriptionDelegate>)delegate
93 sessionDescription:(RTCSessionDescription *)sdp; 92 sessionDescription:(RTCSessionDescription *)sdp;
94 93
95 // Sets the remote session description. 94 // Sets the remote session description.
96 // Success or failure will be reported via RTCSessionDescriptionDelegate. 95 // Success or failure will be reported via RTCSessionDescriptionDelegate.
97 - (void) 96 - (void)
98 setRemoteDescriptionWithDelegate:(id<RTCSessionDescriptionDelegate>)delegate 97 setRemoteDescriptionWithDelegate:(id<RTCSessionDescriptionDelegate>)delegate
99 sessionDescription:(RTCSessionDescription *)sdp; 98 sessionDescription:(RTCSessionDescription *)sdp;
100 99
101 // Sets the PeerConnection's global configuration to |configuration|. 100 // Restarts or updates the ICE Agent process of gathering local candidates
102 // Any changes to STUN/TURN servers or ICE candidate policy will affect the 101 // and pinging remote candidates.
103 // next gathering phase, and cause the next call to createOffer to generate 102 - (BOOL)updateICEServers:(NSArray *)servers
104 // new ICE credentials. Note that the BUNDLE and RTCP-multiplexing policies 103 constraints:(RTCMediaConstraints *)constraints;
105 // cannot be changed with this method.
106 - (BOOL)setConfiguration:(RTCConfiguration *)configuration;
107 104
108 // Provides a remote candidate to the ICE Agent. 105 // Provides a remote candidate to the ICE Agent.
109 - (BOOL)addICECandidate:(RTCICECandidate *)candidate; 106 - (BOOL)addICECandidate:(RTCICECandidate *)candidate;
110 107
111 // Terminates all media and closes the transport. 108 // Terminates all media and closes the transport.
112 - (void)close; 109 - (void)close;
113 110
114 // Gets statistics for the media track. If |mediaStreamTrack| is nil statistics 111 // Gets statistics for the media track. If |mediaStreamTrack| is nil statistics
115 // are gathered for all tracks. 112 // are gathered for all tracks.
116 // Statistics information will be reported via RTCStatsDelegate. 113 // Statistics information will be reported via RTCStatsDelegate.
117 - (BOOL)getStatsWithDelegate:(id<RTCStatsDelegate>)delegate 114 - (BOOL)getStatsWithDelegate:(id<RTCStatsDelegate>)delegate
118 mediaStreamTrack:(RTCMediaStreamTrack*)mediaStreamTrack 115 mediaStreamTrack:(RTCMediaStreamTrack*)mediaStreamTrack
119 statsOutputLevel:(RTCStatsOutputLevel)statsOutputLevel; 116 statsOutputLevel:(RTCStatsOutputLevel)statsOutputLevel;
120 117
121 #ifndef DOXYGEN_SHOULD_SKIP_THIS 118 #ifndef DOXYGEN_SHOULD_SKIP_THIS
122 // Disallow init and don't add to documentation 119 // Disallow init and don't add to documentation
123 - (id)init __attribute__( 120 - (id)init __attribute__(
124 (unavailable("init is not a supported initializer for this class."))); 121 (unavailable("init is not a supported initializer for this class.")));
125 #endif /* DOXYGEN_SHOULD_SKIP_THIS */ 122 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
126 123
127 @end 124 @end
OLDNEW
« no previous file with comments | « talk/app/webrtc/objc/RTCPeerConnection.mm ('k') | talk/app/webrtc/peerconnection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698