From patchwork Thu Jul 9 08:41:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 8703 X-Patchwork-Delegate: jacopo@jmondi.org 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 F048CBD790 for ; Thu, 9 Jul 2020 08:38:17 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 90C70611A9; Thu, 9 Jul 2020 10:38:17 +0200 (CEST) Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7C29061158 for ; Thu, 9 Jul 2020 10:38:15 +0200 (CEST) Received: from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101]) (Authenticated sender: jacopo@jmondi.org) by relay11.mail.gandi.net (Postfix) with ESMTPSA id E2996100015; Thu, 9 Jul 2020 08:38:14 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Thu, 9 Jul 2020 10:41:20 +0200 Message-Id: <20200709084128.5316-13-jacopo@jmondi.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200709084128.5316-1-jacopo@jmondi.org> References: <20200709084128.5316-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 12/20] libcamera: ipu3: Always use the maximum frame size 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 requirement of having the ImgU output height 32 pixels smaller than the input frame produced by the CIO2 makes it complicated to re-adjust the sensor produced size after the alignement has been applied. To simplify the procedure, always ask for the full frame size from the CIO2 unit. Signed-off-by: Jacopo Mondi --- src/libcamera/pipeline/ipu3/ipu3.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index d07f1a7b5ae8..feabffe641e1 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -156,8 +156,6 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate() unsigned int rawCount = 0; unsigned int outCount = 0; Size yuvSize; - Size size; - for (const StreamConfiguration &cfg : config_) { const PixelFormatInfo &info = PixelFormatInfo::info(cfg.pixelFormat); @@ -174,11 +172,6 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate() if (cfg.size > yuvSize) yuvSize = cfg.size; } - - if (cfg.size.width > size.width) - size.width = cfg.size.width; - if (cfg.size.height > size.height) - size.height = cfg.size.height; } if (rawCount > 1 || outCount > 2) { LOG(IPU3, Error) @@ -189,10 +182,13 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate() } /* Generate raw configuration from CIO2. */ - cio2Configuration_ = data_->cio2_.generateConfiguration(size); + Size sensorSize = data_->cio2_.sensor()->resolution(); + cio2Configuration_ = data_->cio2_.generateConfiguration(sensorSize); if (!cio2Configuration_.pixelFormat.isValid()) return Invalid; + LOG(IPU3, Debug) << "CIO2 configuration: " << cio2Configuration_.toString(); + /* * Adjust the configurations if needed and assign streams while * iterating them.