[{"id":16925,"web_url":"https://patchwork.libcamera.org/comment/16925/","msgid":"","date":"2021-05-13T03:31:43","subject":"Re: [libcamera-devel] [PATCH v3 2/3] android: camera_device: Use\n\tthe new CameraMetadata functions","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/people/63/","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"content":"Hi Paul, thank you for this patch,\n\nOn Wed, May 12, 2021 at 7:25 PM Paul Elder \nwrote:\n\n> Now that CameraMetadata supports more convenient functions, use those\n> instead.\n>\n> Signed-off-by: Paul Elder \n>\n> ---\n> New in v3\n> ---\n> src/android/camera_device.cpp | 241 +++++++++++++++-------------------\n> 1 file changed, 105 insertions(+), 136 deletions(-)\n>\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 74f6915c..1bafb339 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -803,7 +803,7 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n>\n> data.push_back(ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF);\n> }\n>\n> staticMetadata_->addEntry(ANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES,\n> - data.data(), data.size());\n> + data);\n> }\n>\n> /* Control static metadata. */\n> @@ -814,15 +814,13 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> ANDROID_CONTROL_AE_ANTIBANDING_MODE_AUTO,\n> };\n>\n> staticMetadata_->addEntry(ANDROID_CONTROL_AE_AVAILABLE_ANTIBANDING_MODES,\n> - aeAvailableAntiBandingModes.data(),\n> - aeAvailableAntiBandingModes.size());\n> + aeAvailableAntiBandingModes);\n>\n> std::vector aeAvailableModes = {\n> ANDROID_CONTROL_AE_MODE_ON,\n> };\n> staticMetadata_->addEntry(ANDROID_CONTROL_AE_AVAILABLE_MODES,\n> - aeAvailableModes.data(),\n> - aeAvailableModes.size());\n> + aeAvailableModes);\n>\n> int64_t minFrameDurationNsec = -1;\n> int64_t maxFrameDurationNsec = -1;\n> @@ -871,8 +869,7 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> 0, 0,\n> };\n> staticMetadata_->addEntry(ANDROID_CONTROL_AE_COMPENSATION_RANGE,\n> - aeCompensationRange.data(),\n> - aeCompensationRange.size());\n> + aeCompensationRange);\n>\n> const camera_metadata_rational_t aeCompensationStep[] = {\n> { 0, 1 }\n> @@ -884,29 +881,25 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> ANDROID_CONTROL_AF_MODE_OFF,\n> };\n> staticMetadata_->addEntry(ANDROID_CONTROL_AF_AVAILABLE_MODES,\n> - availableAfModes.data(),\n> - availableAfModes.size());\n> + availableAfModes);\n>\n> std::vector availableEffects = {\n> ANDROID_CONTROL_EFFECT_MODE_OFF,\n> };\n> staticMetadata_->addEntry(ANDROID_CONTROL_AVAILABLE_EFFECTS,\n> - availableEffects.data(),\n> - availableEffects.size());\n> + availableEffects);\n>\n> std::vector availableSceneModes = {\n> ANDROID_CONTROL_SCENE_MODE_DISABLED,\n> };\n> staticMetadata_->addEntry(ANDROID_CONTROL_AVAILABLE_SCENE_MODES,\n> - availableSceneModes.data(),\n> - availableSceneModes.size());\n> + availableSceneModes);\n>\n> std::vector availableStabilizationModes = {\n> ANDROID_CONTROL_VIDEO_STABILIZATION_MODE_OFF,\n> };\n>\n> staticMetadata_->addEntry(ANDROID_CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES,\n> - availableStabilizationModes.data(),\n> - availableStabilizationModes.size());\n> + availableStabilizationModes);\n>\n> /*\n> * \\todo Inspect the Camera capabilities to report the available\n> @@ -916,15 +909,13 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> ANDROID_CONTROL_AWB_MODE_AUTO,\n> };\n> staticMetadata_->addEntry(ANDROID_CONTROL_AWB_AVAILABLE_MODES,\n> - availableAwbModes.data(),\n> - availableAwbModes.size());\n> + availableAwbModes);\n>\n> std::vector availableMaxRegions = {\n> 0, 0, 0,\n> };\n> staticMetadata_->addEntry(ANDROID_CONTROL_MAX_REGIONS,\n> - availableMaxRegions.data(),\n> - availableMaxRegions.size());\n> + availableMaxRegions);\n>\n> std::vector sceneModesOverride = {\n> ANDROID_CONTROL_AE_MODE_ON,\n> @@ -932,20 +923,19 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> ANDROID_CONTROL_AF_MODE_OFF,\n> };\n> staticMetadata_->addEntry(ANDROID_CONTROL_SCENE_MODE_OVERRIDES,\n> - sceneModesOverride.data(),\n> - sceneModesOverride.size());\n> + sceneModesOverride);\n>\n> uint8_t aeLockAvailable = ANDROID_CONTROL_AE_LOCK_AVAILABLE_FALSE;\n> staticMetadata_->addEntry(ANDROID_CONTROL_AE_LOCK_AVAILABLE,\n> - &aeLockAvailable, 1);\n> + aeLockAvailable);\n>\n> uint8_t awbLockAvailable =\n> ANDROID_CONTROL_AWB_LOCK_AVAILABLE_FALSE;\n> staticMetadata_->addEntry(ANDROID_CONTROL_AWB_LOCK_AVAILABLE,\n> - &awbLockAvailable, 1);\n> + awbLockAvailable);\n>\n> char availableControlModes = ANDROID_CONTROL_MODE_AUTO;\n> staticMetadata_->addEntry(ANDROID_CONTROL_AVAILABLE_MODES,\n> - &availableControlModes, 1);\n> + availableControlModes);\n>\n> /* JPEG static metadata. */\n>\n> @@ -983,9 +973,9 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> thumbnailEntries.push_back(size.height);\n> }\n> staticMetadata_->addEntry(ANDROID_JPEG_AVAILABLE_THUMBNAIL_SIZES,\n> - thumbnailEntries.data(),\n> thumbnailEntries.size());\n> + thumbnailEntries);\n>\n> - staticMetadata_->addEntry(ANDROID_JPEG_MAX_SIZE,\n> &maxJpegBufferSize_, 1);\n> + staticMetadata_->addEntry(ANDROID_JPEG_MAX_SIZE,\n> maxJpegBufferSize_);\n>\n> /* Sensor static metadata. */\n> std::array pixelArraySize;\n> @@ -994,7 +984,7 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> pixelArraySize[0] = size.width;\n> pixelArraySize[1] = size.height;\n>\n> staticMetadata_->addEntry(ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE,\n> - pixelArraySize.data(),\n> pixelArraySize.size());\n> + pixelArraySize.data(), 2);\n> }\n>\n> if (properties.contains(properties::UnitCellSize)) {\n> @@ -1004,7 +994,7 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> cellSize.height * pixelArraySize[1] / 1e6f\n> };\n>\n> staticMetadata_->addEntry(ANDROID_SENSOR_INFO_PHYSICAL_SIZE,\n> - physicalSize.data(),\n> physicalSize.size());\n> + physicalSize.data(), 2);\n> }\n>\n> {\n> @@ -1017,20 +1007,20 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> static_cast(rects[0].height),\n> };\n>\n> staticMetadata_->addEntry(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE,\n> - data.data(), data.size());\n> + data);\n> }\n>\n> int32_t sensitivityRange[] = {\n> 32, 2400,\n> };\n> staticMetadata_->addEntry(ANDROID_SENSOR_INFO_SENSITIVITY_RANGE,\n> - &sensitivityRange, 2);\n> + sensitivityRange, 2);\n>\n> /* Report the color filter arrangement if the camera reports it. */\n> if\n> (properties.contains(properties::draft::ColorFilterArrangement)) {\n> uint8_t filterArr =\n> properties.get(properties::draft::ColorFilterArrangement);\n>\n> staticMetadata_->addEntry(ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT,\n> - &filterArr, 1);\n> + filterArr);\n> }\n>\n> const auto &exposureInfo =\n> controlsInfo.find(&controls::ExposureTime);\n> @@ -1040,25 +1030,24 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> exposureInfo->second.max().get() * 1000LL,\n> };\n>\n> staticMetadata_->addEntry(ANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE,\n> - &exposureTimeRange, 2);\n> + exposureTimeRange, 2);\n> }\n>\n> - staticMetadata_->addEntry(ANDROID_SENSOR_ORIENTATION,\n> &orientation_, 1);\n> + staticMetadata_->addEntry(ANDROID_SENSOR_ORIENTATION,\n> orientation_);\n>\n> std::vector testPatterModes = {\n> ANDROID_SENSOR_TEST_PATTERN_MODE_OFF,\n> };\n>\n> staticMetadata_->addEntry(ANDROID_SENSOR_AVAILABLE_TEST_PATTERN_MODES,\n> - testPatterModes.data(),\n> - testPatterModes.size());\n> + testPatterModes);\n>\n> uint8_t timestampSource =\n> ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE_UNKNOWN;\n> staticMetadata_->addEntry(ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE,\n> - ×tampSource, 1);\n> + timestampSource);\n>\n> if (maxFrameDurationNsec > 0)\n>\n> staticMetadata_->addEntry(ANDROID_SENSOR_INFO_MAX_FRAME_DURATION,\n> - &maxFrameDurationNsec, 1);\n> + maxFrameDurationNsec);\n>\n> /* Statistics static metadata. */\n> uint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n> @@ -1067,7 +1056,7 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n>\n> int32_t maxFaceCount = 0;\n> staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_MAX_FACE_COUNT,\n> - &maxFaceCount, 1);\n> + maxFaceCount);\n>\n> {\n> std::vector data;\n> @@ -1080,25 +1069,24 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n>\n> data.push_back(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF);\n> }\n>\n> staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES,\n> - data.data(), data.size());\n> + data);\n> }\n>\n> /* Sync static metadata. */\n> int32_t maxLatency = ANDROID_SYNC_MAX_LATENCY_UNKNOWN;\n> - staticMetadata_->addEntry(ANDROID_SYNC_MAX_LATENCY, &maxLatency,\n> 1);\n> + staticMetadata_->addEntry(ANDROID_SYNC_MAX_LATENCY, maxLatency);\n>\n> /* Flash static metadata. */\n> char flashAvailable = ANDROID_FLASH_INFO_AVAILABLE_FALSE;\n> staticMetadata_->addEntry(ANDROID_FLASH_INFO_AVAILABLE,\n> - &flashAvailable, 1);\n> + flashAvailable);\n>\n> /* Lens static metadata. */\n> std::vector lensApertures = {\n> 2.53 / 100,\n> };\n> staticMetadata_->addEntry(ANDROID_LENS_INFO_AVAILABLE_APERTURES,\n> - lensApertures.data(),\n> - lensApertures.size());\n> + lensApertures);\n>\n> uint8_t lensFacing;\n> switch (facing_) {\n> @@ -1113,29 +1101,27 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> lensFacing = ANDROID_LENS_FACING_EXTERNAL;\n> break;\n> }\n> - staticMetadata_->addEntry(ANDROID_LENS_FACING, &lensFacing, 1);\n> + staticMetadata_->addEntry(ANDROID_LENS_FACING, lensFacing);\n>\n> - std::vector lensFocalLenghts = {\n> + std::vector lensFocalLengths = {\n> 1,\n> };\n>\n> staticMetadata_->addEntry(ANDROID_LENS_INFO_AVAILABLE_FOCAL_LENGTHS,\n> - lensFocalLenghts.data(),\n> - lensFocalLenghts.size());\n> + lensFocalLengths);\n>\n> std::vector opticalStabilizations = {\n> ANDROID_LENS_OPTICAL_STABILIZATION_MODE_OFF,\n> };\n>\n> staticMetadata_->addEntry(ANDROID_LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION,\n> - opticalStabilizations.data(),\n> - opticalStabilizations.size());\n> + opticalStabilizations);\n>\n> float hypeFocalDistance = 0;\n> staticMetadata_->addEntry(ANDROID_LENS_INFO_HYPERFOCAL_DISTANCE,\n> - &hypeFocalDistance, 1);\n> + hypeFocalDistance);\n>\n> float minFocusDistance = 0;\n> staticMetadata_->addEntry(ANDROID_LENS_INFO_MINIMUM_FOCUS_DISTANCE,\n> - &minFocusDistance, 1);\n> + minFocusDistance);\n>\n> /* Noise reduction modes. */\n> {\n> @@ -1149,7 +1135,7 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> data.push_back(ANDROID_NOISE_REDUCTION_MODE_OFF);\n> }\n>\n> staticMetadata_->addEntry(ANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,\n> - data.data(), data.size());\n> + data);\n> }\n>\n> /* Scaler static metadata. */\n> @@ -1174,7 +1160,7 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> 1.0f * max.height / min.height);\n> }\n>\n> staticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,\n> - &maxZoom, 1);\n> + maxZoom);\n>\n> std::vector availableStreamConfigurations;\n> availableStreamConfigurations.reserve(streamConfigurations_.size()\n> * 4);\n> @@ -1193,8 +1179,7 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> ANDROID_SCALER_AVAILABLE_FORMATS_BLOB, 2560, 1920,\n> 33333333,\n> };\n> staticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_STALL_DURATIONS,\n> - availableStallDurations.data(),\n> - availableStallDurations.size());\n> + availableStallDurations);\n>\n> /* Use the minimum frame duration for all the YUV/RGB formats. */\n> if (minFrameDurationNsec > 0) {\n> @@ -1207,22 +1192,21 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> minFrameDurations.push_back(minFrameDurationNsec);\n> }\n>\n> staticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS,\n> - minFrameDurations.data(),\n> - minFrameDurations.size());\n> + minFrameDurations);\n> }\n>\n> uint8_t croppingType = ANDROID_SCALER_CROPPING_TYPE_CENTER_ONLY;\n> - staticMetadata_->addEntry(ANDROID_SCALER_CROPPING_TYPE,\n> &croppingType, 1);\n> + staticMetadata_->addEntry(ANDROID_SCALER_CROPPING_TYPE,\n> croppingType);\n>\n> /* Info static metadata. */\n> uint8_t supportedHWLevel =\n> ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;\n> staticMetadata_->addEntry(ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL,\n> - &supportedHWLevel, 1);\n> + supportedHWLevel);\n>\n> /* Request static metadata. */\n> int32_t partialResultCount = 1;\n> staticMetadata_->addEntry(ANDROID_REQUEST_PARTIAL_RESULT_COUNT,\n> - &partialResultCount, 1);\n> + partialResultCount);\n>\n> {\n> /* Default the value to 2 if not reported by the camera. */\n> @@ -1231,13 +1215,13 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> if (infoMap != controlsInfo.end())\n> maxPipelineDepth =\n> infoMap->second.max().get();\n>\n> staticMetadata_->addEntry(ANDROID_REQUEST_PIPELINE_MAX_DEPTH,\n> - &maxPipelineDepth, 1);\n> + maxPipelineDepth);\n> }\n>\n> /* LIMITED does not support reprocessing. */\n> uint32_t maxNumInputStreams = 0;\n> staticMetadata_->addEntry(ANDROID_REQUEST_MAX_NUM_INPUT_STREAMS,\n> - &maxNumInputStreams, 1);\n> + maxNumInputStreams);\n>\n> std::vector availableCapabilities = {\n> ANDROID_REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE,\n> @@ -1261,11 +1245,10 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> /* Number of { RAW, YUV, JPEG } supported output streams */\n> int32_t numOutStreams[] = { rawStreamAvailable, 2, 1 };\n> staticMetadata_->addEntry(ANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS,\n> - &numOutStreams, 3);\n> + numOutStreams, 3);\n>\n\nYou can remove 3 if you use Span as I suggested.\nditto to others.\n\n-Hiro\n\n>\n> staticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_CAPABILITIES,\n> - availableCapabilities.data(),\n> - availableCapabilities.size());\n> + availableCapabilities);\n>\n> std::vector availableCharacteristicsKeys = {\n> ANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES,\n> @@ -1320,8 +1303,7 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> ANDROID_SYNC_MAX_LATENCY,\n> };\n>\n> staticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_CHARACTERISTICS_KEYS,\n> - availableCharacteristicsKeys.data(),\n> - availableCharacteristicsKeys.size());\n> + availableCharacteristicsKeys);\n>\n> std::vector availableRequestKeys = {\n> ANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n> @@ -1352,8 +1334,7 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> ANDROID_STATISTICS_FACE_DETECT_MODE\n> };\n> staticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_REQUEST_KEYS,\n> - availableRequestKeys.data(),\n> - availableRequestKeys.size());\n> + availableRequestKeys);\n>\n> std::vector availableResultKeys = {\n> ANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n> @@ -1402,8 +1383,7 @@ const camera_metadata_t\n> *CameraDevice::getStaticMetadata()\n> ANDROID_STATISTICS_SCENE_FLICKER,\n> };\n> staticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_RESULT_KEYS,\n> - availableResultKeys.data(),\n> - availableResultKeys.size());\n> + availableResultKeys);\n>\n> if (!staticMetadata_->isValid()) {\n> LOG(HAL, Error) << \"Failed to construct static metadata\";\n> @@ -1442,69 +1422,63 @@ std::unique_ptr\n> CameraDevice::requestTemplatePreview()\n> entry.data.i32, 2);\n>\n> uint8_t aeMode = ANDROID_CONTROL_AE_MODE_ON;\n> - requestTemplate->addEntry(ANDROID_CONTROL_AE_MODE,\n> - &aeMode, 1);\n> + requestTemplate->addEntry(ANDROID_CONTROL_AE_MODE, aeMode);\n>\n> int32_t aeExposureCompensation = 0;\n> requestTemplate->addEntry(ANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,\n> - &aeExposureCompensation, 1);\n> + aeExposureCompensation);\n>\n> uint8_t aePrecaptureTrigger =\n> ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_IDLE;\n> requestTemplate->addEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n> - &aePrecaptureTrigger, 1);\n> + aePrecaptureTrigger);\n>\n> uint8_t aeLock = ANDROID_CONTROL_AE_LOCK_OFF;\n> - requestTemplate->addEntry(ANDROID_CONTROL_AE_LOCK,\n> - &aeLock, 1);\n> + requestTemplate->addEntry(ANDROID_CONTROL_AE_LOCK, aeLock);\n>\n> uint8_t aeAntibandingMode =\n> ANDROID_CONTROL_AE_ANTIBANDING_MODE_AUTO;\n> requestTemplate->addEntry(ANDROID_CONTROL_AE_ANTIBANDING_MODE,\n> - &aeAntibandingMode, 1);\n> + aeAntibandingMode);\n>\n> uint8_t afMode = ANDROID_CONTROL_AF_MODE_OFF;\n> - requestTemplate->addEntry(ANDROID_CONTROL_AF_MODE, &afMode, 1);\n> + requestTemplate->addEntry(ANDROID_CONTROL_AF_MODE, afMode);\n>\n> uint8_t afTrigger = ANDROID_CONTROL_AF_TRIGGER_IDLE;\n> - requestTemplate->addEntry(ANDROID_CONTROL_AF_TRIGGER,\n> - &afTrigger, 1);\n> + requestTemplate->addEntry(ANDROID_CONTROL_AF_TRIGGER, afTrigger);\n>\n> uint8_t awbMode = ANDROID_CONTROL_AWB_MODE_AUTO;\n> - requestTemplate->addEntry(ANDROID_CONTROL_AWB_MODE,\n> - &awbMode, 1);\n> + requestTemplate->addEntry(ANDROID_CONTROL_AWB_MODE, awbMode);\n>\n> uint8_t awbLock = ANDROID_CONTROL_AWB_LOCK_OFF;\n> - requestTemplate->addEntry(ANDROID_CONTROL_AWB_LOCK,\n> - &awbLock, 1);\n> + requestTemplate->addEntry(ANDROID_CONTROL_AWB_LOCK, awbLock);\n>\n> uint8_t flashMode = ANDROID_FLASH_MODE_OFF;\n> - requestTemplate->addEntry(ANDROID_FLASH_MODE,\n> - &flashMode, 1);\n> + requestTemplate->addEntry(ANDROID_FLASH_MODE, flashMode);\n>\n> uint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n> requestTemplate->addEntry(ANDROID_STATISTICS_FACE_DETECT_MODE,\n> - &faceDetectMode, 1);\n> + faceDetectMode);\n>\n> uint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_OFF;\n> requestTemplate->addEntry(ANDROID_NOISE_REDUCTION_MODE,\n> - &noiseReduction, 1);\n> + noiseReduction);\n>\n> uint8_t aberrationMode =\n> ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF;\n> requestTemplate->addEntry(ANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n> - &aberrationMode, 1);\n> + aberrationMode);\n>\n> uint8_t controlMode = ANDROID_CONTROL_MODE_AUTO;\n> - requestTemplate->addEntry(ANDROID_CONTROL_MODE, &controlMode, 1);\n> + requestTemplate->addEntry(ANDROID_CONTROL_MODE, controlMode);\n>\n> float lensAperture = 2.53 / 100;\n> - requestTemplate->addEntry(ANDROID_LENS_APERTURE, &lensAperture, 1);\n> + requestTemplate->addEntry(ANDROID_LENS_APERTURE, lensAperture);\n>\n> uint8_t opticalStabilization =\n> ANDROID_LENS_OPTICAL_STABILIZATION_MODE_OFF;\n> requestTemplate->addEntry(ANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n> - &opticalStabilization, 1);\n> + opticalStabilization);\n>\n> uint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW;\n> requestTemplate->addEntry(ANDROID_CONTROL_CAPTURE_INTENT,\n> - &captureIntent, 1);\n> + captureIntent);\n>\n> return requestTemplate;\n> }\n> @@ -1580,7 +1554,7 @@ const camera_metadata_t\n> *CameraDevice::constructDefaultRequestSettings(int type)\n> }\n>\n> requestTemplate->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT,\n> - &captureIntent, 1);\n> + captureIntent);\n>\n> requestTemplates_[type] = std::move(requestTemplate);\n> return requestTemplates_[type]->get();\n> @@ -2154,20 +2128,20 @@ CameraDevice::getResultMetadata(const\n> Camera3RequestDescriptor &descriptor) cons\n>\n> uint8_t value = ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF;\n> resultMetadata->addEntry(ANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n> - &value, 1);\n> + value);\n>\n> value = ANDROID_CONTROL_AE_ANTIBANDING_MODE_OFF;\n> - resultMetadata->addEntry(ANDROID_CONTROL_AE_ANTIBANDING_MODE,\n> &value, 1);\n> + resultMetadata->addEntry(ANDROID_CONTROL_AE_ANTIBANDING_MODE,\n> value);\n>\n> int32_t value32 = 0;\n> resultMetadata->addEntry(ANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,\n> - &value32, 1);\n> + value32);\n>\n> value = ANDROID_CONTROL_AE_LOCK_OFF;\n> - resultMetadata->addEntry(ANDROID_CONTROL_AE_LOCK, &value, 1);\n> + resultMetadata->addEntry(ANDROID_CONTROL_AE_LOCK, value);\n>\n> value = ANDROID_CONTROL_AE_MODE_ON;\n> - resultMetadata->addEntry(ANDROID_CONTROL_AE_MODE, &value, 1);\n> + resultMetadata->addEntry(ANDROID_CONTROL_AE_MODE, value);\n>\n> if (settings.getEntry(ANDROID_CONTROL_AE_TARGET_FPS_RANGE, &entry))\n> /*\n> @@ -2178,109 +2152,104 @@ CameraDevice::getResultMetadata(const\n> Camera3RequestDescriptor &descriptor) cons\n>\n> resultMetadata->addEntry(ANDROID_CONTROL_AE_TARGET_FPS_RANGE,\n> entry.data.i32, 2);\n>\n> - value = ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_IDLE;\n> found = settings.getEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n> &entry);\n> - resultMetadata->addEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n> - found ? entry.data.u8 : &value, 1);\n> + value = found ? *entry.data.u8 :\n> +\n> (uint8_t)ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_IDLE;\n> + resultMetadata->addEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n> value);\n>\n> value = ANDROID_CONTROL_AE_STATE_CONVERGED;\n> - resultMetadata->addEntry(ANDROID_CONTROL_AE_STATE, &value, 1);\n> + resultMetadata->addEntry(ANDROID_CONTROL_AE_STATE, value);\n>\n> value = ANDROID_CONTROL_AF_MODE_OFF;\n> - resultMetadata->addEntry(ANDROID_CONTROL_AF_MODE, &value, 1);\n> + resultMetadata->addEntry(ANDROID_CONTROL_AF_MODE, value);\n>\n> value = ANDROID_CONTROL_AF_STATE_INACTIVE;\n> - resultMetadata->addEntry(ANDROID_CONTROL_AF_STATE, &value, 1);\n> + resultMetadata->addEntry(ANDROID_CONTROL_AF_STATE, value);\n>\n> value = ANDROID_CONTROL_AF_TRIGGER_IDLE;\n> - resultMetadata->addEntry(ANDROID_CONTROL_AF_TRIGGER, &value, 1);\n> + resultMetadata->addEntry(ANDROID_CONTROL_AF_TRIGGER, value);\n>\n> value = ANDROID_CONTROL_AWB_MODE_AUTO;\n> - resultMetadata->addEntry(ANDROID_CONTROL_AWB_MODE, &value, 1);\n> + resultMetadata->addEntry(ANDROID_CONTROL_AWB_MODE, value);\n>\n> value = ANDROID_CONTROL_AWB_LOCK_OFF;\n> - resultMetadata->addEntry(ANDROID_CONTROL_AWB_LOCK, &value, 1);\n> + resultMetadata->addEntry(ANDROID_CONTROL_AWB_LOCK, value);\n>\n> value = ANDROID_CONTROL_AWB_STATE_CONVERGED;\n> - resultMetadata->addEntry(ANDROID_CONTROL_AWB_STATE, &value, 1);\n> + resultMetadata->addEntry(ANDROID_CONTROL_AWB_STATE, value);\n>\n> value = ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW;\n> - resultMetadata->addEntry(ANDROID_CONTROL_CAPTURE_INTENT, &value,\n> 1);\n> + resultMetadata->addEntry(ANDROID_CONTROL_CAPTURE_INTENT, value);\n>\n> value = ANDROID_CONTROL_EFFECT_MODE_OFF;\n> - resultMetadata->addEntry(ANDROID_CONTROL_EFFECT_MODE, &value, 1);\n> + resultMetadata->addEntry(ANDROID_CONTROL_EFFECT_MODE, value);\n>\n> value = ANDROID_CONTROL_MODE_AUTO;\n> - resultMetadata->addEntry(ANDROID_CONTROL_MODE, &value, 1);\n> + resultMetadata->addEntry(ANDROID_CONTROL_MODE, value);\n>\n> value = ANDROID_CONTROL_SCENE_MODE_DISABLED;\n> - resultMetadata->addEntry(ANDROID_CONTROL_SCENE_MODE, &value, 1);\n> + resultMetadata->addEntry(ANDROID_CONTROL_SCENE_MODE, value);\n>\n> value = ANDROID_CONTROL_VIDEO_STABILIZATION_MODE_OFF;\n> - resultMetadata->addEntry(ANDROID_CONTROL_VIDEO_STABILIZATION_MODE,\n> &value, 1);\n> + resultMetadata->addEntry(ANDROID_CONTROL_VIDEO_STABILIZATION_MODE,\n> value);\n>\n> value = ANDROID_FLASH_MODE_OFF;\n> - resultMetadata->addEntry(ANDROID_FLASH_MODE, &value, 1);\n> + resultMetadata->addEntry(ANDROID_FLASH_MODE, value);\n>\n> value = ANDROID_FLASH_STATE_UNAVAILABLE;\n> - resultMetadata->addEntry(ANDROID_FLASH_STATE, &value, 1);\n> + resultMetadata->addEntry(ANDROID_FLASH_STATE, value);\n>\n> if (settings.getEntry(ANDROID_LENS_APERTURE, &entry))\n> resultMetadata->addEntry(ANDROID_LENS_APERTURE,\n> entry.data.f, 1);\n>\n> float focal_length = 1.0;\n> - resultMetadata->addEntry(ANDROID_LENS_FOCAL_LENGTH, &focal_length,\n> 1);\n> + resultMetadata->addEntry(ANDROID_LENS_FOCAL_LENGTH, focal_length);\n>\n> value = ANDROID_LENS_STATE_STATIONARY;\n> - resultMetadata->addEntry(ANDROID_LENS_STATE, &value, 1);\n> + resultMetadata->addEntry(ANDROID_LENS_STATE, value);\n>\n> value = ANDROID_LENS_OPTICAL_STABILIZATION_MODE_OFF;\n> resultMetadata->addEntry(ANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n> - &value, 1);\n> + value);\n>\n> value32 = ANDROID_SENSOR_TEST_PATTERN_MODE_OFF;\n> - resultMetadata->addEntry(ANDROID_SENSOR_TEST_PATTERN_MODE,\n> - &value32, 1);\n> + resultMetadata->addEntry(ANDROID_SENSOR_TEST_PATTERN_MODE,\n> value32);\n>\n> value = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n> - resultMetadata->addEntry(ANDROID_STATISTICS_FACE_DETECT_MODE,\n> - &value, 1);\n> + resultMetadata->addEntry(ANDROID_STATISTICS_FACE_DETECT_MODE,\n> value);\n>\n> value = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF;\n> resultMetadata->addEntry(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE,\n> - &value, 1);\n> + value);\n>\n> value = ANDROID_STATISTICS_HOT_PIXEL_MAP_MODE_OFF;\n> - resultMetadata->addEntry(ANDROID_STATISTICS_HOT_PIXEL_MAP_MODE,\n> - &value, 1);\n> + resultMetadata->addEntry(ANDROID_STATISTICS_HOT_PIXEL_MAP_MODE,\n> value);\n>\n> value = ANDROID_STATISTICS_SCENE_FLICKER_NONE;\n> - resultMetadata->addEntry(ANDROID_STATISTICS_SCENE_FLICKER,\n> - &value, 1);\n> + resultMetadata->addEntry(ANDROID_STATISTICS_SCENE_FLICKER, value);\n>\n> value = ANDROID_NOISE_REDUCTION_MODE_OFF;\n> - resultMetadata->addEntry(ANDROID_NOISE_REDUCTION_MODE, &value, 1);\n> + resultMetadata->addEntry(ANDROID_NOISE_REDUCTION_MODE, value);\n>\n> /* 33.3 msec */\n> const int64_t rolling_shutter_skew = 33300000;\n> resultMetadata->addEntry(ANDROID_SENSOR_ROLLING_SHUTTER_SKEW,\n> - &rolling_shutter_skew, 1);\n> + rolling_shutter_skew);\n>\n> /* Add metadata tags reported by libcamera. */\n> const int64_t timestamp = metadata.get(controls::SensorTimestamp);\n> - resultMetadata->addEntry(ANDROID_SENSOR_TIMESTAMP, ×tamp, 1);\n> + resultMetadata->addEntry(ANDROID_SENSOR_TIMESTAMP, timestamp);\n>\n> if (metadata.contains(controls::draft::PipelineDepth)) {\n> uint8_t pipeline_depth =\n>\n> metadata.get(controls::draft::PipelineDepth);\n> resultMetadata->addEntry(ANDROID_REQUEST_PIPELINE_DEPTH,\n> - &pipeline_depth, 1);\n> + pipeline_depth);\n> }\n>\n> if (metadata.contains(controls::ExposureTime)) {\n> int64_t exposure = metadata.get(controls::ExposureTime) *\n> 1000ULL;\n> - resultMetadata->addEntry(ANDROID_SENSOR_EXPOSURE_TIME,\n> - &exposure, 1);\n> + resultMetadata->addEntry(ANDROID_SENSOR_EXPOSURE_TIME,\n> exposure);\n> }\n>\n> if (metadata.contains(controls::ScalerCrop)) {\n> @@ -2289,7 +2258,7 @@ CameraDevice::getResultMetadata(const\n> Camera3RequestDescriptor &descriptor) cons\n> crop.x, crop.y, static_cast(crop.width),\n> static_cast(crop.height),\n> };\n> - resultMetadata->addEntry(ANDROID_SCALER_CROP_REGION,\n> cropRect, 4);\n> + resultMetadata->addEntry(ANDROID_SCALER_CROP_REGION,\n> cropRect, 2);\n> }\n>\n> /*\n> --\n> 2.27.0\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 76A0EC31EA\n\tfor ;\n\tThu, 13 May 2021 03:31:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5CACC68920;\n\tThu, 13 May 2021 05:31:56 +0200 (CEST)","from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com\n\t[IPv6:2a00:1450:4864:20::52b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 030B5602B5\n\tfor ;\n\tThu, 13 May 2021 05:31:54 +0200 (CEST)","by mail-ed1-x52b.google.com with SMTP id di13so29469192edb.2\n\tfor ;\n\tWed, 12 May 2021 20:31:54 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"n43bVnpk\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=mime-version:references:in-reply-to:from:date:message-id:subject:to\n\t:cc; bh=vTLNQGWan1F+Y/heNjLnilxef8AGUm6kaK9Yy/sj4Zs=;\n\tb=n43bVnpkxgBZ+UiqAxqJnhMcivJqzP3vvvXuJkXDGuJYywjs+DUe4LN/W0QRQnfk7T\n\ttjTqestZCpW19lS+TgaHqp9TZz9W55irKy2WFQt0KRIfAkCg7pGL+cNtfZDivGaS0Hyc\n\tyxCzHWAezdmmVSHTxiWfC+UNMhx9MDzGXSrYU=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc;\n\tbh=vTLNQGWan1F+Y/heNjLnilxef8AGUm6kaK9Yy/sj4Zs=;\n\tb=ezuMu2OXctJ1ERFBsE92ef3rBLvaYMUx8HVUFNtJ0pi2wVtxTVifye145impJxavOQ\n\tZUggFhkTJPsy9SZf+Z9hC0IsGZLbJ23IUzuNsPpEz80pTa2sYFYUlFeK5IJfo6AULT2G\n\tqOy8KT3rYg20PYcVFYScc0bwbS00FrfM4fycbU69O38n2q4DtxByvAQ4yXJ/tYuSHWMK\n\tlyWIgXh/hQvFDt51AnF8y5UXiVyc6ei96yP3CDdC8z/a7nH6mNtPBnJwd/Foe5HDAdya\n\tg6WssBthYEHcWAnuKC301sh1mh8sLNBFGETdmeTAAAuFspeQmvWLH/4ZFxal9wLqMmnT\n\tZ/Jw==","X-Gm-Message-State":"AOAM530WU+idJ7cN8lDZ5ks275Tlcv8cJ/GQcw3BxQkeODysjDiLvz8d\n\tfZie6UbSpEBkLBbdFUGHTqvK0C8OLpc/KtCWgEfBC5dPmQY=","X-Google-Smtp-Source":"ABdhPJwFbZYnyfU8ruZbgfLhsSEB1IL02HZ5t8EOpXRWrJwUWGHHMoCPZgObBYMDY5WZ3CaZ46JCxOyprgf5K8bZeWw=","X-Received":"by 2002:a50:bec1:: with SMTP id\n\te1mr47423374edk.116.1620876714565; \n\tWed, 12 May 2021 20:31:54 -0700 (PDT)","MIME-Version":"1.0","References":"<20210512102541.722956-1-paul.elder@ideasonboard.com>\n\t<20210512102541.722956-3-paul.elder@ideasonboard.com>","In-Reply-To":"<20210512102541.722956-3-paul.elder@ideasonboard.com>","From":"Hirokazu Honda ","Date":"Thu, 13 May 2021 12:31:43 +0900","Message-ID":"","To":"Paul Elder ","Subject":"Re: [libcamera-devel] [PATCH v3 2/3] android: camera_device: Use\n\tthe new CameraMetadata functions","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera devel ","Content-Type":"multipart/mixed;\n\tboundary=\"===============3042429032246099255==\"","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":16930,"web_url":"https://patchwork.libcamera.org/comment/16930/","msgid":"","date":"2021-05-13T08:42:21","subject":"Re: [libcamera-devel] [PATCH v3 2/3] android: camera_device: Use\n\tthe new CameraMetadata functions","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Paul,\n\nOn 2021-05-12 19:25:40 +0900, Paul Elder wrote:\n> Now that CameraMetadata supports more convenient functions, use those\n> instead.\n> \n> Signed-off-by: Paul Elder \n\nWith the assumption that the Span improvements from 1/3 is filtered down \nto this change,\n\nReviewed-by: Niklas Söderlund \n\n> \n> ---\n> New in v3\n> ---\n> src/android/camera_device.cpp | 241 +++++++++++++++-------------------\n> 1 file changed, 105 insertions(+), 136 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 74f6915c..1bafb339 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -803,7 +803,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\t\tdata.push_back(ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF);\n> \t\t}\n> \t\tstaticMetadata_->addEntry(ANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES,\n> -\t\t\t\t\t data.data(), data.size());\n> +\t\t\t\t\t data);\n> \t}\n> \n> \t/* Control static metadata. */\n> @@ -814,15 +814,13 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\tANDROID_CONTROL_AE_ANTIBANDING_MODE_AUTO,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_CONTROL_AE_AVAILABLE_ANTIBANDING_MODES,\n> -\t\t\t\t aeAvailableAntiBandingModes.data(),\n> -\t\t\t\t aeAvailableAntiBandingModes.size());\n> +\t\t\t\t aeAvailableAntiBandingModes);\n> \n> \tstd::vector aeAvailableModes = {\n> \t\tANDROID_CONTROL_AE_MODE_ON,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_CONTROL_AE_AVAILABLE_MODES,\n> -\t\t\t\t aeAvailableModes.data(),\n> -\t\t\t\t aeAvailableModes.size());\n> +\t\t\t\t aeAvailableModes);\n> \n> \tint64_t minFrameDurationNsec = -1;\n> \tint64_t maxFrameDurationNsec = -1;\n> @@ -871,8 +869,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\t0, 0,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_CONTROL_AE_COMPENSATION_RANGE,\n> -\t\t\t\t aeCompensationRange.data(),\n> -\t\t\t\t aeCompensationRange.size());\n> +\t\t\t\t aeCompensationRange);\n> \n> \tconst camera_metadata_rational_t aeCompensationStep[] = {\n> \t\t{ 0, 1 }\n> @@ -884,29 +881,25 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\tANDROID_CONTROL_AF_MODE_OFF,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_CONTROL_AF_AVAILABLE_MODES,\n> -\t\t\t\t availableAfModes.data(),\n> -\t\t\t\t availableAfModes.size());\n> +\t\t\t\t availableAfModes);\n> \n> \tstd::vector availableEffects = {\n> \t\tANDROID_CONTROL_EFFECT_MODE_OFF,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_CONTROL_AVAILABLE_EFFECTS,\n> -\t\t\t\t availableEffects.data(),\n> -\t\t\t\t availableEffects.size());\n> +\t\t\t\t availableEffects);\n> \n> \tstd::vector availableSceneModes = {\n> \t\tANDROID_CONTROL_SCENE_MODE_DISABLED,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_CONTROL_AVAILABLE_SCENE_MODES,\n> -\t\t\t\t availableSceneModes.data(),\n> -\t\t\t\t availableSceneModes.size());\n> +\t\t\t\t availableSceneModes);\n> \n> \tstd::vector availableStabilizationModes = {\n> \t\tANDROID_CONTROL_VIDEO_STABILIZATION_MODE_OFF,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES,\n> -\t\t\t\t availableStabilizationModes.data(),\n> -\t\t\t\t availableStabilizationModes.size());\n> +\t\t\t\t availableStabilizationModes);\n> \n> \t/*\n> \t * \\todo Inspect the Camera capabilities to report the available\n> @@ -916,15 +909,13 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\tANDROID_CONTROL_AWB_MODE_AUTO,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_CONTROL_AWB_AVAILABLE_MODES,\n> -\t\t\t\t availableAwbModes.data(),\n> -\t\t\t\t availableAwbModes.size());\n> +\t\t\t\t availableAwbModes);\n> \n> \tstd::vector availableMaxRegions = {\n> \t\t0, 0, 0,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_CONTROL_MAX_REGIONS,\n> -\t\t\t\t availableMaxRegions.data(),\n> -\t\t\t\t availableMaxRegions.size());\n> +\t\t\t\t availableMaxRegions);\n> \n> \tstd::vector sceneModesOverride = {\n> \t\tANDROID_CONTROL_AE_MODE_ON,\n> @@ -932,20 +923,19 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\tANDROID_CONTROL_AF_MODE_OFF,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_CONTROL_SCENE_MODE_OVERRIDES,\n> -\t\t\t\t sceneModesOverride.data(),\n> -\t\t\t\t sceneModesOverride.size());\n> +\t\t\t\t sceneModesOverride);\n> \n> \tuint8_t aeLockAvailable = ANDROID_CONTROL_AE_LOCK_AVAILABLE_FALSE;\n> \tstaticMetadata_->addEntry(ANDROID_CONTROL_AE_LOCK_AVAILABLE,\n> -\t\t\t\t &aeLockAvailable, 1);\n> +\t\t\t\t aeLockAvailable);\n> \n> \tuint8_t awbLockAvailable = ANDROID_CONTROL_AWB_LOCK_AVAILABLE_FALSE;\n> \tstaticMetadata_->addEntry(ANDROID_CONTROL_AWB_LOCK_AVAILABLE,\n> -\t\t\t\t &awbLockAvailable, 1);\n> +\t\t\t\t awbLockAvailable);\n> \n> \tchar availableControlModes = ANDROID_CONTROL_MODE_AUTO;\n> \tstaticMetadata_->addEntry(ANDROID_CONTROL_AVAILABLE_MODES,\n> -\t\t\t\t &availableControlModes, 1);\n> +\t\t\t\t availableControlModes);\n> \n> \t/* JPEG static metadata. */\n> \n> @@ -983,9 +973,9 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\tthumbnailEntries.push_back(size.height);\n> \t}\n> \tstaticMetadata_->addEntry(ANDROID_JPEG_AVAILABLE_THUMBNAIL_SIZES,\n> -\t\t\t\t thumbnailEntries.data(), thumbnailEntries.size());\n> +\t\t\t\t thumbnailEntries);\n> \n> -\tstaticMetadata_->addEntry(ANDROID_JPEG_MAX_SIZE, &maxJpegBufferSize_, 1);\n> +\tstaticMetadata_->addEntry(ANDROID_JPEG_MAX_SIZE, maxJpegBufferSize_);\n> \n> \t/* Sensor static metadata. */\n> \tstd::array pixelArraySize;\n> @@ -994,7 +984,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\tpixelArraySize[0] = size.width;\n> \t\tpixelArraySize[1] = size.height;\n> \t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE,\n> -\t\t\t\t\t pixelArraySize.data(), pixelArraySize.size());\n> +\t\t\t\t\t pixelArraySize.data(), 2);\n> \t}\n> \n> \tif (properties.contains(properties::UnitCellSize)) {\n> @@ -1004,7 +994,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\t\tcellSize.height * pixelArraySize[1] / 1e6f\n> \t\t};\n> \t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_PHYSICAL_SIZE,\n> -\t\t\t\t\t physicalSize.data(), physicalSize.size());\n> +\t\t\t\t\t physicalSize.data(), 2);\n> \t}\n> \n> \t{\n> @@ -1017,20 +1007,20 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\t\tstatic_cast(rects[0].height),\n> \t\t};\n> \t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE,\n> -\t\t\t\t\t data.data(), data.size());\n> +\t\t\t\t\t data);\n> \t}\n> \n> \tint32_t sensitivityRange[] = {\n> \t\t32, 2400,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_SENSITIVITY_RANGE,\n> -\t\t\t\t &sensitivityRange, 2);\n> +\t\t\t\t sensitivityRange, 2);\n> \n> \t/* Report the color filter arrangement if the camera reports it. */\n> \tif (properties.contains(properties::draft::ColorFilterArrangement)) {\n> \t\tuint8_t filterArr = properties.get(properties::draft::ColorFilterArrangement);\n> \t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT,\n> -\t\t\t\t\t &filterArr, 1);\n> +\t\t\t\t\t filterArr);\n> \t}\n> \n> \tconst auto &exposureInfo = controlsInfo.find(&controls::ExposureTime);\n> @@ -1040,25 +1030,24 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\t\texposureInfo->second.max().get() * 1000LL,\n> \t\t};\n> \t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE,\n> -\t\t\t\t\t &exposureTimeRange, 2);\n> +\t\t\t\t\t exposureTimeRange, 2);\n> \t}\n> \n> -\tstaticMetadata_->addEntry(ANDROID_SENSOR_ORIENTATION, &orientation_, 1);\n> +\tstaticMetadata_->addEntry(ANDROID_SENSOR_ORIENTATION, orientation_);\n> \n> \tstd::vector testPatterModes = {\n> \t\tANDROID_SENSOR_TEST_PATTERN_MODE_OFF,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_SENSOR_AVAILABLE_TEST_PATTERN_MODES,\n> -\t\t\t\t testPatterModes.data(),\n> -\t\t\t\t testPatterModes.size());\n> +\t\t\t\t testPatterModes);\n> \n> \tuint8_t timestampSource = ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE_UNKNOWN;\n> \tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE,\n> -\t\t\t\t ×tampSource, 1);\n> +\t\t\t\t timestampSource);\n> \n> \tif (maxFrameDurationNsec > 0)\n> \t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_MAX_FRAME_DURATION,\n> -\t\t\t\t\t &maxFrameDurationNsec, 1);\n> +\t\t\t\t\t maxFrameDurationNsec);\n> \n> \t/* Statistics static metadata. */\n> \tuint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n> @@ -1067,7 +1056,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \n> \tint32_t maxFaceCount = 0;\n> \tstaticMetadata_->addEntry(ANDROID_STATISTICS_INFO_MAX_FACE_COUNT,\n> -\t\t\t\t &maxFaceCount, 1);\n> +\t\t\t\t maxFaceCount);\n> \n> \t{\n> \t\tstd::vector data;\n> @@ -1080,25 +1069,24 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\t\tdata.push_back(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF);\n> \t\t}\n> \t\tstaticMetadata_->addEntry(ANDROID_STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES,\n> -\t\t\t\t\t data.data(), data.size());\n> +\t\t\t\t\t data);\n> \t}\n> \n> \t/* Sync static metadata. */\n> \tint32_t maxLatency = ANDROID_SYNC_MAX_LATENCY_UNKNOWN;\n> -\tstaticMetadata_->addEntry(ANDROID_SYNC_MAX_LATENCY, &maxLatency, 1);\n> +\tstaticMetadata_->addEntry(ANDROID_SYNC_MAX_LATENCY, maxLatency);\n> \n> \t/* Flash static metadata. */\n> \tchar flashAvailable = ANDROID_FLASH_INFO_AVAILABLE_FALSE;\n> \tstaticMetadata_->addEntry(ANDROID_FLASH_INFO_AVAILABLE,\n> -\t\t\t\t &flashAvailable, 1);\n> +\t\t\t\t flashAvailable);\n> \n> \t/* Lens static metadata. */\n> \tstd::vector lensApertures = {\n> \t\t2.53 / 100,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_LENS_INFO_AVAILABLE_APERTURES,\n> -\t\t\t\t lensApertures.data(),\n> -\t\t\t\t lensApertures.size());\n> +\t\t\t\t lensApertures);\n> \n> \tuint8_t lensFacing;\n> \tswitch (facing_) {\n> @@ -1113,29 +1101,27 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\tlensFacing = ANDROID_LENS_FACING_EXTERNAL;\n> \t\tbreak;\n> \t}\n> -\tstaticMetadata_->addEntry(ANDROID_LENS_FACING, &lensFacing, 1);\n> +\tstaticMetadata_->addEntry(ANDROID_LENS_FACING, lensFacing);\n> \n> -\tstd::vector lensFocalLenghts = {\n> +\tstd::vector lensFocalLengths = {\n> \t\t1,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_LENS_INFO_AVAILABLE_FOCAL_LENGTHS,\n> -\t\t\t\t lensFocalLenghts.data(),\n> -\t\t\t\t lensFocalLenghts.size());\n> +\t\t\t\t lensFocalLengths);\n> \n> \tstd::vector opticalStabilizations = {\n> \t\tANDROID_LENS_OPTICAL_STABILIZATION_MODE_OFF,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION,\n> -\t\t\t\t opticalStabilizations.data(),\n> -\t\t\t\t opticalStabilizations.size());\n> +\t\t\t\t opticalStabilizations);\n> \n> \tfloat hypeFocalDistance = 0;\n> \tstaticMetadata_->addEntry(ANDROID_LENS_INFO_HYPERFOCAL_DISTANCE,\n> -\t\t\t\t &hypeFocalDistance, 1);\n> +\t\t\t\t hypeFocalDistance);\n> \n> \tfloat minFocusDistance = 0;\n> \tstaticMetadata_->addEntry(ANDROID_LENS_INFO_MINIMUM_FOCUS_DISTANCE,\n> -\t\t\t\t &minFocusDistance, 1);\n> +\t\t\t\t minFocusDistance);\n> \n> \t/* Noise reduction modes. */\n> \t{\n> @@ -1149,7 +1135,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\t\tdata.push_back(ANDROID_NOISE_REDUCTION_MODE_OFF);\n> \t\t}\n> \t\tstaticMetadata_->addEntry(ANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,\n> -\t\t\t\t\t data.data(), data.size());\n> +\t\t\t\t\t data);\n> \t}\n> \n> \t/* Scaler static metadata. */\n> @@ -1174,7 +1160,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\t\t\t 1.0f * max.height / min.height);\n> \t}\n> \tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,\n> -\t\t\t\t &maxZoom, 1);\n> +\t\t\t\t maxZoom);\n> \n> \tstd::vector availableStreamConfigurations;\n> \tavailableStreamConfigurations.reserve(streamConfigurations_.size() * 4);\n> @@ -1193,8 +1179,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\tANDROID_SCALER_AVAILABLE_FORMATS_BLOB, 2560, 1920, 33333333,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_STALL_DURATIONS,\n> -\t\t\t\t availableStallDurations.data(),\n> -\t\t\t\t availableStallDurations.size());\n> +\t\t\t\t availableStallDurations);\n> \n> \t/* Use the minimum frame duration for all the YUV/RGB formats. */\n> \tif (minFrameDurationNsec > 0) {\n> @@ -1207,22 +1192,21 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\t\tminFrameDurations.push_back(minFrameDurationNsec);\n> \t\t}\n> \t\tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS,\n> -\t\t\t\t\t minFrameDurations.data(),\n> -\t\t\t\t\t minFrameDurations.size());\n> +\t\t\t\t\t minFrameDurations);\n> \t}\n> \n> \tuint8_t croppingType = ANDROID_SCALER_CROPPING_TYPE_CENTER_ONLY;\n> -\tstaticMetadata_->addEntry(ANDROID_SCALER_CROPPING_TYPE, &croppingType, 1);\n> +\tstaticMetadata_->addEntry(ANDROID_SCALER_CROPPING_TYPE, croppingType);\n> \n> \t/* Info static metadata. */\n> \tuint8_t supportedHWLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;\n> \tstaticMetadata_->addEntry(ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL,\n> -\t\t\t\t &supportedHWLevel, 1);\n> +\t\t\t\t supportedHWLevel);\n> \n> \t/* Request static metadata. */\n> \tint32_t partialResultCount = 1;\n> \tstaticMetadata_->addEntry(ANDROID_REQUEST_PARTIAL_RESULT_COUNT,\n> -\t\t\t\t &partialResultCount, 1);\n> +\t\t\t\t partialResultCount);\n> \n> \t{\n> \t\t/* Default the value to 2 if not reported by the camera. */\n> @@ -1231,13 +1215,13 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\tif (infoMap != controlsInfo.end())\n> \t\t\tmaxPipelineDepth = infoMap->second.max().get();\n> \t\tstaticMetadata_->addEntry(ANDROID_REQUEST_PIPELINE_MAX_DEPTH,\n> -\t\t\t\t\t &maxPipelineDepth, 1);\n> +\t\t\t\t\t maxPipelineDepth);\n> \t}\n> \n> \t/* LIMITED does not support reprocessing. */\n> \tuint32_t maxNumInputStreams = 0;\n> \tstaticMetadata_->addEntry(ANDROID_REQUEST_MAX_NUM_INPUT_STREAMS,\n> -\t\t\t\t &maxNumInputStreams, 1);\n> +\t\t\t\t maxNumInputStreams);\n> \n> \tstd::vector availableCapabilities = {\n> \t\tANDROID_REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE,\n> @@ -1261,11 +1245,10 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t/* Number of { RAW, YUV, JPEG } supported output streams */\n> \tint32_t numOutStreams[] = { rawStreamAvailable, 2, 1 };\n> \tstaticMetadata_->addEntry(ANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS,\n> -\t\t\t\t &numOutStreams, 3);\n> +\t\t\t\t numOutStreams, 3);\n> \n> \tstaticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_CAPABILITIES,\n> -\t\t\t\t availableCapabilities.data(),\n> -\t\t\t\t availableCapabilities.size());\n> +\t\t\t\t availableCapabilities);\n> \n> \tstd::vector availableCharacteristicsKeys = {\n> \t\tANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES,\n> @@ -1320,8 +1303,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\tANDROID_SYNC_MAX_LATENCY,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_CHARACTERISTICS_KEYS,\n> -\t\t\t\t availableCharacteristicsKeys.data(),\n> -\t\t\t\t availableCharacteristicsKeys.size());\n> +\t\t\t\t availableCharacteristicsKeys);\n> \n> \tstd::vector availableRequestKeys = {\n> \t\tANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n> @@ -1352,8 +1334,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\tANDROID_STATISTICS_FACE_DETECT_MODE\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_REQUEST_KEYS,\n> -\t\t\t\t availableRequestKeys.data(),\n> -\t\t\t\t availableRequestKeys.size());\n> +\t\t\t\t availableRequestKeys);\n> \n> \tstd::vector availableResultKeys = {\n> \t\tANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n> @@ -1402,8 +1383,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\tANDROID_STATISTICS_SCENE_FLICKER,\n> \t};\n> \tstaticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_RESULT_KEYS,\n> -\t\t\t\t availableResultKeys.data(),\n> -\t\t\t\t availableResultKeys.size());\n> +\t\t\t\t availableResultKeys);\n> \n> \tif (!staticMetadata_->isValid()) {\n> \t\tLOG(HAL, Error) << \"Failed to construct static metadata\";\n> @@ -1442,69 +1422,63 @@ std::unique_ptr CameraDevice::requestTemplatePreview()\n> \t\t\t\t entry.data.i32, 2);\n> \n> \tuint8_t aeMode = ANDROID_CONTROL_AE_MODE_ON;\n> -\trequestTemplate->addEntry(ANDROID_CONTROL_AE_MODE,\n> -\t\t\t\t &aeMode, 1);\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_AE_MODE, aeMode);\n> \n> \tint32_t aeExposureCompensation = 0;\n> \trequestTemplate->addEntry(ANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,\n> -\t\t\t\t &aeExposureCompensation, 1);\n> +\t\t\t\t aeExposureCompensation);\n> \n> \tuint8_t aePrecaptureTrigger = ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_IDLE;\n> \trequestTemplate->addEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n> -\t\t\t\t &aePrecaptureTrigger, 1);\n> +\t\t\t\t aePrecaptureTrigger);\n> \n> \tuint8_t aeLock = ANDROID_CONTROL_AE_LOCK_OFF;\n> -\trequestTemplate->addEntry(ANDROID_CONTROL_AE_LOCK,\n> -\t\t\t\t &aeLock, 1);\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_AE_LOCK, aeLock);\n> \n> \tuint8_t aeAntibandingMode = ANDROID_CONTROL_AE_ANTIBANDING_MODE_AUTO;\n> \trequestTemplate->addEntry(ANDROID_CONTROL_AE_ANTIBANDING_MODE,\n> -\t\t\t\t &aeAntibandingMode, 1);\n> +\t\t\t\t aeAntibandingMode);\n> \n> \tuint8_t afMode = ANDROID_CONTROL_AF_MODE_OFF;\n> -\trequestTemplate->addEntry(ANDROID_CONTROL_AF_MODE, &afMode, 1);\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_AF_MODE, afMode);\n> \n> \tuint8_t afTrigger = ANDROID_CONTROL_AF_TRIGGER_IDLE;\n> -\trequestTemplate->addEntry(ANDROID_CONTROL_AF_TRIGGER,\n> -\t\t\t\t &afTrigger, 1);\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_AF_TRIGGER, afTrigger);\n> \n> \tuint8_t awbMode = ANDROID_CONTROL_AWB_MODE_AUTO;\n> -\trequestTemplate->addEntry(ANDROID_CONTROL_AWB_MODE,\n> -\t\t\t\t &awbMode, 1);\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_AWB_MODE, awbMode);\n> \n> \tuint8_t awbLock = ANDROID_CONTROL_AWB_LOCK_OFF;\n> -\trequestTemplate->addEntry(ANDROID_CONTROL_AWB_LOCK,\n> -\t\t\t\t &awbLock, 1);\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_AWB_LOCK, awbLock);\n> \n> \tuint8_t flashMode = ANDROID_FLASH_MODE_OFF;\n> -\trequestTemplate->addEntry(ANDROID_FLASH_MODE,\n> -\t\t\t\t &flashMode, 1);\n> +\trequestTemplate->addEntry(ANDROID_FLASH_MODE, flashMode);\n> \n> \tuint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n> \trequestTemplate->addEntry(ANDROID_STATISTICS_FACE_DETECT_MODE,\n> -\t\t\t\t &faceDetectMode, 1);\n> +\t\t\t\t faceDetectMode);\n> \n> \tuint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_OFF;\n> \trequestTemplate->addEntry(ANDROID_NOISE_REDUCTION_MODE,\n> -\t\t\t\t &noiseReduction, 1);\n> +\t\t\t\t noiseReduction);\n> \n> \tuint8_t aberrationMode = ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF;\n> \trequestTemplate->addEntry(ANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n> -\t\t\t\t &aberrationMode, 1);\n> +\t\t\t\t aberrationMode);\n> \n> \tuint8_t controlMode = ANDROID_CONTROL_MODE_AUTO;\n> -\trequestTemplate->addEntry(ANDROID_CONTROL_MODE, &controlMode, 1);\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_MODE, controlMode);\n> \n> \tfloat lensAperture = 2.53 / 100;\n> -\trequestTemplate->addEntry(ANDROID_LENS_APERTURE, &lensAperture, 1);\n> +\trequestTemplate->addEntry(ANDROID_LENS_APERTURE, lensAperture);\n> \n> \tuint8_t opticalStabilization = ANDROID_LENS_OPTICAL_STABILIZATION_MODE_OFF;\n> \trequestTemplate->addEntry(ANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n> -\t\t\t\t &opticalStabilization, 1);\n> +\t\t\t\t opticalStabilization);\n> \n> \tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW;\n> \trequestTemplate->addEntry(ANDROID_CONTROL_CAPTURE_INTENT,\n> -\t\t\t\t &captureIntent, 1);\n> +\t\t\t\t captureIntent);\n> \n> \treturn requestTemplate;\n> }\n> @@ -1580,7 +1554,7 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n> \t}\n> \n> \trequestTemplate->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT,\n> -\t\t\t\t &captureIntent, 1);\n> +\t\t\t\t captureIntent);\n> \n> \trequestTemplates_[type] = std::move(requestTemplate);\n> \treturn requestTemplates_[type]->get();\n> @@ -2154,20 +2128,20 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons\n> \n> \tuint8_t value = ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF;\n> \tresultMetadata->addEntry(ANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n> -\t\t\t\t &value, 1);\n> +\t\t\t\t value);\n> \n> \tvalue = ANDROID_CONTROL_AE_ANTIBANDING_MODE_OFF;\n> -\tresultMetadata->addEntry(ANDROID_CONTROL_AE_ANTIBANDING_MODE, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_CONTROL_AE_ANTIBANDING_MODE, value);\n> \n> \tint32_t value32 = 0;\n> \tresultMetadata->addEntry(ANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,\n> -\t\t\t\t &value32, 1);\n> +\t\t\t\t value32);\n> \n> \tvalue = ANDROID_CONTROL_AE_LOCK_OFF;\n> -\tresultMetadata->addEntry(ANDROID_CONTROL_AE_LOCK, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_CONTROL_AE_LOCK, value);\n> \n> \tvalue = ANDROID_CONTROL_AE_MODE_ON;\n> -\tresultMetadata->addEntry(ANDROID_CONTROL_AE_MODE, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_CONTROL_AE_MODE, value);\n> \n> \tif (settings.getEntry(ANDROID_CONTROL_AE_TARGET_FPS_RANGE, &entry))\n> \t\t/*\n> @@ -2178,109 +2152,104 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons\n> \t\tresultMetadata->addEntry(ANDROID_CONTROL_AE_TARGET_FPS_RANGE,\n> \t\t\t\t\t entry.data.i32, 2);\n> \n> -\tvalue = ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_IDLE;\n> \tfound = settings.getEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER, &entry);\n> -\tresultMetadata->addEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n> -\t\t\t\t found ? entry.data.u8 : &value, 1);\n> +\tvalue = found ? *entry.data.u8 :\n> +\t\t\t(uint8_t)ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_IDLE;\n> +\tresultMetadata->addEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER, value);\n> \n> \tvalue = ANDROID_CONTROL_AE_STATE_CONVERGED;\n> -\tresultMetadata->addEntry(ANDROID_CONTROL_AE_STATE, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_CONTROL_AE_STATE, value);\n> \n> \tvalue = ANDROID_CONTROL_AF_MODE_OFF;\n> -\tresultMetadata->addEntry(ANDROID_CONTROL_AF_MODE, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_CONTROL_AF_MODE, value);\n> \n> \tvalue = ANDROID_CONTROL_AF_STATE_INACTIVE;\n> -\tresultMetadata->addEntry(ANDROID_CONTROL_AF_STATE, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_CONTROL_AF_STATE, value);\n> \n> \tvalue = ANDROID_CONTROL_AF_TRIGGER_IDLE;\n> -\tresultMetadata->addEntry(ANDROID_CONTROL_AF_TRIGGER, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_CONTROL_AF_TRIGGER, value);\n> \n> \tvalue = ANDROID_CONTROL_AWB_MODE_AUTO;\n> -\tresultMetadata->addEntry(ANDROID_CONTROL_AWB_MODE, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_CONTROL_AWB_MODE, value);\n> \n> \tvalue = ANDROID_CONTROL_AWB_LOCK_OFF;\n> -\tresultMetadata->addEntry(ANDROID_CONTROL_AWB_LOCK, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_CONTROL_AWB_LOCK, value);\n> \n> \tvalue = ANDROID_CONTROL_AWB_STATE_CONVERGED;\n> -\tresultMetadata->addEntry(ANDROID_CONTROL_AWB_STATE, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_CONTROL_AWB_STATE, value);\n> \n> \tvalue = ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW;\n> -\tresultMetadata->addEntry(ANDROID_CONTROL_CAPTURE_INTENT, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_CONTROL_CAPTURE_INTENT, value);\n> \n> \tvalue = ANDROID_CONTROL_EFFECT_MODE_OFF;\n> -\tresultMetadata->addEntry(ANDROID_CONTROL_EFFECT_MODE, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_CONTROL_EFFECT_MODE, value);\n> \n> \tvalue = ANDROID_CONTROL_MODE_AUTO;\n> -\tresultMetadata->addEntry(ANDROID_CONTROL_MODE, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_CONTROL_MODE, value);\n> \n> \tvalue = ANDROID_CONTROL_SCENE_MODE_DISABLED;\n> -\tresultMetadata->addEntry(ANDROID_CONTROL_SCENE_MODE, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_CONTROL_SCENE_MODE, value);\n> \n> \tvalue = ANDROID_CONTROL_VIDEO_STABILIZATION_MODE_OFF;\n> -\tresultMetadata->addEntry(ANDROID_CONTROL_VIDEO_STABILIZATION_MODE, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_CONTROL_VIDEO_STABILIZATION_MODE, value);\n> \n> \tvalue = ANDROID_FLASH_MODE_OFF;\n> -\tresultMetadata->addEntry(ANDROID_FLASH_MODE, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_FLASH_MODE, value);\n> \n> \tvalue = ANDROID_FLASH_STATE_UNAVAILABLE;\n> -\tresultMetadata->addEntry(ANDROID_FLASH_STATE, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_FLASH_STATE, value);\n> \n> \tif (settings.getEntry(ANDROID_LENS_APERTURE, &entry))\n> \t\tresultMetadata->addEntry(ANDROID_LENS_APERTURE, entry.data.f, 1);\n> \n> \tfloat focal_length = 1.0;\n> -\tresultMetadata->addEntry(ANDROID_LENS_FOCAL_LENGTH, &focal_length, 1);\n> +\tresultMetadata->addEntry(ANDROID_LENS_FOCAL_LENGTH, focal_length);\n> \n> \tvalue = ANDROID_LENS_STATE_STATIONARY;\n> -\tresultMetadata->addEntry(ANDROID_LENS_STATE, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_LENS_STATE, value);\n> \n> \tvalue = ANDROID_LENS_OPTICAL_STABILIZATION_MODE_OFF;\n> \tresultMetadata->addEntry(ANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n> -\t\t\t\t &value, 1);\n> +\t\t\t\t value);\n> \n> \tvalue32 = ANDROID_SENSOR_TEST_PATTERN_MODE_OFF;\n> -\tresultMetadata->addEntry(ANDROID_SENSOR_TEST_PATTERN_MODE,\n> -\t\t\t\t &value32, 1);\n> +\tresultMetadata->addEntry(ANDROID_SENSOR_TEST_PATTERN_MODE, value32);\n> \n> \tvalue = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n> -\tresultMetadata->addEntry(ANDROID_STATISTICS_FACE_DETECT_MODE,\n> -\t\t\t\t &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_STATISTICS_FACE_DETECT_MODE, value);\n> \n> \tvalue = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF;\n> \tresultMetadata->addEntry(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE,\n> -\t\t\t\t &value, 1);\n> +\t\t\t\t value);\n> \n> \tvalue = ANDROID_STATISTICS_HOT_PIXEL_MAP_MODE_OFF;\n> -\tresultMetadata->addEntry(ANDROID_STATISTICS_HOT_PIXEL_MAP_MODE,\n> -\t\t\t\t &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_STATISTICS_HOT_PIXEL_MAP_MODE, value);\n> \n> \tvalue = ANDROID_STATISTICS_SCENE_FLICKER_NONE;\n> -\tresultMetadata->addEntry(ANDROID_STATISTICS_SCENE_FLICKER,\n> -\t\t\t\t &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_STATISTICS_SCENE_FLICKER, value);\n> \n> \tvalue = ANDROID_NOISE_REDUCTION_MODE_OFF;\n> -\tresultMetadata->addEntry(ANDROID_NOISE_REDUCTION_MODE, &value, 1);\n> +\tresultMetadata->addEntry(ANDROID_NOISE_REDUCTION_MODE, value);\n> \n> \t/* 33.3 msec */\n> \tconst int64_t rolling_shutter_skew = 33300000;\n> \tresultMetadata->addEntry(ANDROID_SENSOR_ROLLING_SHUTTER_SKEW,\n> -\t\t\t\t &rolling_shutter_skew, 1);\n> +\t\t\t\t rolling_shutter_skew);\n> \n> \t/* Add metadata tags reported by libcamera. */\n> \tconst int64_t timestamp = metadata.get(controls::SensorTimestamp);\n> -\tresultMetadata->addEntry(ANDROID_SENSOR_TIMESTAMP, ×tamp, 1);\n> +\tresultMetadata->addEntry(ANDROID_SENSOR_TIMESTAMP, timestamp);\n> \n> \tif (metadata.contains(controls::draft::PipelineDepth)) {\n> \t\tuint8_t pipeline_depth =\n> \t\t\tmetadata.get(controls::draft::PipelineDepth);\n> \t\tresultMetadata->addEntry(ANDROID_REQUEST_PIPELINE_DEPTH,\n> -\t\t\t\t\t &pipeline_depth, 1);\n> +\t\t\t\t\t pipeline_depth);\n> \t}\n> \n> \tif (metadata.contains(controls::ExposureTime)) {\n> \t\tint64_t exposure = metadata.get(controls::ExposureTime) * 1000ULL;\n> -\t\tresultMetadata->addEntry(ANDROID_SENSOR_EXPOSURE_TIME,\n> -\t\t\t\t\t &exposure, 1);\n> +\t\tresultMetadata->addEntry(ANDROID_SENSOR_EXPOSURE_TIME, exposure);\n> \t}\n> \n> \tif (metadata.contains(controls::ScalerCrop)) {\n> @@ -2289,7 +2258,7 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons\n> \t\t\tcrop.x, crop.y, static_cast(crop.width),\n> \t\t\tstatic_cast(crop.height),\n> \t\t};\n> -\t\tresultMetadata->addEntry(ANDROID_SCALER_CROP_REGION, cropRect, 4);\n> +\t\tresultMetadata->addEntry(ANDROID_SCALER_CROP_REGION, cropRect, 2);\n> \t}\n> \n> \t/*\n> -- \n> 2.27.0\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 695EBC31EB\n\tfor ;\n\tThu, 13 May 2021 08:42:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 26DD96891D;\n\tThu, 13 May 2021 10:42:25 +0200 (CEST)","from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com\n\t[IPv6:2a00:1450:4864:20::22e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5646068919\n\tfor ;\n\tThu, 13 May 2021 10:42:23 +0200 (CEST)","by mail-lj1-x22e.google.com with SMTP id u20so1344450ljo.4\n\tfor ;\n\tThu, 13 May 2021 01:42:23 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tl23sm360422ljb.26.2021.05.13.01.42.21\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 13 May 2021 01:42:22 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com\n\theader.b=\"pfLSSyqV\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=s4j0kzUc5oCv3x3/xsuz9hTM+/IhISWdDqXl02ic3SU=;\n\tb=pfLSSyqVnArHys3KRNN/SNC79hwPArEjJPyDFB2zOD2+mXlJzZnGm9V1iHARDHKwEq\n\twXcJpYA7G32TfFy76ZjXDwyF58TjUZImgJVilKzDytSPHH2qIYF7LQeuTkeREjyoI+ew\n\tJA89qFM6PAiVR+7a6Fq7KbQdTw+NPxg+b9ma+Gj4VMC8mVRxc5HUy6ncE2tVA+kJDjVz\n\txxnhPiXoJNm+hlBd3ryQ5tUgY0X4cWLbYVEPMEndg9UUlQufwTSEVw6lX8lWpKxh7Qof\n\t3JiLpmmDfaS5d7muraTqAazjBb2W/DSdM035K7OPD8OfVnBCtmIZEFEYt6gPfLY5vO7r\n\tL1ZA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=s4j0kzUc5oCv3x3/xsuz9hTM+/IhISWdDqXl02ic3SU=;\n\tb=awgW40EA39cf7VVIAYW6idgnEk8KQQGM8ZFTZlus/4TleRWhvJW9x9ptRtHmrpqBat\n\tGwBYyBkgeKzX8vdDTX4RyT7N+jxP/9Q2X5ehvbkKgyVPga0Y1myM5H5oSlzMf5+hhXvF\n\tLVfUaCl/s4YOZG487cDhZx/nKMHgQwsWgqdmFPb+BKtvpyKwouTDJnNCzuRXpaFGwHRE\n\tGuoe/eRGnqAKZ36xY3LeDE0agzLTpAsvX1bzSHdiK5HxEEBnDffrS43AzCecqd589LS9\n\t367LnM8W+odm5x1O6YPgpjRDwD4XlmFe74+SDnV3jy6PW0ccIgXMuQ75dpu+L3wmmDJl\n\t/0MQ==","X-Gm-Message-State":"AOAM532xIRxLd+v7OJnhVZWCfEpGjcP1xQT+IUN01ZcISsrSBcRv3+Q3\n\tPr+eVywY5Mazad04xrmAhgoiw1gRzs+8rg==","X-Google-Smtp-Source":"ABdhPJwRK4OqDqXvABwub9tBEiT65XO1UtAUov7AHgYdcQww9NxMPARLTXneo9jSso9nCQVGJRgSxg==","X-Received":"by 2002:a2e:8946:: with SMTP id\n\tb6mr15038089ljk.389.1620895342611; \n\tThu, 13 May 2021 01:42:22 -0700 (PDT)","Date":"Thu, 13 May 2021 10:42:21 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Paul Elder ","Message-ID":"","References":"<20210512102541.722956-1-paul.elder@ideasonboard.com>\n\t<20210512102541.722956-3-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210512102541.722956-3-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v3 2/3] android: camera_device: Use\n\tthe new CameraMetadata functions","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]