From edd804816cd1e57374717e9e2bdd2c4237b6e692 Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Mon, 1 Jan 2024 17:03:03 +0100 Subject: [PATCH] video capture test: use stock EXPECT_TRUE_WAIT instead of a custom one. BUG=None Change-Id: I5c55acef6203a384748534c6c9701dcdd8dec211 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/332940 Commit-Queue: Philipp Hancke Reviewed-by: Ilya Nikolaevskiy Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#41526} --- modules/video_capture/BUILD.gn | 1 + .../test/video_capture_unittest.cc | 19 +------------------ 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn index 730ec9bfdd..b583814ebe 100644 --- a/modules/video_capture/BUILD.gn +++ b/modules/video_capture/BUILD.gn @@ -178,6 +178,7 @@ if (!build_with_chromium || is_linux || is_chromeos) { "../../api/video:video_frame", "../../api/video:video_rtp_headers", "../../common_video", + "../../rtc_base:gunit_helpers", "../../rtc_base:timeutils", "../../rtc_base/synchronization:mutex", "../../system_wrappers", diff --git a/modules/video_capture/test/video_capture_unittest.cc b/modules/video_capture/test/video_capture_unittest.cc index c8af222b57..002131ebc7 100644 --- a/modules/video_capture/test/video_capture_unittest.cc +++ b/modules/video_capture/test/video_capture_unittest.cc @@ -22,6 +22,7 @@ #include "api/video/video_frame.h" #include "common_video/libyuv/include/webrtc_libyuv.h" #include "modules/video_capture/video_capture_factory.h" +#include "rtc_base/gunit.h" #include "rtc_base/synchronization/mutex.h" #include "rtc_base/time_utils.h" #include "system_wrappers/include/sleep.h" @@ -33,24 +34,6 @@ using webrtc::VideoCaptureCapability; using webrtc::VideoCaptureFactory; using webrtc::VideoCaptureModule; -#define WAIT_(ex, timeout, res) \ - do { \ - res = (ex); \ - int64_t start = rtc::TimeMillis(); \ - while (!res && rtc::TimeMillis() < start + timeout) { \ - SleepMs(5); \ - res = (ex); \ - } \ - } while (0) - -#define EXPECT_TRUE_WAIT(ex, timeout) \ - do { \ - bool res; \ - WAIT_(ex, timeout, res); \ - if (!res) \ - EXPECT_TRUE(ex); \ - } while (0) - static const int kTimeOut = 5000; #ifdef WEBRTC_MAC static const int kTestHeight = 288;