| Index: webrtc/test/call_test.cc
|
| diff --git a/webrtc/test/call_test.cc b/webrtc/test/call_test.cc
|
| index f2b5f91c7b0e313b7beb917f54ba0b65f03bc176..7d73f154a316530fe6b78b93e86a5971e071a6c9 100644
|
| --- a/webrtc/test/call_test.cc
|
| +++ b/webrtc/test/call_test.cc
|
| @@ -27,22 +27,30 @@ CallTest::CallTest()
|
| CallTest::~CallTest() {
|
| }
|
|
|
| -void CallTest::RunBaseTest(BaseTest* test) {
|
| +void CallTest::RunBaseTest(BaseTest* test,
|
| + const FakeNetworkPipe::Config& config) {
|
| CreateSenderCall(test->GetSenderCallConfig());
|
| if (test->ShouldCreateReceivers())
|
| CreateReceiverCall(test->GetReceiverCallConfig());
|
| + send_transport_.reset(new PacketTransport(
|
| + sender_call_.get(), test, test::PacketTransport::kSender, config));
|
| + receive_transport_.reset(new PacketTransport(
|
| + nullptr, test, test::PacketTransport::kReceiver, config));
|
| + test->OnTransportsCreated(send_transport_.get(), receive_transport_.get());
|
| test->OnCallsCreated(sender_call_.get(), receiver_call_.get());
|
|
|
| if (test->ShouldCreateReceivers()) {
|
| - test->SetReceivers(receiver_call_->Receiver(), sender_call_->Receiver());
|
| + send_transport_->SetReceiver(receiver_call_->Receiver());
|
| + receive_transport_->SetReceiver(sender_call_->Receiver());
|
| } else {
|
| // Sender-only call delivers to itself.
|
| - test->SetReceivers(sender_call_->Receiver(), NULL);
|
| + send_transport_->SetReceiver(sender_call_->Receiver());
|
| + receive_transport_->SetReceiver(nullptr);
|
| }
|
|
|
| - CreateSendConfig(test->GetNumStreams(), test->SendTransport());
|
| + CreateSendConfig(test->GetNumStreams(), send_transport_.get());
|
| if (test->ShouldCreateReceivers()) {
|
| - CreateMatchingReceiveConfigs(test->ReceiveTransport());
|
| + CreateMatchingReceiveConfigs(receive_transport_.get());
|
| }
|
| test->ModifyConfigs(&send_config_, &receive_configs_, &encoder_config_);
|
| CreateStreams();
|
| @@ -53,7 +61,8 @@ void CallTest::RunBaseTest(BaseTest* test) {
|
|
|
| Start();
|
| test->PerformTest();
|
| - test->StopSending();
|
| + send_transport_->StopSending();
|
| + receive_transport_->StopSending();
|
| Stop();
|
|
|
| DestroyStreams();
|
| @@ -182,11 +191,6 @@ const int CallTest::kAbsSendTimeExtensionId = 7;
|
| BaseTest::BaseTest(unsigned int timeout_ms) : RtpRtcpObserver(timeout_ms) {
|
| }
|
|
|
| -BaseTest::BaseTest(unsigned int timeout_ms,
|
| - const FakeNetworkPipe::Config& config)
|
| - : RtpRtcpObserver(timeout_ms, config) {
|
| -}
|
| -
|
| BaseTest::~BaseTest() {
|
| }
|
|
|
| @@ -201,6 +205,9 @@ Call::Config BaseTest::GetReceiverCallConfig() {
|
| void BaseTest::OnCallsCreated(Call* sender_call, Call* receiver_call) {
|
| }
|
|
|
| +void BaseTest::OnTransportsCreated(PacketTransport* send_transport,
|
| + PacketTransport* receive_transport) {}
|
| +
|
| size_t BaseTest::GetNumStreams() const {
|
| return 1;
|
| }
|
| @@ -223,11 +230,6 @@ void BaseTest::OnFrameGeneratorCapturerCreated(
|
| SendTest::SendTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
|
| }
|
|
|
| -SendTest::SendTest(unsigned int timeout_ms,
|
| - const FakeNetworkPipe::Config& config)
|
| - : BaseTest(timeout_ms, config) {
|
| -}
|
| -
|
| bool SendTest::ShouldCreateReceivers() const {
|
| return false;
|
| }
|
| @@ -235,11 +237,6 @@ bool SendTest::ShouldCreateReceivers() const {
|
| EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
|
| }
|
|
|
| -EndToEndTest::EndToEndTest(unsigned int timeout_ms,
|
| - const FakeNetworkPipe::Config& config)
|
| - : BaseTest(timeout_ms, config) {
|
| -}
|
| -
|
| bool EndToEndTest::ShouldCreateReceivers() const {
|
| return true;
|
| }
|
|
|