mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-05 22:19:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #25502 from Kumataro:fix25501

Browse Source 
highgui: wayland: reduce cpu usage for cv::waitKey()
This commit is contained in:
Alexander Smorkalov 2024-04-30 11:45:03 +03:00 committed by GitHub
commit cbf71c380f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/highgui/src/window_wayland.cpp
View File

@ -2479,11 +2479,16 @@ void setWindowTitle_WAYLAND(const cv::String &winname, const cv::String &title)
CV_IMPL int cvWaitKey(int delay) {
int key = -1;
auto limit = ch::duration_cast<ch::nanoseconds>(ch::milliseconds(delay));
auto limit = ch::duration_cast<ch::nanoseconds>(ch::milliseconds(delay)).count();
auto start_time = ch::duration_cast<ch::nanoseconds>(
ch::steady_clock::now().time_since_epoch())
.count();
// See https://github.com/opencv/opencv/issues/25501
// Too long sleep_for() makes no response to Wayland ping-pong mechanism
// So interval is limited to 33ms (1000ms / 30fps).
auto sleep_time_min = ch::duration_cast<ch::nanoseconds>(ch::milliseconds(33)).count();
while (true) {
auto res = CvWlCore::getInstance().display().run_once();
@ -2502,11 +2507,11 @@ CV_IMPL int cvWaitKey(int delay) {
.count();
auto elapsed = end_time - start_time;
if (limit.count() > 0 && elapsed >= limit.count()) {
if (limit > 0 && elapsed >= limit) {
break;
}
auto sleep_time = 64000 - elapsed;
auto sleep_time = std::min(limit - elapsed, sleep_time_min);
if (sleep_time > 0) {
std::this_thread::sleep_for(ch::nanoseconds(sleep_time));
}