2015-01-12 08:30:16 +00:00
|
|
|
/*
|
2016-02-10 07:54:43 -08:00
|
|
|
* Copyright 2014 The WebRTC project authors. All Rights Reserved.
|
2015-01-12 08:30:16 +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.
|
2015-01-12 08:30:16 +00:00
|
|
|
*/
|
2015-01-20 21:36:13 +00:00
|
|
|
|
2016-02-10 10:53:12 +01:00
|
|
|
#ifndef WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_
|
|
|
|
|
#define WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_
|
2015-01-12 08:30:16 +00:00
|
|
|
|
2016-04-27 06:47:29 -07:00
|
|
|
#include <memory>
|
2015-01-12 08:30:16 +00:00
|
|
|
#include <string>
|
2015-12-17 03:04:15 -08:00
|
|
|
#include <utility>
|
2015-01-12 08:30:16 +00:00
|
|
|
|
2016-02-10 10:53:12 +01:00
|
|
|
#include "webrtc/api/peerconnectioninterface.h"
|
|
|
|
|
#include "webrtc/api/proxy.h"
|
2015-08-11 10:33:13 +02:00
|
|
|
#include "webrtc/base/bind.h"
|
2015-01-12 08:30:16 +00:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
|
2016-04-15 03:49:07 -07:00
|
|
|
BEGIN_SIGNALING_PROXY_MAP(PeerConnectionFactory)
|
2015-01-12 08:30:16 +00:00
|
|
|
PROXY_METHOD1(void, SetOptions, const Options&)
|
2016-04-27 06:47:29 -07:00
|
|
|
// Can't use PROXY_METHOD5 because unique_ptr must be moved.
|
|
|
|
|
// TODO(tommi,hbos): Use of templates to support unique_ptr?
|
2015-12-01 15:01:24 -08:00
|
|
|
rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
|
|
|
|
|
const PeerConnectionInterface::RTCConfiguration& a1,
|
|
|
|
|
const MediaConstraintsInterface* a2,
|
2016-04-27 06:47:29 -07:00
|
|
|
std::unique_ptr<cricket::PortAllocator> a3,
|
Replacing DtlsIdentityStoreInterface with RTCCertificateGeneratorInterface.
The store was used in WebRtcSessionDescriptionFactory to generate certificates,
now a generator is used instead (new API). PeerConnection[Factory][Interface],
and WebRtcSession are updated to pass generators all the way down to the
WebRtcSessionDescriptionFactory instead of stores.
The webrtc implementation of a generator, RTCCertificateGenerator, is used as
the default generator (peerconnectionfactory.cc:189) instead of the webrtc
implementation of a store, DtlsIdentityStoreImpl.
The generator is fully parameterized and does not generate RSA-1024 unless you
ask for it (which makes sense not to do beforehand since ECDSA is now default).
The store was not fully parameterized (known filed bug).
The "top" layer, PeerConnectionFactoryInterface::CreatePeerConneciton, is
updated to take a generator instead of a store.
Many unittests still use a store, to allow them to continue to do so the
factory gets CreatePeerConnectionWithStore which uses the old function
signature (and invokes the new signature by wrapping the store in an
RTCCertificateGeneratorStoreWrapper). As soon as the FakeDtlsIdentityStore is
turned into a certificate generator instead of a store, the unittests will be
updated and we can remove CreatePeerConnectionWithStore.
This is a reupload of https://codereview.webrtc.org/2013523002/ with minor
changes.
BUG=webrtc:5707, webrtc:5708
R=tommi@webrtc.org
Review URL: https://codereview.webrtc.org/2017943002 .
Cr-Commit-Position: refs/heads/master@{#12984}
2016-06-01 11:44:18 +02:00
|
|
|
std::unique_ptr<rtc::RTCCertificateGeneratorInterface> a4,
|
2015-12-01 15:01:24 -08:00
|
|
|
PeerConnectionObserver* a5) override {
|
2016-04-07 07:45:54 -07:00
|
|
|
return signaling_thread_
|
|
|
|
|
->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
|
2016-06-10 14:17:27 -07:00
|
|
|
RTC_FROM_HERE,
|
2016-04-07 07:45:54 -07:00
|
|
|
rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot,
|
|
|
|
|
this, a1, a2, a3.release(), a4.release(), a5));
|
2015-12-01 15:01:24 -08:00
|
|
|
}
|
2016-03-04 02:51:39 -08:00
|
|
|
rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
|
|
|
|
|
const PeerConnectionInterface::RTCConfiguration& a1,
|
2016-04-27 06:47:29 -07:00
|
|
|
std::unique_ptr<cricket::PortAllocator> a3,
|
Replacing DtlsIdentityStoreInterface with RTCCertificateGeneratorInterface.
The store was used in WebRtcSessionDescriptionFactory to generate certificates,
now a generator is used instead (new API). PeerConnection[Factory][Interface],
and WebRtcSession are updated to pass generators all the way down to the
WebRtcSessionDescriptionFactory instead of stores.
The webrtc implementation of a generator, RTCCertificateGenerator, is used as
the default generator (peerconnectionfactory.cc:189) instead of the webrtc
implementation of a store, DtlsIdentityStoreImpl.
The generator is fully parameterized and does not generate RSA-1024 unless you
ask for it (which makes sense not to do beforehand since ECDSA is now default).
The store was not fully parameterized (known filed bug).
The "top" layer, PeerConnectionFactoryInterface::CreatePeerConneciton, is
updated to take a generator instead of a store.
Many unittests still use a store, to allow them to continue to do so the
factory gets CreatePeerConnectionWithStore which uses the old function
signature (and invokes the new signature by wrapping the store in an
RTCCertificateGeneratorStoreWrapper). As soon as the FakeDtlsIdentityStore is
turned into a certificate generator instead of a store, the unittests will be
updated and we can remove CreatePeerConnectionWithStore.
This is a reupload of https://codereview.webrtc.org/2013523002/ with minor
changes.
BUG=webrtc:5707, webrtc:5708
R=tommi@webrtc.org
Review URL: https://codereview.webrtc.org/2017943002 .
Cr-Commit-Position: refs/heads/master@{#12984}
2016-06-01 11:44:18 +02:00
|
|
|
std::unique_ptr<rtc::RTCCertificateGeneratorInterface> a4,
|
2016-03-04 02:51:39 -08:00
|
|
|
PeerConnectionObserver* a5) override {
|
2016-04-07 07:45:54 -07:00
|
|
|
return signaling_thread_
|
|
|
|
|
->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
|
2016-06-10 14:17:27 -07:00
|
|
|
RTC_FROM_HERE,
|
2016-04-07 07:45:54 -07:00
|
|
|
rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot,
|
|
|
|
|
this, a1, a3.release(), a4.release(), a5));
|
2016-03-04 02:51:39 -08:00
|
|
|
}
|
2015-01-12 08:30:16 +00:00
|
|
|
PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>,
|
|
|
|
|
CreateLocalMediaStream, const std::string&)
|
|
|
|
|
PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>,
|
|
|
|
|
CreateAudioSource, const MediaConstraintsInterface*)
|
2016-03-04 02:51:39 -08:00
|
|
|
PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>,
|
|
|
|
|
CreateAudioSource,
|
|
|
|
|
const cricket::AudioOptions&)
|
2016-03-08 01:27:48 +01:00
|
|
|
PROXY_METHOD2(rtc::scoped_refptr<VideoTrackSourceInterface>,
|
|
|
|
|
CreateVideoSource,
|
|
|
|
|
cricket::VideoCapturer*,
|
2015-01-12 08:30:16 +00:00
|
|
|
const MediaConstraintsInterface*)
|
2016-03-08 01:27:48 +01:00
|
|
|
PROXY_METHOD1(rtc::scoped_refptr<VideoTrackSourceInterface>,
|
2016-03-04 02:51:39 -08:00
|
|
|
CreateVideoSource,
|
|
|
|
|
cricket::VideoCapturer*)
|
2015-01-12 08:30:16 +00:00
|
|
|
PROXY_METHOD2(rtc::scoped_refptr<VideoTrackInterface>,
|
2016-03-08 01:27:48 +01:00
|
|
|
CreateVideoTrack,
|
|
|
|
|
const std::string&,
|
|
|
|
|
VideoTrackSourceInterface*)
|
2015-01-12 08:30:16 +00:00
|
|
|
PROXY_METHOD2(rtc::scoped_refptr<AudioTrackInterface>,
|
|
|
|
|
CreateAudioTrack, const std::string&, AudioSourceInterface*)
|
2016-01-15 03:06:36 -08:00
|
|
|
PROXY_METHOD2(bool, StartAecDump, rtc::PlatformFile, int64_t)
|
2015-10-22 03:25:41 -07:00
|
|
|
PROXY_METHOD0(void, StopAecDump)
|
2015-10-16 02:22:18 -07:00
|
|
|
PROXY_METHOD1(bool, StartRtcEventLog, rtc::PlatformFile)
|
2016-05-13 08:30:39 -07:00
|
|
|
PROXY_METHOD2(bool, StartRtcEventLog, rtc::PlatformFile, int64_t)
|
2015-10-16 02:22:18 -07:00
|
|
|
PROXY_METHOD0(void, StopRtcEventLog)
|
2015-08-11 10:33:13 +02:00
|
|
|
|
|
|
|
|
private:
|
2015-12-29 14:14:52 -08:00
|
|
|
rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot(
|
2015-12-01 15:01:24 -08:00
|
|
|
const PeerConnectionInterface::RTCConfiguration& a1,
|
|
|
|
|
const MediaConstraintsInterface* a2,
|
|
|
|
|
cricket::PortAllocator* a3,
|
Replacing DtlsIdentityStoreInterface with RTCCertificateGeneratorInterface.
The store was used in WebRtcSessionDescriptionFactory to generate certificates,
now a generator is used instead (new API). PeerConnection[Factory][Interface],
and WebRtcSession are updated to pass generators all the way down to the
WebRtcSessionDescriptionFactory instead of stores.
The webrtc implementation of a generator, RTCCertificateGenerator, is used as
the default generator (peerconnectionfactory.cc:189) instead of the webrtc
implementation of a store, DtlsIdentityStoreImpl.
The generator is fully parameterized and does not generate RSA-1024 unless you
ask for it (which makes sense not to do beforehand since ECDSA is now default).
The store was not fully parameterized (known filed bug).
The "top" layer, PeerConnectionFactoryInterface::CreatePeerConneciton, is
updated to take a generator instead of a store.
Many unittests still use a store, to allow them to continue to do so the
factory gets CreatePeerConnectionWithStore which uses the old function
signature (and invokes the new signature by wrapping the store in an
RTCCertificateGeneratorStoreWrapper). As soon as the FakeDtlsIdentityStore is
turned into a certificate generator instead of a store, the unittests will be
updated and we can remove CreatePeerConnectionWithStore.
This is a reupload of https://codereview.webrtc.org/2013523002/ with minor
changes.
BUG=webrtc:5707, webrtc:5708
R=tommi@webrtc.org
Review URL: https://codereview.webrtc.org/2017943002 .
Cr-Commit-Position: refs/heads/master@{#12984}
2016-06-01 11:44:18 +02:00
|
|
|
rtc::RTCCertificateGeneratorInterface* a4,
|
2015-12-01 15:01:24 -08:00
|
|
|
PeerConnectionObserver* a5) {
|
2016-04-27 06:47:29 -07:00
|
|
|
std::unique_ptr<cricket::PortAllocator> ptr_a3(a3);
|
Replacing DtlsIdentityStoreInterface with RTCCertificateGeneratorInterface.
The store was used in WebRtcSessionDescriptionFactory to generate certificates,
now a generator is used instead (new API). PeerConnection[Factory][Interface],
and WebRtcSession are updated to pass generators all the way down to the
WebRtcSessionDescriptionFactory instead of stores.
The webrtc implementation of a generator, RTCCertificateGenerator, is used as
the default generator (peerconnectionfactory.cc:189) instead of the webrtc
implementation of a store, DtlsIdentityStoreImpl.
The generator is fully parameterized and does not generate RSA-1024 unless you
ask for it (which makes sense not to do beforehand since ECDSA is now default).
The store was not fully parameterized (known filed bug).
The "top" layer, PeerConnectionFactoryInterface::CreatePeerConneciton, is
updated to take a generator instead of a store.
Many unittests still use a store, to allow them to continue to do so the
factory gets CreatePeerConnectionWithStore which uses the old function
signature (and invokes the new signature by wrapping the store in an
RTCCertificateGeneratorStoreWrapper). As soon as the FakeDtlsIdentityStore is
turned into a certificate generator instead of a store, the unittests will be
updated and we can remove CreatePeerConnectionWithStore.
This is a reupload of https://codereview.webrtc.org/2013523002/ with minor
changes.
BUG=webrtc:5707, webrtc:5708
R=tommi@webrtc.org
Review URL: https://codereview.webrtc.org/2017943002 .
Cr-Commit-Position: refs/heads/master@{#12984}
2016-06-01 11:44:18 +02:00
|
|
|
std::unique_ptr<rtc::RTCCertificateGeneratorInterface> ptr_a4(a4);
|
2015-12-17 03:04:15 -08:00
|
|
|
return c_->CreatePeerConnection(a1, a2, std::move(ptr_a3),
|
|
|
|
|
std::move(ptr_a4), a5);
|
2015-12-01 15:01:24 -08:00
|
|
|
}
|
2016-03-04 02:51:39 -08:00
|
|
|
|
|
|
|
|
rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot(
|
|
|
|
|
const PeerConnectionInterface::RTCConfiguration& a1,
|
|
|
|
|
cricket::PortAllocator* a3,
|
Replacing DtlsIdentityStoreInterface with RTCCertificateGeneratorInterface.
The store was used in WebRtcSessionDescriptionFactory to generate certificates,
now a generator is used instead (new API). PeerConnection[Factory][Interface],
and WebRtcSession are updated to pass generators all the way down to the
WebRtcSessionDescriptionFactory instead of stores.
The webrtc implementation of a generator, RTCCertificateGenerator, is used as
the default generator (peerconnectionfactory.cc:189) instead of the webrtc
implementation of a store, DtlsIdentityStoreImpl.
The generator is fully parameterized and does not generate RSA-1024 unless you
ask for it (which makes sense not to do beforehand since ECDSA is now default).
The store was not fully parameterized (known filed bug).
The "top" layer, PeerConnectionFactoryInterface::CreatePeerConneciton, is
updated to take a generator instead of a store.
Many unittests still use a store, to allow them to continue to do so the
factory gets CreatePeerConnectionWithStore which uses the old function
signature (and invokes the new signature by wrapping the store in an
RTCCertificateGeneratorStoreWrapper). As soon as the FakeDtlsIdentityStore is
turned into a certificate generator instead of a store, the unittests will be
updated and we can remove CreatePeerConnectionWithStore.
This is a reupload of https://codereview.webrtc.org/2013523002/ with minor
changes.
BUG=webrtc:5707, webrtc:5708
R=tommi@webrtc.org
Review URL: https://codereview.webrtc.org/2017943002 .
Cr-Commit-Position: refs/heads/master@{#12984}
2016-06-01 11:44:18 +02:00
|
|
|
rtc::RTCCertificateGeneratorInterface* a4,
|
2016-03-04 02:51:39 -08:00
|
|
|
PeerConnectionObserver* a5) {
|
2016-04-27 06:47:29 -07:00
|
|
|
std::unique_ptr<cricket::PortAllocator> ptr_a3(a3);
|
Replacing DtlsIdentityStoreInterface with RTCCertificateGeneratorInterface.
The store was used in WebRtcSessionDescriptionFactory to generate certificates,
now a generator is used instead (new API). PeerConnection[Factory][Interface],
and WebRtcSession are updated to pass generators all the way down to the
WebRtcSessionDescriptionFactory instead of stores.
The webrtc implementation of a generator, RTCCertificateGenerator, is used as
the default generator (peerconnectionfactory.cc:189) instead of the webrtc
implementation of a store, DtlsIdentityStoreImpl.
The generator is fully parameterized and does not generate RSA-1024 unless you
ask for it (which makes sense not to do beforehand since ECDSA is now default).
The store was not fully parameterized (known filed bug).
The "top" layer, PeerConnectionFactoryInterface::CreatePeerConneciton, is
updated to take a generator instead of a store.
Many unittests still use a store, to allow them to continue to do so the
factory gets CreatePeerConnectionWithStore which uses the old function
signature (and invokes the new signature by wrapping the store in an
RTCCertificateGeneratorStoreWrapper). As soon as the FakeDtlsIdentityStore is
turned into a certificate generator instead of a store, the unittests will be
updated and we can remove CreatePeerConnectionWithStore.
This is a reupload of https://codereview.webrtc.org/2013523002/ with minor
changes.
BUG=webrtc:5707, webrtc:5708
R=tommi@webrtc.org
Review URL: https://codereview.webrtc.org/2017943002 .
Cr-Commit-Position: refs/heads/master@{#12984}
2016-06-01 11:44:18 +02:00
|
|
|
std::unique_ptr<rtc::RTCCertificateGeneratorInterface> ptr_a4(a4);
|
2016-03-04 02:51:39 -08:00
|
|
|
return c_->CreatePeerConnection(a1, std::move(ptr_a3), std::move(ptr_a4),
|
|
|
|
|
a5);
|
|
|
|
|
}
|
2016-04-15 03:49:07 -07:00
|
|
|
END_SIGNALING_PROXY()
|
2015-01-12 08:30:16 +00:00
|
|
|
|
|
|
|
|
} // namespace webrtc
|
|
|
|
|
|
2016-02-10 10:53:12 +01:00
|
|
|
#endif // WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_
|