[libcamera-devel] [PATCH v2 7/9] android: camera_device: Use CameraMetadata wrapper in processControls

Paul Elder paul.elder at ideasonboard.com
Thu Jan 21 11:15:47 CET 2021


Use the CameraMetadata wrapper to access android request settings
instead of accessing camera_metadata_t directly.

Signed-off-by: Paul Elder <paul.elder at ideasonboard.com>

---
New in v2
---
 src/android/camera_device.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 16d5b472..49af221b 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -1639,12 +1639,10 @@ int CameraDevice::processControls(camera3_capture_request_t *camera3Request,
 	 * \todo As soon as more controls are handled, this part should be
 	 * broke out to a dedicated function.
 	 */
-	const camera_metadata_t *camera3Settings = camera3Request->settings;
+	CameraMetadata camera3Settings(camera3Request->settings);
 	camera_metadata_ro_entry_t entry;
-	int ret = find_camera_metadata_ro_entry(camera3Settings,
-						ANDROID_SCALER_CROP_REGION,
-						&entry);
-	if (!ret) {
+	int ret = camera3Settings.getEntry(ANDROID_SCALER_CROP_REGION, &entry);
+	if (ret) {
 		const int32_t *data = entry.data.i32;
 		Rectangle cropRegion = { data[0], data[1],
 					 static_cast<unsigned int>(data[2]),
-- 
2.27.0



More information about the libcamera-devel mailing list