2014-06-27 08:47:52 +00:00
|
|
|
/*
|
|
|
|
|
* Copyright (c) 2014 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.
|
|
|
|
|
*/
|
2016-11-15 07:10:52 -08:00
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "test/call_test.h"
|
2016-11-15 07:10:52 -08:00
|
|
|
|
|
|
|
|
#include <algorithm>
|
|
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
|
|
|
|
|
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
|
|
|
|
|
#include "call/rtp_transport_controller_send.h"
|
|
|
|
|
#include "call/video_config.h"
|
|
|
|
|
#include "modules/audio_mixer/audio_mixer_impl.h"
|
|
|
|
|
#include "rtc_base/checks.h"
|
|
|
|
|
#include "rtc_base/event.h"
|
|
|
|
|
#include "rtc_base/ptr_util.h"
|
|
|
|
|
#include "test/testsupport/fileutils.h"
|
2017-08-22 04:02:52 -07:00
|
|
|
|
2014-06-27 08:47:52 +00:00
|
|
|
namespace webrtc {
|
|
|
|
|
namespace test {
|
|
|
|
|
|
2015-04-08 13:00:10 -07:00
|
|
|
namespace {
|
|
|
|
|
const int kVideoRotationRtpExtensionId = 4;
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-27 08:47:52 +00:00
|
|
|
CallTest::CallTest()
|
2014-07-07 13:06:48 +00:00
|
|
|
: clock_(Clock::GetRealTimeClock()),
|
2017-04-10 03:54:05 -07:00
|
|
|
event_log_(RtcEventLog::CreateNull()),
|
2017-08-09 06:42:32 -07:00
|
|
|
sender_call_transport_controller_(nullptr),
|
2015-12-21 03:14:00 -08:00
|
|
|
video_send_config_(nullptr),
|
2016-01-07 17:43:18 +01:00
|
|
|
video_send_stream_(nullptr),
|
|
|
|
|
audio_send_config_(nullptr),
|
|
|
|
|
audio_send_stream_(nullptr),
|
2018-04-18 07:17:07 +00:00
|
|
|
fake_encoder_(clock_),
|
2016-01-14 20:34:30 +01:00
|
|
|
num_video_streams_(1),
|
2016-01-07 17:43:18 +01:00
|
|
|
num_audio_streams_(0),
|
2016-11-15 07:10:52 -08:00
|
|
|
num_flexfec_streams_(0),
|
2018-03-28 14:16:04 +02:00
|
|
|
audio_decoder_factory_(CreateBuiltinAudioDecoderFactory()),
|
|
|
|
|
audio_encoder_factory_(CreateBuiltinAudioEncoderFactory()),
|
Remove voe::TransmitMixer
TransmitMixer's functionality is moved into the AudioTransportProxy
owned by AudioState. This removes the need for an AudioTransport
implementation in VoEBaseImpl, which means that the proxy is no longer
a proxy, hence AudioTransportProxy is renamed to AudioTransportImpl.
In the short term, AudioState needs to know which AudioDeviceModule is
used, so it is added in AudioState::Config. AudioTransportImpl needs
to know which AudioSendStream:s are currently enabled to send, so
AudioState maintains a map of them, which is reduced into a simple
vector for AudioTransportImpl.
To encode and transmit audio,
AudioSendStream::OnAudioData(std::unique_ptr<AudioFrame> audio_frame)
is introduced, which is used in both the Chromium and standalone use
cases. This removes the need for two different instances of
voe::Channel::ProcessAndEncodeAudio(), so there is now only one,
taking an AudioFrame as argument. Callers need to allocate their own
AudioFrame:s, which is wasteful but not a regression since this was
already happening in the voe::Channel functions.
Most of the logic changed resides in
AudioTransportImpl::RecordedDataIsAvailable(), where two strange
things were found:
1. The clock drift parameter was ineffective since
apm->echo_cancellation()->enable_drift_compensation(false) is
called during initialization.
2. The output parameter 'new_mic_volume' was never set - instead it
was returned as a result, causing the ADM to never update the
analog mic gain
(https://cs.chromium.org/chromium/src/third_party/webrtc/voice_engine/voe_base_impl.cc?q=voe_base_impl.cc&dr&l=100).
Besides this, tests are updated, and some dead code is removed which
was found in the process.
Bug: webrtc:4690, webrtc:8591
Change-Id: I789d5296bf5efb7299a5ee05a4f3ce6abf9124b2
Reviewed-on: https://webrtc-review.googlesource.com/26681
Commit-Queue: Fredrik Solenberg <solenberg@webrtc.org>
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21301}
2017-12-15 16:42:15 +01:00
|
|
|
task_queue_("CallTestTaskQueue") {}
|
2014-10-22 12:15:24 +00:00
|
|
|
|
2014-06-27 08:47:52 +00:00
|
|
|
CallTest::~CallTest() {
|
2017-08-22 04:02:52 -07:00
|
|
|
task_queue_.SendTask([this]() {
|
Remove voe::TransmitMixer
TransmitMixer's functionality is moved into the AudioTransportProxy
owned by AudioState. This removes the need for an AudioTransport
implementation in VoEBaseImpl, which means that the proxy is no longer
a proxy, hence AudioTransportProxy is renamed to AudioTransportImpl.
In the short term, AudioState needs to know which AudioDeviceModule is
used, so it is added in AudioState::Config. AudioTransportImpl needs
to know which AudioSendStream:s are currently enabled to send, so
AudioState maintains a map of them, which is reduced into a simple
vector for AudioTransportImpl.
To encode and transmit audio,
AudioSendStream::OnAudioData(std::unique_ptr<AudioFrame> audio_frame)
is introduced, which is used in both the Chromium and standalone use
cases. This removes the need for two different instances of
voe::Channel::ProcessAndEncodeAudio(), so there is now only one,
taking an AudioFrame as argument. Callers need to allocate their own
AudioFrame:s, which is wasteful but not a regression since this was
already happening in the voe::Channel functions.
Most of the logic changed resides in
AudioTransportImpl::RecordedDataIsAvailable(), where two strange
things were found:
1. The clock drift parameter was ineffective since
apm->echo_cancellation()->enable_drift_compensation(false) is
called during initialization.
2. The output parameter 'new_mic_volume' was never set - instead it
was returned as a result, causing the ADM to never update the
analog mic gain
(https://cs.chromium.org/chromium/src/third_party/webrtc/voice_engine/voe_base_impl.cc?q=voe_base_impl.cc&dr&l=100).
Besides this, tests are updated, and some dead code is removed which
was found in the process.
Bug: webrtc:4690, webrtc:8591
Change-Id: I789d5296bf5efb7299a5ee05a4f3ce6abf9124b2
Reviewed-on: https://webrtc-review.googlesource.com/26681
Commit-Queue: Fredrik Solenberg <solenberg@webrtc.org>
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21301}
2017-12-15 16:42:15 +01:00
|
|
|
fake_send_audio_device_ = nullptr;
|
|
|
|
|
fake_recv_audio_device_ = nullptr;
|
2017-08-22 04:02:52 -07:00
|
|
|
frame_generator_capturer_.reset();
|
|
|
|
|
});
|
2014-06-27 08:47:52 +00:00
|
|
|
}
|
|
|
|
|
|
2016-01-08 06:47:13 -08:00
|
|
|
void CallTest::RunBaseTest(BaseTest* test) {
|
2017-08-22 04:02:52 -07:00
|
|
|
task_queue_.SendTask([this, test]() {
|
|
|
|
|
num_video_streams_ = test->GetNumVideoStreams();
|
|
|
|
|
num_audio_streams_ = test->GetNumAudioStreams();
|
|
|
|
|
num_flexfec_streams_ = test->GetNumFlexfecStreams();
|
|
|
|
|
RTC_DCHECK(num_video_streams_ > 0 || num_audio_streams_ > 0);
|
|
|
|
|
Call::Config send_config(test->GetSenderCallConfig());
|
2016-01-07 17:43:18 +01:00
|
|
|
if (num_audio_streams_ > 0) {
|
2017-08-22 04:02:52 -07:00
|
|
|
CreateFakeAudioDevices(test->CreateCapturer(), test->CreateRenderer());
|
|
|
|
|
test->OnFakeAudioDevicesCreated(fake_send_audio_device_.get(),
|
|
|
|
|
fake_recv_audio_device_.get());
|
2018-01-09 14:17:33 +01:00
|
|
|
apm_send_ = AudioProcessingBuilder().Create();
|
|
|
|
|
apm_recv_ = AudioProcessingBuilder().Create();
|
2018-01-11 13:52:30 +01:00
|
|
|
EXPECT_EQ(0, fake_send_audio_device_->Init());
|
|
|
|
|
EXPECT_EQ(0, fake_recv_audio_device_->Init());
|
2016-01-07 17:43:18 +01:00
|
|
|
AudioState::Config audio_state_config;
|
2016-11-17 06:48:48 -08:00
|
|
|
audio_state_config.audio_mixer = AudioMixerImpl::Create();
|
2017-08-22 04:02:52 -07:00
|
|
|
audio_state_config.audio_processing = apm_send_;
|
Remove voe::TransmitMixer
TransmitMixer's functionality is moved into the AudioTransportProxy
owned by AudioState. This removes the need for an AudioTransport
implementation in VoEBaseImpl, which means that the proxy is no longer
a proxy, hence AudioTransportProxy is renamed to AudioTransportImpl.
In the short term, AudioState needs to know which AudioDeviceModule is
used, so it is added in AudioState::Config. AudioTransportImpl needs
to know which AudioSendStream:s are currently enabled to send, so
AudioState maintains a map of them, which is reduced into a simple
vector for AudioTransportImpl.
To encode and transmit audio,
AudioSendStream::OnAudioData(std::unique_ptr<AudioFrame> audio_frame)
is introduced, which is used in both the Chromium and standalone use
cases. This removes the need for two different instances of
voe::Channel::ProcessAndEncodeAudio(), so there is now only one,
taking an AudioFrame as argument. Callers need to allocate their own
AudioFrame:s, which is wasteful but not a regression since this was
already happening in the voe::Channel functions.
Most of the logic changed resides in
AudioTransportImpl::RecordedDataIsAvailable(), where two strange
things were found:
1. The clock drift parameter was ineffective since
apm->echo_cancellation()->enable_drift_compensation(false) is
called during initialization.
2. The output parameter 'new_mic_volume' was never set - instead it
was returned as a result, causing the ADM to never update the
analog mic gain
(https://cs.chromium.org/chromium/src/third_party/webrtc/voice_engine/voe_base_impl.cc?q=voe_base_impl.cc&dr&l=100).
Besides this, tests are updated, and some dead code is removed which
was found in the process.
Bug: webrtc:4690, webrtc:8591
Change-Id: I789d5296bf5efb7299a5ee05a4f3ce6abf9124b2
Reviewed-on: https://webrtc-review.googlesource.com/26681
Commit-Queue: Fredrik Solenberg <solenberg@webrtc.org>
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21301}
2017-12-15 16:42:15 +01:00
|
|
|
audio_state_config.audio_device_module = fake_send_audio_device_;
|
2017-08-22 04:02:52 -07:00
|
|
|
send_config.audio_state = AudioState::Create(audio_state_config);
|
2017-11-21 20:33:05 +01:00
|
|
|
fake_send_audio_device_->RegisterAudioCallback(
|
|
|
|
|
send_config.audio_state->audio_transport());
|
2017-08-22 04:02:52 -07:00
|
|
|
}
|
|
|
|
|
CreateSenderCall(send_config);
|
|
|
|
|
if (sender_call_transport_controller_ != nullptr) {
|
|
|
|
|
test->OnRtpTransportControllerSendCreated(
|
|
|
|
|
sender_call_transport_controller_);
|
|
|
|
|
}
|
|
|
|
|
if (test->ShouldCreateReceivers()) {
|
|
|
|
|
Call::Config recv_config(test->GetReceiverCallConfig());
|
|
|
|
|
if (num_audio_streams_ > 0) {
|
|
|
|
|
AudioState::Config audio_state_config;
|
|
|
|
|
audio_state_config.audio_mixer = AudioMixerImpl::Create();
|
|
|
|
|
audio_state_config.audio_processing = apm_recv_;
|
Remove voe::TransmitMixer
TransmitMixer's functionality is moved into the AudioTransportProxy
owned by AudioState. This removes the need for an AudioTransport
implementation in VoEBaseImpl, which means that the proxy is no longer
a proxy, hence AudioTransportProxy is renamed to AudioTransportImpl.
In the short term, AudioState needs to know which AudioDeviceModule is
used, so it is added in AudioState::Config. AudioTransportImpl needs
to know which AudioSendStream:s are currently enabled to send, so
AudioState maintains a map of them, which is reduced into a simple
vector for AudioTransportImpl.
To encode and transmit audio,
AudioSendStream::OnAudioData(std::unique_ptr<AudioFrame> audio_frame)
is introduced, which is used in both the Chromium and standalone use
cases. This removes the need for two different instances of
voe::Channel::ProcessAndEncodeAudio(), so there is now only one,
taking an AudioFrame as argument. Callers need to allocate their own
AudioFrame:s, which is wasteful but not a regression since this was
already happening in the voe::Channel functions.
Most of the logic changed resides in
AudioTransportImpl::RecordedDataIsAvailable(), where two strange
things were found:
1. The clock drift parameter was ineffective since
apm->echo_cancellation()->enable_drift_compensation(false) is
called during initialization.
2. The output parameter 'new_mic_volume' was never set - instead it
was returned as a result, causing the ADM to never update the
analog mic gain
(https://cs.chromium.org/chromium/src/third_party/webrtc/voice_engine/voe_base_impl.cc?q=voe_base_impl.cc&dr&l=100).
Besides this, tests are updated, and some dead code is removed which
was found in the process.
Bug: webrtc:4690, webrtc:8591
Change-Id: I789d5296bf5efb7299a5ee05a4f3ce6abf9124b2
Reviewed-on: https://webrtc-review.googlesource.com/26681
Commit-Queue: Fredrik Solenberg <solenberg@webrtc.org>
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21301}
2017-12-15 16:42:15 +01:00
|
|
|
audio_state_config.audio_device_module = fake_recv_audio_device_;
|
2017-08-22 04:02:52 -07:00
|
|
|
recv_config.audio_state = AudioState::Create(audio_state_config);
|
2017-11-21 20:33:05 +01:00
|
|
|
fake_recv_audio_device_->RegisterAudioCallback(
|
|
|
|
|
recv_config.audio_state->audio_transport()); }
|
2017-08-22 04:02:52 -07:00
|
|
|
CreateReceiverCall(recv_config);
|
|
|
|
|
}
|
|
|
|
|
test->OnCallsCreated(sender_call_.get(), receiver_call_.get());
|
|
|
|
|
receive_transport_.reset(test->CreateReceiveTransport(&task_queue_));
|
|
|
|
|
send_transport_.reset(
|
|
|
|
|
test->CreateSendTransport(&task_queue_, sender_call_.get()));
|
|
|
|
|
|
|
|
|
|
if (test->ShouldCreateReceivers()) {
|
|
|
|
|
send_transport_->SetReceiver(receiver_call_->Receiver());
|
|
|
|
|
receive_transport_->SetReceiver(sender_call_->Receiver());
|
|
|
|
|
if (num_video_streams_ > 0)
|
|
|
|
|
receiver_call_->SignalChannelNetworkState(MediaType::VIDEO, kNetworkUp);
|
|
|
|
|
if (num_audio_streams_ > 0)
|
|
|
|
|
receiver_call_->SignalChannelNetworkState(MediaType::AUDIO, kNetworkUp);
|
|
|
|
|
} else {
|
|
|
|
|
// Sender-only call delivers to itself.
|
|
|
|
|
send_transport_->SetReceiver(sender_call_->Receiver());
|
|
|
|
|
receive_transport_->SetReceiver(nullptr);
|
2016-01-07 17:43:18 +01:00
|
|
|
}
|
2014-06-27 08:47:52 +00:00
|
|
|
|
2017-08-22 04:02:52 -07:00
|
|
|
CreateSendConfig(num_video_streams_, num_audio_streams_,
|
|
|
|
|
num_flexfec_streams_, send_transport_.get());
|
|
|
|
|
if (test->ShouldCreateReceivers()) {
|
|
|
|
|
CreateMatchingReceiveConfigs(receive_transport_.get());
|
|
|
|
|
}
|
|
|
|
|
if (num_video_streams_ > 0) {
|
|
|
|
|
test->ModifyVideoConfigs(&video_send_config_, &video_receive_configs_,
|
|
|
|
|
&video_encoder_config_);
|
|
|
|
|
}
|
|
|
|
|
if (num_audio_streams_ > 0) {
|
|
|
|
|
test->ModifyAudioConfigs(&audio_send_config_, &audio_receive_configs_);
|
|
|
|
|
}
|
|
|
|
|
if (num_flexfec_streams_ > 0) {
|
|
|
|
|
test->ModifyFlexfecConfigs(&flexfec_receive_configs_);
|
|
|
|
|
}
|
2016-01-07 17:43:18 +01:00
|
|
|
|
2017-08-22 04:02:52 -07:00
|
|
|
if (num_flexfec_streams_ > 0) {
|
|
|
|
|
CreateFlexfecStreams();
|
|
|
|
|
test->OnFlexfecStreamsCreated(flexfec_receive_streams_);
|
|
|
|
|
}
|
|
|
|
|
if (num_video_streams_ > 0) {
|
|
|
|
|
CreateVideoStreams();
|
|
|
|
|
test->OnVideoStreamsCreated(video_send_stream_, video_receive_streams_);
|
|
|
|
|
}
|
|
|
|
|
if (num_audio_streams_ > 0) {
|
|
|
|
|
CreateAudioStreams();
|
|
|
|
|
test->OnAudioStreamsCreated(audio_send_stream_, audio_receive_streams_);
|
|
|
|
|
}
|
2014-06-27 08:47:52 +00:00
|
|
|
|
2017-08-22 04:02:52 -07:00
|
|
|
if (num_video_streams_ > 0) {
|
|
|
|
|
int width = kDefaultWidth;
|
|
|
|
|
int height = kDefaultHeight;
|
|
|
|
|
int frame_rate = kDefaultFramerate;
|
|
|
|
|
test->ModifyVideoCaptureStartResolution(&width, &height, &frame_rate);
|
|
|
|
|
CreateFrameGeneratorCapturer(frame_rate, width, height);
|
|
|
|
|
test->OnFrameGeneratorCapturerCreated(frame_generator_capturer_.get());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Start();
|
|
|
|
|
});
|
2014-06-27 08:47:52 +00:00
|
|
|
|
|
|
|
|
test->PerformTest();
|
|
|
|
|
|
2017-09-14 14:46:47 +02:00
|
|
|
task_queue_.SendTask([this, test]() {
|
2017-08-22 04:02:52 -07:00
|
|
|
Stop();
|
2017-09-14 14:46:47 +02:00
|
|
|
test->OnStreamsStopped();
|
2017-08-22 04:02:52 -07:00
|
|
|
DestroyStreams();
|
|
|
|
|
send_transport_.reset();
|
|
|
|
|
receive_transport_.reset();
|
|
|
|
|
DestroyCalls();
|
|
|
|
|
});
|
2014-06-27 08:47:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CallTest::CreateCalls(const Call::Config& sender_config,
|
|
|
|
|
const Call::Config& receiver_config) {
|
|
|
|
|
CreateSenderCall(sender_config);
|
|
|
|
|
CreateReceiverCall(receiver_config);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CallTest::CreateSenderCall(const Call::Config& config) {
|
2018-02-22 10:31:14 +01:00
|
|
|
std::unique_ptr<RtpTransportControllerSend> controller_send =
|
|
|
|
|
rtc::MakeUnique<RtpTransportControllerSend>(
|
|
|
|
|
Clock::GetRealTimeClock(), config.event_log, config.bitrate_config);
|
|
|
|
|
sender_call_transport_controller_ = controller_send.get();
|
|
|
|
|
sender_call_.reset(Call::Create(config, std::move(controller_send)));
|
2014-06-27 08:47:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CallTest::CreateReceiverCall(const Call::Config& config) {
|
|
|
|
|
receiver_call_.reset(Call::Create(config));
|
|
|
|
|
}
|
|
|
|
|
|
2015-10-22 10:49:27 +02:00
|
|
|
void CallTest::DestroyCalls() {
|
2016-01-07 17:43:18 +01:00
|
|
|
sender_call_.reset();
|
|
|
|
|
receiver_call_.reset();
|
2015-10-22 10:49:27 +02:00
|
|
|
}
|
|
|
|
|
|
2017-12-21 18:02:59 +01:00
|
|
|
void CallTest::CreateVideoSendConfig(VideoSendStream::Config* video_config,
|
|
|
|
|
size_t num_video_streams,
|
|
|
|
|
size_t num_used_ssrcs,
|
|
|
|
|
Transport* send_transport) {
|
|
|
|
|
RTC_DCHECK_LE(num_video_streams + num_used_ssrcs, kNumSsrcs);
|
|
|
|
|
*video_config = VideoSendStream::Config(send_transport);
|
2018-04-18 07:17:07 +00:00
|
|
|
video_config->encoder_settings.encoder = &fake_encoder_;
|
Reland "Reland "Move rtp-specific config out of EncoderSettings.""
This reverts commit 6c2c13af06b32778b86950681758a7970d1c5d9e.
Reason for revert: Intend to investigate and fix perf problems.
Original change's description:
> Revert "Reland "Move rtp-specific config out of EncoderSettings.""
>
> This reverts commit 04dd1768625eb2241d1fb97fd0137897e703e266.
>
> Reason for revert: Regression in ramp up perf tests.
>
> Original change's description:
> > Reland "Move rtp-specific config out of EncoderSettings."
> >
> > This is a reland of bc900cb1d1810fcf678fe41cf1e3966daa39c88c
> >
> > Original change's description:
> > > Move rtp-specific config out of EncoderSettings.
> > >
> > > In VideoSendStream::Config, move payload_name and payload_type from
> > > EncoderSettings to Rtp.
> > >
> > > EncoderSettings now contains configuration for VideoStreamEncoder only,
> > > and should perhaps be renamed in a follow up cl. It's no longer
> > > passed as an argument to VideoCodecInitializer::SetupCodec.
> > >
> > > The latter then needs a different way to know the codec type,
> > > which is provided by a new codec_type member in VideoEncoderConfig.
> > >
> > > Bug: webrtc:8830
> > > Change-Id: Ifcc691aef1ee6a95e43c0452c5e630d92a511cd6
> > > Reviewed-on: https://webrtc-review.googlesource.com/62062
> > > Commit-Queue: Niels Moller <nisse@webrtc.org>
> > > Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
> > > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > > Cr-Commit-Position: refs/heads/master@{#22532}
> >
> > Bug: webrtc:8830
> > Change-Id: If88ef7d57cdaa4fae3c7b2a97ea5a6e1b833e019
> > Reviewed-on: https://webrtc-review.googlesource.com/63721
> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > Commit-Queue: Niels Moller <nisse@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#22595}
>
> TBR=brandtr@webrtc.org,magjed@webrtc.org,nisse@webrtc.org,stefan@webrtc.org
>
> Bug: webrtc:8830,chromium:827080
> Change-Id: Iaaf146de91ec5c0d741b8efdf143f7e173084fef
> Reviewed-on: https://webrtc-review.googlesource.com/65520
> Commit-Queue: Niels Moller <nisse@webrtc.org>
> Reviewed-by: Niels Moller <nisse@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#22677}
TBR=brandtr@webrtc.org,magjed@webrtc.org,nisse@webrtc.org,stefan@webrtc.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: webrtc:8830, chromium:827080
Change-Id: I9b62987bf5daced90dfeb3ebb6739c80117c487f
Reviewed-on: https://webrtc-review.googlesource.com/66862
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22751}
2018-04-05 15:36:51 +02:00
|
|
|
video_config->rtp.payload_name = "FAKE";
|
|
|
|
|
video_config->rtp.payload_type = kFakeVideoSendPayloadType;
|
2017-12-21 18:02:59 +01:00
|
|
|
video_config->rtp.extensions.push_back(
|
|
|
|
|
RtpExtension(RtpExtension::kTransportSequenceNumberUri,
|
|
|
|
|
kTransportSequenceNumberExtensionId));
|
|
|
|
|
video_config->rtp.extensions.push_back(RtpExtension(
|
|
|
|
|
RtpExtension::kVideoContentTypeUri, kVideoContentTypeExtensionId));
|
Reland "Reland "Move rtp-specific config out of EncoderSettings.""
This reverts commit 6c2c13af06b32778b86950681758a7970d1c5d9e.
Reason for revert: Intend to investigate and fix perf problems.
Original change's description:
> Revert "Reland "Move rtp-specific config out of EncoderSettings.""
>
> This reverts commit 04dd1768625eb2241d1fb97fd0137897e703e266.
>
> Reason for revert: Regression in ramp up perf tests.
>
> Original change's description:
> > Reland "Move rtp-specific config out of EncoderSettings."
> >
> > This is a reland of bc900cb1d1810fcf678fe41cf1e3966daa39c88c
> >
> > Original change's description:
> > > Move rtp-specific config out of EncoderSettings.
> > >
> > > In VideoSendStream::Config, move payload_name and payload_type from
> > > EncoderSettings to Rtp.
> > >
> > > EncoderSettings now contains configuration for VideoStreamEncoder only,
> > > and should perhaps be renamed in a follow up cl. It's no longer
> > > passed as an argument to VideoCodecInitializer::SetupCodec.
> > >
> > > The latter then needs a different way to know the codec type,
> > > which is provided by a new codec_type member in VideoEncoderConfig.
> > >
> > > Bug: webrtc:8830
> > > Change-Id: Ifcc691aef1ee6a95e43c0452c5e630d92a511cd6
> > > Reviewed-on: https://webrtc-review.googlesource.com/62062
> > > Commit-Queue: Niels Moller <nisse@webrtc.org>
> > > Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
> > > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > > Cr-Commit-Position: refs/heads/master@{#22532}
> >
> > Bug: webrtc:8830
> > Change-Id: If88ef7d57cdaa4fae3c7b2a97ea5a6e1b833e019
> > Reviewed-on: https://webrtc-review.googlesource.com/63721
> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > Commit-Queue: Niels Moller <nisse@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#22595}
>
> TBR=brandtr@webrtc.org,magjed@webrtc.org,nisse@webrtc.org,stefan@webrtc.org
>
> Bug: webrtc:8830,chromium:827080
> Change-Id: Iaaf146de91ec5c0d741b8efdf143f7e173084fef
> Reviewed-on: https://webrtc-review.googlesource.com/65520
> Commit-Queue: Niels Moller <nisse@webrtc.org>
> Reviewed-by: Niels Moller <nisse@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#22677}
TBR=brandtr@webrtc.org,magjed@webrtc.org,nisse@webrtc.org,stefan@webrtc.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: webrtc:8830, chromium:827080
Change-Id: I9b62987bf5daced90dfeb3ebb6739c80117c487f
Reviewed-on: https://webrtc-review.googlesource.com/66862
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22751}
2018-04-05 15:36:51 +02:00
|
|
|
FillEncoderConfiguration(kVideoCodecGeneric, num_video_streams,
|
|
|
|
|
&video_encoder_config_);
|
2017-12-21 18:02:59 +01:00
|
|
|
|
|
|
|
|
for (size_t i = 0; i < num_video_streams; ++i)
|
|
|
|
|
video_config->rtp.ssrcs.push_back(kVideoSendSsrcs[num_used_ssrcs + i]);
|
|
|
|
|
video_config->rtp.extensions.push_back(RtpExtension(
|
|
|
|
|
RtpExtension::kVideoRotationUri, kVideoRotationRtpExtensionId));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CallTest::CreateAudioAndFecSendConfigs(size_t num_audio_streams,
|
|
|
|
|
size_t num_flexfec_streams,
|
|
|
|
|
Transport* send_transport) {
|
2016-11-28 15:21:39 -08:00
|
|
|
RTC_DCHECK_LE(num_audio_streams, 1);
|
|
|
|
|
RTC_DCHECK_LE(num_flexfec_streams, 1);
|
2016-01-07 17:43:18 +01:00
|
|
|
if (num_audio_streams > 0) {
|
|
|
|
|
audio_send_config_ = AudioSendStream::Config(send_transport);
|
|
|
|
|
audio_send_config_.rtp.ssrc = kAudioSendSsrc;
|
2017-11-16 10:54:58 +01:00
|
|
|
audio_send_config_.send_codec_spec = AudioSendStream::Config::SendCodecSpec(
|
|
|
|
|
kAudioSendPayloadType, {"opus", 48000, 2, {{"stereo", "1"}}});
|
2018-03-28 14:16:04 +02:00
|
|
|
audio_send_config_.encoder_factory = audio_encoder_factory_;
|
2016-01-07 17:43:18 +01:00
|
|
|
}
|
2016-11-15 07:10:52 -08:00
|
|
|
|
|
|
|
|
// TODO(brandtr): Update this when we support multistream protection.
|
|
|
|
|
if (num_flexfec_streams > 0) {
|
2017-01-16 06:59:19 -08:00
|
|
|
video_send_config_.rtp.flexfec.payload_type = kFlexfecPayloadType;
|
|
|
|
|
video_send_config_.rtp.flexfec.ssrc = kFlexfecSendSsrc;
|
2016-11-15 07:10:52 -08:00
|
|
|
video_send_config_.rtp.flexfec.protected_media_ssrcs = {kVideoSendSsrcs[0]};
|
|
|
|
|
}
|
2014-06-27 08:47:52 +00:00
|
|
|
}
|
|
|
|
|
|
2017-12-21 18:02:59 +01:00
|
|
|
void CallTest::CreateSendConfig(size_t num_video_streams,
|
|
|
|
|
size_t num_audio_streams,
|
|
|
|
|
size_t num_flexfec_streams,
|
|
|
|
|
Transport* send_transport) {
|
|
|
|
|
if (num_video_streams > 0) {
|
|
|
|
|
CreateVideoSendConfig(&video_send_config_, num_video_streams, 0,
|
|
|
|
|
send_transport);
|
2016-01-07 17:43:18 +01:00
|
|
|
}
|
2017-12-21 18:02:59 +01:00
|
|
|
CreateAudioAndFecSendConfigs(num_audio_streams, num_flexfec_streams,
|
|
|
|
|
send_transport);
|
|
|
|
|
}
|
2016-01-07 17:43:18 +01:00
|
|
|
|
2017-12-21 18:02:59 +01:00
|
|
|
std::vector<VideoReceiveStream::Config>
|
|
|
|
|
CallTest::CreateMatchingVideoReceiveConfigs(
|
|
|
|
|
const VideoSendStream::Config& video_send_config,
|
|
|
|
|
Transport* rtcp_send_transport) {
|
|
|
|
|
std::vector<VideoReceiveStream::Config> result;
|
|
|
|
|
RTC_DCHECK(!video_send_config.rtp.ssrcs.empty());
|
|
|
|
|
VideoReceiveStream::Config video_config(rtcp_send_transport);
|
|
|
|
|
video_config.rtp.remb = false;
|
|
|
|
|
video_config.rtp.transport_cc = true;
|
|
|
|
|
video_config.rtp.local_ssrc = kReceiverLocalVideoSsrc;
|
|
|
|
|
for (const RtpExtension& extension : video_send_config.rtp.extensions)
|
|
|
|
|
video_config.rtp.extensions.push_back(extension);
|
|
|
|
|
video_config.renderer = &fake_renderer_;
|
|
|
|
|
for (size_t i = 0; i < video_send_config.rtp.ssrcs.size(); ++i) {
|
|
|
|
|
VideoReceiveStream::Decoder decoder =
|
Reland "Reland "Move rtp-specific config out of EncoderSettings.""
This reverts commit 6c2c13af06b32778b86950681758a7970d1c5d9e.
Reason for revert: Intend to investigate and fix perf problems.
Original change's description:
> Revert "Reland "Move rtp-specific config out of EncoderSettings.""
>
> This reverts commit 04dd1768625eb2241d1fb97fd0137897e703e266.
>
> Reason for revert: Regression in ramp up perf tests.
>
> Original change's description:
> > Reland "Move rtp-specific config out of EncoderSettings."
> >
> > This is a reland of bc900cb1d1810fcf678fe41cf1e3966daa39c88c
> >
> > Original change's description:
> > > Move rtp-specific config out of EncoderSettings.
> > >
> > > In VideoSendStream::Config, move payload_name and payload_type from
> > > EncoderSettings to Rtp.
> > >
> > > EncoderSettings now contains configuration for VideoStreamEncoder only,
> > > and should perhaps be renamed in a follow up cl. It's no longer
> > > passed as an argument to VideoCodecInitializer::SetupCodec.
> > >
> > > The latter then needs a different way to know the codec type,
> > > which is provided by a new codec_type member in VideoEncoderConfig.
> > >
> > > Bug: webrtc:8830
> > > Change-Id: Ifcc691aef1ee6a95e43c0452c5e630d92a511cd6
> > > Reviewed-on: https://webrtc-review.googlesource.com/62062
> > > Commit-Queue: Niels Moller <nisse@webrtc.org>
> > > Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
> > > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > > Cr-Commit-Position: refs/heads/master@{#22532}
> >
> > Bug: webrtc:8830
> > Change-Id: If88ef7d57cdaa4fae3c7b2a97ea5a6e1b833e019
> > Reviewed-on: https://webrtc-review.googlesource.com/63721
> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > Commit-Queue: Niels Moller <nisse@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#22595}
>
> TBR=brandtr@webrtc.org,magjed@webrtc.org,nisse@webrtc.org,stefan@webrtc.org
>
> Bug: webrtc:8830,chromium:827080
> Change-Id: Iaaf146de91ec5c0d741b8efdf143f7e173084fef
> Reviewed-on: https://webrtc-review.googlesource.com/65520
> Commit-Queue: Niels Moller <nisse@webrtc.org>
> Reviewed-by: Niels Moller <nisse@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#22677}
TBR=brandtr@webrtc.org,magjed@webrtc.org,nisse@webrtc.org,stefan@webrtc.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: webrtc:8830, chromium:827080
Change-Id: I9b62987bf5daced90dfeb3ebb6739c80117c487f
Reviewed-on: https://webrtc-review.googlesource.com/66862
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22751}
2018-04-05 15:36:51 +02:00
|
|
|
test::CreateMatchingDecoder(video_send_config);
|
2017-12-21 18:02:59 +01:00
|
|
|
allocated_decoders_.push_back(
|
|
|
|
|
std::unique_ptr<VideoDecoder>(decoder.decoder));
|
|
|
|
|
video_config.decoders.clear();
|
|
|
|
|
video_config.decoders.push_back(decoder);
|
|
|
|
|
video_config.rtp.remote_ssrc = video_send_config.rtp.ssrcs[i];
|
|
|
|
|
result.push_back(video_config.Copy());
|
|
|
|
|
}
|
|
|
|
|
result[0].rtp.protected_by_flexfec = (num_flexfec_streams_ == 1);
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CallTest::CreateMatchingAudioAndFecConfigs(
|
|
|
|
|
Transport* rtcp_send_transport) {
|
2016-11-28 15:21:39 -08:00
|
|
|
RTC_DCHECK_GE(1, num_audio_streams_);
|
2016-01-07 17:43:18 +01:00
|
|
|
if (num_audio_streams_ == 1) {
|
|
|
|
|
AudioReceiveStream::Config audio_config;
|
|
|
|
|
audio_config.rtp.local_ssrc = kReceiverLocalAudioSsrc;
|
|
|
|
|
audio_config.rtcp_send_transport = rtcp_send_transport;
|
|
|
|
|
audio_config.rtp.remote_ssrc = audio_send_config_.rtp.ssrc;
|
2018-03-28 14:16:04 +02:00
|
|
|
audio_config.decoder_factory = audio_decoder_factory_;
|
2017-04-10 16:57:57 -07:00
|
|
|
audio_config.decoder_map = {{kAudioSendPayloadType, {"opus", 48000, 2}}};
|
2016-01-07 17:43:18 +01:00
|
|
|
audio_receive_configs_.push_back(audio_config);
|
2014-06-27 08:47:52 +00:00
|
|
|
}
|
2016-11-15 07:10:52 -08:00
|
|
|
|
|
|
|
|
// TODO(brandtr): Update this when we support multistream protection.
|
|
|
|
|
RTC_DCHECK(num_flexfec_streams_ <= 1);
|
|
|
|
|
if (num_flexfec_streams_ == 1) {
|
2017-01-13 07:41:19 -08:00
|
|
|
FlexfecReceiveStream::Config config(rtcp_send_transport);
|
2016-12-08 04:17:53 -08:00
|
|
|
config.payload_type = kFlexfecPayloadType;
|
|
|
|
|
config.remote_ssrc = kFlexfecSendSsrc;
|
|
|
|
|
config.protected_media_ssrcs = {kVideoSendSsrcs[0]};
|
2017-01-17 01:33:54 -08:00
|
|
|
config.local_ssrc = kReceiverLocalVideoSsrc;
|
2016-12-21 06:37:18 -08:00
|
|
|
for (const RtpExtension& extension : video_send_config_.rtp.extensions)
|
|
|
|
|
config.rtp_header_extensions.push_back(extension);
|
2016-12-08 04:17:53 -08:00
|
|
|
flexfec_receive_configs_.push_back(config);
|
2016-11-15 07:10:52 -08:00
|
|
|
}
|
2014-06-27 08:47:52 +00:00
|
|
|
}
|
|
|
|
|
|
2017-12-21 18:02:59 +01:00
|
|
|
void CallTest::CreateMatchingReceiveConfigs(Transport* rtcp_send_transport) {
|
|
|
|
|
video_receive_configs_.clear();
|
|
|
|
|
allocated_decoders_.clear();
|
|
|
|
|
if (num_video_streams_ > 0) {
|
|
|
|
|
std::vector<VideoReceiveStream::Config> new_configs =
|
|
|
|
|
CreateMatchingVideoReceiveConfigs(video_send_config_,
|
|
|
|
|
rtcp_send_transport);
|
|
|
|
|
for (VideoReceiveStream::Config& config : new_configs) {
|
|
|
|
|
video_receive_configs_.push_back(config.Copy());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
CreateMatchingAudioAndFecConfigs(rtcp_send_transport);
|
|
|
|
|
}
|
|
|
|
|
|
2016-02-10 10:54:47 -08:00
|
|
|
void CallTest::CreateFrameGeneratorCapturerWithDrift(Clock* clock,
|
2016-10-02 23:45:26 -07:00
|
|
|
float speed,
|
|
|
|
|
int framerate,
|
|
|
|
|
int width,
|
|
|
|
|
int height) {
|
2016-02-10 10:54:47 -08:00
|
|
|
frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create(
|
2018-03-09 15:03:26 -08:00
|
|
|
width, height, rtc::nullopt, rtc::nullopt, framerate * speed, clock));
|
2016-11-01 11:45:46 -07:00
|
|
|
video_send_stream_->SetSource(
|
|
|
|
|
frame_generator_capturer_.get(),
|
Reland of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #1 id:1 of https://codereview.webrtc.org/2783183003/ )
Reason for revert:
Seem to be a flaky test rather than an issue with this cl. Creating reland, will add code to reduce flakiness to that test.
Original issue's description:
> Revert of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #8 id:410001 of https://codereview.webrtc.org/2781433002/ )
>
> Reason for revert:
> This has resulted in failure of CallPerfTest.ReceivesCpuOveruseAndUnderuse test on the Win7 build bot https://build.chromium.org/p/client.webrtc.perf/builders/Win7/builds/1780
>
> Original issue's description:
> > Reland of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #1 id:1 of https://codereview.webrtc.org/2764133002/ )
> >
> > Reason for revert:
> > Found issue with test case, will add fix to reland cl.
> >
> > Original issue's description:
> > > Revert of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #14 id:250001 of https://codereview.webrtc.org/2716643002/ )
> > >
> > > Reason for revert:
> > > Breaks perf tests:
> > > https://build.chromium.org/p/client.webrtc.perf/builders/Win7/builds/1679
> > > https://build.chromium.org/p/client.webrtc.perf/builders/Android32%20Tests%20%28L%20Nexus5%29/builds/2325
> > >
> > > Original issue's description:
> > > > Add framerate to VideoSinkWants and ability to signal on overuse
> > > >
> > > > In ViEEncoder, try to reduce framerate instead of resolution if the
> > > > current degradation preference is maintain-resolution rather than
> > > > balanced.
> > > >
> > > > BUG=webrtc:4172
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2716643002
> > > > Cr-Commit-Position: refs/heads/master@{#17327}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/72acf2526177bb4dbb5103cd6e165eb4361a5ae6
> > >
> > > TBR=nisse@webrtc.org,magjed@webrtc.org,kthelgason@webrtc.org,ilnik@webrtc.org,stefan@webrtc.org,sprang@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4172
> > >
> > > Review-Url: https://codereview.webrtc.org/2764133002
> > > Cr-Commit-Position: refs/heads/master@{#17331}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/8b45b11144c968b4173215c76f78c710c9a2ed0b
> >
> > TBR=nisse@webrtc.org,magjed@webrtc.org,kthelgason@webrtc.org,ilnik@webrtc.org,stefan@webrtc.org,skvlad@webrtc.org
> > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > BUG=webrtc:4172
> >
> > Review-Url: https://codereview.webrtc.org/2781433002
> > Cr-Commit-Position: refs/heads/master@{#17474}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/3ea3c77e93121b1ab9d5e46641e6764f2cca0d51
>
> TBR=ilnik@webrtc.org,stefan@webrtc.org,asapersson@webrtc.org,sprang@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4172
>
> Review-Url: https://codereview.webrtc.org/2783183003
> Cr-Commit-Position: refs/heads/master@{#17477}
> Committed: https://chromium.googlesource.com/external/webrtc/+/f9ed235c9b7248694edcb46feb1f29ce7456ab59
R=ilnik@webrtc.org,stefan@webrtc.org
BUG=webrtc:4172
Review-Url: https://codereview.webrtc.org/2789823002
Cr-Commit-Position: refs/heads/master@{#17498}
2017-04-02 23:53:04 -07:00
|
|
|
VideoSendStream::DegradationPreference::kMaintainFramerate);
|
2016-02-10 10:54:47 -08:00
|
|
|
}
|
|
|
|
|
|
2016-10-02 23:45:26 -07:00
|
|
|
void CallTest::CreateFrameGeneratorCapturer(int framerate,
|
|
|
|
|
int width,
|
|
|
|
|
int height) {
|
2018-03-09 15:03:26 -08:00
|
|
|
frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create(
|
|
|
|
|
width, height, rtc::nullopt, rtc::nullopt, framerate, clock_));
|
2016-11-01 11:45:46 -07:00
|
|
|
video_send_stream_->SetSource(
|
|
|
|
|
frame_generator_capturer_.get(),
|
Reland of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #1 id:1 of https://codereview.webrtc.org/2783183003/ )
Reason for revert:
Seem to be a flaky test rather than an issue with this cl. Creating reland, will add code to reduce flakiness to that test.
Original issue's description:
> Revert of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #8 id:410001 of https://codereview.webrtc.org/2781433002/ )
>
> Reason for revert:
> This has resulted in failure of CallPerfTest.ReceivesCpuOveruseAndUnderuse test on the Win7 build bot https://build.chromium.org/p/client.webrtc.perf/builders/Win7/builds/1780
>
> Original issue's description:
> > Reland of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #1 id:1 of https://codereview.webrtc.org/2764133002/ )
> >
> > Reason for revert:
> > Found issue with test case, will add fix to reland cl.
> >
> > Original issue's description:
> > > Revert of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #14 id:250001 of https://codereview.webrtc.org/2716643002/ )
> > >
> > > Reason for revert:
> > > Breaks perf tests:
> > > https://build.chromium.org/p/client.webrtc.perf/builders/Win7/builds/1679
> > > https://build.chromium.org/p/client.webrtc.perf/builders/Android32%20Tests%20%28L%20Nexus5%29/builds/2325
> > >
> > > Original issue's description:
> > > > Add framerate to VideoSinkWants and ability to signal on overuse
> > > >
> > > > In ViEEncoder, try to reduce framerate instead of resolution if the
> > > > current degradation preference is maintain-resolution rather than
> > > > balanced.
> > > >
> > > > BUG=webrtc:4172
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2716643002
> > > > Cr-Commit-Position: refs/heads/master@{#17327}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/72acf2526177bb4dbb5103cd6e165eb4361a5ae6
> > >
> > > TBR=nisse@webrtc.org,magjed@webrtc.org,kthelgason@webrtc.org,ilnik@webrtc.org,stefan@webrtc.org,sprang@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4172
> > >
> > > Review-Url: https://codereview.webrtc.org/2764133002
> > > Cr-Commit-Position: refs/heads/master@{#17331}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/8b45b11144c968b4173215c76f78c710c9a2ed0b
> >
> > TBR=nisse@webrtc.org,magjed@webrtc.org,kthelgason@webrtc.org,ilnik@webrtc.org,stefan@webrtc.org,skvlad@webrtc.org
> > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > BUG=webrtc:4172
> >
> > Review-Url: https://codereview.webrtc.org/2781433002
> > Cr-Commit-Position: refs/heads/master@{#17474}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/3ea3c77e93121b1ab9d5e46641e6764f2cca0d51
>
> TBR=ilnik@webrtc.org,stefan@webrtc.org,asapersson@webrtc.org,sprang@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4172
>
> Review-Url: https://codereview.webrtc.org/2783183003
> Cr-Commit-Position: refs/heads/master@{#17477}
> Committed: https://chromium.googlesource.com/external/webrtc/+/f9ed235c9b7248694edcb46feb1f29ce7456ab59
R=ilnik@webrtc.org,stefan@webrtc.org
BUG=webrtc:4172
Review-Url: https://codereview.webrtc.org/2789823002
Cr-Commit-Position: refs/heads/master@{#17498}
2017-04-02 23:53:04 -07:00
|
|
|
VideoSendStream::DegradationPreference::kMaintainFramerate);
|
2014-06-27 08:47:52 +00:00
|
|
|
}
|
2015-07-28 08:20:59 -07:00
|
|
|
|
2017-03-23 03:40:03 -07:00
|
|
|
void CallTest::CreateFakeAudioDevices(
|
2018-03-07 14:44:00 +01:00
|
|
|
std::unique_ptr<TestAudioDeviceModule::Capturer> capturer,
|
|
|
|
|
std::unique_ptr<TestAudioDeviceModule::Renderer> renderer) {
|
|
|
|
|
fake_send_audio_device_ = TestAudioDeviceModule::CreateTestAudioDeviceModule(
|
Remove voe::TransmitMixer
TransmitMixer's functionality is moved into the AudioTransportProxy
owned by AudioState. This removes the need for an AudioTransport
implementation in VoEBaseImpl, which means that the proxy is no longer
a proxy, hence AudioTransportProxy is renamed to AudioTransportImpl.
In the short term, AudioState needs to know which AudioDeviceModule is
used, so it is added in AudioState::Config. AudioTransportImpl needs
to know which AudioSendStream:s are currently enabled to send, so
AudioState maintains a map of them, which is reduced into a simple
vector for AudioTransportImpl.
To encode and transmit audio,
AudioSendStream::OnAudioData(std::unique_ptr<AudioFrame> audio_frame)
is introduced, which is used in both the Chromium and standalone use
cases. This removes the need for two different instances of
voe::Channel::ProcessAndEncodeAudio(), so there is now only one,
taking an AudioFrame as argument. Callers need to allocate their own
AudioFrame:s, which is wasteful but not a regression since this was
already happening in the voe::Channel functions.
Most of the logic changed resides in
AudioTransportImpl::RecordedDataIsAvailable(), where two strange
things were found:
1. The clock drift parameter was ineffective since
apm->echo_cancellation()->enable_drift_compensation(false) is
called during initialization.
2. The output parameter 'new_mic_volume' was never set - instead it
was returned as a result, causing the ADM to never update the
analog mic gain
(https://cs.chromium.org/chromium/src/third_party/webrtc/voice_engine/voe_base_impl.cc?q=voe_base_impl.cc&dr&l=100).
Besides this, tests are updated, and some dead code is removed which
was found in the process.
Bug: webrtc:4690, webrtc:8591
Change-Id: I789d5296bf5efb7299a5ee05a4f3ce6abf9124b2
Reviewed-on: https://webrtc-review.googlesource.com/26681
Commit-Queue: Fredrik Solenberg <solenberg@webrtc.org>
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21301}
2017-12-15 16:42:15 +01:00
|
|
|
std::move(capturer), nullptr, 1.f);
|
2018-03-07 14:44:00 +01:00
|
|
|
fake_recv_audio_device_ = TestAudioDeviceModule::CreateTestAudioDeviceModule(
|
Remove voe::TransmitMixer
TransmitMixer's functionality is moved into the AudioTransportProxy
owned by AudioState. This removes the need for an AudioTransport
implementation in VoEBaseImpl, which means that the proxy is no longer
a proxy, hence AudioTransportProxy is renamed to AudioTransportImpl.
In the short term, AudioState needs to know which AudioDeviceModule is
used, so it is added in AudioState::Config. AudioTransportImpl needs
to know which AudioSendStream:s are currently enabled to send, so
AudioState maintains a map of them, which is reduced into a simple
vector for AudioTransportImpl.
To encode and transmit audio,
AudioSendStream::OnAudioData(std::unique_ptr<AudioFrame> audio_frame)
is introduced, which is used in both the Chromium and standalone use
cases. This removes the need for two different instances of
voe::Channel::ProcessAndEncodeAudio(), so there is now only one,
taking an AudioFrame as argument. Callers need to allocate their own
AudioFrame:s, which is wasteful but not a regression since this was
already happening in the voe::Channel functions.
Most of the logic changed resides in
AudioTransportImpl::RecordedDataIsAvailable(), where two strange
things were found:
1. The clock drift parameter was ineffective since
apm->echo_cancellation()->enable_drift_compensation(false) is
called during initialization.
2. The output parameter 'new_mic_volume' was never set - instead it
was returned as a result, causing the ADM to never update the
analog mic gain
(https://cs.chromium.org/chromium/src/third_party/webrtc/voice_engine/voe_base_impl.cc?q=voe_base_impl.cc&dr&l=100).
Besides this, tests are updated, and some dead code is removed which
was found in the process.
Bug: webrtc:4690, webrtc:8591
Change-Id: I789d5296bf5efb7299a5ee05a4f3ce6abf9124b2
Reviewed-on: https://webrtc-review.googlesource.com/26681
Commit-Queue: Fredrik Solenberg <solenberg@webrtc.org>
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21301}
2017-12-15 16:42:15 +01:00
|
|
|
nullptr, std::move(renderer), 1.f);
|
2016-01-07 17:43:18 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CallTest::CreateVideoStreams() {
|
|
|
|
|
RTC_DCHECK(video_send_stream_ == nullptr);
|
|
|
|
|
RTC_DCHECK(video_receive_streams_.empty());
|
2014-06-27 08:47:52 +00:00
|
|
|
|
2015-12-21 03:14:00 -08:00
|
|
|
video_send_stream_ = sender_call_->CreateVideoSendStream(
|
2016-09-01 01:17:40 -07:00
|
|
|
video_send_config_.Copy(), video_encoder_config_.Copy());
|
2015-12-21 03:14:00 -08:00
|
|
|
for (size_t i = 0; i < video_receive_configs_.size(); ++i) {
|
2016-06-10 17:58:01 +02:00
|
|
|
video_receive_streams_.push_back(receiver_call_->CreateVideoReceiveStream(
|
|
|
|
|
video_receive_configs_[i].Copy()));
|
2014-06-30 13:19:09 +00:00
|
|
|
}
|
2017-08-02 07:39:07 -07:00
|
|
|
|
|
|
|
|
AssociateFlexfecStreamsWithVideoStreams();
|
2014-06-27 08:47:52 +00:00
|
|
|
}
|
|
|
|
|
|
2016-01-07 17:43:18 +01:00
|
|
|
void CallTest::CreateAudioStreams() {
|
2017-12-21 18:02:59 +01:00
|
|
|
RTC_DCHECK(audio_send_stream_ == nullptr);
|
|
|
|
|
RTC_DCHECK(audio_receive_streams_.empty());
|
2016-01-07 17:43:18 +01:00
|
|
|
audio_send_stream_ = sender_call_->CreateAudioSendStream(audio_send_config_);
|
|
|
|
|
for (size_t i = 0; i < audio_receive_configs_.size(); ++i) {
|
|
|
|
|
audio_receive_streams_.push_back(
|
|
|
|
|
receiver_call_->CreateAudioReceiveStream(audio_receive_configs_[i]));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-11-15 07:10:52 -08:00
|
|
|
void CallTest::CreateFlexfecStreams() {
|
|
|
|
|
for (size_t i = 0; i < flexfec_receive_configs_.size(); ++i) {
|
|
|
|
|
flexfec_receive_streams_.push_back(
|
|
|
|
|
receiver_call_->CreateFlexfecReceiveStream(
|
|
|
|
|
flexfec_receive_configs_[i]));
|
|
|
|
|
}
|
2017-08-02 07:39:07 -07:00
|
|
|
|
|
|
|
|
AssociateFlexfecStreamsWithVideoStreams();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CallTest::AssociateFlexfecStreamsWithVideoStreams() {
|
|
|
|
|
// All FlexFEC streams protect all of the video streams.
|
|
|
|
|
for (FlexfecReceiveStream* flexfec_recv_stream : flexfec_receive_streams_) {
|
|
|
|
|
for (VideoReceiveStream* video_recv_stream : video_receive_streams_) {
|
|
|
|
|
video_recv_stream->AddSecondarySink(flexfec_recv_stream);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CallTest::DissociateFlexfecStreamsFromVideoStreams() {
|
|
|
|
|
for (FlexfecReceiveStream* flexfec_recv_stream : flexfec_receive_streams_) {
|
|
|
|
|
for (VideoReceiveStream* video_recv_stream : video_receive_streams_) {
|
|
|
|
|
video_recv_stream->RemoveSecondarySink(flexfec_recv_stream);
|
|
|
|
|
}
|
|
|
|
|
}
|
2016-11-15 07:10:52 -08:00
|
|
|
}
|
|
|
|
|
|
2017-08-09 01:52:36 -07:00
|
|
|
void CallTest::Start() {
|
|
|
|
|
if (video_send_stream_)
|
|
|
|
|
video_send_stream_->Start();
|
|
|
|
|
for (VideoReceiveStream* video_recv_stream : video_receive_streams_)
|
|
|
|
|
video_recv_stream->Start();
|
|
|
|
|
if (audio_send_stream_) {
|
|
|
|
|
audio_send_stream_->Start();
|
|
|
|
|
}
|
|
|
|
|
for (AudioReceiveStream* audio_recv_stream : audio_receive_streams_)
|
|
|
|
|
audio_recv_stream->Start();
|
|
|
|
|
if (frame_generator_capturer_.get() != NULL)
|
|
|
|
|
frame_generator_capturer_->Start();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CallTest::Stop() {
|
|
|
|
|
if (frame_generator_capturer_.get() != NULL)
|
|
|
|
|
frame_generator_capturer_->Stop();
|
|
|
|
|
for (AudioReceiveStream* audio_recv_stream : audio_receive_streams_)
|
|
|
|
|
audio_recv_stream->Stop();
|
|
|
|
|
if (audio_send_stream_) {
|
|
|
|
|
audio_send_stream_->Stop();
|
|
|
|
|
}
|
|
|
|
|
for (VideoReceiveStream* video_recv_stream : video_receive_streams_)
|
|
|
|
|
video_recv_stream->Stop();
|
|
|
|
|
if (video_send_stream_)
|
|
|
|
|
video_send_stream_->Stop();
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-27 08:47:52 +00:00
|
|
|
void CallTest::DestroyStreams() {
|
2017-08-02 07:39:07 -07:00
|
|
|
DissociateFlexfecStreamsFromVideoStreams();
|
|
|
|
|
|
2016-01-07 17:43:18 +01:00
|
|
|
if (audio_send_stream_)
|
|
|
|
|
sender_call_->DestroyAudioSendStream(audio_send_stream_);
|
|
|
|
|
audio_send_stream_ = nullptr;
|
|
|
|
|
for (AudioReceiveStream* audio_recv_stream : audio_receive_streams_)
|
|
|
|
|
receiver_call_->DestroyAudioReceiveStream(audio_recv_stream);
|
2017-01-27 06:47:55 -08:00
|
|
|
|
|
|
|
|
if (video_send_stream_)
|
|
|
|
|
sender_call_->DestroyVideoSendStream(video_send_stream_);
|
|
|
|
|
video_send_stream_ = nullptr;
|
2017-03-07 04:21:04 -08:00
|
|
|
|
2017-01-27 06:47:55 -08:00
|
|
|
for (VideoReceiveStream* video_recv_stream : video_receive_streams_)
|
|
|
|
|
receiver_call_->DestroyVideoReceiveStream(video_recv_stream);
|
2016-01-07 17:43:18 +01:00
|
|
|
|
2016-11-15 07:10:52 -08:00
|
|
|
for (FlexfecReceiveStream* flexfec_recv_stream : flexfec_receive_streams_)
|
|
|
|
|
receiver_call_->DestroyFlexfecReceiveStream(flexfec_recv_stream);
|
|
|
|
|
|
|
|
|
|
video_receive_streams_.clear();
|
2014-10-29 15:28:39 +00:00
|
|
|
allocated_decoders_.clear();
|
2014-06-27 08:47:52 +00:00
|
|
|
}
|
|
|
|
|
|
2017-08-09 01:52:36 -07:00
|
|
|
void CallTest::SetFakeVideoCaptureRotation(VideoRotation rotation) {
|
|
|
|
|
frame_generator_capturer_->SetFakeRotation(rotation);
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-21 18:02:59 +01:00
|
|
|
constexpr size_t CallTest::kNumSsrcs;
|
2016-10-02 23:45:26 -07:00
|
|
|
const int CallTest::kDefaultWidth;
|
|
|
|
|
const int CallTest::kDefaultHeight;
|
|
|
|
|
const int CallTest::kDefaultFramerate;
|
2015-12-10 13:02:50 +01:00
|
|
|
const int CallTest::kDefaultTimeoutMs = 30 * 1000;
|
|
|
|
|
const int CallTest::kLongTimeoutMs = 120 * 1000;
|
2017-12-21 18:02:59 +01:00
|
|
|
const uint32_t CallTest::kSendRtxSsrcs[kNumSsrcs] = {
|
|
|
|
|
0xBADCAFD, 0xBADCAFE, 0xBADCAFF, 0xBADCB00, 0xBADCB01, 0xBADCB02};
|
|
|
|
|
const uint32_t CallTest::kVideoSendSsrcs[kNumSsrcs] = {
|
|
|
|
|
0xC0FFED, 0xC0FFEE, 0xC0FFEF, 0xC0FFF0, 0xC0FFF1, 0xC0FFF2};
|
2016-01-07 17:43:18 +01:00
|
|
|
const uint32_t CallTest::kAudioSendSsrc = 0xDEADBEEF;
|
2016-11-15 07:10:52 -08:00
|
|
|
const uint32_t CallTest::kFlexfecSendSsrc = 0xBADBEEF;
|
2016-01-07 17:43:18 +01:00
|
|
|
const uint32_t CallTest::kReceiverLocalVideoSsrc = 0x123456;
|
|
|
|
|
const uint32_t CallTest::kReceiverLocalAudioSsrc = 0x1234567;
|
2014-06-27 08:47:52 +00:00
|
|
|
const int CallTest::kNackRtpHistoryMs = 1000;
|
|
|
|
|
|
2017-07-10 08:41:10 -07:00
|
|
|
const uint8_t CallTest::kDefaultKeepalivePayloadType =
|
|
|
|
|
RtpKeepAliveConfig().payload_type;
|
|
|
|
|
|
2017-04-10 16:57:57 -07:00
|
|
|
const std::map<uint8_t, MediaType> CallTest::payload_type_map_ = {
|
|
|
|
|
{CallTest::kVideoSendPayloadType, MediaType::VIDEO},
|
|
|
|
|
{CallTest::kFakeVideoSendPayloadType, MediaType::VIDEO},
|
|
|
|
|
{CallTest::kSendRtxPayloadType, MediaType::VIDEO},
|
|
|
|
|
{CallTest::kRedPayloadType, MediaType::VIDEO},
|
|
|
|
|
{CallTest::kRtxRedPayloadType, MediaType::VIDEO},
|
|
|
|
|
{CallTest::kUlpfecPayloadType, MediaType::VIDEO},
|
|
|
|
|
{CallTest::kFlexfecPayloadType, MediaType::VIDEO},
|
2017-07-10 08:41:10 -07:00
|
|
|
{CallTest::kAudioSendPayloadType, MediaType::AUDIO},
|
|
|
|
|
{CallTest::kDefaultKeepalivePayloadType, MediaType::ANY}};
|
2017-04-10 16:57:57 -07:00
|
|
|
|
2017-04-10 03:54:05 -07:00
|
|
|
BaseTest::BaseTest() : event_log_(RtcEventLog::CreateNull()) {}
|
2017-03-21 03:24:27 -07:00
|
|
|
|
2017-04-10 03:54:05 -07:00
|
|
|
BaseTest::BaseTest(unsigned int timeout_ms)
|
|
|
|
|
: RtpRtcpObserver(timeout_ms), event_log_(RtcEventLog::CreateNull()) {}
|
2014-06-27 08:47:52 +00:00
|
|
|
|
|
|
|
|
BaseTest::~BaseTest() {
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-07 14:44:00 +01:00
|
|
|
std::unique_ptr<TestAudioDeviceModule::Capturer> BaseTest::CreateCapturer() {
|
|
|
|
|
return TestAudioDeviceModule::CreatePulsedNoiseCapturer(256, 48000);
|
2017-03-23 03:40:03 -07:00
|
|
|
}
|
|
|
|
|
|
2018-03-07 14:44:00 +01:00
|
|
|
std::unique_ptr<TestAudioDeviceModule::Renderer> BaseTest::CreateRenderer() {
|
|
|
|
|
return TestAudioDeviceModule::CreateDiscardRenderer(48000);
|
2017-03-23 03:40:03 -07:00
|
|
|
}
|
|
|
|
|
|
2018-03-07 14:44:00 +01:00
|
|
|
void BaseTest::OnFakeAudioDevicesCreated(
|
|
|
|
|
TestAudioDeviceModule* send_audio_device,
|
|
|
|
|
TestAudioDeviceModule* recv_audio_device) {}
|
2017-03-23 03:40:03 -07:00
|
|
|
|
2014-06-27 08:47:52 +00:00
|
|
|
Call::Config BaseTest::GetSenderCallConfig() {
|
2017-04-10 03:54:05 -07:00
|
|
|
return Call::Config(event_log_.get());
|
2014-06-27 08:47:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Call::Config BaseTest::GetReceiverCallConfig() {
|
2017-04-10 03:54:05 -07:00
|
|
|
return Call::Config(event_log_.get());
|
2014-06-27 08:47:52 +00:00
|
|
|
}
|
|
|
|
|
|
2017-08-09 06:42:32 -07:00
|
|
|
void BaseTest::OnRtpTransportControllerSendCreated(
|
|
|
|
|
RtpTransportControllerSend* controller) {}
|
|
|
|
|
|
2014-06-27 08:47:52 +00:00
|
|
|
void BaseTest::OnCallsCreated(Call* sender_call, Call* receiver_call) {
|
|
|
|
|
}
|
|
|
|
|
|
2017-08-22 04:02:52 -07:00
|
|
|
test::PacketTransport* BaseTest::CreateSendTransport(
|
|
|
|
|
SingleThreadedTaskQueueForTesting* task_queue,
|
|
|
|
|
Call* sender_call) {
|
|
|
|
|
return new PacketTransport(
|
|
|
|
|
task_queue, sender_call, this, test::PacketTransport::kSender,
|
|
|
|
|
CallTest::payload_type_map_, FakeNetworkPipe::Config());
|
2016-01-08 06:47:13 -08:00
|
|
|
}
|
|
|
|
|
|
2017-08-22 04:02:52 -07:00
|
|
|
test::PacketTransport* BaseTest::CreateReceiveTransport(
|
|
|
|
|
SingleThreadedTaskQueueForTesting* task_queue) {
|
|
|
|
|
return new PacketTransport(
|
|
|
|
|
task_queue, nullptr, this, test::PacketTransport::kReceiver,
|
|
|
|
|
CallTest::payload_type_map_, FakeNetworkPipe::Config());
|
2016-01-08 06:47:13 -08:00
|
|
|
}
|
2015-10-27 08:29:42 -07:00
|
|
|
|
2016-01-07 17:43:18 +01:00
|
|
|
size_t BaseTest::GetNumVideoStreams() const {
|
2014-06-27 08:47:52 +00:00
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-07 17:43:18 +01:00
|
|
|
size_t BaseTest::GetNumAudioStreams() const {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2016-11-15 07:10:52 -08:00
|
|
|
size_t BaseTest::GetNumFlexfecStreams() const {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-21 03:14:00 -08:00
|
|
|
void BaseTest::ModifyVideoConfigs(
|
2014-06-30 13:19:09 +00:00
|
|
|
VideoSendStream::Config* send_config,
|
|
|
|
|
std::vector<VideoReceiveStream::Config>* receive_configs,
|
2015-12-21 03:14:00 -08:00
|
|
|
VideoEncoderConfig* encoder_config) {}
|
2014-06-27 08:47:52 +00:00
|
|
|
|
2016-10-02 23:45:26 -07:00
|
|
|
void BaseTest::ModifyVideoCaptureStartResolution(int* width,
|
|
|
|
|
int* heigt,
|
|
|
|
|
int* frame_rate) {}
|
|
|
|
|
|
2015-12-21 03:14:00 -08:00
|
|
|
void BaseTest::OnVideoStreamsCreated(
|
2014-06-30 13:19:09 +00:00
|
|
|
VideoSendStream* send_stream,
|
2015-12-21 03:14:00 -08:00
|
|
|
const std::vector<VideoReceiveStream*>& receive_streams) {}
|
2014-06-27 08:47:52 +00:00
|
|
|
|
2016-01-07 17:43:18 +01:00
|
|
|
void BaseTest::ModifyAudioConfigs(
|
|
|
|
|
AudioSendStream::Config* send_config,
|
|
|
|
|
std::vector<AudioReceiveStream::Config>* receive_configs) {}
|
|
|
|
|
|
|
|
|
|
void BaseTest::OnAudioStreamsCreated(
|
|
|
|
|
AudioSendStream* send_stream,
|
|
|
|
|
const std::vector<AudioReceiveStream*>& receive_streams) {}
|
|
|
|
|
|
2016-11-15 07:10:52 -08:00
|
|
|
void BaseTest::ModifyFlexfecConfigs(
|
|
|
|
|
std::vector<FlexfecReceiveStream::Config>* receive_configs) {}
|
|
|
|
|
|
|
|
|
|
void BaseTest::OnFlexfecStreamsCreated(
|
|
|
|
|
const std::vector<FlexfecReceiveStream*>& receive_streams) {}
|
|
|
|
|
|
2014-06-27 08:47:52 +00:00
|
|
|
void BaseTest::OnFrameGeneratorCapturerCreated(
|
|
|
|
|
FrameGeneratorCapturer* frame_generator_capturer) {
|
|
|
|
|
}
|
|
|
|
|
|
2017-09-14 14:46:47 +02:00
|
|
|
void BaseTest::OnStreamsStopped() {
|
2017-03-23 03:40:03 -07:00
|
|
|
}
|
|
|
|
|
|
2014-06-27 08:47:52 +00:00
|
|
|
SendTest::SendTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool SendTest::ShouldCreateReceivers() const {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-21 03:24:27 -07:00
|
|
|
EndToEndTest::EndToEndTest() {}
|
|
|
|
|
|
2014-06-27 08:47:52 +00:00
|
|
|
EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool EndToEndTest::ShouldCreateReceivers() const {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace test
|
|
|
|
|
} // namespace webrtc
|