[{"id":19721,"web_url":"https://patchwork.libcamera.org/comment/19721/","msgid":"","date":"2021-09-20T19:15:34","subject":"Re: [libcamera-devel] [PATCH v3 06/10] android: camera_stream:\n\tPlumb process() with Camera3RequestDescriptor","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Umang,\n\nThank you for the patch.\n\nOn Mon, Sep 20, 2021 at 11:07:48PM +0530, Umang Jain wrote:\n> Data (or broader context) required for post processing of a camera request\n> is saved via Camera3RequestDescriptor. Instead of passing individual\n> arguments to CameraStream::process(), pass the Camera3RequestDescriptor\n> pointer to it. All the arguments necessary to run the post-processor can\n> be accessed from the descriptor.\n> \n> In subsequent commits, we will prepare the post-processor to run\n> asynchronously. Hence, it will require the Camera3RequestDescriptor\n> pointer to be emitted back in the post-processing completion handler\n> to finally complete the request (i.e. sending the capture results back\n> to the framework).\n> \n> Signed-off-by: Umang Jain \n> Reviewed-by: Laurent Pinchart \n> ---\n> src/android/camera_device.cpp | 5 ++---\n> src/android/camera_stream.cpp | 5 ++---\n> src/android/camera_stream.h | 5 +++--\n> src/android/jpeg/post_processor_jpeg.cpp | 5 +++--\n> src/android/jpeg/post_processor_jpeg.h | 3 +--\n> src/android/post_processor.h | 5 +++--\n> src/android/yuv/post_processor_yuv.cpp | 3 +--\n> src/android/yuv/post_processor_yuv.h | 3 +--\n> 8 files changed, 16 insertions(+), 18 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 1ae4ac73..fa462368 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1150,9 +1150,8 @@ void CameraDevice::requestComplete(Request *request)\n> \t\t\tcontinue;\n> \t\t}\n> \n> -\t\tint ret = cameraStream->process(src, *buffer.buffer,\n> -\t\t\t\t\t\tdescriptor->settings_,\n> -\t\t\t\t\t\tdescriptor->resultMetadata_.get());\n> +\t\tint ret = cameraStream->process(src, *buffer.buffer, descriptor);\n> +\n> \t\t/*\n> \t\t * Return the FrameBuffer to the CameraStream now that we're\n> \t\t * done processing it.\n> diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> index 0fed5382..d494f5d5 100644\n> --- a/src/android/camera_stream.cpp\n> +++ b/src/android/camera_stream.cpp\n> @@ -100,8 +100,7 @@ int CameraStream::configure()\n> \n> int CameraStream::process(const FrameBuffer *source,\n> \t\t\t buffer_handle_t camera3Dest,\n> -\t\t\t const CameraMetadata &requestMetadata,\n> -\t\t\t CameraMetadata *resultMetadata)\n> +\t\t\t Camera3RequestDescriptor *request)\n> {\n> \tif (!postProcessor_)\n> \t\treturn 0;\n> @@ -118,7 +117,7 @@ int CameraStream::process(const FrameBuffer *source,\n> \t\treturn -EINVAL;\n> \t}\n> \n> -\treturn postProcessor_->process(source, &dest, requestMetadata, resultMetadata);\n> +\treturn postProcessor_->process(source, &dest, request);\n> }\n> \n> FrameBuffer *CameraStream::getBuffer()\n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> index 5c232cb6..68789700 100644\n> --- a/src/android/camera_stream.h\n> +++ b/src/android/camera_stream.h\n> @@ -23,6 +23,8 @@ class CameraDevice;\n> class CameraMetadata;\n> class PostProcessor;\n> \n> +struct Camera3RequestDescriptor;\n> +\n> class CameraStream\n> {\n> public:\n> @@ -120,8 +122,7 @@ public:\n> \tint configure();\n> \tint process(const libcamera::FrameBuffer *source,\n> \t\t buffer_handle_t camera3Dest,\n> -\t\t const CameraMetadata &requestMetadata,\n> -\t\t CameraMetadata *resultMetadata);\n> +\t\t Camera3RequestDescriptor *request);\n> \tlibcamera::FrameBuffer *getBuffer();\n> \tvoid putBuffer(libcamera::FrameBuffer *buffer);\n> \n> diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\n> index cb45f86b..31f68330 100644\n> --- a/src/android/jpeg/post_processor_jpeg.cpp\n> +++ b/src/android/jpeg/post_processor_jpeg.cpp\n> @@ -99,14 +99,15 @@ void PostProcessorJpeg::generateThumbnail(const FrameBuffer *source,\n> \n> int PostProcessorJpeg::process(const FrameBuffer *source,\n> \t\t\t CameraBuffer *destination,\n> -\t\t\t const CameraMetadata &requestMetadata,\n> -\t\t\t CameraMetadata *resultMetadata)\n> +\t\t\t Camera3RequestDescriptor *request)\n> {\n> \tif (!encoder_)\n> \t\treturn 0;\n> \n> \tASSERT(destination->numPlanes() == 1);\n> \n> +\tconst CameraMetadata &requestMetadata = request->settings_;\n> +\tCameraMetadata *resultMetadata = request->resultMetadata_.get();\n> \tcamera_metadata_ro_entry_t entry;\n> \tint ret;\n> \n> diff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\n> index c4b2e9ef..d49c8d2b 100644\n> --- a/src/android/jpeg/post_processor_jpeg.h\n> +++ b/src/android/jpeg/post_processor_jpeg.h\n> @@ -24,8 +24,7 @@ public:\n> \t\t const libcamera::StreamConfiguration &outcfg) override;\n> \tint process(const libcamera::FrameBuffer *source,\n> \t\t CameraBuffer *destination,\n> -\t\t const CameraMetadata &requestMetadata,\n> -\t\t CameraMetadata *resultMetadata) override;\n> +\t\t Camera3RequestDescriptor *request) override;\n> \n> private:\n> \tvoid generateThumbnail(const libcamera::FrameBuffer *source,\n> diff --git a/src/android/post_processor.h b/src/android/post_processor.h\n> index 61dfb6d4..bdd6afe7 100644\n> --- a/src/android/post_processor.h\n> +++ b/src/android/post_processor.h\n> @@ -14,6 +14,8 @@\n> \n> class CameraMetadata;\n> \n> +struct Camera3RequestDescriptor;\n> +\n> class PostProcessor\n> {\n> public:\n> @@ -23,8 +25,7 @@ public:\n> \t\t\t const libcamera::StreamConfiguration &outCfg) = 0;\n> \tvirtual int process(const libcamera::FrameBuffer *source,\n> \t\t\t CameraBuffer *destination,\n> -\t\t\t const CameraMetadata &requestMetadata,\n> -\t\t\t CameraMetadata *resultMetadata) = 0;\n> +\t\t\t Camera3RequestDescriptor *request) = 0;\n> };\n> \n> #endif /* __ANDROID_POST_PROCESSOR_H__ */\n> diff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp\n> index 0a874886..5e18caee 100644\n> --- a/src/android/yuv/post_processor_yuv.cpp\n> +++ b/src/android/yuv/post_processor_yuv.cpp\n> @@ -51,8 +51,7 @@ int PostProcessorYuv::configure(const StreamConfiguration &inCfg,\n> \n> int PostProcessorYuv::process(const FrameBuffer *source,\n> \t\t\t CameraBuffer *destination,\n> -\t\t\t [[maybe_unused]] const CameraMetadata &requestMetadata,\n> -\t\t\t [[maybe_unused]] CameraMetadata *metadata)\n> +\t\t\t [[maybe_unused]] Camera3RequestDescriptor *request)\n> {\n> \tif (!isValidBuffers(source, *destination))\n> \t\treturn -EINVAL;\n> diff --git a/src/android/yuv/post_processor_yuv.h b/src/android/yuv/post_processor_yuv.h\n> index 44a04113..eddd1086 100644\n> --- a/src/android/yuv/post_processor_yuv.h\n> +++ b/src/android/yuv/post_processor_yuv.h\n> @@ -22,8 +22,7 @@ public:\n> \t\t const libcamera::StreamConfiguration &outcfg) override;\n> \tint process(const libcamera::FrameBuffer *source,\n> \t\t CameraBuffer *destination,\n> -\t\t const CameraMetadata &requestMetadata,\n> -\t\t CameraMetadata *metadata) override;\n> +\t\t Camera3RequestDescriptor *context) override;\n\ns/context/request/\n\nReviewed-by: Laurent Pinchart \n\n> \n> private:\n> \tbool isValidBuffers(const libcamera::FrameBuffer *source,","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 3343BBF01C\n\tfor ;\n\tMon, 20 Sep 2021 19:16:07 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A1E1D6918A;\n\tMon, 20 Sep 2021 21:16:06 +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 5D71D69186\n\tfor ;\n\tMon, 20 Sep 2021 21:16:05 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D0AADE57;\n\tMon, 20 Sep 2021 21:16:04 +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=\"WJ8t9KTJ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1632165365;\n\tbh=LUjLXFJv3ybB0p5gF5MOlmN3ig/Kftu9F94pv9RRufI=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=WJ8t9KTJCKkVE2WXIVQN+ICVbAl4qFv33CRcb6TcJosGiNScOg6FDEv/KxdSi2vzZ\n\tdwxb1+DZJCiTesfzoGODI6Is0J0NqmLChMy4qdXQ2alIy2i6yUoqQNxH7ku1bDZZxM\n\tjlMVhgfXMFX9EjRrP+Evudk0zxMR4EtRpnW/naP4=","Date":"Mon, 20 Sep 2021 22:15:34 +0300","From":"Laurent Pinchart ","To":"Umang Jain ","Message-ID":"","References":"<20210920173752.1346190-1-umang.jain@ideasonboard.com>\n\t<20210920173752.1346190-7-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210920173752.1346190-7-umang.jain@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v3 06/10] android: camera_stream:\n\tPlumb process() with Camera3RequestDescriptor","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@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":19731,"web_url":"https://patchwork.libcamera.org/comment/19731/","msgid":"<20210921111424.jjzaizr32a2y7txe@uno.localdomain>","date":"2021-09-21T11:14:24","subject":"Re: [libcamera-devel] [PATCH v3 06/10] android: camera_stream:\n\tPlumb process() with Camera3RequestDescriptor","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Umang,\n\nOn Mon, Sep 20, 2021 at 11:07:48PM +0530, Umang Jain wrote:\n> Data (or broader context) required for post processing of a camera request\n> is saved via Camera3RequestDescriptor. Instead of passing individual\n> arguments to CameraStream::process(), pass the Camera3RequestDescriptor\n> pointer to it. All the arguments necessary to run the post-processor can\n> be accessed from the descriptor.\n>\n> In subsequent commits, we will prepare the post-processor to run\n> asynchronously. Hence, it will require the Camera3RequestDescriptor\n> pointer to be emitted back in the post-processing completion handler\n> to finally complete the request (i.e. sending the capture results back\n> to the framework).\n>\n> Signed-off-by: Umang Jain \n> Reviewed-by: Laurent Pinchart \n\nAh -.-\n\nSorry for the noise on the previous one then\n\nShould these two patches be squashed then ?\n\nThanks\n j\n\n> ---\n> src/android/camera_device.cpp | 5 ++---\n> src/android/camera_stream.cpp | 5 ++---\n> src/android/camera_stream.h | 5 +++--\n> src/android/jpeg/post_processor_jpeg.cpp | 5 +++--\n> src/android/jpeg/post_processor_jpeg.h | 3 +--\n> src/android/post_processor.h | 5 +++--\n> src/android/yuv/post_processor_yuv.cpp | 3 +--\n> src/android/yuv/post_processor_yuv.h | 3 +--\n> 8 files changed, 16 insertions(+), 18 deletions(-)\n>\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 1ae4ac73..fa462368 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1150,9 +1150,8 @@ void CameraDevice::requestComplete(Request *request)\n> \t\t\tcontinue;\n> \t\t}\n>\n> -\t\tint ret = cameraStream->process(src, *buffer.buffer,\n> -\t\t\t\t\t\tdescriptor->settings_,\n> -\t\t\t\t\t\tdescriptor->resultMetadata_.get());\n> +\t\tint ret = cameraStream->process(src, *buffer.buffer, descriptor);\n> +\n> \t\t/*\n> \t\t * Return the FrameBuffer to the CameraStream now that we're\n> \t\t * done processing it.\n> diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> index 0fed5382..d494f5d5 100644\n> --- a/src/android/camera_stream.cpp\n> +++ b/src/android/camera_stream.cpp\n> @@ -100,8 +100,7 @@ int CameraStream::configure()\n>\n> int CameraStream::process(const FrameBuffer *source,\n> \t\t\t buffer_handle_t camera3Dest,\n> -\t\t\t const CameraMetadata &requestMetadata,\n> -\t\t\t CameraMetadata *resultMetadata)\n> +\t\t\t Camera3RequestDescriptor *request)\n> {\n> \tif (!postProcessor_)\n> \t\treturn 0;\n> @@ -118,7 +117,7 @@ int CameraStream::process(const FrameBuffer *source,\n> \t\treturn -EINVAL;\n> \t}\n>\n> -\treturn postProcessor_->process(source, &dest, requestMetadata, resultMetadata);\n> +\treturn postProcessor_->process(source, &dest, request);\n> }\n>\n> FrameBuffer *CameraStream::getBuffer()\n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> index 5c232cb6..68789700 100644\n> --- a/src/android/camera_stream.h\n> +++ b/src/android/camera_stream.h\n> @@ -23,6 +23,8 @@ class CameraDevice;\n> class CameraMetadata;\n> class PostProcessor;\n>\n> +struct Camera3RequestDescriptor;\n> +\n> class CameraStream\n> {\n> public:\n> @@ -120,8 +122,7 @@ public:\n> \tint configure();\n> \tint process(const libcamera::FrameBuffer *source,\n> \t\t buffer_handle_t camera3Dest,\n> -\t\t const CameraMetadata &requestMetadata,\n> -\t\t CameraMetadata *resultMetadata);\n> +\t\t Camera3RequestDescriptor *request);\n> \tlibcamera::FrameBuffer *getBuffer();\n> \tvoid putBuffer(libcamera::FrameBuffer *buffer);\n>\n> diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\n> index cb45f86b..31f68330 100644\n> --- a/src/android/jpeg/post_processor_jpeg.cpp\n> +++ b/src/android/jpeg/post_processor_jpeg.cpp\n> @@ -99,14 +99,15 @@ void PostProcessorJpeg::generateThumbnail(const FrameBuffer *source,\n>\n> int PostProcessorJpeg::process(const FrameBuffer *source,\n> \t\t\t CameraBuffer *destination,\n> -\t\t\t const CameraMetadata &requestMetadata,\n> -\t\t\t CameraMetadata *resultMetadata)\n> +\t\t\t Camera3RequestDescriptor *request)\n> {\n> \tif (!encoder_)\n> \t\treturn 0;\n>\n> \tASSERT(destination->numPlanes() == 1);\n>\n> +\tconst CameraMetadata &requestMetadata = request->settings_;\n> +\tCameraMetadata *resultMetadata = request->resultMetadata_.get();\n> \tcamera_metadata_ro_entry_t entry;\n> \tint ret;\n>\n> diff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\n> index c4b2e9ef..d49c8d2b 100644\n> --- a/src/android/jpeg/post_processor_jpeg.h\n> +++ b/src/android/jpeg/post_processor_jpeg.h\n> @@ -24,8 +24,7 @@ public:\n> \t\t const libcamera::StreamConfiguration &outcfg) override;\n> \tint process(const libcamera::FrameBuffer *source,\n> \t\t CameraBuffer *destination,\n> -\t\t const CameraMetadata &requestMetadata,\n> -\t\t CameraMetadata *resultMetadata) override;\n> +\t\t Camera3RequestDescriptor *request) override;\n>\n> private:\n> \tvoid generateThumbnail(const libcamera::FrameBuffer *source,\n> diff --git a/src/android/post_processor.h b/src/android/post_processor.h\n> index 61dfb6d4..bdd6afe7 100644\n> --- a/src/android/post_processor.h\n> +++ b/src/android/post_processor.h\n> @@ -14,6 +14,8 @@\n>\n> class CameraMetadata;\n>\n> +struct Camera3RequestDescriptor;\n> +\n> class PostProcessor\n> {\n> public:\n> @@ -23,8 +25,7 @@ public:\n> \t\t\t const libcamera::StreamConfiguration &outCfg) = 0;\n> \tvirtual int process(const libcamera::FrameBuffer *source,\n> \t\t\t CameraBuffer *destination,\n> -\t\t\t const CameraMetadata &requestMetadata,\n> -\t\t\t CameraMetadata *resultMetadata) = 0;\n> +\t\t\t Camera3RequestDescriptor *request) = 0;\n> };\n>\n> #endif /* __ANDROID_POST_PROCESSOR_H__ */\n> diff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp\n> index 0a874886..5e18caee 100644\n> --- a/src/android/yuv/post_processor_yuv.cpp\n> +++ b/src/android/yuv/post_processor_yuv.cpp\n> @@ -51,8 +51,7 @@ int PostProcessorYuv::configure(const StreamConfiguration &inCfg,\n>\n> int PostProcessorYuv::process(const FrameBuffer *source,\n> \t\t\t CameraBuffer *destination,\n> -\t\t\t [[maybe_unused]] const CameraMetadata &requestMetadata,\n> -\t\t\t [[maybe_unused]] CameraMetadata *metadata)\n> +\t\t\t [[maybe_unused]] Camera3RequestDescriptor *request)\n> {\n> \tif (!isValidBuffers(source, *destination))\n> \t\treturn -EINVAL;\n> diff --git a/src/android/yuv/post_processor_yuv.h b/src/android/yuv/post_processor_yuv.h\n> index 44a04113..eddd1086 100644\n> --- a/src/android/yuv/post_processor_yuv.h\n> +++ b/src/android/yuv/post_processor_yuv.h\n> @@ -22,8 +22,7 @@ public:\n> \t\t const libcamera::StreamConfiguration &outcfg) override;\n> \tint process(const libcamera::FrameBuffer *source,\n> \t\t CameraBuffer *destination,\n> -\t\t const CameraMetadata &requestMetadata,\n> -\t\t CameraMetadata *metadata) override;\n> +\t\t Camera3RequestDescriptor *context) override;\n>\n> private:\n> \tbool isValidBuffers(const libcamera::FrameBuffer *source,\n> --\n> 2.31.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 76442BDC71\n\tfor ;\n\tTue, 21 Sep 2021 11:13:40 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4BDED6918A;\n\tTue, 21 Sep 2021 13:13:40 +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 BED1660247\n\tfor ;\n\tTue, 21 Sep 2021 13:13:38 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 39ACE6000C;\n\tTue, 21 Sep 2021 11:13:37 +0000 (UTC)"],"Date":"Tue, 21 Sep 2021 13:14:24 +0200","From":"Jacopo Mondi ","To":"Umang Jain ","Message-ID":"<20210921111424.jjzaizr32a2y7txe@uno.localdomain>","References":"<20210920173752.1346190-1-umang.jain@ideasonboard.com>\n\t<20210920173752.1346190-7-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210920173752.1346190-7-umang.jain@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v3 06/10] android: camera_stream:\n\tPlumb process() with Camera3RequestDescriptor","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@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":19860,"web_url":"https://patchwork.libcamera.org/comment/19860/","msgid":"","date":"2021-09-27T06:32:02","subject":"Re: [libcamera-devel] [PATCH v3 06/10] android: camera_stream:\n\tPlumb process() with Camera3RequestDescriptor","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/people/63/","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"content":"Hi Umang, thank you for the patch.\n\nOn Tue, Sep 21, 2021 at 8:13 PM Jacopo Mondi wrote:\n>\n> Hi Umang,\n>\n> On Mon, Sep 20, 2021 at 11:07:48PM +0530, Umang Jain wrote:\n> > Data (or broader context) required for post processing of a camera request\n> > is saved via Camera3RequestDescriptor. Instead of passing individual\n> > arguments to CameraStream::process(), pass the Camera3RequestDescriptor\n> > pointer to it. All the arguments necessary to run the post-processor can\n> > be accessed from the descriptor.\n> >\n> > In subsequent commits, we will prepare the post-processor to run\n> > asynchronously. Hence, it will require the Camera3RequestDescriptor\n> > pointer to be emitted back in the post-processing completion handler\n> > to finally complete the request (i.e. sending the capture results back\n> > to the framework).\n> >\n> > Signed-off-by: Umang Jain \n> > Reviewed-by: Laurent Pinchart \n\nReviewed-by: Hirokazu Honda \n>\n> Ah -.-\n>\n> Sorry for the noise on the previous one then\n>\n> Should these two patches be squashed then ?\n>\n> Thanks\n> j\n>\n> > ---\n> > src/android/camera_device.cpp | 5 ++---\n> > src/android/camera_stream.cpp | 5 ++---\n> > src/android/camera_stream.h | 5 +++--\n> > src/android/jpeg/post_processor_jpeg.cpp | 5 +++--\n> > src/android/jpeg/post_processor_jpeg.h | 3 +--\n> > src/android/post_processor.h | 5 +++--\n> > src/android/yuv/post_processor_yuv.cpp | 3 +--\n> > src/android/yuv/post_processor_yuv.h | 3 +--\n> > 8 files changed, 16 insertions(+), 18 deletions(-)\n> >\n> > diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> > index 1ae4ac73..fa462368 100644\n> > --- a/src/android/camera_device.cpp\n> > +++ b/src/android/camera_device.cpp\n> > @@ -1150,9 +1150,8 @@ void CameraDevice::requestComplete(Request *request)\n> > continue;\n> > }\n> >\n> > - int ret = cameraStream->process(src, *buffer.buffer,\n> > - descriptor->settings_,\n> > - descriptor->resultMetadata_.get());\n> > + int ret = cameraStream->process(src, *buffer.buffer, descriptor);\n> > +\n> > /*\n> > * Return the FrameBuffer to the CameraStream now that we're\n> > * done processing it.\n> > diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> > index 0fed5382..d494f5d5 100644\n> > --- a/src/android/camera_stream.cpp\n> > +++ b/src/android/camera_stream.cpp\n> > @@ -100,8 +100,7 @@ int CameraStream::configure()\n> >\n> > int CameraStream::process(const FrameBuffer *source,\n> > buffer_handle_t camera3Dest,\n> > - const CameraMetadata &requestMetadata,\n> > - CameraMetadata *resultMetadata)\n> > + Camera3RequestDescriptor *request)\n> > {\n> > if (!postProcessor_)\n> > return 0;\n> > @@ -118,7 +117,7 @@ int CameraStream::process(const FrameBuffer *source,\n> > return -EINVAL;\n> > }\n> >\n> > - return postProcessor_->process(source, &dest, requestMetadata, resultMetadata);\n> > + return postProcessor_->process(source, &dest, request);\n> > }\n> >\n> > FrameBuffer *CameraStream::getBuffer()\n> > diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> > index 5c232cb6..68789700 100644\n> > --- a/src/android/camera_stream.h\n> > +++ b/src/android/camera_stream.h\n> > @@ -23,6 +23,8 @@ class CameraDevice;\n> > class CameraMetadata;\n> > class PostProcessor;\n> >\n> > +struct Camera3RequestDescriptor;\n> > +\n> > class CameraStream\n> > {\n> > public:\n> > @@ -120,8 +122,7 @@ public:\n> > int configure();\n> > int process(const libcamera::FrameBuffer *source,\n> > buffer_handle_t camera3Dest,\n> > - const CameraMetadata &requestMetadata,\n> > - CameraMetadata *resultMetadata);\n> > + Camera3RequestDescriptor *request);\n> > libcamera::FrameBuffer *getBuffer();\n> > void putBuffer(libcamera::FrameBuffer *buffer);\n> >\n> > diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\n> > index cb45f86b..31f68330 100644\n> > --- a/src/android/jpeg/post_processor_jpeg.cpp\n> > +++ b/src/android/jpeg/post_processor_jpeg.cpp\n> > @@ -99,14 +99,15 @@ void PostProcessorJpeg::generateThumbnail(const FrameBuffer *source,\n> >\n> > int PostProcessorJpeg::process(const FrameBuffer *source,\n> > CameraBuffer *destination,\n> > - const CameraMetadata &requestMetadata,\n> > - CameraMetadata *resultMetadata)\n> > + Camera3RequestDescriptor *request)\n> > {\n> > if (!encoder_)\n> > return 0;\n> >\n> > ASSERT(destination->numPlanes() == 1);\n> >\n> > + const CameraMetadata &requestMetadata = request->settings_;\n> > + CameraMetadata *resultMetadata = request->resultMetadata_.get();\n> > camera_metadata_ro_entry_t entry;\n> > int ret;\n> >\n> > diff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\n> > index c4b2e9ef..d49c8d2b 100644\n> > --- a/src/android/jpeg/post_processor_jpeg.h\n> > +++ b/src/android/jpeg/post_processor_jpeg.h\n> > @@ -24,8 +24,7 @@ public:\n> > const libcamera::StreamConfiguration &outcfg) override;\n> > int process(const libcamera::FrameBuffer *source,\n> > CameraBuffer *destination,\n> > - const CameraMetadata &requestMetadata,\n> > - CameraMetadata *resultMetadata) override;\n> > + Camera3RequestDescriptor *request) override;\n> >\n> > private:\n> > void generateThumbnail(const libcamera::FrameBuffer *source,\n> > diff --git a/src/android/post_processor.h b/src/android/post_processor.h\n> > index 61dfb6d4..bdd6afe7 100644\n> > --- a/src/android/post_processor.h\n> > +++ b/src/android/post_processor.h\n> > @@ -14,6 +14,8 @@\n> >\n> > class CameraMetadata;\n> >\n> > +struct Camera3RequestDescriptor;\n> > +\n> > class PostProcessor\n> > {\n> > public:\n> > @@ -23,8 +25,7 @@ public:\n> > const libcamera::StreamConfiguration &outCfg) = 0;\n> > virtual int process(const libcamera::FrameBuffer *source,\n> > CameraBuffer *destination,\n> > - const CameraMetadata &requestMetadata,\n> > - CameraMetadata *resultMetadata) = 0;\n> > + Camera3RequestDescriptor *request) = 0;\n> > };\n> >\n> > #endif /* __ANDROID_POST_PROCESSOR_H__ */\n> > diff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp\n> > index 0a874886..5e18caee 100644\n> > --- a/src/android/yuv/post_processor_yuv.cpp\n> > +++ b/src/android/yuv/post_processor_yuv.cpp\n> > @@ -51,8 +51,7 @@ int PostProcessorYuv::configure(const StreamConfiguration &inCfg,\n> >\n> > int PostProcessorYuv::process(const FrameBuffer *source,\n> > CameraBuffer *destination,\n> > - [[maybe_unused]] const CameraMetadata &requestMetadata,\n> > - [[maybe_unused]] CameraMetadata *metadata)\n> > + [[maybe_unused]] Camera3RequestDescriptor *request)\n> > {\n> > if (!isValidBuffers(source, *destination))\n> > return -EINVAL;\n> > diff --git a/src/android/yuv/post_processor_yuv.h b/src/android/yuv/post_processor_yuv.h\n> > index 44a04113..eddd1086 100644\n> > --- a/src/android/yuv/post_processor_yuv.h\n> > +++ b/src/android/yuv/post_processor_yuv.h\n> > @@ -22,8 +22,7 @@ public:\n> > const libcamera::StreamConfiguration &outcfg) override;\n> > int process(const libcamera::FrameBuffer *source,\n> > CameraBuffer *destination,\n> > - const CameraMetadata &requestMetadata,\n> > - CameraMetadata *metadata) override;\n> > + Camera3RequestDescriptor *context) override;\n> >\n> > private:\n> > bool isValidBuffers(const libcamera::FrameBuffer *source,\n> > --\n> > 2.31.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 6A798BDC71\n\tfor ;\n\tMon, 27 Sep 2021 06:32:15 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 38CF56918E;\n\tMon, 27 Sep 2021 08:32:15 +0200 (CEST)","from mail-ed1-x530.google.com (mail-ed1-x530.google.com\n\t[IPv6:2a00:1450:4864:20::530])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 48E20684C8\n\tfor ;\n\tMon, 27 Sep 2021 08:32:13 +0200 (CEST)","by mail-ed1-x530.google.com with SMTP id x7so50079289edd.6\n\tfor ;\n\tSun, 26 Sep 2021 23:32:13 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"VPE+QyN3\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=mime-version:references:in-reply-to:from:date:message-id:subject:to\n\t:cc; bh=Qx57XDSNh5CW+xayLMEOINZGJCm0W5lDpvaMFg9xUpk=;\n\tb=VPE+QyN3YJAuWqIQWCHuuvPieY9C/00qFvdnSPlA2h4XOGO9Bl1vAU89kzZ0mtvIJy\n\tTSrp9aWVJMy4MUcJ2uhXWjfwYzyzI0X+NKKvbr6f2Y7z0+zYwjpzFZGwWq/yvVsnchh+\n\t0uLBhGxJXuZsEIRdchnbaT8XxKnbvV6AheMcI=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc;\n\tbh=Qx57XDSNh5CW+xayLMEOINZGJCm0W5lDpvaMFg9xUpk=;\n\tb=ACeyGYE2hMi4ThWC2XLfehbc7uwDCuDa2nUWxW7JS22vNOJDQ7vYfh+0UuxJjfeT8F\n\tjNQOTZeorpc7uCFqY4OuuQjtPnQBz8VpK0QUpmwLKvTNseDEi/P3u4qGkzEe07zP1YGr\n\tR3OlV4EPc+Stk/DU3NGZNTthrL7rQOWMFf34min3RWnhfe9rDZUNHsNmsUtomOiGxy2e\n\tYUsrMwtWcpHnY7C7f0vJvX+aexXZzg+sIRXLeun6f4UvDyVPyMtcTn8xumYR2vyhyXVV\n\tjscdGb1m7DCbUYDflukEL6rt+y0t/QWmmk48sbJiKI3802U/AFk/3M4leIhl/i0i4FBi\n\tYDNw==","X-Gm-Message-State":"AOAM532WQDdSjCUdheRCxZZV1wGcoBJtYhduDy+U7JrAj3mTlQ8B4mWA\n\tf+ZX21DPXsIxSjdCb9d11TyilPwYITAe5UpTkU061A==","X-Google-Smtp-Source":"ABdhPJzspIvme3Ewb0nI68iWJ30utHcpWWZCiWzlRK352bGKh5re24ihmNd0N6OGpPJjdnctf/NBrx2AtzWUUClZVKI=","X-Received":"by 2002:aa7:d402:: with SMTP id\n\tz2mr22266971edq.291.1632724332927; \n\tSun, 26 Sep 2021 23:32:12 -0700 (PDT)","MIME-Version":"1.0","References":"<20210920173752.1346190-1-umang.jain@ideasonboard.com>\n\t<20210920173752.1346190-7-umang.jain@ideasonboard.com>\n\t<20210921111424.jjzaizr32a2y7txe@uno.localdomain>","In-Reply-To":"<20210921111424.jjzaizr32a2y7txe@uno.localdomain>","From":"Hirokazu Honda ","Date":"Mon, 27 Sep 2021 15:32:02 +0900","Message-ID":"","To":"Jacopo Mondi ","Content-Type":"text/plain; charset=\"UTF-8\"","Subject":"Re: [libcamera-devel] [PATCH v3 06/10] android: camera_stream:\n\tPlumb process() with Camera3RequestDescriptor","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 ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]