From patchwork Sun Jun 30 18:10:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 1537 Return-Path: Received: from relay12.mail.gandi.net (relay12.mail.gandi.net [217.70.178.232]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C24E961F4A for ; Sun, 30 Jun 2019 20:09:39 +0200 (CEST) Received: from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101]) (Authenticated sender: jacopo@jmondi.org) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 64CD5200003; Sun, 30 Jun 2019 18:09:39 +0000 (UTC) From: Jacopo Mondi 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 Subject: [libcamera-devel] [RFC 4/8] libcamera: Rename PipelineHandler::allocateBuffers X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jun 2019 18:09:40 -0000 Now that the pipeline handlers can inspect the Stream's memory type flag the allocateBuffers() operation name does not match the actual operation purpose, which is to setup buffers to export memory to application or either prepare to use externally allocated buffers. Todo: rename the camera operation as well? Signed-off-by: Jacopo Mondi --- src/libcamera/camera.cpp | 2 +- src/libcamera/include/pipeline_handler.h | 4 ++-- src/libcamera/pipeline/ipu3/ipu3.cpp | 8 ++++---- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 6 +++--- src/libcamera/pipeline/uvcvideo.cpp | 8 ++++---- src/libcamera/pipeline/vimc.cpp | 8 ++++---- src/libcamera/pipeline_handler.cpp | 6 ++++-- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 662406b970dc..a71b44b82ea0 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -704,7 +704,7 @@ int Camera::allocateBuffers() return -EINVAL; } - int ret = pipe_->allocateBuffers(this, activeStreams_); + int ret = pipe_->setupBuffers(this, activeStreams_); if (ret) { LOG(Camera, Error) << "Failed to allocate buffers"; return ret; diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h index a4cbc593a179..df479d92883a 100644 --- a/src/libcamera/include/pipeline_handler.h +++ b/src/libcamera/include/pipeline_handler.h @@ -64,8 +64,8 @@ public: const StreamRoles &roles) = 0; virtual int configure(Camera *camera, CameraConfiguration *config) = 0; - virtual int allocateBuffers(Camera *camera, - const std::set &streams) = 0; + virtual int setupBuffers(Camera *camera, + const std::set &streams) = 0; virtual int freeBuffers(Camera *camera, const std::set &streams) = 0; diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 2de0892138a8..2975b59a0953 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -207,8 +207,8 @@ public: const StreamRoles &roles) override; int configure(Camera *camera, CameraConfiguration *config) override; - int allocateBuffers(Camera *camera, - const std::set &streams) override; + int setupBuffers(Camera *camera, + const std::set &streams) override; int freeBuffers(Camera *camera, const std::set &streams) override; @@ -588,8 +588,8 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c) * In order to be able to start the 'viewfinder' and 'stat' nodes, we need * memory to be reserved. */ -int PipelineHandlerIPU3::allocateBuffers(Camera *camera, - const std::set &streams) +int PipelineHandlerIPU3::setupBuffers(Camera *camera, + const std::set &streams) { IPU3CameraData *data = cameraData(camera); IPU3Stream *outStream = &data->outStream_; diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 4a5898d25f91..716428e33d6c 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -80,7 +80,7 @@ public: const StreamRoles &roles) override; int configure(Camera *camera, CameraConfiguration *config) override; - int allocateBuffers(Camera *camera, + int setupBuffers(Camera *camera, const std::set &streams) override; int freeBuffers(Camera *camera, const std::set &streams) override; @@ -315,8 +315,8 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c) return 0; } -int PipelineHandlerRkISP1::allocateBuffers(Camera *camera, - const std::set &streams) +int PipelineHandlerRkISP1::setupBuffers(Camera *camera, + const std::set &streams) { Stream *stream = *streams.begin(); return video_->exportBuffers(&stream->bufferPool()); diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp index 5112356c25ac..e66a55c83c66 100644 --- a/src/libcamera/pipeline/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo.cpp @@ -58,8 +58,8 @@ public: const StreamRoles &roles) override; int configure(Camera *camera, CameraConfiguration *config) override; - int allocateBuffers(Camera *camera, - const std::set &streams) override; + int setupBuffers(Camera *camera, + const std::set &streams) override; int freeBuffers(Camera *camera, const std::set &streams) override; @@ -184,8 +184,8 @@ int PipelineHandlerUVC::configure(Camera *camera, CameraConfiguration *config) return 0; } -int PipelineHandlerUVC::allocateBuffers(Camera *camera, - const std::set &streams) +int PipelineHandlerUVC::setupBuffers(Camera *camera, + const std::set &streams) { UVCCameraData *data = cameraData(camera); Stream *stream = *streams.begin(); diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp index 21a37dba1fc6..3d48305f4b76 100644 --- a/src/libcamera/pipeline/vimc.cpp +++ b/src/libcamera/pipeline/vimc.cpp @@ -62,8 +62,8 @@ public: const StreamRoles &roles) override; int configure(Camera *camera, CameraConfiguration *config) override; - int allocateBuffers(Camera *camera, - const std::set &streams) override; + int setupBuffers(Camera *camera, + const std::set &streams) override; int freeBuffers(Camera *camera, const std::set &streams) override; @@ -183,8 +183,8 @@ int PipelineHandlerVimc::configure(Camera *camera, CameraConfiguration *config) return 0; } -int PipelineHandlerVimc::allocateBuffers(Camera *camera, - const std::set &streams) +int PipelineHandlerVimc::setupBuffers(Camera *camera, + const std::set &streams) { VimcCameraData *data = cameraData(camera); Stream *stream = *streams.begin(); diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp index c91ef2f7d336..fbebe4a04acd 100644 --- a/src/libcamera/pipeline_handler.cpp +++ b/src/libcamera/pipeline_handler.cpp @@ -261,11 +261,13 @@ void PipelineHandler::unlock() */ /** - * \fn PipelineHandler::allocateBuffers() - * \brief Allocate buffers for a stream + * \fn PipelineHandler::setupBuffers() + * \brief Setup buffer for a stream * \param[in] camera The camera the \a stream belongs to * \param[in] streams The set of streams to allocate buffers for * + * \todo Change this to describe both allocation and importing + * * This method allocates buffers internally in the pipeline handler for each * stream in the \a streams buffer set, and associates them with the stream's * buffer pool.