{"id":1913,"url":"https://patchwork.libcamera.org/api/patches/1913/?format=json","web_url":"https://patchwork.libcamera.org/patch/1913/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190904120847.11934-4-jacopo@jmondi.org>","date":"2019-09-04T12:08:46","name":"[libcamera-devel,v3,3/4] android: camera_device: Rework template generation","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"f6a68568fd7966ff094e8d986c94ee9a6751d126","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1913/mbox/","series":[{"id":478,"url":"https://patchwork.libcamera.org/api/series/478/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=478","date":"2019-09-04T12:08:43","name":"android: Rework metadata tags","version":2,"mbox":"https://patchwork.libcamera.org/series/478/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1913/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1913/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net\n\t[217.70.183.200])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DD18261567\n\tfor ;\n\tWed, 4 Sep 2019 14:07:25 +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 relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 9F0EE20011;\n\tWed, 4 Sep 2019 12:07:24 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Cc":"Jacopo Mondi , kamesan@google.com, jcliang@google.com,\n\tshik@google.com, wtlee@google.com","Date":"Wed, 4 Sep 2019 14:08:46 +0200","Message-Id":"<20190904120847.11934-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.23.0","In-Reply-To":"<20190904120847.11934-1-jacopo@jmondi.org>","References":"<20190904120847.11934-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 3/4] android: camera_device: Rework\n\ttemplate generation","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Wed, 04 Sep 2019 12:07:26 -0000"},"content":"Rework the template generation procedure by adding two missing requested\nkeys, fixing the capture intent to update it based on the requested\ntemplate type, and removing static metadata keys which didn't belong\nthere.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 123 +++++++---------------------------\n 1 file changed, 24 insertions(+), 99 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex dee60e3d2931..eaa0e1de12c2 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -544,52 +544,29 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n \t\treturn nullptr;\n \t}\n \n-\tif (requestTemplate_)\n+\tif (requestTemplate_) {\n+\t\tcamera_metadata_entry_t captureIntentEntry;\n+\n+\t\tfind_camera_metadata_entry(requestTemplate_,\n+\t\t\tANDROID_CONTROL_CAPTURE_INTENT, &captureIntentEntry);\n+\t\tret = update_camera_metadata_entry(requestTemplate_,\n+\t\t\t\tcaptureIntentEntry.index,\n+\t\t\t\t&captureIntent, 1, &captureIntentEntry);\n+\t\tMETADATA_ASSERT(ret);\n+\n \t\treturn requestTemplate_;\n+\t}\n \n-\t/* \\todo Use correct sizes */\n-\t#define REQUEST_TEMPLATE_ENTRIES\t 30\n-\t#define REQUEST_TEMPLATE_DATA\t\t2048\n-\trequestTemplate_ = allocate_camera_metadata(REQUEST_TEMPLATE_ENTRIES,\n-\t\t\t\t\t\t REQUEST_TEMPLATE_DATA);\n+\t/*\n+\t * \\todo Keep this in sync with the actual number of entries.\n+\t * Currently: 12 entries, 15 bytes\n+\t */\n+\trequestTemplate_ = allocate_camera_metadata(15, 20);\n \tif (!requestTemplate_) {\n \t\tLOG(HAL, Error) << \"Failed to allocate template metadata\";\n \t\treturn nullptr;\n \t}\n \n-\t/* Set to 0 the number of 'processed and stalling' streams (ie JPEG). */\n-\tint32_t maxOutStream[] = { 0, 2, 0 };\n-\tret = add_camera_metadata_entry(requestTemplate_,\n-\t\t\tANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS,\n-\t\t\tmaxOutStream, 3);\n-\tMETADATA_ASSERT(ret);\n-\n-\tuint8_t maxPipelineDepth = 5;\n-\tret = add_camera_metadata_entry(requestTemplate_,\n-\t\t\tANDROID_REQUEST_PIPELINE_MAX_DEPTH,\n-\t\t\t&maxPipelineDepth, 1);\n-\tMETADATA_ASSERT(ret);\n-\n-\tint32_t inputStreams = 0;\n-\tret = add_camera_metadata_entry(requestTemplate_,\n-\t\t\tANDROID_REQUEST_MAX_NUM_INPUT_STREAMS,\n-\t\t\t&inputStreams, 1);\n-\tMETADATA_ASSERT(ret);\n-\n-\tint32_t partialResultCount = 1;\n-\tret = add_camera_metadata_entry(requestTemplate_,\n-\t\t\tANDROID_REQUEST_PARTIAL_RESULT_COUNT,\n-\t\t\t&partialResultCount, 1);\n-\tMETADATA_ASSERT(ret);\n-\n-\tuint8_t availableCapabilities[] = {\n-\t\tANDROID_REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE,\n-\t};\n-\tret = add_camera_metadata_entry(requestTemplate_,\n-\t\t\tANDROID_REQUEST_AVAILABLE_CAPABILITIES,\n-\t\t\tavailableCapabilities, 1);\n-\tMETADATA_ASSERT(ret);\n-\n \tuint8_t aeMode = ANDROID_CONTROL_AE_MODE_ON;\n \tret = add_camera_metadata_entry(requestTemplate_,\n \t\t\tANDROID_CONTROL_AE_MODE,\n@@ -632,12 +609,6 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n \t\t\t&awbLock, 1);\n \tMETADATA_ASSERT(ret);\n \n-\tuint8_t awbLockAvailable = ANDROID_CONTROL_AWB_LOCK_AVAILABLE_FALSE;\n-\tret = add_camera_metadata_entry(requestTemplate_,\n-\t\t\tANDROID_CONTROL_AWB_LOCK_AVAILABLE,\n-\t\t\t&awbLockAvailable, 1);\n-\tMETADATA_ASSERT(ret);\n-\n \tuint8_t flashMode = ANDROID_FLASH_MODE_OFF;\n \tret = add_camera_metadata_entry(requestTemplate_,\n \t\t\tANDROID_FLASH_MODE,\n@@ -650,67 +621,21 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n \t\t\t&faceDetectMode, 1);\n \tMETADATA_ASSERT(ret);\n \n+\tuint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_OFF;\n \tret = add_camera_metadata_entry(requestTemplate_,\n-\t\t\tANDROID_CONTROL_CAPTURE_INTENT,\n-\t\t\t&captureIntent, 1);\n+\t\t\tANDROID_NOISE_REDUCTION_MODE, &noiseReduction, 1);\n \tMETADATA_ASSERT(ret);\n \n-\t/*\n-\t * This is quite hard to list at the moment wihtout knowing what\n-\t * we could control.\n-\t *\n-\t * For now, just list in the available Request keys and in the available\n-\t * result keys the control and reporting of the AE algorithm.\n-\t */\n-\tstd::vector availableRequestKeys = {\n-\t\tANDROID_CONTROL_AE_MODE,\n-\t\tANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,\n-\t\tANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n-\t\tANDROID_CONTROL_AE_LOCK,\n-\t\tANDROID_CONTROL_AF_TRIGGER,\n-\t\tANDROID_CONTROL_AWB_MODE,\n-\t\tANDROID_CONTROL_AWB_LOCK,\n-\t\tANDROID_CONTROL_AWB_LOCK_AVAILABLE,\n-\t\tANDROID_CONTROL_CAPTURE_INTENT,\n-\t\tANDROID_FLASH_MODE,\n-\t\tANDROID_STATISTICS_FACE_DETECT_MODE,\n-\t};\n-\n+\tuint8_t aberrationMode = ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF;\n \tret = add_camera_metadata_entry(requestTemplate_,\n-\t\t\tANDROID_REQUEST_AVAILABLE_REQUEST_KEYS,\n-\t\t\tavailableRequestKeys.data(),\n-\t\t\tavailableRequestKeys.size());\n-\tMETADATA_ASSERT(ret);\n-\n-\tstd::vector availableResultKeys = {\n-\t\tANDROID_CONTROL_AE_MODE,\n-\t\tANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,\n-\t\tANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n-\t\tANDROID_CONTROL_AE_LOCK,\n-\t\tANDROID_CONTROL_AF_TRIGGER,\n-\t\tANDROID_CONTROL_AWB_MODE,\n-\t\tANDROID_CONTROL_AWB_LOCK,\n-\t\tANDROID_CONTROL_AWB_LOCK_AVAILABLE,\n-\t\tANDROID_CONTROL_CAPTURE_INTENT,\n-\t\tANDROID_FLASH_MODE,\n-\t\tANDROID_STATISTICS_FACE_DETECT_MODE,\n-\t};\n-\tret = add_camera_metadata_entry(requestTemplate_,\n-\t\t\tANDROID_REQUEST_AVAILABLE_RESULT_KEYS,\n-\t\t\tavailableResultKeys.data(),\n-\t\t\tavailableResultKeys.size());\n+\t\t\tANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n+\t\t\t&aberrationMode, 1);\n \tMETADATA_ASSERT(ret);\n \n-\t/*\n-\t * \\todo The available characteristics are be the tags reported\n-\t * as part of the static metadata reported at hal_get_camera_info()\n-\t * time. As of now, report an empty list.\n-\t */\n-\tstd::vector availableCharacteristicsKeys = {};\n+\t/* Use the capture matching the requested template type. */\n \tret = add_camera_metadata_entry(requestTemplate_,\n-\t\t\tANDROID_REQUEST_AVAILABLE_CHARACTERISTICS_KEYS,\n-\t\t\tavailableCharacteristicsKeys.data(),\n-\t\t\tavailableCharacteristicsKeys.size());\n+\t\t\tANDROID_CONTROL_CAPTURE_INTENT,\n+\t\t\t&captureIntent, 1);\n \tMETADATA_ASSERT(ret);\n \n \treturn requestTemplate_;\n","prefixes":["libcamera-devel","v3","3/4"]}