From patchwork Thu Oct 31 09:49:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 21783 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 5E589C3292 for ; Thu, 31 Oct 2024 09:52:53 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id EC2CF653AA; Thu, 31 Oct 2024 10:52:47 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="gclw96W/"; dkim-atps=neutral Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 90566618BF for ; Thu, 31 Oct 2024 10:52:43 +0100 (CET) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-43155a6c3a6so1119225e9.1 for ; Thu, 31 Oct 2024 02:52:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1730368363; x=1730973163; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gF1CRK5658pUZV0uzy7B6zhR0H6HtzA+lmLE8dz6KjA=; b=gclw96W/7CaT7qDizkE+cbMrMwEvaAzUfQ4KN7VW2UV2chMq2Uo20+6u0p/XcZHYUO oW4L6hw+Jr+o9VR0huTj38NnJDKUpa+E/XaPMGSN2HS/1V+gS3YI8p7aevFVwrbytc4y xt+BEUnbne/5b3ZxQBiZQj7mbwBBZNSDFyAYuqz92Z1h3hfbOmq7LSPG2a3XdctseH2+ o5QaodNQnjogcY79npXyYX8EWIhOVOHoYoB2gBlPIKMg9rUzFSWWTC54ozRcUMf0dZGC /+R0o4TuXd6OMXzlcSq3/3UsWrh/OdtLY2IXNofmtUz2wSLFvhsHen08y8Ux2ZKgw4yb wolw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730368363; x=1730973163; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gF1CRK5658pUZV0uzy7B6zhR0H6HtzA+lmLE8dz6KjA=; b=tQDnj+3XK0sg2PZgvQxh3/aCjQsaLWonual4gzNobkTKoE21tXx6wLDRQ2+qF/AS4q wuzpaKW+pD45DmtNFRTSOhMpkgyJ52ybq4P/LTugQZEh/PTPk3uawn4ATQ1x1l5wZi4o T7KNZTIuHBAsyUJJg8S9vCk0aSL0qaCiAocn8Odf0t6INJvM4bAm4jKcA3ZIMgEzC9Q+ gWHx40r60Q9+YzmeZMIhYtpiQwDVWm2trlcGuPYVX7f8/kD6XISmhgi+KLVINzY2rcQg zaARLFsJ2uHSRZ/Ds63Ucab/rezFw+zkwW8a5TWQRubYdzHxTsVAg6Hqtaakf9A7xYBa kOng== X-Gm-Message-State: AOJu0YwWRKI6XrPzkrp0Lr+3TGonKAX4DOA5C7pGTJxUfM23/cIxealD DkohPX6Pe2f+nxG1XsSggInb8ErkUXdZryWfi/Pr1+njAb0lVvTPipxU0vSx6YGGZTNOOF2Dt/0 S X-Google-Smtp-Source: AGHT+IGnZKl1k4SGUoAE/692lZgoEpCE4p/mc7gB1jKD+YfgwS/3NtI5UCiRzSsZjvD6qSeN0o+Deg== X-Received: by 2002:a05:600c:4f0c:b0:431:4983:e8fe with SMTP id 5b1f17b1804b1-4319ad41c64mr69708655e9.9.1730368362846; Thu, 31 Oct 2024 02:52:42 -0700 (PDT) Received: from naush-laptop.pitowers.org ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4327d6983c2sm19789835e9.42.2024.10.31.02.52.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Oct 2024 02:52:42 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Cc: Naushir Patuck , Laurent Pinchart , Jacopo Mondi Subject: [PATCH v4 2/7] pipeline: rpi: Remove CameraData::scalerCrop_ Date: Thu, 31 Oct 2024 09:49:52 +0000 Message-Id: <20241031094957.18471-3-naush@raspberrypi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241031094957.18471-1-naush@raspberrypi.com> References: <20241031094957.18471-1-naush@raspberrypi.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" Do not cache the scalerCrop_ parameter. The cached value is used to update the request metadata, but since this is not an expensive operation (and can only occur once per frame), caching it is of limited value. This will simplify logic in a future commit where we can specify a crop per-output stream. Signed-off-by: Naushir Patuck Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- .../pipeline/rpi/common/pipeline_base.cpp | 18 +++--------------- .../pipeline/rpi/common/pipeline_base.h | 1 - 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp index 3041fd1ed9fd..11f1bfd4a5da 100644 --- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp +++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp @@ -544,12 +544,6 @@ int PipelineHandlerBase::configure(Camera *camera, CameraConfiguration *config) return ret; } - /* - * Set the scaler crop to the value we are using (scaled to native sensor - * coordinates). - */ - data->scalerCrop_ = data->scaleIspCrop(data->ispCrop_); - /* * Update the ScalerCropMaximum to the correct value for this camera mode. * For us, it's the same as the "analogue crop". @@ -569,7 +563,8 @@ int PipelineHandlerBase::configure(Camera *camera, CameraConfiguration *config) /* Add the ScalerCrop control limits based on the current mode. */ Rectangle ispMinCrop = data->scaleIspCrop(Rectangle(data->ispMinCropSize_)); - ctrlMap[&controls::ScalerCrop] = ControlInfo(ispMinCrop, data->sensorInfo_.analogCrop, data->scalerCrop_); + ctrlMap[&controls::ScalerCrop] = ControlInfo(ispMinCrop, data->sensorInfo_.analogCrop, + data->scaleIspCrop(data->ispCrop_)); data->controlInfo_ = ControlInfoMap(std::move(ctrlMap), result.controlInfo.idmap()); @@ -1320,13 +1315,6 @@ void CameraData::applyScalerCrop(const ControlList &controls) if (ispCrop != ispCrop_) { ispCrop_ = ispCrop; platformSetIspCrop(); - - /* - * Also update the ScalerCrop in the metadata with what we actually - * used. But we must first rescale that from ISP (camera mode) pixels - * back into sensor native pixels. - */ - scalerCrop_ = scaleIspCrop(ispCrop_); } } } @@ -1483,7 +1471,7 @@ void CameraData::fillRequestMetadata(const ControlList &bufferControls, Request request->metadata().set(controls::SensorTimestamp, bufferControls.get(controls::SensorTimestamp).value_or(0)); - request->metadata().set(controls::ScalerCrop, scalerCrop_); + request->metadata().set(controls::ScalerCrop, scaleIspCrop(ispCrop_)); } } /* namespace libcamera */ diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.h b/src/libcamera/pipeline/rpi/common/pipeline_base.h index f9cecf70f179..5161c16e518f 100644 --- a/src/libcamera/pipeline/rpi/common/pipeline_base.h +++ b/src/libcamera/pipeline/rpi/common/pipeline_base.h @@ -134,7 +134,6 @@ public: /* For handling digital zoom. */ IPACameraSensorInfo sensorInfo_; Rectangle ispCrop_; /* crop in ISP (camera mode) pixels */ - Rectangle scalerCrop_; /* crop in sensor native pixels */ Size ispMinCropSize_; unsigned int dropFrameCount_;