From c8ac35879c9db21b25143d2075ce37f44b8f1897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Mon, 17 Aug 2020 14:30:13 +0000 Subject: [PATCH] Revert "Call OnReceivedOverhead after audio network adaptor is created." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a135557b3c7ffa4fb1710d2d907c3cb86c5d5913. Reason for revert: Suspected downstream breakage Original change's description: > Call OnReceivedOverhead after audio network adaptor is created. > > This prevents ending up in a state where audio network adaptor never > receives the current packet overhead and therefore doesn't work. > > Bug: chromium:1086942 > Change-Id: I8ee2ffbb7741b342b3ec93fc89f2859a146f4ba7 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181583 > Reviewed-by: Erik Språng > Reviewed-by: Per Åhgren > Commit-Queue: Jakob Ivarsson > Cr-Commit-Position: refs/heads/master@{#31951} TBR=peah@webrtc.org,sprang@webrtc.org,jakobi@webrtc.org Change-Id: I96a92f82f0431457d649cc7feb253f0e026eeada No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium:1086942 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181885 Reviewed-by: Erik Språng Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/master@{#31954} --- audio/audio_send_stream.cc | 5 ---- audio/audio_send_stream_unittest.cc | 43 ----------------------------- test/mock_audio_encoder.h | 4 --- 3 files changed, 52 deletions(-) diff --git a/audio/audio_send_stream.cc b/audio/audio_send_stream.cc index 8bf504e490..24f8ce908e 100644 --- a/audio/audio_send_stream.cc +++ b/audio/audio_send_stream.cc @@ -739,11 +739,6 @@ void AudioSendStream::ReconfigureANA(const Config& new_config) { *new_config.audio_network_adaptor_config, event_log_)) { RTC_LOG(LS_INFO) << "Audio network adaptor enabled on SSRC " << new_config.rtp.ssrc; - MutexLock lock(&overhead_per_packet_lock_); - size_t overhead = GetPerPacketOverheadBytes(); - if (overhead > 0) { - encoder->OnReceivedOverhead(overhead); - } } else { RTC_LOG(LS_INFO) << "Failed to enable Audio network adaptor on SSRC " << new_config.rtp.ssrc; diff --git a/audio/audio_send_stream_unittest.cc b/audio/audio_send_stream_unittest.cc index bfec59bf92..481405c297 100644 --- a/audio/audio_send_stream_unittest.cc +++ b/audio/audio_send_stream_unittest.cc @@ -45,7 +45,6 @@ using ::testing::_; using ::testing::AnyNumber; using ::testing::Eq; using ::testing::Field; -using ::testing::InSequence; using ::testing::Invoke; using ::testing::Ne; using ::testing::Return; @@ -557,48 +556,6 @@ TEST(AudioSendStreamTest, SendCodecAppliesAudioNetworkAdaptor) { } } -TEST(AudioSendStreamTest, AudioNetworkAdaptorReceivesOverhead) { - for (bool use_null_audio_processing : {false, true}) { - ConfigHelper helper(false, true, use_null_audio_processing); - helper.config().send_codec_spec = - AudioSendStream::Config::SendCodecSpec(0, kOpusFormat); - const std::string kAnaConfigString = "abcde"; - helper.config().rtp.extensions.push_back(RtpExtension( - RtpExtension::kTransportSequenceNumberUri, kTransportSequenceNumberId)); - - EXPECT_CALL(helper.mock_encoder_factory(), MakeAudioEncoderMock(_, _, _, _)) - .WillOnce(Invoke( - [&kAnaConfigString](int payload_type, const SdpAudioFormat& format, - absl::optional codec_pair_id, - std::unique_ptr* return_value) { - auto mock_encoder = SetupAudioEncoderMock(payload_type, format); - InSequence s; - EXPECT_CALL( - *mock_encoder, - OnReceivedOverhead(Eq(kOverheadPerPacket.bytes()))) - .Times(2); - EXPECT_CALL(*mock_encoder, - EnableAudioNetworkAdaptor(StrEq(kAnaConfigString), _)) - .WillOnce(Return(true)); - // Note: Overhead is received AFTER ANA has been enabled. - EXPECT_CALL( - *mock_encoder, - OnReceivedOverhead(Eq(kOverheadPerPacket.bytes()))) - .WillOnce(Return()); - *return_value = std::move(mock_encoder); - })); - EXPECT_CALL(*helper.rtp_rtcp(), ExpectedPerPacketOverhead) - .WillRepeatedly(Return(kOverheadPerPacket.bytes())); - - auto send_stream = helper.CreateAudioSendStream(); - - auto stream_config = helper.config(); - stream_config.audio_network_adaptor_config = kAnaConfigString; - - send_stream->Reconfigure(stream_config); - } -} - // VAD is applied when codec is mono and the CNG frequency matches the codec // clock rate. TEST(AudioSendStreamTest, SendCodecCanApplyVad) { diff --git a/test/mock_audio_encoder.h b/test/mock_audio_encoder.h index 87b8cc8c8e..eeb63f1062 100644 --- a/test/mock_audio_encoder.h +++ b/test/mock_audio_encoder.h @@ -48,10 +48,6 @@ class MockAudioEncoder : public AudioEncoder { OnReceivedUplinkPacketLossFraction, (float uplink_packet_loss_fraction), (override)); - MOCK_METHOD(void, - OnReceivedOverhead, - (size_t overhead_bytes_per_packet), - (override)); MOCK_METHOD(bool, EnableAudioNetworkAdaptor,