From d339348895e1316a363b5a03dac078345cc02334 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sun, 11 Apr 2021 17:56:38 -0700 Subject: [PATCH] Revert "CameraBuf: avoid busy waiting on safe_queue (#20643)" This reverts commit e7db6f827d41b8c75579ccbfc2db20f93bd3f6c0. old-commit-hash: 4e03e3738170f0c9cfb7377e4f41d4760b1505d8 --- selfdrive/camerad/cameras/camera_common.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/camerad/cameras/camera_common.cc b/selfdrive/camerad/cameras/camera_common.cc index 90dc5166a4..7f78b2b98e 100644 --- a/selfdrive/camerad/cameras/camera_common.cc +++ b/selfdrive/camerad/cameras/camera_common.cc @@ -105,7 +105,7 @@ CameraBuf::~CameraBuf() { } bool CameraBuf::acquire() { - if (!safe_queue.try_pop(cur_buf_idx, 50)) return false; + if (!safe_queue.try_pop(cur_buf_idx, 1)) return false; if (camera_bufs_metadata[cur_buf_idx].frame_id == -1) { LOGE("no frame data? wtf");