{"id":2569,"url":"https://patchwork.libcamera.org/api/patches/2569/?format=json","web_url":"https://patchwork.libcamera.org/patch/2569/","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":"<20200110193808.2266294-23-niklas.soderlund@ragnatech.se>","date":"2020-01-10T19:37:57","name":"[libcamera-devel,v3,22/33] libcamera: pipeline: rkisp1: Switch to FrameBuffer interface for stat and param","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"446473861a9b28a6025d1c85000341a3895e59e0","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2569/mbox/","series":[{"id":615,"url":"https://patchwork.libcamera.org/api/series/615/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=615","date":"2020-01-10T19:37:35","name":"libcamera: Rework buffer API","version":3,"mbox":"https://patchwork.libcamera.org/series/615/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2569/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2569/checks/","tags":{},"headers":{"Return-Path":"<niklas.soderlund@ragnatech.se>","Received":["from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 26954606A6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 10 Jan 2020 20:38:56 +0100 (CET)","from bismarck.berto.se (p54ac5d7b.dip0.t-ipconnect.de\n\t[84.172.93.123]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid d49c739c-33e0-11ea-b6d8-005056917f90;\n\tFri, 10 Jan 2020 20:38:52 +0100 (CET)"],"X-Halon-ID":"d49c739c-33e0-11ea-b6d8-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 10 Jan 2020 20:37:57 +0100","Message-Id":"<20200110193808.2266294-23-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200110193808.2266294-1-niklas.soderlund@ragnatech.se>","References":"<20200110193808.2266294-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 22/33] libcamera: pipeline: rkisp1:\n\tSwitch to FrameBuffer interface for stat and param","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","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":"Fri, 10 Jan 2020 19:38:56 -0000"},"content":"The V4L2VideoDevice class can now operate using a FrameBuffer interface,\nswitch the RkISP1 statistics and parameters buffer to use it. We can not\nconvert the application-facing buffers yet.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n* Changes since v2\n- Rename {param,stat}BuffersMemory to {param,stat}Buffers_\n- Rename {param,stat}Buffers_ to available{Param,Stat}Buffers_\n- s/err:/error:/\n- Beutification of small code blocks\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 132 ++++++++++++-----------\n 1 file changed, 72 insertions(+), 60 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 607ff85539a22324..dbc5df801f30e76b 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -32,9 +32,6 @@\n #include \"v4l2_subdevice.h\"\n #include \"v4l2_videodevice.h\"\n \n-#define RKISP1_PARAM_BASE 0x100\n-#define RKISP1_STAT_BASE 0x200\n-\n namespace libcamera {\n \n LOG_DEFINE_CATEGORY(RkISP1)\n@@ -52,8 +49,8 @@ struct RkISP1FrameInfo {\n \tunsigned int frame;\n \tRequest *request;\n \n-\tBuffer *paramBuffer;\n-\tBuffer *statBuffer;\n+\tFrameBuffer *paramBuffer;\n+\tFrameBuffer *statBuffer;\n \tBuffer *videoBuffer;\n \n \tbool paramFilled;\n@@ -71,6 +68,7 @@ public:\n \n \tRkISP1FrameInfo *find(unsigned int frame);\n \tRkISP1FrameInfo *find(Buffer *buffer);\n+\tRkISP1FrameInfo *find(FrameBuffer *buffer);\n \tRkISP1FrameInfo *find(Request *request);\n \n private:\n@@ -203,8 +201,8 @@ private:\n \tint createCamera(MediaEntity *sensor);\n \tvoid tryCompleteRequest(Request *request);\n \tvoid bufferReady(Buffer *buffer);\n-\tvoid paramReady(Buffer *buffer);\n-\tvoid statReady(Buffer *buffer);\n+\tvoid paramReady(FrameBuffer *buffer);\n+\tvoid statReady(FrameBuffer *buffer);\n \n \tMediaDevice *media_;\n \tV4L2Subdevice *dphy_;\n@@ -213,11 +211,10 @@ private:\n \tV4L2VideoDevice *param_;\n \tV4L2VideoDevice *stat_;\n \n-\tBufferPool paramPool_;\n-\tBufferPool statPool_;\n-\n-\tstd::queue<Buffer *> paramBuffers_;\n-\tstd::queue<Buffer *> statBuffers_;\n+\tstd::vector<std::unique_ptr<FrameBuffer>> paramBuffers_;\n+\tstd::vector<std::unique_ptr<FrameBuffer>> statBuffers_;\n+\tstd::queue<FrameBuffer *> availableParamBuffers_;\n+\tstd::queue<FrameBuffer *> availableStatBuffers_;\n \n \tCamera *activeCamera_;\n };\n@@ -229,17 +226,17 @@ RkISP1Frames::RkISP1Frames(PipelineHandler *pipe)\n \n RkISP1FrameInfo *RkISP1Frames::create(unsigned int frame, Request *request, Stream *stream)\n {\n-\tif (pipe_->paramBuffers_.empty()) {\n+\tif (pipe_->availableParamBuffers_.empty()) {\n \t\tLOG(RkISP1, Error) << \"Parameters buffer underrun\";\n \t\treturn nullptr;\n \t}\n-\tBuffer *paramBuffer = pipe_->paramBuffers_.front();\n+\tFrameBuffer *paramBuffer = pipe_->availableParamBuffers_.front();\n \n-\tif (pipe_->statBuffers_.empty()) {\n+\tif (pipe_->availableStatBuffers_.empty()) {\n \t\tLOG(RkISP1, Error) << \"Statisitc buffer underrun\";\n \t\treturn nullptr;\n \t}\n-\tBuffer *statBuffer = pipe_->statBuffers_.front();\n+\tFrameBuffer *statBuffer = pipe_->availableStatBuffers_.front();\n \n \tBuffer *videoBuffer = request->findBuffer(stream);\n \tif (!videoBuffer) {\n@@ -248,8 +245,8 @@ RkISP1FrameInfo *RkISP1Frames::create(unsigned int frame, Request *request, Stre\n \t\treturn nullptr;\n \t}\n \n-\tpipe_->paramBuffers_.pop();\n-\tpipe_->statBuffers_.pop();\n+\tpipe_->availableParamBuffers_.pop();\n+\tpipe_->availableStatBuffers_.pop();\n \n \tRkISP1FrameInfo *info = new RkISP1FrameInfo;\n \n@@ -273,8 +270,8 @@ int RkISP1Frames::destroy(unsigned int frame)\n \tif (!info)\n \t\treturn -ENOENT;\n \n-\tpipe_->paramBuffers_.push(info->paramBuffer);\n-\tpipe_->statBuffers_.push(info->statBuffer);\n+\tpipe_->availableParamBuffers_.push(info->paramBuffer);\n+\tpipe_->availableStatBuffers_.push(info->statBuffer);\n \n \tframeInfo_.erase(info->frame);\n \n@@ -299,9 +296,21 @@ RkISP1FrameInfo *RkISP1Frames::find(Buffer *buffer)\n \tfor (auto &itInfo : frameInfo_) {\n \t\tRkISP1FrameInfo *info = itInfo.second;\n \n+\t\tif (info->videoBuffer == buffer)\n+\t\t\treturn info;\n+\t}\n+\n+\tLOG(RkISP1, Error) << \"Can't locate info from buffer\";\n+\treturn nullptr;\n+}\n+\n+RkISP1FrameInfo *RkISP1Frames::find(FrameBuffer *buffer)\n+{\n+\tfor (auto &itInfo : frameInfo_) {\n+\t\tRkISP1FrameInfo *info = itInfo.second;\n+\n \t\tif (info->paramBuffer == buffer ||\n-\t\t    info->statBuffer == buffer ||\n-\t\t    info->videoBuffer == buffer)\n+\t\t    info->statBuffer == buffer)\n \t\t\treturn info;\n \t}\n \n@@ -661,6 +670,7 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera,\n {\n \tRkISP1CameraData *data = cameraData(camera);\n \tStream *stream = *streams.begin();\n+\tunsigned int count = 1;\n \tint ret;\n \n \tif (stream->memoryType() == InternalMemory)\n@@ -671,35 +681,41 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera,\n \tif (ret)\n \t\treturn ret;\n \n-\tparamPool_.createBuffers(stream->configuration().bufferCount);\n-\tret = param_->exportBuffers(&paramPool_);\n-\tif (ret) {\n-\t\tvideo_->releaseBuffers();\n-\t\treturn ret;\n-\t}\n+\tunsigned int maxBuffers = 0;\n+\tfor (const Stream *s : camera->streams())\n+\t\tmaxBuffers = std::max(maxBuffers, s->configuration().bufferCount);\n \n-\tstatPool_.createBuffers(stream->configuration().bufferCount);\n-\tret = stat_->exportBuffers(&statPool_);\n-\tif (ret) {\n-\t\tparam_->releaseBuffers();\n-\t\tvideo_->releaseBuffers();\n-\t\treturn ret;\n-\t}\n+\tret = param_->exportBuffers(maxBuffers, &paramBuffers_);\n+\tif (ret < 0)\n+\t\tgoto error;\n+\n+\tret = stat_->exportBuffers(maxBuffers, &statBuffers_);\n+\tif (ret < 0)\n+\t\tgoto error;\n \n-\tfor (unsigned int i = 0; i < stream->configuration().bufferCount; i++) {\n-\t\tdata->ipaBuffers_.push_back({ .id = RKISP1_PARAM_BASE | i,\n-\t\t\t\t\t      .planes = paramPool_.buffers()[i].planes() });\n-\t\tparamBuffers_.push(new Buffer(i));\n+\tfor (std::unique_ptr<FrameBuffer> &buffer : paramBuffers_) {\n+\t\tbuffer->setCookie(count++);\n+\t\tdata->ipaBuffers_.push_back({ .id = buffer->cookie(),\n+\t\t\t\t\t      .planes = buffer->planes() });\n+\t\tavailableParamBuffers_.push(buffer.get());\n \t}\n \n-\tfor (unsigned int i = 0; i < stream->configuration().bufferCount; i++) {\n-\t\tdata->ipaBuffers_.push_back({ .id = RKISP1_STAT_BASE | i,\n-\t\t\t\t\t      .planes = statPool_.buffers()[i].planes() });\n-\t\tstatBuffers_.push(new Buffer(i));\n+\tfor (std::unique_ptr<FrameBuffer> &buffer : statBuffers_) {\n+\t\tbuffer->setCookie(count++);\n+\t\tdata->ipaBuffers_.push_back({ .id = buffer->cookie(),\n+\t\t\t\t\t      .planes = buffer->planes() });\n+\t\tavailableStatBuffers_.push(buffer.get());\n \t}\n \n \tdata->ipa_->mapBuffers(data->ipaBuffers_);\n \n+\treturn 0;\n+\n+error:\n+\tparamBuffers_.clear();\n+\tstatBuffers_.clear();\n+\tvideo_->releaseBuffers();\n+\n \treturn ret;\n }\n \n@@ -708,15 +724,14 @@ int PipelineHandlerRkISP1::freeBuffers(Camera *camera,\n {\n \tRkISP1CameraData *data = cameraData(camera);\n \n-\twhile (!statBuffers_.empty()) {\n-\t\tdelete statBuffers_.front();\n-\t\tstatBuffers_.pop();\n-\t}\n+\twhile (!availableStatBuffers_.empty())\n+\t\tavailableStatBuffers_.pop();\n \n-\twhile (!paramBuffers_.empty()) {\n-\t\tdelete paramBuffers_.front();\n-\t\tparamBuffers_.pop();\n-\t}\n+\twhile (!availableParamBuffers_.empty())\n+\t\tavailableParamBuffers_.pop();\n+\n+\tparamBuffers_.clear();\n+\tstatBuffers_.clear();\n \n \tstd::vector<unsigned int> ids;\n \tfor (IPABuffer &ipabuf : data->ipaBuffers_)\n@@ -823,7 +838,7 @@ int PipelineHandlerRkISP1::queueRequestDevice(Camera *camera,\n \n \tIPAOperationData op;\n \top.operation = RKISP1_IPA_EVENT_QUEUE_REQUEST;\n-\top.data = { data->frame_, RKISP1_PARAM_BASE | info->paramBuffer->index() };\n+\top.data = { data->frame_, info->paramBuffer->cookie() };\n \top.controls = { request->controls() };\n \tdata->ipa_->processEvent(op);\n \n@@ -938,8 +953,8 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n \t\treturn false;\n \n \tvideo_->bufferReady.connect(this, &PipelineHandlerRkISP1::bufferReady);\n-\tstat_->bufferReady.connect(this, &PipelineHandlerRkISP1::statReady);\n-\tparam_->bufferReady.connect(this, &PipelineHandlerRkISP1::paramReady);\n+\tstat_->frameBufferReady.connect(this, &PipelineHandlerRkISP1::statReady);\n+\tparam_->frameBufferReady.connect(this, &PipelineHandlerRkISP1::paramReady);\n \n \t/* Configure default links. */\n \tif (initLinks() < 0) {\n@@ -1001,7 +1016,7 @@ void PipelineHandlerRkISP1::bufferReady(Buffer *buffer)\n \ttryCompleteRequest(request);\n }\n \n-void PipelineHandlerRkISP1::paramReady(Buffer *buffer)\n+void PipelineHandlerRkISP1::paramReady(FrameBuffer *buffer)\n {\n \tASSERT(activeCamera_);\n \tRkISP1CameraData *data = cameraData(activeCamera_);\n@@ -1012,7 +1027,7 @@ void PipelineHandlerRkISP1::paramReady(Buffer *buffer)\n \ttryCompleteRequest(info->request);\n }\n \n-void PipelineHandlerRkISP1::statReady(Buffer *buffer)\n+void PipelineHandlerRkISP1::statReady(FrameBuffer *buffer)\n {\n \tASSERT(activeCamera_);\n \tRkISP1CameraData *data = cameraData(activeCamera_);\n@@ -1021,12 +1036,9 @@ void PipelineHandlerRkISP1::statReady(Buffer *buffer)\n \tif (!info)\n \t\treturn;\n \n-\tunsigned int frame = info->frame;\n-\tunsigned int statid = RKISP1_STAT_BASE | info->statBuffer->index();\n-\n \tIPAOperationData op;\n \top.operation = RKISP1_IPA_EVENT_SIGNAL_STAT_BUFFER;\n-\top.data = { frame, statid };\n+\top.data = { info->frame, info->statBuffer->cookie() };\n \tdata->ipa_->processEvent(op);\n }\n \n","prefixes":["libcamera-devel","v3","22/33"]}