From f85e31b33c19e9ac7841af86c35ed2edf5526db7 Mon Sep 17 00:00:00 2001 From: Oskar Sundbom Date: Wed, 20 Dec 2017 16:38:09 +0100 Subject: [PATCH] Don't (re-)configure BitrateObserver unless already sending Bug: b/70793338 Change-Id: I262474386ef424818ad63d9ad9a0fe91266686c7 Reviewed-on: https://webrtc-review.googlesource.com/35340 Reviewed-by: Stefan Holmer Commit-Queue: Oskar Sundbom Cr-Commit-Position: refs/heads/master@{#21390} --- audio/audio_send_stream.cc | 4 +++- audio/audio_send_stream_unittest.cc | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/audio/audio_send_stream.cc b/audio/audio_send_stream.cc index f0d13e3ee4..ff4ae97385 100644 --- a/audio/audio_send_stream.cc +++ b/audio/audio_send_stream.cc @@ -225,7 +225,9 @@ void AudioSendStream::ConfigureStream( RTC_LOG(LS_ERROR) << "Failed to set up send codec state."; } - ReconfigureBitrateObserver(stream, new_config); + if (stream->sending_) { + ReconfigureBitrateObserver(stream, new_config); + } stream->config_ = new_config; } diff --git a/audio/audio_send_stream_unittest.cc b/audio/audio_send_stream_unittest.cc index f6056378fe..5afdffe67b 100644 --- a/audio/audio_send_stream_unittest.cc +++ b/audio/audio_send_stream_unittest.cc @@ -222,8 +222,6 @@ struct ConfigHelper { &fake_transport_, Eq(nullptr))) .Times(1); } - EXPECT_CALL(*channel_proxy_, SetBitrate(_, _)) - .Times(1); EXPECT_CALL(*channel_proxy_, ResetSenderCongestionControlObjects()) .Times(1); EXPECT_CALL(*channel_proxy_, RegisterTransport(nullptr)).Times(2);