commit fd720b2406b025c39782f91c292e7b1ccdc2f70e
author Rasmus Brandt <brandtr@webrtc.org> Wed Apr 03 11:06:21 2019
committer Commit Bot <commit-bot@chromium.org> Wed Apr 03 12:03:14 2019
tree 4b17d1c26f17593605f10a1e3511462c0592e13e
parent 0682850c77c1e5ff24f83dfb25c9046724ff8ee2

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 <mirtad@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27439}

modules/video_coding/BUILD.gn

diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index cdaff5d..304dd4f 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -652,7 +652,6 @@
       "../../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",

modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc

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 ced5458..db7f59a 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::ProcessAllFrames(
-    rtc::TaskQueue* task_queue,
+    TaskQueueForTest* task_queue,
     const std::vector<RateProfile>& rate_profiles) {
   // Set initial rates.
   auto rate_profile = rate_profiles.begin();
@@ -450,9 +449,7 @@
   }
 
   // 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.

modules/video_coding/codecs/test/videocodec_test_fixture_impl.h

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 a3b4d75..8caebeb 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 @@
                            int initial_framerate_fps);
   void ReleaseAndCloseObjects(TaskQueueForTest* task_queue);
 
-  void ProcessAllFrames(rtc::TaskQueue* task_queue,
+  void ProcessAllFrames(TaskQueueForTest* task_queue,
                         const std::vector<RateProfile>& rate_profiles);
   void AnalyzeAllFrames(
       const std::vector<RateProfile>& rate_profiles,