diff options
Diffstat (limited to 'modules/video_capture/test/video_capture_unittest.cc')
-rw-r--r-- | modules/video_capture/test/video_capture_unittest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/modules/video_capture/test/video_capture_unittest.cc b/modules/video_capture/test/video_capture_unittest.cc index be443e0820..1a0cf2d5da 100644 --- a/modules/video_capture/test/video_capture_unittest.cc +++ b/modules/video_capture/test/video_capture_unittest.cc @@ -23,7 +23,7 @@ #include "common_video/libyuv/include/webrtc_libyuv.h" #include "modules/utility/include/process_thread.h" #include "modules/video_capture/video_capture_factory.h" -#include "rtc_base/critical_section.h" +#include "rtc_base/synchronization/mutex.h" #include "rtc_base/time_utils.h" #include "system_wrappers/include/sleep.h" #include "test/frame_utils.h" @@ -74,7 +74,7 @@ class TestVideoCaptureCallback } void OnFrame(const webrtc::VideoFrame& videoFrame) override { - rtc::CritScope cs(&capture_cs_); + webrtc::MutexLock lock(&capture_lock_); int height = videoFrame.height(); int width = videoFrame.width(); #if defined(WEBRTC_ANDROID) && WEBRTC_ANDROID @@ -106,38 +106,38 @@ class TestVideoCaptureCallback } void SetExpectedCapability(VideoCaptureCapability capability) { - rtc::CritScope cs(&capture_cs_); + webrtc::MutexLock lock(&capture_lock_); capability_ = capability; incoming_frames_ = 0; last_render_time_ms_ = 0; } int incoming_frames() { - rtc::CritScope cs(&capture_cs_); + webrtc::MutexLock lock(&capture_lock_); return incoming_frames_; } int timing_warnings() { - rtc::CritScope cs(&capture_cs_); + webrtc::MutexLock lock(&capture_lock_); return timing_warnings_; } VideoCaptureCapability capability() { - rtc::CritScope cs(&capture_cs_); + webrtc::MutexLock lock(&capture_lock_); return capability_; } bool CompareLastFrame(const webrtc::VideoFrame& frame) { - rtc::CritScope cs(&capture_cs_); + webrtc::MutexLock lock(&capture_lock_); return webrtc::test::FrameBufsEqual(last_frame_, frame.video_frame_buffer()); } void SetExpectedCaptureRotation(webrtc::VideoRotation rotation) { - rtc::CritScope cs(&capture_cs_); + webrtc::MutexLock lock(&capture_lock_); rotate_frame_ = rotation; } private: - rtc::CriticalSection capture_cs_; + webrtc::Mutex capture_lock_; VideoCaptureCapability capability_; int64_t last_render_time_ms_; int incoming_frames_; |