From fd720b2406b025c39782f91c292e7b1ccdc2f70e Mon Sep 17 00:00:00 2001 From: Rasmus Brandt Date: Wed, 3 Apr 2019 13:06:21 +0200 Subject: [PATCH] Switch to SendTask instead of manually waiting for event. Bug: webrtc:10349 Change-Id: I128856d2baf221d67e957ce0614b075ecef3c5fc Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131140 Reviewed-by: Mirta Dvornicic Commit-Queue: Rasmus Brandt Cr-Commit-Position: refs/heads/master@{#27439} --- modules/video_coding/BUILD.gn | 1 - .../codecs/test/videocodec_test_fixture_impl.cc | 7 ++----- .../codecs/test/videocodec_test_fixture_impl.h | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index cdaff5d6ab..304dd4f76d 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -652,7 +652,6 @@ if (rtc_include_tests) { "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_tests_utils", - "../../rtc_base:rtc_event", "../../rtc_base:task_queue_for_test", "../../system_wrappers", "../../test:fileutils", diff --git a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc index ced5458c50..db7f59add8 100644 --- a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc +++ b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc @@ -37,7 +37,6 @@ #include "modules/video_coding/utility/ivf_file_writer.h" #include "rtc_base/checks.h" #include "rtc_base/cpu_time.h" -#include "rtc_base/event.h" #include "rtc_base/strings/string_builder.h" #include "rtc_base/time_utils.h" #include "system_wrappers/include/cpu_info.h" @@ -418,7 +417,7 @@ void VideoCodecTestFixtureImpl::RunTest( } void VideoCodecTestFixtureImpl::ProcessAllFrames( - rtc::TaskQueue* task_queue, + TaskQueueForTest* task_queue, const std::vector& rate_profiles) { // Set initial rates. auto rate_profile = rate_profiles.begin(); @@ -450,9 +449,7 @@ void VideoCodecTestFixtureImpl::ProcessAllFrames( } // Wait until we know that the last frame has been sent for encode. - rtc::Event sync_event; - task_queue->PostTask([&sync_event] { sync_event.Set(); }); - sync_event.Wait(rtc::Event::kForever); + task_queue->SendTask([] {}); // Give the VideoProcessor pipeline some time to process the last frame, // and then release the codecs. diff --git a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.h b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.h index a3b4d75f78..8caebebca7 100644 --- a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.h +++ b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.h @@ -66,7 +66,7 @@ class VideoCodecTestFixtureImpl : public VideoCodecTestFixture { int initial_framerate_fps); void ReleaseAndCloseObjects(TaskQueueForTest* task_queue); - void ProcessAllFrames(rtc::TaskQueue* task_queue, + void ProcessAllFrames(TaskQueueForTest* task_queue, const std::vector& rate_profiles); void AnalyzeAllFrames( const std::vector& rate_profiles,