{"id":809,"url":"https://patchwork.libcamera.org/api/1.1/patches/809/?format=json","web_url":"https://patchwork.libcamera.org/patch/809/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20190326083902.26121-15-jacopo@jmondi.org>","date":"2019-03-26T08:38:57","name":"[libcamera-devel,v5,14/19] libcamera: ipu3: Implement camera start/stop","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"7425e37dd97723344c2f62d38dcc1b9ecb603cc0","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/809/mbox/","series":[{"id":219,"url":"https://patchwork.libcamera.org/api/1.1/series/219/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=219","date":"2019-03-26T08:38:43","name":"libcamera: ipu3: Add ImgU support","version":5,"mbox":"https://patchwork.libcamera.org/series/219/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/809/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/809/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay10.mail.gandi.net (relay10.mail.gandi.net\n\t[217.70.178.230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BCEF361111\n\tfor ;\n\tTue, 26 Mar 2019 09:38:39 +0100 (CET)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay10.mail.gandi.net (Postfix) with ESMTPSA id 3538B240006;\n\tTue, 26 Mar 2019 08:38:39 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 26 Mar 2019 09:38:57 +0100","Message-Id":"<20190326083902.26121-15-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190326083902.26121-1-jacopo@jmondi.org>","References":"<20190326083902.26121-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 14/19] libcamera: ipu3: Implement\n\tcamera start/stop","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":"Tue, 26 Mar 2019 08:38:40 -0000"},"content":"Start and stop video devices in the pipeline.\n\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 93 ++++++++++++++++++++++++++--\n 1 file changed, 87 insertions(+), 6 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex d3519bb1d536..5b3c44174566 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -111,6 +111,9 @@ public:\n \tint exportBuffers(enum OutputId id, unsigned int count);\n \tvoid freeBuffers();\n \n+\tint start();\n+\tvoid stop();\n+\n \tunsigned int index_;\n \tstd::string name_;\n \tMediaDevice *media_;\n@@ -154,6 +157,9 @@ public:\n \tBufferPool *exportBuffers();\n \tvoid freeBuffers();\n \n+\tint start();\n+\tvoid stop();\n+\n \tV4L2Device *output_;\n \tV4L2Subdevice *csi2_;\n \tV4L2Subdevice *sensor_;\n@@ -371,12 +377,24 @@ int PipelineHandlerIPU3::freeBuffers(Camera *camera, Stream *stream)\n int PipelineHandlerIPU3::start(Camera *camera)\n {\n \tIPU3CameraData *data = cameraData(camera);\n-\tV4L2Device *cio2 = data->cio2_.output_;\n+\tCIO2Device *cio2 = &data->cio2_;\n+\tImgUDevice *imgu = data->imgu_;\n \tint ret;\n \n-\tret = cio2->streamOn();\n+\t/*\n+\t * Start the ImgU video devices, buffers will be queued to the\n+\t * ImgU output and viewfinder when requests will be queued.\n+\t */\n+\tret = cio2->start();\n+\tif (ret) {\n+\t\tcio2->stop();\n+\t\treturn ret;\n+\t}\n+\n+\tret = imgu->start();\n \tif (ret) {\n-\t\tLOG(IPU3, Info) << \"Failed to start camera \" << camera->name();\n+\t\timgu->stop();\n+\t\tcio2->stop();\n \t\treturn ret;\n \t}\n \n@@ -386,10 +404,9 @@ int PipelineHandlerIPU3::start(Camera *camera)\n void PipelineHandlerIPU3::stop(Camera *camera)\n {\n \tIPU3CameraData *data = cameraData(camera);\n-\tV4L2Device *cio2 = data->cio2_.output_;\n \n-\tif (cio2->streamOff())\n-\t\tLOG(IPU3, Info) << \"Failed to stop camera \" << camera->name();\n+\tdata->cio2_.stop();\n+\tdata->imgu_->stop();\n \n \tPipelineHandler::stop(camera);\n }\n@@ -833,6 +850,46 @@ void ImgUDevice::freeBuffers()\n \t\tLOG(IPU3, Error) << \"Failed to release ImgU input buffers\";\n }\n \n+int ImgUDevice::start()\n+{\n+\tint ret;\n+\n+\t/* Start the ImgU video devices. */\n+\tret = output_->streamOn();\n+\tif (ret) {\n+\t\tLOG(IPU3, Error) << \"Failed to start ImgU output\";\n+\t\treturn ret;\n+\t}\n+\n+\tret = viewfinder_->streamOn();\n+\tif (ret) {\n+\t\tLOG(IPU3, Error) << \"Failed to start ImgU viewfinder\";\n+\t\treturn ret;\n+\t}\n+\n+\tret = stat_->streamOn();\n+\tif (ret) {\n+\t\tLOG(IPU3, Error) << \"Failed to start ImgU stat\";\n+\t\treturn ret;\n+\t}\n+\n+\tret = input_->streamOn();\n+\tif (ret) {\n+\t\tLOG(IPU3, Error) << \"Failed to start ImgU input\";\n+\t\treturn ret;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+void ImgUDevice::stop()\n+{\n+\toutput_->streamOff();\n+\tviewfinder_->streamOff();\n+\tstat_->streamOff();\n+\tinput_->streamOff();\n+}\n+\n /*------------------------------------------------------------------------------\n * CIO2 Device\n */\n@@ -1026,6 +1083,30 @@ void CIO2Device::freeBuffers()\n \t\tLOG(IPU3, Error) << \"Failed to release CIO2 buffers\";\n }\n \n+int CIO2Device::start()\n+{\n+\tint ret;\n+\n+\tfor (Buffer &buffer : pool_.buffers()) {\n+\t\tret = output_->queueBuffer(&buffer);\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\t}\n+\n+\tret = output_->streamOn();\n+\tif (ret) {\n+\t\tLOG(IPU3, Error) << \"Failed to start CIO2\";\n+\t\treturn ret;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+void CIO2Device::stop()\n+{\n+\toutput_->streamOff();\n+}\n+\n REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3);\n \n } /* namespace libcamera */\n","prefixes":["libcamera-devel","v5","14/19"]}