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 77efafa..0000000 Binary files a/camera_stream and /dev/null differ diff --git a/device.c b/device.c index fb91cb4..4634551 100644 --- a/device.c +++ b/device.c @@ -70,7 +70,7 @@ int device_open_buffer_list(device_t *dev, bool do_capture, unsigned width, unsi } } else { buf_list = &dev->output_list; - do_mmap = true; + //do_mmap = true; if (dev->v4l2_cap.capabilities & V4L2_CAP_VIDEO_OUTPUT) { type = V4L2_BUF_TYPE_VIDEO_OUTPUT;