{"id":10676,"url":"https://patchwork.libcamera.org/api/patches/10676/?format=json","web_url":"https://patchwork.libcamera.org/patch/10676/","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":"<20201217140358.17614-3-jacopo@jmondi.org>","date":"2020-12-17T14:03:58","name":"[libcamera-devel,v2,2/2] android: camera_device: Report number of out streams","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c12273335adece5f53d808463898cd6c6e2b4485","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/10676/mbox/","series":[{"id":1536,"url":"https://patchwork.libcamera.org/api/series/1536/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1536","date":"2020-12-17T14:03:56","name":"android: Report","version":2,"mbox":"https://patchwork.libcamera.org/series/1536/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10676/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10676/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 8D9F7BD80A\n\tfor ;\n\tThu, 17 Dec 2020 14:03:59 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id ABFEF615B2;\n\tThu, 17 Dec 2020 15:03:58 +0100 (CET)","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 E963B61591\n\tfor ;\n\tThu, 17 Dec 2020 15:03:56 +0100 (CET)","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 1876220004;\n\tThu, 17 Dec 2020 14:03:55 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 17 Dec 2020 15:03:58 +0100","Message-Id":"<20201217140358.17614-3-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.29.2","In-Reply-To":"<20201217140358.17614-1-jacopo@jmondi.org>","References":"<20201217140358.17614-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 2/2] android: camera_device: Report\n\tnumber of out streams","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":"Report the number of supported output streams through the\nANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS static metadata.\n\nThe camera HAL currently supports:\n- 1 optional RAW stream\n- 2 YUV streams\n- 1 JPEG stream\n\nReviewed-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 17 +++++++++++++----\n 1 file changed, 13 insertions(+), 4 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 26aa3bc4b123..b4618a680f41 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -675,10 +675,10 @@ std::tuple CameraDevice::calculateStaticMetadataSize()\n {\n \t/*\n \t * \\todo Keep this in sync with the actual number of entries.\n-\t * Currently: 52 entries, 698 bytes of static metadata\n+\t * Currently: 53 entries, 714 bytes of static metadata\n \t */\n-\tuint32_t numEntries = 52;\n-\tuint32_t byteSize = 698;\n+\tuint32_t numEntries = 53;\n+\tuint32_t byteSize = 714;\n \n \t/*\n \t * Calculate space occupation in bytes for dynamically built metadata\n@@ -1090,15 +1090,23 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t};\n \n \t/* Report if camera supports RAW. */\n+\tbool rawStreamAvailable = false;\n \tstd::unique_ptr cameraConfig =\n \t\tcamera_->generateConfiguration({ StreamRole::Raw });\n \tif (cameraConfig && !cameraConfig->empty()) {\n \t\tconst PixelFormatInfo &info =\n \t\t\tPixelFormatInfo::info(cameraConfig->at(0).pixelFormat);\n-\t\tif (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW)\n+\t\tif (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW) {\n+\t\t\trawStreamAvailable = true;\n \t\t\tavailableCapabilities.push_back(ANDROID_REQUEST_AVAILABLE_CAPABILITIES_RAW);\n+\t\t}\n \t}\n \n+\t/* Number of { RAW, YUV, JPEG } supported output streams */\n+\tint32_t numOutStreams[] = { rawStreamAvailable, 2, 1 };\n+\tstaticMetadata_->addEntry(ANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS,\n+\t\t\t\t &numOutStreams, 3);\n+\n \tstaticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_CAPABILITIES,\n \t\t\t\t availableCapabilities.data(),\n \t\t\t\t availableCapabilities.size());\n@@ -1150,6 +1158,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\tANDROID_INFO_SUPPORTED_HARDWARE_LEVEL,\n \t\tANDROID_REQUEST_PARTIAL_RESULT_COUNT,\n \t\tANDROID_REQUEST_PIPELINE_MAX_DEPTH,\n+\t\tANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS,\n \t\tANDROID_REQUEST_MAX_NUM_INPUT_STREAMS,\n \t\tANDROID_REQUEST_AVAILABLE_CAPABILITIES,\n \t};\n","prefixes":["libcamera-devel","v2","2/2"]}