From patchwork Wed Nov 20 14:27:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 22039 X-Patchwork-Delegate: paul.elder@ideasonboard.com 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 0FA3DC0F2A for ; Wed, 20 Nov 2024 14:28:38 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 89F5465F7B; Wed, 20 Nov 2024 15:28:37 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="URB7ZGYw"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3FCC265F68 for ; Wed, 20 Nov 2024 15:28:34 +0100 (CET) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:bbd:82cc:f3f3:e12e]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 204C155A; Wed, 20 Nov 2024 15:28:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1732112896; bh=6uRcnGEjc4jL4hQG7g77jgv3Oxl7V7O6yXmgl+XIGXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=URB7ZGYw29wo9+nyeE5GaW5uySO1hbnJuGDhy2uH73QNrFXkcDIsNX3BIn+COdZsc eJgA7bk0lb+ktW/HkA2aiby+PXBl54M2yJIusAb0HAHQPpl2lBnmP/Ct9Pxm4z+FMJ CMDFXc/vB6ejuawV8aTFy0IVg2dgBNPUUUew9Ja4= From: Stefan Klug To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug , Laurent Pinchart Subject: [PATCH v3 8/9] rkisp1: Use Matrix class from libcamera Date: Wed, 20 Nov 2024 15:27:55 +0100 Message-ID: <20241120142807.2093301-9-stefan.klug@ideasonboard.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241120142807.2093301-1-stefan.klug@ideasonboard.com> References: <20241120142807.2093301-1-stefan.klug@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" Use the Matrix class from libcamera/internal in the rkisp IPA so that the libipa one can be dropped later. Signed-off-by: Stefan Klug Reviewed-by: Laurent Pinchart --- src/ipa/rkisp1/algorithms/ccm.h | 3 ++- src/ipa/rkisp1/ipa_context.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ipa/rkisp1/algorithms/ccm.h b/src/ipa/rkisp1/algorithms/ccm.h index 46a1416e6be5..a5d9a9a45e5d 100644 --- a/src/ipa/rkisp1/algorithms/ccm.h +++ b/src/ipa/rkisp1/algorithms/ccm.h @@ -9,8 +9,9 @@ #include +#include "libcamera/internal/matrix.h" + #include "libipa/interpolator.h" -#include "libipa/matrix.h" #include "algorithm.h" diff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h index 7b93a9e9461d..12b37d1c73b0 100644 --- a/src/ipa/rkisp1/ipa_context.h +++ b/src/ipa/rkisp1/ipa_context.h @@ -21,10 +21,10 @@ #include #include "libcamera/internal/debug_controls.h" +#include "libcamera/internal/matrix.h" #include #include -#include namespace libcamera {