Patch Detail
Show a patch.
GET /api/1.1/patches/13872/?format=api
{ "id": 13872, "url": "https://patchwork.libcamera.org/api/1.1/patches/13872/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13872/", "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": "<20210920173752.1346190-9-umang.jain@ideasonboard.com>", "date": "2021-09-20T17:37:50", "name": "[libcamera-devel,v3,08/10] android: camera_stream: Drop return value for process()", "commit_ref": null, "pull_url": null, "state": "rfc", "archived": false, "hash": "a59f1950308cf0fad3b357584d4ce785f8417558", "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/13872/mbox/", "series": [ { "id": 2539, "url": "https://patchwork.libcamera.org/api/1.1/series/2539/?format=api", "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/13872/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13872/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 A4F97BF01C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 20 Sep 2021 17:38:18 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6BCCD6919A;\n\tMon, 20 Sep 2021 19:38:18 +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 B2C436918A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 20 Sep 2021 19:38:16 +0200 (CEST)", "from perceval.ideasonboard.com (unknown [103.251.226.144])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B39CE45E;\n\tMon, 20 Sep 2021 19:38:15 +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=\"WjTd72QG\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1632159496;\n\tbh=NodJbV49AofcC4UIUTM3F8u44WF85VPPDRG5zjG7GA4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=WjTd72QGDgWqnGt9jQvwSkO+VqhfAGHJo4mM+tbTWztxiKKYng/2aTC6o1lbJEYUZ\n\tqozoWN6JvBJ852CbrOH778EuY+9cirbmOam1SeASl4cGRwjFEzkvVYIyL/yX1aW8nl\n\tpeaM5KF/iMpU7H2QdlfZuxbaIqxPfQ0JvnLXZ+HY=", "From": "Umang Jain <umang.jain@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 20 Sep 2021 23:07:50 +0530", "Message-Id": "<20210920173752.1346190-9-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 08/10] 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 and sets the ProcessStatus on the\nCamera3RequestDescriptor passed to it, we can drop the return value of\nCameraStream::process() in favour of reading the process status set on\nthe descriptor in the PostProcessor::processComplete's slot.\n\nSigned-off-by: Umang Jain <umang.jain@ideasonboard.com>\n---\n src/android/camera_device.cpp | 26 +++++++++++++-----------\n src/android/camera_stream.cpp | 12 +++++------\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, 43 insertions(+), 45 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex e2de4012..4658e881 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1158,7 +1158,7 @@ void CameraDevice::requestComplete(Request *request)\n \n \t\tdescriptor->status_ = Camera3RequestDescriptor::ProcessStatus::Processing;\n \n-\t\tint ret = cameraStream->process(src, *buffer.buffer, descriptor);\n+\t\tcameraStream->process(src, *buffer.buffer, descriptor);\n \n \t\t/*\n \t\t * Return the FrameBuffer to the CameraStream now that we're\n@@ -1166,12 +1166,6 @@ void CameraDevice::requestComplete(Request *request)\n \t\t */\n \t\tif (cameraStream->type() == CameraStream::Type::Internal)\n \t\t\tcameraStream->putBuffer(src);\n-\n-\t\tif (ret) {\n-\t\t\tbuffer.status = CAMERA3_BUFFER_STATUS_ERROR;\n-\t\t\tnotifyError(descriptor->frameNumber_, buffer.stream,\n-\t\t\t\t CAMERA3_MSG_ERROR_BUFFER);\n-\t\t}\n \t}\n \n \tcaptureResult.result = descriptor->resultMetadata_->get();\n@@ -1182,12 +1176,20 @@ void CameraDevice::requestComplete(Request *request)\n \n \n void CameraDevice::streamProcessingComplete([[maybe_unused]] CameraStream *cameraStream,\n-\t\t\t\t\t [[maybe_unused]] Camera3RequestDescriptor *request)\n+\t\t\t\t\t Camera3RequestDescriptor *request)\n {\n-\t/*\n-\t * \\todo Stream processing is completed hence, check for errors and\n-\t * if any, mark the corresponding buffer with CAMERA3_BUFFER_STATUS_ERROR.\n-\t */\n+\tif (request->status_ == Camera3RequestDescriptor::ProcessStatus::Error) {\n+\t\tfor (camera3_stream_buffer_t &buffer : request->buffers_) {\n+\t\t\tCameraStream *cs = static_cast<CameraStream *>(buffer.stream->priv);\n+\n+\t\t\tif (cs->camera3Stream().format != HAL_PIXEL_FORMAT_BLOB)\n+\t\t\t\tcontinue;\n+\n+\t\t\tbuffer.status = CAMERA3_BUFFER_STATUS_ERROR;\n+\t\t\tnotifyError(request->frameNumber_, buffer.stream,\n+\t\t\t\t CAMERA3_MSG_ERROR_BUFFER);\n+\t\t}\n+\t}\n }\n \n std::string CameraDevice::logPrefix() const\ndiff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\nindex 70471959..c18c7041 100644\n--- a/src/android/camera_stream.cpp\n+++ b/src/android/camera_stream.cpp\n@@ -101,14 +101,14 @@ int CameraStream::configure()\n \treturn 0;\n }\n \n-int CameraStream::process(const FrameBuffer *source,\n-\t\t\t buffer_handle_t camera3Dest,\n-\t\t\t Camera3RequestDescriptor *request)\n+void CameraStream::process(const FrameBuffer *source,\n+\t\t\t buffer_handle_t camera3Dest,\n+\t\t\t Camera3RequestDescriptor *request)\n {\n \tif (!postProcessor_) {\n \t\trequest->status_ = Camera3RequestDescriptor::ProcessStatus::Error;\n \t\thandleProcessComplete(request);\n-\t\treturn 0;\n+\t\treturn;\n \t}\n \n \t/*\n@@ -122,10 +122,10 @@ int CameraStream::process(const FrameBuffer *source,\n \t\tLOG(HAL, Error) << \"Failed to map android blob buffer\";\n \t\trequest->status_ = Camera3RequestDescriptor::ProcessStatus::Error;\n \t\thandleProcessComplete(request);\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 void CameraStream::handleProcessComplete(Camera3RequestDescriptor *request)\ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nindex f8ad6245..d4ec5c25 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 buffer_handle_t camera3Dest,\n-\t\t Camera3RequestDescriptor *request);\n+\tvoid process(const libcamera::FrameBuffer *source,\n+\t\t buffer_handle_t camera3Dest,\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 87252acd..19eb7983 100644\n--- a/src/android/jpeg/post_processor_jpeg.cpp\n+++ b/src/android/jpeg/post_processor_jpeg.cpp\n@@ -97,14 +97,14 @@ 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\trequest->status_ = Camera3RequestDescriptor::ProcessStatus::Error;\n \t\tprocessComplete.emit(request);\n-\t\treturn 0;\n+\t\treturn;\n \t}\n \n \tASSERT(destination->numPlanes() == 1);\n@@ -202,7 +202,7 @@ int PostProcessorJpeg::process(const FrameBuffer *source,\n \t\tLOG(JPEG, Error) << \"Failed to encode stream image\";\n \t\trequest->status_ = Camera3RequestDescriptor::ProcessStatus::Error;\n \t\tprocessComplete.emit(request);\n-\t\treturn jpeg_size;\n+\t\treturn;\n \t}\n \n \t/* Fill in the JPEG blob header. */\n@@ -218,6 +218,4 @@ int PostProcessorJpeg::process(const FrameBuffer *source,\n \n \trequest->status_ = Camera3RequestDescriptor::ProcessStatus::Success;\n \tprocessComplete.emit(request);\n-\n-\treturn 0;\n }\ndiff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\nindex d49c8d2b..e9938919 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 f639b237..48ddd8ac 100644\n--- a/src/android/post_processor.h\n+++ b/src/android/post_processor.h\n@@ -25,9 +25,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 *> processComplete;\n };\ndiff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp\nindex b144649a..09838aa5 100644\n--- a/src/android/yuv/post_processor_yuv.cpp\n+++ b/src/android/yuv/post_processor_yuv.cpp\n@@ -51,14 +51,14 @@ 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\trequest->status_ = Camera3RequestDescriptor::ProcessStatus::Error;\n \t\tprocessComplete.emit(request);\n-\t\treturn -EINVAL;\n+\t\treturn;\n \t}\n \n \tconst MappedFrameBuffer sourceMapped(source, MappedFrameBuffer::MapFlag::Read);\n@@ -66,7 +66,7 @@ int PostProcessorYuv::process(const FrameBuffer *source,\n \t\tLOG(YUV, Error) << \"Failed to mmap camera frame buffer\";\n \t\trequest->status_ = Camera3RequestDescriptor::ProcessStatus::Error;\n \t\tprocessComplete.emit(request);\n-\t\treturn -EINVAL;\n+\t\treturn;\n \t}\n \n \tint ret = libyuv::NV12Scale(sourceMapped.planes()[0].data(),\n@@ -85,13 +85,11 @@ int PostProcessorYuv::process(const FrameBuffer *source,\n \t\tLOG(YUV, Error) << \"Failed NV12 scaling: \" << ret;\n \t\trequest->status_ = Camera3RequestDescriptor::ProcessStatus::Error;\n \t\tprocessComplete.emit(request);\n-\t\treturn -EINVAL;\n+\t\treturn;\n \t}\n \n \trequest->status_ = Camera3RequestDescriptor::ProcessStatus::Success;\n \tprocessComplete.emit(request);\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 eddd1086..32e5b60d 100644\n--- a/src/android/yuv/post_processor_yuv.h\n+++ b/src/android/yuv/post_processor_yuv.h\n@@ -20,9 +20,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 *context) override;\n+\tvoid process(const libcamera::FrameBuffer *source,\n+\t\t CameraBuffer *destination,\n+\t\t Camera3RequestDescriptor *context) override;\n \n private:\n \tbool isValidBuffers(const libcamera::FrameBuffer *source,\n", "prefixes": [ "libcamera-devel", "v3", "08/10" ] }