Make it possible to inject IceTransport in pc quality test fixture
Bug: chromium:1024965 Change-Id: I55296a31e1638c8c00bd6c53151fc4898202b033 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/166168 Commit-Queue: Jonas Oreland <jonaso@webrtc.org> Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Reviewed-by: Artem Titov <titovartem@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30279}
This commit is contained in:

committed by
Commit Bot

parent
c6f81a71e5
commit
c7bce99540
@ -277,7 +277,7 @@ class PeerConnectionE2EQualityTestFixture {
|
|||||||
virtual PeerConfigurer* SetVideoDecoderFactory(
|
virtual PeerConfigurer* SetVideoDecoderFactory(
|
||||||
std::unique_ptr<VideoDecoderFactory> video_decoder_factory) = 0;
|
std::unique_ptr<VideoDecoderFactory> video_decoder_factory) = 0;
|
||||||
|
|
||||||
// The parameters of the following 3 methods will be passed to the
|
// The parameters of the following 4 methods will be passed to the
|
||||||
// PeerConnectionInterface implementation that will be created for this
|
// PeerConnectionInterface implementation that will be created for this
|
||||||
// peer.
|
// peer.
|
||||||
virtual PeerConfigurer* SetAsyncResolverFactory(
|
virtual PeerConfigurer* SetAsyncResolverFactory(
|
||||||
@ -288,6 +288,8 @@ class PeerConnectionE2EQualityTestFixture {
|
|||||||
cert_generator) = 0;
|
cert_generator) = 0;
|
||||||
virtual PeerConfigurer* SetSSLCertificateVerifier(
|
virtual PeerConfigurer* SetSSLCertificateVerifier(
|
||||||
std::unique_ptr<rtc::SSLCertificateVerifier> tls_cert_verifier) = 0;
|
std::unique_ptr<rtc::SSLCertificateVerifier> tls_cert_verifier) = 0;
|
||||||
|
virtual PeerConfigurer* SetIceTransportFactory(
|
||||||
|
std::unique_ptr<IceTransportFactory> factory) = 0;
|
||||||
|
|
||||||
// Add new video stream to the call that will be sent from this peer.
|
// Add new video stream to the call that will be sent from this peer.
|
||||||
virtual PeerConfigurer* AddVideoConfig(VideoConfig config) = 0;
|
virtual PeerConfigurer* AddVideoConfig(VideoConfig config) = 0;
|
||||||
|
@ -160,6 +160,12 @@ class PeerConfigurerImpl final
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PeerConfigurer* SetIceTransportFactory(
|
||||||
|
std::unique_ptr<IceTransportFactory> factory) override {
|
||||||
|
components_->pc_dependencies->ice_transport_factory = std::move(factory);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
friend class PeerConnectionE2EQualityTest;
|
friend class PeerConnectionE2EQualityTest;
|
||||||
|
|
||||||
|
@ -75,6 +75,7 @@ struct PeerConnectionComponents {
|
|||||||
std::unique_ptr<webrtc::AsyncResolverFactory> async_resolver_factory;
|
std::unique_ptr<webrtc::AsyncResolverFactory> async_resolver_factory;
|
||||||
std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator;
|
std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator;
|
||||||
std::unique_ptr<rtc::SSLCertificateVerifier> tls_cert_verifier;
|
std::unique_ptr<rtc::SSLCertificateVerifier> tls_cert_verifier;
|
||||||
|
std::unique_ptr<IceTransportFactory> ice_transport_factory;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Contains all components, that can be overridden in peer connection. Also
|
// Contains all components, that can be overridden in peer connection. Also
|
||||||
|
@ -301,6 +301,10 @@ class TestPeerComponents {
|
|||||||
if (pc_dependencies->tls_cert_verifier != nullptr) {
|
if (pc_dependencies->tls_cert_verifier != nullptr) {
|
||||||
pc_deps.tls_cert_verifier = std::move(pc_dependencies->tls_cert_verifier);
|
pc_deps.tls_cert_verifier = std::move(pc_dependencies->tls_cert_verifier);
|
||||||
}
|
}
|
||||||
|
if (pc_dependencies->ice_transport_factory != nullptr) {
|
||||||
|
pc_deps.ice_transport_factory =
|
||||||
|
std::move(pc_dependencies->ice_transport_factory);
|
||||||
|
}
|
||||||
return pc_deps;
|
return pc_deps;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user