forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-03-15 03:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed grabbed_mutex

Browse Source
This commit is contained in:
Maxim Devaev
2021-12-19 01:28:57 +03:00
parent fbabba29ed
commit ead06e741a
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ustreamer/device.c
View File

@@ -194,7 +194,6 @@ void device_close(device_s *dev) {
free(HW(raw.data)); free(HW(raw.data));
} }
} }
A_MUTEX_DESTROY(&HW(grabbed_mutex));
# undef HW # undef HW
} }
@@ -346,14 +345,11 @@ int device_grab_buffer(device_s *dev, hw_buffer_s **hw) {
# define HW(_next) RUN(hw_bufs)[buf.index]._next # define HW(_next) RUN(hw_bufs)[buf.index]._next
A_MUTEX_LOCK(&HW(grabbed_mutex));
if (HW(grabbed)) { if (HW(grabbed)) {
LOG_ERROR("V4L2 error: grabbed device buffer=%u is already used", buf.index); LOG_ERROR("V4L2 error: grabbed device buffer=%u is already used", buf.index);
A_MUTEX_UNLOCK(&HW(grabbed_mutex));
return -1; return -1;
} }
HW(grabbed) = true; HW(grabbed) = true;
A_MUTEX_UNLOCK(&HW(grabbed_mutex));
HW(raw.dma_fd) = HW(dma_fd); HW(raw.dma_fd) = HW(dma_fd);
HW(raw.used) = buf.bytesused; HW(raw.used) = buf.bytesused;
@@ -374,14 +370,11 @@ int device_release_buffer(device_s *dev, hw_buffer_s *hw) {
const unsigned index = hw->buf.index; const unsigned index = hw->buf.index;
LOG_DEBUG("Releasing device buffer=%u ...", index); LOG_DEBUG("Releasing device buffer=%u ...", index);
A_MUTEX_LOCK(&hw->grabbed_mutex);
if (xioctl(RUN(fd), VIDIOC_QBUF, &hw->buf) < 0) { if (xioctl(RUN(fd), VIDIOC_QBUF, &hw->buf) < 0) {
LOG_PERROR("Unable to release device buffer=%u", index); LOG_PERROR("Unable to release device buffer=%u", index);
A_MUTEX_UNLOCK(&hw->grabbed_mutex);
return -1; return -1;
} }
hw->grabbed = false; hw->grabbed = false;
A_MUTEX_UNLOCK(&hw->grabbed_mutex);
return 0; return 0;
} }
@@ -688,8 +681,6 @@ static int _device_open_io_method_mmap(device_s *dev) {
HW(dma_fd) = -1; HW(dma_fd) = -1;
A_MUTEX_INIT(&HW(grabbed_mutex));
LOG_DEBUG("Mapping device buffer=%u ...", RUN(n_bufs)); LOG_DEBUG("Mapping device buffer=%u ...", RUN(n_bufs));
if ((HW(raw.data) = mmap( if ((HW(raw.data) = mmap(
NULL, NULL,

7
src/ustreamer/device.h
View File

@@ -68,13 +68,10 @@
typedef struct { typedef struct {
frame_s raw; frame_s raw;
struct v4l2_buffer buf; struct v4l2_buffer buf;
int dma_fd; int dma_fd;
bool grabbed;
pthread_mutex_t grabbed_mutex;
bool grabbed;
} hw_buffer_s; } hw_buffer_s;
typedef struct { typedef struct {