{"id":1935,"url":"https://patchwork.libcamera.org/api/patches/1935/?format=json","web_url":"https://patchwork.libcamera.org/patch/1935/","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":"<20190905074737.6955-4-jacopo@jmondi.org>","date":"2019-09-05T07:47:30","name":"[libcamera-devel,v6,3/9] android: camera_device: Remove tags from request template","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"57965b5cd056535d38e23d66d326d32af7978472","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/1935/mbox/","series":[{"id":481,"url":"https://patchwork.libcamera.org/api/series/481/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=481","date":"2019-09-05T07:47:27","name":"android: Rework metadata tags","version":6,"mbox":"https://patchwork.libcamera.org/series/481/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1935/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1935/checks/","tags":{},"headers":{"Return-Path":"","Received":["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 70AC661566\n\tfor ;\n\tThu, 5 Sep 2019 09:46: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 relay4-d.mail.gandi.net (Postfix) with ESMTPSA id B91FEE000D;\n\tThu, 5 Sep 2019 07:46:13 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 5 Sep 2019 09:47:30 +0200","Message-Id":"<20190905074737.6955-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.23.0","In-Reply-To":"<20190905074737.6955-1-jacopo@jmondi.org>","References":"<20190905074737.6955-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v6 3/9] android: camera_device: Remove\n\ttags from request template","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":"Thu, 05 Sep 2019 07:46:14 -0000"},"content":"Remove metadata tags wrongly added to the request template constructed\nby the libcamera HAL.\n\nSigned-off-by: Jacopo Mondi \nReviewed-by: Laurent Pinchart \n---\n src/android/camera_device.cpp | 97 -----------------------------------\n 1 file changed, 97 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex dee60e3d2931..bd69198ec482 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -557,39 +557,6 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\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 +599,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@@ -655,64 +616,6 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n \t\t\t&captureIntent, 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-\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-\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-\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-\tMETADATA_ASSERT(ret);\n-\n \treturn requestTemplate_;\n }\n \n","prefixes":["libcamera-devel","v6","3/9"]}