From d5571f095d1b8bfa47412a847fb77290067bd322 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Mon, 11 Apr 2022 10:05:38 +0200 Subject: [PATCH] Move `queueing buffer` message into `device/buffer_queue.c` --- device/buffer_queue.c | 11 +++++++++++ device/v4l2/buffer.c | 15 ++------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/device/buffer_queue.c b/device/buffer_queue.c index 30e5942..c403d3b 100644 --- a/device/buffer_queue.c +++ b/device/buffer_queue.c @@ -38,6 +38,17 @@ bool buffer_consumed(buffer_t *buf, const char *who) buf->mmap_reflinks--; if (!buf->enqueued && buf->mmap_reflinks == 0) { + E_LOG_DEBUG(buf, "Queuing buffer... used=%zu length=%zu (linked=%s) by %s", + buf->used, + buf->length, + buf->dma_source ? buf->dma_source->name : NULL, + who); + + // Assign or clone timestamp + if (buf->buf_list->do_timestamps) { + buf->captured_time_us = get_monotonic_time_us(NULL, NULL); + } + if (buf->buf_list->dev->hw->buffer_enqueue(buf, who) < 0) { goto error; } diff --git a/device/v4l2/buffer.c b/device/v4l2/buffer.c index 4bd7bda..7641fb6 100644 --- a/device/v4l2/buffer.c +++ b/device/v4l2/buffer.c @@ -117,19 +117,8 @@ int v4l2_buffer_enqueue(buffer_t *buf, const char *who) } } - E_LOG_DEBUG(buf, "Queuing buffer... used=%zu length=%zu (linked=%s) by %s", - buf->used, - buf->length, - buf->dma_source ? buf->dma_source->name : NULL, - who); - - // Assign or clone timestamp - if (buf->buf_list->do_timestamps) { - get_monotonic_time_us(NULL, &v4l2_buf.timestamp); - } else { - v4l2_buf.timestamp.tv_sec = buf->captured_time_us / (1000LL * 1000LL); - v4l2_buf.timestamp.tv_usec = buf->captured_time_us % (1000LL * 1000LL); - } + v4l2_buf.timestamp.tv_sec = buf->captured_time_us / (1000LL * 1000LL); + v4l2_buf.timestamp.tv_usec = buf->captured_time_us % (1000LL * 1000LL); E_XIOCTL(buf, buf->buf_list->dev->v4l2->dev_fd, VIDIOC_QBUF, &v4l2_buf, "Can't queue buffer.");