diff options
Diffstat (limited to 'third_party/libwebrtc/pc/peer_connection_factory_unittest.cc')
| -rw-r--r-- | third_party/libwebrtc/pc/peer_connection_factory_unittest.cc | 218 |
1 files changed, 103 insertions, 115 deletions
diff --git a/third_party/libwebrtc/pc/peer_connection_factory_unittest.cc b/third_party/libwebrtc/pc/peer_connection_factory_unittest.cc index 11e232c01f..618ac68388 100644 --- a/third_party/libwebrtc/pc/peer_connection_factory_unittest.cc +++ b/third_party/libwebrtc/pc/peer_connection_factory_unittest.cc @@ -20,6 +20,8 @@ #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/create_peerconnection_factory.h" #include "api/data_channel_interface.h" +#include "api/enable_media.h" +#include "api/environment/environment_factory.h" #include "api/jsep.h" #include "api/media_stream_interface.h" #include "api/task_queue/default_task_queue_factory.h" @@ -35,7 +37,6 @@ #include "api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter.h" #include "api/video_codecs/video_encoder_factory_template_open_h264_adapter.h" #include "media/base/fake_frame_source.h" -#include "media/engine/webrtc_media_engine.h" #include "modules/audio_device/include/audio_device.h" #include "modules/audio_processing/include/audio_processing.h" #include "p2p/base/fake_port_allocator.h" @@ -106,8 +107,7 @@ class NullPeerConnectionObserver : public PeerConnectionObserver { PeerConnectionInterface::IceConnectionState new_state) override {} void OnIceGatheringChange( PeerConnectionInterface::IceGatheringState new_state) override {} - void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override { - } + void OnIceCandidate(const IceCandidateInterface* candidate) override {} }; class MockNetworkManager : public rtc::NetworkManager { @@ -133,17 +133,15 @@ class PeerConnectionFactoryTest : public ::testing::Test { private: void SetUp() { #ifdef WEBRTC_ANDROID - webrtc::InitializeAndroidObjects(); + InitializeAndroidObjects(); #endif // Use fake audio device module since we're only testing the interface // level, and using a real one could make tests flaky e.g. when run in // parallel. - factory_ = webrtc::CreatePeerConnectionFactory( + factory_ = CreatePeerConnectionFactory( rtc::Thread::Current(), rtc::Thread::Current(), rtc::Thread::Current(), - rtc::scoped_refptr<webrtc::AudioDeviceModule>( - FakeAudioCaptureModule::Create()), - webrtc::CreateBuiltinAudioEncoderFactory(), - webrtc::CreateBuiltinAudioDecoderFactory(), + rtc::scoped_refptr<AudioDeviceModule>(FakeAudioCaptureModule::Create()), + CreateBuiltinAudioEncoderFactory(), CreateBuiltinAudioDecoderFactory(), std::make_unique<VideoEncoderFactoryTemplate< LibvpxVp8EncoderTemplateAdapter, LibvpxVp9EncoderTemplateAdapter, OpenH264EncoderTemplateAdapter, LibaomAv1EncoderTemplateAdapter>>(), @@ -182,64 +180,64 @@ class PeerConnectionFactoryTest : public ::testing::Test { } } - void VerifyAudioCodecCapability(const webrtc::RtpCodecCapability& codec) { + void VerifyAudioCodecCapability(const RtpCodecCapability& codec) { EXPECT_EQ(codec.kind, cricket::MEDIA_TYPE_AUDIO); EXPECT_FALSE(codec.name.empty()); EXPECT_GT(codec.clock_rate, 0); EXPECT_GT(codec.num_channels, 0); } - void VerifyVideoCodecCapability(const webrtc::RtpCodecCapability& codec, + void VerifyVideoCodecCapability(const RtpCodecCapability& codec, bool sender) { EXPECT_EQ(codec.kind, cricket::MEDIA_TYPE_VIDEO); EXPECT_FALSE(codec.name.empty()); EXPECT_GT(codec.clock_rate, 0); if (sender) { if (codec.name == "VP8" || codec.name == "H264") { - EXPECT_THAT(codec.scalability_modes, - UnorderedElementsAre(webrtc::ScalabilityMode::kL1T1, - webrtc::ScalabilityMode::kL1T2, - webrtc::ScalabilityMode::kL1T3)) + EXPECT_THAT( + codec.scalability_modes, + UnorderedElementsAre(ScalabilityMode::kL1T1, ScalabilityMode::kL1T2, + ScalabilityMode::kL1T3)) << "Codec: " << codec.name; } else if (codec.name == "VP9" || codec.name == "AV1") { EXPECT_THAT( codec.scalability_modes, UnorderedElementsAre( // clang-format off - webrtc::ScalabilityMode::kL1T1, - webrtc::ScalabilityMode::kL1T2, - webrtc::ScalabilityMode::kL1T3, - webrtc::ScalabilityMode::kL2T1, - webrtc::ScalabilityMode::kL2T1h, - webrtc::ScalabilityMode::kL2T1_KEY, - webrtc::ScalabilityMode::kL2T2, - webrtc::ScalabilityMode::kL2T2h, - webrtc::ScalabilityMode::kL2T2_KEY, - webrtc::ScalabilityMode::kL2T2_KEY_SHIFT, - webrtc::ScalabilityMode::kL2T3, - webrtc::ScalabilityMode::kL2T3h, - webrtc::ScalabilityMode::kL2T3_KEY, - webrtc::ScalabilityMode::kL3T1, - webrtc::ScalabilityMode::kL3T1h, - webrtc::ScalabilityMode::kL3T1_KEY, - webrtc::ScalabilityMode::kL3T2, - webrtc::ScalabilityMode::kL3T2h, - webrtc::ScalabilityMode::kL3T2_KEY, - webrtc::ScalabilityMode::kL3T3, - webrtc::ScalabilityMode::kL3T3h, - webrtc::ScalabilityMode::kL3T3_KEY, - webrtc::ScalabilityMode::kS2T1, - webrtc::ScalabilityMode::kS2T1h, - webrtc::ScalabilityMode::kS2T2, - webrtc::ScalabilityMode::kS2T2h, - webrtc::ScalabilityMode::kS2T3, - webrtc::ScalabilityMode::kS2T3h, - webrtc::ScalabilityMode::kS3T1, - webrtc::ScalabilityMode::kS3T1h, - webrtc::ScalabilityMode::kS3T2, - webrtc::ScalabilityMode::kS3T2h, - webrtc::ScalabilityMode::kS3T3, - webrtc::ScalabilityMode::kS3T3h) + ScalabilityMode::kL1T1, + ScalabilityMode::kL1T2, + ScalabilityMode::kL1T3, + ScalabilityMode::kL2T1, + ScalabilityMode::kL2T1h, + ScalabilityMode::kL2T1_KEY, + ScalabilityMode::kL2T2, + ScalabilityMode::kL2T2h, + ScalabilityMode::kL2T2_KEY, + ScalabilityMode::kL2T2_KEY_SHIFT, + ScalabilityMode::kL2T3, + ScalabilityMode::kL2T3h, + ScalabilityMode::kL2T3_KEY, + ScalabilityMode::kL3T1, + ScalabilityMode::kL3T1h, + ScalabilityMode::kL3T1_KEY, + ScalabilityMode::kL3T2, + ScalabilityMode::kL3T2h, + ScalabilityMode::kL3T2_KEY, + ScalabilityMode::kL3T3, + ScalabilityMode::kL3T3h, + ScalabilityMode::kL3T3_KEY, + ScalabilityMode::kS2T1, + ScalabilityMode::kS2T1h, + ScalabilityMode::kS2T2, + ScalabilityMode::kS2T2h, + ScalabilityMode::kS2T3, + ScalabilityMode::kS2T3h, + ScalabilityMode::kS3T1, + ScalabilityMode::kS3T1h, + ScalabilityMode::kS3T2, + ScalabilityMode::kS3T2h, + ScalabilityMode::kS3T3, + ScalabilityMode::kS3T3h) // clang-format on ) << "Codec: " << codec.name; @@ -251,7 +249,7 @@ class PeerConnectionFactoryTest : public ::testing::Test { } } - webrtc::test::ScopedKeyValueConfig field_trials_; + test::ScopedKeyValueConfig field_trials_; std::unique_ptr<rtc::SocketServer> socket_server_; rtc::AutoSocketServerThread main_thread_; rtc::scoped_refptr<PeerConnectionFactoryInterface> factory_; @@ -267,37 +265,27 @@ class PeerConnectionFactoryTest : public ::testing::Test { // to reconstruct factory with our own ConnectionContext. rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactoryWithRtxDisabled() { - webrtc::PeerConnectionFactoryDependencies pcf_dependencies; + PeerConnectionFactoryDependencies pcf_dependencies; pcf_dependencies.signaling_thread = rtc::Thread::Current(); pcf_dependencies.worker_thread = rtc::Thread::Current(); pcf_dependencies.network_thread = rtc::Thread::Current(); pcf_dependencies.task_queue_factory = CreateDefaultTaskQueueFactory(); - pcf_dependencies.call_factory = CreateCallFactory(); - pcf_dependencies.trials = std::make_unique<webrtc::FieldTrialBasedConfig>(); - - cricket::MediaEngineDependencies media_dependencies; - media_dependencies.task_queue_factory = - pcf_dependencies.task_queue_factory.get(); - media_dependencies.adm = rtc::scoped_refptr<webrtc::AudioDeviceModule>( - FakeAudioCaptureModule::Create()); - media_dependencies.audio_encoder_factory = - webrtc::CreateBuiltinAudioEncoderFactory(); - media_dependencies.audio_decoder_factory = - webrtc::CreateBuiltinAudioDecoderFactory(); - media_dependencies.video_encoder_factory = + + pcf_dependencies.adm = FakeAudioCaptureModule::Create(); + pcf_dependencies.audio_encoder_factory = CreateBuiltinAudioEncoderFactory(); + pcf_dependencies.audio_decoder_factory = CreateBuiltinAudioDecoderFactory(); + pcf_dependencies.video_encoder_factory = std::make_unique<VideoEncoderFactoryTemplate< LibvpxVp8EncoderTemplateAdapter, LibvpxVp9EncoderTemplateAdapter, OpenH264EncoderTemplateAdapter, LibaomAv1EncoderTemplateAdapter>>(); - media_dependencies.video_decoder_factory = + pcf_dependencies.video_decoder_factory = std::make_unique<VideoDecoderFactoryTemplate< LibvpxVp8DecoderTemplateAdapter, LibvpxVp9DecoderTemplateAdapter, OpenH264DecoderTemplateAdapter, Dav1dDecoderTemplateAdapter>>(), - media_dependencies.trials = pcf_dependencies.trials.get(); - pcf_dependencies.media_engine = - cricket::CreateMediaEngine(std::move(media_dependencies)); + EnableMedia(pcf_dependencies); - rtc::scoped_refptr<webrtc::ConnectionContext> context = - ConnectionContext::Create(&pcf_dependencies); + rtc::scoped_refptr<ConnectionContext> context = + ConnectionContext::Create(CreateEnvironment(), &pcf_dependencies); context->set_use_rtx(false); return rtc::make_ref_counted<PeerConnectionFactory>(context, &pcf_dependencies); @@ -311,26 +299,26 @@ CreatePeerConnectionFactoryWithRtxDisabled() { // See https://bugs.chromium.org/p/webrtc/issues/detail?id=7806 for details. TEST(PeerConnectionFactoryTestInternal, DISABLED_CreatePCUsingInternalModules) { #ifdef WEBRTC_ANDROID - webrtc::InitializeAndroidObjects(); + InitializeAndroidObjects(); #endif rtc::scoped_refptr<PeerConnectionFactoryInterface> factory( - webrtc::CreatePeerConnectionFactory( + CreatePeerConnectionFactory( nullptr /* network_thread */, nullptr /* worker_thread */, nullptr /* signaling_thread */, nullptr /* default_adm */, - webrtc::CreateBuiltinAudioEncoderFactory(), - webrtc::CreateBuiltinAudioDecoderFactory(), + CreateBuiltinAudioEncoderFactory(), + CreateBuiltinAudioDecoderFactory(), nullptr /* video_encoder_factory */, nullptr /* video_decoder_factory */, nullptr /* audio_mixer */, nullptr /* audio_processing */)); NullPeerConnectionObserver observer; - webrtc::PeerConnectionInterface::RTCConfiguration config; - config.sdp_semantics = webrtc::SdpSemantics::kUnifiedPlan; + PeerConnectionInterface::RTCConfiguration config; + config.sdp_semantics = SdpSemantics::kUnifiedPlan; std::unique_ptr<FakeRTCCertificateGenerator> cert_generator( new FakeRTCCertificateGenerator()); - webrtc::PeerConnectionDependencies pc_dependencies(&observer); + PeerConnectionDependencies pc_dependencies(&observer); pc_dependencies.cert_generator = std::move(cert_generator); auto result = factory->CreatePeerConnectionOrError(config, std::move(pc_dependencies)); @@ -339,7 +327,7 @@ TEST(PeerConnectionFactoryTestInternal, DISABLED_CreatePCUsingInternalModules) { } TEST_F(PeerConnectionFactoryTest, CheckRtpSenderAudioCapabilities) { - webrtc::RtpCapabilities audio_capabilities = + RtpCapabilities audio_capabilities = factory_->GetRtpSenderCapabilities(cricket::MEDIA_TYPE_AUDIO); EXPECT_FALSE(audio_capabilities.codecs.empty()); for (const auto& codec : audio_capabilities.codecs) { @@ -352,7 +340,7 @@ TEST_F(PeerConnectionFactoryTest, CheckRtpSenderAudioCapabilities) { } TEST_F(PeerConnectionFactoryTest, CheckRtpSenderVideoCapabilities) { - webrtc::RtpCapabilities video_capabilities = + RtpCapabilities video_capabilities = factory_->GetRtpSenderCapabilities(cricket::MEDIA_TYPE_VIDEO); EXPECT_FALSE(video_capabilities.codecs.empty()); for (const auto& codec : video_capabilities.codecs) { @@ -365,7 +353,7 @@ TEST_F(PeerConnectionFactoryTest, CheckRtpSenderVideoCapabilities) { } TEST_F(PeerConnectionFactoryTest, CheckRtpSenderRtxEnabledCapabilities) { - webrtc::RtpCapabilities video_capabilities = + RtpCapabilities video_capabilities = factory_->GetRtpSenderCapabilities(cricket::MEDIA_TYPE_VIDEO); const auto it = std::find_if( video_capabilities.codecs.begin(), video_capabilities.codecs.end(), @@ -375,7 +363,7 @@ TEST_F(PeerConnectionFactoryTest, CheckRtpSenderRtxEnabledCapabilities) { TEST(PeerConnectionFactoryTestInternal, CheckRtpSenderRtxDisabledCapabilities) { auto factory = CreatePeerConnectionFactoryWithRtxDisabled(); - webrtc::RtpCapabilities video_capabilities = + RtpCapabilities video_capabilities = factory->GetRtpSenderCapabilities(cricket::MEDIA_TYPE_VIDEO); const auto it = std::find_if( video_capabilities.codecs.begin(), video_capabilities.codecs.end(), @@ -384,14 +372,14 @@ TEST(PeerConnectionFactoryTestInternal, CheckRtpSenderRtxDisabledCapabilities) { } TEST_F(PeerConnectionFactoryTest, CheckRtpSenderDataCapabilities) { - webrtc::RtpCapabilities data_capabilities = + RtpCapabilities data_capabilities = factory_->GetRtpSenderCapabilities(cricket::MEDIA_TYPE_DATA); EXPECT_TRUE(data_capabilities.codecs.empty()); EXPECT_TRUE(data_capabilities.header_extensions.empty()); } TEST_F(PeerConnectionFactoryTest, CheckRtpReceiverAudioCapabilities) { - webrtc::RtpCapabilities audio_capabilities = + RtpCapabilities audio_capabilities = factory_->GetRtpReceiverCapabilities(cricket::MEDIA_TYPE_AUDIO); EXPECT_FALSE(audio_capabilities.codecs.empty()); for (const auto& codec : audio_capabilities.codecs) { @@ -404,7 +392,7 @@ TEST_F(PeerConnectionFactoryTest, CheckRtpReceiverAudioCapabilities) { } TEST_F(PeerConnectionFactoryTest, CheckRtpReceiverVideoCapabilities) { - webrtc::RtpCapabilities video_capabilities = + RtpCapabilities video_capabilities = factory_->GetRtpReceiverCapabilities(cricket::MEDIA_TYPE_VIDEO); EXPECT_FALSE(video_capabilities.codecs.empty()); for (const auto& codec : video_capabilities.codecs) { @@ -417,7 +405,7 @@ TEST_F(PeerConnectionFactoryTest, CheckRtpReceiverVideoCapabilities) { } TEST_F(PeerConnectionFactoryTest, CheckRtpReceiverRtxEnabledCapabilities) { - webrtc::RtpCapabilities video_capabilities = + RtpCapabilities video_capabilities = factory_->GetRtpReceiverCapabilities(cricket::MEDIA_TYPE_VIDEO); const auto it = std::find_if( video_capabilities.codecs.begin(), video_capabilities.codecs.end(), @@ -428,7 +416,7 @@ TEST_F(PeerConnectionFactoryTest, CheckRtpReceiverRtxEnabledCapabilities) { TEST(PeerConnectionFactoryTestInternal, CheckRtpReceiverRtxDisabledCapabilities) { auto factory = CreatePeerConnectionFactoryWithRtxDisabled(); - webrtc::RtpCapabilities video_capabilities = + RtpCapabilities video_capabilities = factory->GetRtpReceiverCapabilities(cricket::MEDIA_TYPE_VIDEO); const auto it = std::find_if( video_capabilities.codecs.begin(), video_capabilities.codecs.end(), @@ -437,7 +425,7 @@ TEST(PeerConnectionFactoryTestInternal, } TEST_F(PeerConnectionFactoryTest, CheckRtpReceiverDataCapabilities) { - webrtc::RtpCapabilities data_capabilities = + RtpCapabilities data_capabilities = factory_->GetRtpReceiverCapabilities(cricket::MEDIA_TYPE_DATA); EXPECT_TRUE(data_capabilities.codecs.empty()); EXPECT_TRUE(data_capabilities.header_extensions.empty()); @@ -447,8 +435,8 @@ TEST_F(PeerConnectionFactoryTest, CheckRtpReceiverDataCapabilities) { // configuration. Also verifies the URL's parsed correctly as expected. TEST_F(PeerConnectionFactoryTest, CreatePCUsingIceServers) { PeerConnectionInterface::RTCConfiguration config; - config.sdp_semantics = webrtc::SdpSemantics::kUnifiedPlan; - webrtc::PeerConnectionInterface::IceServer ice_server; + config.sdp_semantics = SdpSemantics::kUnifiedPlan; + PeerConnectionInterface::IceServer ice_server; ice_server.uri = kStunIceServer; config.servers.push_back(ice_server); ice_server.uri = kTurnIceServer; @@ -459,7 +447,7 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingIceServers) { ice_server.username = kTurnUsername; ice_server.password = kTurnPassword; config.servers.push_back(ice_server); - webrtc::PeerConnectionDependencies pc_dependencies(&observer_); + PeerConnectionDependencies pc_dependencies(&observer_); pc_dependencies.cert_generator = std::make_unique<FakeRTCCertificateGenerator>(); pc_dependencies.allocator = std::move(port_allocator_); @@ -484,15 +472,15 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingIceServers) { // configuration. Also verifies the list of URL's parsed correctly as expected. TEST_F(PeerConnectionFactoryTest, CreatePCUsingIceServersUrls) { PeerConnectionInterface::RTCConfiguration config; - config.sdp_semantics = webrtc::SdpSemantics::kUnifiedPlan; - webrtc::PeerConnectionInterface::IceServer ice_server; + config.sdp_semantics = SdpSemantics::kUnifiedPlan; + PeerConnectionInterface::IceServer ice_server; ice_server.urls.push_back(kStunIceServer); ice_server.urls.push_back(kTurnIceServer); ice_server.urls.push_back(kTurnIceServerWithTransport); ice_server.username = kTurnUsername; ice_server.password = kTurnPassword; config.servers.push_back(ice_server); - webrtc::PeerConnectionDependencies pc_dependencies(&observer_); + PeerConnectionDependencies pc_dependencies(&observer_); pc_dependencies.cert_generator = std::make_unique<FakeRTCCertificateGenerator>(); pc_dependencies.allocator = std::move(port_allocator_); @@ -515,15 +503,15 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingIceServersUrls) { TEST_F(PeerConnectionFactoryTest, CreatePCUsingNoUsernameInUri) { PeerConnectionInterface::RTCConfiguration config; - config.sdp_semantics = webrtc::SdpSemantics::kUnifiedPlan; - webrtc::PeerConnectionInterface::IceServer ice_server; + config.sdp_semantics = SdpSemantics::kUnifiedPlan; + PeerConnectionInterface::IceServer ice_server; ice_server.uri = kStunIceServer; config.servers.push_back(ice_server); ice_server.uri = kTurnIceServerWithNoUsernameInUri; ice_server.username = kTurnUsername; ice_server.password = kTurnPassword; config.servers.push_back(ice_server); - webrtc::PeerConnectionDependencies pc_dependencies(&observer_); + PeerConnectionDependencies pc_dependencies(&observer_); pc_dependencies.cert_generator = std::make_unique<FakeRTCCertificateGenerator>(); pc_dependencies.allocator = std::move(port_allocator_); @@ -541,13 +529,13 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingNoUsernameInUri) { // has transport parameter in it. TEST_F(PeerConnectionFactoryTest, CreatePCUsingTurnUrlWithTransportParam) { PeerConnectionInterface::RTCConfiguration config; - config.sdp_semantics = webrtc::SdpSemantics::kUnifiedPlan; - webrtc::PeerConnectionInterface::IceServer ice_server; + config.sdp_semantics = SdpSemantics::kUnifiedPlan; + PeerConnectionInterface::IceServer ice_server; ice_server.uri = kTurnIceServerWithTransport; ice_server.username = kTurnUsername; ice_server.password = kTurnPassword; config.servers.push_back(ice_server); - webrtc::PeerConnectionDependencies pc_dependencies(&observer_); + PeerConnectionDependencies pc_dependencies(&observer_); pc_dependencies.cert_generator = std::make_unique<FakeRTCCertificateGenerator>(); pc_dependencies.allocator = std::move(port_allocator_); @@ -563,8 +551,8 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingTurnUrlWithTransportParam) { TEST_F(PeerConnectionFactoryTest, CreatePCUsingSecureTurnUrl) { PeerConnectionInterface::RTCConfiguration config; - config.sdp_semantics = webrtc::SdpSemantics::kUnifiedPlan; - webrtc::PeerConnectionInterface::IceServer ice_server; + config.sdp_semantics = SdpSemantics::kUnifiedPlan; + PeerConnectionInterface::IceServer ice_server; ice_server.uri = kSecureTurnIceServer; ice_server.username = kTurnUsername; ice_server.password = kTurnPassword; @@ -577,7 +565,7 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingSecureTurnUrl) { ice_server.username = kTurnUsername; ice_server.password = kTurnPassword; config.servers.push_back(ice_server); - webrtc::PeerConnectionDependencies pc_dependencies(&observer_); + PeerConnectionDependencies pc_dependencies(&observer_); pc_dependencies.cert_generator = std::make_unique<FakeRTCCertificateGenerator>(); pc_dependencies.allocator = std::move(port_allocator_); @@ -602,8 +590,8 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingSecureTurnUrl) { TEST_F(PeerConnectionFactoryTest, CreatePCUsingIPLiteralAddress) { PeerConnectionInterface::RTCConfiguration config; - config.sdp_semantics = webrtc::SdpSemantics::kUnifiedPlan; - webrtc::PeerConnectionInterface::IceServer ice_server; + config.sdp_semantics = SdpSemantics::kUnifiedPlan; + PeerConnectionInterface::IceServer ice_server; ice_server.uri = kStunIceServerWithIPv4Address; config.servers.push_back(ice_server); ice_server.uri = kStunIceServerWithIPv4AddressWithoutPort; @@ -616,7 +604,7 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingIPLiteralAddress) { ice_server.username = kTurnUsername; ice_server.password = kTurnPassword; config.servers.push_back(ice_server); - webrtc::PeerConnectionDependencies pc_dependencies(&observer_); + PeerConnectionDependencies pc_dependencies(&observer_); pc_dependencies.cert_generator = std::make_unique<FakeRTCCertificateGenerator>(); pc_dependencies.allocator = std::move(port_allocator_); @@ -644,8 +632,8 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingIPLiteralAddress) { // This test verifies the captured stream is rendered locally using a // local video track. TEST_F(PeerConnectionFactoryTest, LocalRendering) { - rtc::scoped_refptr<webrtc::FakeVideoTrackSource> source = - webrtc::FakeVideoTrackSource::Create(/*is_screencast=*/false); + rtc::scoped_refptr<FakeVideoTrackSource> source = + FakeVideoTrackSource::Create(/*is_screencast=*/false); cricket::FakeFrameSource frame_source(1280, 720, rtc::kNumMicrosecsPerSec / 30); @@ -673,7 +661,7 @@ TEST_F(PeerConnectionFactoryTest, LocalRendering) { } TEST(PeerConnectionFactoryDependenciesTest, UsesNetworkManager) { - constexpr webrtc::TimeDelta kWaitTimeout = webrtc::TimeDelta::Seconds(10); + constexpr TimeDelta kWaitTimeout = TimeDelta::Seconds(10); auto mock_network_manager = std::make_unique<NiceMock<MockNetworkManager>>(); rtc::Event called; @@ -681,24 +669,24 @@ TEST(PeerConnectionFactoryDependenciesTest, UsesNetworkManager) { .Times(AtLeast(1)) .WillRepeatedly(InvokeWithoutArgs([&] { called.Set(); })); - webrtc::PeerConnectionFactoryDependencies pcf_dependencies; + PeerConnectionFactoryDependencies pcf_dependencies; pcf_dependencies.network_manager = std::move(mock_network_manager); - rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> pcf = + rtc::scoped_refptr<PeerConnectionFactoryInterface> pcf = CreateModularPeerConnectionFactory(std::move(pcf_dependencies)); PeerConnectionInterface::RTCConfiguration config; config.ice_candidate_pool_size = 2; NullPeerConnectionObserver observer; auto pc = pcf->CreatePeerConnectionOrError( - config, webrtc::PeerConnectionDependencies(&observer)); + config, PeerConnectionDependencies(&observer)); ASSERT_TRUE(pc.ok()); called.Wait(kWaitTimeout); } TEST(PeerConnectionFactoryDependenciesTest, UsesPacketSocketFactory) { - constexpr webrtc::TimeDelta kWaitTimeout = webrtc::TimeDelta::Seconds(10); + constexpr TimeDelta kWaitTimeout = TimeDelta::Seconds(10); auto mock_socket_factory = std::make_unique<NiceMock<rtc::MockPacketSocketFactory>>(); @@ -710,10 +698,10 @@ TEST(PeerConnectionFactoryDependenciesTest, UsesPacketSocketFactory) { })) .WillRepeatedly(Return(nullptr)); - webrtc::PeerConnectionFactoryDependencies pcf_dependencies; + PeerConnectionFactoryDependencies pcf_dependencies; pcf_dependencies.packet_socket_factory = std::move(mock_socket_factory); - rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> pcf = + rtc::scoped_refptr<PeerConnectionFactoryInterface> pcf = CreateModularPeerConnectionFactory(std::move(pcf_dependencies)); // By default, localhost addresses are ignored, which makes tests fail if test @@ -726,7 +714,7 @@ TEST(PeerConnectionFactoryDependenciesTest, UsesPacketSocketFactory) { config.ice_candidate_pool_size = 2; NullPeerConnectionObserver observer; auto pc = pcf->CreatePeerConnectionOrError( - config, webrtc::PeerConnectionDependencies(&observer)); + config, PeerConnectionDependencies(&observer)); ASSERT_TRUE(pc.ok()); called.Wait(kWaitTimeout); |