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

Make buffer_list_open to accept const char *path

Browse Source
This commit is contained in:
Kamil Trzcinski 2022-04-11 19:04:38 +02:00
parent 753e9d4255
commit a3e8ef1e24
10 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
device/buffer_list.c
View File

@ -4,16 +4,18 @@
#include "opts/log.h" #include "opts/log.h"
#include "opts/fourcc.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)); buffer_list_t *buf_list = calloc(1, sizeof(buffer_list_t));
buf_list->dev = dev; buf_list->dev = dev;
buf_list->name = strdup(name); buf_list->name = strdup(name);
if (path)
buf_list->path = strdup(path);
buf_list->do_capture = do_capture; buf_list->do_capture = do_capture;
buf_list->do_mmap = do_mmap; 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) { if (got_bufs <= 0) {
goto error; goto error;
} }

3
device/buffer_list.h
View File

@ -9,6 +9,7 @@ struct pollfd;
typedef struct buffer_list_s { typedef struct buffer_list_s {
char *name; char *name;
char *path;
device_t *dev; device_t *dev;
buffer_t **bufs; buffer_t **bufs;
int nbufs; int nbufs;
@ -30,7 +31,7 @@ typedef struct buffer_list_s {
int frames; int frames;
} buffer_list_t; } 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); void buffer_list_close(buffer_list_t *buf_list);
int buffer_list_set_stream(buffer_list_t *buf_list, bool do_on); int buffer_list_set_stream(buffer_list_t *buf_list, bool do_on);

2
device/device.c
View File

@ -75,7 +75,7 @@ int device_open_buffer_list(device_t *dev, bool do_capture, unsigned width, unsi
sprintf(name, "%s:output", dev->name); 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) { if (!*buf_list) {
goto error; goto error;
} }

2
device/device.h
View File

@ -22,7 +22,7 @@ typedef struct device_hw_s {
int (*buffer_list_dequeue)(buffer_list_t *buf_list, buffer_t **bufp); 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_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); void (*buffer_list_close)(buffer_list_t *buf_list);
int (*buffer_list_set_stream)(buffer_list_t *buf_list, bool do_on); int (*buffer_list_set_stream)(buffer_list_t *buf_list, bool do_on);
} device_hw_t; } device_hw_t;

2
device/dummy/buffer_list.c
View File

@ -3,7 +3,7 @@
#include <stdlib.h> #include <stdlib.h>
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)); buf_list->dummy = calloc(1, sizeof(buffer_list_dummy_t));
return 0; return 0;

2
device/dummy/dummy.h
View File

@ -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_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_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); 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_buffers(buffer_list_t *buf_list, int nbufs);
int dummy_buffer_list_set_stream(buffer_list_t *buf_list, bool do_on); int dummy_buffer_list_set_stream(buffer_list_t *buf_list, bool do_on);

2
device/libcamera/buffer_list.cc
View File

@ -1,7 +1,7 @@
#ifdef USE_LIBCAMERA #ifdef USE_LIBCAMERA
#include "libcamera.hh" #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; int got_bufs = 0;

2
device/libcamera/libcamera.hh
View File

@ -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_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_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); void libcamera_buffer_list_close(buffer_list_t *buf_list);
int libcamera_buffer_list_set_stream(buffer_list_t *buf_list, bool do_on); int libcamera_buffer_list_set_stream(buffer_list_t *buf_list, bool do_on);
#endif // USE_LIBCAMERA #endif // USE_LIBCAMERA

2
device/v4l2/buffer_list.c
View File

@ -5,7 +5,7 @@
#include "opts/log.h" #include "opts/log.h"
#include "opts/fourcc.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; device_t *dev = buf_list->dev;

2
device/v4l2/v4l2.h
View File

@ -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_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_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); void v4l2_buffer_list_close(buffer_list_t *buf_list);
int v4l2_buffer_list_set_stream(buffer_list_t *buf_list, bool do_on); int v4l2_buffer_list_set_stream(buffer_list_t *buf_list, bool do_on);