[libcamera-devel,v4,2/9] android: camera_device: Add frame allocator
diff mbox series

Message ID 20200930132707.19367-3-jacopo@jmondi.org
State Superseded
Headers show
Series
  • android: camera_device: Add support for internal buffers
Related show

Commit Message

Jacopo Mondi Sept. 30, 2020, 1:27 p.m. UTC 
Add a FrameBufferAllocator to the CameraDevice class to handle any
allocations required to satisfy internal stream requirements.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/android/camera_device.cpp | 4 ++--
 src/android/camera_device.h   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

Patch
diff mbox series 

diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index e4ffbc02c2da..d8587647f831 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -211,8 +211,8 @@  CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor()
  */
 
 CameraDevice::CameraDevice(unsigned int id, const std::shared_ptr<Camera> &camera)
-	: id_(id), running_(false), camera_(camera), staticMetadata_(nullptr),
-	  facing_(CAMERA_FACING_FRONT), orientation_(0)
+	: id_(id), running_(false), camera_(camera), allocator_(camera),
+	  staticMetadata_(nullptr), facing_(CAMERA_FACING_FRONT), orientation_(0)
 {
 	camera_->requestCompleted.connect(this, &CameraDevice::requestComplete);
 
diff --git a/src/android/camera_device.h b/src/android/camera_device.h
index 17de963f5fc4..75e3305089d9 100644
--- a/src/android/camera_device.h
+++ b/src/android/camera_device.h
@@ -16,6 +16,7 @@ 
 
 #include <libcamera/buffer.h>
 #include <libcamera/camera.h>
+#include <libcamera/framebuffer_allocator.h>
 #include <libcamera/geometry.h>
 #include <libcamera/request.h>
 #include <libcamera/stream.h>
@@ -206,6 +207,7 @@  private:
 	bool running_;
 	std::shared_ptr<libcamera::Camera> camera_;
 	std::unique_ptr<libcamera::CameraConfiguration> config_;
+	libcamera::FrameBufferAllocator allocator_;
 
 	CameraMetadata *staticMetadata_;
 	std::map<unsigned int, const CameraMetadata *> requestTemplates_;