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

Move int nbufs into buffer_list_open

Browse Source
This commit is contained in:
Kamil Trzcinski
2022-04-11 08:57:16 +02:00
parent e4673851c1
commit 95c7b06e1e
13 changed files with 44 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
device/v4l2/buffer_list.c
View File

@@ -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 v4l2_buffer_list_open(buffer_list_t *buf_list, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs)
{
device_t *dev = buf_list->dev;
@@ -128,23 +128,6 @@ int v4l2_buffer_list_open(buffer_list_t *buf_list, unsigned width, unsigned heig
v4l2_device_set_pad_format(dev, width, height, format);
}
E_LOG_INFO(
buf_list,
"Using: %ux%u/%s, bytesperline=%d",
buf_list->fmt_width,
buf_list->fmt_height,
fourcc_to_string(buf_list->fmt_format).buf,
buf_list->fmt_bytesperline
);
return 0;
error:
return -1;
}
int v4l2_buffer_list_set_buffers(buffer_list_t *buf_list, int nbufs)
{
struct v4l2_requestbuffers v4l2_req = {0};
v4l2_req.count = nbufs;
v4l2_req.type = buf_list->v4l2->type;

1
device/v4l2/v4l2.c
View File

@@ -17,7 +17,6 @@ device_hw_t v4l2_device_hw = {
.buffer_list_pollfd = v4l2_buffer_list_pollfd,
.buffer_list_open = v4l2_buffer_list_open,
.buffer_list_close = v4l2_buffer_list_close,
.buffer_list_set_buffers = v4l2_buffer_list_set_buffers,
.buffer_list_set_stream = v4l2_buffer_list_set_stream
};

3
device/v4l2/v4l2.h
View File

@@ -38,9 +38,8 @@ 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 v4l2_buffer_list_open(buffer_list_t *buf_list, 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_buffers(buffer_list_t *buf_list, int nbufs);
int v4l2_buffer_list_set_stream(buffer_list_t *buf_list, bool do_on);
int v4l2_device_open_media_device(device_t *dev);