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

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

Issue 1369773003: Add a continual_gathering_policy in PeerConnection RTCConfiguration (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Rebase to master 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/peerconnectioninterface.h ('k') | talk/app/webrtc/webrtcsession.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 * 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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 // The ownership of |desc| will be transferred after this call. 171 // The ownership of |desc| will be transferred after this call.
172 bool SetLocalDescription(SessionDescriptionInterface* desc, 172 bool SetLocalDescription(SessionDescriptionInterface* desc,
173 std::string* err_desc); 173 std::string* err_desc);
174 // The ownership of |desc| will be transferred after this call. 174 // The ownership of |desc| will be transferred after this call.
175 bool SetRemoteDescription(SessionDescriptionInterface* desc, 175 bool SetRemoteDescription(SessionDescriptionInterface* desc,
176 std::string* err_desc); 176 std::string* err_desc);
177 bool ProcessIceMessage(const IceCandidateInterface* ice_candidate); 177 bool ProcessIceMessage(const IceCandidateInterface* ice_candidate);
178 178
179 bool SetIceTransports(PeerConnectionInterface::IceTransportsType type); 179 bool SetIceTransports(PeerConnectionInterface::IceTransportsType type);
180 180
181 cricket::IceConfig ParseIceConfig(
182 const PeerConnectionInterface::RTCConfiguration& config) const;
183
181 const SessionDescriptionInterface* local_description() const { 184 const SessionDescriptionInterface* local_description() const {
182 return local_desc_.get(); 185 return local_desc_.get();
183 } 186 }
184 const SessionDescriptionInterface* remote_description() const { 187 const SessionDescriptionInterface* remote_description() const {
185 return remote_desc_.get(); 188 return remote_desc_.get();
186 } 189 }
187 // TODO(pthatcher): Cleanup the distinction between 190 // TODO(pthatcher): Cleanup the distinction between
188 // SessionDescription and SessionDescriptionInterface and remove 191 // SessionDescription and SessionDescriptionInterface and remove
189 // these if possible. 192 // these if possible.
190 const cricket::SessionDescription* base_local_description() const { 193 const cricket::SessionDescription* base_local_description() const {
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 PeerConnectionInterface::BundlePolicy bundle_policy_; 425 PeerConnectionInterface::BundlePolicy bundle_policy_;
423 426
424 // Declares the RTCP mux policy for the WebRTCSession. 427 // Declares the RTCP mux policy for the WebRTCSession.
425 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 428 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
426 429
427 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 430 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
428 }; 431 };
429 } // namespace webrtc 432 } // namespace webrtc
430 433
431 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ 434 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/peerconnectioninterface.h ('k') | talk/app/webrtc/webrtcsession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698