webrtc_m130/webrtc/api/peerconnectionfactoryproxy.h

103 lines
4.3 KiB
C
Raw Normal View History

/*
* 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 WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_
#define WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_
#include <memory>
#include <string>
#include <utility>
#include "webrtc/api/peerconnectioninterface.h"
#include "webrtc/api/proxy.h"
#include "webrtc/base/bind.h"
namespace webrtc {
BEGIN_SIGNALING_PROXY_MAP(PeerConnectionFactory)
PROXY_METHOD1(void, SetOptions, const Options&)
// Can't use PROXY_METHOD5 because unique_ptr must be moved.
// TODO(tommi,hbos): Use of templates to support unique_ptr?
rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
const PeerConnectionInterface::RTCConfiguration& a1,
const MediaConstraintsInterface* a2,
std::unique_ptr<cricket::PortAllocator> a3,
Revert of Replacing DtlsIdentityStoreInterface with RTCCertificateGeneratorInterface. (patchset #2 id:20001 of https://codereview.webrtc.org/2013523002/ ) Reason for revert: There are more CreatePeerConnection calls than I anticipated/had found in Chromium, like remoting/protocol/webrtc_transport.cc. Reverting due to broken Chromium FYI bots. Original issue's description: > 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::CreatePeerConnection, is > updated to take a generator instead of a store. But as to not break Chromium, > the old function signature taking a store is kept. It is implemented to invoke > the generator version by wrapping the store in an > RTCCertificateGeneratorStoreWrapper. As soon as Chromium is updated to use the > new function signature we can remove the old CreatePeerConnection. > Due to having multiple CreatePeerConnection signatures, some calling places > are updated to resolve the ambiguity introduced. > > BUG=webrtc:5707, webrtc:5708 > R=phoglund@webrtc.org, tommi@webrtc.org > TBR=tkchin@webrc.org > > Committed: https://chromium.googlesource.com/external/webrtc/+/400781a2091d09a725b32c6953247036b22478e8 TBR=tkchin@webrtc.org,tommi@webrtc.org,phoglund@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5707, webrtc:5708 Review-Url: https://codereview.webrtc.org/2020633002 Cr-Commit-Position: refs/heads/master@{#12948}
2016-05-27 06:08:53 -07:00
std::unique_ptr<DtlsIdentityStoreInterface> a4,
PeerConnectionObserver* a5) override {
return signaling_thread_
->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot,
this, a1, a2, a3.release(), a4.release(), a5));
}
rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
const PeerConnectionInterface::RTCConfiguration& a1,
std::unique_ptr<cricket::PortAllocator> a3,
Revert of Replacing DtlsIdentityStoreInterface with RTCCertificateGeneratorInterface. (patchset #2 id:20001 of https://codereview.webrtc.org/2013523002/ ) Reason for revert: There are more CreatePeerConnection calls than I anticipated/had found in Chromium, like remoting/protocol/webrtc_transport.cc. Reverting due to broken Chromium FYI bots. Original issue's description: > 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::CreatePeerConnection, is > updated to take a generator instead of a store. But as to not break Chromium, > the old function signature taking a store is kept. It is implemented to invoke > the generator version by wrapping the store in an > RTCCertificateGeneratorStoreWrapper. As soon as Chromium is updated to use the > new function signature we can remove the old CreatePeerConnection. > Due to having multiple CreatePeerConnection signatures, some calling places > are updated to resolve the ambiguity introduced. > > BUG=webrtc:5707, webrtc:5708 > R=phoglund@webrtc.org, tommi@webrtc.org > TBR=tkchin@webrc.org > > Committed: https://chromium.googlesource.com/external/webrtc/+/400781a2091d09a725b32c6953247036b22478e8 TBR=tkchin@webrtc.org,tommi@webrtc.org,phoglund@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5707, webrtc:5708 Review-Url: https://codereview.webrtc.org/2020633002 Cr-Commit-Position: refs/heads/master@{#12948}
2016-05-27 06:08:53 -07:00
std::unique_ptr<DtlsIdentityStoreInterface> a4,
PeerConnectionObserver* a5) override {
return signaling_thread_
->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot,
this, a1, a3.release(), a4.release(), a5));
}
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,
cricket::VideoCapturer*,
const MediaConstraintsInterface*)
PROXY_METHOD1(rtc::scoped_refptr<VideoTrackSourceInterface>,
CreateVideoSource,
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)
PROXY_METHOD1(bool, StartRtcEventLog, rtc::PlatformFile)
PROXY_METHOD2(bool, StartRtcEventLog, rtc::PlatformFile, int64_t)
PROXY_METHOD0(void, StopRtcEventLog)
private:
rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot(
const PeerConnectionInterface::RTCConfiguration& a1,
const MediaConstraintsInterface* a2,
cricket::PortAllocator* a3,
Revert of Replacing DtlsIdentityStoreInterface with RTCCertificateGeneratorInterface. (patchset #2 id:20001 of https://codereview.webrtc.org/2013523002/ ) Reason for revert: There are more CreatePeerConnection calls than I anticipated/had found in Chromium, like remoting/protocol/webrtc_transport.cc. Reverting due to broken Chromium FYI bots. Original issue's description: > 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::CreatePeerConnection, is > updated to take a generator instead of a store. But as to not break Chromium, > the old function signature taking a store is kept. It is implemented to invoke > the generator version by wrapping the store in an > RTCCertificateGeneratorStoreWrapper. As soon as Chromium is updated to use the > new function signature we can remove the old CreatePeerConnection. > Due to having multiple CreatePeerConnection signatures, some calling places > are updated to resolve the ambiguity introduced. > > BUG=webrtc:5707, webrtc:5708 > R=phoglund@webrtc.org, tommi@webrtc.org > TBR=tkchin@webrc.org > > Committed: https://chromium.googlesource.com/external/webrtc/+/400781a2091d09a725b32c6953247036b22478e8 TBR=tkchin@webrtc.org,tommi@webrtc.org,phoglund@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5707, webrtc:5708 Review-Url: https://codereview.webrtc.org/2020633002 Cr-Commit-Position: refs/heads/master@{#12948}
2016-05-27 06:08:53 -07:00
DtlsIdentityStoreInterface* a4,
PeerConnectionObserver* a5) {
std::unique_ptr<cricket::PortAllocator> ptr_a3(a3);
Revert of Replacing DtlsIdentityStoreInterface with RTCCertificateGeneratorInterface. (patchset #2 id:20001 of https://codereview.webrtc.org/2013523002/ ) Reason for revert: There are more CreatePeerConnection calls than I anticipated/had found in Chromium, like remoting/protocol/webrtc_transport.cc. Reverting due to broken Chromium FYI bots. Original issue's description: > 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::CreatePeerConnection, is > updated to take a generator instead of a store. But as to not break Chromium, > the old function signature taking a store is kept. It is implemented to invoke > the generator version by wrapping the store in an > RTCCertificateGeneratorStoreWrapper. As soon as Chromium is updated to use the > new function signature we can remove the old CreatePeerConnection. > Due to having multiple CreatePeerConnection signatures, some calling places > are updated to resolve the ambiguity introduced. > > BUG=webrtc:5707, webrtc:5708 > R=phoglund@webrtc.org, tommi@webrtc.org > TBR=tkchin@webrc.org > > Committed: https://chromium.googlesource.com/external/webrtc/+/400781a2091d09a725b32c6953247036b22478e8 TBR=tkchin@webrtc.org,tommi@webrtc.org,phoglund@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5707, webrtc:5708 Review-Url: https://codereview.webrtc.org/2020633002 Cr-Commit-Position: refs/heads/master@{#12948}
2016-05-27 06:08:53 -07:00
std::unique_ptr<DtlsIdentityStoreInterface> ptr_a4(a4);
return c_->CreatePeerConnection(a1, a2, std::move(ptr_a3),
std::move(ptr_a4), a5);
}
rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot(
const PeerConnectionInterface::RTCConfiguration& a1,
cricket::PortAllocator* a3,
Revert of Replacing DtlsIdentityStoreInterface with RTCCertificateGeneratorInterface. (patchset #2 id:20001 of https://codereview.webrtc.org/2013523002/ ) Reason for revert: There are more CreatePeerConnection calls than I anticipated/had found in Chromium, like remoting/protocol/webrtc_transport.cc. Reverting due to broken Chromium FYI bots. Original issue's description: > 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::CreatePeerConnection, is > updated to take a generator instead of a store. But as to not break Chromium, > the old function signature taking a store is kept. It is implemented to invoke > the generator version by wrapping the store in an > RTCCertificateGeneratorStoreWrapper. As soon as Chromium is updated to use the > new function signature we can remove the old CreatePeerConnection. > Due to having multiple CreatePeerConnection signatures, some calling places > are updated to resolve the ambiguity introduced. > > BUG=webrtc:5707, webrtc:5708 > R=phoglund@webrtc.org, tommi@webrtc.org > TBR=tkchin@webrc.org > > Committed: https://chromium.googlesource.com/external/webrtc/+/400781a2091d09a725b32c6953247036b22478e8 TBR=tkchin@webrtc.org,tommi@webrtc.org,phoglund@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5707, webrtc:5708 Review-Url: https://codereview.webrtc.org/2020633002 Cr-Commit-Position: refs/heads/master@{#12948}
2016-05-27 06:08:53 -07:00
DtlsIdentityStoreInterface* a4,
PeerConnectionObserver* a5) {
std::unique_ptr<cricket::PortAllocator> ptr_a3(a3);
Revert of Replacing DtlsIdentityStoreInterface with RTCCertificateGeneratorInterface. (patchset #2 id:20001 of https://codereview.webrtc.org/2013523002/ ) Reason for revert: There are more CreatePeerConnection calls than I anticipated/had found in Chromium, like remoting/protocol/webrtc_transport.cc. Reverting due to broken Chromium FYI bots. Original issue's description: > 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::CreatePeerConnection, is > updated to take a generator instead of a store. But as to not break Chromium, > the old function signature taking a store is kept. It is implemented to invoke > the generator version by wrapping the store in an > RTCCertificateGeneratorStoreWrapper. As soon as Chromium is updated to use the > new function signature we can remove the old CreatePeerConnection. > Due to having multiple CreatePeerConnection signatures, some calling places > are updated to resolve the ambiguity introduced. > > BUG=webrtc:5707, webrtc:5708 > R=phoglund@webrtc.org, tommi@webrtc.org > TBR=tkchin@webrc.org > > Committed: https://chromium.googlesource.com/external/webrtc/+/400781a2091d09a725b32c6953247036b22478e8 TBR=tkchin@webrtc.org,tommi@webrtc.org,phoglund@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5707, webrtc:5708 Review-Url: https://codereview.webrtc.org/2020633002 Cr-Commit-Position: refs/heads/master@{#12948}
2016-05-27 06:08:53 -07:00
std::unique_ptr<DtlsIdentityStoreInterface> ptr_a4(a4);
return c_->CreatePeerConnection(a1, std::move(ptr_a3), std::move(ptr_a4),
a5);
}
END_SIGNALING_PROXY()
} // namespace webrtc
#endif // WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_