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

libcamera: support transform to orientation rename

Browse Source
This commit is contained in:
Kamil Trzcinski 2023-11-27 22:21:18 +01:00
parent 3c116f2307
commit bc231917d8
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -61,6 +61,7 @@ endif
HTML_SRC = $(addsuffix .c,$(HTML)) HTML_SRC = $(addsuffix .c,$(HTML))
OBJS = $(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(SRC) $(HTML_SRC))) OBJS = $(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(SRC) $(HTML_SRC)))
TARGET_OBJS = $(filter-out third_party/%, $(filter-out tests/%, $(OBJS)))
all: version all: version
+make $(TARGET) +make $(TARGET)
@ -73,11 +74,16 @@ endif
.PHONY: version .PHONY: version
version: version:
echo "#define GIT_VERSION \"$(GIT_VERSION)\"\n#define GIT_REVISION \"$(GIT_REVISION)\"" > version.h.tmp; \ echo "#define GIT_VERSION \"$(GIT_VERSION)\"\n#define GIT_REVISION \"$(GIT_REVISION)\"" > version.h.tmp
diff -u version.h version.h.tmp || mv version.h.tmp version.h; \ if $(CXX) $(CFLAGS) -o /dev/null -c tests/libcamera/orientation.cc 2>/dev/null; then \
rm -f version.h.tmp echo "#define LIBCAMERA_USES_ORIENTATION" >> version.h.tmp; \
else \
echo "#define LIBCAMERA_USES_TRANSFORM" >> version.h.tmp; \
fi
diff -u version.h version.h.tmp || mv version.h.tmp version.h
-rm -f version.h.tmp
%: cmd/% $(filter-out third_party/%, $(OBJS)) %: cmd/% $(TARGET_OBJS)
$(CCACHE) $(CXX) $(CFLAGS) -o $@ $(filter-out cmd/%, $^) $(filter $</%, $^) $(LDLIBS) $(CCACHE) $(CXX) $(CFLAGS) -o $@ $(filter-out cmd/%, $^) $(filter $</%, $^) $(LDLIBS)
install: $(TARGET) install: $(TARGET)

10
device/libcamera/buffer_list.cc
View File

@ -99,6 +99,15 @@ int libcamera_buffer_list_open(buffer_list_t *buf_list)
if (configurations->validate() == libcamera::CameraConfiguration::Invalid) { if (configurations->validate() == libcamera::CameraConfiguration::Invalid) {
LOG_ERROR(buf_list, "Camera configuration invalid"); LOG_ERROR(buf_list, "Camera configuration invalid");
} }
#ifdef LIBCAMERA_USES_ORIENTATION
if (buf_list->dev->libcamera->vflip && buf_list->dev->libcamera->hflip) {
configurations->orientation = libcamera::Orientation::Rotate180;
} else if (buf_list->dev->libcamera->vflip) {
configurations->orientation = libcamera::Orientation::Rotate180Mirror;
} else if (buf_list->dev->libcamera->hflip) {
configurations->orientation = libcamera::Orientation::Rotate0Mirror;
}
#else // LIBCAMERA_USES_ORIENTATION
if (buf_list->dev->libcamera->vflip) { if (buf_list->dev->libcamera->vflip) {
configurations->transform |= libcamera::Transform::VFlip; configurations->transform |= libcamera::Transform::VFlip;
} }
@ -108,6 +117,7 @@ int libcamera_buffer_list_open(buffer_list_t *buf_list)
if (!!(configurations->transform & libcamera::Transform::Transpose)) { if (!!(configurations->transform & libcamera::Transform::Transpose)) {
LOG_ERROR(buf_list, "Transformation requiring transpose not supported"); LOG_ERROR(buf_list, "Transformation requiring transpose not supported");
} }
#endif // LIBCAMERA_USES_ORIENTATION
if (buf_list->dev->libcamera->camera->configure(configurations.get()) < 0) { if (buf_list->dev->libcamera->camera->configure(configurations.get()) < 0) {
LOG_ERROR(buf_list, "Failed to configure camera"); LOG_ERROR(buf_list, "Failed to configure camera");

5
device/libcamera/libcamera.hh
View File

@ -7,6 +7,7 @@ extern "C" {
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include "version.h"
#include "device/device.h" #include "device/device.h"
#include "device/buffer_list.h" #include "device/buffer_list.h"
#include "device/buffer.h" #include "device/buffer.h"
@ -29,7 +30,11 @@ extern "C" {
#include <libcamera/request.h> #include <libcamera/request.h>
#include <libcamera/stream.h> #include <libcamera/stream.h>
#include <libcamera/formats.h> #include <libcamera/formats.h>
#ifdef LIBCAMERA_USES_ORIENTATION
#include <libcamera/orientation.h>
#else // LIBCAMERA_USES_ORIENTATION
#include <libcamera/transform.h> #include <libcamera/transform.h>
#endif // LIBCAMERA_USES_ORIENTATION
typedef struct buffer_s buffer_t; typedef struct buffer_s buffer_t;
typedef struct buffer_list_s buffer_list_t; typedef struct buffer_list_s buffer_list_t;

1
tests/libcamera/orientation.cc Normal file
View File

@ -0,0 +1 @@
#include <libcamera/orientation.h>