From b56069e650210ac7b11b5e5507ac517270f1a793 Mon Sep 17 00:00:00 2001 From: deadbeef Date: Fri, 6 May 2016 04:57:03 -0700 Subject: [PATCH] Enable NACK for audio even if there are no send streams. BUG=webrtc:5762 Review-Url: https://codereview.webrtc.org/1950963003 Cr-Commit-Position: refs/heads/master@{#12641} --- webrtc/media/engine/webrtcvoiceengine.cc | 6 ++---- webrtc/media/engine/webrtcvoiceengine_unittest.cc | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/webrtc/media/engine/webrtcvoiceengine.cc b/webrtc/media/engine/webrtcvoiceengine.cc index d873d8b767..47ed43e82e 100644 --- a/webrtc/media/engine/webrtcvoiceengine.cc +++ b/webrtc/media/engine/webrtcvoiceengine.cc @@ -1676,10 +1676,8 @@ bool WebRtcVoiceMediaChannel::SetSendCodecs( } // Set nack status on receive channels. - if (!send_streams_.empty()) { - for (const auto& kv : recv_streams_) { - SetNack(kv.second->channel(), send_codec_spec_.nack_enabled); - } + for (const auto& kv : recv_streams_) { + SetNack(kv.second->channel(), send_codec_spec_.nack_enabled); } // Check if the transport cc feedback has changed on the preferred send codec, diff --git a/webrtc/media/engine/webrtcvoiceengine_unittest.cc b/webrtc/media/engine/webrtcvoiceengine_unittest.cc index 5d8dd90d02..e879cf2d38 100644 --- a/webrtc/media/engine/webrtcvoiceengine_unittest.cc +++ b/webrtc/media/engine/webrtcvoiceengine_unittest.cc @@ -1351,7 +1351,8 @@ TEST_F(WebRtcVoiceEngineTestFake, SetSendCodecEnableNackAsCallee) { cricket::kParamValueEmpty)); EXPECT_FALSE(voe_.GetNACK(channel_num)); EXPECT_TRUE(channel_->SetSendParameters(parameters)); - EXPECT_FALSE(voe_.GetNACK(channel_num)); + // NACK should be enabled even with no send stream. + EXPECT_TRUE(voe_.GetNACK(channel_num)); EXPECT_TRUE(channel_->AddSendStream( cricket::StreamParams::CreateLegacy(kSsrc1)));