a4ecf5571e
This reverts commit 6c7ec32bd63ab2b45d4d83ae1de817ee946b4d72. Reason for revert: Third party project breaks due to use-after-free in the callback. I suspect this is because the adapter is processing the async callback instead of the pc, i.e. callback is called from SetRemoteDescriptionObserverAdapter::OnMessage instead of from PeerConnection::OnMessage. This makes it possible for the callback to be invoked after the PC is destroyed. I argue this is how it should be done, and that if you're using a raw pointer in an async callback you're doing it wrong, but I will reland this CL with the callback processed in PeerConnection::OnMessage instead as to not change the behavior of the old SRD signature. Original change's description: > SetRemoteDescriptionObserverInterface added. > > The new observer replaced SetSessionDescriptionObserver for > SetRemoteDescription. Unlike SetSessionDescriptionObserver, > SetRemoteDescriptionObserverInterface is invoked synchronously so > that the you can rely on the state of the PeerConnection to represent > the result of the SetRemoteDescription call in the callback. > > The new observer succeeds or fails with an RTCError. > > This deprecates the need for PeerConnectionObserver::OnAdd/RemoveTrack > and SetSessionDescriptionObserver, with the benefit that all media > object changes can be processed in a single callback by the application > in a synchronous callback. This will help Chromium keep objects in-sync > across layers and threads in a non-racy and straight-forward way, see > design doc (Proposal 2): > https://docs.google.com/a/google.com/document/d/1-cDDC82mgU5zrHacfFz720p3xwRtuBkOPSRchh07Ho0/edit?usp=sharing > > An adapter for SetSessionDescriptionObserver is added to allow calling > the old SetRemoteDescription signature and get the old behavior > (OnSuccess/OnFailure callback in a Post) until third parties switch. > > Bug: webrtc:8473 > Change-Id: I3d4eb60da6dd34615f2c9f384aeaf4634e648c99 > Reviewed-on: https://webrtc-review.googlesource.com/17523 > Commit-Queue: Henrik Boström <hbos@webrtc.org> > Reviewed-by: Peter Thatcher <pthatcher@webrtc.org> > Reviewed-by: Guido Urdaneta <guidou@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20841} TBR=hbos@webrtc.org,hta@webrtc.org,pthatcher@webrtc.org,guidou@webrtc.org Change-Id: I715555e084d9aae49ee2a8831c70dc006dbdb74c No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8473 Reviewed-on: https://webrtc-review.googlesource.com/25580 Reviewed-by: Henrik Boström <hbos@webrtc.org> Commit-Queue: Henrik Boström <hbos@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20850}
125 lines
5.0 KiB
C++
125 lines
5.0 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_PEERCONNECTIONPROXY_H_
|
|
#define API_PEERCONNECTIONPROXY_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "api/peerconnectioninterface.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(rtc::scoped_refptr<RtpSenderInterface>,
|
|
AddTrack,
|
|
MediaStreamTrackInterface*,
|
|
std::vector<MediaStreamInterface*>)
|
|
PROXY_METHOD1(bool, RemoveTrack, RtpSenderInterface*)
|
|
PROXY_METHOD1(rtc::scoped_refptr<DtmfSenderInterface>,
|
|
CreateDtmfSender,
|
|
AudioTrackInterface*)
|
|
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_METHOD3(bool,
|
|
GetStats,
|
|
StatsObserver*,
|
|
MediaStreamTrackInterface*,
|
|
StatsOutputLevel)
|
|
PROXY_METHOD1(void, GetStats, 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*,
|
|
pending_local_description)
|
|
PROXY_CONSTMETHOD0(const SessionDescriptionInterface*,
|
|
pending_remote_description)
|
|
PROXY_CONSTMETHOD0(const SessionDescriptionInterface*,
|
|
current_local_description)
|
|
PROXY_CONSTMETHOD0(const SessionDescriptionInterface*,
|
|
current_remote_description)
|
|
PROXY_METHOD2(void,
|
|
CreateOffer,
|
|
CreateSessionDescriptionObserver*,
|
|
const MediaConstraintsInterface*)
|
|
PROXY_METHOD2(void,
|
|
CreateAnswer,
|
|
CreateSessionDescriptionObserver*,
|
|
const MediaConstraintsInterface*)
|
|
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_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(void, SetAudioPlayout, bool)
|
|
PROXY_METHOD1(void, SetAudioRecording, bool)
|
|
PROXY_METHOD1(void, RegisterUMAObserver, UMAObserver*)
|
|
PROXY_METHOD1(RTCError, SetBitrate, const BitrateParameters&);
|
|
PROXY_METHOD1(void,
|
|
SetBitrateAllocationStrategy,
|
|
std::unique_ptr<rtc::BitrateAllocationStrategy>);
|
|
PROXY_METHOD0(SignalingState, signaling_state)
|
|
PROXY_METHOD0(IceConnectionState, ice_connection_state)
|
|
PROXY_METHOD0(IceGatheringState, ice_gathering_state)
|
|
PROXY_METHOD2(bool, StartRtcEventLog, rtc::PlatformFile, int64_t)
|
|
PROXY_METHOD2(bool,
|
|
StartRtcEventLog,
|
|
std::unique_ptr<RtcEventLogOutput>,
|
|
int64_t);
|
|
PROXY_METHOD0(void, StopRtcEventLog)
|
|
PROXY_METHOD0(void, Close)
|
|
END_PROXY_MAP()
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // API_PEERCONNECTIONPROXY_H_
|