diff --git a/device/buffer_list.c b/device/buffer_list.c index 737b813..d0982a9 100644 --- a/device/buffer_list.c +++ b/device/buffer_list.c @@ -4,16 +4,18 @@ #include "opts/log.h" #include "opts/fourcc.h" -buffer_list_t *buffer_list_open(const char *name, struct device_s *dev, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs, bool do_capture, bool do_mmap) +buffer_list_t *buffer_list_open(const char *name, const char *path, struct device_s *dev, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs, bool do_capture, bool do_mmap) { buffer_list_t *buf_list = calloc(1, sizeof(buffer_list_t)); buf_list->dev = dev; buf_list->name = strdup(name); + if (path) + buf_list->path = strdup(path); buf_list->do_capture = do_capture; buf_list->do_mmap = do_mmap; - int got_bufs = dev->hw->buffer_list_open(buf_list, width, height, format, bytesperline, nbufs); + int got_bufs = dev->hw->buffer_list_open(buf_list, path, width, height, format, bytesperline, nbufs); if (got_bufs <= 0) { goto error; } diff --git a/device/buffer_list.h b/device/buffer_list.h index ae51048..952406d 100644 --- a/device/buffer_list.h +++ b/device/buffer_list.h @@ -9,6 +9,7 @@ struct pollfd; typedef struct buffer_list_s { char *name; + char *path; device_t *dev; buffer_t **bufs; int nbufs; @@ -30,7 +31,7 @@ typedef struct buffer_list_s { int frames; } buffer_list_t; -buffer_list_t *buffer_list_open(const char *name, struct device_s *dev, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs, bool do_capture, bool do_mmap); +buffer_list_t *buffer_list_open(const char *name, const char *path, struct device_s *dev, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs, bool do_capture, bool do_mmap); void buffer_list_close(buffer_list_t *buf_list); int buffer_list_set_stream(buffer_list_t *buf_list, bool do_on); diff --git a/device/device.c b/device/device.c index d3ff744..a862a64 100644 --- a/device/device.c +++ b/device/device.c @@ -75,7 +75,7 @@ int device_open_buffer_list(device_t *dev, bool do_capture, unsigned width, unsi sprintf(name, "%s:output", dev->name); } - *buf_list = buffer_list_open(name, dev, width, height, format, bytesperline, nbufs, do_capture, do_mmap); + *buf_list = buffer_list_open(name, NULL, dev, width, height, format, bytesperline, nbufs, do_capture, do_mmap); if (!*buf_list) { goto error; } diff --git a/device/device.h b/device/device.h index d07b4b6..1d12348 100644 --- a/device/device.h +++ b/device/device.h @@ -22,7 +22,7 @@ typedef struct device_hw_s { int (*buffer_list_dequeue)(buffer_list_t *buf_list, buffer_t **bufp); int (*buffer_list_pollfd)(buffer_list_t *buf_list, struct pollfd *pollfd, bool can_dequeue); - int (*buffer_list_open)(buffer_list_t *buf_list, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs); + int (*buffer_list_open)(buffer_list_t *buf_list, const char *path, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs); void (*buffer_list_close)(buffer_list_t *buf_list); int (*buffer_list_set_stream)(buffer_list_t *buf_list, bool do_on); } device_hw_t; diff --git a/device/dummy/buffer_list.c b/device/dummy/buffer_list.c index a713b58..765b773 100644 --- a/device/dummy/buffer_list.c +++ b/device/dummy/buffer_list.c @@ -3,7 +3,7 @@ #include -int dummy_buffer_list_open(buffer_list_t *buf_list, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs) +int dummy_buffer_list_open(buffer_list_t *buf_list, const char *path, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs) { buf_list->dummy = calloc(1, sizeof(buffer_list_dummy_t)); return 0; diff --git a/device/dummy/dummy.h b/device/dummy/dummy.h index 2d7753e..d17c639 100644 --- a/device/dummy/dummy.h +++ b/device/dummy/dummy.h @@ -30,7 +30,7 @@ int dummy_buffer_enqueue(buffer_t *buf, const char *who); int dummy_buffer_list_dequeue(buffer_list_t *buf_list, buffer_t **bufp); int dummy_buffer_list_pollfd(buffer_list_t *buf_list, struct pollfd *pollfd, bool can_dequeue); -int dummy_buffer_list_open(buffer_list_t *buf_list, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs); +int dummy_buffer_list_open(buffer_list_t *buf_list, const char *path, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs); void dummy_buffer_list_close(buffer_list_t *buf_list); int dummy_buffer_list_set_buffers(buffer_list_t *buf_list, int nbufs); int dummy_buffer_list_set_stream(buffer_list_t *buf_list, bool do_on); diff --git a/device/libcamera/buffer_list.cc b/device/libcamera/buffer_list.cc index f2da1e2..e4d9387 100644 --- a/device/libcamera/buffer_list.cc +++ b/device/libcamera/buffer_list.cc @@ -1,7 +1,7 @@ #ifdef USE_LIBCAMERA #include "libcamera.hh" -int libcamera_buffer_list_open(buffer_list_t *buf_list, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs) +int libcamera_buffer_list_open(buffer_list_t *buf_list, const char *path, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs) { int got_bufs = 0; diff --git a/device/libcamera/libcamera.hh b/device/libcamera/libcamera.hh index ca42547..d1e16d7 100644 --- a/device/libcamera/libcamera.hh +++ b/device/libcamera/libcamera.hh @@ -67,7 +67,7 @@ void libcamera_buffer_list_dequeued(buffer_list_t *buf_list, libcamera::Request int libcamera_buffer_list_dequeue(buffer_list_t *buf_list, buffer_t **bufp); int libcamera_buffer_list_pollfd(buffer_list_t *buf_list, struct pollfd *pollfd, bool can_dequeue); -int libcamera_buffer_list_open(buffer_list_t *buf_list, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs); +int libcamera_buffer_list_open(buffer_list_t *buf_list, const char *path, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs); void libcamera_buffer_list_close(buffer_list_t *buf_list); int libcamera_buffer_list_set_stream(buffer_list_t *buf_list, bool do_on); #endif // USE_LIBCAMERA diff --git a/device/v4l2/buffer_list.c b/device/v4l2/buffer_list.c index cb07d4b..65e59e2 100644 --- a/device/v4l2/buffer_list.c +++ b/device/v4l2/buffer_list.c @@ -5,7 +5,7 @@ #include "opts/log.h" #include "opts/fourcc.h" -int v4l2_buffer_list_open(buffer_list_t *buf_list, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs) +int v4l2_buffer_list_open(buffer_list_t *buf_list, const char *path, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs) { device_t *dev = buf_list->dev; diff --git a/device/v4l2/v4l2.h b/device/v4l2/v4l2.h index 4bcc8e5..b3dcd86 100644 --- a/device/v4l2/v4l2.h +++ b/device/v4l2/v4l2.h @@ -46,7 +46,7 @@ int v4l2_buffer_list_dequeue(buffer_list_t *buf_list, buffer_t **bufp); int v4l2_buffer_list_refresh_states(buffer_list_t *buf_list); int v4l2_buffer_list_pollfd(buffer_list_t *buf_list, struct pollfd *pollfd, bool can_dequeue); -int v4l2_buffer_list_open(buffer_list_t *buf_list, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs); +int v4l2_buffer_list_open(buffer_list_t *buf_list, const char *path, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs); void v4l2_buffer_list_close(buffer_list_t *buf_list); int v4l2_buffer_list_set_stream(buffer_list_t *buf_list, bool do_on);