From patchwork Thu Apr 18 07:49:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 19902 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 2F250C3213 for ; Thu, 18 Apr 2024 07:49:59 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C43EF633FA; Thu, 18 Apr 2024 09:49:58 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="u/WikHay"; 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 0291861B43 for ; Thu, 18 Apr 2024 09:49:56 +0200 (CEST) Received: from fedora.local (unknown [103.251.226.7]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 5EE0E27C; Thu, 18 Apr 2024 09:49:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1713426548; bh=VXr3D+TUxrRHSWDqDk0UGq+2PnJnjfPyy2Sjwir6f4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u/WikHayjHlz05PWPfx0GuBrnZC2Ud/7Ds5wYYH3JBem8WCnoZ6cF6LwopCQXUIpj fhB2d1Sh23PVxBNuFuBJZfe4/hCceRxLLNlcLe9Ig6DshZhDofBGg37JzLFDN37oyM foP33RngM0TapctBo0Lsvv1NtH6Lv4Dz0Zne4twQ= From: Umang Jain To: libcamera-devel@lists.libcamera.org Cc: Umang Jain Subject: [PATCH 1/2] pipeline: rkisp1: Use cached Request pointer Date: Thu, 18 Apr 2024 13:19:44 +0530 Message-ID: <20240418074945.47349-2-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240418074945.47349-1-umang.jain@ideasonboard.com> References: <20240418074945.47349-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 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" The Request pointer is cached in RkISP1FrameInfo. Use it directly instead of retrieving it via buffer->request(). Signed-off-by: Umang Jain --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index abb21968..5a6c9e1e 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -1261,7 +1261,7 @@ void PipelineHandlerRkISP1::bufferReady(FrameBuffer *buffer) return; const FrameMetadata &metadata = buffer->metadata(); - Request *request = buffer->request(); + Request *request = info->request; if (metadata.status != FrameMetadata::FrameCancelled) { /* From patchwork Thu Apr 18 07:49:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 19903 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 D9BA6C3213 for ; Thu, 18 Apr 2024 07:50:00 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 24D02633F8; Thu, 18 Apr 2024 09:50:00 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="k68XihdE"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BB69661B43 for ; Thu, 18 Apr 2024 09:49:57 +0200 (CEST) Received: from fedora.local (unknown [103.251.226.7]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3A82C27C; Thu, 18 Apr 2024 09:49:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1713426550; bh=/7wP6pvuxqVXiKfdt384YkEwRJHCCH3eBiCxe5CmJ4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k68XihdE6bIrfhu3lIpXYKwn4JyGwfZJiSQrCbO0oL36xxz/WT01Igtxk/TRBT3sU VGYmKKpCL/dpom6zVj80HDIFyKUiwCYO4HJkchD54cCcioCizEkDfLMszyOY6Ukte2 jU1cJAJ7PhKQ5wnijydzzYe0kBxlHV5gSO5Zb5YI= From: Umang Jain To: libcamera-devel@lists.libcamera.org Cc: Umang Jain Subject: [PATCH 2/2] libcamera: Fix output spelling error Date: Thu, 18 Apr 2024 13:19:45 +0530 Message-ID: <20240418074945.47349-3-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240418074945.47349-1-umang.jain@ideasonboard.com> References: <20240418074945.47349-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 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" There are two places where "output" is spelled as "ouput". Fix it. Signed-off-by: Umang Jain Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- include/libcamera/internal/converter/converter_v4l2_m2m.h | 2 +- utils/raspberrypi/ctt/ctt.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/libcamera/internal/converter/converter_v4l2_m2m.h b/include/libcamera/internal/converter/converter_v4l2_m2m.h index 815916d0..84fb485f 100644 --- a/include/libcamera/internal/converter/converter_v4l2_m2m.h +++ b/include/libcamera/internal/converter/converter_v4l2_m2m.h @@ -47,7 +47,7 @@ public: int configure(const StreamConfiguration &inputCfg, const std::vector> &outputCfg); - int exportBuffers(unsigned int ouput, unsigned int count, + int exportBuffers(unsigned int output, unsigned int count, std::vector> *buffers); int start(); diff --git a/utils/raspberrypi/ctt/ctt.py b/utils/raspberrypi/ctt/ctt.py index cd89f177..89159e63 100755 --- a/utils/raspberrypi/ctt/ctt.py +++ b/utils/raspberrypi/ctt/ctt.py @@ -350,7 +350,7 @@ class Camera: alsc_out = alsc_all(self, do_alsc_colour, plot) cal_cr_list, cal_cb_list, luminance_lut, av_corn = alsc_out """ - write ouput to json and finish if not do_alsc_colour + write output to json and finish if not do_alsc_colour """ if not do_alsc_colour: self.json['rpi.alsc']['luminance_lut'] = luminance_lut