Patch Detail
Show a patch.
GET /api/1.1/patches/9012/?format=api
{ "id": 9012, "url": "https://patchwork.libcamera.org/api/1.1/patches/9012/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9012/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20200725164243.168297-6-jacopo@jmondi.org>", "date": "2020-07-25T16:42:43", "name": "[libcamera-devel,5/5] android: camera_device: Re-use PREVIEW template for other cases", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ec03d10e75b91f6b0fb1d0bc973be4523ff4e385", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": { "id": 15, "url": "https://patchwork.libcamera.org/api/1.1/users/15/?format=api", "username": "jmondi", "first_name": "Jacopo", "last_name": "Mondi", "email": "jacopo@jmondi.org" }, "mbox": "https://patchwork.libcamera.org/patch/9012/mbox/", "series": [ { "id": 1147, "url": "https://patchwork.libcamera.org/api/1.1/series/1147/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1147", "date": "2020-07-25T16:42:38", "name": "android: cts: Fix Manual and VideoRecording templates", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1147/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9012/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9012/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 DBB23BD86F\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 25 Jul 2020 16:39:17 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5180D613AD;\n\tSat, 25 Jul 2020 18:39:17 +0200 (CEST)", "from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EAFA06124D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 25 Jul 2020 18:39:13 +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 relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 6346FE0003;\n\tSat, 25 Jul 2020 16:39:13 +0000 (UTC)" ], "X-Originating-IP": "2.224.242.101", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sat, 25 Jul 2020 18:42:43 +0200", "Message-Id": "<20200725164243.168297-6-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20200725164243.168297-1-jacopo@jmondi.org>", "References": "<20200725164243.168297-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 5/5] android: camera_device: Re-use\n\tPREVIEW template for other cases", "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=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "As the VideoRecording and Manual request templates are very similar to\nthe one used for the Preview use case, re-use it and update the entries\nthat differ between use-cases.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 149 ++--------------------------------\n 1 file changed, 9 insertions(+), 140 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex bd501a9b1660..363151755366 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -920,168 +920,37 @@ CameraMetadata *CameraDevice::requestTemplatePreview()\n \n CameraMetadata *CameraDevice::requestTemplateVideoRecord()\n {\n-\t/*\n-\t * \\todo Keep this in sync with the actual number of entries.\n-\t * Currently: 20 entries, 35 bytes\n-\t */\n-\tCameraMetadata *requestTemplate = new CameraMetadata(20, 35);\n-\tif (!requestTemplate->isValid()) {\n+\tCameraMetadata *requestTemplate = requestTemplatePreview();\n+\tif (!requestTemplate || !requestTemplate->isValid()) {\n \t\tdelete requestTemplate;\n \t\treturn nullptr;\n \t}\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-\n-\tint32_t aeExposureCompensation = 0;\n-\trequestTemplate->addEntry(ANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,\n-\t\t\t\t &aeExposureCompensation, 1);\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-\n-\tuint8_t aeLock = ANDROID_CONTROL_AE_LOCK_OFF;\n-\trequestTemplate->addEntry(ANDROID_CONTROL_AE_LOCK,\n-\t\t\t\t &aeLock, 1);\n-\n \tstd::vector<int32_t> aeFpsTarget = {\n \t\t30, 30,\n \t};\n-\trequestTemplate->addEntry(ANDROID_CONTROL_AE_TARGET_FPS_RANGE,\n-\t\t\t\t aeFpsTarget.data(),\n-\t\t\t\t aeFpsTarget.size());\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-\n-\tuint8_t afTrigger = ANDROID_CONTROL_AF_TRIGGER_IDLE;\n-\trequestTemplate->addEntry(ANDROID_CONTROL_AF_TRIGGER,\n-\t\t\t\t &afTrigger, 1);\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-\n-\tuint8_t awbLock = ANDROID_CONTROL_AWB_LOCK_OFF;\n-\trequestTemplate->addEntry(ANDROID_CONTROL_AWB_LOCK,\n-\t\t\t\t &awbLock, 1);\n-\n-\tuint8_t flashMode = ANDROID_FLASH_MODE_OFF;\n-\trequestTemplate->addEntry(ANDROID_FLASH_MODE,\n-\t\t\t\t &flashMode, 1);\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-\n-\tuint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_OFF;\n-\trequestTemplate->addEntry(ANDROID_NOISE_REDUCTION_MODE,\n-\t\t\t\t &noiseReduction, 1);\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-\n-\tuint8_t controlMode = ANDROID_CONTROL_MODE_AUTO;\n-\trequestTemplate->addEntry(ANDROID_CONTROL_MODE, &controlMode, 1);\n-\n-\tfloat lensAperture = 2.53 / 100;\n-\trequestTemplate->addEntry(ANDROID_LENS_APERTURE, &lensAperture, 1);\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-\n-\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW;\n-\trequestTemplate->addEntry(ANDROID_CONTROL_CAPTURE_INTENT,\n-\t\t\t\t &captureIntent, 1);\n+\trequestTemplate->updateEntry(ANDROID_CONTROL_AE_TARGET_FPS_RANGE,\n+\t\t\t\t aeFpsTarget.data(), aeFpsTarget.size());\n \n \treturn requestTemplate;\n }\n \n CameraMetadata *CameraDevice::requestTemplateManual()\n {\n-\t/*\n-\t * \\todo Keep this in sync with the actual number of entries.\n-\t * Currently: 20 entries, 35 bytes\n-\t */\n-\tCameraMetadata *requestTemplate = new CameraMetadata(20, 35);\n-\tif (!requestTemplate->isValid()) {\n+\tCameraMetadata *requestTemplate = requestTemplatePreview();\n+\tif (!requestTemplate || !requestTemplate->isValid()) {\n \t\tdelete requestTemplate;\n \t\treturn nullptr;\n \t}\n \n \tuint8_t aeMode = ANDROID_CONTROL_AE_MODE_OFF;\n-\trequestTemplate->addEntry(ANDROID_CONTROL_AE_MODE,\n-\t\t\t\t &aeMode, 1);\n-\n-\tint32_t aeExposureCompensation = 0;\n-\trequestTemplate->addEntry(ANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,\n-\t\t\t\t &aeExposureCompensation, 1);\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-\n-\tuint8_t aeLock = ANDROID_CONTROL_AE_LOCK_OFF;\n-\trequestTemplate->addEntry(ANDROID_CONTROL_AE_LOCK,\n-\t\t\t\t &aeLock, 1);\n-\n-\tstd::vector<int32_t> aeFpsTarget = {\n-\t\t15, 30,\n-\t};\n-\trequestTemplate->addEntry(ANDROID_CONTROL_AE_TARGET_FPS_RANGE,\n-\t\t\t\t aeFpsTarget.data(),\n-\t\t\t\t aeFpsTarget.size());\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-\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->updateEntry(ANDROID_CONTROL_AE_MODE, &aeMode, 1);\n \n \tuint8_t awbMode = ANDROID_CONTROL_AWB_MODE_OFF;\n-\trequestTemplate->addEntry(ANDROID_CONTROL_AWB_MODE,\n-\t\t\t\t &awbMode, 1);\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-\n-\tuint8_t flashMode = ANDROID_FLASH_MODE_OFF;\n-\trequestTemplate->addEntry(ANDROID_FLASH_MODE,\n-\t\t\t\t &flashMode, 1);\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-\n-\tuint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_OFF;\n-\trequestTemplate->addEntry(ANDROID_NOISE_REDUCTION_MODE,\n-\t\t\t\t &noiseReduction, 1);\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+\trequestTemplate->updateEntry(ANDROID_CONTROL_AWB_MODE, &awbMode, 1);\n \n \tuint8_t controlMode = ANDROID_CONTROL_MODE_OFF;\n-\trequestTemplate->addEntry(ANDROID_CONTROL_MODE, &controlMode, 1);\n-\n-\tfloat lensAperture = 2.53 / 100;\n-\trequestTemplate->addEntry(ANDROID_LENS_APERTURE, &lensAperture, 1);\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-\n-\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW;\n-\trequestTemplate->addEntry(ANDROID_CONTROL_CAPTURE_INTENT,\n-\t\t\t\t &captureIntent, 1);\n+\trequestTemplate->updateEntry(ANDROID_CONTROL_MODE, &controlMode, 1);\n \n \treturn requestTemplate;\n }\n", "prefixes": [ "libcamera-devel", "5/5" ] }