Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 12286,
    "url": "https://patchwork.libcamera.org/api/patches/12286/?format=api",
    "web_url": "https://patchwork.libcamera.org/patch/12286/",
    "project": {
        "id": 1,
        "url": "https://patchwork.libcamera.org/api/projects/1/?format=api",
        "name": "libcamera",
        "link_name": "libcamera",
        "list_id": "libcamera_core",
        "list_email": "libcamera-devel@lists.libcamera.org",
        "web_url": "",
        "scm_url": "",
        "webscm_url": ""
    },
    "msgid": "<20210514064303.798045-3-paul.elder@ideasonboard.com>",
    "date": "2021-05-14T06:43:02",
    "name": "[libcamera-devel,v5,2/3] android: camera_device: Use the new CameraMetadata functions",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": false,
    "hash": "a34537ff3a380518b805d7a580ac9de65d018689",
    "submitter": {
        "id": 17,
        "url": "https://patchwork.libcamera.org/api/people/17/?format=api",
        "name": "Paul Elder",
        "email": "paul.elder@ideasonboard.com"
    },
    "delegate": null,
    "mbox": "https://patchwork.libcamera.org/patch/12286/mbox/",
    "series": [
        {
            "id": 2028,
            "url": "https://patchwork.libcamera.org/api/series/2028/?format=api",
            "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2028",
            "date": "2021-05-14T06:43:00",
            "name": "Auto-resize CameraMetadata",
            "version": 5,
            "mbox": "https://patchwork.libcamera.org/series/2028/mbox/"
        }
    ],
    "comments": "https://patchwork.libcamera.org/api/patches/12286/comments/",
    "check": "pending",
    "checks": "https://patchwork.libcamera.org/api/patches/12286/checks/",
    "tags": {},
    "headers": {
        "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>",
        "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 B7FF4C31F6\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 14 May 2021 06:43:29 +0000 (UTC)",
            "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 72CA968919;\n\tFri, 14 May 2021 08:43:29 +0200 (CEST)",
            "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 22276602B4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 14 May 2021 08:43:27 +0200 (CEST)",
            "from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5E5091051;\n\tFri, 14 May 2021 08:43:25 +0200 (CEST)"
        ],
        "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"fjrM4AP3\"; dkim-atps=neutral",
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1620974606;\n\tbh=j2WPhZ7GqsY/QVxOGmbDObqcdVOTNgBWgHDMuoYevuM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=fjrM4AP3r+2O7g6PcJ96SxMhe5LIkq+Oh3CQtzLLapoOcYAUMIasylKA1GghxQRYA\n\tnTv0/bOhR2V4g3IWytu6WbRT4FnWdHocmAlsPX1nFI0xeyEQe7Wg7yOgxbyx2UlNi+\n\t2FYLVbHdiYd6J85Tx8hgF8zZJmbbfrOrhFMy6ml0=",
        "From": "Paul Elder <paul.elder@ideasonboard.com>",
        "To": "libcamera-devel@lists.libcamera.org",
        "Date": "Fri, 14 May 2021 15:43:02 +0900",
        "Message-Id": "<20210514064303.798045-3-paul.elder@ideasonboard.com>",
        "X-Mailer": "git-send-email 2.27.0",
        "In-Reply-To": "<20210514064303.798045-1-paul.elder@ideasonboard.com>",
        "References": "<20210514064303.798045-1-paul.elder@ideasonboard.com>",
        "MIME-Version": "1.0",
        "Subject": "[libcamera-devel] [PATCH v5 2/3] android: camera_device: Use the\n\tnew CameraMetadata functions",
        "X-BeenThere": "libcamera-devel@lists.libcamera.org",
        "X-Mailman-Version": "2.1.29",
        "Precedence": "list",
        "List-Id": "<libcamera-devel.lists.libcamera.org>",
        "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>",
        "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>",
        "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>",
        "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>",
        "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>",
        "Content-Type": "text/plain; charset=\"utf-8\"",
        "Content-Transfer-Encoding": "base64",
        "Errors-To": "libcamera-devel-bounces@lists.libcamera.org",
        "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"
    },
    "content": "Now that CameraMetadata supports more convenient functions, use those\ninstead.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\n---\nChanges in v5:\n- also convert the calls that use C arrays\n\nChanges in v4:\n- also convert the calls that use std::array\n\nNew in v3\n---\n src/android/camera_device.cpp | 243 +++++++++++++++-------------------\n 1 file changed, 106 insertions(+), 137 deletions(-)",
    "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 74f6915c..b32e8be5 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<uint8_t> 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@@ -864,15 +862,14 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\tminFps, maxFps, maxFps, maxFps\n \t\t};\n \t\tstaticMetadata_->addEntry(ANDROID_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES,\n-\t\t\t\t\t  availableAeFpsTarget, 4);\n+\t\t\t\t\t  availableAeFpsTarget);\n \t}\n \n \tstd::vector<int32_t> aeCompensationRange = {\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<uint8_t> 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<uint8_t> 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<uint8_t> 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<int32_t> 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<uint8_t> 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<int32_t, 2> 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);\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);\n \t}\n \n \t{\n@@ -1017,20 +1007,20 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\tstatic_cast<int32_t>(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);\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<int32_t>() * 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<int32_t> 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  &timestampSource, 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<uint8_t> 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<float> 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<float> lensFocalLenghts = {\n+\tstd::vector<float> 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<uint8_t> 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<uint32_t> 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<int32_t>();\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<uint8_t> 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);\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<int32_t> 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<int32_t> 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<int32_t> 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<CameraMetadata> 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, &timestamp, 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<int32_t>(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<int32_t>(crop.width),\n \t\t\tstatic_cast<int32_t>(crop.height),\n \t\t};\n-\t\tresultMetadata->addEntry(ANDROID_SCALER_CROP_REGION, cropRect, 4);\n+\t\tresultMetadata->addEntry(ANDROID_SCALER_CROP_REGION, cropRect);\n \t}\n \n \t/*\n",
    "prefixes": [
        "libcamera-devel",
        "v5",
        "2/3"
    ]
}