From f7ebe31c719def67f2ee07f5c4438e0d5ef437cd Mon Sep 17 00:00:00 2001 From: Maxim Devaev Date: Mon, 28 Jul 2025 21:29:27 +0300 Subject: [PATCH] refactoring --- src/libs/capture.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/libs/capture.c b/src/libs/capture.c index c72f61e..a46d95d 100644 --- a/src/libs/capture.c +++ b/src/libs/capture.c @@ -569,25 +569,28 @@ bool _capture_is_buffer_valid(const us_capture_s *cap, const struct v4l2_buffer if (us_is_jpeg(cap->run->format)) { if (buf->bytesused < 125) { // https://stackoverflow.com/questions/2253404/what-is-the-smallest-valid-jpeg-file-size-in-bytes - _LOG_DEBUG("Discarding invalid frame, too small to be a valid JPEG: bytesused=%u", buf->bytesused); + _LOG_DEBUG("Discarding invalid frame, too small to be a valid JPEG: bytesused=%u", + buf->bytesused); return false; } const u16 begin_marker = (((u16)(data[0]) << 8) | data[1]); if (begin_marker != 0xFFD8) { - _LOG_DEBUG("Discarding JPEG frame with invalid header: begin_marker=0x%04x, bytesused=%u", begin_marker, buf->bytesused); + _LOG_DEBUG("Discarding JPEG frame with invalid header: begin_marker=0x%04x, bytesused=%u", + begin_marker, buf->bytesused); return false; } - const u8 *const end_ptr = data + buf->bytesused; - const u8 *const eoi_ptr = end_ptr - 2; - const u16 eoi_marker = (((u16)(eoi_ptr[0]) << 8) | eoi_ptr[1]); - if (eoi_marker != 0xFFD9 && eoi_marker != 0xD900 && eoi_marker != 0x0000) { + const u8 *const end_ptr = data + buf->bytesused - 2; + const u16 end_marker = (((u16)(end_ptr[0]) << 8) | end_ptr[1]); + if (end_marker != 0xFFD9 && end_marker != 0xD900 && end_marker != 0x0000) { if (!cap->allow_truncated_frames) { - _LOG_DEBUG("Discarding truncated JPEG frame: eoi_marker=0x%04x, bytesused=%u", eoi_marker, buf->bytesused); + _LOG_DEBUG("Discarding truncated JPEG frame: end_marker=0x%04x, bytesused=%u", + end_marker, buf->bytesused); return false; } - _LOG_DEBUG("Got truncated JPEG frame: eoi_marker=0x%04x, bytesused=%u", eoi_marker, buf->bytesused); + _LOG_DEBUG("Got truncated JPEG frame: end_marker=0x%04x, bytesused=%u", + end_marker, buf->bytesused); } }