From 0335e6c4bfa9a3254a392c003344c71238ee832f Mon Sep 17 00:00:00 2001 From: solenberg Date: Wed, 22 Feb 2017 07:07:04 -0800 Subject: [PATCH] Fix flaky test WebRtcMediaRecorderTest.PeerConnection A previous CL changed from logging to DCHECKing when setting minimum playout delay on a VoE channel: https://codereview.webrtc.org/2452163004/ I thought it safe at the time, since the input parameter range is capped, but apparently I didn't dig deep enough, as ultimately a failure may be returned for other reasons: https://chromium.googlesource.com/external/webrtc/+/master/webrtc/modules/audio_coding/neteq/delay_manager.cc#381 Thus, reverting to old behavior. BUG=694373 Review-Url: https://codereview.webrtc.org/2704933008 Cr-Commit-Position: refs/heads/master@{#16775} --- webrtc/voice_engine/channel_proxy.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webrtc/voice_engine/channel_proxy.cc b/webrtc/voice_engine/channel_proxy.cc index 7f68f5101a..86501409e2 100644 --- a/webrtc/voice_engine/channel_proxy.cc +++ b/webrtc/voice_engine/channel_proxy.cc @@ -14,6 +14,7 @@ #include "webrtc/api/call/audio_sink.h" #include "webrtc/base/checks.h" +#include "webrtc/base/logging.h" #include "webrtc/voice_engine/channel.h" namespace webrtc { @@ -284,7 +285,9 @@ void ChannelProxy::SetMinimumPlayoutDelay(int delay_ms) { // close as possible, instead of failing. delay_ms = std::max(0, std::min(delay_ms, 10000)); int error = channel()->SetMinimumPlayoutDelay(delay_ms); - RTC_DCHECK_EQ(0, error); + if (0 != error) { + LOG(LS_WARNING) << "Error setting minimum playout delay."; + } } void ChannelProxy::SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats) {