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

Allow to set -camera-vflip and -camera-hflip

Browse Source
This commit is contained in:
Kamil Trzcinski
2022-08-24 17:48:55 +02:00
parent 8b1d066dfc
commit a9c65fae0d
9 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
device/libcamera/buffer_list.cc
View File

@ -76,6 +76,15 @@ int libcamera_buffer_list_open(buffer_list_t *buf_list)
if (buf_list->libcamera->configuration->validate() == libcamera::CameraConfiguration::Invalid) {
LOG_ERROR(buf_list, "Camera configuration invalid");
}
if (buf_list->dev->libcamera->vflip) {
buf_list->libcamera->configuration->transform |= libcamera::Transform::VFlip;
}
if (buf_list->dev->libcamera->hflip) {
buf_list->libcamera->configuration->transform |= libcamera::Transform::HFlip;
}
if (!!(buf_list->libcamera->configuration->transform & libcamera::Transform::Transpose)) {
LOG_ERROR(buf_list, "Transformation requiring transpose not supported");
}
if (buf_list->dev->libcamera->camera->configure(buf_list->libcamera->configuration.get()) < 0) {
LOG_ERROR(buf_list, "Failed to configure camera");
@ -90,7 +99,6 @@ int libcamera_buffer_list_open(buffer_list_t *buf_list)
buf_list->libcamera->allocator = std::make_shared<libcamera::FrameBufferAllocator>(
buf_list->dev->libcamera->camera);
for (libcamera::StreamConfiguration &stream_config : *buf_list->libcamera->configuration) {
if (buf_list->libcamera->allocator->allocate(stream_config.stream()) < 0) {
LOG_ERROR(buf_list, "Can't allocate buffers");

7
device/libcamera/device.cc
View File

@ -127,6 +127,13 @@ int libcamera_device_set_fps(device_t *dev, int desired_fps)
return 0;
}
int libcamera_device_set_rotation(device_t *dev, bool vflip, bool hflip)
{
dev->libcamera->vflip = vflip;
dev->libcamera->hflip = hflip;
return 0;
}
int libcamera_device_set_option(device_t *dev, const char *keyp, const char *value)
{
auto key = libcamera_device_option_normalize(keyp);

1
device/libcamera/libcamera.cc
View File

@ -6,6 +6,7 @@ device_hw_t libcamera_device_hw = {
.device_close = libcamera_device_close,
.device_dump_options = libcamera_device_dump_options,
.device_set_fps = libcamera_device_set_fps,
.device_set_rotation = libcamera_device_set_rotation,
.device_set_option = libcamera_device_set_option,
.buffer_open = libcamera_buffer_open,

2
device/libcamera/libcamera.hh
View File

@ -40,6 +40,7 @@ typedef struct device_libcamera_s {
std::shared_ptr<libcamera::CameraManager> camera_manager;
std::shared_ptr<libcamera::Camera> camera;
libcamera::ControlList controls;
bool vflip, hflip;
} device_libcamera_t;
typedef struct buffer_list_libcamera_s {
@ -59,6 +60,7 @@ int libcamera_device_open(device_t *dev);
void libcamera_device_close(device_t *dev);
void libcamera_device_dump_options(device_t *dev, FILE *stream);
int libcamera_device_set_fps(device_t *dev, int desired_fps);
int libcamera_device_set_rotation(device_t *dev, bool vflip, bool hflip);
int libcamera_device_set_option(device_t *dev, const char *key, const char *value);
int libcamera_buffer_open(buffer_t *buf);