diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-03-22 22:32:55 +0200 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-03-25 13:11:12 +0200 |
commit | 54398c1583f18ef9daf1a9227691b14c3b7f4212 (patch) | |
tree | a172cf3f6ebc881f5b0ac9e7235e140c4ddebe1f /test/v4l2_videodevice | |
parent | 074fa98ac4ea903049ba9d7386cdb2f050ea3b48 (diff) |
libcamera: base: timer: Drop start() overload with int argument
The start(unsigned int msec) overload is error-prone, as the argument
unit can easily be mistaken in callers. Drop it and update all callers
to use the start(std::chrono::milliseconds) overload instead.
The callers now need to use std::chrono_literals. The using statement
could be added to timer.h for convenience, but "using" is discouraged in
header files to avoid namespace pollution. Update the callers instead,
and while at it, sort the "using" statements alphabetically in tests.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Diffstat (limited to 'test/v4l2_videodevice')
-rw-r--r-- | test/v4l2_videodevice/buffer_sharing.cpp | 3 | ||||
-rw-r--r-- | test/v4l2_videodevice/capture_async.cpp | 3 | ||||
-rw-r--r-- | test/v4l2_videodevice/v4l2_m2mdevice.cpp | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp index 75ee93ce..fa856ab6 100644 --- a/test/v4l2_videodevice/buffer_sharing.cpp +++ b/test/v4l2_videodevice/buffer_sharing.cpp @@ -21,6 +21,7 @@ #include "v4l2_videodevice_test.h" using namespace libcamera; +using namespace std::chrono_literals; class BufferSharingTest : public V4L2VideoDeviceTest { @@ -145,7 +146,7 @@ protected: return TestFail; } - timeout.start(10000); + timeout.start(10000ms); while (timeout.isRunning()) { dispatcher->processEvents(); if (framesCaptured_ > 30 && framesOutput_ > 30) diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp index 3aa4ca0b..42e1e671 100644 --- a/test/v4l2_videodevice/capture_async.cpp +++ b/test/v4l2_videodevice/capture_async.cpp @@ -16,6 +16,7 @@ #include "v4l2_videodevice_test.h" using namespace libcamera; +using namespace std::chrono_literals; class CaptureAsyncTest : public V4L2VideoDeviceTest { @@ -60,7 +61,7 @@ protected: if (ret) return TestFail; - timeout.start(10000); + timeout.start(10000ms); while (timeout.isRunning()) { dispatcher->processEvents(); if (frames > 30) diff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp index ebf3e245..852b853f 100644 --- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp +++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp @@ -19,8 +19,9 @@ #include "test.h" -using namespace std; using namespace libcamera; +using namespace std; +using namespace std::chrono_literals; class V4L2M2MDeviceTest : public Test { @@ -155,7 +156,7 @@ protected: } Timer timeout; - timeout.start(5000); + timeout.start(5000ms); while (timeout.isRunning()) { dispatcher->processEvents(); if (captureFrames_ > 30) |