summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
authorHirokazu Honda <hiroh@chromium.org>2021-12-01 16:53:42 +0900
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-12-01 13:46:48 +0200
commit7e91f951604c17a091b8c05efa1d01eddbcdfdbf (patch)
tree43c43696afc608bfd80caa166c775880499bae90 /src/android
parentc17f172842d17b6036e10b1775e89d0219c3b3f9 (diff)
libcamera: Correct include headers for Mutex classes
Mutex classes are defined in mutex.h. This replaces thread.h include for the Mutex classes with mutex.h. Signed-off-by: Hirokazu Honda <hiroh@chromium.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/camera_device.cpp1
-rw-r--r--src/android/camera_device.h2
-rw-r--r--src/android/camera_hal_manager.h2
-rw-r--r--src/android/camera_request.h2
-rw-r--r--src/android/camera_stream.h1
5 files changed, 4 insertions, 4 deletions
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index ad4bf07c..c7686557 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -14,7 +14,6 @@
#include <vector>
#include <libcamera/base/log.h>
-#include <libcamera/base/thread.h>
#include <libcamera/base/utils.h>
#include <libcamera/control_ids.h>
diff --git a/src/android/camera_device.h b/src/android/camera_device.h
index bda0b376..a945f5de 100644
--- a/src/android/camera_device.h
+++ b/src/android/camera_device.h
@@ -17,7 +17,7 @@
#include <libcamera/base/class.h>
#include <libcamera/base/log.h>
#include <libcamera/base/message.h>
-#include <libcamera/base/thread.h>
+#include <libcamera/base/mutex.h>
#include <libcamera/camera.h>
#include <libcamera/framebuffer.h>
diff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h
index cc310f90..765701b2 100644
--- a/src/android/camera_hal_manager.h
+++ b/src/android/camera_hal_manager.h
@@ -17,7 +17,7 @@
#include <system/camera_metadata.h>
#include <libcamera/base/class.h>
-#include <libcamera/base/thread.h>
+#include <libcamera/base/mutex.h>
#include <libcamera/camera_manager.h>
diff --git a/src/android/camera_request.h b/src/android/camera_request.h
index 88d501a8..887dbe86 100644
--- a/src/android/camera_request.h
+++ b/src/android/camera_request.h
@@ -12,7 +12,7 @@
#include <vector>
#include <libcamera/base/class.h>
-#include <libcamera/base/thread.h>
+#include <libcamera/base/mutex.h>
#include <libcamera/camera.h>
#include <libcamera/framebuffer.h>
diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h
index adb5a37d..e4eb953a 100644
--- a/src/android/camera_stream.h
+++ b/src/android/camera_stream.h
@@ -13,6 +13,7 @@
#include <hardware/camera3.h>
+#include <libcamera/base/mutex.h>
#include <libcamera/base/thread.h>
#include <libcamera/camera.h>