79b6980020
This is part of "Perfect Negotiation" (https://crbug.com/980872). Spec PR here (merged): https://github.com/w3c/webrtc-pc/pull/2169 Spec: https://w3c.github.io/webrtc-pc/#dfn-localufragstoreplace The restartIce() makes the next createOffer() generate new ICE credentials, as if {iceRestart:true} was passed in as options. It also causes negotiationneeded. This is better than manually restarting ICE because it survives rollbacks (when that is implemented) and restartIce() can be called regardless of current signalingState. Bug: chromium:980881 Change-Id: I8e70bec31ce9d4d6a303bd35e91b2dcc28fcad60 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144941 Commit-Queue: Henrik Boström <hbos@webrtc.org> Reviewed-by: Steve Anton <steveanton@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28596}
144 lines
5.9 KiB
C++
144 lines
5.9 KiB
C++
/*
|
|
* Copyright 2012 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef API_PEER_CONNECTION_PROXY_H_
|
|
#define API_PEER_CONNECTION_PROXY_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "api/peer_connection_interface.h"
|
|
#include "api/proxy.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// TODO(deadbeef): Move this to .cc file and out of api/. What threads methods
|
|
// are called on is an implementation detail.
|
|
BEGIN_SIGNALING_PROXY_MAP(PeerConnection)
|
|
PROXY_SIGNALING_THREAD_DESTRUCTOR()
|
|
PROXY_METHOD0(rtc::scoped_refptr<StreamCollectionInterface>, local_streams)
|
|
PROXY_METHOD0(rtc::scoped_refptr<StreamCollectionInterface>, remote_streams)
|
|
PROXY_METHOD1(bool, AddStream, MediaStreamInterface*)
|
|
PROXY_METHOD1(void, RemoveStream, MediaStreamInterface*)
|
|
PROXY_METHOD2(RTCErrorOr<rtc::scoped_refptr<RtpSenderInterface>>,
|
|
AddTrack,
|
|
rtc::scoped_refptr<MediaStreamTrackInterface>,
|
|
const std::vector<std::string>&)
|
|
PROXY_METHOD1(bool, RemoveTrack, RtpSenderInterface*)
|
|
PROXY_METHOD1(RTCError, RemoveTrackNew, rtc::scoped_refptr<RtpSenderInterface>)
|
|
PROXY_METHOD1(RTCErrorOr<rtc::scoped_refptr<RtpTransceiverInterface>>,
|
|
AddTransceiver,
|
|
rtc::scoped_refptr<MediaStreamTrackInterface>)
|
|
PROXY_METHOD2(RTCErrorOr<rtc::scoped_refptr<RtpTransceiverInterface>>,
|
|
AddTransceiver,
|
|
rtc::scoped_refptr<MediaStreamTrackInterface>,
|
|
const RtpTransceiverInit&)
|
|
PROXY_METHOD1(RTCErrorOr<rtc::scoped_refptr<RtpTransceiverInterface>>,
|
|
AddTransceiver,
|
|
cricket::MediaType)
|
|
PROXY_METHOD2(RTCErrorOr<rtc::scoped_refptr<RtpTransceiverInterface>>,
|
|
AddTransceiver,
|
|
cricket::MediaType,
|
|
const RtpTransceiverInit&)
|
|
PROXY_METHOD2(rtc::scoped_refptr<RtpSenderInterface>,
|
|
CreateSender,
|
|
const std::string&,
|
|
const std::string&)
|
|
PROXY_CONSTMETHOD0(std::vector<rtc::scoped_refptr<RtpSenderInterface>>,
|
|
GetSenders)
|
|
PROXY_CONSTMETHOD0(std::vector<rtc::scoped_refptr<RtpReceiverInterface>>,
|
|
GetReceivers)
|
|
PROXY_CONSTMETHOD0(std::vector<rtc::scoped_refptr<RtpTransceiverInterface>>,
|
|
GetTransceivers)
|
|
PROXY_METHOD3(bool,
|
|
GetStats,
|
|
StatsObserver*,
|
|
MediaStreamTrackInterface*,
|
|
StatsOutputLevel)
|
|
PROXY_METHOD1(void, GetStats, RTCStatsCollectorCallback*)
|
|
PROXY_METHOD2(void,
|
|
GetStats,
|
|
rtc::scoped_refptr<RtpSenderInterface>,
|
|
rtc::scoped_refptr<RTCStatsCollectorCallback>)
|
|
PROXY_METHOD2(void,
|
|
GetStats,
|
|
rtc::scoped_refptr<RtpReceiverInterface>,
|
|
rtc::scoped_refptr<RTCStatsCollectorCallback>)
|
|
PROXY_METHOD2(rtc::scoped_refptr<DataChannelInterface>,
|
|
CreateDataChannel,
|
|
const std::string&,
|
|
const DataChannelInit*)
|
|
PROXY_CONSTMETHOD0(const SessionDescriptionInterface*, local_description)
|
|
PROXY_CONSTMETHOD0(const SessionDescriptionInterface*, remote_description)
|
|
PROXY_CONSTMETHOD0(const SessionDescriptionInterface*,
|
|
current_local_description)
|
|
PROXY_CONSTMETHOD0(const SessionDescriptionInterface*,
|
|
current_remote_description)
|
|
PROXY_CONSTMETHOD0(const SessionDescriptionInterface*,
|
|
pending_local_description)
|
|
PROXY_CONSTMETHOD0(const SessionDescriptionInterface*,
|
|
pending_remote_description)
|
|
PROXY_METHOD0(void, RestartIce)
|
|
PROXY_METHOD2(void,
|
|
CreateOffer,
|
|
CreateSessionDescriptionObserver*,
|
|
const RTCOfferAnswerOptions&)
|
|
PROXY_METHOD2(void,
|
|
CreateAnswer,
|
|
CreateSessionDescriptionObserver*,
|
|
const RTCOfferAnswerOptions&)
|
|
PROXY_METHOD2(void,
|
|
SetLocalDescription,
|
|
SetSessionDescriptionObserver*,
|
|
SessionDescriptionInterface*)
|
|
PROXY_METHOD2(void,
|
|
SetRemoteDescription,
|
|
SetSessionDescriptionObserver*,
|
|
SessionDescriptionInterface*)
|
|
PROXY_METHOD2(void,
|
|
SetRemoteDescription,
|
|
std::unique_ptr<SessionDescriptionInterface>,
|
|
rtc::scoped_refptr<SetRemoteDescriptionObserverInterface>)
|
|
PROXY_METHOD0(PeerConnectionInterface::RTCConfiguration, GetConfiguration)
|
|
PROXY_METHOD2(bool,
|
|
SetConfiguration,
|
|
const PeerConnectionInterface::RTCConfiguration&,
|
|
RTCError*)
|
|
PROXY_METHOD1(bool,
|
|
SetConfiguration,
|
|
const PeerConnectionInterface::RTCConfiguration&)
|
|
PROXY_METHOD1(bool, AddIceCandidate, const IceCandidateInterface*)
|
|
PROXY_METHOD1(bool, RemoveIceCandidates, const std::vector<cricket::Candidate>&)
|
|
PROXY_METHOD1(RTCError, SetBitrate, const BitrateSettings&)
|
|
PROXY_METHOD1(void, SetAudioPlayout, bool)
|
|
PROXY_METHOD1(void, SetAudioRecording, bool)
|
|
PROXY_METHOD1(rtc::scoped_refptr<DtlsTransportInterface>,
|
|
LookupDtlsTransportByMid,
|
|
const std::string&)
|
|
PROXY_CONSTMETHOD0(rtc::scoped_refptr<SctpTransportInterface>, GetSctpTransport)
|
|
PROXY_METHOD0(SignalingState, signaling_state)
|
|
PROXY_METHOD0(IceConnectionState, ice_connection_state)
|
|
PROXY_METHOD0(IceConnectionState, standardized_ice_connection_state)
|
|
PROXY_METHOD0(PeerConnectionState, peer_connection_state)
|
|
PROXY_METHOD0(IceGatheringState, ice_gathering_state)
|
|
PROXY_METHOD2(bool,
|
|
StartRtcEventLog,
|
|
std::unique_ptr<RtcEventLogOutput>,
|
|
int64_t)
|
|
PROXY_METHOD1(bool, StartRtcEventLog, std::unique_ptr<RtcEventLogOutput>)
|
|
PROXY_METHOD0(void, StopRtcEventLog)
|
|
PROXY_METHOD0(void, Close)
|
|
END_PROXY_MAP()
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // API_PEER_CONNECTION_PROXY_H_
|