Patch Detail
Show a patch.
GET /api/1.1/patches/14079/?format=api
{ "id": 14079, "url": "https://patchwork.libcamera.org/api/1.1/patches/14079/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14079/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20211011073505.243864-5-umang.jain@ideasonboard.com>", "date": "2021-10-11T07:35:02", "name": "[libcamera-devel,v4,4/7] android: camera_stream: Drop return value for process()", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "0767c794123e42a61f9832175ad724df3dff87c7", "submitter": { "id": 86, "url": "https://patchwork.libcamera.org/api/1.1/people/86/?format=api", "name": "Umang Jain", "email": "umang.jain@ideasonboard.com" }, "delegate": { "id": 12, "url": "https://patchwork.libcamera.org/api/1.1/users/12/?format=api", "username": "uajain", "first_name": "Umang", "last_name": "Jain", "email": "umang.jain@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/14079/mbox/", "series": [ { "id": 2611, "url": "https://patchwork.libcamera.org/api/1.1/series/2611/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2611", "date": "2021-10-11T07:34:58", "name": "Async Post Processor", "version": 4, "mbox": "https://patchwork.libcamera.org/series/2611/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14079/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14079/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 1BC4AC323E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 11 Oct 2021 07:35:25 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5905468F57;\n\tMon, 11 Oct 2021 09:35:24 +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 748E068F4C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 11 Oct 2021 09:35:22 +0200 (CEST)", "from perceval.ideasonboard.com (unknown [103.251.226.107])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8E3CA2BD;\n\tMon, 11 Oct 2021 09:35:21 +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=\"rzDq+zON\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1633937722;\n\tbh=OH/IvMPL/5DidY8odwhuRRvjKOYw6D41+284OpPODSg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=rzDq+zONXkP/LsakH8wTAMQx9Q5YXEZlrUELvv74nvnEOfZLFDHBtWdlricyw0sFw\n\tnSLAf3L5sDVtIrBpgfNhFXnxNoS8ikYXgg03P6u9Ryptu+kx5/1Tda+ABHk8heS8xG\n\t1GHtTr+vtBZk7j2twW40PhQIgeJP97LcJAJgZJOM=", "From": "Umang Jain <umang.jain@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 11 Oct 2021 13:05:02 +0530", "Message-Id": "<20211011073505.243864-5-umang.jain@ideasonboard.com>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20211011073505.243864-1-umang.jain@ideasonboard.com>", "References": "<20211011073505.243864-1-umang.jain@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 4/7] android: camera_stream: Drop\n\treturn value for process()", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "CameraStream::process() is invoked by CameraDevice::requestComplete()\nin case any post-processing is required for the camera stream. The\nfailure or success is checked via the value returned by\nCameraStream::process().\n\nNow that the post-processor notifies about the post-processing\ncompletion operation, we can drop the return value of\nCameraStream::process(). The status of post-processing is passed\nto CameraDevice::streamProcessingComplete() by the\nPostProcessor::processComplete slot.\n\nSigned-off-by: Umang Jain <umang.jain@ideasonboard.com>\n---\n src/android/camera_device.cpp | 2 +-\n src/android/camera_stream.cpp | 14 +++++++-------\n src/android/camera_stream.h | 6 +++---\n src/android/jpeg/post_processor_jpeg.cpp | 12 +++++-------\n src/android/jpeg/post_processor_jpeg.h | 6 +++---\n src/android/post_processor.h | 6 +++---\n src/android/yuv/post_processor_yuv.cpp | 14 ++++++--------\n src/android/yuv/post_processor_yuv.h | 6 +++---\n 8 files changed, 31 insertions(+), 35 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 9f26c36d..eba370ea 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1228,7 +1228,7 @@ void CameraDevice::requestComplete(Request *request)\n \t\tif (cameraStream->type() == CameraStream::Type::Internal)\n \t\t\tdescriptor->internalBuffer_ = src;\n \n-\t\tint ret = cameraStream->process(*src, buffer, descriptor);\n+\t\tcameraStream->process(*src, buffer, descriptor);\n \n \t\treturn;\n \t}\ndiff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\nindex d91e7dee..cec07269 100644\n--- a/src/android/camera_stream.cpp\n+++ b/src/android/camera_stream.cpp\n@@ -147,9 +147,9 @@ int CameraStream::waitFence(int fence)\n \treturn -errno;\n }\n \n-int CameraStream::process(const FrameBuffer &source,\n-\t\t\t camera3_stream_buffer_t &camera3Dest,\n-\t\t\t Camera3RequestDescriptor *request)\n+void CameraStream::process(const FrameBuffer &source,\n+\t\t\t camera3_stream_buffer_t &camera3Dest,\n+\t\t\t Camera3RequestDescriptor *request)\n {\n \t/* Handle waiting on fences on the destination buffer. */\n \tint fence = camera3Dest.acquire_fence;\n@@ -160,12 +160,12 @@ int CameraStream::process(const FrameBuffer &source,\n \t\tif (ret < 0) {\n \t\t\tLOG(HAL, Error) << \"Failed waiting for fence: \"\n \t\t\t\t\t<< fence << \": \" << strerror(-ret);\n-\t\t\treturn ret;\n+\t\t\treturn;\n \t\t}\n \t}\n \n \tif (!postProcessor_)\n-\t\treturn 0;\n+\t\treturn;\n \n \t/*\n \t * \\todo Buffer mapping and processing should be moved to a\n@@ -176,10 +176,10 @@ int CameraStream::process(const FrameBuffer &source,\n \t\t\t PROT_READ | PROT_WRITE);\n \tif (!dest.isValid()) {\n \t\tLOG(HAL, Error) << \"Failed to create destination buffer\";\n-\t\treturn -EINVAL;\n+\t\treturn;\n \t}\n \n-\treturn postProcessor_->process(source, &dest, request);\n+\tpostProcessor_->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 04cfd111..a0c5f166 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -120,9 +120,9 @@ public:\n \tlibcamera::Stream *stream() const;\n \n \tint configure();\n-\tint process(const libcamera::FrameBuffer &source,\n-\t\t camera3_stream_buffer_t &camera3Buffer,\n-\t\t Camera3RequestDescriptor *request);\n+\tvoid process(const libcamera::FrameBuffer &source,\n+\t\t camera3_stream_buffer_t &camera3Buffer,\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 81d1efe6..eb87931b 100644\n--- a/src/android/jpeg/post_processor_jpeg.cpp\n+++ b/src/android/jpeg/post_processor_jpeg.cpp\n@@ -97,12 +97,12 @@ void PostProcessorJpeg::generateThumbnail(const FrameBuffer &source,\n \t}\n }\n \n-int PostProcessorJpeg::process(const FrameBuffer &source,\n-\t\t\t CameraBuffer *destination,\n-\t\t\t Camera3RequestDescriptor *request)\n+void PostProcessorJpeg::process(const FrameBuffer &source,\n+\t\t\t\tCameraBuffer *destination,\n+\t\t\t\tCamera3RequestDescriptor *request)\n {\n \tif (!encoder_)\n-\t\treturn 0;\n+\t\treturn;\n \n \tASSERT(destination->numPlanes() == 1);\n \n@@ -198,7 +198,7 @@ int PostProcessorJpeg::process(const FrameBuffer &source,\n \tif (jpeg_size < 0) {\n \t\tLOG(JPEG, Error) << \"Failed to encode stream image\";\n \t\tprocessComplete.emit(request, PostProcessor::Status::Error);\n-\t\treturn jpeg_size;\n+\t\treturn;\n \t}\n \n \t/* Fill in the JPEG blob header. */\n@@ -212,6 +212,4 @@ int PostProcessorJpeg::process(const FrameBuffer &source,\n \t/* Update the JPEG result Metadata. */\n \tresultMetadata->addEntry(ANDROID_JPEG_SIZE, jpeg_size);\n \tprocessComplete.emit(request, PostProcessor::Status::Success);\n-\n-\treturn 0;\n }\ndiff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\nindex 0184d77e..5dab14e1 100644\n--- a/src/android/jpeg/post_processor_jpeg.h\n+++ b/src/android/jpeg/post_processor_jpeg.h\n@@ -22,9 +22,9 @@ public:\n \n \tint configure(const libcamera::StreamConfiguration &incfg,\n \t\t const libcamera::StreamConfiguration &outcfg) override;\n-\tint process(const libcamera::FrameBuffer &source,\n-\t\t CameraBuffer *destination,\n-\t\t Camera3RequestDescriptor *request) override;\n+\tvoid process(const libcamera::FrameBuffer &source,\n+\t\t CameraBuffer *destination,\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 6e67bcba..88a5f985 100644\n--- a/src/android/post_processor.h\n+++ b/src/android/post_processor.h\n@@ -30,9 +30,9 @@ public:\n \n \tvirtual int configure(const libcamera::StreamConfiguration &inCfg,\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 Camera3RequestDescriptor *request) = 0;\n+\tvirtual void process(const libcamera::FrameBuffer &source,\n+\t\t\t CameraBuffer *destination,\n+\t\t\t Camera3RequestDescriptor *request) = 0;\n \n \tlibcamera::Signal<Camera3RequestDescriptor *, Status> processComplete;\n };\ndiff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp\nindex b34b389d..860a1a7f 100644\n--- a/src/android/yuv/post_processor_yuv.cpp\n+++ b/src/android/yuv/post_processor_yuv.cpp\n@@ -51,20 +51,20 @@ int PostProcessorYuv::configure(const StreamConfiguration &inCfg,\n \treturn 0;\n }\n \n-int PostProcessorYuv::process(const FrameBuffer &source,\n-\t\t\t CameraBuffer *destination,\n-\t\t\t Camera3RequestDescriptor *request)\n+void PostProcessorYuv::process(const FrameBuffer &source,\n+\t\t\t CameraBuffer *destination,\n+\t\t\t Camera3RequestDescriptor *request)\n {\n \tif (!isValidBuffers(source, *destination)) {\n \t\tprocessComplete.emit(request, PostProcessor::Status::Error);\n-\t\treturn -EINVAL;\n+\t\treturn;\n \t}\n \n \tconst MappedFrameBuffer sourceMapped(&source, MappedFrameBuffer::MapFlag::Read);\n \tif (!sourceMapped.isValid()) {\n \t\tLOG(YUV, Error) << \"Failed to mmap camera frame buffer\";\n \t\tprocessComplete.emit(request, PostProcessor::Status::Error);\n-\t\treturn -EINVAL;\n+\t\treturn;\n \t}\n \n \tint ret = libyuv::NV12Scale(sourceMapped.planes()[0].data(),\n@@ -82,12 +82,10 @@ int PostProcessorYuv::process(const FrameBuffer &source,\n \tif (ret) {\n \t\tLOG(YUV, Error) << \"Failed NV12 scaling: \" << ret;\n \t\tprocessComplete.emit(request, PostProcessor::Status::Error);\n-\t\treturn -EINVAL;\n+\t\treturn;\n \t}\n \n \tprocessComplete.emit(request, PostProcessor::Status::Success);\n-\n-\treturn 0;\n }\n \n bool PostProcessorYuv::isValidBuffers(const FrameBuffer &source,\ndiff --git a/src/android/yuv/post_processor_yuv.h b/src/android/yuv/post_processor_yuv.h\nindex a4e0ff5d..1278843b 100644\n--- a/src/android/yuv/post_processor_yuv.h\n+++ b/src/android/yuv/post_processor_yuv.h\n@@ -18,9 +18,9 @@ public:\n \n \tint configure(const libcamera::StreamConfiguration &incfg,\n \t\t const libcamera::StreamConfiguration &outcfg) override;\n-\tint process(const libcamera::FrameBuffer &source,\n-\t\t CameraBuffer *destination,\n-\t\t Camera3RequestDescriptor *request) override;\n+\tvoid process(const libcamera::FrameBuffer &source,\n+\t\t CameraBuffer *destination,\n+\t\t Camera3RequestDescriptor *request) override;\n \n private:\n \tbool isValidBuffers(const libcamera::FrameBuffer &source,\n", "prefixes": [ "libcamera-devel", "v4", "4/7" ] }