From 075c6d7f7ed6586f7ccdf5c3eed77b0b0afdd434 Mon Sep 17 00:00:00 2001 From: brandtr Date: Mon, 9 Jan 2017 05:11:09 -0800 Subject: [PATCH] Temporarily remove SSRC DCHECK in RTPSender::SendToNetwork. Removing the DCHECK due to (sometimes) failing voe_auto_test. Long-term, this DCHECK should be readded. Before that can happen, the SSRC in the RTPSender should be made immutable. TESTED=No failures when running third_party/gtest-parallel/gtest-parallel --repeat=5000 --gtest_filter="VolumeTest.ManualInputMutingMutesMicrophone" out/Debug/voe_auto_test. BUG=webrtc:6887 Review-Url: https://codereview.webrtc.org/2610873002 Cr-Commit-Position: refs/heads/master@{#15962} --- webrtc/modules/rtp_rtcp/source/rtp_sender.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc index 4a285ca219..a55ccc37b9 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc @@ -882,7 +882,10 @@ bool RTPSender::SendToNetwork(std::unique_ptr packet, // To support retransmissions, we store the media packet as sent in the // packet history (even if send failed). if (storage == kAllowRetransmission) { - RTC_DCHECK_EQ(ssrc, SSRC()); + // TODO(brandtr): Uncomment the DCHECK line below when |ssrc_| cannot + // change after the first packet has been sent. For more details, see + // https://bugs.chromium.org/p/webrtc/issues/detail?id=6887. + // RTC_DCHECK_EQ(ssrc, SSRC()); packet_history_.PutRtpPacket(std::move(packet), storage, true); }