libcamera: support transform to orientation rename

ayufan · Nov 27, 2023 · bc23191 · bc23191
1 parent 3c116f2
commit bc23191
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -61,6 +61,7 @@ endif
 
 HTML_SRC = $(addsuffix .c,$(HTML))
 OBJS = $(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(SRC) $(HTML_SRC)))
+TARGET_OBJS = $(filter-out third_party/%, $(filter-out tests/%, $(OBJS)))
 
 all: version
 	+make $(TARGET)
@@ -73,11 +74,16 @@ endif
 
 .PHONY: version
 version:
-	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; \
-		rm -f version.h.tmp
-
-%: cmd/% $(filter-out third_party/%, $(OBJS))
+	echo "#define GIT_VERSION \"$(GIT_VERSION)\"\n#define GIT_REVISION \"$(GIT_REVISION)\"" > version.h.tmp
+	if $(CXX) $(CFLAGS) -o /dev/null -c tests/libcamera/orientation.cc 2>/dev/null; then \
+		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/% $(TARGET_OBJS)
 	$(CCACHE) $(CXX) $(CFLAGS) -o $@ $(filter-out cmd/%, $^) $(filter $</%, $^) $(LDLIBS)
 
 install: $(TARGET)

diff --git a/device/libcamera/buffer_list.cc b/device/libcamera/buffer_list.cc
@@ -99,6 +99,15 @@ int libcamera_buffer_list_open(buffer_list_t *buf_list)
   if (configurations->validate() == libcamera::CameraConfiguration::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) {
     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)) {
     LOG_ERROR(buf_list, "Transformation requiring transpose not supported");
   }
+#endif // LIBCAMERA_USES_ORIENTATION
 
   if (buf_list->dev->libcamera->camera->configure(configurations.get()) < 0) {
     LOG_ERROR(buf_list, "Failed to configure camera");

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

diff --git a/tests/libcamera/orientation.cc b/tests/libcamera/orientation.cc
@@ -0,0 +1 @@
+#include <libcamera/orientation.h>