Patch Detail
Show a patch.
GET /api/1.1/patches/13378/?format=api
{ "id": 13378, "url": "https://patchwork.libcamera.org/api/1.1/patches/13378/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13378/", "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": "<tencent_EFAACFAD922F4A0346DA0B94B3F318288506@qq.com>", "date": "2021-08-17T15:42:00", "name": "[libcamera-devel,RFC,v3,1/4] pipeline: isp: The software ISP-based pipeline handler", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "7be99c3e9ca75b8fdde596b05d148baf6e3fbf01", "submitter": { "id": 88, "url": "https://patchwork.libcamera.org/api/1.1/people/88/?format=api", "name": "Siyuan Fan", "email": "siyuan.fan@foxmail.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/13378/mbox/", "series": [ { "id": 2365, "url": "https://patchwork.libcamera.org/api/1.1/series/2365/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2365", "date": "2021-08-17T15:41:39", "name": "pipeline: isp: The software ISP module", "version": 3, "mbox": "https://patchwork.libcamera.org/series/2365/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13378/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13378/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 15E73BD87C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 17 Aug 2021 15:42:08 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D49C3688A2;\n\tTue, 17 Aug 2021 17:42:07 +0200 (CEST)", "from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com\n\t[162.62.57.252])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4F2EF6025C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 17 Aug 2021 17:42:06 +0200 (CEST)", "from localhost.localdomain ([123.126.82.10])\n\tby newxmesmtplogicsvrszc7.qq.com (NewEsmtp) with SMTP\n\tid A81A1CD5; Tue, 17 Aug 2021 23:42:01 +0800" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=foxmail.com header.i=@foxmail.com\n\theader.b=\"yyFK77i+\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com;\n\ts=s201512; t=1629214923;\n\tbh=DWtivy05nTGHyPkjDPkoKhqut1dksWt2RYr8riNC19A=;\n\th=From:To:Cc:Subject:Date;\n\tb=yyFK77i+SNcK4zG9otTxNA0+6hzN+2t7xCCydxVKHnHRbf/a3m78przcju8dEbI2b\n\t7wqPtfe9rqdMnVotro9cIFTo4t+L8LaKz/QD53IjB/hbCOT7BCgi7qCmNP3tJT2yfn\n\tgKj63l/0czIXtBtC+CInU8AlUen4XyiCEfcK7B3k=", "X-QQ-mid": "xmsmtpt1629214921t6h6x25w3", "Message-ID": "<tencent_EFAACFAD922F4A0346DA0B94B3F318288506@qq.com>", "X-QQ-XMAILINFO": "MDlC9u6qHHGcke0xx4Xm5HXv3CpktQWDq0h7nNaW6gC1Is3s/WiCDZmC5VFdOx\n\td9LNvTgBo/BnXHuH0Dg3bJdWJRmhOXAdNpGAhoCypNvcgW0GBz4Om6kIxydXva3W8wVhmXhOqKsb\n\tLCDMBJipssz1xWarUfbvOiMiPkvjfA1LifenESD6/JztePOG47yrc9s/nWG88Byl9wOJ/HP4WncB\n\trM13bSWDPaYvhjK2Z06K8hO83r99UCD4plZbbZKpe/XVEs8tV1QxlygL8pBPooUSHpwXCL6nPyLn\n\tysDiJp5ZohcEn9gmOHp0mRKmhCaReFJNu1yYSx4VyxwZpxh1CIYWwCG6HJRrRZJSmwGLLJVPblCk\n\tbZJYlO7VtjGFhT3otbZ4NjzxpXuZnRIvXQ65fh/cVcqDXke6tZx3q4rtnfEffaR2mG2MNT8WGcis\n\tREOajfGFSTLZ6gzQ+8U+HTPUg7afsvvf2EY/LV2I+oPXPiskp7vXo/yfqIUwmL2ZqAKfJ9Qc9eRw\n\t9/nCXmN+j2zmX3U/S70QV+ioEbd0fIE6g+XjxviJgOcIrCOMr7NLvnUotGg6ST1UriCpySQGkMiU\n\tBtWh1H2FDWMOMedP98VlFtFvfsHraiIkt8kZjTEI4U8AXUNnZUqkf29JLZ829HA4qJbf7JNIrurw\n\tAPorP2piBpCkDeEd2SJEnvtGiAjdJ1GwTqnTz2qclXN77PcegvrfNL3n4XTpwAPZ5/Sor0NPAxgm\n\tqIr7pyiXDs/amTtzvPTUc8fDv88Mqms4DtcXeGQt76UdYgRyHSvMwV80fVX1/qFo+T0VIto0ruTL\n\tRRpD+lwwJudCeEWGiGPUsSN9igO8QEXpPcaW+G2NOD6WoUvEpzs3mym7PihW0d/hPJi/wSiQe/jU\n\tI2f4KOpk4WU+lIzl+C9gI0rK+bzMmir0IN2uISCF7IVwCBdi1gy7OUTha1CgadbqRaQ9y8OQkF9G\n\t3XU/UwAO+GOuQPHa6A3Z7jxU9bGS+peRYknu5//G/g1qR6AdjC9HqrKlkLDItHdWqa0xLS7ywI1I\n\tvGRJN+Ug==", "From": "Siyuan Fan <siyuan.fan@foxmail.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 17 Aug 2021 16:42:00 +0100", "X-OQ-MSGID": "<20210817154200.6763-1-siyuan.fan@foxmail.com>", "X-Mailer": "git-send-email 2.20.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [RFC PATCH v3 1/4] pipeline: isp: The software\n\tISP-based pipeline handler", "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": "From: Fan Siyuan <siyuan.fan@foxmail.com>\n\nUsing the output format supported by ISP initializes StreamFormats. In\nvalidate(), if the request format is not supported, adjust format to RGB888.\n\nSigned-off-by: Fan Siyuan <siyuan.fan@foxmail.com>\n---\n src/libcamera/pipeline/isp/isp.cpp | 315 +++++++++++++++++++++++++++++\n 1 file changed, 315 insertions(+)\n create mode 100644 src/libcamera/pipeline/isp/isp.cpp", "diff": "diff --git a/src/libcamera/pipeline/isp/isp.cpp b/src/libcamera/pipeline/isp/isp.cpp\nnew file mode 100644\nindex 00000000..49f55ddb\n--- /dev/null\n+++ b/src/libcamera/pipeline/isp/isp.cpp\n@@ -0,0 +1,315 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2021, Siyuan Fan <siyuan.fan@foxmail.com>\n+ *\n+ * isp.cpp - The software ISP-based pipeline handler\n+ */\n+\n+#include \"../../swisp/isp.h\"\n+\n+#include <math.h>\n+#include <queue>\n+#include <stdlib.h>\n+#include <sys/mman.h>\n+#include <unistd.h>\n+\n+#include <libcamera/camera.h>\n+#include <libcamera/control_ids.h>\n+#include <libcamera/controls.h>\n+#include <libcamera/formats.h>\n+\n+#include \"libcamera/internal/device_enumerator.h\"\n+#include \"libcamera/internal/media_device.h\"\n+#include \"libcamera/internal/pipeline_handler.h\"\n+#include \"libcamera/internal/v4l2_videodevice.h\"\n+\n+namespace libcamera {\n+\n+LOG_DEFINE_CATEGORY(ISP)\n+\n+class ISPCameraData : public CameraData\n+{\n+public:\n+ ISPCameraData(PipelineHandler *pipe, MediaDevice *media)\n+ : CameraData(pipe), media_(media), video_(nullptr)\n+ {\n+ }\n+\n+ ~ISPCameraData()\n+ {\n+ delete video_;\n+ }\n+\n+ int init();\n+ void bufferReady(FrameBuffer *buffer);\n+ void ISPCompleted(FrameBuffer *rawbuffer, FrameBuffer *rgbBuffer);\n+\n+ Stream stream_;\n+ ISPCPU isp_;\n+ int width_;\n+ int height_;\n+\n+ std::vector<std::unique_ptr<FrameBuffer>> rawBuffers_;\n+ std::queue<FrameBuffer *> rawBufferQueue_;\n+ std::queue<FrameBuffer *> rgbBufferQueue_;\n+\n+ MediaDevice *media_;\n+ V4L2VideoDevice *video_;\n+};\n+\n+\n+class ISPCameraConfiguration : public CameraConfiguration\n+{\n+public:\n+ ISPCameraConfiguration();\n+\n+ Status validate() override;\n+};\n+\n+class PipelineHandlerISP : public PipelineHandler\n+{\n+public:\n+ PipelineHandlerISP(CameraManager *manager);\n+\n+ CameraConfiguration *generateConfiguration(Camera *camera,\n+ const StreamRoles &roles) override;\n+ int configure(Camera *camera, CameraConfiguration *config) override;\n+\n+ int exportFrameBuffers(Camera *camera, Stream *stream,\n+ std::vector<std::unique_ptr<FrameBuffer>> *buffers) override;\n+\n+ int start(Camera *camera, const ControlList *controls) override;\n+ void stop(Camera *camera) override;\n+\n+ int queueRequestDevice(Camera *camera, Request *request) override;\n+\n+ bool match(DeviceEnumerator *enumerator) override;\n+\n+private:\n+ ISPCameraData *cameraData(const Camera *camera)\n+ {\n+ return static_cast<ISPCameraData *>(\n+ PipelineHandler::cameraData(camera));\n+ }\n+};\n+\n+ISPCameraConfiguration::ISPCameraConfiguration()\n+ : CameraConfiguration()\n+{\n+}\n+\n+CameraConfiguration::Status ISPCameraConfiguration::validate()\n+{\n+ Status status = Valid;\n+\n+ if (config_.empty())\n+ return Invalid;\n+\n+ if (config_.size() > 1) {\n+ config_.resize(1);\n+ status = Adjusted;\n+ }\n+\n+ StreamConfiguration &cfg = config_[0];\n+ const std::vector<libcamera::PixelFormat> formats = cfg.formats().pixelformats();\n+ if (std::find(formats.begin(), formats.end(), cfg.pixelFormat) == formats.end()) {\n+ cfg.pixelFormat = cfg.formats().pixelformats()[0];\n+ LOG(ISP, Debug) << \"Adjusting format to\" << cfg.pixelFormat.toString();\n+ status = Adjusted;\n+ }\n+\n+ cfg.bufferCount = 4;\n+\n+ return status;\n+}\n+\n+PipelineHandlerISP::PipelineHandlerISP(CameraManager *manager)\n+ : PipelineHandler(manager)\n+{\n+}\n+\n+CameraConfiguration *PipelineHandlerISP::generateConfiguration(Camera *camera,\n+ const StreamRoles &roles)\n+{\n+ ISPCameraData *data = cameraData(camera);\n+ CameraConfiguration *config = new ISPCameraConfiguration();\n+\n+ if (roles.empty())\n+ return config;\n+\n+ std::map<PixelFormat, std::vector<SizeRange>> ispFormat;\n+ ispFormat = data->isp_.pixelFormatConfiguration();\n+ StreamFormats formats(ispFormat);\n+ StreamConfiguration cfg(formats);\n+\n+ cfg.pixelFormat = formats::RGB888;\n+ cfg.size = { 640, 480 };\n+ cfg.bufferCount = 4;\n+\n+ config->addConfiguration(cfg);\n+\n+ config->validate();\n+\n+ data->isp_.outputpixelformat = data->isp_.getOutputPixelFormat(config->at(0).pixelFormat); ;\n+\n+ return config;\n+}\n+\n+int PipelineHandlerISP::configure(Camera *camera, CameraConfiguration *config)\n+{\n+ ISPCameraData *data = cameraData(camera);\n+ StreamConfiguration &cfg = config->at(0);\n+\n+ PixelFormat bayerFormat = formats::SBGGR10;\n+ V4L2DeviceFormat format = {};\n+ format.fourcc = data->video_->toV4L2PixelFormat(bayerFormat);;\n+ format.size = {640, 480};\n+\n+ data->width_ = format.size.width;\n+ data->height_ = format.size.height;\n+\n+ int ret = data->video_->setFormat(&format);\n+ if (ret)\n+ return ret;\n+\n+ cfg.setStream(&data->stream_);\n+ cfg.stride = format.planes[0].bpl;\n+\n+ return 0;\n+}\n+\n+int PipelineHandlerISP::exportFrameBuffers(Camera *camera, Stream *stream,\n+ std::vector<std::unique_ptr<FrameBuffer>> *buffers)\n+{\n+ unsigned int count = stream->configuration().bufferCount;\n+ ISPCameraData *data = cameraData(camera);\n+\n+ count = data->isp_.exportBuffers(buffers, count, data->width_, data->height_);\n+\n+ return count; \n+\n+}\n+\n+int PipelineHandlerISP::start(Camera *camera, [[maybe_unused]] const ControlList *controls)\n+{\n+ ISPCameraData *data = cameraData(camera);\n+ unsigned int count = data->stream_.configuration().bufferCount;\n+\n+ int ret = data->video_->allocateBuffers(count, &data->rawBuffers_);\n+ if (ret < 0) {\n+ LOG(ISP, Error) << strerror(-ret);\n+ return ret;\n+ }\n+\n+ for (unsigned int i = 0; i < count; i++) {\n+ data->rawBufferQueue_.push(data->rawBuffers_[i].get());\n+ }\n+ \n+\n+ ret = data->video_->streamOn();\n+ if (ret < 0) {\n+ data->video_->releaseBuffers();\n+ return ret;\n+ }\n+\n+ data->isp_.startThreadISP();\n+\n+ return 0;\n+}\n+\n+void PipelineHandlerISP::stop(Camera *camera)\n+{\n+ ISPCameraData *data = cameraData(camera);\n+\n+ if (!(data->rawBuffers_.empty())) {\n+ data->rawBuffers_.clear();\n+ }\n+\n+ data->isp_.stopThreadISP();\n+\n+ data->video_->streamOff();\n+ data->video_->releaseBuffers();\n+}\n+\n+int PipelineHandlerISP::queueRequestDevice(Camera *camera, Request *request)\n+{\n+ ISPCameraData *data = cameraData(camera);\n+ FrameBuffer *rgbBuffer = request->findBuffer(&data->stream_); \n+ if (!rgbBuffer) {\n+ LOG(ISP, Error) << \"Attempt to queue request with invalid stream\";\n+ return -ENOENT;\n+ }\n+ data->rgbBufferQueue_.push(rgbBuffer);\n+\n+ FrameBuffer *buffer = data->rawBufferQueue_.front();\n+ int ret = data->video_->queueBuffer(buffer);\n+ if (ret < 0) {\n+ LOG(ISP, Error) << \"Queue raw buffer error\";\n+ return ret;\n+ }\n+ data->rawBufferQueue_.pop();\n+\n+ return 0;\n+}\n+\n+bool PipelineHandlerISP::match(DeviceEnumerator *enumerator)\n+{\n+ DeviceMatch unicam(\"unicam\");\n+\n+ unicam.add(\"unicam-embedded\");\n+ unicam.add(\"unicam-image\");\n+\n+ MediaDevice *unicam_ = acquireMediaDevice(enumerator, unicam);\n+ if (!unicam_) {\n+ LOG(ISP, Debug) << \"unicam Device not found\";\n+ return false;\n+ }\n+\n+ LOG(ISP, Debug) << \"unicam Device Identified\";\n+\n+ std::unique_ptr<ISPCameraData> data = std::make_unique<ISPCameraData>(this, unicam_);\n+\n+ if(data->init()) return false;\n+\n+ std::set<Stream *> streams{&data->stream_};\n+ std::shared_ptr<Camera> camera = Camera::create(this, data->video_->deviceName(), streams);\n+ registerCamera(std::move(camera), std::move(data));\n+\n+ return true;\n+}\n+\n+\n+void ISPCameraData::ISPCompleted(FrameBuffer *rawBuffer, FrameBuffer *rgbBuffer)\n+{\n+ Request *request = rgbBuffer->request();\n+\n+ rawBufferQueue_.push(rawBuffer);\n+\n+ pipe_->completeBuffer(request, rgbBuffer);\n+ pipe_->completeRequest(request);\n+\n+}\n+\n+void ISPCameraData::bufferReady(FrameBuffer *buffer)\n+{\n+ FrameBuffer *rgbBuffer = rgbBufferQueue_.front();\n+ isp_.invokeMethod(&ISPCPU::processing, ConnectionTypeQueued, buffer, rgbBuffer, width_, height_);\n+ rgbBufferQueue_.pop();\n+ \n+}\n+\n+int ISPCameraData::init()\n+{\n+ video_ = new V4L2VideoDevice(media_->getEntityByName(\"unicam-image\"));\n+ if (video_->open())\n+ return -ENODEV;\n+\n+ video_->bufferReady.connect(this, &ISPCameraData::bufferReady);\n+ isp_.ispCompleted.connect(this, &ISPCameraData::ISPCompleted);\n+\n+ return 0;\n+}\n+\n+REGISTER_PIPELINE_HANDLER(PipelineHandlerISP)\n+\n+} /* namespace libcamera */\n", "prefixes": [ "libcamera-devel", "RFC", "v3", "1/4" ] }