From b686396ec6b6d9e90acc9f6c65eb2cf6a52fe1b8 Mon Sep 17 00:00:00 2001 From: Sebastian Jansson Date: Wed, 10 Oct 2018 10:23:13 +0200 Subject: [PATCH] Makes AudioSendStream signal that it's part of allocation. This adds calls to the underlying RtpRtcp module to indicate when audio is part of bitrate allocation. This information is propagated and set in the packet info for each packet. This is part of a series of CLs that allows GoogCC to track sent bitrate that is included in bitrate allocation but without transport feedback. Bug: webrtc:9796 Change-Id: I79b024cb7f2eb8c86421cfa34d38ef68467776c3 Reviewed-on: https://webrtc-review.googlesource.com/c/104882 Reviewed-by: Karl Wiberg Commit-Queue: Sebastian Jansson Cr-Commit-Position: refs/heads/master@{#25086} --- audio/audio_send_stream.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/audio/audio_send_stream.cc b/audio/audio_send_stream.cc index e82264a83c..49d933c3f4 100644 --- a/audio/audio_send_stream.cc +++ b/audio/audio_send_stream.cc @@ -301,9 +301,12 @@ void AudioSendStream::Start() { webrtc::field_trial::IsEnabled("WebRTC-Audio-ABWENoTWCC"))) { // Audio BWE is enabled. transport_->packet_sender()->SetAccountForAudioPackets(true); + rtp_rtcp_module_->SetAsPartOfAllocation(true); ConfigureBitrateObserver(config_.min_bitrate_bps, config_.max_bitrate_bps, config_.bitrate_priority, has_transport_sequence_number); + } else { + rtp_rtcp_module_->SetAsPartOfAllocation(false); } channel_proxy_->StartSend(); sending_ = true; @@ -713,8 +716,10 @@ void AudioSendStream::ReconfigureBitrateObserver( stream->ConfigureBitrateObserver( new_config.min_bitrate_bps, new_config.max_bitrate_bps, new_config.bitrate_priority, has_transport_sequence_number); + stream->rtp_rtcp_module_->SetAsPartOfAllocation(true); } else { stream->RemoveBitrateObserver(); + stream->rtp_rtcp_module_->SetAsPartOfAllocation(false); } }