summaryrefslogtreecommitdiff
path: root/src/android/camera_device.h
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2021-10-25 11:47:44 +0200
committerJacopo Mondi <jacopo@jmondi.org>2021-12-11 17:53:40 +0100
commit015fa7f718156f59d233b48653211d08f5567760 (patch)
treeec74e14c9c76a46b9630c5f7233cf24914a9175a /src/android/camera_device.h
parenta71834e1a0f951772bb7efaa8d4a4b296718d1ec (diff)
android: Remove CameraWorker
The CameraWorker class purpose was to handle acquire fences for incoming capture requests directed to libcamera. Now that fences are handled by the core library, it is not required to handle them in the HAL and the CameraWorker and CaptureRequest classes can be dropped. Update the core in CameraDevice class accordingly to queue Requests directly to the libcamera::Camera and set the release_fence to the value of the FrameBuffer::fence() for streams of type ::Direct. While at it make CameraRequest::StreamBuffer::fence a UniqueFD to ease the management of the fences file descriptor values. Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/android/camera_device.h')
-rw-r--r--src/android/camera_device.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/android/camera_device.h b/src/android/camera_device.h
index e5d9cda2..64050416 100644
--- a/src/android/camera_device.h
+++ b/src/android/camera_device.h
@@ -29,7 +29,6 @@
#include "camera_capabilities.h"
#include "camera_metadata.h"
#include "camera_stream.h"
-#include "camera_worker.h"
#include "jpeg/encoder.h"
class Camera3RequestDescriptor;
@@ -105,8 +104,6 @@ private:
unsigned int id_;
camera3_device_t camera3Device_;
- CameraWorker worker_;
-
libcamera::Mutex stateMutex_; /* Protects access to the camera state. */
State state_ LIBCAMERA_TSA_GUARDED_BY(stateMutex_);