mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-02-05 13:28:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d/v4l2: Split some definitions into a new header

Browse source
This commit is contained in:
Mateo de Mayo 2022-07-20 12:38:49 -03:00 committed by Moses Turner
parent ae8305f324
commit 8d929fe2fa
4 changed files with 142 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/xrt/drivers/CMakeLists.txt
View file

@ -199,7 +199,7 @@ if(XRT_BUILD_DRIVER_VIVE)
endif()
if(XRT_HAVE_V4L2)
add_library(drv_v4l2 STATIC v4l2/v4l2_driver.c)
add_library(drv_v4l2 STATIC v4l2/v4l2_driver.h v4l2/v4l2_driver.c)
target_link_libraries(drv_v4l2 PRIVATE xrt-interfaces aux_os aux_util)
list(APPEND ENABLED_DRIVERS v4l2)
endif()
@ -240,8 +240,8 @@ endif()
if(XRT_BUILD_DRIVER_SURVIVE)
add_library(
drv_survive STATIC survive/survive_driver.c
survive/survive_interface.h
drv_survive STATIC survive/survive_driver.c
survive/survive_interface.h
)
target_link_libraries(
drv_survive

123
src/xrt/drivers/v4l2/v4l2_driver.c
View file

@ -1,4 +1,4 @@
// Copyright 2019-2021, Collabora, Ltd.
// Copyright 2019-2022, Collabora, Ltd.
// SPDX-License-Identifier: BSL-1.0
/*!
* @file
@ -19,9 +19,9 @@
#include "util/u_trace_marker.h"
#include "v4l2_interface.h"
#include "v4l2_driver.h"
#include <stdio.h>
#include <assert.h>
#include <unistd.h>
#include <pthread.h>
@ -38,17 +38,6 @@
*
*/
/*
*
* Printing functions.
*
*/
#define V4L2_TRACE(d, ...) U_LOG_IFL_T(d->log_level, __VA_ARGS__)
#define V4L2_DEBUG(d, ...) U_LOG_IFL_D(d->log_level, __VA_ARGS__)
#define V4L2_INFO(d, ...) U_LOG_IFL_I(d->log_level, __VA_ARGS__)
#define V4L2_WARN(d, ...) U_LOG_IFL_W(d->log_level, __VA_ARGS__)
#define V4L2_ERROR(d, ...) U_LOG_IFL_E(d->log_level, __VA_ARGS__)
#define V_CONTROL_GET(VID, CONTROL) \
do { \
@ -70,119 +59,12 @@
DEBUG_GET_ONCE_LOG_OPTION(v4l2_log, "V4L2_LOG", U_LOGGING_WARN)
DEBUG_GET_ONCE_NUM_OPTION(v4l2_exposure_absolute, "V4L2_EXPOSURE_ABSOLUTE", 10)
#define NUM_V4L2_BUFFERS 32
/*
*
* Structs
*
*/
/*!
* @extends xrt_frame
* @ingroup drv_v4l2
*/
struct v4l2_frame
{
struct xrt_frame base;
void *mem; //!< Data might be at an offset, so we need base memory.
struct v4l2_buffer v_buf;
};
struct v4l2_state_want
{
bool active;
int value;
};
/*!
* @ingroup drv_v4l2
*/
struct v4l2_control_state
{
int id;
int force;
struct v4l2_state_want want[2];
int value;
const char *name;
};
/*!
* A single open v4l2 capture device, starts its own thread and waits on it.
*
* @implements xrt_frame_node
* @implements xrt_fs
*/
struct v4l2_fs
{
struct xrt_fs base;
struct xrt_frame_node node;
struct u_sink_debug usd;
int fd;
struct
{
bool extended_format;
bool timeperframe;
} has;
enum xrt_fs_capture_type capture_type;
struct v4l2_control_state states[256];
size_t num_states;
struct
{
bool ps4_cam;
} quirks;
struct v4l2_frame frames[NUM_V4L2_BUFFERS];
uint32_t used_frames;
struct
{
bool mmap;
bool userptr;
} capture;
struct xrt_frame_sink *sink;
pthread_t stream_thread;
struct v4l2_source_descriptor *descriptors;
uint32_t num_descriptors;
uint32_t selected;
struct xrt_fs_capture_parameters capture_params;
bool is_configured;
bool is_running;
enum u_logging_level log_level;
};
/*!
* Streaming thread entrypoint
*/
static void *
v4l2_fs_mainloop(void *ptr);
/*!
* Cast to derived type.
*/
static inline struct v4l2_fs *
v4l2_fs(struct xrt_fs *xfs)
{
return (struct v4l2_fs *)xfs;
}
static void
dump_controls(struct v4l2_fs *vid);
@ -956,6 +838,7 @@ v4l2_fs_mainloop(void *ptr)
if ((v_buf.flags & V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC) != 0) {
xf->timestamp = os_timeval_to_ns(&v_buf.timestamp);
xf->source_timestamp = xf->timestamp;
}
vid->sink->push_frame(vid->sink, xf);

135
src/xrt/drivers/v4l2/v4l2_driver.h Normal file
View file

@ -0,0 +1,135 @@
// Copyright 2019-2022, Collabora, Ltd.
// SPDX-License-Identifier: BSL-1.0
/*!
* @file
* @brief V4L2 frameserver common definitions
* @author Pete Black <pblack@collabora.com>
* @author Jakob Bornecrantz <jakob@collabora.com>
* @ingroup drv_v4l2
*/
#include "util/u_logging.h"
#include "util/u_sink.h"
#include "xrt/xrt_frameserver.h"
#include <linux/videodev2.h>
/*
*
* Defines.
*
*/
#define V4L2_TRACE(d, ...) U_LOG_IFL_T(d->log_level, __VA_ARGS__)
#define V4L2_DEBUG(d, ...) U_LOG_IFL_D(d->log_level, __VA_ARGS__)
#define V4L2_INFO(d, ...) U_LOG_IFL_I(d->log_level, __VA_ARGS__)
#define V4L2_WARN(d, ...) U_LOG_IFL_W(d->log_level, __VA_ARGS__)
#define V4L2_ERROR(d, ...) U_LOG_IFL_E(d->log_level, __VA_ARGS__)
#define NUM_V4L2_BUFFERS 32
/*
*
* Structs
*
*/
/*!
* @extends xrt_frame
* @ingroup drv_v4l2
*/
struct v4l2_frame
{
struct xrt_frame base;
void *mem; //!< Data might be at an offset, so we need base memory.
struct v4l2_buffer v_buf;
};
struct v4l2_state_want
{
bool active;
int value;
};
/*!
* @ingroup drv_v4l2
*/
struct v4l2_control_state
{
int id;
int force;
struct v4l2_state_want want[2];
int value;
const char *name;
};
/*!
* A single open v4l2 capture device, starts its own thread and waits on it.
*
* @implements xrt_frame_node
* @implements xrt_fs
*/
struct v4l2_fs
{
struct xrt_fs base;
struct xrt_frame_node node;
struct u_sink_debug usd;
int fd;
struct
{
bool extended_format;
bool timeperframe;
} has;
enum xrt_fs_capture_type capture_type;
struct v4l2_control_state states[256];
size_t num_states;
struct
{
bool ps4_cam;
} quirks;
struct v4l2_frame frames[NUM_V4L2_BUFFERS];
uint32_t used_frames;
struct
{
bool mmap;
bool userptr;
} capture;
struct xrt_frame_sink *sink;
pthread_t stream_thread;
struct v4l2_source_descriptor *descriptors;
uint32_t num_descriptors;
uint32_t selected;
struct xrt_fs_capture_parameters capture_params;
bool is_configured;
bool is_running;
enum u_logging_level log_level;
};
/*!
* Cast to derived type.
*/
static inline struct v4l2_fs *
v4l2_fs(struct xrt_fs *xfs)
{
return (struct v4l2_fs *)xfs;
}

2
src/xrt/drivers/v4l2/v4l2_interface.h
View file

@ -1,4 +1,4 @@
// Copyright 2019, Collabora, Ltd.
// Copyright 2019-2022, Collabora, Ltd.
// SPDX-License-Identifier: BSL-1.0
/*!
* @file