{"id":725,"url":"https://patchwork.libcamera.org/api/1.1/patches/725/?format=json","web_url":"https://patchwork.libcamera.org/patch/725/","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":"<20190312121242.2253-11-jacopo@jmondi.org>","date":"2019-03-12T12:12:38","name":"[libcamera-devel,v2,10/14] libcamera: ipu3: Queue requests to the pipeline","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"26c8801814d0139d0b94911c59516297eeb2e3f4","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/725/mbox/","series":[{"id":205,"url":"https://patchwork.libcamera.org/api/1.1/series/205/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=205","date":"2019-03-12T12:12:28","name":"libcamera: ipu3: ImgU support","version":2,"mbox":"https://patchwork.libcamera.org/series/205/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/725/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/725/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 92A41611A7\n\tfor ;\n\tTue, 12 Mar 2019 13:12:25 +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 relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 262981C0005;\n\tTue, 12 Mar 2019 12:12:24 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 12 Mar 2019 13:12:38 +0100","Message-Id":"<20190312121242.2253-11-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190312121242.2253-1-jacopo@jmondi.org>","References":"<20190312121242.2253-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 10/14] libcamera: ipu3: Queue requests\n\tto the pipeline","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, 12 Mar 2019 12:12:25 -0000"},"content":"Implement queueRequest for the IPU3 pipeline manager. When a request is\nqueued, a new buffer is queued to the ImgU output.\n\nAlso queue buffers for the viewfinder and stat video nodes, even if\nthey're not used at the moment.\n\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 25 +++++++++++++++++++++++--\n 1 file changed, 23 insertions(+), 2 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex badde4839f99..1a7b96d9ada7 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -160,11 +160,15 @@ private:\n \n \tstd::shared_ptr cio2MediaDev_;\n \tstd::shared_ptr imguMediaDev_;\n+\n+\tunsigned int tmpBufferCount;\n };\n \n PipelineHandlerIPU3::PipelineHandlerIPU3(CameraManager *manager)\n \t: PipelineHandler(manager), cio2MediaDev_(nullptr), imguMediaDev_(nullptr)\n {\n+\t/* FIXME: this is an hack. */\n+\ttmpBufferCount = 0;\n }\n \n PipelineHandlerIPU3::~PipelineHandlerIPU3()\n@@ -464,9 +468,26 @@ void PipelineHandlerIPU3::stop(Camera *camera)\n int PipelineHandlerIPU3::queueRequest(Camera *camera, Request *request)\n {\n \tIPU3CameraData *data = cameraData(camera);\n-\tV4L2Device *cio2 = data->cio2.output;\n+\tV4L2Device *viewfinder = data->imgu->viewfinder;\n+\tV4L2Device *output = data->imgu->output;\n+\tV4L2Device *stat = data->imgu->stat;\n \tStream *stream = &data->stream_;\n+\tBuffer *tmpBuffer;\n+\n+\t/*\n+\t * Queue buffer on VF and stat.\n+\t * FIXME: this is an hack!\n+\t */\n+\ttmpBuffer = &data->imgu->vfPool.buffers()[tmpBufferCount];\n+\tviewfinder->queueBuffer(tmpBuffer);\n+\n+\ttmpBuffer = &data->imgu->statPool.buffers()[tmpBufferCount];\n+\tstat->queueBuffer(tmpBuffer);\n+\n+\ttmpBufferCount++;\n+\ttmpBufferCount %= IPU3_IMGU_BUFFER_COUNT;\n \n+\t/* Queue a buffer to the ImgU output for capture. */\n \tBuffer *buffer = request->findBuffer(stream);\n \tif (!buffer) {\n \t\tLOG(IPU3, Error)\n@@ -474,7 +495,7 @@ int PipelineHandlerIPU3::queueRequest(Camera *camera, Request *request)\n \t\treturn -ENOENT;\n \t}\n \n-\tint ret = cio2->queueBuffer(buffer);\n+\tint ret = output->queueBuffer(buffer);\n \tif (ret < 0)\n \t\treturn ret;\n \n","prefixes":["libcamera-devel","v2","10/14"]}