summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2019-09-04 16:18:22 +0200
committerJacopo Mondi <jacopo@jmondi.org>2019-09-05 23:07:53 +0200
commit637034742f2b0b752402719741ad0ec899c8ba6d (patch)
treea968908b552413e5efee4c55eb7d593aa7858eb9 /src/android
parent9b361dc4bcb901e6a7de92202b16cafe91899bd4 (diff)
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>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/camera_device.cpp10
1 files changed, 5 insertions, 5 deletions
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;