commit 5d2bf19be865c19ae09b21b32771ccda3c95eda0
author Danil Chapovalov <danilchap@webrtc.org> Wed Dec 30 16:12:27 2020
committer Commit Bot <commit-bot@chromium.org> Wed Dec 30 17:11:31 2020
tree 3a28095a12080d4fef7f3d566983a29df151324c
parent f86cf4c2de2fb6fa37a2637b4613c37c9b75f48a

Fix data race on destruction in Audio Video sync tests

Bug: webrtc:12199
Change-Id: Ibf77056e050aed7c693a5f77e6db31a990bc4290
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/199962
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32891}

call/call_perf_tests.cc

diff --git a/call/call_perf_tests.cc b/call/call_perf_tests.cc
index 61e5545..6591ab5 100644
--- a/call/call_perf_tests.cc
+++ b/call/call_perf_tests.cc
@@ -312,14 +312,18 @@
 
     DestroyStreams();
 
-    video_send_transport.reset();
-    audio_send_transport.reset();
-    receive_transport.reset();
-
     sender_call_->DestroyAudioSendStream(audio_send_stream);
     receiver_call_->DestroyAudioReceiveStream(audio_receive_stream);
 
     DestroyCalls();
+    // Call may post periodic rtcp packet to the transport on the process
+    // thread, thus transport should be destroyed after the call objects.
+    // Though transports keep pointers to the call objects, transports handle
+    // packets on the task_queue() and thus wouldn't create a race while current
+    // destruction happens in the same task as destruction of the call objects.
+    video_send_transport.reset();
+    audio_send_transport.reset();
+    receive_transport.reset();
   });
 
   observer->PrintResults();
@@ -357,10 +361,8 @@
                      DriftingClock::PercentsFaster(30.0f), "_audio_faster");
 }
 
-// TODO(bugs.webrtc.org/12199): Disabled because flaky.
-TEST_F(
-    CallPerfTest,
-    DISABLED_Synchronization_PlaysOutAudioAndVideoWithVideoFasterThanAudioDrift) {  // NOLINT(whitespace/line_length)
+TEST_F(CallPerfTest,
+       Synchronization_PlaysOutAudioAndVideoWithVideoFasterThanAudioDrift) {
   TestAudioVideoSync(FecMode::kOn, CreateOrder::kVideoFirst,
                      DriftingClock::kNoDrift,
                      DriftingClock::PercentsFaster(30.0f),