[{"id":11097,"web_url":"https://patchwork.libcamera.org/comment/11097/","msgid":"<20200702233246.GJ3158543@oden.dyn.berto.se>","date":"2020-07-02T23:32:46","subject":"Re: [libcamera-devel] [PATCH v2 7/9] android: camera_device: Add\n\tbuffers for each stream to Requests","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Kieran,\n\nThanks for your work.\n\nOn 2020-07-02 22:36:52 +0100, Kieran Bingham wrote:\n> Construct a FrameBuffer for every buffer given in the camera3Request\n> and add it to the libcamera Request on the appropriate stream.\n> \n> The correct stream is obtained from the private data of the camera3_stream\n> associated with the camera3_buffer.\n> \n> Comments regarding supporting only one buffer are now removed.\n> \n> Signed-off-by: Kieran Bingham \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/android/camera_device.cpp | 38 ++++++++++++++---------------------\n> 1 file changed, 15 insertions(+), 23 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index fc3962dac230..eea8c8c50352 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -977,6 +977,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \n> \t\t/* Maintain internal state of all stream mappings. */\n> \t\tstreams_[i].androidStream = stream;\n> +\t\tstream->priv = static_cast(&streams_[i]);\n> \n> \t\tStreamConfiguration streamConfiguration;\n> \n> @@ -1045,9 +1046,6 @@ static FrameBuffer *newFrameBuffer(const buffer_handle_t camera3buffer)\n> \n> int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Request)\n> {\n> -\tStreamConfiguration *streamConfiguration = &config_->at(0);\n> -\tStream *stream = streamConfiguration->stream();\n> -\n> \tif (camera3Request->num_output_buffers != 1) {\n> \t\tLOG(HAL, Error) << \"Invalid number of output buffers: \"\n> \t\t\t\t<< camera3Request->num_output_buffers;\n> @@ -1085,30 +1083,28 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \t\tcamera_->createRequest(reinterpret_cast(descriptor));\n> \n> \tfor (unsigned int i = 0; i < descriptor->numBuffers; ++i) {\n> +\t\tCameraStream *cameraStream = static_cast(camera3Buffers[i].stream->priv);\n> +\n> \t\t/*\n> \t\t * Keep track of which stream the request belongs to and store\n> \t\t * the native buffer handles.\n> -\t\t *\n> -\t\t * \\todo Currently we only support one capture buffer. Copy\n> -\t\t * all of them to be ready once we'll support more.\n> \t\t */\n> \t\tdescriptor->buffers[i].stream = camera3Buffers[i].stream;\n> \t\tdescriptor->buffers[i].buffer = camera3Buffers[i].buffer;\n> -\t}\n> \n> -\t/*\n> -\t * Create a libcamera buffer using the dmabuf descriptors of the first\n> -\t * and (currently) only supported request buffer.\n> -\t */\n> -\tFrameBuffer *buffer = newFrameBuffer(*camera3Buffers[0].buffer);\n> -\tif (!buffer) {\n> -\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n> -\t\tdelete request;\n> -\t\tdelete descriptor;\n> -\t\treturn -ENOMEM;\n> -\t}\n> +\t\tFrameBuffer *buffer = newFrameBuffer(*camera3Buffers[0].buffer);\n> +\t\tif (!buffer) {\n> +\t\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n> +\t\t\tdelete request;\n> +\t\t\tdelete descriptor;\n> +\t\t\treturn -ENOMEM;\n> +\t\t}\n> +\n> +\t\tStreamConfiguration *streamConfiguration = &config_->at(cameraStream->libcameraIndex);\n> +\t\tStream *stream = streamConfiguration->stream();\n> \n> -\trequest->addBuffer(stream, buffer);\n> +\t\trequest->addBuffer(stream, buffer);\n> +\t}\n> \n> \tint ret = camera_->queueRequest(request);\n> \tif (ret) {\n> @@ -1142,10 +1138,6 @@ void CameraDevice::requestComplete(Request *request)\n> \tcaptureResult.frame_number = descriptor->frameNumber;\n> \tcaptureResult.num_output_buffers = descriptor->numBuffers;\n> \tfor (unsigned int i = 0; i < descriptor->numBuffers; ++i) {\n> -\t\t/*\n> -\t\t * \\todo Currently we only support one capture buffer. Prepare\n> -\t\t * all of them to be ready once we'll support more.\n> -\t\t */\n> \t\tdescriptor->buffers[i].acquire_fence = -1;\n> \t\tdescriptor->buffers[i].release_fence = -1;\n> \t\tdescriptor->buffers[i].status = status;\n> -- \n> 2.25.1\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 0563CBE905\n\tfor ;\n\tThu, 2 Jul 2020 23:32:49 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C668160C55;\n\tFri, 3 Jul 2020 01:32:48 +0200 (CEST)","from mail-lj1-x244.google.com (mail-lj1-x244.google.com\n\t[IPv6:2a00:1450:4864:20::244])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 809D0609C7\n\tfor ;\n\tFri, 3 Jul 2020 01:32:47 +0200 (CEST)","by mail-lj1-x244.google.com with SMTP id h22so27257929lji.9\n\tfor ;\n\tThu, 02 Jul 2020 16:32:47 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tl5sm4372896lfp.9.2020.07.02.16.32.46\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 02 Jul 2020 16:32:46 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com\n\theader.b=\"RySidH2l\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=m180DcdAdaFdp5UlPiBqAhWvIL2d0duPZyfBEdiJ1dQ=;\n\tb=RySidH2lo5jY4H+y6n0p8eH2Z7uXu8SqibBlRiqAH6nRVUcgBy5rLl40pRSP8x3hda\n\tTlDq452PrufYNdRi7b0bz+6r8gkXJ2aZpApQNTv74+VjFWuf4cgFfNqc67AYF0UsdwDM\n\tw1+8dPZGoPTb3mk592qKE+GJdCQ9J0ulnJhc59EPXieSPf58A0bqBxU3gGLVeQ0enACZ\n\tY38oSEcglk/eRgoTrSv0xavzg6PV/bgdkzxKsGTHJXlj6d9Qo8Mie9mAHU+QaFl0wghm\n\tEmp0c8Q/v9iJLjsPSlV6WmreXL3H2igeqJ+8bBKv47QwdAywvMhHfm0+6h1dxFGJw95n\n\tW42w==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=m180DcdAdaFdp5UlPiBqAhWvIL2d0duPZyfBEdiJ1dQ=;\n\tb=TL34CQ0Mzow9JHBNSofkfgyw8qBTnzuDQzUddi/UeT1Kch65uwtL/xFJqYVXiCpm6+\n\tOss6yn98M0tcNZwPmc7TeRVzAjaJ2jDWeTUIEpSz4InFRPi5jHsJ1XFU1v2grTI9jbOa\n\tDS0e+7T7vb21ecX0LTouMkOq1gcm9Vi6thgBpiqqYatD4CwHuGFrzPaav9y34d7gKovb\n\tsIXXg/g9P6cXiCEp3Hc1Bd9KFeDHrVRctovAnBRR2Ts8DvE6clbR3gwqtkhOPmZNHZvq\n\tyXGvmVniAg51gXAplDHCfWd3uutMIiDoeBWGMcWK/Kjo+l8vafxPfdN9g+c9a8NG5zPg\n\t4l/g==","X-Gm-Message-State":"AOAM530E6QIeKRHn+cBhwvIWcYCUQ7q6k4ZooHdlnSm9PPgVYoaFkmnH\n\tD+6WFv0MZb7yhLhlKfEXd8O2ddXRpm91DQ==","X-Google-Smtp-Source":"ABdhPJz89BW/Xi82UCAuqt4eXN5mMmLQRpXlYDXqitLV8oGVQ631xAHI1lXuunX3CxgDKAdMZ6hZ0g==","X-Received":"by 2002:a2e:8e27:: with SMTP id\n\tr7mr17316167ljk.382.1593732766946; \n\tThu, 02 Jul 2020 16:32:46 -0700 (PDT)","Date":"Fri, 3 Jul 2020 01:32:46 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Kieran Bingham ","Message-ID":"<20200702233246.GJ3158543@oden.dyn.berto.se>","References":"<20200702213654.2129054-1-kieran.bingham@ideasonboard.com>\n\t<20200702213654.2129054-8-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200702213654.2129054-8-kieran.bingham@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 7/9] android: camera_device: Add\n\tbuffers for each stream to Requests","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":"libcamera devel ","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":11106,"web_url":"https://patchwork.libcamera.org/comment/11106/","msgid":"<20200703004709.GG12562@pendragon.ideasonboard.com>","date":"2020-07-03T00:47:09","subject":"Re: [libcamera-devel] [PATCH v2 7/9] android: camera_device: Add\n\tbuffers for each stream to Requests","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nThank you for the patch.\n\nOn Thu, Jul 02, 2020 at 10:36:52PM +0100, Kieran Bingham wrote:\n> Construct a FrameBuffer for every buffer given in the camera3Request\n> and add it to the libcamera Request on the appropriate stream.\n> \n> The correct stream is obtained from the private data of the camera3_stream\n> associated with the camera3_buffer.\n> \n> Comments regarding supporting only one buffer are now removed.\n> \n> Signed-off-by: Kieran Bingham \n> ---\n> src/android/camera_device.cpp | 38 ++++++++++++++---------------------\n> 1 file changed, 15 insertions(+), 23 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index fc3962dac230..eea8c8c50352 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -977,6 +977,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \n> \t\t/* Maintain internal state of all stream mappings. */\n> \t\tstreams_[i].androidStream = stream;\n> +\t\tstream->priv = static_cast(&streams_[i]);\n\nWe could also store i in stream->priv, and remove libcameraIndex from\nCameraStream. Up to you.\n\nReviewed-by: Laurent Pinchart \n\n> \n> \t\tStreamConfiguration streamConfiguration;\n> \n> @@ -1045,9 +1046,6 @@ static FrameBuffer *newFrameBuffer(const buffer_handle_t camera3buffer)\n> \n> int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Request)\n> {\n> -\tStreamConfiguration *streamConfiguration = &config_->at(0);\n> -\tStream *stream = streamConfiguration->stream();\n> -\n> \tif (camera3Request->num_output_buffers != 1) {\n> \t\tLOG(HAL, Error) << \"Invalid number of output buffers: \"\n> \t\t\t\t<< camera3Request->num_output_buffers;\n> @@ -1085,30 +1083,28 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \t\tcamera_->createRequest(reinterpret_cast(descriptor));\n> \n> \tfor (unsigned int i = 0; i < descriptor->numBuffers; ++i) {\n> +\t\tCameraStream *cameraStream = static_cast(camera3Buffers[i].stream->priv);\n> +\n> \t\t/*\n> \t\t * Keep track of which stream the request belongs to and store\n> \t\t * the native buffer handles.\n> -\t\t *\n> -\t\t * \\todo Currently we only support one capture buffer. Copy\n> -\t\t * all of them to be ready once we'll support more.\n> \t\t */\n> \t\tdescriptor->buffers[i].stream = camera3Buffers[i].stream;\n> \t\tdescriptor->buffers[i].buffer = camera3Buffers[i].buffer;\n> -\t}\n> \n> -\t/*\n> -\t * Create a libcamera buffer using the dmabuf descriptors of the first\n> -\t * and (currently) only supported request buffer.\n> -\t */\n> -\tFrameBuffer *buffer = newFrameBuffer(*camera3Buffers[0].buffer);\n> -\tif (!buffer) {\n> -\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n> -\t\tdelete request;\n> -\t\tdelete descriptor;\n> -\t\treturn -ENOMEM;\n> -\t}\n> +\t\tFrameBuffer *buffer = newFrameBuffer(*camera3Buffers[0].buffer);\n> +\t\tif (!buffer) {\n> +\t\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n> +\t\t\tdelete request;\n> +\t\t\tdelete descriptor;\n> +\t\t\treturn -ENOMEM;\n> +\t\t}\n> +\n> +\t\tStreamConfiguration *streamConfiguration = &config_->at(cameraStream->libcameraIndex);\n> +\t\tStream *stream = streamConfiguration->stream();\n> \n> -\trequest->addBuffer(stream, buffer);\n> +\t\trequest->addBuffer(stream, buffer);\n> +\t}\n> \n> \tint ret = camera_->queueRequest(request);\n> \tif (ret) {\n> @@ -1142,10 +1138,6 @@ void CameraDevice::requestComplete(Request *request)\n> \tcaptureResult.frame_number = descriptor->frameNumber;\n> \tcaptureResult.num_output_buffers = descriptor->numBuffers;\n> \tfor (unsigned int i = 0; i < descriptor->numBuffers; ++i) {\n> -\t\t/*\n> -\t\t * \\todo Currently we only support one capture buffer. Prepare\n> -\t\t * all of them to be ready once we'll support more.\n> -\t\t */\n> \t\tdescriptor->buffers[i].acquire_fence = -1;\n> \t\tdescriptor->buffers[i].release_fence = -1;\n> \t\tdescriptor->buffers[i].status = status;","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 21310BFFE2\n\tfor ;\n\tFri, 3 Jul 2020 00:47:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 966D960C56;\n\tFri, 3 Jul 2020 02:47:15 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1894B603B3\n\tfor ;\n\tFri, 3 Jul 2020 02:47:14 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6DD289CB;\n\tFri, 3 Jul 2020 02:47:13 +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=\"I0nLKLIg\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593737233;\n\tbh=uOtvvjs5jPA8vUpr3jG29ul83uT96JBmA9SXR09rKCM=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=I0nLKLIgVSrj8axLl/0j5L6JZbM7yNedDq/kFTArW+yiJYA57+mMttTQDbXPkcixe\n\t4quxwOdLNHJcKx18RbTsoxhuOSf4jtwm5mfaQeGChj3QZWbIRE4Cgll3odB69whOKq\n\tv+AhSMYfGDgVDBEGvDZ9I0nUtv52OtloPNAbdVuE=","Date":"Fri, 3 Jul 2020 03:47:09 +0300","From":"Laurent Pinchart ","To":"Kieran Bingham ","Message-ID":"<20200703004709.GG12562@pendragon.ideasonboard.com>","References":"<20200702213654.2129054-1-kieran.bingham@ideasonboard.com>\n\t<20200702213654.2129054-8-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200702213654.2129054-8-kieran.bingham@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 7/9] android: camera_device: Add\n\tbuffers for each stream to Requests","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":"libcamera devel ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":11132,"web_url":"https://patchwork.libcamera.org/comment/11132/","msgid":"<20200703094726.llgtfjzeysotx5nq@uno.localdomain>","date":"2020-07-03T09:47:26","subject":"Re: [libcamera-devel] [PATCH v2 7/9] android: camera_device: Add\n\tbuffers for each stream to Requests","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Kieran,\n\nOn Thu, Jul 02, 2020 at 10:36:52PM +0100, Kieran Bingham wrote:\n> Construct a FrameBuffer for every buffer given in the camera3Request\n> and add it to the libcamera Request on the appropriate stream.\n>\n> The correct stream is obtained from the private data of the camera3_stream\n> associated with the camera3_buffer.\n>\n> Comments regarding supporting only one buffer are now removed.\n>\n> Signed-off-by: Kieran Bingham \n> ---\n> src/android/camera_device.cpp | 38 ++++++++++++++---------------------\n> 1 file changed, 15 insertions(+), 23 deletions(-)\n>\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index fc3962dac230..eea8c8c50352 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -977,6 +977,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n>\n> \t\t/* Maintain internal state of all stream mappings. */\n> \t\tstreams_[i].androidStream = stream;\n> +\t\tstream->priv = static_cast(&streams_[i]);\n ^ space ?\n\n>\n> \t\tStreamConfiguration streamConfiguration;\n>\n> @@ -1045,9 +1046,6 @@ static FrameBuffer *newFrameBuffer(const buffer_handle_t camera3buffer)\n>\n> int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Request)\n> {\n> -\tStreamConfiguration *streamConfiguration = &config_->at(0);\n> -\tStream *stream = streamConfiguration->stream();\n> -\n> \tif (camera3Request->num_output_buffers != 1) {\n> \t\tLOG(HAL, Error) << \"Invalid number of output buffers: \"\n> \t\t\t\t<< camera3Request->num_output_buffers;\n> @@ -1085,30 +1083,28 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \t\tcamera_->createRequest(reinterpret_cast(descriptor));\n>\n> \tfor (unsigned int i = 0; i < descriptor->numBuffers; ++i) {\n> +\t\tCameraStream *cameraStream = static_cast(camera3Buffers[i].stream->priv);\n ^\n space ?\n\nThis makes me think that you could store a StreamConfiguration *\nin stream->priv.\n\n> +\n> \t\t/*\n> \t\t * Keep track of which stream the request belongs to and store\n> \t\t * the native buffer handles.\n> -\t\t *\n> -\t\t * \\todo Currently we only support one capture buffer. Copy\n> -\t\t * all of them to be ready once we'll support more.\n> \t\t */\n> \t\tdescriptor->buffers[i].stream = camera3Buffers[i].stream;\n> \t\tdescriptor->buffers[i].buffer = camera3Buffers[i].buffer;\n> -\t}\n>\n> -\t/*\n> -\t * Create a libcamera buffer using the dmabuf descriptors of the first\n> -\t * and (currently) only supported request buffer.\n> -\t */\n> -\tFrameBuffer *buffer = newFrameBuffer(*camera3Buffers[0].buffer);\n> -\tif (!buffer) {\n> -\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n> -\t\tdelete request;\n> -\t\tdelete descriptor;\n> -\t\treturn -ENOMEM;\n> -\t}\n> +\t\tFrameBuffer *buffer = newFrameBuffer(*camera3Buffers[0].buffer);\n> +\t\tif (!buffer) {\n> +\t\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n> +\t\t\tdelete request;\n> +\t\t\tdelete descriptor;\n> +\t\t\treturn -ENOMEM;\n> +\t\t}\n> +\n> +\t\tStreamConfiguration *streamConfiguration = &config_->at(cameraStream->libcameraIndex);\n> +\t\tStream *stream = streamConfiguration->stream();\n>\n> -\trequest->addBuffer(stream, buffer);\n> +\t\trequest->addBuffer(stream, buffer);\n> +\t}\n>\n> \tint ret = camera_->queueRequest(request);\n> \tif (ret) {\n> @@ -1142,10 +1138,6 @@ void CameraDevice::requestComplete(Request *request)\n> \tcaptureResult.frame_number = descriptor->frameNumber;\n> \tcaptureResult.num_output_buffers = descriptor->numBuffers;\n> \tfor (unsigned int i = 0; i < descriptor->numBuffers; ++i) {\n> -\t\t/*\n> -\t\t * \\todo Currently we only support one capture buffer. Prepare\n> -\t\t * all of them to be ready once we'll support more.\n> -\t\t */\n> \t\tdescriptor->buffers[i].acquire_fence = -1;\n> \t\tdescriptor->buffers[i].release_fence = -1;\n> \t\tdescriptor->buffers[i].status = status;\n> --\n> 2.25.1\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 C9D83BE905\n\tfor ;\n\tFri, 3 Jul 2020 09:44:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6AAE960C57;\n\tFri, 3 Jul 2020 11:44:00 +0200 (CEST)","from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D540760C50\n\tfor ;\n\tFri, 3 Jul 2020 11:43:59 +0200 (CEST)","from uno.localdomain (93-34-118-233.ip49.fastwebnet.it\n\t[93.34.118.233]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id 2BF0D100003;\n\tFri, 3 Jul 2020 09:43:57 +0000 (UTC)"],"Date":"Fri, 3 Jul 2020 11:47:26 +0200","From":"Jacopo Mondi ","To":"Kieran Bingham ","Message-ID":"<20200703094726.llgtfjzeysotx5nq@uno.localdomain>","References":"<20200702213654.2129054-1-kieran.bingham@ideasonboard.com>\n\t<20200702213654.2129054-8-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200702213654.2129054-8-kieran.bingham@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 7/9] android: camera_device: Add\n\tbuffers for each stream to Requests","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":"libcamera devel ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":11144,"web_url":"https://patchwork.libcamera.org/comment/11144/","msgid":"<4d8ac8a9-3f3b-6f5b-fbb0-ac43564a8749@ideasonboard.com>","date":"2020-07-03T10:48:41","subject":"Re: [libcamera-devel] [PATCH v2 7/9] android: camera_device: Add\n\tbuffers for each stream to Requests","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 03/07/2020 01:47, Laurent Pinchart wrote:\n> Hi Kieran,\n> \n> Thank you for the patch.\n> \n> On Thu, Jul 02, 2020 at 10:36:52PM +0100, Kieran Bingham wrote:\n>> Construct a FrameBuffer for every buffer given in the camera3Request\n>> and add it to the libcamera Request on the appropriate stream.\n>>\n>> The correct stream is obtained from the private data of the camera3_stream\n>> associated with the camera3_buffer.\n>>\n>> Comments regarding supporting only one buffer are now removed.\n>>\n>> Signed-off-by: Kieran Bingham \n>> ---\n>> src/android/camera_device.cpp | 38 ++++++++++++++---------------------\n>> 1 file changed, 15 insertions(+), 23 deletions(-)\n>>\n>> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n>> index fc3962dac230..eea8c8c50352 100644\n>> --- a/src/android/camera_device.cpp\n>> +++ b/src/android/camera_device.cpp\n>> @@ -977,6 +977,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n>> \n>> \t\t/* Maintain internal state of all stream mappings. */\n>> \t\tstreams_[i].androidStream = stream;\n>> +\t\tstream->priv = static_cast(&streams_[i]);\n> \n> We could also store i in stream->priv, and remove libcameraIndex from\n> CameraStream. Up to you.\n> \n\nAt this stage we could, especially as I don't think I actaully needed to\nuse the halStream, so only index is in this structure currently.\n\nHowever, it will (very likely) grow in $FUTURE_PATCHES, so I'll keep the\nstruct and keep the index in it.\n\nMaybe the struct could already be a class, but I'll defer that until I\nfind out if it really needs to be a full class or a struct is simpler.\n\n\n> Reviewed-by: Laurent Pinchart \n\nThanks.\n\n\n\n> \n>> \n>> \t\tStreamConfiguration streamConfiguration;\n>> \n>> @@ -1045,9 +1046,6 @@ static FrameBuffer *newFrameBuffer(const buffer_handle_t camera3buffer)\n>> \n>> int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Request)\n>> {\n>> -\tStreamConfiguration *streamConfiguration = &config_->at(0);\n>> -\tStream *stream = streamConfiguration->stream();\n>> -\n>> \tif (camera3Request->num_output_buffers != 1) {\n>> \t\tLOG(HAL, Error) << \"Invalid number of output buffers: \"\n>> \t\t\t\t<< camera3Request->num_output_buffers;\n>> @@ -1085,30 +1083,28 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n>> \t\tcamera_->createRequest(reinterpret_cast(descriptor));\n>> \n>> \tfor (unsigned int i = 0; i < descriptor->numBuffers; ++i) {\n>> +\t\tCameraStream *cameraStream = static_cast(camera3Buffers[i].stream->priv);\n>> +\n>> \t\t/*\n>> \t\t * Keep track of which stream the request belongs to and store\n>> \t\t * the native buffer handles.\n>> -\t\t *\n>> -\t\t * \\todo Currently we only support one capture buffer. Copy\n>> -\t\t * all of them to be ready once we'll support more.\n>> \t\t */\n>> \t\tdescriptor->buffers[i].stream = camera3Buffers[i].stream;\n>> \t\tdescriptor->buffers[i].buffer = camera3Buffers[i].buffer;\n>> -\t}\n>> \n>> -\t/*\n>> -\t * Create a libcamera buffer using the dmabuf descriptors of the first\n>> -\t * and (currently) only supported request buffer.\n>> -\t */\n>> -\tFrameBuffer *buffer = newFrameBuffer(*camera3Buffers[0].buffer);\n>> -\tif (!buffer) {\n>> -\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n>> -\t\tdelete request;\n>> -\t\tdelete descriptor;\n>> -\t\treturn -ENOMEM;\n>> -\t}\n>> +\t\tFrameBuffer *buffer = newFrameBuffer(*camera3Buffers[0].buffer);\n>> +\t\tif (!buffer) {\n>> +\t\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n>> +\t\t\tdelete request;\n>> +\t\t\tdelete descriptor;\n>> +\t\t\treturn -ENOMEM;\n>> +\t\t}\n>> +\n>> +\t\tStreamConfiguration *streamConfiguration = &config_->at(cameraStream->libcameraIndex);\n>> +\t\tStream *stream = streamConfiguration->stream();\n>> \n>> -\trequest->addBuffer(stream, buffer);\n>> +\t\trequest->addBuffer(stream, buffer);\n>> +\t}\n>> \n>> \tint ret = camera_->queueRequest(request);\n>> \tif (ret) {\n>> @@ -1142,10 +1138,6 @@ void CameraDevice::requestComplete(Request *request)\n>> \tcaptureResult.frame_number = descriptor->frameNumber;\n>> \tcaptureResult.num_output_buffers = descriptor->numBuffers;\n>> \tfor (unsigned int i = 0; i < descriptor->numBuffers; ++i) {\n>> -\t\t/*\n>> -\t\t * \\todo Currently we only support one capture buffer. Prepare\n>> -\t\t * all of them to be ready once we'll support more.\n>> -\t\t */\n>> \t\tdescriptor->buffers[i].acquire_fence = -1;\n>> \t\tdescriptor->buffers[i].release_fence = -1;\n>> \t\tdescriptor->buffers[i].status = status;\n>","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 D95BABFFE2\n\tfor ;\n\tFri, 3 Jul 2020 10:48:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A1B1060C53;\n\tFri, 3 Jul 2020 12:48:44 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 03611603AE\n\tfor ;\n\tFri, 3 Jul 2020 12:48:44 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8A9FF51B;\n\tFri, 3 Jul 2020 12:48:43 +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=\"mxltaLYI\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593773323;\n\tbh=fOPm4oWWqKowRxk+JEFoR9scbVJDnDRcejF8e6FAz7s=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=mxltaLYIf+ut5x9O8QrCsZkIcH1Oo9mg/vaqeTaCgYJl4albG2s8lAR4Vr0i/u3KX\n\t4DUFuRxfVGscgtD5TREDqAdOi9zr8lWuxGMPnmZ4rcl9GFd+LDcxVULDaO1G4wxSRB\n\tCF/O9B2qmNMr3sUVMI/gdg+ydGoVfCHwTQRDS7IY=","To":"Laurent Pinchart ","References":"<20200702213654.2129054-1-kieran.bingham@ideasonboard.com>\n\t<20200702213654.2129054-8-kieran.bingham@ideasonboard.com>\n\t<20200703004709.GG12562@pendragon.ideasonboard.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<4d8ac8a9-3f3b-6f5b-fbb0-ac43564a8749@ideasonboard.com>","Date":"Fri, 3 Jul 2020 11:48:41 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.8.0","MIME-Version":"1.0","In-Reply-To":"<20200703004709.GG12562@pendragon.ideasonboard.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v2 7/9] android: camera_device: Add\n\tbuffers for each stream to Requests","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","Reply-To":"kieran.bingham@ideasonboard.com","Cc":"libcamera devel ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":11146,"web_url":"https://patchwork.libcamera.org/comment/11146/","msgid":"<2d380d29-7596-3c80-492a-baff8e1a23eb@ideasonboard.com>","date":"2020-07-03T10:53:13","subject":"Re: [libcamera-devel] [PATCH v2 7/9] android: camera_device: Add\n\tbuffers for each stream to Requests","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn 03/07/2020 10:47, Jacopo Mondi wrote:\n> Hi Kieran,\n> \n> On Thu, Jul 02, 2020 at 10:36:52PM +0100, Kieran Bingham wrote:\n>> Construct a FrameBuffer for every buffer given in the camera3Request\n>> and add it to the libcamera Request on the appropriate stream.\n>>\n>> The correct stream is obtained from the private data of the camera3_stream\n>> associated with the camera3_buffer.\n>>\n>> Comments regarding supporting only one buffer are now removed.\n>>\n>> Signed-off-by: Kieran Bingham \n>> ---\n>> src/android/camera_device.cpp | 38 ++++++++++++++---------------------\n>> 1 file changed, 15 insertions(+), 23 deletions(-)\n>>\n>> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n>> index fc3962dac230..eea8c8c50352 100644\n>> --- a/src/android/camera_device.cpp\n>> +++ b/src/android/camera_device.cpp\n>> @@ -977,6 +977,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n>>\n>> \t\t/* Maintain internal state of all stream mappings. */\n>> \t\tstreams_[i].androidStream = stream;\n>> +\t\tstream->priv = static_cast(&streams_[i]);\n> ^ space ?\n\nCheckstyle hasn't complained. Where would you have a space? After the '>' ?\n\nI'm not sure it needs it, I don't think we've done that anywhere else...\n\n> \n>>\n>> \t\tStreamConfiguration streamConfiguration;\n>>\n>> @@ -1045,9 +1046,6 @@ static FrameBuffer *newFrameBuffer(const buffer_handle_t camera3buffer)\n>>\n>> int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Request)\n>> {\n>> -\tStreamConfiguration *streamConfiguration = &config_->at(0);\n>> -\tStream *stream = streamConfiguration->stream();\n>> -\n>> \tif (camera3Request->num_output_buffers != 1) {\n>> \t\tLOG(HAL, Error) << \"Invalid number of output buffers: \"\n>> \t\t\t\t<< camera3Request->num_output_buffers;\n>> @@ -1085,30 +1083,28 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n>> \t\tcamera_->createRequest(reinterpret_cast(descriptor));\n\nI.e. there's no space in the casting above....?\n\nOh - now looking up - did you mean between void and * ?\n\n>>\n>> \tfor (unsigned int i = 0; i < descriptor->numBuffers; ++i) {\n>> +\t\tCameraStream *cameraStream = static_cast(camera3Buffers[i].stream->priv);\n> ^\n> space ?\n\nIs this before the '*' ?\n\n> \n> This makes me think that you could store a StreamConfiguration *\n> in stream->priv.\n\nI'll need to store more data regarding an internal HAL only stream very\nsoon, so I'd like to keep a specific structure.\n\n\n\n>> +\n>> \t\t/*\n>> \t\t * Keep track of which stream the request belongs to and store\n>> \t\t * the native buffer handles.\n>> -\t\t *\n>> -\t\t * \\todo Currently we only support one capture buffer. Copy\n>> -\t\t * all of them to be ready once we'll support more.\n>> \t\t */\n>> \t\tdescriptor->buffers[i].stream = camera3Buffers[i].stream;\n>> \t\tdescriptor->buffers[i].buffer = camera3Buffers[i].buffer;\n>> -\t}\n>>\n>> -\t/*\n>> -\t * Create a libcamera buffer using the dmabuf descriptors of the first\n>> -\t * and (currently) only supported request buffer.\n>> -\t */\n>> -\tFrameBuffer *buffer = newFrameBuffer(*camera3Buffers[0].buffer);\n>> -\tif (!buffer) {\n>> -\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n>> -\t\tdelete request;\n>> -\t\tdelete descriptor;\n>> -\t\treturn -ENOMEM;\n>> -\t}\n>> +\t\tFrameBuffer *buffer = newFrameBuffer(*camera3Buffers[0].buffer);\n>> +\t\tif (!buffer) {\n>> +\t\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n>> +\t\t\tdelete request;\n>> +\t\t\tdelete descriptor;\n>> +\t\t\treturn -ENOMEM;\n>> +\t\t}\n>> +\n>> +\t\tStreamConfiguration *streamConfiguration = &config_->at(cameraStream->libcameraIndex);\n>> +\t\tStream *stream = streamConfiguration->stream();\n>>\n>> -\trequest->addBuffer(stream, buffer);\n>> +\t\trequest->addBuffer(stream, buffer);\n>> +\t}\n>>\n>> \tint ret = camera_->queueRequest(request);\n>> \tif (ret) {\n>> @@ -1142,10 +1138,6 @@ void CameraDevice::requestComplete(Request *request)\n>> \tcaptureResult.frame_number = descriptor->frameNumber;\n>> \tcaptureResult.num_output_buffers = descriptor->numBuffers;\n>> \tfor (unsigned int i = 0; i < descriptor->numBuffers; ++i) {\n>> -\t\t/*\n>> -\t\t * \\todo Currently we only support one capture buffer. Prepare\n>> -\t\t * all of them to be ready once we'll support more.\n>> -\t\t */\n>> \t\tdescriptor->buffers[i].acquire_fence = -1;\n>> \t\tdescriptor->buffers[i].release_fence = -1;\n>> \t\tdescriptor->buffers[i].status = status;\n>> --\n>> 2.25.1\n>>\n>> _______________________________________________\n>> libcamera-devel mailing list\n>> libcamera-devel@lists.libcamera.org\n>> https://lists.libcamera.org/listinfo/libcamera-devel","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 E0057BFFE2\n\tfor ;\n\tFri, 3 Jul 2020 10:53:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AF88560C58;\n\tFri, 3 Jul 2020 12:53:18 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0A6D8603AE\n\tfor ;\n\tFri, 3 Jul 2020 12:53:17 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 927B251B;\n\tFri, 3 Jul 2020 12:53:16 +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=\"McwOOYv7\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593773596;\n\tbh=ulm7xVMOGxByCBJENQwHRDhV5hjtpsxWQRAlo1ZjU4U=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=McwOOYv7pATHIDI8Z8cZnAwQPodC+IhXe65sBXQcybmz4xn6eW93IgLFjPpxaleyS\n\tpZvg2XqzkxVltO4smMwsBf0KlGoF2Q2gy/9ntXomqMqwdhJFVCnpvBVw8m63qYj0VM\n\tSVk3WUWEi8PGab3M54AC/dqiCsksFwkVZLiysU3I=","To":"Jacopo Mondi ","References":"<20200702213654.2129054-1-kieran.bingham@ideasonboard.com>\n\t<20200702213654.2129054-8-kieran.bingham@ideasonboard.com>\n\t<20200703094726.llgtfjzeysotx5nq@uno.localdomain>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<2d380d29-7596-3c80-492a-baff8e1a23eb@ideasonboard.com>","Date":"Fri, 3 Jul 2020 11:53:13 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.8.0","MIME-Version":"1.0","In-Reply-To":"<20200703094726.llgtfjzeysotx5nq@uno.localdomain>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v2 7/9] android: camera_device: Add\n\tbuffers for each stream to Requests","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","Reply-To":"kieran.bingham@ideasonboard.com","Cc":"libcamera devel ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]