From f4caaab5189d6040039a61a2741ec4d92a62e75b Mon Sep 17 00:00:00 2001 From: michaelt Date: Mon, 16 Jan 2017 23:55:07 -0800 Subject: [PATCH] Fix for bwe with overhead on audio only calls. BUG=webrtc:6989 Review-Url: https://codereview.webrtc.org/2635893002 Cr-Commit-Position: refs/heads/master@{#16104} --- webrtc/audio/audio_send_stream.cc | 4 +++- webrtc/audio/audio_send_stream.h | 1 + .../congestion_controller/transport_feedback_adapter.cc | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/webrtc/audio/audio_send_stream.cc b/webrtc/audio/audio_send_stream.cc index 3831b8d27a..cb4c1b041c 100644 --- a/webrtc/audio/audio_send_stream.cc +++ b/webrtc/audio/audio_send_stream.cc @@ -53,7 +53,8 @@ AudioSendStream::AudioSendStream( : worker_queue_(worker_queue), config_(config), audio_state_(audio_state), - bitrate_allocator_(bitrate_allocator) { + bitrate_allocator_(bitrate_allocator), + congestion_controller_(congestion_controller) { LOG(LS_INFO) << "AudioSendStream: " << config_.ToString(); RTC_DCHECK_NE(config_.voe_channel_id, -1); RTC_DCHECK(audio_state_.get()); @@ -258,6 +259,7 @@ const webrtc::AudioSendStream::Config& AudioSendStream::config() const { void AudioSendStream::SetTransportOverhead(int transport_overhead_per_packet) { RTC_DCHECK(thread_checker_.CalledOnValidThread()); + congestion_controller_->SetTransportOverhead(transport_overhead_per_packet); channel_proxy_->SetTransportOverhead(transport_overhead_per_packet); } diff --git a/webrtc/audio/audio_send_stream.h b/webrtc/audio/audio_send_stream.h index de1cf82d80..05ed3aaeb8 100644 --- a/webrtc/audio/audio_send_stream.h +++ b/webrtc/audio/audio_send_stream.h @@ -76,6 +76,7 @@ class AudioSendStream final : public webrtc::AudioSendStream, std::unique_ptr channel_proxy_; BitrateAllocator* const bitrate_allocator_; + CongestionController* const congestion_controller_; RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioSendStream); }; diff --git a/webrtc/modules/congestion_controller/transport_feedback_adapter.cc b/webrtc/modules/congestion_controller/transport_feedback_adapter.cc index 7ffbe8d2da..c3d60fe35d 100644 --- a/webrtc/modules/congestion_controller/transport_feedback_adapter.cc +++ b/webrtc/modules/congestion_controller/transport_feedback_adapter.cc @@ -43,7 +43,8 @@ class PacketInfoComparator { TransportFeedbackAdapter::TransportFeedbackAdapter( Clock* clock, BitrateController* bitrate_controller) - : send_time_history_(clock, kSendTimeHistoryWindowMs), + : transport_overhead_bytes_per_packet_(0), + send_time_history_(clock, kSendTimeHistoryWindowMs), clock_(clock), current_offset_ms_(kNoTimestamp), last_timestamp_us_(kNoTimestamp),