admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix data race on destruction in Audio Video sync tests

Browse Source 
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}
This commit is contained in:
Danil Chapovalov 2020-12-30 17:12:27 +01:00 committed by Commit Bot
parent f86cf4c2de
commit 5d2bf19be8
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
call/call_perf_tests.cc
View File

@ -312,14 +312,18 @@ void CallPerfTest::TestAudioVideoSync(FecMode fec,
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 @@ TEST_F(CallPerfTest,
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),