mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-19 08:37:54 +01:00
89870ffa95
This reverts commit3e61f881cd. Reason for revert: Issue fixed in https://webrtc-review.googlesource.com/c/src/+/291104 Original change's description: > Revert "Change CallTests to use new PacketReceiver::DeliverRtp and PacketReceiver::DeliverRtcp" > > This reverts commit3b96f2c770. > > Reason for revert: Seems to cause test failures and perf regressions in tests: webrtc:14833, and CallPerfTest.Min_Bitrate_VideoAndAudio > > > Original change's description: > > Change CallTests to use new PacketReceiver::DeliverRtp and PacketReceiver::DeliverRtcp > > > > PacketReceiver::DeliverRtp requires delivered packets to have extensions already mapped. > > Therefore DirectTransport is provided with the extension mapping. > > > > CallTests and tests derived from CallTest create transports in different ways, this cl change CallTest to create tests in only one way to simplify how extensions are provided to the transport but at the same time still allows different network behaviour. > > > > > > Change-Id: Ie8b3ad947c170be61e62c02dadf4adedbb3841f1 > > Bug: webrtc:7135, webrtc:14795 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/290980 > > Reviewed-by: Jakob Ivarsson <jakobi@webrtc.org> > > Commit-Queue: Per Kjellander <perkj@webrtc.org> > > Reviewed-by: Erik Språng <sprang@webrtc.org> > > Cr-Commit-Position: refs/heads/main@{#39137} > > Bug: webrtc:7135, webrtc:14795, webrtc:14833 > Change-Id: Ib6180a47cf7611ed2bc648acc3b9e5cfeec4d9cf > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/291220 > Owners-Override: Björn Terelius <terelius@webrtc.org> > Auto-Submit: Per Kjellander <perkj@webrtc.org> > Reviewed-by: Björn Terelius <terelius@webrtc.org> > Commit-Queue: Björn Terelius <terelius@webrtc.org> > Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> > Cr-Commit-Position: refs/heads/main@{#39146} Bug: webrtc:7135, webrtc:14795, webrtc:14833 Change-Id: I3fb0210d7a33c600ead5719ce2acb8cc68ec20bd Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/291222 Commit-Queue: Per Kjellander <perkj@webrtc.org> Reviewed-by: Jakob Ivarsson <jakobi@webrtc.org> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Per Kjellander <perkj@webrtc.org> Cr-Commit-Position: refs/heads/main@{#39157}
91 lines
2.8 KiB
C++
91 lines
2.8 KiB
C++
/*
|
|
* Copyright (c) 2017 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.
|
|
*/
|
|
|
|
#include "audio/test/audio_end_to_end_test.h"
|
|
|
|
#include <algorithm>
|
|
#include <memory>
|
|
|
|
#include "api/task_queue/task_queue_base.h"
|
|
#include "call/fake_network_pipe.h"
|
|
#include "call/simulated_network.h"
|
|
#include "system_wrappers/include/sleep.h"
|
|
#include "test/gtest.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
namespace {
|
|
// Wait half a second between stopping sending and stopping receiving audio.
|
|
constexpr int kExtraRecordTimeMs = 500;
|
|
|
|
constexpr int kSampleRate = 48000;
|
|
} // namespace
|
|
|
|
AudioEndToEndTest::AudioEndToEndTest()
|
|
: EndToEndTest(CallTest::kDefaultTimeout) {}
|
|
|
|
size_t AudioEndToEndTest::GetNumVideoStreams() const {
|
|
return 0;
|
|
}
|
|
|
|
size_t AudioEndToEndTest::GetNumAudioStreams() const {
|
|
return 1;
|
|
}
|
|
|
|
size_t AudioEndToEndTest::GetNumFlexfecStreams() const {
|
|
return 0;
|
|
}
|
|
|
|
std::unique_ptr<TestAudioDeviceModule::Capturer>
|
|
AudioEndToEndTest::CreateCapturer() {
|
|
return TestAudioDeviceModule::CreatePulsedNoiseCapturer(32000, kSampleRate);
|
|
}
|
|
|
|
std::unique_ptr<TestAudioDeviceModule::Renderer>
|
|
AudioEndToEndTest::CreateRenderer() {
|
|
return TestAudioDeviceModule::CreateDiscardRenderer(kSampleRate);
|
|
}
|
|
|
|
void AudioEndToEndTest::OnFakeAudioDevicesCreated(
|
|
TestAudioDeviceModule* send_audio_device,
|
|
TestAudioDeviceModule* recv_audio_device) {
|
|
send_audio_device_ = send_audio_device;
|
|
}
|
|
|
|
void AudioEndToEndTest::ModifyAudioConfigs(
|
|
AudioSendStream::Config* send_config,
|
|
std::vector<AudioReceiveStreamInterface::Config>* receive_configs) {
|
|
// Large bitrate by default.
|
|
const webrtc::SdpAudioFormat kDefaultFormat("opus", 48000, 2,
|
|
{{"stereo", "1"}});
|
|
send_config->send_codec_spec = AudioSendStream::Config::SendCodecSpec(
|
|
test::CallTest::kAudioSendPayloadType, kDefaultFormat);
|
|
send_config->min_bitrate_bps = 32000;
|
|
send_config->max_bitrate_bps = 32000;
|
|
}
|
|
|
|
void AudioEndToEndTest::OnAudioStreamsCreated(
|
|
AudioSendStream* send_stream,
|
|
const std::vector<AudioReceiveStreamInterface*>& receive_streams) {
|
|
ASSERT_NE(nullptr, send_stream);
|
|
ASSERT_EQ(1u, receive_streams.size());
|
|
ASSERT_NE(nullptr, receive_streams[0]);
|
|
send_stream_ = send_stream;
|
|
receive_stream_ = receive_streams[0];
|
|
}
|
|
|
|
void AudioEndToEndTest::PerformTest() {
|
|
// Wait until the input audio file is done...
|
|
send_audio_device_->WaitForRecordingEnd();
|
|
// and some extra time to account for network delay.
|
|
SleepMs(GetSendTransportConfig().queue_delay_ms + kExtraRecordTimeMs);
|
|
}
|
|
} // namespace test
|
|
} // namespace webrtc
|