From b4c3db4c015082a2866e3e546b74d3b3de253d7f Mon Sep 17 00:00:00 2001
From: Paul Elder <paul.elder@ideasonboard.com>
Date: Wed, 26 May 2021 18:22:04 +0900
Subject: android: camera_device: Simplify leftover CameraMetadata calls

There were some CameraMetadata calls that were left in the old version.
Update them.

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
---
 src/android/camera_device.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/android')

diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index aca273cc..8c71fd06 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -931,7 +931,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
 		{ 0, 1 }
 	};
 	staticMetadata_->addEntry(ANDROID_CONTROL_AE_COMPENSATION_STEP,
-				  aeCompensationStep, 1);
+				  aeCompensationStep);
 
 	std::vector<uint8_t> availableAfModes = {
 		ANDROID_CONTROL_AF_MODE_OFF,
@@ -1153,7 +1153,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
 	/* Statistics static metadata. */
 	uint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;
 	staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES,
-				  &faceDetectMode, 1);
+				  faceDetectMode);
 
 	int32_t maxFaceCount = 0;
 	staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_MAX_FACE_COUNT,
@@ -1273,8 +1273,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
 			ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT);
 	}
 	staticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS,
-				  availableStreamConfigurations.data(),
-				  availableStreamConfigurations.size());
+				  availableStreamConfigurations);
 
 	std::vector<int64_t> availableStallDurations = {
 		ANDROID_SCALER_AVAILABLE_FORMATS_BLOB, 2560, 1920, 33333333,
-- 
cgit v1.2.1