From patchwork Wed Aug 11 23:26:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 13322 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 3FF56C3249 for ; Wed, 11 Aug 2021 23:26:47 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D668468889; Thu, 12 Aug 2021 01:26:46 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="SOXsT760"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 89EED6884D for ; Thu, 12 Aug 2021 01:26:37 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 33092268 for ; Thu, 12 Aug 2021 01:26:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1628724397; bh=v4l0TfJGrIWZzQA8je2kLRBPT8RmYSVNN/nSfIdhqVY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=SOXsT760cMtgZnMCSW70WmNk5hpABy5xOeJOxUeLMxADpx25tiFe4+v1TnsuTBeF4 CqTVuRlOgdcfiunqZ8Jm7ZpHq/WfSn10xTLAvZWr1EicSlzZI4s04DGCTq2g+im+HH d32Wcw1RdwH+3c9P6y4kqTB+zOYqLz/8vt6uj93Q= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Thu, 12 Aug 2021 02:26:25 +0300 Message-Id: <20210811232625.17280-15-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210811232625.17280-1-laurent.pinchart@ideasonboard.com> References: <20210811232625.17280-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 14/14] libcamera: pipeline: Cast to derived pipeline handler with helpers X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Replace manual static casts from the PipelineHandler pointer to a derived class pointer with helper functions in the camera data classes. This simplifies code accessing the pipeline from the camera data. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Reviewed-by: Kieran Bingham --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 14 ++++++++------ src/libcamera/pipeline/simple/simple.cpp | 16 +++++++++------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 3c37a8ccad8f..2dbd6304acce 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -87,6 +87,7 @@ public: { } + PipelineHandlerRkISP1 *pipe(); int loadIPA(unsigned int hwRevision); Stream mainPathStream_; @@ -304,6 +305,11 @@ RkISP1FrameInfo *RkISP1Frames::find(Request *request) return nullptr; } +PipelineHandlerRkISP1 *RkISP1CameraData::pipe() +{ + return static_cast(Camera::Private::pipe()); +} + int RkISP1CameraData::loadIPA(unsigned int hwRevision) { ipa_ = IPAManager::createIPA(pipe(), 1, 1); @@ -332,8 +338,7 @@ void RkISP1CameraData::queueFrameAction(unsigned int frame, break; } case ipa::rkisp1::ActionParamFilled: { - PipelineHandlerRkISP1 *pipe = - static_cast(this->pipe()); + PipelineHandlerRkISP1 *pipe = RkISP1CameraData::pipe(); RkISP1FrameInfo *info = frameInfo_.find(frame); if (!info) break; @@ -360,9 +365,6 @@ void RkISP1CameraData::queueFrameAction(unsigned int frame, void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &metadata) { - PipelineHandlerRkISP1 *pipe = - static_cast(this->pipe()); - RkISP1FrameInfo *info = frameInfo_.find(frame); if (!info) return; @@ -370,7 +372,7 @@ void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &meta info->request->metadata().merge(metadata); info->metadataProcessed = true; - pipe->tryCompleteRequest(info->request); + pipe()->tryCompleteRequest(info->request); } RkISP1CameraConfiguration::RkISP1CameraConfiguration(Camera *camera, diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index ef7687eaf502..8ff954722fed 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -155,6 +155,7 @@ public: MediaEntity *sensor); bool isValid() const { return sensor_ != nullptr; } + SimplePipelineHandler *pipe(); int init(); int setupLinks(); @@ -352,11 +353,14 @@ SimpleCameraData::SimpleCameraData(SimplePipelineHandler *pipe, [](const Entity &e) { return e.entity->name(); }); } +SimplePipelineHandler *SimpleCameraData::pipe() +{ + return static_cast(Camera::Private::pipe()); +} + int SimpleCameraData::init() { - SimplePipelineHandler *pipe = - static_cast(this->pipe()); - SimpleConverter *converter = pipe->converter(); + SimpleConverter *converter = pipe()->converter(); int ret; /* @@ -480,8 +484,7 @@ int SimpleCameraData::setupLinks() int SimpleCameraData::setupFormats(V4L2SubdeviceFormat *format, V4L2Subdevice::Whence whence) { - SimplePipelineHandler *pipe = - static_cast(this->pipe()); + SimplePipelineHandler *pipe = SimpleCameraData::pipe(); int ret; /* @@ -582,8 +585,7 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate() } /* Adjust the requested streams. */ - SimplePipelineHandler *pipe = static_cast(data_->pipe()); - SimpleConverter *converter = pipe->converter(); + SimpleConverter *converter = data_->pipe()->converter(); /* * Enable usage of the converter when producing multiple streams, as