Patch Detail
Show a patch.
GET /api/1.1/patches/1034/?format=api
{ "id": 1034, "url": "https://patchwork.libcamera.org/api/1.1/patches/1034/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1034/", "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": "<20190418104715.22622-3-jacopo@jmondi.org>", "date": "2019-04-18T10:47:03", "name": "[libcamera-devel,v5,02/14] libcamera: camera: Pass the stream set to allocate/freeBuffers()", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "eb7efc2a36e86321caf5d0d505486412f1ef6d49", "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/1034/mbox/", "series": [ { "id": 255, "url": "https://patchwork.libcamera.org/api/1.1/series/255/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=255", "date": "2019-04-18T10:47:01", "name": "libcamera: ipu3: Multiple streams support", "version": 5, "mbox": "https://patchwork.libcamera.org/series/255/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1034/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1034/checks/", "tags": {}, "headers": { "Return-Path": "<jacopo@jmondi.org>", "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 9EBE760DC6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 18 Apr 2019 12:46:31 +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 relay5-d.mail.gandi.net (Postfix) with ESMTPSA id C5B2A1C0007;\n\tThu, 18 Apr 2019 10:46:30 +0000 (UTC)" ], "X-Originating-IP": "2.224.242.101", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 18 Apr 2019 12:47:03 +0200", "Message-Id": "<20190418104715.22622-3-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190418104715.22622-1-jacopo@jmondi.org>", "References": "<20190418104715.22622-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v5 02/14] libcamera: camera: Pass the\n\tstream set to allocate/freeBuffers()", "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": "Thu, 18 Apr 2019 10:46:31 -0000" }, "content": "Pipeline handlers might need to perform allocation of internal buffers,\nsetup operations, or simple sanity check before going into the\nper-stream buffer allocation.\n\nAs of now, PipelineHandler::allocateBuffers() is called once for each\nactive stream, leaving no space for stream-independent configuration.\n\nChange this by providing to the pipeline handlers the full set of active\nstreams, and ask them to loop over them to perform per-streams\nmemory allocations and freeing.\n\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/camera.cpp | 15 ++++++---------\n src/libcamera/include/pipeline_handler.h | 6 ++++--\n src/libcamera/pipeline/ipu3/ipu3.cpp | 13 +++++++++----\n src/libcamera/pipeline/uvcvideo.cpp | 13 +++++++++----\n src/libcamera/pipeline/vimc.cpp | 13 +++++++++----\n src/libcamera/pipeline_handler.cpp | 11 ++++++-----\n 6 files changed, 43 insertions(+), 28 deletions(-)", "diff": "diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex bdf14b31d8ee..21caa24b90b5 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -647,13 +647,11 @@ int Camera::allocateBuffers()\n \t\treturn -EINVAL;\n \t}\n \n-\tfor (Stream *stream : activeStreams_) {\n-\t\tint ret = pipe_->allocateBuffers(this, stream);\n-\t\tif (ret) {\n-\t\t\tLOG(Camera, Error) << \"Failed to allocate buffers\";\n-\t\t\tfreeBuffers();\n-\t\t\treturn ret;\n-\t\t}\n+\tint ret = pipe_->allocateBuffers(this, activeStreams_);\n+\tif (ret) {\n+\t\tLOG(Camera, Error) << \"Failed to allocate buffers\";\n+\t\tfreeBuffers();\n+\t\treturn ret;\n \t}\n \n \tstate_ = CameraPrepared;\n@@ -683,12 +681,11 @@ int Camera::freeBuffers()\n \t\t * by the V4L2 device that has allocated them.\n \t\t */\n \t\tstream->bufferPool().destroyBuffers();\n-\t\tpipe_->freeBuffers(this, stream);\n \t}\n \n \tstate_ = CameraConfigured;\n \n-\treturn 0;\n+\treturn pipe_->freeBuffers(this, activeStreams_);\n }\n \n /**\ndiff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h\nindex 33b820e706cc..a0862ebf35df 100644\n--- a/src/libcamera/include/pipeline_handler.h\n+++ b/src/libcamera/include/pipeline_handler.h\n@@ -58,8 +58,10 @@ public:\n \tstreamConfiguration(Camera *camera, const std::vector<StreamUsage> &usages) = 0;\n \tvirtual int configureStreams(Camera *camera, const CameraConfiguration &config) = 0;\n \n-\tvirtual int allocateBuffers(Camera *camera, Stream *stream) = 0;\n-\tvirtual int freeBuffers(Camera *camera, Stream *stream) = 0;\n+\tvirtual int allocateBuffers(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 \n \tvirtual int start(Camera *camera) = 0;\n \tvirtual void stop(Camera *camera);\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex ca09da753b90..f96e8763bce9 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -145,8 +145,10 @@ public:\n \tint configureStreams(Camera *camera,\n \t\t\t const CameraConfiguration &config) override;\n \n-\tint allocateBuffers(Camera *camera, Stream *stream) override;\n-\tint freeBuffers(Camera *camera, Stream *stream) override;\n+\tint allocateBuffers(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 \tint start(Camera *camera) override;\n \tvoid stop(Camera *camera) override;\n@@ -305,9 +307,11 @@ int PipelineHandlerIPU3::configureStreams(Camera *camera,\n \treturn 0;\n }\n \n-int PipelineHandlerIPU3::allocateBuffers(Camera *camera, Stream *stream)\n+int PipelineHandlerIPU3::allocateBuffers(Camera *camera,\n+\t\t\t\t\t const std::set<Stream *> &streams)\n {\n \tIPU3CameraData *data = cameraData(camera);\n+\tStream *stream = *streams.begin();\n \tCIO2Device *cio2 = &data->cio2_;\n \tImgUDevice *imgu = data->imgu_;\n \tint ret;\n@@ -346,7 +350,8 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera, Stream *stream)\n \treturn 0;\n }\n \n-int PipelineHandlerIPU3::freeBuffers(Camera *camera, Stream *stream)\n+int PipelineHandlerIPU3::freeBuffers(Camera *camera,\n+\t\t\t\t const std::set<Stream *> &streams)\n {\n \tIPU3CameraData *data = cameraData(camera);\n \ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex cd472cfadd86..b8f634d88b46 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -32,8 +32,10 @@ public:\n \tint configureStreams(Camera *camera,\n \t\t\t const CameraConfiguration &config) override;\n \n-\tint allocateBuffers(Camera *camera, Stream *stream) override;\n-\tint freeBuffers(Camera *camera, Stream *stream) override;\n+\tint allocateBuffers(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 \tint start(Camera *camera) override;\n \tvoid stop(Camera *camera) override;\n@@ -127,9 +129,11 @@ int PipelineHandlerUVC::configureStreams(Camera *camera,\n \treturn 0;\n }\n \n-int PipelineHandlerUVC::allocateBuffers(Camera *camera, Stream *stream)\n+int PipelineHandlerUVC::allocateBuffers(Camera *camera,\n+\t\t\t\t\tconst std::set<Stream *> &streams)\n {\n \tUVCCameraData *data = cameraData(camera);\n+\tStream *stream = *streams.begin();\n \tconst StreamConfiguration &cfg = stream->configuration();\n \n \tLOG(UVC, Debug) << \"Requesting \" << cfg.bufferCount << \" buffers\";\n@@ -137,7 +141,8 @@ int PipelineHandlerUVC::allocateBuffers(Camera *camera, Stream *stream)\n \treturn data->video_->exportBuffers(&stream->bufferPool());\n }\n \n-int PipelineHandlerUVC::freeBuffers(Camera *camera, Stream *stream)\n+int PipelineHandlerUVC::freeBuffers(Camera *camera,\n+\t\t\t\t const std::set<Stream *> &streams)\n {\n \tUVCCameraData *data = cameraData(camera);\n \treturn data->video_->releaseBuffers();\ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex c8bbe2a19847..22449e47bc2d 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -32,8 +32,10 @@ public:\n \tint configureStreams(Camera *camera,\n \t\t\t const CameraConfiguration &config) override;\n \n-\tint allocateBuffers(Camera *camera, Stream *stream) override;\n-\tint freeBuffers(Camera *camera, Stream *stream) override;\n+\tint allocateBuffers(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 \tint start(Camera *camera) override;\n \tvoid stop(Camera *camera) override;\n@@ -127,9 +129,11 @@ int PipelineHandlerVimc::configureStreams(Camera *camera,\n \treturn 0;\n }\n \n-int PipelineHandlerVimc::allocateBuffers(Camera *camera, Stream *stream)\n+int PipelineHandlerVimc::allocateBuffers(Camera *camera,\n+\t\t\t\t\t const std::set<Stream *> &streams)\n {\n \tVimcCameraData *data = cameraData(camera);\n+\tStream *stream = *streams.begin();\n \tconst StreamConfiguration &cfg = stream->configuration();\n \n \tLOG(VIMC, Debug) << \"Requesting \" << cfg.bufferCount << \" buffers\";\n@@ -137,7 +141,8 @@ int PipelineHandlerVimc::allocateBuffers(Camera *camera, Stream *stream)\n \treturn data->video_->exportBuffers(&stream->bufferPool());\n }\n \n-int PipelineHandlerVimc::freeBuffers(Camera *camera, Stream *stream)\n+int PipelineHandlerVimc::freeBuffers(Camera *camera,\n+\t\t\t\t const std::set<Stream *> &streams)\n {\n \tVimcCameraData *data = cameraData(camera);\n \treturn data->video_->releaseBuffers();\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 43550c0e0210..911d08448e69 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -193,10 +193,11 @@ PipelineHandler::~PipelineHandler()\n * \\fn PipelineHandler::allocateBuffers()\n * \\brief Allocate buffers for a stream\n * \\param[in] camera The camera the \\a stream belongs to\n- * \\param[in] stream The stream to allocate buffers for\n+ * \\param[in] streams The set of streams to allocate buffers for\n *\n- * This method allocates buffers internally in the pipeline handler and\n- * associates them with the stream's buffer pool.\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 *\n * The intended caller of this method is the Camera class.\n *\n@@ -207,9 +208,9 @@ PipelineHandler::~PipelineHandler()\n * \\fn PipelineHandler::freeBuffers()\n * \\brief Free all buffers associated with a stream\n * \\param[in] camera The camera the \\a stream belongs to\n- * \\param[in] stream The stream to free buffers from\n+ * \\param[in] streams The set of streams to free buffers from\n *\n- * After a capture session has been stopped all buffers associated with the\n+ * After a capture session has been stopped all buffers associated with each\n * stream shall be freed.\n *\n * The intended caller of this method is the Camera class.\n", "prefixes": [ "libcamera-devel", "v5", "02/14" ] }