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

Optimise usage of videodev2.h header

Browse Source
This commit is contained in:
Kamil Trzcinski
2022-04-10 14:41:00 +02:00
parent b21ddd2519
commit cae3087116
32 changed files with 131 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
device/v4l2/buffer.c
View File

@ -1,7 +1,8 @@
#include "device/v4l2/v4l2.h"
#include "v4l2.h"
#include "device/buffer.h"
#include "device/buffer_list.h"
#include "device/device.h"
#include "opts/log.h"
int v4l2_buffer_open(buffer_t *buf)
{
@ -78,7 +79,9 @@ int v4l2_buffer_enqueue(buffer_t *buf, const char *who)
v4l2_buf.type = buf->buf_list->v4l2.type;
v4l2_buf.index = buf->index;
v4l2_buf.flags = buf->v4l2.flags;
v4l2_buf.flags = 0;
if (buf->flags.is_keyframe)
v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME;
if (buf->buf_list->do_mmap) {
assert(buf->dma_source == NULL);
@ -154,6 +157,7 @@ int v4l2_buffer_list_dequeue(buffer_list_t *buf_list, buffer_t **bufp)
}
buf->v4l2.flags = v4l2_buf.flags;
buf->flags.is_keyframe = (v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME) != 0;
buf->captured_time_us = get_time_us(CLOCK_FROM_PARAMS, NULL, &v4l2_buf.timestamp, 0);
return 0;

4
device/v4l2/buffer_list.c
View File

@ -1,7 +1,9 @@
#include "device/v4l2/v4l2.h"
#include "v4l2.h"
#include "device/buffer.h"
#include "device/buffer_list.h"
#include "device/device.h"
#include "opts/log.h"
#include "opts/fourcc.h"
int v4l2_buffer_list_set_format(buffer_list_t *buf_list, unsigned width, unsigned height, unsigned format, unsigned bytesperline)
{

3
device/v4l2/debug.c
View File

@ -1,6 +1,7 @@
#include "device/v4l2/v4l2.h"
#include "v4l2.h"
#include "device/buffer_list.h"
#include "device/device.h"
#include "opts/log.h"
int v4l2_buffer_list_refresh_states(buffer_list_t *buf_list)
{

4
device/v4l2/device.c
View File

@ -1,6 +1,6 @@
#include "device/v4l2/v4l2.h"
#include "device/hw/v4l2.h"
#include "v4l2.h"
#include "device/device.h"
#include "opts/log.h"
int v4l2_device_open(device_t *dev)
{

27
device/v4l2/device_hw.c
View File

@ -1,27 +0,0 @@
#include "device/v4l2/v4l2.h"
#include "device/hw/v4l2.h"
#include "device/device.h"
device_hw_t v4l2_device_hw = {
.device_open = v4l2_device_open,
.device_close = v4l2_device_close,
.device_set_decoder_start = v4l2_device_set_decoder_start,
.device_video_force_key = v4l2_device_video_force_key,
.device_set_fps = v4l2_device_set_fps,
.device_set_option = v4l2_device_set_option,
.buffer_open = v4l2_buffer_open,
.buffer_close = v4l2_buffer_close,
.buffer_enqueue = v4l2_buffer_enqueue,
.buffer_list_dequeue = v4l2_buffer_list_dequeue,
.buffer_list_pollfd = v4l2_buffer_list_pollfd,
.buffer_list_set_format = v4l2_buffer_list_set_format,
.buffer_list_set_buffers = v4l2_buffer_list_set_buffers,
.buffer_list_set_stream = v4l2_buffer_list_set_stream
};
device_t *device_v4l2_open(const char *name, const char *path)
{
return device_open(name, path, &v4l2_device_hw);
}

5
device/v4l2/device_media.c
View File

@ -1,6 +1,7 @@
#include "device/v4l2/v4l2.h"
#include "v4l2.h"
#include "device/device.h"
#include "device/hw/v4l2.h"
#include "opts/log.h"
#include <unistd.h>
#include <dirent.h>

4
device/v4l2/device_options.c
View File

@ -1,6 +1,6 @@
#include "device/v4l2/v4l2.h"
#include "device/hw/v4l2.h"
#include "v4l2.h"
#include "device/device.h"
#include "opts/log.h"
#include <ctype.h>

77
device/v4l2/v4l2.c
View File

@ -1,59 +1,26 @@
#include "device/v4l2/v4l2.h"
#include "v4l2.h"
#include "device/device.h"
#include <linux/videodev2.h>
#include <linux/v4l2-subdev.h>
device_hw_t v4l2_device_hw = {
.device_open = v4l2_device_open,
.device_close = v4l2_device_close,
.device_set_decoder_start = v4l2_device_set_decoder_start,
.device_video_force_key = v4l2_device_video_force_key,
.device_set_fps = v4l2_device_set_fps,
.device_set_option = v4l2_device_set_option,
int xioctl(const char *name, int fd, int request, void *arg)
.buffer_open = v4l2_buffer_open,
.buffer_close = v4l2_buffer_close,
.buffer_enqueue = v4l2_buffer_enqueue,
.buffer_list_dequeue = v4l2_buffer_list_dequeue,
.buffer_list_pollfd = v4l2_buffer_list_pollfd,
.buffer_list_set_format = v4l2_buffer_list_set_format,
.buffer_list_set_buffers = v4l2_buffer_list_set_buffers,
.buffer_list_set_stream = v4l2_buffer_list_set_stream
};
device_t *device_v4l2_open(const char *name, const char *path)
{
int retries = XIOCTL_RETRIES;
int retval = -1;
do {
retval = ioctl(fd, request, arg);
} while (
retval
&& retries--
&& (
errno == EINTR
|| errno == EAGAIN
|| errno == ETIMEDOUT
)
);
// cppcheck-suppress knownConditionTrueFalse
if (retval && retries <= 0) {
E_LOG_PERROR(NULL, "%s: ioctl(%08x) retried %u times; giving up", name, request, XIOCTL_RETRIES);
}
return retval;
}
static size_t align_size(size_t size, size_t to)
{
return ((size + (to - 1)) & ~(to - 1));
}
unsigned fourcc_to_stride(unsigned width, unsigned format)
{
switch (format) {
case V4L2_PIX_FMT_YUYV:
case V4L2_PIX_FMT_UYVY:
case V4L2_PIX_FMT_RGB565:
return align_size(width * 2, 32);
case V4L2_PIX_FMT_YUV420:
return align_size(width * 3 / 2, 32);
case V4L2_PIX_FMT_RGB24:
return align_size(width * 3, 32);
case V4L2_PIX_FMT_SRGGB10P:
return align_size(width * 5 / 4, 32);
case V4L2_PIX_FMT_JPEG:
case V4L2_PIX_FMT_H264:
return 0;
default:
E_LOG_PERROR(NULL, "Unknown format: %s", fourcc_to_string(format).buf);
}
return device_open(name, path, &v4l2_device_hw);
}

21
device/v4l2/v4l2.h
View File

@ -1,7 +1,9 @@
#pragma once
// TODO: temporary
#include "device/hw/v4l2.h"
#include <linux/videodev2.h>
#include <linux/v4l2-subdev.h>
#include <stdbool.h>
#include <stdint.h>
typedef struct buffer_s buffer_t;
typedef struct buffer_list_s buffer_list_t;
@ -29,18 +31,3 @@ int v4l2_buffer_list_set_stream(buffer_list_t *buf_list, bool do_on);
int v4l2_device_open_media_device(device_t *dev);
int v4l2_device_open_v4l2_subdev(device_t *dev, int subdev);
int v4l2_device_set_pad_format(device_t *dev, unsigned width, unsigned height, unsigned format);
#ifndef CFG_XIOCTL_RETRIES
# define CFG_XIOCTL_RETRIES 4
#endif
#define XIOCTL_RETRIES ((unsigned)(CFG_XIOCTL_RETRIES))
unsigned fourcc_to_stride(unsigned width, unsigned format);
int xioctl(const char *name, int fd, int request, void *arg);
#define E_XIOCTL(dev, _fd, _request, _value, _msg, ...) do { \
int ret; \
if ((ret = xioctl(dev_name(dev), _fd, _request, _value)) < 0) { \
E_LOG_ERROR(dev, "xioctl(ret=%d): " _msg, ret, ##__VA_ARGS__); \
} \
} while(0)