From patchwork Mon Oct 28 02:25:17 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: 2264 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 894B661506 for ; Mon, 28 Oct 2019 03:25:51 +0100 (CET) X-Halon-ID: 408b182b-f92a-11e9-903a-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from localhost.localdomain (unknown [93.2.121.143]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id 408b182b-f92a-11e9-903a-005056917f90; Mon, 28 Oct 2019 03:25:48 +0100 (CET) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Mon, 28 Oct 2019 03:25:17 +0100 Message-Id: <20191028022525.796995-5-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191028022525.796995-1-niklas.soderlund@ragnatech.se> References: <20191028022525.796995-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC 04/12] libcamera: pipelines: Switch to helper to resolve request from buffer 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: , X-List-Received-Date: Mon, 28 Oct 2019 02:25:51 -0000 Use the pipeline helper instead of the soon to be removed request recorded in the buffer. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/libcamera/pipeline/ipu3/ipu3.cpp | 2 +- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +- src/libcamera/pipeline/uvcvideo.cpp | 2 +- src/libcamera/pipeline/vimc.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index ff90b729e558c3a3..8aa5f34febf16585 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -948,7 +948,7 @@ void IPU3CameraData::imguInputBufferReady(Buffer *buffer) */ void IPU3CameraData::imguOutputBufferReady(Buffer *buffer) { - Request *request = buffer->request(); + Request *request = requestFromBuffer(buffer); if (!pipe_->completeBuffer(camera_, request, buffer)) /* Request not completed yet, return here. */ diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index cefdb54a06d440fb..0803572754364beb 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -991,7 +991,7 @@ void PipelineHandlerRkISP1::bufferReady(Buffer *buffer) { ASSERT(activeCamera_); RkISP1CameraData *data = cameraData(activeCamera_); - Request *request = buffer->request(); + Request *request = data->requestFromBuffer(buffer); data->timeline_.bufferReady(buffer); diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp index 5aa6a8f9e0b2b7a4..679d82d38227b991 100644 --- a/src/libcamera/pipeline/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo.cpp @@ -375,7 +375,7 @@ int UVCCameraData::init(MediaEntity *entity) void UVCCameraData::bufferReady(Buffer *buffer) { - Request *request = buffer->request(); + Request *request = requestFromBuffer(buffer); pipe_->completeBuffer(camera_, request, buffer); pipe_->completeRequest(camera_, request); diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp index 49b850cf0153020f..56898716a8cde074 100644 --- a/src/libcamera/pipeline/vimc.cpp +++ b/src/libcamera/pipeline/vimc.cpp @@ -460,7 +460,7 @@ int VimcCameraData::init(MediaDevice *media) void VimcCameraData::bufferReady(Buffer *buffer) { - Request *request = buffer->request(); + Request *request = requestFromBuffer(buffer); pipe_->completeBuffer(camera_, request, buffer); pipe_->completeRequest(camera_, request);