{"id":9235,"url":"https://patchwork.libcamera.org/api/1.1/patches/9235/?format=json","web_url":"https://patchwork.libcamera.org/patch/9235/","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":"<20200805151507.227503-9-kieran.bingham@ideasonboard.com>","date":"2020-08-05T15:15:02","name":"[libcamera-devel,v4,08/13] android: camera_device: Only construct required planes","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"57ab788b1e4674c26d9f2b476ba085651c140b10","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9235/mbox/","series":[{"id":1198,"url":"https://patchwork.libcamera.org/api/1.1/series/1198/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1198","date":"2020-08-05T15:14:54","name":"android: JPEG support","version":4,"mbox":"https://patchwork.libcamera.org/series/1198/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9235/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9235/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 7AC55BD87A\n\tfor ;\n\tWed, 5 Aug 2020 15:15:19 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 43C5660737;\n\tWed, 5 Aug 2020 17:15:19 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A7C57607EB\n\tfor ;\n\tWed, 5 Aug 2020 17:15:15 +0200 (CEST)","from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3985310CF;\n\tWed, 5 Aug 2020 17:15:15 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"DdHduWEv\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1596640515;\n\tbh=Q4hfjc6Ay+uc0VMtoVvNDXBriK4jpJv7sMKBqgilycg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=DdHduWEvRfkNqWUtS5bdQmtLGil22i6zNRvFv/q0YvZwrr0C0G3kpHshOXO+peKgU\n\t/4wVa42EVZgD5RAvKeGtmYusryyhfAWwgFH9fUXmOodEG7AcDw/GPEddle+K8YxU81\n\t2NzjrfzWWeh5uSiFnLhBGsXAJ//6dNlv7Cf3XvnA=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Wed, 5 Aug 2020 16:15:02 +0100","Message-Id":"<20200805151507.227503-9-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200805151507.227503-1-kieran.bingham@ideasonboard.com>","References":"<20200805151507.227503-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 08/13] android: camera_device: Only\n\tconstruct required planes","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":"The camera3buffer describes the number of filedescriptors given.\nDon't try to construct more planes than that.\n\nReviewed-by: Laurent Pinchart \nSigned-off-by: Kieran Bingham \n---\n\nv4:\n - Return nullptr on error instead of breaking\n---\n src/android/camera_device.cpp | 13 ++++++++++++-\n 1 file changed, 12 insertions(+), 1 deletion(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 60af59ce154c..27bcf3ab1930 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1118,9 +1118,20 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer)\n {\n \tstd::vector planes;\n-\tfor (unsigned int i = 0; i < 3; i++) {\n+\tfor (int i = 0; i < camera3buffer->numFds; i++) {\n+\t\t/* Skip unused planes. */\n+\t\tif (camera3buffer->data[i] == -1)\n+\t\t\tbreak;\n+\n \t\tFrameBuffer::Plane plane;\n \t\tplane.fd = FileDescriptor(camera3buffer->data[i]);\n+\t\tif (!plane.fd.isValid()) {\n+\t\t\tLOG(HAL, Error) << \"Failed to obtain FileDescriptor (\"\n+\t\t\t\t\t<< camera3buffer->data[i] << \") \"\n+\t\t\t\t\t<< \" on plane \" << i;\n+\t\t\treturn nullptr;\n+\t\t}\n+\n \t\t/*\n \t\t * Setting length to zero here is OK as the length is only used\n \t\t * to map the memory of the plane. Libcamera do not need to poke\n","prefixes":["libcamera-devel","v4","08/13"]}