Patch Detail
Show a patch.
GET /api/1.1/patches/2466/?format=api
{ "id": 2466, "url": "https://patchwork.libcamera.org/api/1.1/patches/2466/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2466/", "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": "<20191230120510.938333-17-niklas.soderlund@ragnatech.se>", "date": "2019-12-30T12:05:01", "name": "[libcamera-devel,v2,16/25] libcamera: pipeline: rkisp1: Switch to FrameBuffer interface for stat and param", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "9e70e29396d58bd28aedd7b66761a85cd252471b", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/1.1/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/2466/mbox/", "series": [ { "id": 593, "url": "https://patchwork.libcamera.org/api/1.1/series/593/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=593", "date": "2019-12-30T12:04:45", "name": "libcamera: Rework buffer API", "version": 2, "mbox": "https://patchwork.libcamera.org/series/593/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/2466/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2466/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "Received": [ "from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 00B656046A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 30 Dec 2019 13:06:03 +0100 (CET)", "from bismarck.berto.se (p4fca2fd0.dip0.t-ipconnect.de\n\t[79.202.47.208]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid bfce7828-2afc-11ea-a00b-005056917a89;\n\tMon, 30 Dec 2019 13:06:02 +0100 (CET)" ], "X-Halon-ID": "bfce7828-2afc-11ea-a00b-005056917a89", "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": "Mon, 30 Dec 2019 13:05:01 +0100", "Message-Id": "<20191230120510.938333-17-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.24.1", "In-Reply-To": "<20191230120510.938333-1-niklas.soderlund@ragnatech.se>", "References": "<20191230120510.938333-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 16/25] 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": "Mon, 30 Dec 2019 12:06:04 -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\nyet convert the application facing buffers yet.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 122 ++++++++++++-----------\n 1 file changed, 66 insertions(+), 56 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 9cd0ab3ad88b35cc..ea581aaaa85088cd 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@@ -152,6 +150,7 @@ public:\n \n \tconst V4L2SubdeviceFormat &sensorFormat() { return sensorFormat_; }\n \n+\n private:\n \tstatic constexpr unsigned int RKISP1_BUFFER_COUNT = 4;\n \n@@ -203,8 +202,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 +212,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>> paramBuffersMemory;\n+\tstd::vector<std::unique_ptr<FrameBuffer>> statBuffersMemory;\n+\tstd::queue<FrameBuffer *> paramBuffers_;\n+\tstd::queue<FrameBuffer *> statBuffers_;\n \n \tCamera *activeCamera_;\n };\n@@ -233,13 +231,13 @@ RkISP1FrameInfo *RkISP1Frames::create(unsigned int frame, Request *request, Stre\n \t\tLOG(RkISP1, Error) << \"Parameters buffer underrun\";\n \t\treturn nullptr;\n \t}\n-\tBuffer *paramBuffer = pipe_->paramBuffers_.front();\n+\tFrameBuffer *paramBuffer = pipe_->paramBuffers_.front();\n \n \tif (pipe_->statBuffers_.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_->statBuffers_.front();\n \n \tBuffer *videoBuffer = request->findBuffer(stream);\n \tif (!videoBuffer) {\n@@ -299,9 +297,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@@ -660,6 +670,7 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera,\n \t\t\t\t\t const std::set<Stream *> &streams)\n {\n \tRkISP1CameraData *data = cameraData(camera);\n+\tunsigned int count = 1;\n \tStream *stream = *streams.begin();\n \tint ret;\n \n@@ -671,43 +682,41 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera,\n \tif (ret)\n \t\treturn ret;\n \n-\tparamPool_.createBuffers(stream->configuration().bufferCount + 1);\n-\tret = param_->exportBuffers(¶mPool_);\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 + 1);\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, ¶mBuffersMemory);\n+\tif (ret < 0)\n+\t\tgoto err;\n \n-\tfor (unsigned int i = 0; i < stream->configuration().bufferCount + 1; i++) {\n-\t\tFrameBuffer::Plane plane;\n-\t\tplane.fd = FileDescriptor(paramPool_.buffers()[i].planes()[0].fd.fd());\n-\t\tplane.length = paramPool_.buffers()[i].planes()[0].length;\n+\tret = stat_->exportBuffers(maxBuffers, &statBuffersMemory);\n+\tif (ret < 0)\n+\t\tgoto err;\n \n-\t\tdata->ipaBuffers_.push_back({ .id = RKISP1_PARAM_BASE | i,\n-\t\t\t\t\t .planes = { plane } });\n-\t\tparamBuffers_.push(new Buffer(i));\n+\tfor (std::unique_ptr<FrameBuffer> &buffer : paramBuffersMemory) {\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\tparamBuffers_.push(buffer.get());\n \t}\n \n-\tfor (unsigned int i = 0; i < stream->configuration().bufferCount + 1; i++) {\n-\t\tFrameBuffer::Plane plane;\n-\t\tplane.fd = FileDescriptor(statPool_.buffers()[i].planes()[0].fd.fd());\n-\t\tplane.length = statPool_.buffers()[i].planes()[0].length;\n-\n-\t\tdata->ipaBuffers_.push_back({ .id = RKISP1_STAT_BASE | i,\n-\t\t\t\t\t .planes = { plane } });\n-\t\tstatBuffers_.push(new Buffer(i));\n+\tfor (std::unique_ptr<FrameBuffer> &buffer : statBuffersMemory) {\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\tstatBuffers_.push(buffer.get());\n \t}\n \n \tdata->ipa_->mapBuffers(data->ipaBuffers_);\n \n+\treturn 0;\n+\n+err:\n+\tparamBuffersMemory.clear();\n+\tstatBuffersMemory.clear();\n+\tvideo_->releaseBuffers();\n+\n \treturn ret;\n }\n \n@@ -716,15 +725,14 @@ int PipelineHandlerRkISP1::freeBuffers(Camera *camera,\n {\n \tRkISP1CameraData *data = cameraData(camera);\n \n-\twhile (!statBuffers_.empty()) {\n-\t\tdelete statBuffers_.front();\n+\twhile (!statBuffers_.empty())\n \t\tstatBuffers_.pop();\n-\t}\n \n-\twhile (!paramBuffers_.empty()) {\n-\t\tdelete paramBuffers_.front();\n+\twhile (!paramBuffers_.empty())\n \t\tparamBuffers_.pop();\n-\t}\n+\n+\tparamBuffersMemory.clear();\n+\tstatBuffersMemory.clear();\n \n \tstd::vector<unsigned int> ids;\n \tfor (IPABuffer &ipabuf : data->ipaBuffers_)\n@@ -829,9 +837,11 @@ int PipelineHandlerRkISP1::queueRequestDevice(Camera *camera,\n \tif (!info)\n \t\treturn -ENOENT;\n \n+\tunsigned int paramid = info->paramBuffer->cookie();\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_, paramid };\n \top.controls = { request->controls() };\n \tdata->ipa_->processEvent(op);\n \n@@ -946,8 +956,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@@ -1009,7 +1019,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@@ -1020,7 +1030,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@@ -1030,7 +1040,7 @@ void PipelineHandlerRkISP1::statReady(Buffer *buffer)\n \t\treturn;\n \n \tunsigned int frame = info->frame;\n-\tunsigned int statid = RKISP1_STAT_BASE | info->statBuffer->index();\n+\tunsigned int statid = info->statBuffer->cookie();\n \n \tIPAOperationData op;\n \top.operation = RKISP1_IPA_EVENT_SIGNAL_STAT_BUFFER;\n", "prefixes": [ "libcamera-devel", "v2", "16/25" ] }