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

Improve DMA handling

Browse Source
This commit is contained in:
Kamil Trzcinski
2022-04-05 14:16:27 +02:00
parent 582f08ba16
commit 5e836612ca
5 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
hw/device.c
View File

@ -49,26 +49,23 @@ void device_close(device_t *dev) {
free(dev);
}
int device_open_buffer_list(device_t *dev, bool do_capture, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs)
int device_open_buffer_list(device_t *dev, bool do_capture, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs, bool do_mmap)
{
unsigned type;
char name[64];
struct buffer_list_s **buf_list = NULL;
bool do_mmap = false;
if (!dev) {
return -1;
}
if (!dev->allow_dma) {
do_mmap = true;
}
if (do_capture) {
buf_list = &dev->capture_list;
if (dev->buf_sink) {
do_mmap = true;
} else {
do_mmap = dev->allow_dma;
}
if (dev->capture_list) {
E_LOG_ERROR(dev, "The capture_list is already created.");
}
@ -84,7 +81,6 @@ int device_open_buffer_list(device_t *dev, bool do_capture, unsigned width, unsi
}
} else {
buf_list = &dev->output_list;
do_mmap = !dev->allow_dma;
if (dev->output_list) {
E_LOG_ERROR(dev, "The output_list is already created.");
@ -122,6 +118,20 @@ error:
return -1;
}
int device_open_buffer_list_output(device_t *dev, buffer_list_t *capture_list)
{
return device_open_buffer_list(dev, false,
capture_list->fmt_width, capture_list->fmt_height,
capture_list->fmt_format, capture_list->fmt_bytesperline, capture_list->nbufs, !capture_list->do_mmap);
}
int device_open_buffer_list_capture(device_t *dev, buffer_list_t *output_list, float div, unsigned format, bool do_mmap)
{
return device_open_buffer_list(dev, true,
output_list->fmt_width / div, output_list->fmt_height / div,
format, 0, output_list->nbufs, do_mmap);
}
int device_stream(device_t *dev, bool do_on)
{
if (dev->capture_list) {

5
hw/device.h
View File

@ -8,7 +8,6 @@ typedef struct device_s {
int fd;
struct v4l2_capability v4l2_cap;
bool allow_dma;
bool buf_sink;
struct buffer_list_s *capture_list;
struct buffer_list_s *output_list;
@ -20,7 +19,9 @@ typedef struct device_s {
device_t *device_open(const char *name, const char *path);
void device_close(device_t *device);
int device_open_buffer_list(device_t *dev, bool do_capture, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs);
int device_open_buffer_list(device_t *dev, bool do_capture, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs, bool do_mmap);
int device_open_buffer_list_output(device_t *dev, struct buffer_list_s *capture_list);
int device_open_buffer_list_capture(device_t *dev, struct buffer_list_s *output_list, float div, unsigned format, bool do_mmap);
int device_consume_event(device_t *device);
int device_stream(device_t *dev, bool do_on);