solenberg | c7a8b08 | 2015-10-16 14:35:07 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. |
| 3 | * |
| 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 |
| 6 | * tree. An additional intellectual property rights grant can be found |
| 7 | * in the file PATENTS. All contributing project authors may |
| 8 | * be found in the AUTHORS file in the root of the source tree. |
| 9 | */ |
| 10 | |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 11 | #include "audio/audio_send_stream.h" |
solenberg | c7a8b08 | 2015-10-16 14:35:07 -0700 | [diff] [blame] | 12 | |
| 13 | #include <string> |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 14 | #include <utility> |
| 15 | #include <vector> |
solenberg | c7a8b08 | 2015-10-16 14:35:07 -0700 | [diff] [blame] | 16 | |
Niels Möller | fa4e185 | 2018-08-14 09:43:34 +0200 | [diff] [blame] | 17 | #include "absl/memory/memory.h" |
Yves Gerey | 988cc08 | 2018-10-23 12:03:01 +0200 | [diff] [blame] | 18 | #include "api/audio_codecs/audio_encoder.h" |
| 19 | #include "api/audio_codecs/audio_encoder_factory.h" |
| 20 | #include "api/audio_codecs/audio_format.h" |
| 21 | #include "api/call/transport.h" |
| 22 | #include "api/crypto/frameencryptorinterface.h" |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 23 | #include "audio/audio_state.h" |
Yves Gerey | 988cc08 | 2018-10-23 12:03:01 +0200 | [diff] [blame] | 24 | #include "audio/channel_send.h" |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 25 | #include "audio/conversion.h" |
Yves Gerey | 988cc08 | 2018-10-23 12:03:01 +0200 | [diff] [blame] | 26 | #include "call/rtp_config.h" |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 27 | #include "call/rtp_transport_controller_send_interface.h" |
Yves Gerey | 988cc08 | 2018-10-23 12:03:01 +0200 | [diff] [blame] | 28 | #include "common_audio/vad/include/vad.h" |
Oskar Sundbom | 56ef305 | 2018-10-30 16:11:02 +0100 | [diff] [blame] | 29 | #include "logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h" |
| 30 | #include "logging/rtc_event_log/rtc_event_log.h" |
| 31 | #include "logging/rtc_event_log/rtc_stream_config.h" |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 32 | #include "modules/audio_coding/codecs/cng/audio_encoder_cng.h" |
Yves Gerey | 988cc08 | 2018-10-23 12:03:01 +0200 | [diff] [blame] | 33 | #include "modules/audio_processing/include/audio_processing.h" |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 34 | #include "rtc_base/checks.h" |
| 35 | #include "rtc_base/event.h" |
| 36 | #include "rtc_base/function_view.h" |
| 37 | #include "rtc_base/logging.h" |
Jonas Olsson | abbe841 | 2018-04-03 13:40:05 +0200 | [diff] [blame] | 38 | #include "rtc_base/strings/audio_format_to_string.h" |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 39 | #include "rtc_base/task_queue.h" |
| 40 | #include "rtc_base/timeutils.h" |
Alex Narest | cedd351 | 2017-12-07 20:54:55 +0100 | [diff] [blame] | 41 | #include "system_wrappers/include/field_trial.h" |
solenberg | c7a8b08 | 2015-10-16 14:35:07 -0700 | [diff] [blame] | 42 | |
| 43 | namespace webrtc { |
solenberg | c7a8b08 | 2015-10-16 14:35:07 -0700 | [diff] [blame] | 44 | namespace internal { |
Fredrik Solenberg | 8f5787a | 2018-01-11 13:52:30 +0100 | [diff] [blame] | 45 | namespace { |
eladalon | edd6eea | 2017-05-25 00:15:35 -0700 | [diff] [blame] | 46 | // TODO(eladalon): Subsequent CL will make these values experiment-dependent. |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 47 | constexpr size_t kPacketLossTrackerMaxWindowSizeMs = 15000; |
| 48 | constexpr size_t kPacketLossRateMinNumAckedPackets = 50; |
| 49 | constexpr size_t kRecoverablePacketLossRateMinNumAckedPairs = 40; |
| 50 | |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 51 | void CallEncoder(const std::unique_ptr<voe::ChannelSendInterface>& channel_send, |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 52 | rtc::FunctionView<void(AudioEncoder*)> lambda) { |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 53 | channel_send->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder_ptr) { |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 54 | RTC_DCHECK(encoder_ptr); |
| 55 | lambda(encoder_ptr->get()); |
| 56 | }); |
| 57 | } |
Fredrik Solenberg | 8f5787a | 2018-01-11 13:52:30 +0100 | [diff] [blame] | 58 | |
Oskar Sundbom | 56ef305 | 2018-10-30 16:11:02 +0100 | [diff] [blame] | 59 | void UpdateEventLogStreamConfig(RtcEventLog* event_log, |
| 60 | const AudioSendStream::Config& config, |
| 61 | const AudioSendStream::Config* old_config) { |
| 62 | using SendCodecSpec = AudioSendStream::Config::SendCodecSpec; |
| 63 | // Only update if any of the things we log have changed. |
| 64 | auto payload_types_equal = [](const absl::optional<SendCodecSpec>& a, |
| 65 | const absl::optional<SendCodecSpec>& b) { |
| 66 | if (a.has_value() && b.has_value()) { |
| 67 | return a->format.name == b->format.name && |
| 68 | a->payload_type == b->payload_type; |
| 69 | } |
| 70 | return !a.has_value() && !b.has_value(); |
| 71 | }; |
| 72 | |
| 73 | if (old_config && config.rtp.ssrc == old_config->rtp.ssrc && |
| 74 | config.rtp.extensions == old_config->rtp.extensions && |
| 75 | payload_types_equal(config.send_codec_spec, |
| 76 | old_config->send_codec_spec)) { |
| 77 | return; |
| 78 | } |
| 79 | |
| 80 | auto rtclog_config = absl::make_unique<rtclog::StreamConfig>(); |
| 81 | rtclog_config->local_ssrc = config.rtp.ssrc; |
| 82 | rtclog_config->rtp_extensions = config.rtp.extensions; |
| 83 | if (config.send_codec_spec) { |
| 84 | rtclog_config->codecs.emplace_back(config.send_codec_spec->format.name, |
| 85 | config.send_codec_spec->payload_type, 0); |
| 86 | } |
| 87 | event_log->Log(absl::make_unique<RtcEventAudioSendStreamConfig>( |
| 88 | std::move(rtclog_config))); |
| 89 | } |
| 90 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 91 | } // namespace |
| 92 | |
Sam Zackrisson | 06953ba | 2018-02-01 16:53:16 +0100 | [diff] [blame] | 93 | // Helper class to track the actively sending lifetime of this stream. |
saza | c58f8c0 | 2017-07-19 00:39:19 -0700 | [diff] [blame] | 94 | class AudioSendStream::TimedTransport : public Transport { |
| 95 | public: |
| 96 | TimedTransport(Transport* transport, TimeInterval* time_interval) |
| 97 | : transport_(transport), lifetime_(time_interval) {} |
| 98 | bool SendRtp(const uint8_t* packet, |
| 99 | size_t length, |
| 100 | const PacketOptions& options) { |
| 101 | if (lifetime_) { |
| 102 | lifetime_->Extend(); |
| 103 | } |
| 104 | return transport_->SendRtp(packet, length, options); |
| 105 | } |
| 106 | bool SendRtcp(const uint8_t* packet, size_t length) { |
| 107 | return transport_->SendRtcp(packet, length); |
| 108 | } |
| 109 | ~TimedTransport() {} |
| 110 | |
| 111 | private: |
| 112 | Transport* transport_; |
| 113 | TimeInterval* lifetime_; |
| 114 | }; |
| 115 | |
solenberg | 566ef24 | 2015-11-06 15:34:49 -0800 | [diff] [blame] | 116 | AudioSendStream::AudioSendStream( |
| 117 | const webrtc::AudioSendStream::Config& config, |
Stefan Holmer | b86d4e4 | 2015-12-07 10:26:18 +0100 | [diff] [blame] | 118 | const rtc::scoped_refptr<webrtc::AudioState>& audio_state, |
perkj | 26091b1 | 2016-09-01 01:17:40 -0700 | [diff] [blame] | 119 | rtc::TaskQueue* worker_queue, |
Fredrik Solenberg | 8f5787a | 2018-01-11 13:52:30 +0100 | [diff] [blame] | 120 | ProcessThread* module_process_thread, |
Niels Möller | 7d76a31 | 2018-10-26 12:57:07 +0200 | [diff] [blame] | 121 | RtpTransportControllerSendInterface* rtp_transport, |
Niels Möller | 67b011d | 2018-10-22 13:00:40 +0200 | [diff] [blame] | 122 | BitrateAllocatorInterface* bitrate_allocator, |
michaelt | 9332b7d | 2016-11-30 07:51:13 -0800 | [diff] [blame] | 123 | RtcEventLog* event_log, |
ossu | c3d4b48 | 2017-05-23 06:07:11 -0700 | [diff] [blame] | 124 | RtcpRttStats* rtcp_rtt_stats, |
Danil Chapovalov | b9b146c | 2018-06-15 12:28:07 +0200 | [diff] [blame] | 125 | const absl::optional<RtpState>& suspended_rtp_state, |
Sam Zackrisson | 06953ba | 2018-02-01 16:53:16 +0100 | [diff] [blame] | 126 | TimeInterval* overall_call_lifetime) |
Fredrik Solenberg | 8f5787a | 2018-01-11 13:52:30 +0100 | [diff] [blame] | 127 | : AudioSendStream(config, |
| 128 | audio_state, |
| 129 | worker_queue, |
Niels Möller | 7d76a31 | 2018-10-26 12:57:07 +0200 | [diff] [blame] | 130 | rtp_transport, |
Fredrik Solenberg | 8f5787a | 2018-01-11 13:52:30 +0100 | [diff] [blame] | 131 | bitrate_allocator, |
| 132 | event_log, |
| 133 | rtcp_rtt_stats, |
| 134 | suspended_rtp_state, |
Sam Zackrisson | 06953ba | 2018-02-01 16:53:16 +0100 | [diff] [blame] | 135 | overall_call_lifetime, |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 136 | voe::CreateChannelSend(worker_queue, |
| 137 | module_process_thread, |
| 138 | config.media_transport, |
| 139 | rtcp_rtt_stats, |
| 140 | event_log, |
| 141 | config.frame_encryptor, |
| 142 | config.crypto_options, |
| 143 | config.rtp.extmap_allow_mixed, |
| 144 | config.rtcp_report_interval_ms)) {} |
Fredrik Solenberg | 8f5787a | 2018-01-11 13:52:30 +0100 | [diff] [blame] | 145 | |
| 146 | AudioSendStream::AudioSendStream( |
| 147 | const webrtc::AudioSendStream::Config& config, |
| 148 | const rtc::scoped_refptr<webrtc::AudioState>& audio_state, |
| 149 | rtc::TaskQueue* worker_queue, |
Niels Möller | 7d76a31 | 2018-10-26 12:57:07 +0200 | [diff] [blame] | 150 | RtpTransportControllerSendInterface* rtp_transport, |
Niels Möller | 67b011d | 2018-10-22 13:00:40 +0200 | [diff] [blame] | 151 | BitrateAllocatorInterface* bitrate_allocator, |
Fredrik Solenberg | 8f5787a | 2018-01-11 13:52:30 +0100 | [diff] [blame] | 152 | RtcEventLog* event_log, |
| 153 | RtcpRttStats* rtcp_rtt_stats, |
Danil Chapovalov | b9b146c | 2018-06-15 12:28:07 +0200 | [diff] [blame] | 154 | const absl::optional<RtpState>& suspended_rtp_state, |
Sam Zackrisson | 06953ba | 2018-02-01 16:53:16 +0100 | [diff] [blame] | 155 | TimeInterval* overall_call_lifetime, |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 156 | std::unique_ptr<voe::ChannelSendInterface> channel_send) |
perkj | 26091b1 | 2016-09-01 01:17:40 -0700 | [diff] [blame] | 157 | : worker_queue_(worker_queue), |
Niels Möller | 7d76a31 | 2018-10-26 12:57:07 +0200 | [diff] [blame] | 158 | config_(Config(/*send_transport=*/nullptr, |
| 159 | /*media_transport=*/nullptr)), |
mflodman | 86cc6ff | 2016-07-26 04:44:06 -0700 | [diff] [blame] | 160 | audio_state_(audio_state), |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 161 | channel_send_(std::move(channel_send)), |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 162 | event_log_(event_log), |
michaelt | f4caaab | 2017-01-16 23:55:07 -0800 | [diff] [blame] | 163 | bitrate_allocator_(bitrate_allocator), |
Niels Möller | 7d76a31 | 2018-10-26 12:57:07 +0200 | [diff] [blame] | 164 | rtp_transport_(rtp_transport), |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 165 | packet_loss_tracker_(kPacketLossTrackerMaxWindowSizeMs, |
| 166 | kPacketLossRateMinNumAckedPackets, |
ossu | c3d4b48 | 2017-05-23 06:07:11 -0700 | [diff] [blame] | 167 | kRecoverablePacketLossRateMinNumAckedPairs), |
| 168 | rtp_rtcp_module_(nullptr), |
Sam Zackrisson | 06953ba | 2018-02-01 16:53:16 +0100 | [diff] [blame] | 169 | suspended_rtp_state_(suspended_rtp_state), |
| 170 | overall_call_lifetime_(overall_call_lifetime) { |
Jonas Olsson | 24ea822 | 2018-01-25 10:14:29 +0100 | [diff] [blame] | 171 | RTC_LOG(LS_INFO) << "AudioSendStream: " << config.rtp.ssrc; |
Fredrik Solenberg | 8f5787a | 2018-01-11 13:52:30 +0100 | [diff] [blame] | 172 | RTC_DCHECK(worker_queue_); |
| 173 | RTC_DCHECK(audio_state_); |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 174 | RTC_DCHECK(channel_send_); |
Fredrik Solenberg | 8f5787a | 2018-01-11 13:52:30 +0100 | [diff] [blame] | 175 | RTC_DCHECK(bitrate_allocator_); |
Niels Möller | 7d76a31 | 2018-10-26 12:57:07 +0200 | [diff] [blame] | 176 | // TODO(nisse): Eventually, we should have only media_transport. But for the |
| 177 | // time being, we can have either. When media transport is injected, there |
| 178 | // should be no rtp_transport, and below check should be strengthened to XOR |
| 179 | // (either rtp_transport or media_transport but not both). |
| 180 | RTC_DCHECK(rtp_transport || config.media_transport); |
Sam Zackrisson | 06953ba | 2018-02-01 16:53:16 +0100 | [diff] [blame] | 181 | RTC_DCHECK(overall_call_lifetime_); |
solenberg | 3a94154 | 2015-11-16 07:34:50 -0800 | [diff] [blame] | 182 | |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 183 | rtp_rtcp_module_ = channel_send_->GetRtpRtcp(); |
ossu | c3d4b48 | 2017-05-23 06:07:11 -0700 | [diff] [blame] | 184 | RTC_DCHECK(rtp_rtcp_module_); |
mflodman | 3d7db26 | 2016-04-29 00:57:13 -0700 | [diff] [blame] | 185 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 186 | ConfigureStream(this, config, true); |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 187 | |
| 188 | pacer_thread_checker_.DetachFromThread(); |
Niels Möller | 7d76a31 | 2018-10-26 12:57:07 +0200 | [diff] [blame] | 189 | if (rtp_transport_) { |
| 190 | // Signal congestion controller this object is ready for OnPacket* |
| 191 | // callbacks. |
| 192 | rtp_transport_->RegisterPacketFeedbackObserver(this); |
| 193 | } |
solenberg | c7a8b08 | 2015-10-16 14:35:07 -0700 | [diff] [blame] | 194 | } |
| 195 | |
| 196 | AudioSendStream::~AudioSendStream() { |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 197 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
Jonas Olsson | 24ea822 | 2018-01-25 10:14:29 +0100 | [diff] [blame] | 198 | RTC_LOG(LS_INFO) << "~AudioSendStream: " << config_.rtp.ssrc; |
Fredrik Solenberg | 2a87797 | 2017-12-15 16:42:15 +0100 | [diff] [blame] | 199 | RTC_DCHECK(!sending_); |
Niels Möller | 7d76a31 | 2018-10-26 12:57:07 +0200 | [diff] [blame] | 200 | if (rtp_transport_) { |
| 201 | rtp_transport_->DeRegisterPacketFeedbackObserver(this); |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 202 | channel_send_->RegisterTransport(nullptr); |
| 203 | channel_send_->ResetSenderCongestionControlObjects(); |
Niels Möller | 7d76a31 | 2018-10-26 12:57:07 +0200 | [diff] [blame] | 204 | } |
Sam Zackrisson | 06953ba | 2018-02-01 16:53:16 +0100 | [diff] [blame] | 205 | // Lifetime can only be updated after deregistering |
| 206 | // |timed_send_transport_adapter_| in the underlying channel object to avoid |
| 207 | // data races in |active_lifetime_|. |
| 208 | overall_call_lifetime_->Extend(active_lifetime_); |
solenberg | c7a8b08 | 2015-10-16 14:35:07 -0700 | [diff] [blame] | 209 | } |
| 210 | |
eladalon | abbc430 | 2017-07-26 02:09:44 -0700 | [diff] [blame] | 211 | const webrtc::AudioSendStream::Config& AudioSendStream::GetConfig() const { |
| 212 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
| 213 | return config_; |
| 214 | } |
| 215 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 216 | void AudioSendStream::Reconfigure( |
| 217 | const webrtc::AudioSendStream::Config& new_config) { |
Fredrik Solenberg | 2a87797 | 2017-12-15 16:42:15 +0100 | [diff] [blame] | 218 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 219 | ConfigureStream(this, new_config, false); |
| 220 | } |
| 221 | |
Alex Narest | cedd351 | 2017-12-07 20:54:55 +0100 | [diff] [blame] | 222 | AudioSendStream::ExtensionIds AudioSendStream::FindExtensionIds( |
| 223 | const std::vector<RtpExtension>& extensions) { |
| 224 | ExtensionIds ids; |
| 225 | for (const auto& extension : extensions) { |
| 226 | if (extension.uri == RtpExtension::kAudioLevelUri) { |
| 227 | ids.audio_level = extension.id; |
| 228 | } else if (extension.uri == RtpExtension::kTransportSequenceNumberUri) { |
| 229 | ids.transport_sequence_number = extension.id; |
Steve Anton | bb50ce5 | 2018-03-26 10:24:32 -0700 | [diff] [blame] | 230 | } else if (extension.uri == RtpExtension::kMidUri) { |
| 231 | ids.mid = extension.id; |
Alex Narest | cedd351 | 2017-12-07 20:54:55 +0100 | [diff] [blame] | 232 | } |
| 233 | } |
| 234 | return ids; |
| 235 | } |
| 236 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 237 | void AudioSendStream::ConfigureStream( |
| 238 | webrtc::internal::AudioSendStream* stream, |
| 239 | const webrtc::AudioSendStream::Config& new_config, |
| 240 | bool first_time) { |
Jonas Olsson | 24ea822 | 2018-01-25 10:14:29 +0100 | [diff] [blame] | 241 | RTC_LOG(LS_INFO) << "AudioSendStream::ConfigureStream: " |
| 242 | << new_config.ToString(); |
Oskar Sundbom | 56ef305 | 2018-10-30 16:11:02 +0100 | [diff] [blame] | 243 | UpdateEventLogStreamConfig(stream->event_log_, new_config, |
| 244 | first_time ? nullptr : &stream->config_); |
| 245 | |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 246 | const auto& channel_send = stream->channel_send_; |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 247 | const auto& old_config = stream->config_; |
| 248 | |
| 249 | if (first_time || old_config.rtp.ssrc != new_config.rtp.ssrc) { |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 250 | channel_send->SetLocalSSRC(new_config.rtp.ssrc); |
ossu | c3d4b48 | 2017-05-23 06:07:11 -0700 | [diff] [blame] | 251 | if (stream->suspended_rtp_state_) { |
| 252 | stream->rtp_rtcp_module_->SetRtpState(*stream->suspended_rtp_state_); |
| 253 | } |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 254 | } |
| 255 | if (first_time || old_config.rtp.c_name != new_config.rtp.c_name) { |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 256 | channel_send->SetRTCP_CNAME(new_config.rtp.c_name); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 257 | } |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 258 | |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 259 | if (first_time || new_config.send_transport != old_config.send_transport) { |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 260 | if (old_config.send_transport) { |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 261 | channel_send->RegisterTransport(nullptr); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 262 | } |
saza | c58f8c0 | 2017-07-19 00:39:19 -0700 | [diff] [blame] | 263 | if (new_config.send_transport) { |
| 264 | stream->timed_send_transport_adapter_.reset(new TimedTransport( |
| 265 | new_config.send_transport, &stream->active_lifetime_)); |
| 266 | } else { |
| 267 | stream->timed_send_transport_adapter_.reset(nullptr); |
| 268 | } |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 269 | channel_send->RegisterTransport( |
saza | c58f8c0 | 2017-07-19 00:39:19 -0700 | [diff] [blame] | 270 | stream->timed_send_transport_adapter_.get()); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 271 | } |
| 272 | |
Benjamin Wright | 84583f6 | 2018-10-04 14:22:34 -0700 | [diff] [blame] | 273 | // Enable the frame encryptor if a new frame encryptor has been provided. |
| 274 | if (first_time || new_config.frame_encryptor != old_config.frame_encryptor) { |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 275 | channel_send->SetFrameEncryptor(new_config.frame_encryptor); |
Benjamin Wright | 84583f6 | 2018-10-04 14:22:34 -0700 | [diff] [blame] | 276 | } |
| 277 | |
Johannes Kron | 9190b82 | 2018-10-29 11:22:05 +0100 | [diff] [blame] | 278 | if (first_time || |
| 279 | new_config.rtp.extmap_allow_mixed != old_config.rtp.extmap_allow_mixed) { |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 280 | channel_send->SetExtmapAllowMixed(new_config.rtp.extmap_allow_mixed); |
Johannes Kron | 9190b82 | 2018-10-29 11:22:05 +0100 | [diff] [blame] | 281 | } |
| 282 | |
Alex Narest | cedd351 | 2017-12-07 20:54:55 +0100 | [diff] [blame] | 283 | const ExtensionIds old_ids = FindExtensionIds(old_config.rtp.extensions); |
| 284 | const ExtensionIds new_ids = FindExtensionIds(new_config.rtp.extensions); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 285 | // Audio level indication |
| 286 | if (first_time || new_ids.audio_level != old_ids.audio_level) { |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 287 | channel_send->SetSendAudioLevelIndicationStatus(new_ids.audio_level != 0, |
| 288 | new_ids.audio_level); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 289 | } |
Sebastian Jansson | 8d9c540 | 2017-11-15 17:22:16 +0100 | [diff] [blame] | 290 | bool transport_seq_num_id_changed = |
| 291 | new_ids.transport_sequence_number != old_ids.transport_sequence_number; |
Alex Narest | 867e510 | 2018-06-12 13:40:18 +0200 | [diff] [blame] | 292 | if (first_time || |
| 293 | (transport_seq_num_id_changed && |
| 294 | !webrtc::field_trial::IsEnabled("WebRTC-Audio-ForceNoTWCC"))) { |
ossu | 1129df2 | 2017-06-30 01:38:56 -0700 | [diff] [blame] | 295 | if (!first_time) { |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 296 | channel_send->ResetSenderCongestionControlObjects(); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 297 | } |
| 298 | |
Sebastian Jansson | 8d9c540 | 2017-11-15 17:22:16 +0100 | [diff] [blame] | 299 | RtcpBandwidthObserver* bandwidth_observer = nullptr; |
Alex Narest | 867e510 | 2018-06-12 13:40:18 +0200 | [diff] [blame] | 300 | bool has_transport_sequence_number = |
| 301 | new_ids.transport_sequence_number != 0 && |
| 302 | !webrtc::field_trial::IsEnabled("WebRTC-Audio-ForceNoTWCC"); |
Sebastian Jansson | 8d9c540 | 2017-11-15 17:22:16 +0100 | [diff] [blame] | 303 | if (has_transport_sequence_number) { |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 304 | channel_send->EnableSendTransportSequenceNumber( |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 305 | new_ids.transport_sequence_number); |
Sebastian Jansson | 8d9c540 | 2017-11-15 17:22:16 +0100 | [diff] [blame] | 306 | // Probing in application limited region is only used in combination with |
| 307 | // send side congestion control, wich depends on feedback packets which |
| 308 | // requires transport sequence numbers to be enabled. |
Niels Möller | 7d76a31 | 2018-10-26 12:57:07 +0200 | [diff] [blame] | 309 | if (stream->rtp_transport_) { |
| 310 | stream->rtp_transport_->EnablePeriodicAlrProbing(true); |
| 311 | bandwidth_observer = stream->rtp_transport_->GetBandwidthObserver(); |
| 312 | } |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 313 | } |
Niels Möller | 7d76a31 | 2018-10-26 12:57:07 +0200 | [diff] [blame] | 314 | if (stream->rtp_transport_) { |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 315 | channel_send->RegisterSenderCongestionControlObjects( |
Niels Möller | 7d76a31 | 2018-10-26 12:57:07 +0200 | [diff] [blame] | 316 | stream->rtp_transport_, bandwidth_observer); |
| 317 | } |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 318 | } |
Steve Anton | bb50ce5 | 2018-03-26 10:24:32 -0700 | [diff] [blame] | 319 | // MID RTP header extension. |
Steve Anton | 003930a | 2018-03-29 12:37:21 -0700 | [diff] [blame] | 320 | if ((first_time || new_ids.mid != old_ids.mid || |
| 321 | new_config.rtp.mid != old_config.rtp.mid) && |
| 322 | new_ids.mid != 0 && !new_config.rtp.mid.empty()) { |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 323 | channel_send->SetMid(new_config.rtp.mid, new_ids.mid); |
Steve Anton | bb50ce5 | 2018-03-26 10:24:32 -0700 | [diff] [blame] | 324 | } |
| 325 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 326 | if (!ReconfigureSendCodec(stream, new_config)) { |
Mirko Bonadei | 675513b | 2017-11-09 11:09:25 +0100 | [diff] [blame] | 327 | RTC_LOG(LS_ERROR) << "Failed to set up send codec state."; |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 328 | } |
| 329 | |
Oskar Sundbom | f85e31b | 2017-12-20 16:38:09 +0100 | [diff] [blame] | 330 | if (stream->sending_) { |
| 331 | ReconfigureBitrateObserver(stream, new_config); |
| 332 | } |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 333 | stream->config_ = new_config; |
| 334 | } |
| 335 | |
solenberg | 3a94154 | 2015-11-16 07:34:50 -0800 | [diff] [blame] | 336 | void AudioSendStream::Start() { |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 337 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
Fredrik Solenberg | 2a87797 | 2017-12-15 16:42:15 +0100 | [diff] [blame] | 338 | if (sending_) { |
| 339 | return; |
| 340 | } |
| 341 | |
Sebastian Jansson | 763e947 | 2018-03-21 12:46:56 +0100 | [diff] [blame] | 342 | bool has_transport_sequence_number = |
Alex Narest | 867e510 | 2018-06-12 13:40:18 +0200 | [diff] [blame] | 343 | FindExtensionIds(config_.rtp.extensions).transport_sequence_number != 0 && |
| 344 | !webrtc::field_trial::IsEnabled("WebRTC-Audio-ForceNoTWCC"); |
Alex Narest | cedd351 | 2017-12-07 20:54:55 +0100 | [diff] [blame] | 345 | if (config_.min_bitrate_bps != -1 && config_.max_bitrate_bps != -1 && |
Tim Haloun | 648d28a | 2018-10-18 16:52:22 -0700 | [diff] [blame] | 346 | !config_.has_dscp && |
Sebastian Jansson | 763e947 | 2018-03-21 12:46:56 +0100 | [diff] [blame] | 347 | (has_transport_sequence_number || |
Alex Narest | bcf9180 | 2018-06-25 16:08:36 +0200 | [diff] [blame] | 348 | !webrtc::field_trial::IsEnabled("WebRTC-Audio-SendSideBwe") || |
| 349 | webrtc::field_trial::IsEnabled("WebRTC-Audio-ABWENoTWCC"))) { |
Alex Narest | 78609d5 | 2017-10-20 10:37:47 +0200 | [diff] [blame] | 350 | // Audio BWE is enabled. |
Niels Möller | 7d76a31 | 2018-10-26 12:57:07 +0200 | [diff] [blame] | 351 | rtp_transport_->packet_sender()->SetAccountForAudioPackets(true); |
Sebastian Jansson | b686396 | 2018-10-10 10:23:13 +0200 | [diff] [blame] | 352 | rtp_rtcp_module_->SetAsPartOfAllocation(true); |
Seth Hampson | 24722b3 | 2017-12-22 09:36:42 -0800 | [diff] [blame] | 353 | ConfigureBitrateObserver(config_.min_bitrate_bps, config_.max_bitrate_bps, |
Sebastian Jansson | 763e947 | 2018-03-21 12:46:56 +0100 | [diff] [blame] | 354 | config_.bitrate_priority, |
| 355 | has_transport_sequence_number); |
Sebastian Jansson | b686396 | 2018-10-10 10:23:13 +0200 | [diff] [blame] | 356 | } else { |
| 357 | rtp_rtcp_module_->SetAsPartOfAllocation(false); |
mflodman | 86cc6ff | 2016-07-26 04:44:06 -0700 | [diff] [blame] | 358 | } |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 359 | channel_send_->StartSend(); |
Fredrik Solenberg | 2a87797 | 2017-12-15 16:42:15 +0100 | [diff] [blame] | 360 | sending_ = true; |
| 361 | audio_state()->AddSendingStream(this, encoder_sample_rate_hz_, |
| 362 | encoder_num_channels_); |
solenberg | 3a94154 | 2015-11-16 07:34:50 -0800 | [diff] [blame] | 363 | } |
| 364 | |
| 365 | void AudioSendStream::Stop() { |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 366 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
Fredrik Solenberg | 2a87797 | 2017-12-15 16:42:15 +0100 | [diff] [blame] | 367 | if (!sending_) { |
| 368 | return; |
| 369 | } |
| 370 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 371 | RemoveBitrateObserver(); |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 372 | channel_send_->StopSend(); |
Fredrik Solenberg | 2a87797 | 2017-12-15 16:42:15 +0100 | [diff] [blame] | 373 | sending_ = false; |
| 374 | audio_state()->RemoveSendingStream(this); |
| 375 | } |
| 376 | |
| 377 | void AudioSendStream::SendAudioData(std::unique_ptr<AudioFrame> audio_frame) { |
| 378 | RTC_CHECK_RUNS_SERIALIZED(&audio_capture_race_checker_); |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 379 | channel_send_->ProcessAndEncodeAudio(std::move(audio_frame)); |
solenberg | 3a94154 | 2015-11-16 07:34:50 -0800 | [diff] [blame] | 380 | } |
| 381 | |
solenberg | ffbbcac | 2016-11-17 05:25:37 -0800 | [diff] [blame] | 382 | bool AudioSendStream::SendTelephoneEvent(int payload_type, |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 383 | int payload_frequency, |
| 384 | int event, |
solenberg | 8842c3e | 2016-03-11 03:06:41 -0800 | [diff] [blame] | 385 | int duration_ms) { |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 386 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 387 | return channel_send_->SetSendTelephoneEventPayloadType(payload_type, |
| 388 | payload_frequency) && |
| 389 | channel_send_->SendTelephoneEventOutband(event, duration_ms); |
Fredrik Solenberg | b572768 | 2015-12-04 15:22:19 +0100 | [diff] [blame] | 390 | } |
| 391 | |
solenberg | 9421853 | 2016-06-16 10:53:22 -0700 | [diff] [blame] | 392 | void AudioSendStream::SetMuted(bool muted) { |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 393 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 394 | channel_send_->SetInputMute(muted); |
solenberg | 9421853 | 2016-06-16 10:53:22 -0700 | [diff] [blame] | 395 | } |
| 396 | |
solenberg | c7a8b08 | 2015-10-16 14:35:07 -0700 | [diff] [blame] | 397 | webrtc::AudioSendStream::Stats AudioSendStream::GetStats() const { |
Ivo Creusen | 56d4609 | 2017-11-24 17:29:59 +0100 | [diff] [blame] | 398 | return GetStats(true); |
| 399 | } |
| 400 | |
| 401 | webrtc::AudioSendStream::Stats AudioSendStream::GetStats( |
| 402 | bool has_remote_tracks) const { |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 403 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
solenberg | 85a0496 | 2015-10-27 03:35:21 -0700 | [diff] [blame] | 404 | webrtc::AudioSendStream::Stats stats; |
| 405 | stats.local_ssrc = config_.rtp.ssrc; |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 406 | stats.target_bitrate_bps = channel_send_->GetBitrate(); |
solenberg | 85a0496 | 2015-10-27 03:35:21 -0700 | [diff] [blame] | 407 | |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 408 | webrtc::CallSendStatistics call_stats = channel_send_->GetRTCPStatistics(); |
solenberg | 85a0496 | 2015-10-27 03:35:21 -0700 | [diff] [blame] | 409 | stats.bytes_sent = call_stats.bytesSent; |
| 410 | stats.packets_sent = call_stats.packetsSent; |
solenberg | 8b85de2 | 2015-11-16 09:48:04 -0800 | [diff] [blame] | 411 | // RTT isn't known until a RTCP report is received. Until then, VoiceEngine |
| 412 | // returns 0 to indicate an error value. |
| 413 | if (call_stats.rttMs > 0) { |
| 414 | stats.rtt_ms = call_stats.rttMs; |
| 415 | } |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 416 | if (config_.send_codec_spec) { |
| 417 | const auto& spec = *config_.send_codec_spec; |
| 418 | stats.codec_name = spec.format.name; |
Oskar Sundbom | 2707fb2 | 2017-11-16 10:57:35 +0100 | [diff] [blame] | 419 | stats.codec_payload_type = spec.payload_type; |
solenberg | 85a0496 | 2015-10-27 03:35:21 -0700 | [diff] [blame] | 420 | |
| 421 | // Get data from the last remote RTCP report. |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 422 | for (const auto& block : channel_send_->GetRemoteRTCPReportBlocks()) { |
solenberg | 8b85de2 | 2015-11-16 09:48:04 -0800 | [diff] [blame] | 423 | // Lookup report for send ssrc only. |
| 424 | if (block.source_SSRC == stats.local_ssrc) { |
| 425 | stats.packets_lost = block.cumulative_num_packets_lost; |
| 426 | stats.fraction_lost = Q8ToFloat(block.fraction_lost); |
| 427 | stats.ext_seqnum = block.extended_highest_sequence_number; |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 428 | // Convert timestamps to milliseconds. |
| 429 | if (spec.format.clockrate_hz / 1000 > 0) { |
solenberg | 8b85de2 | 2015-11-16 09:48:04 -0800 | [diff] [blame] | 430 | stats.jitter_ms = |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 431 | block.interarrival_jitter / (spec.format.clockrate_hz / 1000); |
solenberg | 85a0496 | 2015-10-27 03:35:21 -0700 | [diff] [blame] | 432 | } |
solenberg | 8b85de2 | 2015-11-16 09:48:04 -0800 | [diff] [blame] | 433 | break; |
solenberg | 85a0496 | 2015-10-27 03:35:21 -0700 | [diff] [blame] | 434 | } |
| 435 | } |
| 436 | } |
| 437 | |
Fredrik Solenberg | 2a87797 | 2017-12-15 16:42:15 +0100 | [diff] [blame] | 438 | AudioState::Stats input_stats = audio_state()->GetAudioInputStats(); |
| 439 | stats.audio_level = input_stats.audio_level; |
| 440 | stats.total_input_energy = input_stats.total_energy; |
| 441 | stats.total_input_duration = input_stats.total_duration; |
solenberg | 796b8f9 | 2017-03-01 17:02:23 -0800 | [diff] [blame] | 442 | |
Fredrik Solenberg | 2a87797 | 2017-12-15 16:42:15 +0100 | [diff] [blame] | 443 | stats.typing_noise_detected = audio_state()->typing_noise_detected(); |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 444 | stats.ana_statistics = channel_send_->GetANAStatistics(); |
Ivo Creusen | 56d4609 | 2017-11-24 17:29:59 +0100 | [diff] [blame] | 445 | RTC_DCHECK(audio_state_->audio_processing()); |
| 446 | stats.apm_statistics = |
| 447 | audio_state_->audio_processing()->GetStatistics(has_remote_tracks); |
solenberg | 85a0496 | 2015-10-27 03:35:21 -0700 | [diff] [blame] | 448 | |
| 449 | return stats; |
| 450 | } |
| 451 | |
pbos | 1ba8d39 | 2016-05-01 20:18:34 -0700 | [diff] [blame] | 452 | void AudioSendStream::SignalNetworkState(NetworkState state) { |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 453 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
pbos | 1ba8d39 | 2016-05-01 20:18:34 -0700 | [diff] [blame] | 454 | } |
| 455 | |
| 456 | bool AudioSendStream::DeliverRtcp(const uint8_t* packet, size_t length) { |
| 457 | // TODO(solenberg): Tests call this function on a network thread, libjingle |
| 458 | // calls on the worker thread. We should move towards always using a network |
| 459 | // thread. Then this check can be enabled. |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 460 | // RTC_DCHECK(!worker_thread_checker_.CalledOnValidThread()); |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 461 | return channel_send_->ReceivedRTCPPacket(packet, length); |
pbos | 1ba8d39 | 2016-05-01 20:18:34 -0700 | [diff] [blame] | 462 | } |
| 463 | |
Sebastian Jansson | c0e4d45 | 2018-10-25 15:08:32 +0200 | [diff] [blame] | 464 | uint32_t AudioSendStream::OnBitrateUpdated(BitrateAllocationUpdate update) { |
stefan | fca900a | 2017-04-10 03:53:00 -0700 | [diff] [blame] | 465 | // A send stream may be allocated a bitrate of zero if the allocator decides |
| 466 | // to disable it. For now we ignore this decision and keep sending on min |
| 467 | // bitrate. |
Sebastian Jansson | 13e5903 | 2018-11-21 19:13:07 +0100 | [diff] [blame^] | 468 | if (update.target_bitrate.IsZero()) { |
| 469 | update.target_bitrate = DataRate::bps(config_.min_bitrate_bps); |
stefan | fca900a | 2017-04-10 03:53:00 -0700 | [diff] [blame] | 470 | } |
Sebastian Jansson | 13e5903 | 2018-11-21 19:13:07 +0100 | [diff] [blame^] | 471 | RTC_DCHECK_GE(update.target_bitrate.bps<int>(), config_.min_bitrate_bps); |
mflodman | 86cc6ff | 2016-07-26 04:44:06 -0700 | [diff] [blame] | 472 | // The bitrate allocator might allocate an higher than max configured bitrate |
| 473 | // if there is room, to allow for, as example, extra FEC. Ignore that for now. |
Sebastian Jansson | 13e5903 | 2018-11-21 19:13:07 +0100 | [diff] [blame^] | 474 | const DataRate max_bitrate = DataRate::bps(config_.max_bitrate_bps); |
| 475 | if (update.target_bitrate > max_bitrate) |
| 476 | update.target_bitrate = max_bitrate; |
mflodman | 86cc6ff | 2016-07-26 04:44:06 -0700 | [diff] [blame] | 477 | |
Sebastian Jansson | 13e5903 | 2018-11-21 19:13:07 +0100 | [diff] [blame^] | 478 | channel_send_->SetBitrate(update.target_bitrate.bps(), |
| 479 | update.bwe_period.ms()); |
mflodman | 86cc6ff | 2016-07-26 04:44:06 -0700 | [diff] [blame] | 480 | |
| 481 | // The amount of audio protection is not exposed by the encoder, hence |
| 482 | // always returning 0. |
| 483 | return 0; |
| 484 | } |
| 485 | |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 486 | void AudioSendStream::OnPacketAdded(uint32_t ssrc, uint16_t seq_num) { |
| 487 | RTC_DCHECK(pacer_thread_checker_.CalledOnValidThread()); |
| 488 | // Only packets that belong to this stream are of interest. |
| 489 | if (ssrc == config_.rtp.ssrc) { |
| 490 | rtc::CritScope lock(&packet_loss_tracker_cs_); |
eladalon | edd6eea | 2017-05-25 00:15:35 -0700 | [diff] [blame] | 491 | // TODO(eladalon): This function call could potentially reset the window, |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 492 | // setting both PLR and RPLR to unknown. Consider (during upcoming |
| 493 | // refactoring) passing an indication of such an event. |
| 494 | packet_loss_tracker_.OnPacketAdded(seq_num, rtc::TimeMillis()); |
| 495 | } |
| 496 | } |
| 497 | |
| 498 | void AudioSendStream::OnPacketFeedbackVector( |
| 499 | const std::vector<PacketFeedback>& packet_feedback_vector) { |
eladalon | 3651fdd | 2017-08-24 07:26:25 -0700 | [diff] [blame] | 500 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
Danil Chapovalov | b9b146c | 2018-06-15 12:28:07 +0200 | [diff] [blame] | 501 | absl::optional<float> plr; |
| 502 | absl::optional<float> rplr; |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 503 | { |
| 504 | rtc::CritScope lock(&packet_loss_tracker_cs_); |
| 505 | packet_loss_tracker_.OnPacketFeedbackVector(packet_feedback_vector); |
| 506 | plr = packet_loss_tracker_.GetPacketLossRate(); |
elad.alon | dadb4dc | 2017-03-23 15:29:50 -0700 | [diff] [blame] | 507 | rplr = packet_loss_tracker_.GetRecoverablePacketLossRate(); |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 508 | } |
eladalon | edd6eea | 2017-05-25 00:15:35 -0700 | [diff] [blame] | 509 | // TODO(eladalon): If R/PLR go back to unknown, no indication is given that |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 510 | // the previously sent value is no longer relevant. This will be taken care |
| 511 | // of with some refactoring which is now being done. |
| 512 | if (plr) { |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 513 | channel_send_->OnTwccBasedUplinkPacketLossRate(*plr); |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 514 | } |
elad.alon | dadb4dc | 2017-03-23 15:29:50 -0700 | [diff] [blame] | 515 | if (rplr) { |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 516 | channel_send_->OnRecoverableUplinkPacketLossRate(*rplr); |
elad.alon | dadb4dc | 2017-03-23 15:29:50 -0700 | [diff] [blame] | 517 | } |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 518 | } |
| 519 | |
michaelt | 79e0588 | 2016-11-08 02:50:09 -0800 | [diff] [blame] | 520 | void AudioSendStream::SetTransportOverhead(int transport_overhead_per_packet) { |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 521 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 522 | channel_send_->SetTransportOverhead(transport_overhead_per_packet); |
michaelt | 79e0588 | 2016-11-08 02:50:09 -0800 | [diff] [blame] | 523 | } |
| 524 | |
ossu | c3d4b48 | 2017-05-23 06:07:11 -0700 | [diff] [blame] | 525 | RtpState AudioSendStream::GetRtpState() const { |
| 526 | return rtp_rtcp_module_->GetRtpState(); |
| 527 | } |
| 528 | |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 529 | const voe::ChannelSendInterface* AudioSendStream::GetChannel() const { |
| 530 | return channel_send_.get(); |
Fredrik Solenberg | 8f5787a | 2018-01-11 13:52:30 +0100 | [diff] [blame] | 531 | } |
| 532 | |
Fredrik Solenberg | 2a87797 | 2017-12-15 16:42:15 +0100 | [diff] [blame] | 533 | internal::AudioState* AudioSendStream::audio_state() { |
| 534 | internal::AudioState* audio_state = |
| 535 | static_cast<internal::AudioState*>(audio_state_.get()); |
| 536 | RTC_DCHECK(audio_state); |
| 537 | return audio_state; |
| 538 | } |
| 539 | |
| 540 | const internal::AudioState* AudioSendStream::audio_state() const { |
| 541 | internal::AudioState* audio_state = |
| 542 | static_cast<internal::AudioState*>(audio_state_.get()); |
| 543 | RTC_DCHECK(audio_state); |
| 544 | return audio_state; |
| 545 | } |
| 546 | |
Fredrik Solenberg | 2a87797 | 2017-12-15 16:42:15 +0100 | [diff] [blame] | 547 | void AudioSendStream::StoreEncoderProperties(int sample_rate_hz, |
| 548 | size_t num_channels) { |
| 549 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
| 550 | encoder_sample_rate_hz_ = sample_rate_hz; |
| 551 | encoder_num_channels_ = num_channels; |
| 552 | if (sending_) { |
| 553 | // Update AudioState's information about the stream. |
| 554 | audio_state()->AddSendingStream(this, sample_rate_hz, num_channels); |
| 555 | } |
| 556 | } |
| 557 | |
minyue | 7a97344 | 2016-10-20 03:27:12 -0700 | [diff] [blame] | 558 | // Apply current codec settings to a single voe::Channel used for sending. |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 559 | bool AudioSendStream::SetupSendCodec(AudioSendStream* stream, |
| 560 | const Config& new_config) { |
| 561 | RTC_DCHECK(new_config.send_codec_spec); |
| 562 | const auto& spec = *new_config.send_codec_spec; |
minyue | 48368ad | 2017-05-10 04:06:11 -0700 | [diff] [blame] | 563 | |
| 564 | RTC_DCHECK(new_config.encoder_factory); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 565 | std::unique_ptr<AudioEncoder> encoder = |
Karl Wiberg | 77490b9 | 2018-03-21 15:18:42 +0100 | [diff] [blame] | 566 | new_config.encoder_factory->MakeAudioEncoder( |
| 567 | spec.payload_type, spec.format, new_config.codec_pair_id); |
minyue | 7a97344 | 2016-10-20 03:27:12 -0700 | [diff] [blame] | 568 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 569 | if (!encoder) { |
Jonas Olsson | abbe841 | 2018-04-03 13:40:05 +0200 | [diff] [blame] | 570 | RTC_DLOG(LS_ERROR) << "Unable to create encoder for " |
| 571 | << rtc::ToString(spec.format); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 572 | return false; |
| 573 | } |
Alex Narest | bbbe4e1 | 2018-07-13 10:32:58 +0200 | [diff] [blame] | 574 | |
| 575 | // If other side does not support audio TWCC and WebRTC-Audio-ABWENoTWCC is |
| 576 | // not enabled, do not update target audio bitrate if we are in |
| 577 | // WebRTC-Audio-SendSideBwe-For-Video experiment |
| 578 | const bool do_not_update_target_bitrate = |
| 579 | !webrtc::field_trial::IsEnabled("WebRTC-Audio-ABWENoTWCC") && |
| 580 | webrtc::field_trial::IsEnabled("WebRTC-Audio-SendSideBwe-For-Video") && |
| 581 | !FindExtensionIds(new_config.rtp.extensions).transport_sequence_number; |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 582 | // If a bitrate has been specified for the codec, use it over the |
| 583 | // codec's default. |
Alex Narest | bbbe4e1 | 2018-07-13 10:32:58 +0200 | [diff] [blame] | 584 | if (!do_not_update_target_bitrate && spec.target_bitrate_bps) { |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 585 | encoder->OnReceivedTargetAudioBitrate(*spec.target_bitrate_bps); |
minyue | 7a97344 | 2016-10-20 03:27:12 -0700 | [diff] [blame] | 586 | } |
| 587 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 588 | // Enable ANA if configured (currently only used by Opus). |
| 589 | if (new_config.audio_network_adaptor_config) { |
| 590 | if (encoder->EnableAudioNetworkAdaptor( |
| 591 | *new_config.audio_network_adaptor_config, stream->event_log_)) { |
Jonas Olsson | 24ea822 | 2018-01-25 10:14:29 +0100 | [diff] [blame] | 592 | RTC_DLOG(LS_INFO) << "Audio network adaptor enabled on SSRC " |
| 593 | << new_config.rtp.ssrc; |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 594 | } else { |
| 595 | RTC_NOTREACHED(); |
minyue | 6b825df | 2016-10-31 04:08:32 -0700 | [diff] [blame] | 596 | } |
minyue | 7a97344 | 2016-10-20 03:27:12 -0700 | [diff] [blame] | 597 | } |
| 598 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 599 | // Wrap the encoder in a an AudioEncoderCNG, if VAD is enabled. |
| 600 | if (spec.cng_payload_type) { |
Karl Wiberg | 2365936 | 2018-11-01 11:13:44 +0100 | [diff] [blame] | 601 | AudioEncoderCngConfig cng_config; |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 602 | cng_config.num_channels = encoder->NumChannels(); |
| 603 | cng_config.payload_type = *spec.cng_payload_type; |
| 604 | cng_config.speech_encoder = std::move(encoder); |
| 605 | cng_config.vad_mode = Vad::kVadNormal; |
Karl Wiberg | 2365936 | 2018-11-01 11:13:44 +0100 | [diff] [blame] | 606 | encoder = CreateComfortNoiseEncoder(std::move(cng_config)); |
ossu | 3b9ff38 | 2017-04-27 08:03:42 -0700 | [diff] [blame] | 607 | |
| 608 | stream->RegisterCngPayloadType( |
| 609 | *spec.cng_payload_type, |
| 610 | new_config.send_codec_spec->format.clockrate_hz); |
minyue | 7a97344 | 2016-10-20 03:27:12 -0700 | [diff] [blame] | 611 | } |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 612 | |
Fredrik Solenberg | 2a87797 | 2017-12-15 16:42:15 +0100 | [diff] [blame] | 613 | stream->StoreEncoderProperties(encoder->SampleRateHz(), |
| 614 | encoder->NumChannels()); |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 615 | stream->channel_send_->SetEncoder(new_config.send_codec_spec->payload_type, |
| 616 | std::move(encoder)); |
minyue | 7a97344 | 2016-10-20 03:27:12 -0700 | [diff] [blame] | 617 | return true; |
| 618 | } |
| 619 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 620 | bool AudioSendStream::ReconfigureSendCodec(AudioSendStream* stream, |
| 621 | const Config& new_config) { |
| 622 | const auto& old_config = stream->config_; |
minyue-webrtc | 8de1826 | 2017-07-26 14:18:40 +0200 | [diff] [blame] | 623 | |
| 624 | if (!new_config.send_codec_spec) { |
| 625 | // We cannot de-configure a send codec. So we will do nothing. |
| 626 | // By design, the send codec should have not been configured. |
| 627 | RTC_DCHECK(!old_config.send_codec_spec); |
| 628 | return true; |
| 629 | } |
| 630 | |
| 631 | if (new_config.send_codec_spec == old_config.send_codec_spec && |
| 632 | new_config.audio_network_adaptor_config == |
| 633 | old_config.audio_network_adaptor_config) { |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 634 | return true; |
| 635 | } |
| 636 | |
| 637 | // If we have no encoder, or the format or payload type's changed, create a |
| 638 | // new encoder. |
| 639 | if (!old_config.send_codec_spec || |
| 640 | new_config.send_codec_spec->format != |
| 641 | old_config.send_codec_spec->format || |
| 642 | new_config.send_codec_spec->payload_type != |
| 643 | old_config.send_codec_spec->payload_type) { |
| 644 | return SetupSendCodec(stream, new_config); |
| 645 | } |
| 646 | |
Alex Narest | bbbe4e1 | 2018-07-13 10:32:58 +0200 | [diff] [blame] | 647 | // If other side does not support audio TWCC and WebRTC-Audio-ABWENoTWCC is |
| 648 | // not enabled, do not update target audio bitrate if we are in |
| 649 | // WebRTC-Audio-SendSideBwe-For-Video experiment |
| 650 | const bool do_not_update_target_bitrate = |
| 651 | !webrtc::field_trial::IsEnabled("WebRTC-Audio-ABWENoTWCC") && |
| 652 | webrtc::field_trial::IsEnabled("WebRTC-Audio-SendSideBwe-For-Video") && |
| 653 | !FindExtensionIds(new_config.rtp.extensions).transport_sequence_number; |
| 654 | |
Danil Chapovalov | b9b146c | 2018-06-15 12:28:07 +0200 | [diff] [blame] | 655 | const absl::optional<int>& new_target_bitrate_bps = |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 656 | new_config.send_codec_spec->target_bitrate_bps; |
| 657 | // If a bitrate has been specified for the codec, use it over the |
| 658 | // codec's default. |
Alex Narest | bbbe4e1 | 2018-07-13 10:32:58 +0200 | [diff] [blame] | 659 | if (!do_not_update_target_bitrate && new_target_bitrate_bps && |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 660 | new_target_bitrate_bps != |
| 661 | old_config.send_codec_spec->target_bitrate_bps) { |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 662 | CallEncoder(stream->channel_send_, [&](AudioEncoder* encoder) { |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 663 | encoder->OnReceivedTargetAudioBitrate(*new_target_bitrate_bps); |
| 664 | }); |
| 665 | } |
| 666 | |
| 667 | ReconfigureANA(stream, new_config); |
| 668 | ReconfigureCNG(stream, new_config); |
| 669 | |
| 670 | return true; |
| 671 | } |
| 672 | |
| 673 | void AudioSendStream::ReconfigureANA(AudioSendStream* stream, |
| 674 | const Config& new_config) { |
| 675 | if (new_config.audio_network_adaptor_config == |
| 676 | stream->config_.audio_network_adaptor_config) { |
| 677 | return; |
| 678 | } |
| 679 | if (new_config.audio_network_adaptor_config) { |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 680 | CallEncoder(stream->channel_send_, [&](AudioEncoder* encoder) { |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 681 | if (encoder->EnableAudioNetworkAdaptor( |
| 682 | *new_config.audio_network_adaptor_config, stream->event_log_)) { |
Jonas Olsson | 24ea822 | 2018-01-25 10:14:29 +0100 | [diff] [blame] | 683 | RTC_DLOG(LS_INFO) << "Audio network adaptor enabled on SSRC " |
| 684 | << new_config.rtp.ssrc; |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 685 | } else { |
| 686 | RTC_NOTREACHED(); |
| 687 | } |
| 688 | }); |
| 689 | } else { |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 690 | CallEncoder(stream->channel_send_, [&](AudioEncoder* encoder) { |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 691 | encoder->DisableAudioNetworkAdaptor(); |
| 692 | }); |
Jonas Olsson | 24ea822 | 2018-01-25 10:14:29 +0100 | [diff] [blame] | 693 | RTC_DLOG(LS_INFO) << "Audio network adaptor disabled on SSRC " |
| 694 | << new_config.rtp.ssrc; |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 695 | } |
| 696 | } |
| 697 | |
| 698 | void AudioSendStream::ReconfigureCNG(AudioSendStream* stream, |
| 699 | const Config& new_config) { |
| 700 | if (new_config.send_codec_spec->cng_payload_type == |
| 701 | stream->config_.send_codec_spec->cng_payload_type) { |
| 702 | return; |
| 703 | } |
| 704 | |
ossu | 3b9ff38 | 2017-04-27 08:03:42 -0700 | [diff] [blame] | 705 | // Register the CNG payload type if it's been added, don't do anything if CNG |
| 706 | // is removed. Payload types must not be redefined. |
| 707 | if (new_config.send_codec_spec->cng_payload_type) { |
| 708 | stream->RegisterCngPayloadType( |
| 709 | *new_config.send_codec_spec->cng_payload_type, |
| 710 | new_config.send_codec_spec->format.clockrate_hz); |
| 711 | } |
| 712 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 713 | // Wrap or unwrap the encoder in an AudioEncoderCNG. |
Niels Möller | dced9f6 | 2018-11-19 10:27:07 +0100 | [diff] [blame] | 714 | stream->channel_send_->ModifyEncoder( |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 715 | [&](std::unique_ptr<AudioEncoder>* encoder_ptr) { |
| 716 | std::unique_ptr<AudioEncoder> old_encoder(std::move(*encoder_ptr)); |
| 717 | auto sub_encoders = old_encoder->ReclaimContainedEncoders(); |
| 718 | if (!sub_encoders.empty()) { |
| 719 | // Replace enc with its sub encoder. We need to put the sub |
| 720 | // encoder in a temporary first, since otherwise the old value |
| 721 | // of enc would be destroyed before the new value got assigned, |
| 722 | // which would be bad since the new value is a part of the old |
| 723 | // value. |
| 724 | auto tmp = std::move(sub_encoders[0]); |
| 725 | old_encoder = std::move(tmp); |
| 726 | } |
| 727 | if (new_config.send_codec_spec->cng_payload_type) { |
Karl Wiberg | 2365936 | 2018-11-01 11:13:44 +0100 | [diff] [blame] | 728 | AudioEncoderCngConfig config; |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 729 | config.speech_encoder = std::move(old_encoder); |
| 730 | config.num_channels = config.speech_encoder->NumChannels(); |
| 731 | config.payload_type = *new_config.send_codec_spec->cng_payload_type; |
| 732 | config.vad_mode = Vad::kVadNormal; |
Karl Wiberg | 2365936 | 2018-11-01 11:13:44 +0100 | [diff] [blame] | 733 | *encoder_ptr = CreateComfortNoiseEncoder(std::move(config)); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 734 | } else { |
| 735 | *encoder_ptr = std::move(old_encoder); |
| 736 | } |
| 737 | }); |
| 738 | } |
| 739 | |
| 740 | void AudioSendStream::ReconfigureBitrateObserver( |
| 741 | AudioSendStream* stream, |
| 742 | const webrtc::AudioSendStream::Config& new_config) { |
| 743 | // Since the Config's default is for both of these to be -1, this test will |
| 744 | // allow us to configure the bitrate observer if the new config has bitrate |
| 745 | // limits set, but would only have us call RemoveBitrateObserver if we were |
| 746 | // previously configured with bitrate limits. |
Alex Narest | cedd351 | 2017-12-07 20:54:55 +0100 | [diff] [blame] | 747 | int new_transport_seq_num_id = |
| 748 | FindExtensionIds(new_config.rtp.extensions).transport_sequence_number; |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 749 | if (stream->config_.min_bitrate_bps == new_config.min_bitrate_bps && |
Alex Narest | cedd351 | 2017-12-07 20:54:55 +0100 | [diff] [blame] | 750 | stream->config_.max_bitrate_bps == new_config.max_bitrate_bps && |
Seth Hampson | 24722b3 | 2017-12-22 09:36:42 -0800 | [diff] [blame] | 751 | stream->config_.bitrate_priority == new_config.bitrate_priority && |
Alex Narest | cedd351 | 2017-12-07 20:54:55 +0100 | [diff] [blame] | 752 | (FindExtensionIds(stream->config_.rtp.extensions) |
| 753 | .transport_sequence_number == new_transport_seq_num_id || |
| 754 | !webrtc::field_trial::IsEnabled("WebRTC-Audio-SendSideBwe"))) { |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 755 | return; |
| 756 | } |
| 757 | |
Sebastian Jansson | 763e947 | 2018-03-21 12:46:56 +0100 | [diff] [blame] | 758 | bool has_transport_sequence_number = new_transport_seq_num_id != 0; |
Alex Narest | cedd351 | 2017-12-07 20:54:55 +0100 | [diff] [blame] | 759 | if (new_config.min_bitrate_bps != -1 && new_config.max_bitrate_bps != -1 && |
Tim Haloun | 648d28a | 2018-10-18 16:52:22 -0700 | [diff] [blame] | 760 | !new_config.has_dscp && |
Sebastian Jansson | 763e947 | 2018-03-21 12:46:56 +0100 | [diff] [blame] | 761 | (has_transport_sequence_number || |
Alex Narest | cedd351 | 2017-12-07 20:54:55 +0100 | [diff] [blame] | 762 | !webrtc::field_trial::IsEnabled("WebRTC-Audio-SendSideBwe"))) { |
Niels Möller | 7d76a31 | 2018-10-26 12:57:07 +0200 | [diff] [blame] | 763 | stream->rtp_transport_->packet_sender()->SetAccountForAudioPackets(true); |
Sebastian Jansson | 763e947 | 2018-03-21 12:46:56 +0100 | [diff] [blame] | 764 | stream->ConfigureBitrateObserver( |
| 765 | new_config.min_bitrate_bps, new_config.max_bitrate_bps, |
| 766 | new_config.bitrate_priority, has_transport_sequence_number); |
Sebastian Jansson | b686396 | 2018-10-10 10:23:13 +0200 | [diff] [blame] | 767 | stream->rtp_rtcp_module_->SetAsPartOfAllocation(true); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 768 | } else { |
Niels Möller | 7d76a31 | 2018-10-26 12:57:07 +0200 | [diff] [blame] | 769 | stream->rtp_transport_->packet_sender()->SetAccountForAudioPackets(false); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 770 | stream->RemoveBitrateObserver(); |
Sebastian Jansson | b686396 | 2018-10-10 10:23:13 +0200 | [diff] [blame] | 771 | stream->rtp_rtcp_module_->SetAsPartOfAllocation(false); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 772 | } |
| 773 | } |
| 774 | |
| 775 | void AudioSendStream::ConfigureBitrateObserver(int min_bitrate_bps, |
Seth Hampson | 24722b3 | 2017-12-22 09:36:42 -0800 | [diff] [blame] | 776 | int max_bitrate_bps, |
Sebastian Jansson | 763e947 | 2018-03-21 12:46:56 +0100 | [diff] [blame] | 777 | double bitrate_priority, |
| 778 | bool has_packet_feedback) { |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 779 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
| 780 | RTC_DCHECK_GE(max_bitrate_bps, min_bitrate_bps); |
Niels Möller | c572ff3 | 2018-11-07 08:43:50 +0100 | [diff] [blame] | 781 | rtc::Event thread_sync_event; |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 782 | worker_queue_->PostTask([&] { |
| 783 | // We may get a callback immediately as the observer is registered, so make |
| 784 | // sure the bitrate limits in config_ are up-to-date. |
| 785 | config_.min_bitrate_bps = min_bitrate_bps; |
| 786 | config_.max_bitrate_bps = max_bitrate_bps; |
Seth Hampson | 24722b3 | 2017-12-22 09:36:42 -0800 | [diff] [blame] | 787 | config_.bitrate_priority = bitrate_priority; |
| 788 | // This either updates the current observer or adds a new observer. |
Sebastian Jansson | 24ad720 | 2018-04-19 08:25:12 +0200 | [diff] [blame] | 789 | bitrate_allocator_->AddObserver( |
| 790 | this, MediaStreamAllocationConfig{ |
| 791 | static_cast<uint32_t>(min_bitrate_bps), |
| 792 | static_cast<uint32_t>(max_bitrate_bps), 0, true, |
| 793 | config_.track_id, bitrate_priority, has_packet_feedback}); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 794 | thread_sync_event.Set(); |
| 795 | }); |
| 796 | thread_sync_event.Wait(rtc::Event::kForever); |
| 797 | } |
| 798 | |
| 799 | void AudioSendStream::RemoveBitrateObserver() { |
| 800 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
Niels Möller | c572ff3 | 2018-11-07 08:43:50 +0100 | [diff] [blame] | 801 | rtc::Event thread_sync_event; |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 802 | worker_queue_->PostTask([this, &thread_sync_event] { |
| 803 | bitrate_allocator_->RemoveObserver(this); |
| 804 | thread_sync_event.Set(); |
| 805 | }); |
| 806 | thread_sync_event.Wait(rtc::Event::kForever); |
| 807 | } |
| 808 | |
ossu | 3b9ff38 | 2017-04-27 08:03:42 -0700 | [diff] [blame] | 809 | void AudioSendStream::RegisterCngPayloadType(int payload_type, |
| 810 | int clockrate_hz) { |
ossu | 3b9ff38 | 2017-04-27 08:03:42 -0700 | [diff] [blame] | 811 | const CodecInst codec = {payload_type, "CN", clockrate_hz, 0, 1, 0}; |
ossu | c3d4b48 | 2017-05-23 06:07:11 -0700 | [diff] [blame] | 812 | if (rtp_rtcp_module_->RegisterSendPayload(codec) != 0) { |
| 813 | rtp_rtcp_module_->DeRegisterSendPayload(codec.pltype); |
| 814 | if (rtp_rtcp_module_->RegisterSendPayload(codec) != 0) { |
Jonas Olsson | 24ea822 | 2018-01-25 10:14:29 +0100 | [diff] [blame] | 815 | RTC_DLOG(LS_ERROR) << "RegisterCngPayloadType() failed to register CN to " |
| 816 | "RTP/RTCP module"; |
ossu | 3b9ff38 | 2017-04-27 08:03:42 -0700 | [diff] [blame] | 817 | } |
| 818 | } |
| 819 | } |
solenberg | c7a8b08 | 2015-10-16 14:35:07 -0700 | [diff] [blame] | 820 | } // namespace internal |
| 821 | } // namespace webrtc |