zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't allocate audio if we have no transport sequence number.

Browse Source 
Bug: chromium:1002875
Change-Id: I597184e59cf7b5f47b2025d26408069199ada2c2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/156305
Reviewed-by: Ali Tofigh <alito@webrtc.org>
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29432}
This commit is contained in:
Sebastian Jansson
2019-10-10 13:52:26 +02:00
committed by Commit Bot
parent 9afdddfed0
commit cd0eedb248
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
audio/audio_send_stream.cc
View File

@ -360,12 +360,9 @@ void AudioSendStream::Start() {
if (sending_) { if (sending_) {
return; return;
} }
// TODO(srte): We should not add audio to allocation just because
// audio_send_side_bwe_ is false.
if (!config_.has_dscp && config_.min_bitrate_bps != -1 && if (!config_.has_dscp && config_.min_bitrate_bps != -1 &&
config_.max_bitrate_bps != -1 && config_.max_bitrate_bps != -1 &&
(allocate_audio_without_feedback_ || TransportSeqNumId(config_) != 0 || (allocate_audio_without_feedback_ || TransportSeqNumId(config_) != 0)) {
!audio_send_side_bwe_)) {
rtp_transport_->AccountForAudioPacketsInPacedSender(true); rtp_transport_->AccountForAudioPacketsInPacedSender(true);
rtp_rtcp_module_->SetAsPartOfAllocation(true); rtp_rtcp_module_->SetAsPartOfAllocation(true);
rtc::Event thread_sync_event; rtc::Event thread_sync_event;
@ -824,11 +821,8 @@ void AudioSendStream::ReconfigureBitrateObserver(
return; return;
} }
// TODO(srte): We should not add audio to allocation just because
// audio_send_side_bwe_ is false.
if (!new_config.has_dscp && new_config.min_bitrate_bps != -1 && if (!new_config.has_dscp && new_config.min_bitrate_bps != -1 &&
new_config.max_bitrate_bps != -1 && new_config.max_bitrate_bps != -1 && TransportSeqNumId(new_config) != 0) {
(TransportSeqNumId(new_config) != 0 || !audio_send_side_bwe_)) {
rtp_transport_->AccountForAudioPacketsInPacedSender(true); rtp_transport_->AccountForAudioPacketsInPacedSender(true);
rtc::Event thread_sync_event; rtc::Event thread_sync_event;
worker_queue_->PostTask([&] { worker_queue_->PostTask([&] {