{"id":14178,"url":"https://patchwork.libcamera.org/api/1.1/patches/14178/?format=json","web_url":"https://patchwork.libcamera.org/patch/14178/","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":"<20211019114802.665980-5-umang.jain@ideasonboard.com>","date":"2021-10-19T11:47:54","name":"[libcamera-devel,v2,04/12] android: camera_stream: Plumb process() with Camera3RequestDescriptor","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"a3eb8b0068cf13a0a685f0deb75ccd9581451409","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/14178/mbox/","series":[{"id":2638,"url":"https://patchwork.libcamera.org/api/1.1/series/2638/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2638","date":"2021-10-19T11:47:50","name":"android: Overhaul request handling","version":2,"mbox":"https://patchwork.libcamera.org/series/2638/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14178/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14178/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 07360C324C\n\tfor ;\n\tTue, 19 Oct 2021 11:48:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BF51968F5A;\n\tTue, 19 Oct 2021 13:48:20 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F267C604FE\n\tfor ;\n\tTue, 19 Oct 2021 13:48:18 +0200 (CEST)","from perceval.ideasonboard.com (unknown [103.251.226.98])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A7E3E12A;\n\tTue, 19 Oct 2021 13:48:17 +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=\"OM4fLV1o\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1634644098;\n\tbh=DFHFaDRCBauAYXkG9ClPj4uLX9MXAYU+z0uJ+o91dxQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=OM4fLV1ozJ+pHDlLWF4YHfLxbcCU9daf2t2CcwD6o8NO2mtGG7a013D1Jg28Wrk+k\n\tkeK6krsBvW4LLx7LKZoVaUk+pK4DesWzIJEmaOX7L7cCDgrunDYatkC1+hW2gd8BMs\n\tlHUVRgzw2ZliF9ZyW8tNW8zx+ob5zkVRh81u+S7Q=","From":"Umang Jain ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 19 Oct 2021 17:17:54 +0530","Message-Id":"<20211019114802.665980-5-umang.jain@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20211019114802.665980-1-umang.jain@ideasonboard.com>","References":"<20211019114802.665980-1-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 04/12] 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\nSigned-off-by: Umang Jain \nReviewed-by: Laurent Pinchart \nReviewed-by: Jacopo Mondi \nReviewed-by: Hirokazu Honda \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 | 6 ++++--\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, 15 insertions(+), 20 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 38132cbd..a8c66a79 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1153,9 +1153,8 @@ void CameraDevice::requestComplete(Request *request)\n \t\t\tcontinue;\n \t\t}\n \n-\t\tint ret = cameraStream->process(*src, 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, 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 3b96d2e9..8f47e4d8 100644\n--- a/src/android/camera_stream.cpp\n+++ b/src/android/camera_stream.cpp\n@@ -144,8 +144,7 @@ int CameraStream::waitFence(int fence)\n \n int CameraStream::process(const FrameBuffer &source,\n \t\t\t camera3_stream_buffer_t &camera3Dest,\n-\t\t\t const CameraMetadata &requestMetadata,\n-\t\t\t CameraMetadata *resultMetadata)\n+\t\t\t Camera3RequestDescriptor *request)\n {\n \t/* Handle waiting on fences on the destination buffer. */\n \tint fence = camera3Dest.acquire_fence;\n@@ -175,7 +174,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 03ecfa94..405b232d 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -19,8 +19,8 @@\n #include \n #include \n \n+class Camera3RequestDescriptor;\n class CameraDevice;\n-class CameraMetadata;\n class PostProcessor;\n \n class CameraStream\n@@ -120,8 +120,7 @@ public:\n \tint configure();\n \tint process(const libcamera::FrameBuffer &source,\n \t\t camera3_stream_buffer_t &camera3Buffer,\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 f6d47f63..699576ef 100644\n--- a/src/android/jpeg/post_processor_jpeg.cpp\n+++ b/src/android/jpeg/post_processor_jpeg.cpp\n@@ -11,6 +11,7 @@\n \n #include \"../camera_device.h\"\n #include \"../camera_metadata.h\"\n+#include \"../camera_request.h\"\n #include \"encoder_libjpeg.h\"\n #include \"exif.h\"\n \n@@ -99,14 +100,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 6fd31022..0184d77e 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 ab2b2c60..27eaef88 100644\n--- a/src/android/post_processor.h\n+++ b/src/android/post_processor.h\n@@ -12,7 +12,7 @@\n \n #include \"camera_buffer.h\"\n \n-class CameraMetadata;\n+class Camera3RequestDescriptor;\n \n class PostProcessor\n {\n@@ -23,8 +23,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 7b3b4960..8110a1f1 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 12f7af07..a4e0ff5d 100644\n--- a/src/android/yuv/post_processor_yuv.h\n+++ b/src/android/yuv/post_processor_yuv.h\n@@ -20,8 +20,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 *request) override;\n \n private:\n \tbool isValidBuffers(const libcamera::FrameBuffer &source,\n","prefixes":["libcamera-devel","v2","04/12"]}