From patchwork Mon Jun 28 12:23:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 12726 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 2B5ADC3220 for ; Mon, 28 Jun 2021 12:23:32 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E1A3B684D9; Mon, 28 Jun 2021 14:23:31 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="XYbTlbAA"; dkim-atps=neutral Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2B2A1684D6 for ; Mon, 28 Jun 2021 14:23:28 +0200 (CEST) Received: by mail-wm1-x32e.google.com with SMTP id v20-20020a05600c2154b02901dcefb16af0so11035937wml.5 for ; Mon, 28 Jun 2021 05:23:28 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=cI1Bogz/D11yXqXoXsnxUcCBS7ZdZXJpXnGGD6l2Ekk=; b=XYbTlbAA7zuVLJLSGbk85QaxOL1QVOszocd6TbZaqFRk970jwI1kLrkBUl5MN8dGJA 8tfhJ2mXcvPkYU6kc/21jA5mB/8VZY0N6U7eBkSB1nqxv54fvTW1+nPunOPAMPUbms1i dghi1rDpWgclX+iTAVVgF5yPDFV2kju48rbQ3eoICthrSnHn2eD/IwyfihknW0BHOJ1V iHviEPdiPKcOixibb/62GOFMEeMXPrlQrZreV0k6mKQNwRhrgNPjTYdebeaNGOYsfp5j Rme5RagR67wWWsRC8Jqc+aNPpg4pYSl59KpXBBccnAAy3pU9Bq6tZJVNVMAa6exXVpv2 9Yrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cI1Bogz/D11yXqXoXsnxUcCBS7ZdZXJpXnGGD6l2Ekk=; b=mT8lgtf7wrLCvenH7u2R+/lVldtSg+kBqVsMo/UhL52Yum2smvtsTpcg7RW/HrSt+q 49NuJooPdyhU04w2exYFc7TkNtLBib4X071iGzOX52Ku9BSF0L/S6+UOEqmlnIbP6pJs GtOqSMNMToiYj3Gk4G61jByfpe4rLpVt70bE6CdwWf+0zCRqagFVEkfbHQz283UEwozC QELY58VpSotKQ9JgnOcvW+P21X7Yx08rrPFg1QeDgaF4tIMxeX5yPXAUEqDSSdMTup6E 173hACs+usXP23qdwPNCBRODWKmBpCSskHGH/GBtCf5tkG2huUpGP2c2ClpUAQ4WyzdY B/+w== X-Gm-Message-State: AOAM531oP0T0bdY3pnszKxlHRU5MhdYA6BAXwYO/i3vIBoW9Cg3CJohl SUt1z/0raicMBnJN+u+tCNY5ASnlA5qneA== X-Google-Smtp-Source: ABdhPJxaY+GBy/0/wN8u6hniFGKql8z1A5WdgMnuoYzMGp3iE20VkZXcvnO/xejgd1qzoxPlpFX1gQ== X-Received: by 2002:a7b:cb03:: with SMTP id u3mr26866640wmj.119.1624883007696; Mon, 28 Jun 2021 05:23:27 -0700 (PDT) Received: from pi4-davidp.pitowers.org ([2a00:1098:3142:14:1ce1:9965:4328:89c4]) by smtp.gmail.com with ESMTPSA id s62sm19606542wms.13.2021.06.28.05.23.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 05:23:27 -0700 (PDT) From: David Plowman To: libcamera-devel@lists.libcamera.org Date: Mon, 28 Jun 2021 13:23:24 +0100 Message-Id: <20210628122324.14541-4-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210628122324.14541-1-david.plowman@raspberrypi.com> References: <20210628122324.14541-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 3/3] libcamera: ipa: raspberrypi: Add support for ov9281 sensor 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 necessary tuning file and CamHelper is added for the ov9281 sensor. The ov9281 is a 1280x800 monochrome global shutter sensor. To enable it, please add dtoverlay=ov9281 to the /boot/config.txt file and reboot the Pi. Signed-off-by: David Plowman Reviewed-by: Naushir Patuck Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/ipa/raspberrypi/cam_helper_ov9281.cpp | 65 ++++++++++++++++ src/ipa/raspberrypi/data/meson.build | 1 + src/ipa/raspberrypi/data/ov9281.json | 92 +++++++++++++++++++++++ src/ipa/raspberrypi/meson.build | 1 + 4 files changed, 159 insertions(+) create mode 100644 src/ipa/raspberrypi/cam_helper_ov9281.cpp create mode 100644 src/ipa/raspberrypi/data/ov9281.json diff --git a/src/ipa/raspberrypi/cam_helper_ov9281.cpp b/src/ipa/raspberrypi/cam_helper_ov9281.cpp new file mode 100644 index 00000000..54091f83 --- /dev/null +++ b/src/ipa/raspberrypi/cam_helper_ov9281.cpp @@ -0,0 +1,65 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* + * Copyright (C) 2021, Raspberry Pi (Trading) Limited + * + * cam_helper_ov9281.cpp - camera information for ov9281 sensor + */ + +#include + +#include "cam_helper.hpp" + +using namespace RPiController; + +class CamHelperOv9281 : public CamHelper +{ +public: + CamHelperOv9281(); + uint32_t GainCode(double gain) const override; + double Gain(uint32_t gain_code) const override; + void GetDelays(int &exposure_delay, int &gain_delay, + int &vblank_delay) const override; + +private: + /* + * Smallest difference between the frame length and integration time, + * in units of lines. + */ + static constexpr int frameIntegrationDiff = 4; +}; + +/* + * OV9281 doesn't output metadata, so we have to use the "unicam parser" which + * works by counting frames. + */ + +CamHelperOv9281::CamHelperOv9281() + : CamHelper(nullptr, frameIntegrationDiff) +{ +} + +uint32_t CamHelperOv9281::GainCode(double gain) const +{ + return static_cast(gain * 16.0); +} + +double CamHelperOv9281::Gain(uint32_t gain_code) const +{ + return static_cast(gain_code) / 16.0; +} + +void CamHelperOv9281::GetDelays(int &exposure_delay, int &gain_delay, + int &vblank_delay) const +{ + /* The driver appears to behave as follows: */ + exposure_delay = 2; + gain_delay = 2; + vblank_delay = 2; +} + +static CamHelper *Create() +{ + return new CamHelperOv9281(); +} + +static RegisterCamHelper reg("ov9281", &Create); diff --git a/src/ipa/raspberrypi/data/meson.build b/src/ipa/raspberrypi/data/meson.build index 92ad3272..adf89dbd 100644 --- a/src/ipa/raspberrypi/data/meson.build +++ b/src/ipa/raspberrypi/data/meson.build @@ -4,6 +4,7 @@ conf_files = files([ 'imx219.json', 'imx290.json', 'imx477.json', + 'ov9281.json', 'ov5647.json', 'se327m12.json', 'uncalibrated.json', diff --git a/src/ipa/raspberrypi/data/ov9281.json b/src/ipa/raspberrypi/data/ov9281.json new file mode 100644 index 00000000..ecd262be --- /dev/null +++ b/src/ipa/raspberrypi/data/ov9281.json @@ -0,0 +1,92 @@ +{ + "rpi.black_level": + { + "black_level": 4096 + }, + "rpi.lux": + { + "reference_shutter_speed": 2000, + "reference_gain": 1.0, + "reference_aperture": 1.0, + "reference_lux": 800, + "reference_Y": 20000 + }, + "rpi.noise": + { + "reference_constant": 0, + "reference_slope": 2.5 + }, + "rpi.sdn": + { + }, + "rpi.agc": + { + "metering_modes": + { + "centre-weighted": { + "weights": [4, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0] + } + }, + "exposure_modes": + { + "normal": + { + "shutter": [ 100, 15000, 30000, 60000, 120000 ], + "gain": [ 1.0, 2.0, 3.0, 4.0, 6.0 ] + } + }, + "constraint_modes": + { + "normal": + [ + { "bound": "LOWER", "q_lo": 0.98, "q_hi": 1.0, "y_target": [ 0, 0.4, 1000, 0.4 ] } + ] + }, + "y_target": [ 0, 0.16, 1000, 0.165, 10000, 0.17 ] + }, + "rpi.alsc": + { + "n_iter": 0, + "luminance_strength": 1.0, + "corner_strength": 1.5 + }, + "rpi.contrast": + { + "ce_enable": 0, + "gamma_curve": [ + 0, 0, + 1024, 5040, + 2048, 9338, + 3072, 12356, + 4096, 15312, + 5120, 18051, + 6144, 20790, + 7168, 23193, + 8192, 25744, + 9216, 27942, + 10240, 30035, + 11264, 32005, + 12288, 33975, + 13312, 35815, + 14336, 37600, + 15360, 39168, + 16384, 40642, + 18432, 43379, + 20480, 45749, + 22528, 47753, + 24576, 49621, + 26624, 51253, + 28672, 52698, + 30720, 53796, + 32768, 54876, + 36864, 57012, + 40960, 58656, + 45056, 59954, + 49152, 61183, + 53248, 62355, + 57344, 63419, + 61440, 64476, + 65535, 65535 + ] + } +} diff --git a/src/ipa/raspberrypi/meson.build b/src/ipa/raspberrypi/meson.build index 230356d3..714ac27e 100644 --- a/src/ipa/raspberrypi/meson.build +++ b/src/ipa/raspberrypi/meson.build @@ -22,6 +22,7 @@ rpi_ipa_sources = files([ 'cam_helper_imx219.cpp', 'cam_helper_imx290.cpp', 'cam_helper_imx477.cpp', + 'cam_helper_ov9281.cpp', 'controller/controller.cpp', 'controller/histogram.cpp', 'controller/algorithm.cpp',