diff --git a/c_mpos/src/webcam.c b/c_mpos/src/webcam.c index 5b7085b9..7fcd05db 100644 --- a/c_mpos/src/webcam.c +++ b/c_mpos/src/webcam.c @@ -23,9 +23,7 @@ #define CAPTURE_HEIGHT 480 #define OUTPUT_WIDTH 240 // Resize to 240x240 #define OUTPUT_HEIGHT 240 -#define NUM_BUFFERS 2 // Revert to 2 buffers, as it achieved 2 captures -#define QUEUE_RETRIES 10 // Increase retries for robustness -#define QUEUE_RETRY_DELAY_US 200000 // 200ms delay between retries +#define NUM_BUFFERS 2 // Keep 2 buffers, stable for continuous captures // Webcam object type typedef struct _webcam_obj_t { @@ -98,34 +96,28 @@ static void webcam_reset_streaming(webcam_obj_t *self) { static mp_obj_t webcam_capture_grayscale(mp_obj_t self_in) { webcam_obj_t *self = MP_OBJ_TO_PTR(self_in); - // Try to queue a buffer with retries + // Try to queue a buffer struct v4l2_buffer buf = {0}; bool queued = false; - for (int attempt = 0; attempt < QUEUE_RETRIES && !queued; attempt++) { - for (size_t i = 0; i < self->num_buffers; i++) { - memset(&buf, 0, sizeof(buf)); - buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - buf.memory = V4L2_MEMORY_MMAP; - buf.index = i; + for (size_t i = 0; i < self->num_buffers; i++) { + memset(&buf, 0, sizeof(buf)); + buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + buf.memory = V4L2_MEMORY_MMAP; + buf.index = i; - WEBCAM_DEBUG_PRINT("webcam: Attempting to queue buffer (index=%zu, attempt=%d)\n", i, attempt + 1); - if (ioctl(self->fd, VIDIOC_QBUF, &buf) == 0) { - WEBCAM_DEBUG_PRINT("webcam: Successfully queued buffer (index=%zu)\n", i); - queued = true; - break; - } - WEBCAM_DEBUG_PRINT("webcam: Failed to queue buffer (index=%zu, errno=%d)\n", i, errno); - } - if (!queued && attempt < QUEUE_RETRIES - 1) { - WEBCAM_DEBUG_PRINT("webcam: No buffers available, retrying after delay\n"); - usleep(QUEUE_RETRY_DELAY_US); // Wait 200ms + WEBCAM_DEBUG_PRINT("webcam: Attempting to queue buffer (index=%zu)\n", i); + if (ioctl(self->fd, VIDIOC_QBUF, &buf) == 0) { + WEBCAM_DEBUG_PRINT("webcam: Successfully queued buffer (index=%zu)\n", i); + queued = true; + break; } + WEBCAM_DEBUG_PRINT("webcam: Failed to queue buffer (index=%zu, errno=%d)\n", i, errno); } if (!queued) { - WEBCAM_DEBUG_PRINT("webcam: No buffers available after %d retries, resetting streaming\n", QUEUE_RETRIES); + WEBCAM_DEBUG_PRINT("webcam: No buffers available, resetting streaming\n"); webcam_reset_streaming(self); - // Retry queuing one more time after reset + // Try queuing again after reset for (size_t i = 0; i < self->num_buffers; i++) { memset(&buf, 0, sizeof(buf)); buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;