summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
Diffstat (limited to 'src/android')
-rw-r--r--src/android/camera3_hal.cpp2
-rw-r--r--src/android/camera_capabilities.cpp3
-rw-r--r--src/android/camera_device.cpp9
-rw-r--r--src/android/camera_device.h7
-rw-r--r--src/android/camera_hal_config.cpp2
-rw-r--r--src/android/camera_hal_manager.cpp4
-rw-r--r--src/android/camera_metadata.cpp2
-rw-r--r--src/android/camera_worker.h6
-rw-r--r--src/android/jpeg/encoder_libjpeg.cpp3
-rw-r--r--src/android/jpeg/exif.cpp3
-rw-r--r--src/android/jpeg/post_processor_jpeg.cpp4
-rw-r--r--src/android/jpeg/thumbnailer.cpp4
-rw-r--r--src/android/mm/cros_camera_buffer.cpp2
-rw-r--r--src/android/mm/generic_camera_buffer.cpp3
-rw-r--r--src/android/yuv/post_processor_yuv.cpp3
15 files changed, 30 insertions, 27 deletions
diff --git a/src/android/camera3_hal.cpp b/src/android/camera3_hal.cpp
index e6d435e0..da836bae 100644
--- a/src/android/camera3_hal.cpp
+++ b/src/android/camera3_hal.cpp
@@ -7,7 +7,7 @@
#include <hardware/camera_common.h>
-#include "libcamera/internal/log.h"
+#include <libcamera/base/log.h>
#include "camera_device.h"
#include "camera_hal_manager.h"
diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp
index 00224a6d..6b5edb66 100644
--- a/src/android/camera_capabilities.cpp
+++ b/src/android/camera_capabilities.cpp
@@ -12,12 +12,13 @@
#include <hardware/camera3.h>
+#include <libcamera/base/log.h>
+
#include <libcamera/control_ids.h>
#include <libcamera/controls.h>
#include <libcamera/property_ids.h>
#include "libcamera/internal/formats.h"
-#include "libcamera/internal/log.h"
using namespace libcamera;
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 6243c07e..86ea22b6 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -15,16 +15,15 @@
#include <unistd.h>
#include <vector>
+#include <libcamera/base/log.h>
+#include <libcamera/base/thread.h>
+#include <libcamera/base/utils.h>
+
#include <libcamera/control_ids.h>
#include <libcamera/controls.h>
#include <libcamera/formats.h>
#include <libcamera/property_ids.h>
-#include <libcamera/base/utils.h>
-
-#include "libcamera/internal/log.h"
-#include "libcamera/internal/thread.h"
-
#include "system/graphics.h"
using namespace libcamera;
diff --git a/src/android/camera_device.h b/src/android/camera_device.h
index 090fe28a..4747f577 100644
--- a/src/android/camera_device.h
+++ b/src/android/camera_device.h
@@ -14,15 +14,16 @@
#include <hardware/camera3.h>
+#include <libcamera/base/log.h>
+#include <libcamera/base/message.h>
+#include <libcamera/base/thread.h>
+
#include <libcamera/buffer.h>
#include <libcamera/camera.h>
#include <libcamera/request.h>
#include <libcamera/stream.h>
#include "libcamera/internal/buffer.h"
-#include "libcamera/internal/log.h"
-#include "libcamera/internal/message.h"
-#include "libcamera/internal/thread.h"
#include "camera_capabilities.h"
#include "camera_metadata.h"
diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp
index f33ba269..d84de4fd 100644
--- a/src/android/camera_hal_config.cpp
+++ b/src/android/camera_hal_config.cpp
@@ -21,7 +21,7 @@ namespace filesystem = std::experimental::filesystem;
#include <hardware/camera3.h>
-#include "libcamera/internal/log.h"
+#include <libcamera/base/log.h>
using namespace libcamera;
diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp
index 54087d3a..4cd67544 100644
--- a/src/android/camera_hal_manager.cpp
+++ b/src/android/camera_hal_manager.cpp
@@ -7,11 +7,11 @@
#include "camera_hal_manager.h"
+#include <libcamera/base/log.h>
+
#include <libcamera/camera.h>
#include <libcamera/property_ids.h>
-#include "libcamera/internal/log.h"
-
#include "camera_device.h"
using namespace libcamera;
diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp
index c7298d62..3fc7cf27 100644
--- a/src/android/camera_metadata.cpp
+++ b/src/android/camera_metadata.cpp
@@ -7,7 +7,7 @@
#include "camera_metadata.h"
-#include "libcamera/internal/log.h"
+#include <libcamera/base/log.h>
using namespace libcamera;
diff --git a/src/android/camera_worker.h b/src/android/camera_worker.h
index e289ef9b..6e1aee4a 100644
--- a/src/android/camera_worker.h
+++ b/src/android/camera_worker.h
@@ -9,14 +9,14 @@
#include <memory>
+#include <libcamera/base/object.h>
+#include <libcamera/base/thread.h>
+
#include <libcamera/buffer.h>
#include <libcamera/camera.h>
-#include <libcamera/object.h>
#include <libcamera/request.h>
#include <libcamera/stream.h>
-#include "libcamera/internal/thread.h"
-
class CameraDevice;
class CaptureRequest
diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp
index f006e1d1..e6358ca9 100644
--- a/src/android/jpeg/encoder_libjpeg.cpp
+++ b/src/android/jpeg/encoder_libjpeg.cpp
@@ -16,12 +16,13 @@
#include <unistd.h>
#include <vector>
+#include <libcamera/base/log.h>
+
#include <libcamera/camera.h>
#include <libcamera/formats.h>
#include <libcamera/pixel_format.h>
#include "libcamera/internal/formats.h"
-#include "libcamera/internal/log.h"
using namespace libcamera;
diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp
index 747f1cfa..0ba4cb85 100644
--- a/src/android/jpeg/exif.cpp
+++ b/src/android/jpeg/exif.cpp
@@ -14,10 +14,9 @@
#include <tuple>
#include <uchar.h>
+#include <libcamera/base/log.h>
#include <libcamera/base/utils.h>
-#include "libcamera/internal/log.h"
-
using namespace libcamera;
LOG_DEFINE_CATEGORY(EXIF)
diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp
index 058ccc99..0e93f365 100644
--- a/src/android/jpeg/post_processor_jpeg.cpp
+++ b/src/android/jpeg/post_processor_jpeg.cpp
@@ -14,9 +14,9 @@
#include "encoder_libjpeg.h"
#include "exif.h"
-#include <libcamera/formats.h>
+#include <libcamera/base/log.h>
-#include "libcamera/internal/log.h"
+#include <libcamera/formats.h>
using namespace libcamera;
using namespace std::chrono_literals;
diff --git a/src/android/jpeg/thumbnailer.cpp b/src/android/jpeg/thumbnailer.cpp
index f709d343..5cb00744 100644
--- a/src/android/jpeg/thumbnailer.cpp
+++ b/src/android/jpeg/thumbnailer.cpp
@@ -7,9 +7,9 @@
#include "thumbnailer.h"
-#include <libcamera/formats.h>
+#include <libcamera/base/log.h>
-#include "libcamera/internal/log.h"
+#include <libcamera/formats.h>
using namespace libcamera;
diff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp
index c4157606..0008d261 100644
--- a/src/android/mm/cros_camera_buffer.cpp
+++ b/src/android/mm/cros_camera_buffer.cpp
@@ -7,7 +7,7 @@
#include "../camera_buffer.h"
-#include "libcamera/internal/log.h"
+#include <libcamera/base/log.h>
#include "cros-camera/camera_buffer_manager.h"
diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp
index cca88cf3..326fdc06 100644
--- a/src/android/mm/generic_camera_buffer.cpp
+++ b/src/android/mm/generic_camera_buffer.cpp
@@ -9,8 +9,9 @@
#include <unistd.h>
+#include <libcamera/base/log.h>
+
#include "libcamera/internal/buffer.h"
-#include "libcamera/internal/log.h"
using namespace libcamera;
diff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp
index b67364c8..772e805b 100644
--- a/src/android/yuv/post_processor_yuv.cpp
+++ b/src/android/yuv/post_processor_yuv.cpp
@@ -9,12 +9,13 @@
#include <libyuv/scale.h>
+#include <libcamera/base/log.h>
+
#include <libcamera/formats.h>
#include <libcamera/geometry.h>
#include <libcamera/pixel_format.h>
#include "libcamera/internal/formats.h"
-#include "libcamera/internal/log.h"
using namespace libcamera;
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-17 11:46:01 +0000