From 14cf12b1eaf6155dc474c68c5562597157c65b01 Mon Sep 17 00:00:00 2001 From: Taylor Brandstetter Date: Mon, 22 Aug 2016 18:14:14 -0700 Subject: [PATCH] Fixing TSan data race warning in video end-to-end tests. Needed to use critical section in "SendRtp"/"SendRtcp", which is what the real implementation ultimately does. TBR=stefan@webrtc.org Review URL: https://codereview.webrtc.org/2271433002 . Cr-Commit-Position: refs/heads/master@{#13857} --- webrtc/video/end_to_end_tests.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc index 528338defe..60063f49a3 100644 --- a/webrtc/video/end_to_end_tests.cc +++ b/webrtc/video/end_to_end_tests.cc @@ -98,16 +98,19 @@ class EndToEndTest : public test::CallTest { bool SendRtp(const uint8_t* packet, size_t length, const PacketOptions& options) override { + rtc::CritScope lock(&crit_); need_rtp_ = false; return true; } bool SendRtcp(const uint8_t* packet, size_t length) override { + rtc::CritScope lock(&crit_); need_rtcp_ = false; return true; } bool need_rtp_; bool need_rtcp_; + rtc::CriticalSection crit_; }; void DecodesRetransmittedFrame(bool enable_rtx, bool enable_red);