From 3c4457076bad147e10381e89ea898250063af70d Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Mon, 4 Apr 2022 15:12:33 +0200 Subject: [PATCH] WIP --- .gitignore | 1 + buffer_queue.c | 16 ++++++---------- camera_stream | Bin 22792 -> 0 bytes device.c | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 .gitignore delete mode 100755 camera_stream diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..02ceb54 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +camera_stream diff --git a/buffer_queue.c b/buffer_queue.c index 31267bb..63535ec 100644 --- a/buffer_queue.c +++ b/buffer_queue.c @@ -13,11 +13,7 @@ bool buffer_output_dequeue(buffer_t *buf) bool buffer_consumed(buffer_t *buf) { - if (buf->buf_list->do_mmap) { - if (buf->mmap_reflinks <= 0) { - return true; - } - + if (buf->mmap_reflinks > 0) { buf->mmap_reflinks--; // update used bytes @@ -31,11 +27,11 @@ bool buffer_consumed(buffer_t *buf) E_LOG_DEBUG(buf, "Queuing buffer..."); E_XIOCTL(buf, buf->buf_list->device->fd, VIDIOC_QBUF, &buf->v4l2_buffer, "Can't queue buffer."); } - } else { - if (buf->mmap_source) { - buffer_consumed(buf->mmap_source); - buf->mmap_source = NULL; - } + } + + if (buf->mmap_source) { + buffer_consumed(buf->mmap_source); + buf->mmap_source = NULL; } return true; diff --git a/camera_stream b/camera_stream deleted file mode 100755 index 77efafa5263771b870647971238ade500f6f4617..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22792 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 - do_mmap = true; + //do_mmap = true; if (dev->v4l2_cap.capabilities & V4L2_CAP_VIDEO_OUTPUT) { type = V4L2_BUF_TYPE_VIDEO_OUTPUT;