Patch Detail
Show a patch.
GET /api/1.1/patches/1805/?format=api
{ "id": 1805, "url": "https://patchwork.libcamera.org/api/1.1/patches/1805/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1805/", "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": "<20190813094020.10277-7-kieran.bingham@ideasonboard.com>", "date": "2019-08-13T09:40:20", "name": "[libcamera-devel,v3,6/6,PoC/RFC] libcamera: pipeline: Add RaspberryPi handler", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "1089335819b0440ccab22304acb20045303a454e", "submitter": { "id": 4, "url": "https://patchwork.libcamera.org/api/1.1/people/4/?format=api", "name": "Kieran Bingham", "email": "kieran.bingham@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1805/mbox/", "series": [ { "id": 458, "url": "https://patchwork.libcamera.org/api/1.1/series/458/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=458", "date": "2019-08-13T09:40:14", "name": "V4L2 M2M Support (+RPi PoC)", "version": 3, "mbox": "https://patchwork.libcamera.org/series/458/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1805/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1805/checks/", "tags": {}, "headers": { "Return-Path": "<kieran.bingham@ideasonboard.com>", "Received": [ "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 0A69E6162D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 13 Aug 2019 11:40:27 +0200 (CEST)", "from localhost.localdomain\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6AF4130F;\n\tTue, 13 Aug 2019 11:40:26 +0200 (CEST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1565689226;\n\tbh=Ix8dnqJYhKVuHRIDeXvP0HFhRVUfJ4/thXTwmeu5bHI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=GcW4aQlgrDv3oqCgnPve+FyGaXRA7eFUjnfNofIYk/CMANJRW7pZijG+KPcIlH10B\n\tq9gGkfVXlVRgHKgcF1sT9AvCvdxNd46P/DVm2pCSYNpIeZzPW5wz9iQ8E93OdrxJU0\n\tU30n09muaFo+TEseagxBxwI7ZU7N1/yqI9WSa42M=", "From": "Kieran Bingham <kieran.bingham@ideasonboard.com>", "To": "LibCamera Devel <libcamera-devel@lists.libcamera.org>", "Date": "Tue, 13 Aug 2019 10:40:20 +0100", "Message-Id": "<20190813094020.10277-7-kieran.bingham@ideasonboard.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190813094020.10277-1-kieran.bingham@ideasonboard.com>", "References": "<20190813094020.10277-1-kieran.bingham@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 6/6] [PoC/RFC] libcamera: pipeline: Add\n\tRaspberryPi handler", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "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>", "X-List-Received-Date": "Tue, 13 Aug 2019 09:40:27 -0000" }, "content": "Utilise the CameraSensor class and construct a pipeline for a single\nsensor on the Unicam, routed through the V4L2 Codec ISP interface.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n src/libcamera/pipeline/meson.build | 1 +\n src/libcamera/pipeline/raspberrypi.cpp | 453 +++++++++++++++++++++++++\n 2 files changed, 454 insertions(+)\n create mode 100644 src/libcamera/pipeline/raspberrypi.cpp", "diff": "diff --git a/src/libcamera/pipeline/meson.build b/src/libcamera/pipeline/meson.build\nindex 0d466225a72e..7ed7b26f3033 100644\n--- a/src/libcamera/pipeline/meson.build\n+++ b/src/libcamera/pipeline/meson.build\n@@ -1,4 +1,5 @@\n libcamera_sources += files([\n+ 'raspberrypi.cpp',\n 'uvcvideo.cpp',\n 'vimc.cpp',\n ])\ndiff --git a/src/libcamera/pipeline/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi.cpp\nnew file mode 100644\nindex 000000000000..d11b78df2e03\n--- /dev/null\n+++ b/src/libcamera/pipeline/raspberrypi.cpp\n@@ -0,0 +1,453 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * raspberrypi.cpp - Pipeline handler for Raspberry Pi devices\n+ */\n+\n+#include <libcamera/camera.h>\n+#include <libcamera/request.h>\n+#include <libcamera/stream.h>\n+\n+#include \"camera_sensor.h\"\n+#include \"device_enumerator.h\"\n+#include \"log.h\"\n+#include \"media_device.h\"\n+#include \"pipeline_handler.h\"\n+#include \"utils.h\"\n+#include \"v4l2_controls.h\"\n+#include \"v4l2_videodevice.h\"\n+\n+namespace libcamera {\n+\n+LOG_DEFINE_CATEGORY(RPI)\n+\n+class RPiCameraData : public CameraData\n+{\n+public:\n+\tRPiCameraData(PipelineHandler *pipe)\n+\t\t: CameraData(pipe), sensor_(nullptr), unicam_(nullptr),\n+\t\t isp_(nullptr)\n+\t{\n+\t}\n+\n+\t~RPiCameraData()\n+\t{\n+\t\tbayerBuffers_.destroyBuffers();\n+\t\tdelete sensor_;\n+\t\tdelete unicam_;\n+\t\tdelete isp_;\n+\t}\n+\n+\tvoid sensorReady(Buffer *buffer);\n+\tvoid ispOutputReady(Buffer *buffer);\n+\tvoid ispCaptureReady(Buffer *buffer);\n+\n+\tCameraSensor *sensor_;\n+\tV4L2VideoDevice *unicam_;\n+\tV4L2M2MDevice *isp_;\n+\tStream stream_;\n+\n+\tBufferPool bayerBuffers_;\n+\tstd::vector<std::unique_ptr<Buffer>> rawBuffers_;\n+};\n+\n+class RPiCameraConfiguration : public CameraConfiguration\n+{\n+public:\n+\tRPiCameraConfiguration();\n+\n+\tStatus validate() override;\n+};\n+\n+class PipelineHandlerRPi : public PipelineHandler\n+{\n+public:\n+\tPipelineHandlerRPi(CameraManager *manager);\n+\t~PipelineHandlerRPi();\n+\n+\tCameraConfiguration *\n+\tgenerateConfiguration(Camera *camera,\n+\t\t\t const StreamRoles &roles) override;\n+\tint configure(Camera *camera,\n+\t\t CameraConfiguration *config) override;\n+\n+\tint allocateBuffers(Camera *camera,\n+\t\t\t const std::set<Stream *> &streams) override;\n+\tint freeBuffers(Camera *camera,\n+\t\t\tconst std::set<Stream *> &streams) override;\n+\n+\tint start(Camera *camera) override;\n+\tvoid stop(Camera *camera) override;\n+\n+\tint queueRequest(Camera *camera, Request *request) override;\n+\n+\tbool match(DeviceEnumerator *enumerator) override;\n+\n+private:\n+\tRPiCameraData *cameraData(const Camera *camera)\n+\t{\n+\t\treturn static_cast<RPiCameraData *>(\n+\t\t\tPipelineHandler::cameraData(camera));\n+\t}\n+\n+\tstd::shared_ptr<MediaDevice> unicam_;\n+\tstd::shared_ptr<MediaDevice> codec_;\n+};\n+\n+RPiCameraConfiguration::RPiCameraConfiguration()\n+\t: CameraConfiguration()\n+{\n+}\n+\n+CameraConfiguration::Status RPiCameraConfiguration::validate()\n+{\n+\tStatus status = Valid;\n+\n+\tif (config_.empty())\n+\t\treturn Invalid;\n+\n+\t/* todo: Experiment with increased stream support through the ISP. */\n+\tif (config_.size() > 1) {\n+\t\tconfig_.resize(1);\n+\t\tstatus = Adjusted;\n+\t}\n+\n+\tStreamConfiguration &cfg = config_[0];\n+\n+\t/* todo: restrict to hardware capabilities. */\n+\n+\tcfg.bufferCount = 4;\n+\n+\treturn status;\n+}\n+\n+PipelineHandlerRPi::PipelineHandlerRPi(CameraManager *manager)\n+\t: PipelineHandler(manager), unicam_(nullptr), codec_(nullptr)\n+{\n+}\n+\n+PipelineHandlerRPi::~PipelineHandlerRPi()\n+{\n+\tif (unicam_)\n+\t\tunicam_->release();\n+\n+\tif (codec_)\n+\t\tcodec_->release();\n+}\n+\n+CameraConfiguration *\n+PipelineHandlerRPi::generateConfiguration(Camera *camera,\n+\t\t\t\t\t const StreamRoles &roles)\n+{\n+\tCameraConfiguration *config = new RPiCameraConfiguration();\n+\tRPiCameraData *data = cameraData(camera);\n+\n+\tif (roles.empty())\n+\t\treturn config;\n+\n+\tStreamConfiguration cfg{};\n+\tcfg.pixelFormat = V4L2_PIX_FMT_YUYV;\n+\tcfg.size = { 1920, 1080 };\n+\n+\tLOG(RPI, Debug) << \"Sensor Resolution is: \" << data->sensor_->resolution().toString();\n+\n+\tcfg.bufferCount = 4;\n+\n+\tconfig->addConfiguration(cfg);\n+\n+\tconfig->validate();\n+\n+\treturn config;\n+}\n+\n+int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n+{\n+\tRPiCameraData *data = cameraData(camera);\n+\tStreamConfiguration &cfg = config->at(0);\n+\tint ret;\n+\n+\tSize sensorSize = { 1920, 1080 };\n+\tSize outputSize = { 1920, 1088 };\n+\n+\tV4L2DeviceFormat format = {};\n+\tformat.size = sensorSize;\n+\tformat.fourcc = V4L2_PIX_FMT_SRGGB10P;\n+\n+\tLOG(RPI, Debug) << \"Setting format to \" << format.toString();\n+\n+\tret = data->unicam_->setFormat(&format);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tif (format.size != sensorSize ||\n+\t format.fourcc != V4L2_PIX_FMT_SRGGB10P) {\n+\t\tLOG(RPI, Error)\n+\t\t\t<< \"Failed to set format on Video device: \"\n+\t\t\t<< format.toString();\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tformat.size = outputSize;\n+\n+\tret = data->isp_->output()->setFormat(&format);\n+\n+\tif (format.size != outputSize ||\n+\t format.fourcc != V4L2_PIX_FMT_SRGGB10P) {\n+\t\tLOG(RPI, Error) << \"Failed to set format on ISP output device: \"\n+\t\t\t\t<< format.toString();\n+\t\treturn -EINVAL;\n+\t}\n+\n+\t/* Configure the ISP to generate the requested size and format. */\n+\tformat.size = cfg.size;\n+\tformat.fourcc = cfg.pixelFormat;\n+\n+\tret = data->isp_->capture()->setFormat(&format);\n+\n+\tif (format.size != cfg.size ||\n+\t format.fourcc != cfg.pixelFormat) {\n+\t\tLOG(RPI, Error)\n+\t\t\t<< \"Failed to set format on ISP capture device: \"\n+\t\t\t<< format.toString();\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tcfg.setStream(&data->stream_);\n+\n+\treturn 0;\n+}\n+\n+int PipelineHandlerRPi::allocateBuffers(Camera *camera,\n+\t\t\t\t\tconst std::set<Stream *> &streams)\n+{\n+\tRPiCameraData *data = cameraData(camera);\n+\tStream *stream = *streams.begin();\n+\tconst StreamConfiguration &cfg = stream->configuration();\n+\tint ret;\n+\n+\t/*\n+\t * Buffers are allocated on the camera, and the capture pad of the ISP:\n+\t * unicam -> isp.output -> isp.capture -> Application\n+\t */\n+\n+\t/* Create a new intermediate buffer pool. */\n+\tdata->bayerBuffers_.createBuffers(cfg.bufferCount);\n+\n+\t/* Tie the unicam video buffers to the intermediate pool. */\n+\tret = data->unicam_->exportBuffers(&data->bayerBuffers_);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tret = data->isp_->output()->importBuffers(&data->bayerBuffers_);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\t/* Tie the stream buffers to the capture device of the ISP. */\n+\tif (stream->memoryType() == InternalMemory)\n+\t\tret = data->isp_->capture()->exportBuffers(&stream->bufferPool());\n+\telse\n+\t\tret = data->isp_->capture()->importBuffers(&stream->bufferPool());\n+\n+\treturn ret;\n+}\n+\n+int PipelineHandlerRPi::freeBuffers(Camera *camera,\n+\t\t\t\t const std::set<Stream *> &streams)\n+{\n+\tRPiCameraData *data = cameraData(camera);\n+\tint ret;\n+\n+\tret = data->unicam_->releaseBuffers();\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tret = data->isp_->output()->releaseBuffers();\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tret = data->isp_->capture()->releaseBuffers();\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tdata->bayerBuffers_.destroyBuffers();\n+\n+\treturn ret;\n+}\n+\n+int PipelineHandlerRPi::start(Camera *camera)\n+{\n+\tRPiCameraData *data = cameraData(camera);\n+\tint ret;\n+\n+\tdata->rawBuffers_ = data->unicam_->queueAllBuffers();\n+\tif (data->rawBuffers_.empty()) {\n+\t\tLOG(RPI, Debug) << \"Failed to queue unicam buffers\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tLOG(RPI, Warning) << \"Using hard-coded exposure/gain defaults\";\n+\n+\tV4L2ControlList controls;\n+\tcontrols.add(V4L2_CID_EXPOSURE, 1700);\n+\tcontrols.add(V4L2_CID_ANALOGUE_GAIN, 180);\n+\tret = data->unicam_->setControls(&controls);\n+\tif (ret) {\n+\t\tLOG(RPI, Error) << \"Failed to set controls\";\n+\t\treturn ret;\n+\t}\n+\n+\tret = data->isp_->output()->streamOn();\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tret = data->isp_->capture()->streamOn();\n+\tif (ret)\n+\t\tgoto output_streamoff;\n+\n+\tret = data->unicam_->streamOn();\n+\tif (ret)\n+\t\tgoto capture_streamoff;\n+\n+\treturn 0;\n+\n+capture_streamoff:\n+\tdata->isp_->capture()->streamOff();\n+output_streamoff:\n+\tdata->isp_->output()->streamOff();\n+\n+\treturn ret;\n+}\n+\n+void PipelineHandlerRPi::stop(Camera *camera)\n+{\n+\tRPiCameraData *data = cameraData(camera);\n+\n+\tdata->isp_->capture()->streamOff();\n+\tdata->isp_->output()->streamOff();\n+\tdata->unicam_->streamOff();\n+\n+\tdata->rawBuffers_.clear();\n+}\n+\n+int PipelineHandlerRPi::queueRequest(Camera *camera, Request *request)\n+{\n+\tRPiCameraData *data = cameraData(camera);\n+\tStream *stream = &data->stream_;\n+\n+\tBuffer *buffer = request->findBuffer(stream);\n+\tif (!buffer) {\n+\t\tLOG(RPI, Error)\n+\t\t\t<< \"Attempt to queue request with invalid stream\";\n+\t\treturn -ENOENT;\n+\t}\n+\n+\tint ret = data->isp_->capture()->queueBuffer(buffer);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tPipelineHandler::queueRequest(camera, request);\n+\n+\treturn 0;\n+}\n+\n+bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator)\n+{\n+\tDeviceMatch unicam(\"unicam\");\n+\tDeviceMatch codec(\"bcm2835-codec\");\n+\n+\t/* The video node is also named unicam. */\n+\tunicam.add(\"unicam\");\n+\n+\t/* We explicitly need the ISP device from the MMAL codec driver. */\n+\tcodec.add(\"bcm2835-codec-isp-source\");\n+\n+\tunicam_ = enumerator->search(unicam);\n+\tif (!unicam_)\n+\t\treturn false;\n+\n+\tcodec_ = enumerator->search(codec);\n+\tif (!codec_)\n+\t\treturn false;\n+\n+\tunicam_->acquire();\n+\tcodec_->acquire();\n+\n+\tstd::unique_ptr<RPiCameraData> data = utils::make_unique<RPiCameraData>(this);\n+\n+\t/* Locate and open the unicam video node. */\n+\tdata->unicam_ = new V4L2VideoDevice(unicam_->getEntityByName(\"unicam\"));\n+\tif (data->unicam_->open())\n+\t\treturn false;\n+\n+\t/* Locate the ISP M2M node */\n+\tMediaEntity *isp = codec_->getEntityByName(\"bcm2835-codec-isp-source\");\n+\tif (!isp) {\n+\t\tLOG(RPI, Error) << \"Could not identify the ISP\";\n+\t\treturn false;\n+\t}\n+\n+\tdata->isp_ = new V4L2M2MDevice(isp->deviceNode());\n+\tif (data->isp_->open()) {\n+\t\tLOG(RPI, Error) << \"Could not open the ISP device\";\n+\t\treturn false;\n+\t}\n+\n+\tdata->unicam_->bufferReady.connect(data.get(), &RPiCameraData::sensorReady);\n+\tdata->isp_->output()->bufferReady.connect(data.get(), &RPiCameraData::ispOutputReady);\n+\tdata->isp_->capture()->bufferReady.connect(data.get(), &RPiCameraData::ispCaptureReady);\n+\n+\t/* Identify the sensor */\n+\tfor (MediaEntity *entity : unicam_->entities()) {\n+\t\tif (entity->function() == MEDIA_ENT_F_CAM_SENSOR) {\n+\t\t\tdata->sensor_ = new CameraSensor(entity);\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tif (!data->sensor_)\n+\t\treturn false;\n+\n+\tif (data->sensor_->init())\n+\t\treturn false;\n+\n+\t/* Create and register the camera. */\n+\tstd::set<Stream *> streams{ &data->stream_ };\n+\tstd::shared_ptr<Camera> camera =\n+\t\tCamera::create(this, data->sensor_->entity()->name(), streams);\n+\tregisterCamera(std::move(camera), std::move(data));\n+\n+\treturn true;\n+}\n+\n+void RPiCameraData::sensorReady(Buffer *buffer)\n+{\n+\t/* \\todo Handle buffer failures when state is set to BufferError. */\n+\tif (buffer->status() == Buffer::BufferCancelled)\n+\t\treturn;\n+\n+\t/* Deliver the frame from the sensor to the ISP. */\n+\tisp_->output()->queueBuffer(buffer);\n+}\n+\n+void RPiCameraData::ispOutputReady(Buffer *buffer)\n+{\n+\t/* \\todo Handle buffer failures when state is set to BufferError. */\n+\tif (buffer->status() == Buffer::BufferCancelled)\n+\t\treturn;\n+\n+\t/* Return a completed buffer from the ISP back to the sensor. */\n+\tunicam_->queueBuffer(buffer);\n+}\n+\n+void RPiCameraData::ispCaptureReady(Buffer *buffer)\n+{\n+\tRequest *request = buffer->request();\n+\n+\tpipe_->completeBuffer(camera_, request, buffer);\n+\tpipe_->completeRequest(camera_, request);\n+}\n+\n+REGISTER_PIPELINE_HANDLER(PipelineHandlerRPi);\n+\n+} /* namespace libcamera */\n", "prefixes": [ "libcamera-devel", "v3", "6/6", "PoC/RFC" ] }