{"id":9462,"url":"https://patchwork.libcamera.org/api/patches/9462/?format=json","web_url":"https://patchwork.libcamera.org/patch/9462/","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":"<20200902152236.69770-2-jacopo@jmondi.org>","date":"2020-09-02T15:22:25","name":"[libcamera-devel,v2,01/12] android: camera_device: Refuse unsupported formats","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"fa330d6aee561b9cc7d47e66ed96c272bd51180b","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/9462/mbox/","series":[{"id":1259,"url":"https://patchwork.libcamera.org/api/series/1259/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1259","date":"2020-09-02T15:22:24","name":"android: camera_device: Fix JPEG/RAW sizes","version":2,"mbox":"https://patchwork.libcamera.org/series/1259/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9462/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9462/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 F169FBE174\n\tfor ;\n\tWed, 2 Sep 2020 15:19:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B69C562984;\n\tWed, 2 Sep 2020 17:19:00 +0200 (CEST)","from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 82A51629A3\n\tfor ;\n\tWed, 2 Sep 2020 17:18:58 +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 relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 42DF4240009;\n\tWed, 2 Sep 2020 15:18:57 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 2 Sep 2020 17:22:25 +0200","Message-Id":"<20200902152236.69770-2-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200902152236.69770-1-jacopo@jmondi.org>","References":"<20200902152236.69770-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 01/12] android: camera_device: Refuse\n\tunsupported formats","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","Cc":"tfiga@google.com, hiroh@google.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The current implementation of CameraDevice::initializeStreamConfigurations()\nfails if an image format marked as mandatory is not supported by the\nlibcamera::Camera device, but erroneously accepts non-mandatory\nnon-supported formats in the list of accepted ones.\n\nFix this by ignoring non supported image formats which are not marked as\nmandatory.\n\nReviewed-by: Kieran Bingham \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 14 ++++++++++----\n 1 file changed, 10 insertions(+), 4 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 9605b9e9069e..ad0d7fd15d90 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -392,10 +392,16 @@ int CameraDevice::initializeStreamConfigurations()\n \t\t\t\tbreak;\n \t\t\t}\n \t\t}\n-\t\tif (camera3Format.mandatory && !mappedFormat.isValid()) {\n-\t\t\tLOG(HAL, Error) << \"Failed to map Android format \"\n-\t\t\t\t\t<< camera3Format.name << \" (\"\n-\t\t\t\t\t<< utils::hex(androidFormat) << \")\";\n+\n+\t\tif (!mappedFormat.isValid()) {\n+\t\t\t/* If the format is not mandatory, skip it. */\n+\t\t\tif (!camera3Format.mandatory)\n+\t\t\t\tcontinue;\n+\n+\t\t\tLOG(HAL, Error)\n+\t\t\t\t<< \"Failed to map mandatory Android format \"\n+\t\t\t\t<< camera3Format.name << \" (\"\n+\t\t\t\t<< utils::hex(androidFormat) << \"): aborting\";\n \t\t\treturn -EINVAL;\n \t\t}\n \n","prefixes":["libcamera-devel","v2","01/12"]}