This also moves the packet feedback tracking to RtpVideoSender. Bug: webrtc:9517 Change-Id: Ifb1ff85051730108a0b0d1dd30f6f8595ad2af6e Reviewed-on: https://webrtc-review.googlesource.com/c/95920 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Commit-Queue: Stefan Holmer <stefan@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25019}
172 lines
6.4 KiB
C++
172 lines
6.4 KiB
C++
/*
|
|
* Copyright 2018 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 "test/scenario/audio_stream.h"
|
|
|
|
#include "test/call_test.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
SendAudioStream::SendAudioStream(
|
|
CallClient* sender,
|
|
AudioStreamConfig config,
|
|
rtc::scoped_refptr<AudioEncoderFactory> encoder_factory,
|
|
Transport* send_transport)
|
|
: sender_(sender), config_(config) {
|
|
AudioSendStream::Config send_config(send_transport);
|
|
ssrc_ = sender->GetNextAudioSsrc();
|
|
send_config.rtp.ssrc = ssrc_;
|
|
SdpAudioFormat::Parameters sdp_params;
|
|
if (config.source.channels == 2)
|
|
sdp_params["stereo"] = "1";
|
|
if (config.encoder.initial_frame_length != TimeDelta::ms(20))
|
|
sdp_params["ptime"] =
|
|
std::to_string(config.encoder.initial_frame_length.ms());
|
|
|
|
// SdpAudioFormat::num_channels indicates that the encoder is capable of
|
|
// stereo, but the actual channel count used is based on the "stereo"
|
|
// parameter.
|
|
send_config.send_codec_spec = AudioSendStream::Config::SendCodecSpec(
|
|
CallTest::kAudioSendPayloadType, {"opus", 48000, 2, sdp_params});
|
|
RTC_DCHECK_LE(config.source.channels, 2);
|
|
send_config.encoder_factory = encoder_factory;
|
|
|
|
if (config.encoder.fixed_rate)
|
|
send_config.send_codec_spec->target_bitrate_bps =
|
|
config.encoder.fixed_rate->bps();
|
|
|
|
if (config.encoder.allocate_bitrate ||
|
|
config.stream.in_bandwidth_estimation) {
|
|
DataRate min_rate = DataRate::Infinity();
|
|
DataRate max_rate = DataRate::Infinity();
|
|
if (config.encoder.fixed_rate) {
|
|
min_rate = *config.encoder.fixed_rate;
|
|
max_rate = *config.encoder.fixed_rate;
|
|
} else {
|
|
min_rate = *config.encoder.min_rate;
|
|
max_rate = *config.encoder.max_rate;
|
|
}
|
|
if (field_trial::IsEnabled("WebRTC-SendSideBwe-WithOverhead")) {
|
|
TimeDelta frame_length = config.encoder.initial_frame_length;
|
|
DataSize rtp_overhead = DataSize::bytes(12);
|
|
DataSize total_overhead = config.stream.packet_overhead + rtp_overhead;
|
|
min_rate += total_overhead / frame_length;
|
|
max_rate += total_overhead / frame_length;
|
|
}
|
|
send_config.min_bitrate_bps = min_rate.bps();
|
|
send_config.max_bitrate_bps = max_rate.bps();
|
|
}
|
|
|
|
if (config.stream.in_bandwidth_estimation) {
|
|
send_config.send_codec_spec->transport_cc_enabled = true;
|
|
send_config.rtp.extensions = {
|
|
{RtpExtension::kTransportSequenceNumberUri, 8}};
|
|
}
|
|
|
|
if (config.stream.rate_allocation_priority) {
|
|
send_config.track_id = sender->GetNextPriorityId();
|
|
}
|
|
send_stream_ = sender_->call_->CreateAudioSendStream(send_config);
|
|
if (field_trial::IsEnabled("WebRTC-SendSideBwe-WithOverhead")) {
|
|
sender->call_->OnAudioTransportOverheadChanged(
|
|
config.stream.packet_overhead.bytes());
|
|
}
|
|
}
|
|
|
|
SendAudioStream::~SendAudioStream() {
|
|
sender_->call_->DestroyAudioSendStream(send_stream_);
|
|
}
|
|
|
|
void SendAudioStream::Start() {
|
|
send_stream_->Start();
|
|
}
|
|
|
|
bool SendAudioStream::TryDeliverPacket(rtc::CopyOnWriteBuffer packet,
|
|
uint64_t receiver,
|
|
Timestamp at_time) {
|
|
// Removes added overhead before delivering RTCP packet to sender.
|
|
RTC_DCHECK_GE(packet.size(), config_.stream.packet_overhead.bytes());
|
|
packet.SetSize(packet.size() - config_.stream.packet_overhead.bytes());
|
|
sender_->DeliverPacket(MediaType::AUDIO, packet, at_time);
|
|
return true;
|
|
}
|
|
ReceiveAudioStream::ReceiveAudioStream(
|
|
CallClient* receiver,
|
|
AudioStreamConfig config,
|
|
SendAudioStream* send_stream,
|
|
rtc::scoped_refptr<AudioDecoderFactory> decoder_factory,
|
|
Transport* feedback_transport)
|
|
: receiver_(receiver), config_(config) {
|
|
AudioReceiveStream::Config recv_config;
|
|
recv_config.rtp.local_ssrc = CallTest::kReceiverLocalAudioSsrc;
|
|
recv_config.rtcp_send_transport = feedback_transport;
|
|
recv_config.rtp.remote_ssrc = send_stream->ssrc_;
|
|
if (config.stream.in_bandwidth_estimation) {
|
|
recv_config.rtp.transport_cc = true;
|
|
recv_config.rtp.extensions = {
|
|
{RtpExtension::kTransportSequenceNumberUri, 8}};
|
|
}
|
|
recv_config.decoder_factory = decoder_factory;
|
|
recv_config.decoder_map = {
|
|
{CallTest::kAudioSendPayloadType, {"opus", 48000, 2}}};
|
|
recv_config.sync_group = config.render.sync_group;
|
|
receive_stream_ = receiver_->call_->CreateAudioReceiveStream(recv_config);
|
|
}
|
|
ReceiveAudioStream::~ReceiveAudioStream() {
|
|
receiver_->call_->DestroyAudioReceiveStream(receive_stream_);
|
|
}
|
|
|
|
bool ReceiveAudioStream::TryDeliverPacket(rtc::CopyOnWriteBuffer packet,
|
|
uint64_t receiver,
|
|
Timestamp at_time) {
|
|
RTC_DCHECK_GE(packet.size(), config_.stream.packet_overhead.bytes());
|
|
packet.SetSize(packet.size() - config_.stream.packet_overhead.bytes());
|
|
receiver_->DeliverPacket(MediaType::AUDIO, packet, at_time);
|
|
return true;
|
|
}
|
|
|
|
AudioStreamPair::~AudioStreamPair() = default;
|
|
|
|
AudioStreamPair::AudioStreamPair(
|
|
CallClient* sender,
|
|
std::vector<NetworkNode*> send_link,
|
|
uint64_t send_receiver_id,
|
|
rtc::scoped_refptr<AudioEncoderFactory> encoder_factory,
|
|
CallClient* receiver,
|
|
std::vector<NetworkNode*> return_link,
|
|
uint64_t return_receiver_id,
|
|
rtc::scoped_refptr<AudioDecoderFactory> decoder_factory,
|
|
AudioStreamConfig config)
|
|
: config_(config),
|
|
send_link_(send_link),
|
|
return_link_(return_link),
|
|
send_transport_(sender,
|
|
send_link.front(),
|
|
send_receiver_id,
|
|
config.stream.packet_overhead),
|
|
return_transport_(receiver,
|
|
return_link.front(),
|
|
return_receiver_id,
|
|
config.stream.packet_overhead),
|
|
send_stream_(sender, config, encoder_factory, &send_transport_),
|
|
receive_stream_(receiver,
|
|
config,
|
|
&send_stream_,
|
|
decoder_factory,
|
|
&return_transport_) {
|
|
NetworkNode::Route(send_transport_.ReceiverId(), send_link_,
|
|
&receive_stream_);
|
|
NetworkNode::Route(return_transport_.ReceiverId(), return_link_,
|
|
&send_stream_);
|
|
}
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|