From patchwork Fri Feb 8 12:41:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 549 Return-Path: Received: from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net [195.74.38.228]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3472E60B0E for ; Fri, 8 Feb 2019 13:41:14 +0100 (CET) X-Halon-ID: cb43267f-2b9e-11e9-b5ae-0050569116f7 Authorized-sender: niklas@soderlund.pp.se Received: from localhost.localdomain (unknown [81.164.19.127]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA id cb43267f-2b9e-11e9-b5ae-0050569116f7; Fri, 08 Feb 2019 13:41:08 +0100 (CET) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Fri, 8 Feb 2019 13:41:00 +0100 Message-Id: <20190208124100.7498-1-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: pipeline: vimc: fix name of pipeline handler class 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: Fri, 08 Feb 2019 12:41:14 -0000 Rename the VIMC pipeline handler to match the naming convection. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/libcamera/pipeline/vimc.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp index 0e9ad7b59ee57574..46840a4f410456d2 100644 --- a/src/libcamera/pipeline/vimc.cpp +++ b/src/libcamera/pipeline/vimc.cpp @@ -19,11 +19,11 @@ namespace libcamera { LOG_DEFINE_CATEGORY(VIMC) -class PipeHandlerVimc : public PipelineHandler +class PipelineHandlerVimc : public PipelineHandler { public: - PipeHandlerVimc(CameraManager *manager); - ~PipeHandlerVimc(); + PipelineHandlerVimc(CameraManager *manager); + ~PipelineHandlerVimc(); std::map streamConfiguration(Camera *camera, @@ -47,12 +47,12 @@ private: Stream stream_; }; -PipeHandlerVimc::PipeHandlerVimc(CameraManager *manager) +PipelineHandlerVimc::PipelineHandlerVimc(CameraManager *manager) : PipelineHandler(manager), media_(nullptr), video_(nullptr) { } -PipeHandlerVimc::~PipeHandlerVimc() +PipelineHandlerVimc::~PipelineHandlerVimc() { delete video_; @@ -61,7 +61,7 @@ PipeHandlerVimc::~PipeHandlerVimc() } std::map -PipeHandlerVimc::streamConfiguration(Camera *camera, +PipelineHandlerVimc::streamConfiguration(Camera *camera, std::vector &streams) { std::map configs; @@ -79,7 +79,7 @@ PipeHandlerVimc::streamConfiguration(Camera *camera, return configs; } -int PipeHandlerVimc::configureStreams(Camera *camera, +int PipelineHandlerVimc::configureStreams(Camera *camera, std::map &config) { StreamConfiguration *cfg = &config[&stream_]; @@ -95,7 +95,7 @@ int PipeHandlerVimc::configureStreams(Camera *camera, return video_->setFormat(&format); } -int PipeHandlerVimc::allocateBuffers(Camera *camera, Stream *stream) +int PipelineHandlerVimc::allocateBuffers(Camera *camera, Stream *stream) { const StreamConfiguration &cfg = stream->configuration(); @@ -104,22 +104,22 @@ int PipeHandlerVimc::allocateBuffers(Camera *camera, Stream *stream) return video_->exportBuffers(cfg.bufferCount, &stream->bufferPool()); } -int PipeHandlerVimc::freeBuffers(Camera *camera, Stream *stream) +int PipelineHandlerVimc::freeBuffers(Camera *camera, Stream *stream) { return video_->releaseBuffers(); } -int PipeHandlerVimc::start(const Camera *camera) +int PipelineHandlerVimc::start(const Camera *camera) { return video_->streamOn(); } -void PipeHandlerVimc::stop(const Camera *camera) +void PipelineHandlerVimc::stop(const Camera *camera) { video_->streamOff(); } -int PipeHandlerVimc::queueRequest(const Camera *camera, Request *request) +int PipelineHandlerVimc::queueRequest(const Camera *camera, Request *request) { Buffer *buffer = request->findBuffer(&stream_); if (!buffer) { @@ -134,7 +134,7 @@ int PipeHandlerVimc::queueRequest(const Camera *camera, Request *request) return 0; } -bool PipeHandlerVimc::match(DeviceEnumerator *enumerator) +bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator) { DeviceMatch dm("vimc"); @@ -169,6 +169,6 @@ bool PipeHandlerVimc::match(DeviceEnumerator *enumerator) return true; } -REGISTER_PIPELINE_HANDLER(PipeHandlerVimc); +REGISTER_PIPELINE_HANDLER(PipelineHandlerVimc); } /* namespace libcamera */