webrtc_m130/api/peer_connection_proxy.h

155 lines
6.5 KiB
C
Raw Normal View History

/*
* 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_METHOD0(void, ClearStatsCache)
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,
[Perfect Negotiation] Implement non-racy version of SetLocalDescription. BACKGROUND When SLD is invoked with SetSessionDescriptionObserver, the observer is called by posting a message back to the execution thread, delaying the call. This delay is "artificial" - it's not necessary; the operation is already complete. It's a post from the signaling thread to the signaling thread. The rationale for the post was to avoid the observer making recursive calls back into the PeerConnection. The problem with this is that by the time the observer is called, the PeerConnection could already have executed other operations and modified its states. This causes the referenced bug: one can have a race where SLD is resolved "too late" (after a pending SRD is executed) and the signaling state observed when SLD resolves doesn't make sense. When implementing Unified Plan, we fixed similar issues for SRD by adding a version that takes SetRemoteDescriptionObserverInterface as argument instead of SetSessionDescriptionObserver. The new version did not have the delay. The old version had to be kept around not to break downstream projects that had dependencies both on he delay and on allowing the PC to be destroyed midst-operation without informing its observers. THIS CL This does the old SRD fix for SLD as well: A new observer interface is added, SetLocalDescriptionObserverInterface, and PeerConnection::SetLocalDescription() is overloaded. If you call it with the old observer, you get the delay, but if you call it with the new observer, you don't get a delay. - SetLocalDescriptionObserverInterface is added. - SetLocalDescription is overloaded. - The adapter for SetSessionDescriptionObserver that causes the delay previously only used for SRD is updated to handle both SLD and SRD. - FakeSetLocalDescriptionObserver is added and MockSetRemoteDescriptionObserver is renamed "Fake...". Bug: chromium:1071733 Change-Id: I920368e648bede481058ac22f5b8794752a220b3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/179100 Commit-Queue: Henrik Boström <hbos@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31798}
2020-07-28 10:39:36 +02:00
std::unique_ptr<SessionDescriptionInterface>,
rtc::scoped_refptr<SetLocalDescriptionObserverInterface>)
PROXY_METHOD1(void,
SetLocalDescription,
rtc::scoped_refptr<SetLocalDescriptionObserverInterface>)
PROXY_METHOD2(void,
[Perfect Negotiation] Implement non-racy version of SetLocalDescription. BACKGROUND When SLD is invoked with SetSessionDescriptionObserver, the observer is called by posting a message back to the execution thread, delaying the call. This delay is "artificial" - it's not necessary; the operation is already complete. It's a post from the signaling thread to the signaling thread. The rationale for the post was to avoid the observer making recursive calls back into the PeerConnection. The problem with this is that by the time the observer is called, the PeerConnection could already have executed other operations and modified its states. This causes the referenced bug: one can have a race where SLD is resolved "too late" (after a pending SRD is executed) and the signaling state observed when SLD resolves doesn't make sense. When implementing Unified Plan, we fixed similar issues for SRD by adding a version that takes SetRemoteDescriptionObserverInterface as argument instead of SetSessionDescriptionObserver. The new version did not have the delay. The old version had to be kept around not to break downstream projects that had dependencies both on he delay and on allowing the PC to be destroyed midst-operation without informing its observers. THIS CL This does the old SRD fix for SLD as well: A new observer interface is added, SetLocalDescriptionObserverInterface, and PeerConnection::SetLocalDescription() is overloaded. If you call it with the old observer, you get the delay, but if you call it with the new observer, you don't get a delay. - SetLocalDescriptionObserverInterface is added. - SetLocalDescription is overloaded. - The adapter for SetSessionDescriptionObserver that causes the delay previously only used for SRD is updated to handle both SLD and SRD. - FakeSetLocalDescriptionObserver is added and MockSetRemoteDescriptionObserver is renamed "Fake...". Bug: chromium:1071733 Change-Id: I920368e648bede481058ac22f5b8794752a220b3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/179100 Commit-Queue: Henrik Boström <hbos@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31798}
2020-07-28 10:39:36 +02:00
SetLocalDescription,
SetSessionDescriptionObserver*,
SessionDescriptionInterface*)
[Perfect Negotiation] Implement non-racy version of SetLocalDescription. BACKGROUND When SLD is invoked with SetSessionDescriptionObserver, the observer is called by posting a message back to the execution thread, delaying the call. This delay is "artificial" - it's not necessary; the operation is already complete. It's a post from the signaling thread to the signaling thread. The rationale for the post was to avoid the observer making recursive calls back into the PeerConnection. The problem with this is that by the time the observer is called, the PeerConnection could already have executed other operations and modified its states. This causes the referenced bug: one can have a race where SLD is resolved "too late" (after a pending SRD is executed) and the signaling state observed when SLD resolves doesn't make sense. When implementing Unified Plan, we fixed similar issues for SRD by adding a version that takes SetRemoteDescriptionObserverInterface as argument instead of SetSessionDescriptionObserver. The new version did not have the delay. The old version had to be kept around not to break downstream projects that had dependencies both on he delay and on allowing the PC to be destroyed midst-operation without informing its observers. THIS CL This does the old SRD fix for SLD as well: A new observer interface is added, SetLocalDescriptionObserverInterface, and PeerConnection::SetLocalDescription() is overloaded. If you call it with the old observer, you get the delay, but if you call it with the new observer, you don't get a delay. - SetLocalDescriptionObserverInterface is added. - SetLocalDescription is overloaded. - The adapter for SetSessionDescriptionObserver that causes the delay previously only used for SRD is updated to handle both SLD and SRD. - FakeSetLocalDescriptionObserver is added and MockSetRemoteDescriptionObserver is renamed "Fake...". Bug: chromium:1071733 Change-Id: I920368e648bede481058ac22f5b8794752a220b3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/179100 Commit-Queue: Henrik Boström <hbos@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31798}
2020-07-28 10:39:36 +02:00
PROXY_METHOD1(void, SetLocalDescription, SetSessionDescriptionObserver*)
PROXY_METHOD2(void,
SetRemoteDescription,
std::unique_ptr<SessionDescriptionInterface>,
rtc::scoped_refptr<SetRemoteDescriptionObserverInterface>)
[Perfect Negotiation] Implement non-racy version of SetLocalDescription. BACKGROUND When SLD is invoked with SetSessionDescriptionObserver, the observer is called by posting a message back to the execution thread, delaying the call. This delay is "artificial" - it's not necessary; the operation is already complete. It's a post from the signaling thread to the signaling thread. The rationale for the post was to avoid the observer making recursive calls back into the PeerConnection. The problem with this is that by the time the observer is called, the PeerConnection could already have executed other operations and modified its states. This causes the referenced bug: one can have a race where SLD is resolved "too late" (after a pending SRD is executed) and the signaling state observed when SLD resolves doesn't make sense. When implementing Unified Plan, we fixed similar issues for SRD by adding a version that takes SetRemoteDescriptionObserverInterface as argument instead of SetSessionDescriptionObserver. The new version did not have the delay. The old version had to be kept around not to break downstream projects that had dependencies both on he delay and on allowing the PC to be destroyed midst-operation without informing its observers. THIS CL This does the old SRD fix for SLD as well: A new observer interface is added, SetLocalDescriptionObserverInterface, and PeerConnection::SetLocalDescription() is overloaded. If you call it with the old observer, you get the delay, but if you call it with the new observer, you don't get a delay. - SetLocalDescriptionObserverInterface is added. - SetLocalDescription is overloaded. - The adapter for SetSessionDescriptionObserver that causes the delay previously only used for SRD is updated to handle both SLD and SRD. - FakeSetLocalDescriptionObserver is added and MockSetRemoteDescriptionObserver is renamed "Fake...". Bug: chromium:1071733 Change-Id: I920368e648bede481058ac22f5b8794752a220b3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/179100 Commit-Queue: Henrik Boström <hbos@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31798}
2020-07-28 10:39:36 +02:00
PROXY_METHOD2(void,
SetRemoteDescription,
SetSessionDescriptionObserver*,
SessionDescriptionInterface*)
PROXY_METHOD0(PeerConnectionInterface::RTCConfiguration, GetConfiguration)
PROXY_METHOD1(RTCError,
SetConfiguration,
const PeerConnectionInterface::RTCConfiguration&)
PROXY_METHOD1(bool, AddIceCandidate, const IceCandidateInterface*)
PROXY_METHOD2(void,
AddIceCandidate,
std::unique_ptr<IceCandidateInterface>,
std::function<void(RTCError)>)
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)
Reland "Expose can_trickle_ice_candidates on PeerConnection" This reverts commit cb8c40138ca170f841bc45fa6771cdfc4b966e5f. Reason for revert: Added missing default. Original change's description: > Revert "Expose can_trickle_ice_candidates on PeerConnection" > > This reverts commit c6a65c8866487c6adc0a7bb472d3bad9389501f9. > > Reason for revert: Breaks downstream due to missing default > > Original change's description: > > Expose can_trickle_ice_candidates on PeerConnection > > > > Bug: chromium:708484 > > Change-Id: I9a40e75066341f0d9f965bd3718bfcb3f0459533 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/169450 > > Commit-Queue: Harald Alvestrand <hta@webrtc.org> > > Reviewed-by: Taylor <deadbeef@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#30653} > > TBR=deadbeef@webrtc.org,hta@webrtc.org > > Change-Id: Iaa5b977c4237715a8a5127cf167cf6512a3f7059 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: chromium:708484 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/169540 > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Commit-Queue: Harald Alvestrand <hta@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#30655} TBR=deadbeef@webrtc.org,hta@webrtc.org Change-Id: I608da7781f158b4b02dd226d4dcd5615c4935fa8 Bug: chromium:708484 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/169541 Commit-Queue: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30656}
2020-03-02 11:20:00 +01:00
PROXY_METHOD0(absl::optional<bool>, can_trickle_ice_candidates)
PROXY_METHOD1(void, AddAdaptationResource, rtc::scoped_refptr<Resource>)
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_