mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-14 06:10:40 +01:00
6f7e6d6ff3
Currently CreatePeerConnection takes 3 parameters. This is going to expand to four with a new change. Every time a new parameter is added, we need to deprecate the old method, switch clients to the new one, update fake/mock classes and tests, and so on, which is a cumbersome process. To address this, this CL introduces a PeerConnectionDependencies structure to encapsulate all mandatory and optional dependencies (where a dependency is defined as non trivial executable code that an API user may want to provide to the native API). This allows adding a new injectable dependency by simply adding a new field to the struct, avoiding the hassle described above. You may think we could use RTCConfiguration for this. But since RTCConfiguration is both passed in and out of the PeerConnection (using GetConfiguration/SetConfiguration), it can't carry unique_ptrs. And we don't want to inject dependencies via raw pointers, since this could lead to lifetime management bugs, where the dependency is deleted before the PeerConnection is done using it. Bug: webrtc:7913 Change-Id: I38c3f4ce4f26b37e6fe219d1eeca271294b40db8 Reviewed-on: https://webrtc-review.googlesource.com/73663 Commit-Queue: Benjamin Wright <benwright@webrtc.org> Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23084}
77 lines
3.3 KiB
C++
77 lines
3.3 KiB
C++
/*
|
|
* Copyright 2014 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_PEERCONNECTIONFACTORYPROXY_H_
|
|
#define API_PEERCONNECTIONFACTORYPROXY_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "api/peerconnectioninterface.h"
|
|
#include "api/proxy.h"
|
|
#include "rtc_base/bind.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(PeerConnectionFactory)
|
|
PROXY_SIGNALING_THREAD_DESTRUCTOR()
|
|
// Use the overloads of CreateVideoSource that take raw VideoCapturer
|
|
// pointers from PeerConnectionFactoryInterface.
|
|
// TODO(deadbeef): Remove this using statement once those overloads are
|
|
// removed.
|
|
using PeerConnectionFactoryInterface::CreateVideoSource;
|
|
PROXY_METHOD1(void, SetOptions, const Options&)
|
|
PROXY_METHOD5(rtc::scoped_refptr<PeerConnectionInterface>,
|
|
CreatePeerConnection,
|
|
const PeerConnectionInterface::RTCConfiguration&,
|
|
const MediaConstraintsInterface*,
|
|
std::unique_ptr<cricket::PortAllocator>,
|
|
std::unique_ptr<rtc::RTCCertificateGeneratorInterface>,
|
|
PeerConnectionObserver*);
|
|
PROXY_METHOD4(rtc::scoped_refptr<PeerConnectionInterface>,
|
|
CreatePeerConnection,
|
|
const PeerConnectionInterface::RTCConfiguration&,
|
|
std::unique_ptr<cricket::PortAllocator>,
|
|
std::unique_ptr<rtc::RTCCertificateGeneratorInterface>,
|
|
PeerConnectionObserver*);
|
|
PROXY_METHOD2(rtc::scoped_refptr<PeerConnectionInterface>,
|
|
CreatePeerConnection,
|
|
const PeerConnectionInterface::RTCConfiguration&,
|
|
PeerConnectionDependencies);
|
|
PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>,
|
|
CreateLocalMediaStream, const std::string&)
|
|
PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>,
|
|
CreateAudioSource, const MediaConstraintsInterface*)
|
|
PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>,
|
|
CreateAudioSource,
|
|
const cricket::AudioOptions&)
|
|
PROXY_METHOD2(rtc::scoped_refptr<VideoTrackSourceInterface>,
|
|
CreateVideoSource,
|
|
std::unique_ptr<cricket::VideoCapturer>,
|
|
const MediaConstraintsInterface*)
|
|
PROXY_METHOD1(rtc::scoped_refptr<VideoTrackSourceInterface>,
|
|
CreateVideoSource,
|
|
std::unique_ptr<cricket::VideoCapturer>)
|
|
PROXY_METHOD2(rtc::scoped_refptr<VideoTrackInterface>,
|
|
CreateVideoTrack,
|
|
const std::string&,
|
|
VideoTrackSourceInterface*)
|
|
PROXY_METHOD2(rtc::scoped_refptr<AudioTrackInterface>,
|
|
CreateAudioTrack, const std::string&, AudioSourceInterface*)
|
|
PROXY_METHOD2(bool, StartAecDump, rtc::PlatformFile, int64_t)
|
|
PROXY_METHOD0(void, StopAecDump)
|
|
END_PROXY_MAP()
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // API_PEERCONNECTIONFACTORYPROXY_H_
|