From patchwork Fri Sep 25 01:42:03 2020 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: 9816 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 4B358C3B5E for ; Fri, 25 Sep 2020 01:43:01 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1801A63034; Fri, 25 Sep 2020 03:43:01 +0200 (CEST) Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net [195.74.38.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B208C63012 for ; Fri, 25 Sep 2020 03:42:55 +0200 (CEST) X-Halon-ID: 6e217272-fed0-11ea-92dc-005056917a89 Authorized-sender: niklas.soderlund@fsdn.se Received: from bismarck.berto.se (p54ac52a8.dip0.t-ipconnect.de [84.172.82.168]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA id 6e217272-fed0-11ea-92dc-005056917a89; Fri, 25 Sep 2020 03:42:54 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Fri, 25 Sep 2020 03:42:03 +0200 Message-Id: <20200925014207.1455796-19-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200925014207.1455796-1-niklas.soderlund@ragnatech.se> References: <20200925014207.1455796-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 18/22] libcamera: pipeline: rkisp1: Add wrappers for accessing the path video device 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" As a step to be able to make RkISP1Path::video_ private add simple wrappers for buffer handling. There is no functional change. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 12 ++++++------ src/libcamera/pipeline/rkisp1/rkisp1path.cpp | 6 ++++++ src/libcamera/pipeline/rkisp1/rkisp1path.h | 10 +++++++++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 114aee3e180afb77..7dd4fb11c39dd811 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -403,10 +403,10 @@ protected: pipe_->stat_->queueBuffer(info->statBuffer); if (info->mainPathBuffer) - pipe_->mainPath_.video_->queueBuffer(info->mainPathBuffer); + pipe_->mainPath_.queueBuffer(info->mainPathBuffer); if (info->selfPathBuffer) - pipe_->selfPath_.video_->queueBuffer(info->selfPathBuffer); + pipe_->selfPath_.queueBuffer(info->selfPathBuffer); } private: @@ -752,9 +752,9 @@ int PipelineHandlerRkISP1::exportFrameBuffers([[maybe_unused]] Camera *camera, S unsigned int count = stream->configuration().bufferCount; if (stream == &data->mainPathStream_) - return mainPath_.video_->exportBuffers(count, buffers); + return mainPath_.exportBuffers(count, buffers); else if (stream == &data->selfPathStream_) - return selfPath_.video_->exportBuffers(count, buffers); + return selfPath_.exportBuffers(count, buffers); return -EINVAL; } @@ -1154,8 +1154,8 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator) if (!selfPath_.init(media_)) return false; - mainPath_.video_->bufferReady.connect(this, &PipelineHandlerRkISP1::bufferReady); - selfPath_.video_->bufferReady.connect(this, &PipelineHandlerRkISP1::bufferReady); + mainPath_.bufferReady().connect(this, &PipelineHandlerRkISP1::bufferReady); + selfPath_.bufferReady().connect(this, &PipelineHandlerRkISP1::bufferReady); stat_->bufferReady.connect(this, &PipelineHandlerRkISP1::statReady); param_->bufferReady.connect(this, &PipelineHandlerRkISP1::paramReady); diff --git a/src/libcamera/pipeline/rkisp1/rkisp1path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1path.cpp index 0be4d20bb1cd2094..74eaa5d32388184b 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1path.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1path.cpp @@ -149,6 +149,12 @@ int RkISP1Path::configure(const StreamConfiguration &config, return 0; } +int RkISP1Path::exportBuffers(unsigned int bufferCount, + std::vector> *buffers) +{ + return video_->exportBuffers(bufferCount, buffers); +} + RkISP1MainPath::RkISP1MainPath() : RkISP1Path("main", { diff --git a/src/libcamera/pipeline/rkisp1/rkisp1path.h b/src/libcamera/pipeline/rkisp1/rkisp1path.h index 5b2917c746ee1d95..1315b2c64feac681 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1path.h +++ b/src/libcamera/pipeline/rkisp1/rkisp1path.h @@ -10,6 +10,9 @@ #include #include +#include + +#include "libcamera/internal/v4l2_videodevice.h" namespace libcamera { @@ -17,7 +20,6 @@ class MediaDevice; class PixelFormat; class Size; class V4L2Subdevice; -class V4L2VideoDevice; struct StreamConfiguration; struct V4L2SubdeviceFormat; @@ -36,6 +38,12 @@ public: int configure(const StreamConfiguration &config, const V4L2SubdeviceFormat &inputFormat); + int exportBuffers(unsigned int bufferCount, + std::vector> *buffers); + + int queueBuffer(FrameBuffer *buffer) { return video_->queueBuffer(buffer); } + Signal &bufferReady() { return video_->bufferReady; } + /* \todo Make video private. */ V4L2VideoDevice *video_;