From 637034742f2b0b752402719741ad0ec899c8ba6d Mon Sep 17 00:00:00 2001
From: Jacopo Mondi <jacopo@jmondi.org>
Date: Wed, 4 Sep 2019 16:18:22 +0200
Subject: android: camera_device: Use precise sizes for request template
Use more opportune sizes, manually calculated, for the generated request
template.
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
src/android/camera_device.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'src')
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 969c8192..5f8d19b9 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -547,11 +547,11 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)
if (requestTemplate_)
return requestTemplate_;
- /* \todo Use correct sizes */
- #define REQUEST_TEMPLATE_ENTRIES 30
- #define REQUEST_TEMPLATE_DATA 2048
- requestTemplate_ = allocate_camera_metadata(REQUEST_TEMPLATE_ENTRIES,
- REQUEST_TEMPLATE_DATA);
+ /*
+ * \todo Keep this in sync with the actual number of entries.
+ * Currently: 12 entries, 15 bytes
+ */
+ requestTemplate_ = allocate_camera_metadata(15, 20);
if (!requestTemplate_) {
LOG(HAL, Error) << "Failed to allocate template metadata";
return nullptr;
--
cgit v1.2.1