{"id":1072,"url":"https://patchwork.libcamera.org/api/patches/1072/?format=json","web_url":"https://patchwork.libcamera.org/patch/1072/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190419090345.18136-1-benjamin.gaignard@st.com>","date":"2019-04-19T09:03:45","name":"[libcamera-devel,v2] libcamera: pipeline: stm32: add pipeline handler for stm32","commit_ref":null,"pull_url":null,"state":"rejected","archived":false,"hash":"9f185dc771dc71133157b7069eeb5e99489d984f","submitter":{"id":14,"url":"https://patchwork.libcamera.org/api/people/14/?format=json","name":"Benjamin GAIGNARD","email":"benjamin.gaignard@st.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1072/mbox/","series":[{"id":260,"url":"https://patchwork.libcamera.org/api/series/260/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=260","date":"2019-04-19T09:03:45","name":"[libcamera-devel,v2] libcamera: pipeline: stm32: add pipeline handler for stm32","version":2,"mbox":"https://patchwork.libcamera.org/series/260/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1072/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1072/checks/","tags":{},"headers":{"Return-Path":"","Received":["from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com\n\t[62.209.51.94])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C7EDF60DB4\n\tfor ;\n\tFri, 19 Apr 2019 11:03:56 +0200 (CEST)","from pps.filterd (m0046037.ppops.net [127.0.0.1])\n\tby mx07-00178001.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id\n\tx3J925oO020881; Fri, 19 Apr 2019 11:03:55 +0200","from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35])\n\tby mx07-00178001.pphosted.com with ESMTP id 2rxrt6p1c3-1\n\t(version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT);\n\tFri, 19 Apr 2019 11:03:55 +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 3CE803D;\n\tFri, 19 Apr 2019 09:03:55 +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 24C8015C0;\n\tFri, 19 Apr 2019 09:03:55 +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\tFri, 19 Apr 2019 11:03:55 +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\tFri, 19 Apr 2019 11:03:54 +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=nMV5JEjXpEQkeRj/istr/ArTazeVQlFmzDP39fjfWh0=;\n\tb=IopJJkuKySGlJSJlxjzhkPUm7gmAxpjtnGQSMpOTRkd6In0X4uzpHw0veKJjghWly6YS\n\tktBJzeYjtjyEjjoM0xN6HExoW9n6lO0i18L2KQaWg2aJbMJevGNkRHBZAshJM9fnSSXc\n\tJaX460tfjUFeTyuYLU38i6KdmS5CaG7Ij+ChW30/q1iiK+CZEasmqkONg/7sUo3SynRk\n\tn95y+GHFc8i6rw7X9gifRFnLqRjufhUqdz4wCoPUH0beJE8C7gOKoU8OAi/ZnAM7KZqB\n\t5h1kIwEQVtyMzfoZBCm/Ie+DVtypSw9WzWCGu3gENZbkwu/9IqbYy/u85tI7EOwVQOdO\n\tng== ","From":"Benjamin Gaignard ","To":"","CC":", , Benjamin Gaignard\n\t","Date":"Fri, 19 Apr 2019 11:03:45 +0200","Message-ID":"<20190419090345.18136-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-19_05:, , signatures=0","Subject":"[libcamera-devel] [PATCH v2] libcamera: pipeline: stm32: add\n\tpipeline handler for stm32","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 19 Apr 2019 09:03:57 -0000"},"content":"Provide a pipeline handler for the stm32 driver.\n\nSigned-off-by: Benjamin Gaignard \n---\nversion 2:\n- fix indentation and run checkstyle:\n./utils/checkstyle.py \n---------------------------------------------------------------------------------------------------\n9360626c2158b2c5d865608f4504d203b6d0014f libcamera: pipeline: stm32: add pipeline handler for stm32\n---------------------------------------------------------------------------------------------------\nNo style issue detected\n- Use the first video node instead of using MEDIA_ENT_FL_DEFAULT flag\n\n src/libcamera/pipeline/meson.build | 2 +\n src/libcamera/pipeline/stm32/meson.build | 3 +\n src/libcamera/pipeline/stm32/stm32.cpp | 220 +++++++++++++++++++++++++++++++\n 3 files changed, 225 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..15c7764\n--- /dev/null\n+++ b/src/libcamera/pipeline/stm32/stm32.cpp\n@@ -0,0 +1,220 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * stm32.cpp - Pipeline handler for stm32 devices\n+ */\n+\n+#include \n+#include \n+#include \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+{\n+public:\n+\tPipelineHandlerSTM32(CameraManager *manager);\n+\t~PipelineHandlerSTM32();\n+\n+\tstd::map\n+\tstreamConfiguration(Camera *camera, std::set &streams) override;\n+\tint configureStreams(\n+\t\tCamera *camera, std::map &config) override;\n+\n+\tint allocateBuffers(Camera *camera, Stream *stream) override;\n+\tint freeBuffers(Camera *camera, Stream *stream) 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);\n+\n+private:\n+\tclass STM32CameraData : public CameraData\n+\t{\n+\tpublic:\n+\t\tSTM32CameraData(PipelineHandler *pipe)\n+\t\t\t: CameraData(pipe), video_(nullptr) {}\n+\n+\t\t~STM32CameraData() { delete video_; }\n+\n+\t\tvoid bufferReady(Buffer *buffer);\n+\n+\t\tV4L2Device *video_;\n+\t\tStream stream_;\n+\t};\n+\n+\tSTM32CameraData *cameraData(const Camera *camera)\n+\t{\n+\t\treturn static_cast(PipelineHandler::cameraData(camera));\n+\t}\n+\n+\tstd::shared_ptr media_;\n+};\n+\n+PipelineHandlerSTM32::PipelineHandlerSTM32(CameraManager *manager)\n+\t: PipelineHandler(manager), media_(nullptr)\n+{\n+}\n+\n+PipelineHandlerSTM32::~PipelineHandlerSTM32()\n+{\n+\tif (media_)\n+\t\tmedia_->release();\n+}\n+\n+std::map\n+PipelineHandlerSTM32::streamConfiguration(Camera *camera,\n+\t\t\t\t\t std::set &streams)\n+{\n+\tSTM32CameraData *data = cameraData(camera);\n+\n+\tstd::map configs;\n+\tStreamConfiguration config{};\n+\n+\tLOG(STM32, Debug) << \"Retrieving default format\";\n+\tconfig.width = 640;\n+\tconfig.height = 480;\n+\tconfig.pixelFormat = V4L2_PIX_FMT_YUYV;\n+\tconfig.bufferCount = 4;\n+\n+\tconfigs[&data->stream_] = config;\n+\n+\treturn configs;\n+}\n+\n+int PipelineHandlerSTM32::configureStreams(\n+\tCamera *camera, std::map &config)\n+{\n+\tSTM32CameraData *data = cameraData(camera);\n+\tStreamConfiguration *cfg = &config[&data->stream_];\n+\tint ret;\n+\n+\tLOG(STM32, Debug) << \"Configure the camera for resolution \" << cfg->width\n+\t\t\t << \"x\" << cfg->height;\n+\n+\tV4L2DeviceFormat format = {};\n+\tformat.width = cfg->width;\n+\tformat.height = cfg->height;\n+\tformat.fourcc = cfg->pixelFormat;\n+\n+\tret = data->video_->setFormat(&format);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tif (format.width != cfg->width || format.height != cfg->height ||\n+\t format.fourcc != cfg->pixelFormat)\n+\t\treturn -EINVAL;\n+\n+\treturn 0;\n+}\n+\n+int PipelineHandlerSTM32::allocateBuffers(Camera *camera, Stream *stream)\n+{\n+\tSTM32CameraData *data = cameraData(camera);\n+\tconst StreamConfiguration &cfg = stream->configuration();\n+\n+\tLOG(STM32, Debug) << \"Requesting \" << cfg.bufferCount << \" buffers\";\n+\n+\treturn data->video_->exportBuffers(&stream->bufferPool());\n+}\n+\n+int PipelineHandlerSTM32::freeBuffers(Camera *camera, Stream *stream)\n+{\n+\tSTM32CameraData *data = cameraData(camera);\n+\treturn data->video_->releaseBuffers();\n+}\n+\n+int PipelineHandlerSTM32::start(Camera *camera)\n+{\n+\tSTM32CameraData *data = cameraData(camera);\n+\treturn data->video_->streamOn();\n+}\n+\n+void PipelineHandlerSTM32::stop(Camera *camera)\n+{\n+\tSTM32CameraData *data = cameraData(camera);\n+\tdata->video_->streamOff();\n+\tPipelineHandler::stop(camera);\n+}\n+\n+int PipelineHandlerSTM32::queueRequest(Camera *camera, Request *request)\n+{\n+\tSTM32CameraData *data = cameraData(camera);\n+\tBuffer *buffer = request->findBuffer(&data->stream_);\n+\tif (!buffer) {\n+\t\tLOG(STM32, Error) << \"Attempt to queue request with invalid stream\";\n+\n+\t\treturn -ENOENT;\n+\t}\n+\n+\tint ret = data->video_->queueBuffer(buffer);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tPipelineHandler::queueRequest(camera, request);\n+\n+\treturn 0;\n+}\n+\n+bool PipelineHandlerSTM32::match(DeviceEnumerator *enumerator)\n+{\n+\tDeviceMatch dm(\"stm32-dcmi\");\n+\n+\tmedia_ = enumerator->search(dm);\n+\tif (!media_)\n+\t\treturn false;\n+\n+\tmedia_->acquire();\n+\n+\tstd::unique_ptr data =\n+\t\tutils::make_unique(this);\n+\n+\t/* Open the first video node */\n+\tMediaEntity *entity = media_->entities()[0];\n+\tif (!entity) {\n+\t\tLOG(STM32, Error) << \"No video node\";\n+\t\treturn false;\n+\t}\n+\n+\tdata->video_ = new V4L2Device(entity);\n+\tif (!data->video_) {\n+\t\tLOG(STM32, Error) << \"Could not find a default video device\";\n+\t\treturn false;\n+\t}\n+\n+\tif (data->video_->open())\n+\t\treturn false;\n+\n+\tdata->video_->bufferReady.connect(data.get(), &STM32CameraData::bufferReady);\n+\n+\t/* Create and register the camera. */\n+\tstd::set streams{ &data->stream_ };\n+\tstd::shared_ptr camera =\n+\t\tCamera::create(this, media_->model(), streams);\n+\tregisterCamera(std::move(camera), std::move(data));\n+\n+\treturn true;\n+}\n+\n+void PipelineHandlerSTM32::STM32CameraData::bufferReady(Buffer *buffer)\n+{\n+\tRequest *request = queuedRequests_.front();\n+\n+\tpipe_->completeBuffer(camera_, request, buffer);\n+\tpipe_->completeRequest(camera_, request);\n+}\n+\n+REGISTER_PIPELINE_HANDLER(PipelineHandlerSTM32);\n+\n+} /* namespace libcamera */\n","prefixes":["libcamera-devel","v2"]}