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 | |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 17 | #include "audio/audio_state.h" |
| 18 | #include "audio/conversion.h" |
| 19 | #include "audio/scoped_voe_interface.h" |
| 20 | #include "call/rtp_transport_controller_send_interface.h" |
| 21 | #include "modules/audio_coding/codecs/cng/audio_encoder_cng.h" |
| 22 | #include "modules/bitrate_controller/include/bitrate_controller.h" |
| 23 | #include "modules/congestion_controller/include/send_side_congestion_controller.h" |
| 24 | #include "modules/pacing/paced_sender.h" |
| 25 | #include "rtc_base/checks.h" |
| 26 | #include "rtc_base/event.h" |
| 27 | #include "rtc_base/function_view.h" |
| 28 | #include "rtc_base/logging.h" |
| 29 | #include "rtc_base/task_queue.h" |
| 30 | #include "rtc_base/timeutils.h" |
| 31 | #include "voice_engine/channel_proxy.h" |
| 32 | #include "voice_engine/include/voe_base.h" |
| 33 | #include "voice_engine/transmit_mixer.h" |
| 34 | #include "voice_engine/voice_engine_impl.h" |
solenberg | c7a8b08 | 2015-10-16 14:35:07 -0700 | [diff] [blame] | 35 | |
| 36 | namespace webrtc { |
minyue | 7a97344 | 2016-10-20 03:27:12 -0700 | [diff] [blame] | 37 | |
solenberg | c7a8b08 | 2015-10-16 14:35:07 -0700 | [diff] [blame] | 38 | namespace internal { |
eladalon | edd6eea | 2017-05-25 00:15:35 -0700 | [diff] [blame] | 39 | // TODO(eladalon): Subsequent CL will make these values experiment-dependent. |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 40 | constexpr size_t kPacketLossTrackerMaxWindowSizeMs = 15000; |
| 41 | constexpr size_t kPacketLossRateMinNumAckedPackets = 50; |
| 42 | constexpr size_t kRecoverablePacketLossRateMinNumAckedPairs = 40; |
| 43 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 44 | namespace { |
| 45 | void CallEncoder(const std::unique_ptr<voe::ChannelProxy>& channel_proxy, |
| 46 | rtc::FunctionView<void(AudioEncoder*)> lambda) { |
| 47 | channel_proxy->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder_ptr) { |
| 48 | RTC_DCHECK(encoder_ptr); |
| 49 | lambda(encoder_ptr->get()); |
| 50 | }); |
| 51 | } |
| 52 | } // namespace |
| 53 | |
saza | c58f8c0 | 2017-07-19 00:39:19 -0700 | [diff] [blame] | 54 | // TODO(saza): Move this declaration further down when we can use |
| 55 | // std::make_unique. |
| 56 | class AudioSendStream::TimedTransport : public Transport { |
| 57 | public: |
| 58 | TimedTransport(Transport* transport, TimeInterval* time_interval) |
| 59 | : transport_(transport), lifetime_(time_interval) {} |
| 60 | bool SendRtp(const uint8_t* packet, |
| 61 | size_t length, |
| 62 | const PacketOptions& options) { |
| 63 | if (lifetime_) { |
| 64 | lifetime_->Extend(); |
| 65 | } |
| 66 | return transport_->SendRtp(packet, length, options); |
| 67 | } |
| 68 | bool SendRtcp(const uint8_t* packet, size_t length) { |
| 69 | return transport_->SendRtcp(packet, length); |
| 70 | } |
| 71 | ~TimedTransport() {} |
| 72 | |
| 73 | private: |
| 74 | Transport* transport_; |
| 75 | TimeInterval* lifetime_; |
| 76 | }; |
| 77 | |
solenberg | 566ef24 | 2015-11-06 15:34:49 -0800 | [diff] [blame] | 78 | AudioSendStream::AudioSendStream( |
| 79 | const webrtc::AudioSendStream::Config& config, |
Stefan Holmer | b86d4e4 | 2015-12-07 10:26:18 +0100 | [diff] [blame] | 80 | const rtc::scoped_refptr<webrtc::AudioState>& audio_state, |
perkj | 26091b1 | 2016-09-01 01:17:40 -0700 | [diff] [blame] | 81 | rtc::TaskQueue* worker_queue, |
nisse | b8f9a32 | 2017-03-27 05:36:15 -0700 | [diff] [blame] | 82 | RtpTransportControllerSendInterface* transport, |
terelius | e035e2d | 2016-09-21 06:51:47 -0700 | [diff] [blame] | 83 | BitrateAllocator* bitrate_allocator, |
michaelt | 9332b7d | 2016-11-30 07:51:13 -0800 | [diff] [blame] | 84 | RtcEventLog* event_log, |
ossu | c3d4b48 | 2017-05-23 06:07:11 -0700 | [diff] [blame] | 85 | RtcpRttStats* rtcp_rtt_stats, |
| 86 | const rtc::Optional<RtpState>& suspended_rtp_state) |
perkj | 26091b1 | 2016-09-01 01:17:40 -0700 | [diff] [blame] | 87 | : worker_queue_(worker_queue), |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 88 | config_(Config(nullptr)), |
mflodman | 86cc6ff | 2016-07-26 04:44:06 -0700 | [diff] [blame] | 89 | audio_state_(audio_state), |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 90 | event_log_(event_log), |
michaelt | f4caaab | 2017-01-16 23:55:07 -0800 | [diff] [blame] | 91 | bitrate_allocator_(bitrate_allocator), |
nisse | b8f9a32 | 2017-03-27 05:36:15 -0700 | [diff] [blame] | 92 | transport_(transport), |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 93 | packet_loss_tracker_(kPacketLossTrackerMaxWindowSizeMs, |
| 94 | kPacketLossRateMinNumAckedPackets, |
ossu | c3d4b48 | 2017-05-23 06:07:11 -0700 | [diff] [blame] | 95 | kRecoverablePacketLossRateMinNumAckedPairs), |
| 96 | rtp_rtcp_module_(nullptr), |
| 97 | suspended_rtp_state_(suspended_rtp_state) { |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 98 | LOG(LS_INFO) << "AudioSendStream: " << config.ToString(); |
| 99 | RTC_DCHECK_NE(config.voe_channel_id, -1); |
solenberg | 566ef24 | 2015-11-06 15:34:49 -0800 | [diff] [blame] | 100 | RTC_DCHECK(audio_state_.get()); |
nisse | b8f9a32 | 2017-03-27 05:36:15 -0700 | [diff] [blame] | 101 | RTC_DCHECK(transport); |
| 102 | RTC_DCHECK(transport->send_side_cc()); |
solenberg | 3a94154 | 2015-11-16 07:34:50 -0800 | [diff] [blame] | 103 | |
solenberg | 1372508 | 2015-11-25 08:16:52 -0800 | [diff] [blame] | 104 | VoiceEngineImpl* voe_impl = static_cast<VoiceEngineImpl*>(voice_engine()); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 105 | channel_proxy_ = voe_impl->GetChannelProxy(config.voe_channel_id); |
| 106 | channel_proxy_->SetRtcEventLog(event_log_); |
michaelt | 9332b7d | 2016-11-30 07:51:13 -0800 | [diff] [blame] | 107 | channel_proxy_->SetRtcpRttStats(rtcp_rtt_stats); |
solenberg | 1372508 | 2015-11-25 08:16:52 -0800 | [diff] [blame] | 108 | channel_proxy_->SetRTCPStatus(true); |
ossu | c3d4b48 | 2017-05-23 06:07:11 -0700 | [diff] [blame] | 109 | RtpReceiver* rtpReceiver = nullptr; // Unused, but required for call. |
| 110 | channel_proxy_->GetRtpRtcp(&rtp_rtcp_module_, &rtpReceiver); |
| 111 | RTC_DCHECK(rtp_rtcp_module_); |
mflodman | 3d7db26 | 2016-04-29 00:57:13 -0700 | [diff] [blame] | 112 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 113 | ConfigureStream(this, config, true); |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 114 | |
| 115 | pacer_thread_checker_.DetachFromThread(); |
Danil Chapovalov | 90e1f53 | 2017-10-03 14:59:27 +0200 | [diff] [blame] | 116 | // Signal congestion controller this object is ready for OnPacket* callbacks. |
| 117 | transport_->send_side_cc()->RegisterPacketFeedbackObserver(this); |
solenberg | c7a8b08 | 2015-10-16 14:35:07 -0700 | [diff] [blame] | 118 | } |
| 119 | |
| 120 | AudioSendStream::~AudioSendStream() { |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 121 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
solenberg | c7a8b08 | 2015-10-16 14:35:07 -0700 | [diff] [blame] | 122 | LOG(LS_INFO) << "~AudioSendStream: " << config_.ToString(); |
nisse | b8f9a32 | 2017-03-27 05:36:15 -0700 | [diff] [blame] | 123 | transport_->send_side_cc()->DeRegisterPacketFeedbackObserver(this); |
solenberg | 1c239d4 | 2017-09-29 06:00:28 -0700 | [diff] [blame] | 124 | channel_proxy_->RegisterTransport(nullptr); |
nisse | fdbfdc9 | 2017-03-31 05:44:52 -0700 | [diff] [blame] | 125 | channel_proxy_->ResetSenderCongestionControlObjects(); |
terelius | e035e2d | 2016-09-21 06:51:47 -0700 | [diff] [blame] | 126 | channel_proxy_->SetRtcEventLog(nullptr); |
michaelt | 9332b7d | 2016-11-30 07:51:13 -0800 | [diff] [blame] | 127 | channel_proxy_->SetRtcpRttStats(nullptr); |
solenberg | c7a8b08 | 2015-10-16 14:35:07 -0700 | [diff] [blame] | 128 | } |
| 129 | |
eladalon | abbc430 | 2017-07-26 02:09:44 -0700 | [diff] [blame] | 130 | const webrtc::AudioSendStream::Config& AudioSendStream::GetConfig() const { |
| 131 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
| 132 | return config_; |
| 133 | } |
| 134 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 135 | void AudioSendStream::Reconfigure( |
| 136 | const webrtc::AudioSendStream::Config& new_config) { |
| 137 | ConfigureStream(this, new_config, false); |
| 138 | } |
| 139 | |
| 140 | void AudioSendStream::ConfigureStream( |
| 141 | webrtc::internal::AudioSendStream* stream, |
| 142 | const webrtc::AudioSendStream::Config& new_config, |
| 143 | bool first_time) { |
| 144 | LOG(LS_INFO) << "AudioSendStream::Configuring: " << new_config.ToString(); |
| 145 | const auto& channel_proxy = stream->channel_proxy_; |
| 146 | const auto& old_config = stream->config_; |
| 147 | |
| 148 | if (first_time || old_config.rtp.ssrc != new_config.rtp.ssrc) { |
| 149 | channel_proxy->SetLocalSSRC(new_config.rtp.ssrc); |
ossu | c3d4b48 | 2017-05-23 06:07:11 -0700 | [diff] [blame] | 150 | if (stream->suspended_rtp_state_) { |
| 151 | stream->rtp_rtcp_module_->SetRtpState(*stream->suspended_rtp_state_); |
| 152 | } |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 153 | } |
| 154 | if (first_time || old_config.rtp.c_name != new_config.rtp.c_name) { |
| 155 | channel_proxy->SetRTCP_CNAME(new_config.rtp.c_name); |
| 156 | } |
| 157 | // TODO(solenberg): Config NACK history window (which is a packet count), |
| 158 | // using the actual packet size for the configured codec. |
| 159 | if (first_time || old_config.rtp.nack.rtp_history_ms != |
| 160 | new_config.rtp.nack.rtp_history_ms) { |
| 161 | channel_proxy->SetNACKStatus(new_config.rtp.nack.rtp_history_ms != 0, |
| 162 | new_config.rtp.nack.rtp_history_ms / 20); |
| 163 | } |
| 164 | |
| 165 | if (first_time || |
| 166 | new_config.send_transport != old_config.send_transport) { |
| 167 | if (old_config.send_transport) { |
solenberg | 1c239d4 | 2017-09-29 06:00:28 -0700 | [diff] [blame] | 168 | channel_proxy->RegisterTransport(nullptr); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 169 | } |
saza | c58f8c0 | 2017-07-19 00:39:19 -0700 | [diff] [blame] | 170 | if (new_config.send_transport) { |
| 171 | stream->timed_send_transport_adapter_.reset(new TimedTransport( |
| 172 | new_config.send_transport, &stream->active_lifetime_)); |
| 173 | } else { |
| 174 | stream->timed_send_transport_adapter_.reset(nullptr); |
| 175 | } |
solenberg | 1c239d4 | 2017-09-29 06:00:28 -0700 | [diff] [blame] | 176 | channel_proxy->RegisterTransport( |
saza | c58f8c0 | 2017-07-19 00:39:19 -0700 | [diff] [blame] | 177 | stream->timed_send_transport_adapter_.get()); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 178 | } |
| 179 | |
| 180 | // RFC 5285: Each distinct extension MUST have a unique ID. The value 0 is |
| 181 | // reserved for padding and MUST NOT be used as a local identifier. |
| 182 | // So it should be safe to use 0 here to indicate "not configured". |
| 183 | struct ExtensionIds { |
| 184 | int audio_level = 0; |
| 185 | int transport_sequence_number = 0; |
| 186 | }; |
| 187 | |
| 188 | auto find_extension_ids = [](const std::vector<RtpExtension>& extensions) { |
| 189 | ExtensionIds ids; |
| 190 | for (const auto& extension : extensions) { |
| 191 | if (extension.uri == RtpExtension::kAudioLevelUri) { |
| 192 | ids.audio_level = extension.id; |
| 193 | } else if (extension.uri == RtpExtension::kTransportSequenceNumberUri) { |
| 194 | ids.transport_sequence_number = extension.id; |
| 195 | } |
| 196 | } |
| 197 | return ids; |
| 198 | }; |
| 199 | |
| 200 | const ExtensionIds old_ids = find_extension_ids(old_config.rtp.extensions); |
| 201 | const ExtensionIds new_ids = find_extension_ids(new_config.rtp.extensions); |
| 202 | // Audio level indication |
| 203 | if (first_time || new_ids.audio_level != old_ids.audio_level) { |
| 204 | channel_proxy->SetSendAudioLevelIndicationStatus(new_ids.audio_level != 0, |
| 205 | new_ids.audio_level); |
| 206 | } |
| 207 | // Transport sequence number |
| 208 | if (first_time || |
| 209 | new_ids.transport_sequence_number != old_ids.transport_sequence_number) { |
ossu | 1129df2 | 2017-06-30 01:38:56 -0700 | [diff] [blame] | 210 | if (!first_time) { |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 211 | channel_proxy->ResetSenderCongestionControlObjects(); |
| 212 | stream->bandwidth_observer_.reset(); |
| 213 | } |
| 214 | |
| 215 | if (new_ids.transport_sequence_number != 0) { |
| 216 | channel_proxy->EnableSendTransportSequenceNumber( |
| 217 | new_ids.transport_sequence_number); |
| 218 | stream->transport_->send_side_cc()->EnablePeriodicAlrProbing(true); |
| 219 | stream->bandwidth_observer_.reset(stream->transport_->send_side_cc() |
| 220 | ->GetBitrateController() |
| 221 | ->CreateRtcpBandwidthObserver()); |
| 222 | } |
| 223 | |
| 224 | channel_proxy->RegisterSenderCongestionControlObjects( |
| 225 | stream->transport_, stream->bandwidth_observer_.get()); |
| 226 | } |
| 227 | |
| 228 | if (!ReconfigureSendCodec(stream, new_config)) { |
| 229 | LOG(LS_ERROR) << "Failed to set up send codec state."; |
| 230 | } |
| 231 | |
| 232 | ReconfigureBitrateObserver(stream, new_config); |
| 233 | stream->config_ = new_config; |
| 234 | } |
| 235 | |
solenberg | 3a94154 | 2015-11-16 07:34:50 -0800 | [diff] [blame] | 236 | void AudioSendStream::Start() { |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 237 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
minyue | 10cbb46 | 2016-11-07 09:29:22 -0800 | [diff] [blame] | 238 | if (config_.min_bitrate_bps != -1 && config_.max_bitrate_bps != -1) { |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 239 | ConfigureBitrateObserver(config_.min_bitrate_bps, config_.max_bitrate_bps); |
mflodman | 86cc6ff | 2016-07-26 04:44:06 -0700 | [diff] [blame] | 240 | } |
| 241 | |
Taylor Brandstetter | 1a018dc | 2016-03-08 12:37:39 -0800 | [diff] [blame] | 242 | ScopedVoEInterface<VoEBase> base(voice_engine()); |
| 243 | int error = base->StartSend(config_.voe_channel_id); |
| 244 | if (error != 0) { |
| 245 | LOG(LS_ERROR) << "AudioSendStream::Start failed with error: " << error; |
| 246 | } |
solenberg | 3a94154 | 2015-11-16 07:34:50 -0800 | [diff] [blame] | 247 | } |
| 248 | |
| 249 | void AudioSendStream::Stop() { |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 250 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 251 | RemoveBitrateObserver(); |
perkj | 26091b1 | 2016-09-01 01:17:40 -0700 | [diff] [blame] | 252 | |
Taylor Brandstetter | 1a018dc | 2016-03-08 12:37:39 -0800 | [diff] [blame] | 253 | ScopedVoEInterface<VoEBase> base(voice_engine()); |
| 254 | int error = base->StopSend(config_.voe_channel_id); |
| 255 | if (error != 0) { |
| 256 | LOG(LS_ERROR) << "AudioSendStream::Stop failed with error: " << error; |
| 257 | } |
solenberg | 3a94154 | 2015-11-16 07:34:50 -0800 | [diff] [blame] | 258 | } |
| 259 | |
solenberg | ffbbcac | 2016-11-17 05:25:37 -0800 | [diff] [blame] | 260 | bool AudioSendStream::SendTelephoneEvent(int payload_type, |
| 261 | int payload_frequency, int event, |
solenberg | 8842c3e | 2016-03-11 03:06:41 -0800 | [diff] [blame] | 262 | int duration_ms) { |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 263 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
solenberg | ffbbcac | 2016-11-17 05:25:37 -0800 | [diff] [blame] | 264 | return channel_proxy_->SetSendTelephoneEventPayloadType(payload_type, |
| 265 | payload_frequency) && |
Fredrik Solenberg | b572768 | 2015-12-04 15:22:19 +0100 | [diff] [blame] | 266 | channel_proxy_->SendTelephoneEventOutband(event, duration_ms); |
| 267 | } |
| 268 | |
solenberg | 9421853 | 2016-06-16 10:53:22 -0700 | [diff] [blame] | 269 | void AudioSendStream::SetMuted(bool muted) { |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 270 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
solenberg | 9421853 | 2016-06-16 10:53:22 -0700 | [diff] [blame] | 271 | channel_proxy_->SetInputMute(muted); |
| 272 | } |
| 273 | |
solenberg | c7a8b08 | 2015-10-16 14:35:07 -0700 | [diff] [blame] | 274 | webrtc::AudioSendStream::Stats AudioSendStream::GetStats() const { |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 275 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
solenberg | 85a0496 | 2015-10-27 03:35:21 -0700 | [diff] [blame] | 276 | webrtc::AudioSendStream::Stats stats; |
| 277 | stats.local_ssrc = config_.rtp.ssrc; |
solenberg | 85a0496 | 2015-10-27 03:35:21 -0700 | [diff] [blame] | 278 | |
solenberg | 358057b | 2015-11-27 10:46:42 -0800 | [diff] [blame] | 279 | webrtc::CallStatistics call_stats = channel_proxy_->GetRTCPStatistics(); |
solenberg | 85a0496 | 2015-10-27 03:35:21 -0700 | [diff] [blame] | 280 | stats.bytes_sent = call_stats.bytesSent; |
| 281 | stats.packets_sent = call_stats.packetsSent; |
solenberg | 8b85de2 | 2015-11-16 09:48:04 -0800 | [diff] [blame] | 282 | // RTT isn't known until a RTCP report is received. Until then, VoiceEngine |
| 283 | // returns 0 to indicate an error value. |
| 284 | if (call_stats.rttMs > 0) { |
| 285 | stats.rtt_ms = call_stats.rttMs; |
| 286 | } |
| 287 | // TODO(solenberg): [was ajm]: Re-enable this metric once we have a reliable |
| 288 | // implementation. |
| 289 | stats.aec_quality_min = -1; |
solenberg | 85a0496 | 2015-10-27 03:35:21 -0700 | [diff] [blame] | 290 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 291 | if (config_.send_codec_spec) { |
| 292 | const auto& spec = *config_.send_codec_spec; |
| 293 | stats.codec_name = spec.format.name; |
| 294 | stats.codec_payload_type = rtc::Optional<int>(spec.payload_type); |
solenberg | 85a0496 | 2015-10-27 03:35:21 -0700 | [diff] [blame] | 295 | |
| 296 | // Get data from the last remote RTCP report. |
solenberg | 358057b | 2015-11-27 10:46:42 -0800 | [diff] [blame] | 297 | for (const auto& block : channel_proxy_->GetRemoteRTCPReportBlocks()) { |
solenberg | 8b85de2 | 2015-11-16 09:48:04 -0800 | [diff] [blame] | 298 | // Lookup report for send ssrc only. |
| 299 | if (block.source_SSRC == stats.local_ssrc) { |
| 300 | stats.packets_lost = block.cumulative_num_packets_lost; |
| 301 | stats.fraction_lost = Q8ToFloat(block.fraction_lost); |
| 302 | stats.ext_seqnum = block.extended_highest_sequence_number; |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 303 | // Convert timestamps to milliseconds. |
| 304 | if (spec.format.clockrate_hz / 1000 > 0) { |
solenberg | 8b85de2 | 2015-11-16 09:48:04 -0800 | [diff] [blame] | 305 | stats.jitter_ms = |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 306 | block.interarrival_jitter / (spec.format.clockrate_hz / 1000); |
solenberg | 85a0496 | 2015-10-27 03:35:21 -0700 | [diff] [blame] | 307 | } |
solenberg | 8b85de2 | 2015-11-16 09:48:04 -0800 | [diff] [blame] | 308 | break; |
solenberg | 85a0496 | 2015-10-27 03:35:21 -0700 | [diff] [blame] | 309 | } |
| 310 | } |
| 311 | } |
| 312 | |
ivoc | 7aba029 | 2016-11-14 04:52:06 -0800 | [diff] [blame] | 313 | ScopedVoEInterface<VoEBase> base(voice_engine()); |
solenberg | 796b8f9 | 2017-03-01 17:02:23 -0800 | [diff] [blame] | 314 | RTC_DCHECK(base->transmit_mixer()); |
| 315 | stats.audio_level = base->transmit_mixer()->AudioLevelFullRange(); |
| 316 | RTC_DCHECK_LE(0, stats.audio_level); |
| 317 | |
zstein | e76bd3a | 2017-07-14 12:17:49 -0700 | [diff] [blame] | 318 | stats.total_input_energy = base->transmit_mixer()->GetTotalInputEnergy(); |
| 319 | stats.total_input_duration = base->transmit_mixer()->GetTotalInputDuration(); |
| 320 | |
peah | a9cc40b | 2017-06-29 08:32:09 -0700 | [diff] [blame] | 321 | RTC_DCHECK(audio_state_->audio_processing()); |
| 322 | auto audio_processing_stats = |
| 323 | audio_state_->audio_processing()->GetStatistics(); |
ivoc | 7aba029 | 2016-11-14 04:52:06 -0800 | [diff] [blame] | 324 | stats.echo_delay_median_ms = audio_processing_stats.delay_median; |
| 325 | stats.echo_delay_std_ms = audio_processing_stats.delay_standard_deviation; |
| 326 | stats.echo_return_loss = audio_processing_stats.echo_return_loss.instant(); |
| 327 | stats.echo_return_loss_enhancement = |
| 328 | audio_processing_stats.echo_return_loss_enhancement.instant(); |
| 329 | stats.residual_echo_likelihood = |
| 330 | audio_processing_stats.residual_echo_likelihood; |
ivoc | 4e477a1 | 2017-01-15 08:29:46 -0800 | [diff] [blame] | 331 | stats.residual_echo_likelihood_recent_max = |
| 332 | audio_processing_stats.residual_echo_likelihood_recent_max; |
ivoc | 8c63a82 | 2016-10-21 04:10:03 -0700 | [diff] [blame] | 333 | |
solenberg | 3a94154 | 2015-11-16 07:34:50 -0800 | [diff] [blame] | 334 | internal::AudioState* audio_state = |
| 335 | static_cast<internal::AudioState*>(audio_state_.get()); |
solenberg | 566ef24 | 2015-11-06 15:34:49 -0800 | [diff] [blame] | 336 | stats.typing_noise_detected = audio_state->typing_noise_detected(); |
ivoc | e1198e0 | 2017-09-08 08:13:19 -0700 | [diff] [blame] | 337 | stats.ana_statistics = channel_proxy_->GetANAStatistics(); |
solenberg | 85a0496 | 2015-10-27 03:35:21 -0700 | [diff] [blame] | 338 | |
| 339 | return stats; |
| 340 | } |
| 341 | |
pbos | 1ba8d39 | 2016-05-01 20:18:34 -0700 | [diff] [blame] | 342 | void AudioSendStream::SignalNetworkState(NetworkState state) { |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 343 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
pbos | 1ba8d39 | 2016-05-01 20:18:34 -0700 | [diff] [blame] | 344 | } |
| 345 | |
| 346 | bool AudioSendStream::DeliverRtcp(const uint8_t* packet, size_t length) { |
| 347 | // TODO(solenberg): Tests call this function on a network thread, libjingle |
| 348 | // calls on the worker thread. We should move towards always using a network |
| 349 | // thread. Then this check can be enabled. |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 350 | // RTC_DCHECK(!worker_thread_checker_.CalledOnValidThread()); |
pbos | 1ba8d39 | 2016-05-01 20:18:34 -0700 | [diff] [blame] | 351 | return channel_proxy_->ReceivedRTCPPacket(packet, length); |
| 352 | } |
| 353 | |
mflodman | 86cc6ff | 2016-07-26 04:44:06 -0700 | [diff] [blame] | 354 | uint32_t AudioSendStream::OnBitrateUpdated(uint32_t bitrate_bps, |
| 355 | uint8_t fraction_loss, |
minyue | 78b4d56 | 2016-11-30 04:47:39 -0800 | [diff] [blame] | 356 | int64_t rtt, |
minyue | 93e4522 | 2017-05-18 14:32:41 -0700 | [diff] [blame] | 357 | int64_t bwe_period_ms) { |
stefan | fca900a | 2017-04-10 03:53:00 -0700 | [diff] [blame] | 358 | // A send stream may be allocated a bitrate of zero if the allocator decides |
| 359 | // to disable it. For now we ignore this decision and keep sending on min |
| 360 | // bitrate. |
| 361 | if (bitrate_bps == 0) { |
| 362 | bitrate_bps = config_.min_bitrate_bps; |
| 363 | } |
mflodman | 86cc6ff | 2016-07-26 04:44:06 -0700 | [diff] [blame] | 364 | RTC_DCHECK_GE(bitrate_bps, |
minyue | 10cbb46 | 2016-11-07 09:29:22 -0800 | [diff] [blame] | 365 | static_cast<uint32_t>(config_.min_bitrate_bps)); |
mflodman | 86cc6ff | 2016-07-26 04:44:06 -0700 | [diff] [blame] | 366 | // The bitrate allocator might allocate an higher than max configured bitrate |
| 367 | // if there is room, to allow for, as example, extra FEC. Ignore that for now. |
minyue | 10cbb46 | 2016-11-07 09:29:22 -0800 | [diff] [blame] | 368 | const uint32_t max_bitrate_bps = config_.max_bitrate_bps; |
mflodman | 86cc6ff | 2016-07-26 04:44:06 -0700 | [diff] [blame] | 369 | if (bitrate_bps > max_bitrate_bps) |
| 370 | bitrate_bps = max_bitrate_bps; |
| 371 | |
minyue | 93e4522 | 2017-05-18 14:32:41 -0700 | [diff] [blame] | 372 | channel_proxy_->SetBitrate(bitrate_bps, bwe_period_ms); |
mflodman | 86cc6ff | 2016-07-26 04:44:06 -0700 | [diff] [blame] | 373 | |
| 374 | // The amount of audio protection is not exposed by the encoder, hence |
| 375 | // always returning 0. |
| 376 | return 0; |
| 377 | } |
| 378 | |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 379 | void AudioSendStream::OnPacketAdded(uint32_t ssrc, uint16_t seq_num) { |
| 380 | RTC_DCHECK(pacer_thread_checker_.CalledOnValidThread()); |
| 381 | // Only packets that belong to this stream are of interest. |
| 382 | if (ssrc == config_.rtp.ssrc) { |
| 383 | rtc::CritScope lock(&packet_loss_tracker_cs_); |
eladalon | edd6eea | 2017-05-25 00:15:35 -0700 | [diff] [blame] | 384 | // TODO(eladalon): This function call could potentially reset the window, |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 385 | // setting both PLR and RPLR to unknown. Consider (during upcoming |
| 386 | // refactoring) passing an indication of such an event. |
| 387 | packet_loss_tracker_.OnPacketAdded(seq_num, rtc::TimeMillis()); |
| 388 | } |
| 389 | } |
| 390 | |
| 391 | void AudioSendStream::OnPacketFeedbackVector( |
| 392 | const std::vector<PacketFeedback>& packet_feedback_vector) { |
eladalon | 3651fdd | 2017-08-24 07:26:25 -0700 | [diff] [blame] | 393 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 394 | rtc::Optional<float> plr; |
elad.alon | dadb4dc | 2017-03-23 15:29:50 -0700 | [diff] [blame] | 395 | rtc::Optional<float> rplr; |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 396 | { |
| 397 | rtc::CritScope lock(&packet_loss_tracker_cs_); |
| 398 | packet_loss_tracker_.OnPacketFeedbackVector(packet_feedback_vector); |
| 399 | plr = packet_loss_tracker_.GetPacketLossRate(); |
elad.alon | dadb4dc | 2017-03-23 15:29:50 -0700 | [diff] [blame] | 400 | rplr = packet_loss_tracker_.GetRecoverablePacketLossRate(); |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 401 | } |
eladalon | edd6eea | 2017-05-25 00:15:35 -0700 | [diff] [blame] | 402 | // 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] | 403 | // the previously sent value is no longer relevant. This will be taken care |
| 404 | // of with some refactoring which is now being done. |
| 405 | if (plr) { |
| 406 | channel_proxy_->OnTwccBasedUplinkPacketLossRate(*plr); |
| 407 | } |
elad.alon | dadb4dc | 2017-03-23 15:29:50 -0700 | [diff] [blame] | 408 | if (rplr) { |
| 409 | channel_proxy_->OnRecoverableUplinkPacketLossRate(*rplr); |
| 410 | } |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 411 | } |
| 412 | |
michaelt | 79e0588 | 2016-11-08 02:50:09 -0800 | [diff] [blame] | 413 | void AudioSendStream::SetTransportOverhead(int transport_overhead_per_packet) { |
elad.alon | d12a8e1 | 2017-03-23 11:04:48 -0700 | [diff] [blame] | 414 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
nisse | b8f9a32 | 2017-03-27 05:36:15 -0700 | [diff] [blame] | 415 | transport_->send_side_cc()->SetTransportOverhead( |
| 416 | transport_overhead_per_packet); |
michaelt | 79e0588 | 2016-11-08 02:50:09 -0800 | [diff] [blame] | 417 | channel_proxy_->SetTransportOverhead(transport_overhead_per_packet); |
| 418 | } |
| 419 | |
ossu | c3d4b48 | 2017-05-23 06:07:11 -0700 | [diff] [blame] | 420 | RtpState AudioSendStream::GetRtpState() const { |
| 421 | return rtp_rtcp_module_->GetRtpState(); |
| 422 | } |
| 423 | |
saza | c58f8c0 | 2017-07-19 00:39:19 -0700 | [diff] [blame] | 424 | const TimeInterval& AudioSendStream::GetActiveLifetime() const { |
| 425 | return active_lifetime_; |
| 426 | } |
| 427 | |
solenberg | 3a94154 | 2015-11-16 07:34:50 -0800 | [diff] [blame] | 428 | VoiceEngine* AudioSendStream::voice_engine() const { |
| 429 | internal::AudioState* audio_state = |
| 430 | static_cast<internal::AudioState*>(audio_state_.get()); |
| 431 | VoiceEngine* voice_engine = audio_state->voice_engine(); |
| 432 | RTC_DCHECK(voice_engine); |
| 433 | return voice_engine; |
solenberg | c7a8b08 | 2015-10-16 14:35:07 -0700 | [diff] [blame] | 434 | } |
minyue | 7a97344 | 2016-10-20 03:27:12 -0700 | [diff] [blame] | 435 | |
| 436 | // Apply current codec settings to a single voe::Channel used for sending. |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 437 | bool AudioSendStream::SetupSendCodec(AudioSendStream* stream, |
| 438 | const Config& new_config) { |
| 439 | RTC_DCHECK(new_config.send_codec_spec); |
| 440 | const auto& spec = *new_config.send_codec_spec; |
minyue | 48368ad | 2017-05-10 04:06:11 -0700 | [diff] [blame] | 441 | |
| 442 | RTC_DCHECK(new_config.encoder_factory); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 443 | std::unique_ptr<AudioEncoder> encoder = |
| 444 | new_config.encoder_factory->MakeAudioEncoder(spec.payload_type, |
| 445 | spec.format); |
minyue | 7a97344 | 2016-10-20 03:27:12 -0700 | [diff] [blame] | 446 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 447 | if (!encoder) { |
| 448 | LOG(LS_ERROR) << "Unable to create encoder for " << spec.format; |
| 449 | return false; |
| 450 | } |
| 451 | // If a bitrate has been specified for the codec, use it over the |
| 452 | // codec's default. |
| 453 | if (spec.target_bitrate_bps) { |
| 454 | encoder->OnReceivedTargetAudioBitrate(*spec.target_bitrate_bps); |
minyue | 7a97344 | 2016-10-20 03:27:12 -0700 | [diff] [blame] | 455 | } |
| 456 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 457 | // Enable ANA if configured (currently only used by Opus). |
| 458 | if (new_config.audio_network_adaptor_config) { |
| 459 | if (encoder->EnableAudioNetworkAdaptor( |
| 460 | *new_config.audio_network_adaptor_config, stream->event_log_)) { |
minyue | 6b825df | 2016-10-31 04:08:32 -0700 | [diff] [blame] | 461 | LOG(LS_INFO) << "Audio network adaptor enabled on SSRC " |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 462 | << new_config.rtp.ssrc; |
| 463 | } else { |
| 464 | RTC_NOTREACHED(); |
minyue | 6b825df | 2016-10-31 04:08:32 -0700 | [diff] [blame] | 465 | } |
minyue | 7a97344 | 2016-10-20 03:27:12 -0700 | [diff] [blame] | 466 | } |
| 467 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 468 | // Wrap the encoder in a an AudioEncoderCNG, if VAD is enabled. |
| 469 | if (spec.cng_payload_type) { |
| 470 | AudioEncoderCng::Config cng_config; |
| 471 | cng_config.num_channels = encoder->NumChannels(); |
| 472 | cng_config.payload_type = *spec.cng_payload_type; |
| 473 | cng_config.speech_encoder = std::move(encoder); |
| 474 | cng_config.vad_mode = Vad::kVadNormal; |
| 475 | encoder.reset(new AudioEncoderCng(std::move(cng_config))); |
ossu | 3b9ff38 | 2017-04-27 08:03:42 -0700 | [diff] [blame] | 476 | |
| 477 | stream->RegisterCngPayloadType( |
| 478 | *spec.cng_payload_type, |
| 479 | new_config.send_codec_spec->format.clockrate_hz); |
minyue | 7a97344 | 2016-10-20 03:27:12 -0700 | [diff] [blame] | 480 | } |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 481 | |
| 482 | stream->channel_proxy_->SetEncoder(new_config.send_codec_spec->payload_type, |
| 483 | std::move(encoder)); |
minyue | 7a97344 | 2016-10-20 03:27:12 -0700 | [diff] [blame] | 484 | return true; |
| 485 | } |
| 486 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 487 | bool AudioSendStream::ReconfigureSendCodec(AudioSendStream* stream, |
| 488 | const Config& new_config) { |
| 489 | const auto& old_config = stream->config_; |
minyue-webrtc | 8de1826 | 2017-07-26 14:18:40 +0200 | [diff] [blame] | 490 | |
| 491 | if (!new_config.send_codec_spec) { |
| 492 | // We cannot de-configure a send codec. So we will do nothing. |
| 493 | // By design, the send codec should have not been configured. |
| 494 | RTC_DCHECK(!old_config.send_codec_spec); |
| 495 | return true; |
| 496 | } |
| 497 | |
| 498 | if (new_config.send_codec_spec == old_config.send_codec_spec && |
| 499 | new_config.audio_network_adaptor_config == |
| 500 | old_config.audio_network_adaptor_config) { |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 501 | return true; |
| 502 | } |
| 503 | |
| 504 | // If we have no encoder, or the format or payload type's changed, create a |
| 505 | // new encoder. |
| 506 | if (!old_config.send_codec_spec || |
| 507 | new_config.send_codec_spec->format != |
| 508 | old_config.send_codec_spec->format || |
| 509 | new_config.send_codec_spec->payload_type != |
| 510 | old_config.send_codec_spec->payload_type) { |
| 511 | return SetupSendCodec(stream, new_config); |
| 512 | } |
| 513 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 514 | const rtc::Optional<int>& new_target_bitrate_bps = |
| 515 | new_config.send_codec_spec->target_bitrate_bps; |
| 516 | // If a bitrate has been specified for the codec, use it over the |
| 517 | // codec's default. |
| 518 | if (new_target_bitrate_bps && |
| 519 | new_target_bitrate_bps != |
| 520 | old_config.send_codec_spec->target_bitrate_bps) { |
| 521 | CallEncoder(stream->channel_proxy_, [&](AudioEncoder* encoder) { |
| 522 | encoder->OnReceivedTargetAudioBitrate(*new_target_bitrate_bps); |
| 523 | }); |
| 524 | } |
| 525 | |
| 526 | ReconfigureANA(stream, new_config); |
| 527 | ReconfigureCNG(stream, new_config); |
| 528 | |
| 529 | return true; |
| 530 | } |
| 531 | |
| 532 | void AudioSendStream::ReconfigureANA(AudioSendStream* stream, |
| 533 | const Config& new_config) { |
| 534 | if (new_config.audio_network_adaptor_config == |
| 535 | stream->config_.audio_network_adaptor_config) { |
| 536 | return; |
| 537 | } |
| 538 | if (new_config.audio_network_adaptor_config) { |
| 539 | CallEncoder(stream->channel_proxy_, [&](AudioEncoder* encoder) { |
| 540 | if (encoder->EnableAudioNetworkAdaptor( |
| 541 | *new_config.audio_network_adaptor_config, stream->event_log_)) { |
| 542 | LOG(LS_INFO) << "Audio network adaptor enabled on SSRC " |
| 543 | << new_config.rtp.ssrc; |
| 544 | } else { |
| 545 | RTC_NOTREACHED(); |
| 546 | } |
| 547 | }); |
| 548 | } else { |
| 549 | CallEncoder(stream->channel_proxy_, [&](AudioEncoder* encoder) { |
| 550 | encoder->DisableAudioNetworkAdaptor(); |
| 551 | }); |
| 552 | LOG(LS_INFO) << "Audio network adaptor disabled on SSRC " |
| 553 | << new_config.rtp.ssrc; |
| 554 | } |
| 555 | } |
| 556 | |
| 557 | void AudioSendStream::ReconfigureCNG(AudioSendStream* stream, |
| 558 | const Config& new_config) { |
| 559 | if (new_config.send_codec_spec->cng_payload_type == |
| 560 | stream->config_.send_codec_spec->cng_payload_type) { |
| 561 | return; |
| 562 | } |
| 563 | |
ossu | 3b9ff38 | 2017-04-27 08:03:42 -0700 | [diff] [blame] | 564 | // Register the CNG payload type if it's been added, don't do anything if CNG |
| 565 | // is removed. Payload types must not be redefined. |
| 566 | if (new_config.send_codec_spec->cng_payload_type) { |
| 567 | stream->RegisterCngPayloadType( |
| 568 | *new_config.send_codec_spec->cng_payload_type, |
| 569 | new_config.send_codec_spec->format.clockrate_hz); |
| 570 | } |
| 571 | |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 572 | // Wrap or unwrap the encoder in an AudioEncoderCNG. |
| 573 | stream->channel_proxy_->ModifyEncoder( |
| 574 | [&](std::unique_ptr<AudioEncoder>* encoder_ptr) { |
| 575 | std::unique_ptr<AudioEncoder> old_encoder(std::move(*encoder_ptr)); |
| 576 | auto sub_encoders = old_encoder->ReclaimContainedEncoders(); |
| 577 | if (!sub_encoders.empty()) { |
| 578 | // Replace enc with its sub encoder. We need to put the sub |
| 579 | // encoder in a temporary first, since otherwise the old value |
| 580 | // of enc would be destroyed before the new value got assigned, |
| 581 | // which would be bad since the new value is a part of the old |
| 582 | // value. |
| 583 | auto tmp = std::move(sub_encoders[0]); |
| 584 | old_encoder = std::move(tmp); |
| 585 | } |
| 586 | if (new_config.send_codec_spec->cng_payload_type) { |
| 587 | AudioEncoderCng::Config config; |
| 588 | config.speech_encoder = std::move(old_encoder); |
| 589 | config.num_channels = config.speech_encoder->NumChannels(); |
| 590 | config.payload_type = *new_config.send_codec_spec->cng_payload_type; |
| 591 | config.vad_mode = Vad::kVadNormal; |
| 592 | encoder_ptr->reset(new AudioEncoderCng(std::move(config))); |
| 593 | } else { |
| 594 | *encoder_ptr = std::move(old_encoder); |
| 595 | } |
| 596 | }); |
| 597 | } |
| 598 | |
| 599 | void AudioSendStream::ReconfigureBitrateObserver( |
| 600 | AudioSendStream* stream, |
| 601 | const webrtc::AudioSendStream::Config& new_config) { |
| 602 | // Since the Config's default is for both of these to be -1, this test will |
| 603 | // allow us to configure the bitrate observer if the new config has bitrate |
| 604 | // limits set, but would only have us call RemoveBitrateObserver if we were |
| 605 | // previously configured with bitrate limits. |
| 606 | if (stream->config_.min_bitrate_bps == new_config.min_bitrate_bps && |
| 607 | stream->config_.max_bitrate_bps == new_config.max_bitrate_bps) { |
| 608 | return; |
| 609 | } |
| 610 | |
| 611 | if (new_config.min_bitrate_bps != -1 && new_config.max_bitrate_bps != -1) { |
| 612 | stream->ConfigureBitrateObserver(new_config.min_bitrate_bps, |
| 613 | new_config.max_bitrate_bps); |
| 614 | } else { |
| 615 | stream->RemoveBitrateObserver(); |
| 616 | } |
| 617 | } |
| 618 | |
| 619 | void AudioSendStream::ConfigureBitrateObserver(int min_bitrate_bps, |
| 620 | int max_bitrate_bps) { |
| 621 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
| 622 | RTC_DCHECK_GE(max_bitrate_bps, min_bitrate_bps); |
| 623 | rtc::Event thread_sync_event(false /* manual_reset */, false); |
| 624 | worker_queue_->PostTask([&] { |
| 625 | // We may get a callback immediately as the observer is registered, so make |
| 626 | // sure the bitrate limits in config_ are up-to-date. |
| 627 | config_.min_bitrate_bps = min_bitrate_bps; |
| 628 | config_.max_bitrate_bps = max_bitrate_bps; |
| 629 | bitrate_allocator_->AddObserver(this, min_bitrate_bps, max_bitrate_bps, 0, |
Alex Narest | b3944f0 | 2017-10-13 14:56:18 +0200 | [diff] [blame^] | 630 | true, config_.track_id); |
ossu | 20a4b3f | 2017-04-27 02:08:52 -0700 | [diff] [blame] | 631 | thread_sync_event.Set(); |
| 632 | }); |
| 633 | thread_sync_event.Wait(rtc::Event::kForever); |
| 634 | } |
| 635 | |
| 636 | void AudioSendStream::RemoveBitrateObserver() { |
| 637 | RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
| 638 | rtc::Event thread_sync_event(false /* manual_reset */, false); |
| 639 | worker_queue_->PostTask([this, &thread_sync_event] { |
| 640 | bitrate_allocator_->RemoveObserver(this); |
| 641 | thread_sync_event.Set(); |
| 642 | }); |
| 643 | thread_sync_event.Wait(rtc::Event::kForever); |
| 644 | } |
| 645 | |
ossu | 3b9ff38 | 2017-04-27 08:03:42 -0700 | [diff] [blame] | 646 | void AudioSendStream::RegisterCngPayloadType(int payload_type, |
| 647 | int clockrate_hz) { |
ossu | 3b9ff38 | 2017-04-27 08:03:42 -0700 | [diff] [blame] | 648 | const CodecInst codec = {payload_type, "CN", clockrate_hz, 0, 1, 0}; |
ossu | c3d4b48 | 2017-05-23 06:07:11 -0700 | [diff] [blame] | 649 | if (rtp_rtcp_module_->RegisterSendPayload(codec) != 0) { |
| 650 | rtp_rtcp_module_->DeRegisterSendPayload(codec.pltype); |
| 651 | if (rtp_rtcp_module_->RegisterSendPayload(codec) != 0) { |
ossu | 3b9ff38 | 2017-04-27 08:03:42 -0700 | [diff] [blame] | 652 | LOG(LS_ERROR) << "RegisterCngPayloadType() failed to register CN to " |
| 653 | "RTP/RTCP module"; |
| 654 | } |
| 655 | } |
| 656 | } |
| 657 | |
| 658 | |
solenberg | c7a8b08 | 2015-10-16 14:35:07 -0700 | [diff] [blame] | 659 | } // namespace internal |
| 660 | } // namespace webrtc |