2013-07-10 00:45:36 +00:00
|
|
|
/*
|
2016-02-10 07:54:43 -08:00
|
|
|
* Copyright 2012 The WebRTC project authors. All Rights Reserved.
|
2013-07-10 00:45:36 +00:00
|
|
|
*
|
2016-02-10 07:54:43 -08:00
|
|
|
* 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.
|
2013-07-10 00:45:36 +00:00
|
|
|
*/
|
|
|
|
|
|
2019-01-11 09:11:00 -08:00
|
|
|
#ifndef API_PEER_CONNECTION_PROXY_H_
|
|
|
|
|
#define API_PEER_CONNECTION_PROXY_H_
|
2013-07-10 00:45:36 +00:00
|
|
|
|
2017-10-13 16:29:40 +02:00
|
|
|
#include <memory>
|
2017-02-01 01:55:59 -08:00
|
|
|
#include <string>
|
|
|
|
|
#include <vector>
|
|
|
|
|
|
2019-01-11 09:11:00 -08:00
|
|
|
#include "api/peer_connection_interface.h"
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "api/proxy.h"
|
2013-07-10 00:45:36 +00:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
|
2017-02-08 01:38:21 -08:00
|
|
|
// TODO(deadbeef): Move this to .cc file and out of api/. What threads methods
|
|
|
|
|
// are called on is an implementation detail.
|
2016-04-15 03:49:07 -07:00
|
|
|
BEGIN_SIGNALING_PROXY_MAP(PeerConnection)
|
2017-01-18 08:55:23 -08:00
|
|
|
PROXY_SIGNALING_THREAD_DESTRUCTOR()
|
|
|
|
|
PROXY_METHOD0(rtc::scoped_refptr<StreamCollectionInterface>, local_streams)
|
|
|
|
|
PROXY_METHOD0(rtc::scoped_refptr<StreamCollectionInterface>, remote_streams)
|
2014-11-04 11:31:29 +00:00
|
|
|
PROXY_METHOD1(bool, AddStream, MediaStreamInterface*)
|
2013-07-10 00:45:36 +00:00
|
|
|
PROXY_METHOD1(void, RemoveStream, MediaStreamInterface*)
|
2017-12-14 10:23:57 -08:00
|
|
|
PROXY_METHOD2(RTCErrorOr<rtc::scoped_refptr<RtpSenderInterface>>,
|
2018-01-05 17:10:52 -08:00
|
|
|
AddTrack,
|
2017-12-14 10:23:57 -08:00
|
|
|
rtc::scoped_refptr<MediaStreamTrackInterface>,
|
2018-12-18 16:29:34 -08:00
|
|
|
const std::vector<std::string>&)
|
2016-01-14 15:35:42 -08:00
|
|
|
PROXY_METHOD1(bool, RemoveTrack, RtpSenderInterface*)
|
2018-12-18 16:29:34 -08:00
|
|
|
PROXY_METHOD1(RTCError, RemoveTrackNew, rtc::scoped_refptr<RtpSenderInterface>)
|
2017-11-27 13:01:52 -08:00
|
|
|
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&)
|
2015-12-18 16:58:44 -08:00
|
|
|
PROXY_METHOD2(rtc::scoped_refptr<RtpSenderInterface>,
|
2015-11-25 11:26:01 -08:00
|
|
|
CreateSender,
|
2015-12-18 16:58:44 -08:00
|
|
|
const std::string&,
|
2015-11-25 11:26:01 -08:00
|
|
|
const std::string&)
|
2015-09-28 16:53:55 -07:00
|
|
|
PROXY_CONSTMETHOD0(std::vector<rtc::scoped_refptr<RtpSenderInterface>>,
|
|
|
|
|
GetSenders)
|
|
|
|
|
PROXY_CONSTMETHOD0(std::vector<rtc::scoped_refptr<RtpReceiverInterface>>,
|
|
|
|
|
GetReceivers)
|
2017-11-27 13:01:52 -08:00
|
|
|
PROXY_CONSTMETHOD0(std::vector<rtc::scoped_refptr<RtpTransceiverInterface>>,
|
|
|
|
|
GetTransceivers)
|
2017-01-18 08:55:23 -08:00
|
|
|
PROXY_METHOD3(bool,
|
|
|
|
|
GetStats,
|
|
|
|
|
StatsObserver*,
|
2014-02-13 23:18:49 +00:00
|
|
|
MediaStreamTrackInterface*,
|
|
|
|
|
StatsOutputLevel)
|
2016-09-15 23:33:01 -07:00
|
|
|
PROXY_METHOD1(void, GetStats, RTCStatsCollectorCallback*)
|
2018-03-20 13:24:20 +01:00
|
|
|
PROXY_METHOD2(void,
|
|
|
|
|
GetStats,
|
|
|
|
|
rtc::scoped_refptr<RtpSenderInterface>,
|
2018-12-18 16:29:34 -08:00
|
|
|
rtc::scoped_refptr<RTCStatsCollectorCallback>)
|
2018-03-20 13:24:20 +01:00
|
|
|
PROXY_METHOD2(void,
|
|
|
|
|
GetStats,
|
|
|
|
|
rtc::scoped_refptr<RtpReceiverInterface>,
|
2018-12-18 16:29:34 -08:00
|
|
|
rtc::scoped_refptr<RTCStatsCollectorCallback>)
|
2019-09-13 15:41:21 +02:00
|
|
|
PROXY_METHOD0(void, ClearStatsCache)
|
2014-07-29 17:36:52 +00:00
|
|
|
PROXY_METHOD2(rtc::scoped_refptr<DataChannelInterface>,
|
2017-01-18 08:55:23 -08:00
|
|
|
CreateDataChannel,
|
|
|
|
|
const std::string&,
|
|
|
|
|
const DataChannelInit*)
|
2013-07-10 00:45:36 +00:00
|
|
|
PROXY_CONSTMETHOD0(const SessionDescriptionInterface*, local_description)
|
|
|
|
|
PROXY_CONSTMETHOD0(const SessionDescriptionInterface*, remote_description)
|
2016-12-20 17:56:17 -08:00
|
|
|
PROXY_CONSTMETHOD0(const SessionDescriptionInterface*,
|
|
|
|
|
current_local_description)
|
|
|
|
|
PROXY_CONSTMETHOD0(const SessionDescriptionInterface*,
|
|
|
|
|
current_remote_description)
|
2018-12-18 16:29:34 -08:00
|
|
|
PROXY_CONSTMETHOD0(const SessionDescriptionInterface*,
|
|
|
|
|
pending_local_description)
|
|
|
|
|
PROXY_CONSTMETHOD0(const SessionDescriptionInterface*,
|
|
|
|
|
pending_remote_description)
|
2019-07-18 11:16:56 +02:00
|
|
|
PROXY_METHOD0(void, RestartIce)
|
2016-03-04 02:51:39 -08:00
|
|
|
PROXY_METHOD2(void,
|
|
|
|
|
CreateOffer,
|
|
|
|
|
CreateSessionDescriptionObserver*,
|
|
|
|
|
const RTCOfferAnswerOptions&)
|
|
|
|
|
PROXY_METHOD2(void,
|
|
|
|
|
CreateAnswer,
|
|
|
|
|
CreateSessionDescriptionObserver*,
|
|
|
|
|
const RTCOfferAnswerOptions&)
|
2017-01-18 08:55:23 -08:00
|
|
|
PROXY_METHOD2(void,
|
2020-07-28 10:39:36 +02:00
|
|
|
SetLocalDescription,
|
2020-07-29 12:04:00 +02:00
|
|
|
std::unique_ptr<SessionDescriptionInterface>,
|
|
|
|
|
rtc::scoped_refptr<SetLocalDescriptionObserverInterface>)
|
|
|
|
|
PROXY_METHOD1(void,
|
|
|
|
|
SetLocalDescription,
|
|
|
|
|
rtc::scoped_refptr<SetLocalDescriptionObserverInterface>)
|
2020-07-28 10:39:36 +02:00
|
|
|
PROXY_METHOD2(void,
|
2020-07-29 12:04:00 +02:00
|
|
|
SetLocalDescription,
|
2020-07-28 10:39:36 +02:00
|
|
|
SetSessionDescriptionObserver*,
|
|
|
|
|
SessionDescriptionInterface*)
|
2020-07-29 12:04:00 +02:00
|
|
|
PROXY_METHOD1(void, SetLocalDescription, SetSessionDescriptionObserver*)
|
Revert "[Perfect Negotiation] Implement non-racy version of SetLocalDescription."
This reverts commit d4089cae47334a4228b69d6bb23f2e49ebb7496e.
Reason for revert: Breaks chromium WPT that is timing sensitive to onicegatheringstatechanges.
This CL accidentally moved the MaybeStartGatheringIceCandidates to after completing the SLD call. The fix is to move it back. I'll do that in a re-land.
Original change's description:
> [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}
TBR=hbos@webrtc.org,hta@webrtc.org
Change-Id: Ie1e1ecc49f3b1d7a7e230db6d36decbc4cbe8c86
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:1071733
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180480
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31802}
2020-07-29 09:46:40 +00:00
|
|
|
PROXY_METHOD2(void,
|
|
|
|
|
SetRemoteDescription,
|
|
|
|
|
std::unique_ptr<SessionDescriptionInterface>,
|
|
|
|
|
rtc::scoped_refptr<SetRemoteDescriptionObserverInterface>)
|
2020-07-29 12:04:00 +02:00
|
|
|
PROXY_METHOD2(void,
|
|
|
|
|
SetRemoteDescription,
|
|
|
|
|
SetSessionDescriptionObserver*,
|
|
|
|
|
SessionDescriptionInterface*)
|
2018-12-18 16:29:34 -08:00
|
|
|
PROXY_METHOD0(PeerConnectionInterface::RTCConfiguration, GetConfiguration)
|
2019-08-19 09:58:17 +02:00
|
|
|
PROXY_METHOD1(RTCError,
|
2015-09-29 11:56:26 -07:00
|
|
|
SetConfiguration,
|
2018-12-18 16:29:34 -08:00
|
|
|
const PeerConnectionInterface::RTCConfiguration&)
|
2013-07-10 00:45:36 +00:00
|
|
|
PROXY_METHOD1(bool, AddIceCandidate, const IceCandidateInterface*)
|
2019-11-06 12:36:12 +01:00
|
|
|
PROXY_METHOD2(void,
|
|
|
|
|
AddIceCandidate,
|
|
|
|
|
std::unique_ptr<IceCandidateInterface>,
|
|
|
|
|
std::function<void(RTCError)>)
|
2018-12-18 16:29:34 -08:00
|
|
|
PROXY_METHOD1(bool, RemoveIceCandidates, const std::vector<cricket::Candidate>&)
|
|
|
|
|
PROXY_METHOD1(RTCError, SetBitrate, const BitrateSettings&)
|
2017-11-01 11:06:56 +01:00
|
|
|
PROXY_METHOD1(void, SetAudioPlayout, bool)
|
|
|
|
|
PROXY_METHOD1(void, SetAudioRecording, bool)
|
2018-12-03 18:45:19 +01:00
|
|
|
PROXY_METHOD1(rtc::scoped_refptr<DtlsTransportInterface>,
|
|
|
|
|
LookupDtlsTransportByMid,
|
|
|
|
|
const std::string&)
|
2019-02-28 21:33:00 +01:00
|
|
|
PROXY_CONSTMETHOD0(rtc::scoped_refptr<SctpTransportInterface>, GetSctpTransport)
|
2013-07-10 00:45:36 +00:00
|
|
|
PROXY_METHOD0(SignalingState, signaling_state)
|
|
|
|
|
PROXY_METHOD0(IceConnectionState, ice_connection_state)
|
2018-12-18 16:29:34 -08:00
|
|
|
PROXY_METHOD0(IceConnectionState, standardized_ice_connection_state)
|
|
|
|
|
PROXY_METHOD0(PeerConnectionState, peer_connection_state)
|
2013-07-10 00:45:36 +00:00
|
|
|
PROXY_METHOD0(IceGatheringState, ice_gathering_state)
|
2020-03-02 11:20:00 +01:00
|
|
|
PROXY_METHOD0(absl::optional<bool>, can_trickle_ice_candidates)
|
2020-06-11 12:26:53 +02:00
|
|
|
PROXY_METHOD1(void, AddAdaptationResource, rtc::scoped_refptr<Resource>)
|
2017-11-20 17:38:14 +01:00
|
|
|
PROXY_METHOD2(bool,
|
|
|
|
|
StartRtcEventLog,
|
|
|
|
|
std::unique_ptr<RtcEventLogOutput>,
|
2018-12-18 16:29:34 -08:00
|
|
|
int64_t)
|
2019-06-04 11:23:32 -07:00
|
|
|
PROXY_METHOD1(bool, StartRtcEventLog, std::unique_ptr<RtcEventLogOutput>)
|
2016-07-04 07:06:55 -07:00
|
|
|
PROXY_METHOD0(void, StopRtcEventLog)
|
2013-07-10 00:45:36 +00:00
|
|
|
PROXY_METHOD0(void, Close)
|
2020-08-03 16:36:16 -07:00
|
|
|
BYPASS_PROXY_CONSTMETHOD0(rtc::Thread*, signaling_thread)
|
2017-01-18 08:55:23 -08:00
|
|
|
END_PROXY_MAP()
|
2013-07-10 00:45:36 +00:00
|
|
|
|
|
|
|
|
} // namespace webrtc
|
|
|
|
|
|
2019-01-11 09:11:00 -08:00
|
|
|
#endif // API_PEER_CONNECTION_PROXY_H_
|