{"id":10228,"url":"https://patchwork.libcamera.org/api/1.1/patches/10228/?format=json","web_url":"https://patchwork.libcamera.org/patch/10228/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20201023171116.24899-10-jacopo@jmondi.org>","date":"2020-10-23T17:11:13","name":"[libcamera-devel,v4,09/12] android: camera_device: Report PIPELINE_MAX_DEPTH","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c9ef1faefc5131854e9d4c32870d2c96b7746981","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10228/mbox/","series":[{"id":1410,"url":"https://patchwork.libcamera.org/api/1.1/series/1410/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1410","date":"2020-10-23T17:11:04","name":"libcamera: Introduce draft controls","version":4,"mbox":"https://patchwork.libcamera.org/series/1410/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10228/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10228/checks/","tags":{},"headers":{"Return-Path":"","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 965DCBDB13\n\tfor ;\n\tFri, 23 Oct 2020 17:11:35 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 74D2A619BF;\n\tFri, 23 Oct 2020 19:11:35 +0200 (CEST)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C74E16195B\n\tfor ;\n\tFri, 23 Oct 2020 19:11:30 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 1A7501C0006;\n\tFri, 23 Oct 2020 17:11:29 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 23 Oct 2020 19:11:13 +0200","Message-Id":"<20201023171116.24899-10-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20201023171116.24899-1-jacopo@jmondi.org>","References":"<20201023171116.24899-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 09/12] android: camera_device: Report\n\tPIPELINE_MAX_DEPTH","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Register the ANDROID_REQUEST_PIPELINE_MAX_DEPTH static property\ninspecting the value reported by the pipeline handler.\n\nIf the Camera does not report any suitable value, default the\nstatic property to 2.\n\nReviewed-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 15 ++++++++++++---\n 1 file changed, 12 insertions(+), 3 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex e9404c2f3004..8166b09bb69a 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -13,6 +13,7 @@\n #include \n #include \n \n+#include \n #include \n #include \n #include \n@@ -591,6 +592,8 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\treturn nullptr;\n \t}\n \n+\tconst ControlInfoMap &controlsInfo = camera_->controls();\n+\n \t/* Color correction static metadata. */\n \tstd::vector aberrationModes = {\n \t\tANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF,\n@@ -882,9 +885,15 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \tstaticMetadata_->addEntry(ANDROID_REQUEST_PARTIAL_RESULT_COUNT,\n \t\t\t\t &partialResultCount, 1);\n \n-\tuint8_t maxPipelineDepth = 2;\n-\tstaticMetadata_->addEntry(ANDROID_REQUEST_PIPELINE_MAX_DEPTH,\n-\t\t\t\t &maxPipelineDepth, 1);\n+\t{\n+\t\t/* Default the value to 2 if not reported by the camera. */\n+\t\tuint8_t maxPipelineDepth = 2;\n+\t\tconst auto &infoMap = controlsInfo.find(&controls::draft::PipelineDepth);\n+\t\tif (infoMap != controlsInfo.end())\n+\t\t\tmaxPipelineDepth = infoMap->second.max().get();\n+\t\tstaticMetadata_->addEntry(ANDROID_REQUEST_PIPELINE_MAX_DEPTH,\n+\t\t\t\t\t &maxPipelineDepth, 1);\n+\t}\n \n \t/* LIMITED does not support reprocessing. */\n \tuint32_t maxNumInputStreams = 0;\n","prefixes":["libcamera-devel","v4","09/12"]}