jordan/camera-streamer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move queueing buffer message into device/buffer_queue.c

Browse Source
This commit is contained in:
Kamil Trzcinski 2022-04-11 10:05:38 +02:00
parent 4783fe31a5
commit d5571f095d
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
device/buffer_queue.c
View File

@ -38,6 +38,17 @@ bool buffer_consumed(buffer_t *buf, const char *who)
buf->mmap_reflinks--; buf->mmap_reflinks--;
if (!buf->enqueued && buf->mmap_reflinks == 0) { 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) { if (buf->buf_list->dev->hw->buffer_enqueue(buf, who) < 0) {
goto error; goto error;
} }

15
device/v4l2/buffer.c
View File

@ -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", v4l2_buf.timestamp.tv_sec = buf->captured_time_us / (1000LL * 1000LL);
buf->used, v4l2_buf.timestamp.tv_usec = buf->captured_time_us % (1000LL * 1000LL);
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);
}
E_XIOCTL(buf, buf->buf_list->dev->v4l2->dev_fd, VIDIOC_QBUF, &v4l2_buf, "Can't queue buffer."); E_XIOCTL(buf, buf->buf_list->dev->v4l2->dev_fd, VIDIOC_QBUF, &v4l2_buf, "Can't queue buffer.");