Patch Detail
Show a patch.
GET /api/patches/1943/?format=api
{ "id": 1943, "url": "https://patchwork.libcamera.org/api/patches/1943/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1943/", "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": "<20190905210940.32358-2-jacopo@jmondi.org>", "date": "2019-09-05T21:09:32", "name": "[libcamera-devel,v7,1/9] android: camera_device: Add missing static metadata", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "771e4f4fa8600b433252ac0e106b088a54f6e5d6", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1943/mbox/", "series": [ { "id": 482, "url": "https://patchwork.libcamera.org/api/series/482/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=482", "date": "2019-09-05T21:09:31", "name": "android: Rework metadata tags", "version": 7, "mbox": "https://patchwork.libcamera.org/series/482/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1943/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1943/checks/", "tags": {}, "headers": { "Return-Path": "<jacopo@jmondi.org>", "Received": [ "from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net\n\t[217.70.183.198])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 60AC661567\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 5 Sep 2019 23:08:14 +0200 (CEST)", "from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 84614C0002;\n\tThu, 5 Sep 2019 21:08:13 +0000 (UTC)" ], "X-Originating-IP": "2.224.242.101", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 5 Sep 2019 23:09:32 +0200", "Message-Id": "<20190905210940.32358-2-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.23.0", "In-Reply-To": "<20190905210940.32358-1-jacopo@jmondi.org>", "References": "<20190905210940.32358-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v7 1/9] android: camera_device: Add\n\tmissing static metadata", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "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>", "X-List-Received-Date": "Thu, 05 Sep 2019 21:08:14 -0000" }, "content": "Add all the static metadata keys part of the BC (backward compatible)\nmetadata group, which represent the minimum requirement for devices\nsupporting the LIMITED hardware level.\n\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nAcked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 272 +++++++++++++++++++++++++++++++---\n 1 file changed, 248 insertions(+), 24 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex c27175ac090d..15f57a7fe731 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -134,6 +134,149 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tstaticMetadata_ = allocate_camera_metadata(STATIC_ENTRY_CAP,\n \t\t\t\t\t\t STATIC_DATA_CAP);\n \n+\t/* Color correction static metadata. */\n+\tstd::vector<uint8_t> aberrationModes = {\n+\t\tANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES,\n+\t\t\taberrationModes.data(), aberrationModes.size());\n+\tMETADATA_ASSERT(ret);\n+\n+\t/* Control static metadata. */\n+\tstd::vector<uint8_t> aeAvailableAntiBandingModes = {\n+\t\tANDROID_CONTROL_AE_ANTIBANDING_MODE_OFF,\n+\t\tANDROID_CONTROL_AE_ANTIBANDING_MODE_50HZ,\n+\t\tANDROID_CONTROL_AE_ANTIBANDING_MODE_60HZ,\n+\t\tANDROID_CONTROL_AE_ANTIBANDING_MODE_AUTO,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_CONTROL_AE_AVAILABLE_ANTIBANDING_MODES,\n+\t\t\taeAvailableAntiBandingModes.data(),\n+\t\t\taeAvailableAntiBandingModes.size());\n+\tMETADATA_ASSERT(ret);\n+\n+\tstd::vector<uint8_t> aeAvailableModes = {\n+\t\tANDROID_CONTROL_AE_MODE_ON,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_CONTROL_AE_AVAILABLE_MODES,\n+\t\t\taeAvailableModes.data(), aeAvailableModes.size());\n+\tMETADATA_ASSERT(ret);\n+\n+\tstd::vector<int32_t> availableAeFpsTarget = {\n+\t\t15, 30,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES,\n+\t\t\tavailableAeFpsTarget.data(),\n+\t\t\tavailableAeFpsTarget.size());\n+\tMETADATA_ASSERT(ret);\n+\n+\tstd::vector<int32_t> aeCompensationRange = {\n+\t\t0, 0,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_CONTROL_AE_COMPENSATION_RANGE,\n+\t\t\taeCompensationRange.data(),\n+\t\t\taeCompensationRange.size());\n+\tMETADATA_ASSERT(ret);\n+\n+\tconst camera_metadata_rational_t aeCompensationStep[] = {\n+\t\t{ 0, 1 }\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_CONTROL_AE_COMPENSATION_STEP,\n+\t\t\taeCompensationStep, 1);\n+\tMETADATA_ASSERT(ret);\n+\n+\tstd::vector<uint8_t> availableAfModes = {\n+\t\tANDROID_CONTROL_AF_MODE_OFF,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_CONTROL_AF_AVAILABLE_MODES,\n+\t\t\tavailableAfModes.data(), availableAfModes.size());\n+\tMETADATA_ASSERT(ret);\n+\n+\tstd::vector<uint8_t> availableEffects = {\n+\t\tANDROID_CONTROL_EFFECT_MODE_OFF,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_CONTROL_AVAILABLE_EFFECTS,\n+\t\t\tavailableEffects.data(), availableEffects.size());\n+\tMETADATA_ASSERT(ret);\n+\n+\tstd::vector<uint8_t> availableSceneModes = {\n+\t\tANDROID_CONTROL_SCENE_MODE_DISABLED,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_CONTROL_AVAILABLE_SCENE_MODES,\n+\t\t\tavailableSceneModes.data(), availableSceneModes.size());\n+\tMETADATA_ASSERT(ret);\n+\n+\tstd::vector<uint8_t> availableStabilizationModes = {\n+\t\tANDROID_CONTROL_VIDEO_STABILIZATION_MODE_OFF,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES,\n+\t\t\tavailableStabilizationModes.data(),\n+\t\t\tavailableStabilizationModes.size());\n+\tMETADATA_ASSERT(ret);\n+\n+\tstd::vector<uint8_t> availableAwbModes = {\n+\t\tANDROID_CONTROL_AWB_MODE_OFF,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_CONTROL_AWB_AVAILABLE_MODES,\n+\t\t\tavailableAwbModes.data(), availableAwbModes.size());\n+\tMETADATA_ASSERT(ret);\n+\n+\tstd::vector<int32_t> availableMaxRegions = {\n+\t\t0, 0, 0,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_CONTROL_MAX_REGIONS,\n+\t\t\tavailableMaxRegions.data(), availableMaxRegions.size());\n+\tMETADATA_ASSERT(ret);\n+\n+\tstd::vector<uint8_t> sceneModesOverride = {\n+\t\tANDROID_CONTROL_AE_MODE_ON,\n+\t\tANDROID_CONTROL_AWB_MODE_AUTO,\n+\t\tANDROID_CONTROL_AF_MODE_AUTO,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_CONTROL_SCENE_MODE_OVERRIDES,\n+\t\t\tsceneModesOverride.data(), sceneModesOverride.size());\n+\tMETADATA_ASSERT(ret);\n+\n+\tuint8_t aeLockAvailable = ANDROID_CONTROL_AE_LOCK_AVAILABLE_FALSE;\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_CONTROL_AE_LOCK_AVAILABLE,\n+\t\t\t&aeLockAvailable, 1);\n+\tMETADATA_ASSERT(ret);\n+\n+\tuint8_t awbLockAvailable = ANDROID_CONTROL_AWB_LOCK_AVAILABLE_FALSE;\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_CONTROL_AWB_LOCK_AVAILABLE,\n+\t\t\t&awbLockAvailable, 1);\n+\tMETADATA_ASSERT(ret);\n+\n+\tchar availableControlModes = ANDROID_CONTROL_MODE_AUTO;\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_CONTROL_AVAILABLE_MODES,\n+\t\t\t&availableControlModes, 1);\n+\tMETADATA_ASSERT(ret);\n+\n+\t/* JPEG static metadata. */\n+\tstd::vector<int32_t> availableThumbnailSizes = {\n+\t\t0, 0,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_JPEG_AVAILABLE_THUMBNAIL_SIZES,\n+\t\t\tavailableThumbnailSizes.data(),\n+\t\t\tavailableThumbnailSizes.size());\n+\tMETADATA_ASSERT(ret);\n+\n \t/* Sensor static metadata. */\n \tint32_t pixelArraySize[] = {\n \t\t2592, 1944,\n@@ -179,6 +322,47 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\t\t&orientation, 1);\n \tMETADATA_ASSERT(ret);\n \n+\tstd::vector<int32_t> testPatterModes = {\n+\t\tANDROID_SENSOR_TEST_PATTERN_MODE_OFF,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\t\tANDROID_SENSOR_AVAILABLE_TEST_PATTERN_MODES,\n+\t\t\t\ttestPatterModes.data(), testPatterModes.size());\n+\tMETADATA_ASSERT(ret);\n+\n+\tstd::vector<float> physicalSize = {\n+\t\t2592, 1944,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\t\tANDROID_SENSOR_INFO_PHYSICAL_SIZE,\n+\t\t\t\tphysicalSize.data(), physicalSize.size());\n+\tMETADATA_ASSERT(ret);\n+\n+\tuint8_t timestampSource = ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE_UNKNOWN;\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_SENSOR_INFO_TIMESTAMP_SOURCE,\n+\t\t\t×tampSource, 1);\n+\tMETADATA_ASSERT(ret);\n+\n+\t/* Statistics static metadata. */\n+\tuint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES,\n+\t\t\t&faceDetectMode, 1);\n+\tMETADATA_ASSERT(ret);\n+\n+\tint32_t maxFaceCount = 0;\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_STATISTICS_INFO_MAX_FACE_COUNT,\n+\t\t\t&maxFaceCount, 1);\n+\tMETADATA_ASSERT(ret);\n+\n+\t/* Sync static metadata. */\n+\tint32_t maxLatency = ANDROID_SYNC_MAX_LATENCY_UNKNOWN;\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_SYNC_MAX_LATENCY, &maxLatency, 1);\n+\tMETADATA_ASSERT(ret);\n+\n \t/* Flash static metadata. */\n \tchar flashAvailable = ANDROID_FLASH_INFO_AVAILABLE_FALSE;\n \tret = add_camera_metadata_entry(staticMetadata_,\n@@ -187,50 +371,63 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \tMETADATA_ASSERT(ret);\n \n \t/* Lens static metadata. */\n-\tfloat fn = 2.53 / 100;\n+\tstd::vector<float> lensApertures = {\n+\t\t2.53 / 100,\n+\t};\n \tret = add_camera_metadata_entry(staticMetadata_,\n-\t\t\t\tANDROID_LENS_INFO_AVAILABLE_APERTURES, &fn, 1);\n+\t\t\t\tANDROID_LENS_INFO_AVAILABLE_APERTURES,\n+\t\t\t\tlensApertures.data(), lensApertures.size());\n \tMETADATA_ASSERT(ret);\n \n-\t/* Control metadata. */\n-\tchar controlMetadata = ANDROID_CONTROL_MODE_AUTO;\n+\tuint8_t lensFacing = ANDROID_LENS_FACING_FRONT;\n \tret = add_camera_metadata_entry(staticMetadata_,\n-\t\t\tANDROID_CONTROL_AVAILABLE_MODES,\n-\t\t\t&controlMetadata, 1);\n+\t\t\t\tANDROID_LENS_FACING, &lensFacing, 1);\n \tMETADATA_ASSERT(ret);\n \n-\tchar availableAntiBandingModes[] = {\n-\t\tANDROID_CONTROL_AE_ANTIBANDING_MODE_OFF,\n-\t\tANDROID_CONTROL_AE_ANTIBANDING_MODE_50HZ,\n-\t\tANDROID_CONTROL_AE_ANTIBANDING_MODE_60HZ,\n-\t\tANDROID_CONTROL_AE_ANTIBANDING_MODE_AUTO,\n+\tstd::vector<float> lensFocalLenghts = {\n+\t\t1,\n \t};\n \tret = add_camera_metadata_entry(staticMetadata_,\n-\t\t\tANDROID_CONTROL_AE_AVAILABLE_ANTIBANDING_MODES,\n-\t\t\tavailableAntiBandingModes, 4);\n+\t\t\t\tANDROID_LENS_INFO_AVAILABLE_FOCAL_LENGTHS,\n+\t\t\t\tlensFocalLenghts.data(),\n+\t\t\t\tlensFocalLenghts.size());\n \tMETADATA_ASSERT(ret);\n \n-\tchar aeAvailableModes[] = {\n-\t\tANDROID_CONTROL_AE_MODE_ON,\n-\t\tANDROID_CONTROL_AE_MODE_OFF,\n+\tstd::vector<uint8_t> opticalStabilizations = {\n+\t\tANDROID_LENS_OPTICAL_STABILIZATION_MODE_OFF,\n \t};\n \tret = add_camera_metadata_entry(staticMetadata_,\n-\t\t\tANDROID_CONTROL_AE_AVAILABLE_MODES,\n-\t\t\taeAvailableModes, 2);\n+\t\t\t\tANDROID_LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION,\n+\t\t\t\topticalStabilizations.data(),\n+\t\t\t\topticalStabilizations.size());\n \tMETADATA_ASSERT(ret);\n \n-\tcontrolMetadata = ANDROID_CONTROL_AE_LOCK_AVAILABLE_TRUE;\n+\tfloat hypeFocalDistance = 0;\n \tret = add_camera_metadata_entry(staticMetadata_,\n-\t\t\tANDROID_CONTROL_AE_LOCK_AVAILABLE,\n-\t\t\t&controlMetadata, 1);\n+\t\t\t\tANDROID_LENS_INFO_HYPERFOCAL_DISTANCE,\n+\t\t\t\t&hypeFocalDistance, 1);\n \tMETADATA_ASSERT(ret);\n \n-\tuint8_t awbLockAvailable = ANDROID_CONTROL_AWB_LOCK_AVAILABLE_FALSE;\n+\tfloat minFocusDistance = 0;\n \tret = add_camera_metadata_entry(staticMetadata_,\n-\t\t\tANDROID_CONTROL_AWB_LOCK_AVAILABLE,\n-\t\t\t&awbLockAvailable, 1);\n+\t\t\t\tANDROID_LENS_INFO_MINIMUM_FOCUS_DISTANCE,\n+\t\t\t\t&minFocusDistance, 1);\n+\tMETADATA_ASSERT(ret);\n+\n+\t/* Noise reduction modes. */\n+\tuint8_t noiseReductionModes = ANDROID_NOISE_REDUCTION_MODE_OFF;\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\t\tANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,\n+\t\t\t\t&noiseReductionModes, 1);\n+\tMETADATA_ASSERT(ret);\n \n \t/* Scaler static metadata. */\n+\tfloat maxDigitalZoom = 1;\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,\n+\t\t\t&maxDigitalZoom, 1);\n+\tMETADATA_ASSERT(ret);\n+\n \tstd::vector<uint32_t> availableStreamFormats = {\n \t\tANDROID_SCALER_AVAILABLE_FORMATS_BLOB,\n \t\tANDROID_SCALER_AVAILABLE_FORMATS_YCbCr_420_888,\n@@ -275,12 +472,39 @@ camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\tminFrameDurations.data(), minFrameDurations.size());\n \tMETADATA_ASSERT(ret);\n \n+\tuint8_t croppingType = ANDROID_SCALER_CROPPING_TYPE_CENTER_ONLY;\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_SCALER_CROPPING_TYPE, &croppingType, 1);\n+\tMETADATA_ASSERT(ret);\n+\n \t/* Info static metadata. */\n \tuint8_t supportedHWLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;\n \tret = add_camera_metadata_entry(staticMetadata_,\n \t\t\tANDROID_INFO_SUPPORTED_HARDWARE_LEVEL,\n \t\t\t&supportedHWLevel, 1);\n \n+\t/* Request static metadata. */\n+\tint32_t partialResultCount = 1;\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_REQUEST_PARTIAL_RESULT_COUNT,\n+\t\t\t&partialResultCount, 1);\n+\tMETADATA_ASSERT(ret);\n+\n+\tuint8_t maxPipelineDepth = 2;\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_REQUEST_PIPELINE_MAX_DEPTH,\n+\t\t\t&maxPipelineDepth, 1);\n+\tMETADATA_ASSERT(ret);\n+\n+\tstd::vector<uint8_t> availableCapabilities = {\n+\t\tANDROID_REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE,\n+\t};\n+\tret = add_camera_metadata_entry(staticMetadata_,\n+\t\t\tANDROID_REQUEST_AVAILABLE_CAPABILITIES,\n+\t\t\tavailableCapabilities.data(),\n+\t\t\tavailableCapabilities.size());\n+\tMETADATA_ASSERT(ret);\n+\n \treturn staticMetadata_;\n }\n \n", "prefixes": [ "libcamera-devel", "v7", "1/9" ] }