From patchwork Mon Mar 28 10:05:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 15569 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 45AB7C3256 for ; Mon, 28 Mar 2022 10:06:03 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 972BA65631; Mon, 28 Mar 2022 12:06:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1648461962; bh=fobxSYOca9n2xqEKbNJtunWSX+/5vXXf8PaEwvMuwf4=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=pGSYzPf/zAtn0qiZTf5M547tB5EyyaoHMmH7QpHZDvWk8Q9HOg0fON/ONPIip67iV VXpZC9Ut8RJksHYMBLvkj4C509Lj9kLHBEYA4lgkxChsPwtO5cPNEqaAKqSe6RB9Df Pwb+Kk4vyGxfvn/m7lEQKQhY03nDzmjph4ZQa/h/O2KaqAmIi4qsN6cgAb8JTUy6kl YSAIx/Zu0Oc0dtP6JjPmV8gL5mpbaJkNHgmjgyMrtuh0qy2L7X7VMHNN46DVvLthn9 dWugUmH+lWEPUjmygi6GWyn9U6JsUAgUqoVaCNaqdBjNYSRuIJKnI10uBm5elx+KYV c3kpIkrW6ARtA== Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3A18460135 for ; Mon, 28 Mar 2022 12:06:01 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="I2w2w5OV"; dkim-atps=neutral Received: by mail-wr1-x435.google.com with SMTP id h23so19578516wrb.8 for ; Mon, 28 Mar 2022 03:06:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=iypP3q+acGjWspBuWENRUV7LmQSI6M69OQXAEukl2vE=; b=I2w2w5OV7QbIFIuj/jakq5MxLsHrRL0boA8HCvkrm6pGeIUr3WQvu1MxtyrT18KWOQ K+ZLMFmtaKPDbyP8e7VRxjvaA2l5IOB/IAnNOGSauMuiXKGa8Ow90VjsNT/IxSmK1VrY Ydm92/S2FEHb84xVU9PTojJyxhl8QPvAIy3UYU7vBx+CMwPIyBmvGXAP1Yl0yWLLMzdp ReLrZ/Hwf13lNoJwt0nF5Lmzy4isej3AvhduCY8rNd4EDDnwaxdGPJ7clL2mvXlv5u8p oDU6ZuXaRp1cbc3blxN8x54lC8s4crNDuM4KPMbA8FIHrsvzfEqwILgbjs+TGQGjB4OV Y7PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=iypP3q+acGjWspBuWENRUV7LmQSI6M69OQXAEukl2vE=; b=7GaIom8DNpvjIPbaeGEgSzTbXFeR3aKfEzlxiJM52M4PLPNvQwpSletZ3z+0QlcNpX yRF9WNmNM2f/3VZ8xA+Cj8AP06v46G1WY6ReIZj2gZcX1AEjlJy6RGfWfZexYgy+XpEp E9vdt7+F7fIIO1DCCVPTGk7yLq6tYWD5369nXdq69mB4lTtQD3YDLvLB2Ufc0v4o63PY MxiLNzgEfqBpwUlJ04Kt1smf66PZ4x5jAX1Ti5eSs+vqBKxJiya5lJf9qgvedFZXfkm/ 05vpo331TVMJp/RZ7GHi4AeGBpJ7Y7lA1xDvDyppk60UbpRujrSX0uAELeFLTOvMMCVq Jnuw== X-Gm-Message-State: AOAM5320+b8qPvFiPWUzEEBo+wKFwRQH+9U/ghVDMTc+d1wHiICC8oOR kAnmXfb/4hGta9V/JzX0V7RB8hiZVoIQpA== X-Google-Smtp-Source: ABdhPJxLc7K65nplT4tAvScuXq8p8JjI+eduAKj2b6mtFU1j2pnM+d/LkWX14C0hfGKxBoRdbtfSrA== X-Received: by 2002:adf:a411:0:b0:205:c4e1:6ee6 with SMTP id d17-20020adfa411000000b00205c4e16ee6mr3617800wra.489.1648461960646; Mon, 28 Mar 2022 03:06:00 -0700 (PDT) Received: from pi4-davidp.pitowers.org ([2a00:1098:3142:14:e4a2:3070:eea4:e434]) by smtp.gmail.com with ESMTPSA id p14-20020a5d59ae000000b00203dcc87d39sm18928848wrr.54.2022.03.28.03.05.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 03:06:00 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Mon, 28 Mar 2022 11:05:44 +0100 Message-Id: <20220328100544.13477-1-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] ipa: raspberrypi: Correct some of the ControlInfo ranges and defaults 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-Patchwork-Original-From: David Plowman via libcamera-devel From: David Plowman Reply-To: David Plowman Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Some of the values were listed incorrectly. Specifically: ExposureValue: the range is now centred correctly on zero Brightness: the default value (0.0) is made explicit Contrast: the default value is corrected to be 1.0 Saturation: the default value is corrected to be 1.0 Signed-off-by: David Plowman Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Naushir Patuck --- include/libcamera/ipa/raspberrypi.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/libcamera/ipa/raspberrypi.h b/include/libcamera/ipa/raspberrypi.h index 7f705e49..6a56b008 100644 --- a/include/libcamera/ipa/raspberrypi.h +++ b/include/libcamera/ipa/raspberrypi.h @@ -34,13 +34,13 @@ static const ControlInfoMap Controls({ { &controls::AeMeteringMode, ControlInfo(controls::AeMeteringModeValues) }, { &controls::AeConstraintMode, ControlInfo(controls::AeConstraintModeValues) }, { &controls::AeExposureMode, ControlInfo(controls::AeExposureModeValues) }, - { &controls::ExposureValue, ControlInfo(0.0f, 16.0f) }, + { &controls::ExposureValue, ControlInfo(-8.0f, 8.0f, 0.0f) }, { &controls::AwbEnable, ControlInfo(false, true) }, { &controls::ColourGains, ControlInfo(0.0f, 32.0f) }, { &controls::AwbMode, ControlInfo(controls::AwbModeValues) }, - { &controls::Brightness, ControlInfo(-1.0f, 1.0f) }, - { &controls::Contrast, ControlInfo(0.0f, 32.0f) }, - { &controls::Saturation, ControlInfo(0.0f, 32.0f) }, + { &controls::Brightness, ControlInfo(-1.0f, 1.0f, 0.0f) }, + { &controls::Contrast, ControlInfo(0.0f, 32.0f, 1.0f) }, + { &controls::Saturation, ControlInfo(0.0f, 32.0f, 1.0f) }, { &controls::Sharpness, ControlInfo(0.0f, 16.0f, 1.0f) }, { &controls::ColourCorrectionMatrix, ControlInfo(-16.0f, 16.0f) }, { &controls::ScalerCrop, ControlInfo(Rectangle{}, Rectangle(65535, 65535, 65535, 65535), Rectangle{}) },