{"id":13870,"url":"https://patchwork.libcamera.org/api/1.1/patches/13870/?format=json","web_url":"https://patchwork.libcamera.org/patch/13870/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210920173752.1346190-7-umang.jain@ideasonboard.com>","date":"2021-09-20T17:37:48","name":"[libcamera-devel,v3,06/10] android: camera_stream: Plumb process() with Camera3RequestDescriptor","commit_ref":null,"pull_url":null,"state":"rfc","archived":false,"hash":"b3dae8e07d20124db3d95ceb972f632d3f8e3757","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/1.1/people/86/?format=json","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"delegate":{"id":12,"url":"https://patchwork.libcamera.org/api/1.1/users/12/?format=json","username":"uajain","first_name":"Umang","last_name":"Jain","email":"umang.jain@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/13870/mbox/","series":[{"id":2539,"url":"https://patchwork.libcamera.org/api/1.1/series/2539/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2539","date":"2021-09-20T17:37:42","name":"Async post processor","version":3,"mbox":"https://patchwork.libcamera.org/series/2539/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13870/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13870/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id BB2AFBF01C\n\tfor ;\n\tMon, 20 Sep 2021 17:38:15 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 71D376918F;\n\tMon, 20 Sep 2021 19:38:15 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2341C6918F\n\tfor ;\n\tMon, 20 Sep 2021 19:38:13 +0200 (CEST)","from perceval.ideasonboard.com (unknown [103.251.226.144])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E80A345E;\n\tMon, 20 Sep 2021 19:38:11 +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=\"YNG17aqv\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1632159492;\n\tbh=MWmXhXrT2ZZjg1SG7A81WLvgNDlDwkV89K89gzYaHwE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=YNG17aqvCr0iZN1BXcIZXASbM1YYI6qogoSqYnxH9tIZiX1/+Lh3N50tS9WctkIHE\n\t17Y0UM3x1E4Y4n0z3BVdBQIsoPE84H1cABdzZDyck8ugQAKpDwPedlrvpb38jvji67\n\tcJQ7oaCMEm3tYM1A+LKRIhKlTLDVhMfn7DCzhIzY=","From":"Umang Jain ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 20 Sep 2021 23:07:48 +0530","Message-Id":"<20210920173752.1346190-7-umang.jain@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210920173752.1346190-1-umang.jain@ideasonboard.com>","References":"<20210920173752.1346190-1-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 06/10] android: camera_stream: Plumb\n\tprocess() 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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Data (or broader context) required for post processing of a camera request\nis saved via Camera3RequestDescriptor. Instead of passing individual\narguments to CameraStream::process(), pass the Camera3RequestDescriptor\npointer to it. All the arguments necessary to run the post-processor can\nbe accessed from the descriptor.\n\nIn subsequent commits, we will prepare the post-processor to run\nasynchronously. Hence, it will require the Camera3RequestDescriptor\npointer to be emitted back in the post-processing completion handler\nto finally complete the request (i.e. sending the capture results back\nto the framework).\n\nSigned-off-by: Umang Jain \nReviewed-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(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 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.\ndiff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\nindex 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()\ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nindex 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 \ndiff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\nindex 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 \ndiff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\nindex 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,\ndiff --git a/src/android/post_processor.h b/src/android/post_processor.h\nindex 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__ */\ndiff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp\nindex 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;\ndiff --git a/src/android/yuv/post_processor_yuv.h b/src/android/yuv/post_processor_yuv.h\nindex 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","prefixes":["libcamera-devel","v3","06/10"]}