Patch Detail
Show a patch.
GET /api/1.1/patches/939/?format=api
{ "id": 939, "url": "https://patchwork.libcamera.org/api/1.1/patches/939/?format=api", "web_url": "https://patchwork.libcamera.org/patch/939/", "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": "<20190408124322.6869-1-benjamin.gaignard@st.com>", "date": "2019-04-08T12:43:22", "name": "[libcamera-devel] libcamera: pipeline: stm32: add pipeline handler for stm32", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "afc40cc641fbb1b552ab395469e6015ad76e4a04", "submitter": { "id": 14, "url": "https://patchwork.libcamera.org/api/1.1/people/14/?format=api", "name": "Benjamin GAIGNARD", "email": "benjamin.gaignard@st.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/939/mbox/", "series": [ { "id": 244, "url": "https://patchwork.libcamera.org/api/1.1/series/244/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=244", "date": "2019-04-08T12:43:22", "name": "[libcamera-devel] libcamera: pipeline: stm32: add pipeline handler for stm32", "version": 1, "mbox": "https://patchwork.libcamera.org/series/244/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/939/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/939/checks/", "tags": {}, "headers": { "Return-Path": "<benjamin.gaignard@st.com>", "Received": [ "from mx07-00178001.pphosted.com (mx08-00178001.pphosted.com\n\t[91.207.212.93])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D73DE60004\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 8 Apr 2019 14:43:31 +0200 (CEST)", "from pps.filterd (m0046660.ppops.net [127.0.0.1])\n\tby mx08-00178001.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id\n\tx38CQruv006785; Mon, 8 Apr 2019 14:43:30 +0200", "from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35])\n\tby mx08-00178001.pphosted.com with ESMTP id 2rprcf32c7-1\n\t(version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT);\n\tMon, 08 Apr 2019 14:43:30 +0200", "from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9])\n\tby beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 1507031;\n\tMon, 8 Apr 2019 12:43:30 +0000 (GMT)", "from Webmail-eu.st.com (Safex1hubcas23.st.com [10.75.90.46])\n\tby zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id F0CF626A2;\n\tMon, 8 Apr 2019 12:43:29 +0000 (GMT)", "from SAFEX1HUBCAS22.st.com (10.75.90.93) by SAFEX1HUBCAS23.st.com\n\t(10.75.90.46) with Microsoft SMTP Server (TLS) id 14.3.439.0;\n\tMon, 8 Apr 2019 14:43:29 +0200", "from localhost (10.201.20.122) by Webmail-ga.st.com (10.75.90.48)\n\twith Microsoft SMTP Server (TLS) id 14.3.361.1;\n\tMon, 8 Apr 2019 14:43:29 +0200" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com;\n\th=from : to : cc : subject\n\t: date : message-id : mime-version : content-type;\n\ts=STMicroelectronics; \n\tbh=1EBM7zB/Yi2f0fPkXmZBnbof71Dj77xUlyFkYeGOm64=;\n\tb=bt+mHUUTdmzvzmrGGPzPlZBNkq53fYO4rzmPKA4GLSXICVAggHDxl7p7mHDO1RoR+o7H\n\tr0SvPoXuSdopTKujJnsJbdPcrI3RIJH04yjD5auSO6whz6Ms6p1kE3O3CPvQLHiv6A9a\n\tl1TF89iA6W2zxUbFak0KR3uQ4tNX0qWIh5BQdHVq7kaECqKG+UzRQlbtvCZkGeZ1rG4k\n\tsQFsnq/ZiXdas69zB5IlGW2hKvaoCb3r0os985eOzkr07z7dKlao6RZ/hjHlmmyI07RA\n\tg7i72HbYnLzQg200NubcHvBYq6E2Q4Y6rMgeC5RYq7PwU2gYUDhjL3tlWvHP7YZrDJ8k\n\tNg== ", "From": "Benjamin Gaignard <benjamin.gaignard@st.com>", "To": "<libcamera-devel@lists.libcamera.org>", "CC": "<peter.griffin@linaro.org>, <hugues.fruchet@st.com>, Benjamin Gaignard\n\t<benjamin.gaignard@st.com>", "Date": "Mon, 8 Apr 2019 14:43:22 +0200", "Message-ID": "<20190408124322.6869-1-benjamin.gaignard@st.com>", "X-Mailer": "git-send-email 2.15.0", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[10.201.20.122]", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:, ,\n\tdefinitions=2019-04-08_04:, , signatures=0", "X-Mailman-Approved-At": "Mon, 08 Apr 2019 15:08:57 +0200", "Subject": "[libcamera-devel] [PATCH] libcamera: pipeline: stm32: add pipeline\n\thandler for stm32", "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": "Mon, 08 Apr 2019 12:43:32 -0000" }, "content": "Provide a pipeline handler for the stm32 driver.\n\nSigned-off-by: Benjamin Gaignard <benjamin.gaignard@st.com>\n---\n src/libcamera/pipeline/meson.build | 2 +\n src/libcamera/pipeline/stm32/meson.build | 3 +\n src/libcamera/pipeline/stm32/stm32.cpp | 205 +++++++++++++++++++++++++++++++\n 3 files changed, 210 insertions(+)\n create mode 100644 src/libcamera/pipeline/stm32/meson.build\n create mode 100644 src/libcamera/pipeline/stm32/stm32.cpp", "diff": "diff --git a/src/libcamera/pipeline/meson.build b/src/libcamera/pipeline/meson.build\nindex 40bb264..08d6e1c 100644\n--- a/src/libcamera/pipeline/meson.build\n+++ b/src/libcamera/pipeline/meson.build\n@@ -4,3 +4,5 @@ libcamera_sources += files([\n ])\n \n subdir('ipu3')\n+\n+subdir('stm32')\ndiff --git a/src/libcamera/pipeline/stm32/meson.build b/src/libcamera/pipeline/stm32/meson.build\nnew file mode 100644\nindex 0000000..cb6f16b\n--- /dev/null\n+++ b/src/libcamera/pipeline/stm32/meson.build\n@@ -0,0 +1,3 @@\n+libcamera_sources += files([\n+ 'stm32.cpp',\n+])\ndiff --git a/src/libcamera/pipeline/stm32/stm32.cpp b/src/libcamera/pipeline/stm32/stm32.cpp\nnew file mode 100644\nindex 0000000..301fdfc\n--- /dev/null\n+++ b/src/libcamera/pipeline/stm32/stm32.cpp\n@@ -0,0 +1,205 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * stm32.cpp - Pipeline handler for stm32 devices\n+ */\n+\n+#include <libcamera/camera.h>\n+#include <libcamera/request.h>\n+#include <libcamera/stream.h>\n+\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_device.h\"\n+\n+namespace libcamera {\n+\n+LOG_DEFINE_CATEGORY(STM32)\n+\n+class PipelineHandlerSTM32 : public PipelineHandler {\n+public:\n+ PipelineHandlerSTM32(CameraManager *manager);\n+ ~PipelineHandlerSTM32();\n+\n+ std::map<Stream *, StreamConfiguration>\n+ streamConfiguration(Camera *camera, std::set<Stream *> &streams) override;\n+ int configureStreams(\n+ Camera *camera, std::map<Stream *, StreamConfiguration> &config) override;\n+\n+ int allocateBuffers(Camera *camera, Stream *stream) override;\n+ int freeBuffers(Camera *camera, Stream *stream) override;\n+\n+ int start(Camera *camera) override;\n+ void stop(Camera *camera) override;\n+\n+ int queueRequest(Camera *camera, Request *request) override;\n+\n+ bool match(DeviceEnumerator *enumerator);\n+\n+private:\n+ class STM32CameraData : public CameraData {\n+ public:\n+ STM32CameraData(PipelineHandler *pipe)\n+ : CameraData(pipe), video_(nullptr) {}\n+\n+ ~STM32CameraData() { delete video_; }\n+\n+ void bufferReady(Buffer *buffer);\n+\n+ V4L2Device *video_;\n+ Stream stream_;\n+ };\n+\n+ STM32CameraData *cameraData(const Camera *camera) {\n+ return static_cast<STM32CameraData *>(PipelineHandler::cameraData(camera));\n+ }\n+\n+ std::shared_ptr<MediaDevice> media_;\n+};\n+\n+PipelineHandlerSTM32::PipelineHandlerSTM32(CameraManager *manager)\n+ : PipelineHandler(manager), media_(nullptr) {}\n+\n+PipelineHandlerSTM32::~PipelineHandlerSTM32() {\n+ if (media_)\n+ media_->release();\n+}\n+\n+std::map<Stream *, StreamConfiguration>\n+PipelineHandlerSTM32::streamConfiguration(Camera *camera,\n+ std::set<Stream *> &streams) {\n+ STM32CameraData *data = cameraData(camera);\n+\n+ std::map<Stream *, StreamConfiguration> configs;\n+ StreamConfiguration config{};\n+\n+ LOG(STM32, Debug) << \"Retrieving default format\";\n+ config.width = 640;\n+ config.height = 480;\n+ config.pixelFormat = V4L2_PIX_FMT_YUYV;\n+ config.bufferCount = 4;\n+\n+ configs[&data->stream_] = config;\n+\n+ return configs;\n+}\n+\n+int PipelineHandlerSTM32::configureStreams(\n+ Camera *camera, std::map<Stream *, StreamConfiguration> &config) {\n+ STM32CameraData *data = cameraData(camera);\n+ StreamConfiguration *cfg = &config[&data->stream_];\n+ int ret;\n+\n+ LOG(STM32, Debug) << \"Configure the camera for resolution \" << cfg->width\n+ << \"x\" << cfg->height;\n+\n+ V4L2DeviceFormat format = {};\n+ format.width = cfg->width;\n+ format.height = cfg->height;\n+ format.fourcc = cfg->pixelFormat;\n+\n+ ret = data->video_->setFormat(&format);\n+ if (ret)\n+ return ret;\n+\n+ if (format.width != cfg->width || format.height != cfg->height ||\n+ format.fourcc != cfg->pixelFormat)\n+ return -EINVAL;\n+\n+ return 0;\n+}\n+\n+int PipelineHandlerSTM32::allocateBuffers(Camera *camera, Stream *stream) {\n+ STM32CameraData *data = cameraData(camera);\n+ const StreamConfiguration &cfg = stream->configuration();\n+\n+ LOG(STM32, Debug) << \"Requesting \" << cfg.bufferCount << \" buffers\";\n+\n+ return data->video_->exportBuffers(&stream->bufferPool());\n+}\n+\n+int PipelineHandlerSTM32::freeBuffers(Camera *camera, Stream *stream) {\n+ STM32CameraData *data = cameraData(camera);\n+ return data->video_->releaseBuffers();\n+}\n+\n+int PipelineHandlerSTM32::start(Camera *camera) {\n+ STM32CameraData *data = cameraData(camera);\n+ return data->video_->streamOn();\n+}\n+\n+void PipelineHandlerSTM32::stop(Camera *camera) {\n+ STM32CameraData *data = cameraData(camera);\n+ data->video_->streamOff();\n+ PipelineHandler::stop(camera);\n+}\n+\n+int PipelineHandlerSTM32::queueRequest(Camera *camera, Request *request) {\n+ STM32CameraData *data = cameraData(camera);\n+ Buffer *buffer = request->findBuffer(&data->stream_);\n+ if (!buffer) {\n+ LOG(STM32, Error) << \"Attempt to queue request with invalid stream\";\n+\n+ return -ENOENT;\n+ }\n+\n+ int ret = data->video_->queueBuffer(buffer);\n+ if (ret < 0)\n+ return ret;\n+\n+ PipelineHandler::queueRequest(camera, request);\n+\n+ return 0;\n+}\n+\n+bool PipelineHandlerSTM32::match(DeviceEnumerator *enumerator) {\n+ DeviceMatch dm(\"stm32-dcmi\");\n+\n+ media_ = enumerator->search(dm);\n+ if (!media_)\n+ return false;\n+\n+ media_->acquire();\n+\n+ std::unique_ptr<STM32CameraData> data =\n+ utils::make_unique<STM32CameraData>(this);\n+\n+ /* Locate and open the default video node. */\n+ for (MediaEntity *entity : media_->entities()) {\n+ if (entity->flags() & MEDIA_ENT_FL_DEFAULT) {\n+ data->video_ = new V4L2Device(entity);\n+ break;\n+ }\n+ }\n+\n+ if (!data->video_) {\n+ LOG(STM32, Error) << \"Could not find a default video device\";\n+ return false;\n+ }\n+\n+ if (data->video_->open())\n+ return false;\n+\n+ data->video_->bufferReady.connect(data.get(), &STM32CameraData::bufferReady);\n+\n+ /* Create and register the camera. */\n+ std::set<Stream *> streams{&data->stream_};\n+ std::shared_ptr<Camera> camera =\n+ Camera::create(this, media_->model(), streams);\n+ registerCamera(std::move(camera), std::move(data));\n+\n+ return true;\n+}\n+\n+void PipelineHandlerSTM32::STM32CameraData::bufferReady(Buffer *buffer) {\n+ Request *request = queuedRequests_.front();\n+\n+ pipe_->completeBuffer(camera_, request, buffer);\n+ pipe_->completeRequest(camera_, request);\n+}\n+\n+REGISTER_PIPELINE_HANDLER(PipelineHandlerSTM32);\n+\n+} /* namespace libcamera */\n", "prefixes": [ "libcamera-devel" ] }