[{"id":11228,"web_url":"https://patchwork.libcamera.org/comment/11228/","msgid":"<73ef2df3-1b6e-be28-40d3-bccd62a22f43@ideasonboard.com>","date":"2020-07-06T23:06:28","subject":"Re: [libcamera-devel] [PATCH v5 7/8] 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":"Hello all,\n\nAnd due to it being late in the evening, I've missed one indent during\nthe rebase fixups :(\n\nOne minor indentation fixup to apply to this patch, but if there's\nnothing else on this series I'll handle it while integrating.\n\nOn 07/07/2020 00:02, 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, and\n> FrameBuffers have their lifetime tracked in the Camera3RequestDescriptor\n> to ensure they are released when the Request is completed.\n> \n> Signed-off-by: Kieran Bingham \n> Reviewed-by: Niklas Söderlund \n> Reviewed-by: Laurent Pinchart \n> Reviewed-by: Jacopo Mondi \n> ---\n> src/android/camera_device.cpp | 54 +++++++++++++++++++----------------\n> src/android/camera_device.h | 1 +\n> 2 files changed, 31 insertions(+), 24 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 6d060e0c40e5..b13729e84abf 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -98,6 +98,7 @@ CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor(\n> \t: frameNumber(frameNumber), numBuffers(numBuffers)\n> {\n> \tbuffers = new camera3_stream_buffer_t[numBuffers];\n> +\tframeBuffers.reserve(numBuffers);\n> }\n> \n> CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor()\n> @@ -990,6 +991,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\tconfig_->addConfiguration(streamConfiguration);\n> \n> \t\tstreams_[i].index = streamIndex++;\n> +\t\tstream->priv = static_cast(&streams_[i]);\n> \t}\n> \n> \tswitch (config_->validate()) {\n> @@ -1048,9 +1050,6 @@ FrameBuffer *CameraDevice::createFrameBuffer(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> @@ -1088,30 +1087,35 @@ 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 = createFrameBuffer(*camera3Buffers[0].buffer);\n> -\tif (!buffer) {\n> -\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n> +\t\t/*\n> +\t\t * Create a libcamera buffer using the dmabuf descriptors of the\n> +\t\t * first and (currently) only supported request buffer.\n> +\t\t * The FrameBuffer is directly associated with the\n> +\t\t * Camera3RequestDescriptor for lifetime management only.\n> +\t\t */\n> +\t\tFrameBuffer *buffer = createFrameBuffer(*camera3Buffers[i].buffer);\n> +\t\tif (!buffer) {\n> +\t\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n> \t\tdelete request;\n\nThis \"delete request\" is now indented correctly one tab to the right.\n\n--\nKieran\n\n\n\n> -\t\tdelete descriptor;\n> -\t\treturn -ENOMEM;\n> -\t}\n> +\t\t\tdelete descriptor;\n> +\t\t\treturn -ENOMEM;\n> +\t\t}\n> +\t\tdescriptor->frameBuffers.emplace_back(buffer);\n> \n> -\trequest->addBuffer(stream, buffer);\n> +\t\tStreamConfiguration *streamConfiguration = &config_->at(cameraStream->index);\n> +\t\tStream *stream = streamConfiguration->stream();\n> +\n> +\t\trequest->addBuffer(stream, buffer);\n> +\t}\n> \n> \tint ret = camera_->queueRequest(request);\n> \tif (ret) {\n> @@ -1127,7 +1131,6 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> void CameraDevice::requestComplete(Request *request)\n> {\n> \tconst std::map &buffers = request->buffers();\n> -\tFrameBuffer *buffer = buffers.begin()->second;\n> \tcamera3_buffer_status status = CAMERA3_BUFFER_STATUS_OK;\n> \tstd::unique_ptr resultMetadata;\n> \n> @@ -1145,10 +1148,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> @@ -1156,6 +1155,14 @@ void CameraDevice::requestComplete(Request *request)\n> \tcaptureResult.output_buffers =\n> \t\tconst_cast(descriptor->buffers);\n> \n> +\t/*\n> +\t * \\todo The timestamp used for the metadata is currently always taken\n> +\t * from the first buffer (which may be the first stream) in the Request.\n> +\t * It might be appropriate to return a 'correct' (as determined by\n> +\t * pipeline handlers) timestamp in the Request itself.\n> +\t */\n> +\tFrameBuffer *buffer = buffers.begin()->second;\n> +\n> \tif (status == CAMERA3_BUFFER_STATUS_OK) {\n> \t\tnotifyShutter(descriptor->frameNumber,\n> \t\t\t buffer->metadata().timestamp);\n> @@ -1180,7 +1187,6 @@ void CameraDevice::requestComplete(Request *request)\n> \tcallbacks_->process_capture_result(callbacks_, &captureResult);\n> \n> \tdelete descriptor;\n> -\tdelete buffer;\n> }\n> \n> std::string CameraDevice::logPrefix() const\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index d00f617b09a6..5b8b9c3e26e2 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -70,6 +70,7 @@ private:\n> \t\tuint32_t frameNumber;\n> \t\tuint32_t numBuffers;\n> \t\tcamera3_stream_buffer_t *buffers;\n> +\t\tstd::vector> frameBuffers;\n> \t};\n> \n> \tstruct Camera3StreamConfiguration {\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 846CEBD790\n\tfor ;\n\tMon, 6 Jul 2020 23:06:35 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 16E2C60E05;\n\tTue, 7 Jul 2020 01:06:35 +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 3D8F0603AD\n\tfor ;\n\tTue, 7 Jul 2020 01:06:33 +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 D918DAC6;\n\tTue, 7 Jul 2020 01:06:30 +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=\"GqB6/a4D\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1594076792;\n\tbh=qC7E5AhrhrglIuMfsIfZU1y86HLkTVdMgzrCD9ZY0CE=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=GqB6/a4D1s97K0nOYvXqB4z0xv088sQq1R+7dmad3IXFMHaCOzyqHBwN2yCDqGfIW\n\taiWm3J4dY6NFRF5Zyxchb/fZL3/Iyskh8HRq/6gp5K1lfEn1bMwEi9ME8oqMDB1m/1\n\tkoidtc/ws8ZFgg28JUA2oqp6UhPx2mJK2umFANio=","To":"libcamera devel ","References":"<20200706230240.2482100-1-kieran.bingham@ideasonboard.com>\n\t<20200706230240.2482100-8-kieran.bingham@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":"<73ef2df3-1b6e-be28-40d3-bccd62a22f43@ideasonboard.com>","Date":"Tue, 7 Jul 2020 00:06:28 +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":"<20200706230240.2482100-8-kieran.bingham@ideasonboard.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v5 7/8] 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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":11229,"web_url":"https://patchwork.libcamera.org/comment/11229/","msgid":"<20200707074748.wasy5lbhgkyq4ce3@uno.localdomain>","date":"2020-07-07T07:47:48","subject":"Re: [libcamera-devel] [PATCH v5 7/8] 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 two nits you can fix when applying\n\nOn Tue, Jul 07, 2020 at 12:02:39AM +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, and\n> FrameBuffers have their lifetime tracked in the Camera3RequestDescriptor\n> to ensure they are released when the Request is completed.\n>\n> Signed-off-by: Kieran Bingham \n> Reviewed-by: Niklas Söderlund \n> Reviewed-by: Laurent Pinchart \n> Reviewed-by: Jacopo Mondi \n> ---\n> src/android/camera_device.cpp | 54 +++++++++++++++++++----------------\n> src/android/camera_device.h | 1 +\n> 2 files changed, 31 insertions(+), 24 deletions(-)\n>\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 6d060e0c40e5..b13729e84abf 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -98,6 +98,7 @@ CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor(\n> \t: frameNumber(frameNumber), numBuffers(numBuffers)\n> {\n> \tbuffers = new camera3_stream_buffer_t[numBuffers];\n> +\tframeBuffers.reserve(numBuffers);\n> }\n>\n> CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor()\n> @@ -990,6 +991,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\tconfig_->addConfiguration(streamConfiguration);\n>\n> \t\tstreams_[i].index = streamIndex++;\n> +\t\tstream->priv = static_cast(&streams_[i]);\n> \t}\n>\n> \tswitch (config_->validate()) {\n> @@ -1048,9 +1050,6 @@ FrameBuffer *CameraDevice::createFrameBuffer(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> @@ -1088,30 +1087,35 @@ 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\nThis is really long. I would break it after =\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 = createFrameBuffer(*camera3Buffers[0].buffer);\n> -\tif (!buffer) {\n> -\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n> +\t\t/*\n> +\t\t * Create a libcamera buffer using the dmabuf descriptors of the\n> +\t\t * first and (currently) only supported request buffer.\n\nThis is not true anymore, isn't it ?\n\nThe rest looks good as the whole series does!\nThanks\n j\n\n> +\t\t * The FrameBuffer is directly associated with the\n> +\t\t * Camera3RequestDescriptor for lifetime management only.\n> +\t\t */\n> +\t\tFrameBuffer *buffer = createFrameBuffer(*camera3Buffers[i].buffer);\n> +\t\tif (!buffer) {\n> +\t\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n> \t\tdelete request;\n> -\t\tdelete descriptor;\n> -\t\treturn -ENOMEM;\n> -\t}\n> +\t\t\tdelete descriptor;\n> +\t\t\treturn -ENOMEM;\n> +\t\t}\n> +\t\tdescriptor->frameBuffers.emplace_back(buffer);\n>\n> -\trequest->addBuffer(stream, buffer);\n> +\t\tStreamConfiguration *streamConfiguration = &config_->at(cameraStream->index);\n> +\t\tStream *stream = streamConfiguration->stream();\n> +\n> +\t\trequest->addBuffer(stream, buffer);\n> +\t}\n>\n> \tint ret = camera_->queueRequest(request);\n> \tif (ret) {\n> @@ -1127,7 +1131,6 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> void CameraDevice::requestComplete(Request *request)\n> {\n> \tconst std::map &buffers = request->buffers();\n> -\tFrameBuffer *buffer = buffers.begin()->second;\n> \tcamera3_buffer_status status = CAMERA3_BUFFER_STATUS_OK;\n> \tstd::unique_ptr resultMetadata;\n>\n> @@ -1145,10 +1148,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> @@ -1156,6 +1155,14 @@ void CameraDevice::requestComplete(Request *request)\n> \tcaptureResult.output_buffers =\n> \t\tconst_cast(descriptor->buffers);\n>\n> +\t/*\n> +\t * \\todo The timestamp used for the metadata is currently always taken\n> +\t * from the first buffer (which may be the first stream) in the Request.\n> +\t * It might be appropriate to return a 'correct' (as determined by\n> +\t * pipeline handlers) timestamp in the Request itself.\n> +\t */\n> +\tFrameBuffer *buffer = buffers.begin()->second;\n> +\n> \tif (status == CAMERA3_BUFFER_STATUS_OK) {\n> \t\tnotifyShutter(descriptor->frameNumber,\n> \t\t\t buffer->metadata().timestamp);\n> @@ -1180,7 +1187,6 @@ void CameraDevice::requestComplete(Request *request)\n> \tcallbacks_->process_capture_result(callbacks_, &captureResult);\n>\n> \tdelete descriptor;\n> -\tdelete buffer;\n> }\n>\n> std::string CameraDevice::logPrefix() const\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index d00f617b09a6..5b8b9c3e26e2 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -70,6 +70,7 @@ private:\n> \t\tuint32_t frameNumber;\n> \t\tuint32_t numBuffers;\n> \t\tcamera3_stream_buffer_t *buffers;\n> +\t\tstd::vector> frameBuffers;\n> \t};\n>\n> \tstruct Camera3StreamConfiguration {\n> --\n> 2.25.1\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 2522EBD792\n\tfor ;\n\tTue, 7 Jul 2020 07:44:46 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AE86360E0D;\n\tTue, 7 Jul 2020 09:44:45 +0200 (CEST)","from relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B62AB603A9\n\tfor ;\n\tTue, 7 Jul 2020 09:44:43 +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 relay12.mail.gandi.net (Postfix) with ESMTPSA id D141720000F;\n\tTue, 7 Jul 2020 07:44:14 +0000 (UTC)"],"Date":"Tue, 7 Jul 2020 09:47:48 +0200","From":"Jacopo Mondi ","To":"Kieran Bingham ","Message-ID":"<20200707074748.wasy5lbhgkyq4ce3@uno.localdomain>","References":"<20200706230240.2482100-1-kieran.bingham@ideasonboard.com>\n\t<20200706230240.2482100-8-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200706230240.2482100-8-kieran.bingham@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v5 7/8] 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=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":11231,"web_url":"https://patchwork.libcamera.org/comment/11231/","msgid":"<77fc7ae4-203f-b652-9d70-977b70964926@ideasonboard.com>","date":"2020-07-07T09:14:48","subject":"Re: [libcamera-devel] [PATCH v5 7/8] 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 07/07/2020 08:47, Jacopo Mondi wrote:\n> Hi Kieran,\n> two nits you can fix when applying\n> \n> On Tue, Jul 07, 2020 at 12:02:39AM +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, and\n>> FrameBuffers have their lifetime tracked in the Camera3RequestDescriptor\n>> to ensure they are released when the Request is completed.\n>>\n>> Signed-off-by: Kieran Bingham \n>> Reviewed-by: Niklas Söderlund \n>> Reviewed-by: Laurent Pinchart \n>> Reviewed-by: Jacopo Mondi \n>> ---\n>> src/android/camera_device.cpp | 54 +++++++++++++++++++----------------\n>> src/android/camera_device.h | 1 +\n>> 2 files changed, 31 insertions(+), 24 deletions(-)\n>>\n>> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n>> index 6d060e0c40e5..b13729e84abf 100644\n>> --- a/src/android/camera_device.cpp\n>> +++ b/src/android/camera_device.cpp\n>> @@ -98,6 +98,7 @@ CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor(\n>> \t: frameNumber(frameNumber), numBuffers(numBuffers)\n>> {\n>> \tbuffers = new camera3_stream_buffer_t[numBuffers];\n>> +\tframeBuffers.reserve(numBuffers);\n>> }\n>>\n>> CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor()\n>> @@ -990,6 +991,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n>> \t\tconfig_->addConfiguration(streamConfiguration);\n>>\n>> \t\tstreams_[i].index = streamIndex++;\n>> +\t\tstream->priv = static_cast(&streams_[i]);\n>> \t}\n>>\n>> \tswitch (config_->validate()) {\n>> @@ -1048,9 +1050,6 @@ FrameBuffer *CameraDevice::createFrameBuffer(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>> @@ -1088,30 +1087,35 @@ 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> This is really long. I would break it after =\n> \n\n:( I think I prefer the single line, but I can do so.\n\n\nEven formatting as:\n\n\n> \tfor (unsigned int i = 0; i < descriptor->numBuffers; ++i) {\n> \t\tCameraStream *cameraStream =\n> \t\t\tstatic_cast(camera3Buffers[i].stream->priv);\n\ngoes up to 85 chars.\n\nDo you think the line break really helps readability ?\n\nFor me adding new lines looks awkward, as it turns a single line\nstatement into ... well ... two lines ;-)\n\n\nAnyway, I don't want to spend time worrying about line lengths.\n\nI'll apply this with the newline as shown above.\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 = createFrameBuffer(*camera3Buffers[0].buffer);\n>> -\tif (!buffer) {\n>> -\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n>> +\t\t/*\n>> +\t\t * Create a libcamera buffer using the dmabuf descriptors of the\n>> +\t\t * first and (currently) only supported request buffer.\n> \n> This is not true anymore, isn't it ?\n\nGood point, I'll fix this as: (combining both the original statement and\nmy addition):\n\n\"\"\"\nCreate a libcamera buffer using the dmabuf descriptors of the\ncamera3Buffer for each stream. The FrameBuffer is directly associated\nwith the Camera3RequestDescriptor for lifetime management only.\n\"\"\"\n\n\n\n\n> The rest looks good as the whole series does!\n> Thanks\n> j\n> \n>> +\t\t * The FrameBuffer is directly associated with the\n>> +\t\t * Camera3RequestDescriptor for lifetime management only.\n>> +\t\t */\n>> +\t\tFrameBuffer *buffer = createFrameBuffer(*camera3Buffers[i].buffer);\n>> +\t\tif (!buffer) {\n>> +\t\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n>> \t\tdelete request;\n>> -\t\tdelete descriptor;\n>> -\t\treturn -ENOMEM;\n>> -\t}\n>> +\t\t\tdelete descriptor;\n>> +\t\t\treturn -ENOMEM;\n>> +\t\t}\n>> +\t\tdescriptor->frameBuffers.emplace_back(buffer);\n>>\n>> -\trequest->addBuffer(stream, buffer);\n>> +\t\tStreamConfiguration *streamConfiguration = &config_->at(cameraStream->index);\n>> +\t\tStream *stream = streamConfiguration->stream();\n>> +\n>> +\t\trequest->addBuffer(stream, buffer);\n>> +\t}\n>>\n>> \tint ret = camera_->queueRequest(request);\n>> \tif (ret) {\n>> @@ -1127,7 +1131,6 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n>> void CameraDevice::requestComplete(Request *request)\n>> {\n>> \tconst std::map &buffers = request->buffers();\n>> -\tFrameBuffer *buffer = buffers.begin()->second;\n>> \tcamera3_buffer_status status = CAMERA3_BUFFER_STATUS_OK;\n>> \tstd::unique_ptr resultMetadata;\n>>\n>> @@ -1145,10 +1148,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>> @@ -1156,6 +1155,14 @@ void CameraDevice::requestComplete(Request *request)\n>> \tcaptureResult.output_buffers =\n>> \t\tconst_cast(descriptor->buffers);\n>>\n>> +\t/*\n>> +\t * \\todo The timestamp used for the metadata is currently always taken\n>> +\t * from the first buffer (which may be the first stream) in the Request.\n>> +\t * It might be appropriate to return a 'correct' (as determined by\n>> +\t * pipeline handlers) timestamp in the Request itself.\n>> +\t */\n>> +\tFrameBuffer *buffer = buffers.begin()->second;\n>> +\n>> \tif (status == CAMERA3_BUFFER_STATUS_OK) {\n>> \t\tnotifyShutter(descriptor->frameNumber,\n>> \t\t\t buffer->metadata().timestamp);\n>> @@ -1180,7 +1187,6 @@ void CameraDevice::requestComplete(Request *request)\n>> \tcallbacks_->process_capture_result(callbacks_, &captureResult);\n>>\n>> \tdelete descriptor;\n>> -\tdelete buffer;\n>> }\n>>\n>> std::string CameraDevice::logPrefix() const\n>> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n>> index d00f617b09a6..5b8b9c3e26e2 100644\n>> --- a/src/android/camera_device.h\n>> +++ b/src/android/camera_device.h\n>> @@ -70,6 +70,7 @@ private:\n>> \t\tuint32_t frameNumber;\n>> \t\tuint32_t numBuffers;\n>> \t\tcamera3_stream_buffer_t *buffers;\n>> +\t\tstd::vector> frameBuffers;\n>> \t};\n>>\n>> \tstruct Camera3StreamConfiguration {\n>> --\n>> 2.25.1\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 BD0B0BD792\n\tfor ;\n\tTue, 7 Jul 2020 09:14:54 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 56B6760E05;\n\tTue, 7 Jul 2020 11:14:54 +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 A9DB3603A9\n\tfor ;\n\tTue, 7 Jul 2020 11:14:52 +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 D6F542C9;\n\tTue, 7 Jul 2020 11:14:51 +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=\"P/qQtNR/\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1594113292;\n\tbh=HtR5TyuBNXDYGIFdjmhICDvhntXXFN8uo2LoGg9ZP4k=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=P/qQtNR/qRZs3VimrLg3pRGyU/2R5UNrfJC8uAHIQg7bYZRQ9NO9nb+NBaISd0kRh\n\tp1inPd58rJ1jt1Zo1xQDC94D9zdNRxUmwV1QTQEy/GavKLu2x2EmriJ8VytpPtDNiM\n\tK4otteoXsf6ZPd4O7xweCH1YCXR7fOOmxpnwGEMU=","To":"Jacopo Mondi ","References":"<20200706230240.2482100-1-kieran.bingham@ideasonboard.com>\n\t<20200706230240.2482100-8-kieran.bingham@ideasonboard.com>\n\t<20200707074748.wasy5lbhgkyq4ce3@uno.localdomain>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\tmQINBFYE/WYBEACs1PwjMD9rgCu1hlIiUA1AXR4rv2v+BCLUq//vrX5S5bjzxKAryRf0uHat\n\tV/zwz6hiDrZuHUACDB7X8OaQcwhLaVlq6byfoBr25+hbZG7G3+5EUl9cQ7dQEdvNj6V6y/SC\n\trRanWfelwQThCHckbobWiQJfK9n7rYNcPMq9B8e9F020LFH7Kj6YmO95ewJGgLm+idg1Kb3C\n\tpotzWkXc1xmPzcQ1fvQMOfMwdS+4SNw4rY9f07Xb2K99rjMwZVDgESKIzhsDB5GY465sCsiQ\n\tcSAZRxqE49RTBq2+EQsbrQpIc8XiffAB8qexh5/QPzCmR4kJgCGeHIXBtgRj+nIkCJPZvZtf\n\tKr2EAbc6tgg6DkAEHJb+1okosV09+0+TXywYvtEop/WUOWQ+zo+Y/OBd+8Ptgt1pDRyOBzL8\n\tRXa8ZqRf0Mwg75D+dKntZeJHzPRJyrlfQokngAAs4PaFt6UfS+ypMAF37T6CeDArQC41V3ko\n\tlPn1yMsVD0p+6i3DPvA/GPIksDC4owjnzVX9kM8Zc5Cx+XoAN0w5Eqo4t6qEVbuettxx55gq\n\t8K8FieAjgjMSxngo/HST8TpFeqI5nVeq0/lqtBRQKumuIqDg+Bkr4L1V/PSB6XgQcOdhtd36\n\tOe9X9dXB8YSNt7VjOcO7BTmFn/Z8r92mSAfHXpb07YJWJosQOQARAQABtDBLaWVyYW4gQmlu\n\tZ2hhbSA8a2llcmFuLmJpbmdoYW1AaWRlYXNvbmJvYXJkLmNvbT6JAlcEEwEKAEECGwMFCwkI\n\tBwIGFQgJCgsCBBYCAwECHgECF4ACGQEWIQSQLdeYP70o/eNy1HqhHkZyEKRh/QUCXWTtygUJ\n\tCyJXZAAKCRChHkZyEKRh/f8dEACTDsbLN2nioNZMwyLuQRUAFcXNolDX48xcUXsWS2QjxaPm\n\tVsJx8Uy8aYkS85mdPBh0C83OovQR/OVbr8AxhGvYqBs3nQvbWuTl/+4od7DfK2VZOoKBAu5S\n\tQK2FYuUcikDqYcFWJ8DQnubxfE8dvzojHEkXw0sA4igINHDDFX3HJGZtLio+WpEFQtCbfTAG\n\tYZslasz1YZRbwEdSsmO3/kqy5eMnczlm8a21A3fKUo3g8oAZEFM+f4DUNzqIltg31OAB/kZS\n\tenKZQ/SWC8PmLg/ZXBrReYakxXtkP6w3FwMlzOlhGxqhIRNiAJfXJBaRhuUWzPOpEDE9q5YJ\n\tBmqQL2WJm1VSNNVxbXJHpaWMH1sA2R00vmvRrPXGwyIO0IPYeUYQa3gsy6k+En/aMQJd27dp\n\taScf9am9PFICPY5T4ppneeJLif2lyLojo0mcHOV+uyrds9XkLpp14GfTkeKPdPMrLLTsHRfH\n\tfA4I4OBpRrEPiGIZB/0im98MkGY/Mu6qxeZmYLCcgD6qz4idOvfgVOrNh+aA8HzIVR+RMW8H\n\tQGBN9f0E3kfwxuhl3omo6V7lDw8XOdmuWZNC9zPq1UfryVHANYbLGz9KJ4Aw6M+OgBC2JpkD\n\thXMdHUkC+d20dwXrwHTlrJi1YNp6rBc+xald3wsUPOZ5z8moTHUX/uPA/qhGsbkCDQRWBP1m\n\tARAAzijkb+Sau4hAncr1JjOY+KyFEdUNxRy+hqTJdJfaYihxyaj0Ee0P0zEi35CbE6lgU0Uz\n\ttih9fiUbSV3wfsWqg1Ut3/5rTKu7kLFp15kF7eqvV4uezXRD3Qu4yjv/rMmEJbbD4cTvGCYI\n\td6MDC417f7vK3hCbCVIZSp3GXxyC1LU+UQr3fFcOyCwmP9vDUR9JV0BSqHHxRDdpUXE26Dk6\n\tmhf0V1YkspE5St814ETXpEus2urZE5yJIUROlWPIL+hm3NEWfAP06vsQUyLvr/GtbOT79vXl\n\tEn1aulcYyu20dRRxhkQ6iILaURcxIAVJJKPi8dsoMnS8pB0QW12AHWuirPF0g6DiuUfPmrA5\n\tPKe56IGlpkjc8cO51lIxHkWTpCMWigRdPDexKX+Sb+W9QWK/0JjIc4t3KBaiG8O4yRX8ml2R\n\t+rxfAVKM6V769P/hWoRGdgUMgYHFpHGSgEt80OKK5HeUPy2cngDUXzwrqiM5Sz6Od0qw5pCk\n\tNlXqI0W/who0iSVM+8+RmyY0OEkxEcci7rRLsGnM15B5PjLJjh1f2ULYkv8s4SnDwMZ/kE04\n\t/UqCMK/KnX8pwXEMCjz0h6qWNpGwJ0/tYIgQJZh6bqkvBrDogAvuhf60Sogw+mH8b+PBlx1L\n\toeTK396wc+4c3BfiC6pNtUS5GpsPMMjYMk7kVvEAEQEAAYkCPAQYAQoAJgIbDBYhBJAt15g/\n\tvSj943LUeqEeRnIQpGH9BQJdizzIBQkLSKZiAAoJEKEeRnIQpGH9eYgQAJpjaWNgqNOnMTmD\n\tMJggbwjIotypzIXfhHNCeTkG7+qCDlSaBPclcPGYrTwCt0YWPU2TgGgJrVhYT20ierN8LUvj\n\t6qOPTd+Uk7NFzL65qkh80ZKNBFddx1AabQpSVQKbdcLb8OFs85kuSvFdgqZwgxA1vl4TFhNz\n\tPZ79NAmXLackAx3sOVFhk4WQaKRshCB7cSl+RIng5S/ThOBlwNlcKG7j7W2MC06BlTbdEkUp\n\tECzuuRBv8wX4OQl+hbWbB/VKIx5HKlLu1eypen/5lNVzSqMMIYkkZcjV2SWQyUGxSwq0O/sx\n\tS0A8/atCHUXOboUsn54qdxrVDaK+6jIAuo8JiRWctP16KjzUM7MO0/+4zllM8EY57rXrj48j\n\tsbEYX0YQnzaj+jO6kJtoZsIaYR7rMMq9aUAjyiaEZpmP1qF/2sYenDx0Fg2BSlLvLvXM0vU8\n\tpQk3kgDu7kb/7PRYrZvBsr21EIQoIjXbZxDz/o7z95frkP71EaICttZ6k9q5oxxA5WC6sTXc\n\tMW8zs8avFNuA9VpXt0YupJd2ijtZy2mpZNG02fFVXhIn4G807G7+9mhuC4XG5rKlBBUXTvPU\n\tAfYnB4JBDLmLzBFavQfvonSfbitgXwCG3vS+9HEwAjU30Bar1PEOmIbiAoMzuKeRm2LVpmq4\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<77fc7ae4-203f-b652-9d70-977b70964926@ideasonboard.com>","Date":"Tue, 7 Jul 2020 10:14:48 +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":"<20200707074748.wasy5lbhgkyq4ce3@uno.localdomain>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v5 7/8] 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=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":11232,"web_url":"https://patchwork.libcamera.org/comment/11232/","msgid":"<20200707092913.67m5xqoffbf6ttwe@uno.localdomain>","date":"2020-07-07T09:29:13","subject":"Re: [libcamera-devel] [PATCH v5 7/8] 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 Tue, Jul 07, 2020 at 10:14:48AM +0100, Kieran Bingham wrote:\n> Hi Jacopo,\n>\n> On 07/07/2020 08:47, Jacopo Mondi wrote:\n> > Hi Kieran,\n> > two nits you can fix when applying\n> >\n> > On Tue, Jul 07, 2020 at 12:02:39AM +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, and\n> >> FrameBuffers have their lifetime tracked in the Camera3RequestDescriptor\n> >> to ensure they are released when the Request is completed.\n> >>\n> >> Signed-off-by: Kieran Bingham \n> >> Reviewed-by: Niklas Söderlund \n> >> Reviewed-by: Laurent Pinchart \n> >> Reviewed-by: Jacopo Mondi \n> >> ---\n> >> src/android/camera_device.cpp | 54 +++++++++++++++++++----------------\n> >> src/android/camera_device.h | 1 +\n> >> 2 files changed, 31 insertions(+), 24 deletions(-)\n> >>\n> >> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> >> index 6d060e0c40e5..b13729e84abf 100644\n> >> --- a/src/android/camera_device.cpp\n> >> +++ b/src/android/camera_device.cpp\n> >> @@ -98,6 +98,7 @@ CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor(\n> >> \t: frameNumber(frameNumber), numBuffers(numBuffers)\n> >> {\n> >> \tbuffers = new camera3_stream_buffer_t[numBuffers];\n> >> +\tframeBuffers.reserve(numBuffers);\n> >> }\n> >>\n> >> CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor()\n> >> @@ -990,6 +991,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> >> \t\tconfig_->addConfiguration(streamConfiguration);\n> >>\n> >> \t\tstreams_[i].index = streamIndex++;\n> >> +\t\tstream->priv = static_cast(&streams_[i]);\n> >> \t}\n> >>\n> >> \tswitch (config_->validate()) {\n> >> @@ -1048,9 +1050,6 @@ FrameBuffer *CameraDevice::createFrameBuffer(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> >> @@ -1088,30 +1087,35 @@ 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> > This is really long. I would break it after =\n> >\n>\n> :( I think I prefer the single line, but I can do so.\n>\n>\n> Even formatting as:\n>\n>\n> > \tfor (unsigned int i = 0; i < descriptor->numBuffers; ++i) {\n> > \t\tCameraStream *cameraStream =\n> > \t\t\tstatic_cast(camera3Buffers[i].stream->priv);\n>\n> goes up to 85 chars.\n>\n> Do you think the line break really helps readability ?\n>\n> For me adding new lines looks awkward, as it turns a single line\n> statement into ... well ... two lines ;-)\n>\n>\n> Anyway, I don't want to spend time worrying about line lengths.\n>\n> I'll apply this with the newline as shown above.\n\nAs you wish, it's really only a suggestion\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 = createFrameBuffer(*camera3Buffers[0].buffer);\n> >> -\tif (!buffer) {\n> >> -\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n> >> +\t\t/*\n> >> +\t\t * Create a libcamera buffer using the dmabuf descriptors of the\n> >> +\t\t * first and (currently) only supported request buffer.\n> >\n> > This is not true anymore, isn't it ?\n>\n> Good point, I'll fix this as: (combining both the original statement and\n> my addition):\n>\n> \"\"\"\n> Create a libcamera buffer using the dmabuf descriptors of the\n> camera3Buffer for each stream. The FrameBuffer is directly associated\n> with the Camera3RequestDescriptor for lifetime management only.\n> \"\"\"\n\nGood, thanks!\n\n>\n>\n>\n>\n> > The rest looks good as the whole series does!\n> > Thanks\n> > j\n> >\n> >> +\t\t * The FrameBuffer is directly associated with the\n> >> +\t\t * Camera3RequestDescriptor for lifetime management only.\n> >> +\t\t */\n> >> +\t\tFrameBuffer *buffer = createFrameBuffer(*camera3Buffers[i].buffer);\n> >> +\t\tif (!buffer) {\n> >> +\t\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n> >> \t\tdelete request;\n> >> -\t\tdelete descriptor;\n> >> -\t\treturn -ENOMEM;\n> >> -\t}\n> >> +\t\t\tdelete descriptor;\n> >> +\t\t\treturn -ENOMEM;\n> >> +\t\t}\n> >> +\t\tdescriptor->frameBuffers.emplace_back(buffer);\n> >>\n> >> -\trequest->addBuffer(stream, buffer);\n> >> +\t\tStreamConfiguration *streamConfiguration = &config_->at(cameraStream->index);\n> >> +\t\tStream *stream = streamConfiguration->stream();\n> >> +\n> >> +\t\trequest->addBuffer(stream, buffer);\n> >> +\t}\n> >>\n> >> \tint ret = camera_->queueRequest(request);\n> >> \tif (ret) {\n> >> @@ -1127,7 +1131,6 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> >> void CameraDevice::requestComplete(Request *request)\n> >> {\n> >> \tconst std::map &buffers = request->buffers();\n> >> -\tFrameBuffer *buffer = buffers.begin()->second;\n> >> \tcamera3_buffer_status status = CAMERA3_BUFFER_STATUS_OK;\n> >> \tstd::unique_ptr resultMetadata;\n> >>\n> >> @@ -1145,10 +1148,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> >> @@ -1156,6 +1155,14 @@ void CameraDevice::requestComplete(Request *request)\n> >> \tcaptureResult.output_buffers =\n> >> \t\tconst_cast(descriptor->buffers);\n> >>\n> >> +\t/*\n> >> +\t * \\todo The timestamp used for the metadata is currently always taken\n> >> +\t * from the first buffer (which may be the first stream) in the Request.\n> >> +\t * It might be appropriate to return a 'correct' (as determined by\n> >> +\t * pipeline handlers) timestamp in the Request itself.\n> >> +\t */\n> >> +\tFrameBuffer *buffer = buffers.begin()->second;\n> >> +\n> >> \tif (status == CAMERA3_BUFFER_STATUS_OK) {\n> >> \t\tnotifyShutter(descriptor->frameNumber,\n> >> \t\t\t buffer->metadata().timestamp);\n> >> @@ -1180,7 +1187,6 @@ void CameraDevice::requestComplete(Request *request)\n> >> \tcallbacks_->process_capture_result(callbacks_, &captureResult);\n> >>\n> >> \tdelete descriptor;\n> >> -\tdelete buffer;\n> >> }\n> >>\n> >> std::string CameraDevice::logPrefix() const\n> >> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> >> index d00f617b09a6..5b8b9c3e26e2 100644\n> >> --- a/src/android/camera_device.h\n> >> +++ b/src/android/camera_device.h\n> >> @@ -70,6 +70,7 @@ private:\n> >> \t\tuint32_t frameNumber;\n> >> \t\tuint32_t numBuffers;\n> >> \t\tcamera3_stream_buffer_t *buffers;\n> >> +\t\tstd::vector> frameBuffers;\n> >> \t};\n> >>\n> >> \tstruct Camera3StreamConfiguration {\n> >> --\n> >> 2.25.1\n> >>\n>\n> --\n> Regards\n> --\n> Kieran","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 D27BEBD790\n\tfor ;\n\tTue, 7 Jul 2020 09:25:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6EF5960F22;\n\tTue, 7 Jul 2020 11:25:44 +0200 (CEST)","from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net\n\t[217.70.183.195])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1E3B9603A9\n\tfor ;\n\tTue, 7 Jul 2020 11:25:43 +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 relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 142FC6000D;\n\tTue, 7 Jul 2020 09:25:41 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","Date":"Tue, 7 Jul 2020 11:29:13 +0200","From":"Jacopo Mondi ","To":"Kieran Bingham ","Message-ID":"<20200707092913.67m5xqoffbf6ttwe@uno.localdomain>","References":"<20200706230240.2482100-1-kieran.bingham@ideasonboard.com>\n\t<20200706230240.2482100-8-kieran.bingham@ideasonboard.com>\n\t<20200707074748.wasy5lbhgkyq4ce3@uno.localdomain>\n\t<77fc7ae4-203f-b652-9d70-977b70964926@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<77fc7ae4-203f-b652-9d70-977b70964926@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v5 7/8] 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=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]