| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 653 nullptr, nullptr, webrtc::AudioProcessing::Create())); | 653 nullptr, nullptr, webrtc::AudioProcessing::Create())); |
| 654 | 654 |
| 655 std::unique_ptr<webrtc::CallFactoryInterface> call_factory = | 655 std::unique_ptr<webrtc::CallFactoryInterface> call_factory = |
| 656 webrtc::CreateCallFactory(); | 656 webrtc::CreateCallFactory(); |
| 657 | 657 |
| 658 std::unique_ptr<webrtc::RtcEventLogFactoryInterface> event_log_factory = | 658 std::unique_ptr<webrtc::RtcEventLogFactoryInterface> event_log_factory = |
| 659 webrtc::CreateRtcEventLogFactory(); | 659 webrtc::CreateRtcEventLogFactory(); |
| 660 | 660 |
| 661 return new rtc::RefCountedObject<PeerConnectionFactoryForTest>( | 661 return new rtc::RefCountedObject<PeerConnectionFactoryForTest>( |
| 662 rtc::Thread::Current(), rtc::Thread::Current(), rtc::Thread::Current(), | 662 rtc::Thread::Current(), rtc::Thread::Current(), rtc::Thread::Current(), |
| 663 FakeAudioCaptureModule::Create(), audio_encoder_factory, | 663 nullptr, nullptr, std::move(media_engine), std::move(call_factory), |
| 664 audio_decoder_factory, nullptr, nullptr, nullptr, | |
| 665 std::move(media_engine), std::move(call_factory), | |
| 666 std::move(event_log_factory)); | 664 std::move(event_log_factory)); |
| 667 } | 665 } |
| 668 | 666 |
| 669 PeerConnectionFactoryForTest( | 667 PeerConnectionFactoryForTest( |
| 670 rtc::Thread* network_thread, | 668 rtc::Thread* network_thread, |
| 671 rtc::Thread* worker_thread, | 669 rtc::Thread* worker_thread, |
| 672 rtc::Thread* signaling_thread, | 670 rtc::Thread* signaling_thread, |
| 673 rtc::scoped_refptr<FakeAudioCaptureModule> fake_adm, | |
| 674 rtc::scoped_refptr<webrtc::AudioEncoderFactory> audio_encoder_factory, | |
| 675 rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory, | |
| 676 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, | 671 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, |
| 677 cricket::WebRtcVideoDecoderFactory* video_decoder_factory, | 672 cricket::WebRtcVideoDecoderFactory* video_decoder_factory, |
| 678 rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer, | |
| 679 std::unique_ptr<cricket::MediaEngineInterface> media_engine, | 673 std::unique_ptr<cricket::MediaEngineInterface> media_engine, |
| 680 std::unique_ptr<webrtc::CallFactoryInterface> call_factory, | 674 std::unique_ptr<webrtc::CallFactoryInterface> call_factory, |
| 681 std::unique_ptr<webrtc::RtcEventLogFactoryInterface> event_log_factory) | 675 std::unique_ptr<webrtc::RtcEventLogFactoryInterface> event_log_factory) |
| 682 : webrtc::PeerConnectionFactory(network_thread, | 676 : webrtc::PeerConnectionFactory(network_thread, |
| 683 worker_thread, | 677 worker_thread, |
| 684 signaling_thread, | 678 signaling_thread, |
| 685 fake_adm, | |
| 686 audio_encoder_factory, | |
| 687 audio_decoder_factory, | |
| 688 video_encoder_factory, | 679 video_encoder_factory, |
| 689 video_decoder_factory, | 680 video_decoder_factory, |
| 690 audio_mixer, | |
| 691 std::move(media_engine), | 681 std::move(media_engine), |
| 692 std::move(call_factory), | 682 std::move(call_factory), |
| 693 std::move(event_log_factory)) {} | 683 std::move(event_log_factory)) {} |
| 694 | 684 |
| 695 cricket::TransportController* CreateTransportController( | 685 cricket::TransportController* CreateTransportController( |
| 696 cricket::PortAllocator* port_allocator, | 686 cricket::PortAllocator* port_allocator, |
| 697 bool redetermine_role_on_ice_restart) override { | 687 bool redetermine_role_on_ice_restart) override { |
| 698 transport_controller = new cricket::TransportController( | 688 transport_controller = new cricket::TransportController( |
| 699 rtc::Thread::Current(), rtc::Thread::Current(), port_allocator, | 689 rtc::Thread::Current(), rtc::Thread::Current(), port_allocator, |
| 700 redetermine_role_on_ice_restart, rtc::CryptoOptions()); | 690 redetermine_role_on_ice_restart, rtc::CryptoOptions()); |
| (...skipping 3274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3975 EXPECT_NE(a, f); | 3965 EXPECT_NE(a, f); |
| 3976 | 3966 |
| 3977 PeerConnectionInterface::RTCConfiguration g; | 3967 PeerConnectionInterface::RTCConfiguration g; |
| 3978 g.disable_ipv6 = true; | 3968 g.disable_ipv6 = true; |
| 3979 EXPECT_NE(a, g); | 3969 EXPECT_NE(a, g); |
| 3980 | 3970 |
| 3981 PeerConnectionInterface::RTCConfiguration h( | 3971 PeerConnectionInterface::RTCConfiguration h( |
| 3982 PeerConnectionInterface::RTCConfigurationType::kAggressive); | 3972 PeerConnectionInterface::RTCConfigurationType::kAggressive); |
| 3983 EXPECT_NE(a, h); | 3973 EXPECT_NE(a, h); |
| 3984 } | 3974 } |
| OLD | NEW |