From 867e510ef51725eb01a0eff56e0b3ce23772f91d Mon Sep 17 00:00:00 2001 From: Alex Narest Date: Tue, 12 Jun 2018 13:40:18 +0200 Subject: [PATCH] Enable send side audio TWCC only if WebRTC-Audio-ForceNoTWCC is not enabled. This will avoid enabling TWCC for calls having WebRTC-Audio-SendSideBwe enabled on one side of the call but not on the other. Currently the side supporting audio BWE indicates TWCC extension in SDP but the side that does not support will not. As the result the not supporting side will send TWCC but will not use it and the side supporting audio BWE will not send TWCC. Bug: webrtc:8243 Change-Id: I4d59e78998982051004b8ad86c24b9be34fc095f Reviewed-on: https://webrtc-review.googlesource.com/82803 Commit-Queue: Alex Narest Reviewed-by: Stefan Holmer Cr-Commit-Position: refs/heads/master@{#23583} --- audio/audio_send_stream.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/audio/audio_send_stream.cc b/audio/audio_send_stream.cc index 8798d4345c..fe955594ef 100644 --- a/audio/audio_send_stream.cc +++ b/audio/audio_send_stream.cc @@ -242,13 +242,17 @@ void AudioSendStream::ConfigureStream( } bool transport_seq_num_id_changed = new_ids.transport_sequence_number != old_ids.transport_sequence_number; - if (first_time || transport_seq_num_id_changed) { + if (first_time || + (transport_seq_num_id_changed && + !webrtc::field_trial::IsEnabled("WebRTC-Audio-ForceNoTWCC"))) { if (!first_time) { channel_proxy->ResetSenderCongestionControlObjects(); } RtcpBandwidthObserver* bandwidth_observer = nullptr; - bool has_transport_sequence_number = new_ids.transport_sequence_number != 0; + bool has_transport_sequence_number = + new_ids.transport_sequence_number != 0 && + !webrtc::field_trial::IsEnabled("WebRTC-Audio-ForceNoTWCC"); if (has_transport_sequence_number) { channel_proxy->EnableSendTransportSequenceNumber( new_ids.transport_sequence_number); @@ -287,7 +291,8 @@ void AudioSendStream::Start() { } bool has_transport_sequence_number = - FindExtensionIds(config_.rtp.extensions).transport_sequence_number != 0; + FindExtensionIds(config_.rtp.extensions).transport_sequence_number != 0 && + !webrtc::field_trial::IsEnabled("WebRTC-Audio-ForceNoTWCC"); if (config_.min_bitrate_bps != -1 && config_.max_bitrate_bps != -1 && (has_transport_sequence_number || !webrtc::field_trial::IsEnabled("WebRTC-Audio-SendSideBwe"))) {