From 2c72fe8a2a0e540a66028254b26e2409f9360cd8 Mon Sep 17 00:00:00 2001 From: Ilya Nikolaevskiy Date: Mon, 2 Oct 2017 13:01:04 +0200 Subject: [PATCH] Fix crash with rtc_event_log in video_loopback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Because RtcEventLog is created and stopped in different threads, SequencedTaskChecker causes failure at the end of a test. Bug: none Change-Id: Ibaec3162eedebd180b101ec46a171efee5fe667e Reviewed-on: https://webrtc-review.googlesource.com/5401 Reviewed-by: Erik Språng Commit-Queue: Ilya Nikolaevskiy Cr-Commit-Position: refs/heads/master@{#20078} --- video/video_quality_test.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc index 2bfe0e3d8f..2526ac25a6 100644 --- a/video/video_quality_test.cc +++ b/video/video_quality_test.cc @@ -1912,6 +1912,8 @@ void VideoQualityTest::RunWithAnalyzer(const Params& params) { analyzer->Wait(); + event_log_->StopLogging(); + task_queue_.SendTask([&]() { for (std::unique_ptr& video_caputurer : thumbnail_capturers_) @@ -1929,7 +1931,6 @@ void VideoQualityTest::RunWithAnalyzer(const Params& params) { DestroyStreams(); DestroyThumbnailStreams(); - event_log_->StopLogging(); if (graph_data_output_file) fclose(graph_data_output_file);