Patch Detail
Show a patch.
GET /api/1.1/patches/1537/?format=api
{ "id": 1537, "url": "https://patchwork.libcamera.org/api/1.1/patches/1537/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1537/", "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": "<20190630181049.9548-5-jacopo@jmondi.org>", "date": "2019-06-30T18:10:45", "name": "[libcamera-devel,RFC,4/8] libcamera: Rename PipelineHandler::allocateBuffers", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "54a9c100a3a0cd405cd786e92e6965157715ae56", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1537/mbox/", "series": [ { "id": 383, "url": "https://patchwork.libcamera.org/api/1.1/series/383/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=383", "date": "2019-06-30T18:10:41", "name": "libcamera: Add support for importing external memory buffers", "version": 1, "mbox": "https://patchwork.libcamera.org/series/383/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1537/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1537/checks/", "tags": {}, "headers": { "Return-Path": "<jacopo@jmondi.org>", "Received": [ "from relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C24E961F4A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 30 Jun 2019 20:09:39 +0200 (CEST)", "from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay12.mail.gandi.net (Postfix) with ESMTPSA id 64CD5200003;\n\tSun, 30 Jun 2019 18:09:39 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sun, 30 Jun 2019 20:10:45 +0200", "Message-Id": "<20190630181049.9548-5-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190630181049.9548-1-jacopo@jmondi.org>", "References": "<20190630181049.9548-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [RFC 4/8] libcamera: Rename\n\tPipelineHandler::allocateBuffers", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "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": "Sun, 30 Jun 2019 18:09:40 -0000" }, "content": "Now that the pipeline handlers can inspect the Stream's memory type flag\nthe allocateBuffers() operation name does not match the actual operation\npurpose, which is to setup buffers to export memory to application or\neither prepare to use externally allocated buffers.\n\nTodo: rename the camera operation as well?\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/camera.cpp | 2 +-\n src/libcamera/include/pipeline_handler.h | 4 ++--\n src/libcamera/pipeline/ipu3/ipu3.cpp | 8 ++++----\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 6 +++---\n src/libcamera/pipeline/uvcvideo.cpp | 8 ++++----\n src/libcamera/pipeline/vimc.cpp | 8 ++++----\n src/libcamera/pipeline_handler.cpp | 6 ++++--\n 7 files changed, 22 insertions(+), 20 deletions(-)", "diff": "diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex 662406b970dc..a71b44b82ea0 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -704,7 +704,7 @@ int Camera::allocateBuffers()\n \t\treturn -EINVAL;\n \t}\n \n-\tint ret = pipe_->allocateBuffers(this, activeStreams_);\n+\tint ret = pipe_->setupBuffers(this, activeStreams_);\n \tif (ret) {\n \t\tLOG(Camera, Error) << \"Failed to allocate buffers\";\n \t\treturn ret;\ndiff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h\nindex a4cbc593a179..df479d92883a 100644\n--- a/src/libcamera/include/pipeline_handler.h\n+++ b/src/libcamera/include/pipeline_handler.h\n@@ -64,8 +64,8 @@ public:\n \t\tconst StreamRoles &roles) = 0;\n \tvirtual int configure(Camera *camera, CameraConfiguration *config) = 0;\n \n-\tvirtual int allocateBuffers(Camera *camera,\n-\t\t\t\t const std::set<Stream *> &streams) = 0;\n+\tvirtual int setupBuffers(Camera *camera,\n+\t\t\t\t const std::set<Stream *> &streams) = 0;\n \tvirtual int freeBuffers(Camera *camera,\n \t\t\t\tconst std::set<Stream *> &streams) = 0;\n \ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 2de0892138a8..2975b59a0953 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -207,8 +207,8 @@ public:\n \t\tconst StreamRoles &roles) override;\n \tint configure(Camera *camera, CameraConfiguration *config) override;\n \n-\tint allocateBuffers(Camera *camera,\n-\t\t\t const std::set<Stream *> &streams) override;\n+\tint setupBuffers(Camera *camera,\n+\t\t\t const std::set<Stream *> &streams) override;\n \tint freeBuffers(Camera *camera,\n \t\t\tconst std::set<Stream *> &streams) override;\n \n@@ -588,8 +588,8 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n * In order to be able to start the 'viewfinder' and 'stat' nodes, we need\n * memory to be reserved.\n */\n-int PipelineHandlerIPU3::allocateBuffers(Camera *camera,\n-\t\t\t\t\t const std::set<Stream *> &streams)\n+int PipelineHandlerIPU3::setupBuffers(Camera *camera,\n+\t\t\t\t const std::set<Stream *> &streams)\n {\n \tIPU3CameraData *data = cameraData(camera);\n \tIPU3Stream *outStream = &data->outStream_;\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 4a5898d25f91..716428e33d6c 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -80,7 +80,7 @@ public:\n \t\tconst StreamRoles &roles) override;\n \tint configure(Camera *camera, CameraConfiguration *config) override;\n \n-\tint allocateBuffers(Camera *camera,\n+\tint setupBuffers(Camera *camera,\n \t\tconst std::set<Stream *> &streams) override;\n \tint freeBuffers(Camera *camera,\n \t\tconst std::set<Stream *> &streams) override;\n@@ -315,8 +315,8 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \treturn 0;\n }\n \n-int PipelineHandlerRkISP1::allocateBuffers(Camera *camera,\n-\t\t\t\t\t const std::set<Stream *> &streams)\n+int PipelineHandlerRkISP1::setupBuffers(Camera *camera,\n+\t\t\t\t\tconst std::set<Stream *> &streams)\n {\n \tStream *stream = *streams.begin();\n \treturn video_->exportBuffers(&stream->bufferPool());\ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex 5112356c25ac..e66a55c83c66 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -58,8 +58,8 @@ public:\n \t\tconst StreamRoles &roles) override;\n \tint configure(Camera *camera, CameraConfiguration *config) override;\n \n-\tint allocateBuffers(Camera *camera,\n-\t\t\t const std::set<Stream *> &streams) override;\n+\tint setupBuffers(Camera *camera,\n+\t\t\t const std::set<Stream *> &streams) override;\n \tint freeBuffers(Camera *camera,\n \t\t\tconst std::set<Stream *> &streams) override;\n \n@@ -184,8 +184,8 @@ int PipelineHandlerUVC::configure(Camera *camera, CameraConfiguration *config)\n \treturn 0;\n }\n \n-int PipelineHandlerUVC::allocateBuffers(Camera *camera,\n-\t\t\t\t\tconst std::set<Stream *> &streams)\n+int PipelineHandlerUVC::setupBuffers(Camera *camera,\n+\t\t\t\t const std::set<Stream *> &streams)\n {\n \tUVCCameraData *data = cameraData(camera);\n \tStream *stream = *streams.begin();\ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex 21a37dba1fc6..3d48305f4b76 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -62,8 +62,8 @@ public:\n \t\tconst StreamRoles &roles) override;\n \tint configure(Camera *camera, CameraConfiguration *config) override;\n \n-\tint allocateBuffers(Camera *camera,\n-\t\t\t const std::set<Stream *> &streams) override;\n+\tint setupBuffers(Camera *camera,\n+\t\t\t const std::set<Stream *> &streams) override;\n \tint freeBuffers(Camera *camera,\n \t\t\tconst std::set<Stream *> &streams) override;\n \n@@ -183,8 +183,8 @@ int PipelineHandlerVimc::configure(Camera *camera, CameraConfiguration *config)\n \treturn 0;\n }\n \n-int PipelineHandlerVimc::allocateBuffers(Camera *camera,\n-\t\t\t\t\t const std::set<Stream *> &streams)\n+int PipelineHandlerVimc::setupBuffers(Camera *camera,\n+\t\t\t\t const std::set<Stream *> &streams)\n {\n \tVimcCameraData *data = cameraData(camera);\n \tStream *stream = *streams.begin();\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex c91ef2f7d336..fbebe4a04acd 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -261,11 +261,13 @@ void PipelineHandler::unlock()\n */\n \n /**\n- * \\fn PipelineHandler::allocateBuffers()\n- * \\brief Allocate buffers for a stream\n+ * \\fn PipelineHandler::setupBuffers()\n+ * \\brief Setup buffer for a stream\n * \\param[in] camera The camera the \\a stream belongs to\n * \\param[in] streams The set of streams to allocate buffers for\n *\n+ * \\todo Change this to describe both allocation and importing\n+ *\n * This method allocates buffers internally in the pipeline handler for each\n * stream in the \\a streams buffer set, and associates them with the stream's\n * buffer pool.\n", "prefixes": [ "libcamera-devel", "RFC", "4/8" ] }