From 2bde6e420571c6dc0ff25246620b4c987987f6be Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede@redhat.com> Date: Tue, 19 Dec 2023 15:45:51 +0100 Subject: [PATCH 20/21] ov01a1s HACK Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- src/libcamera/camera_sensor.cpp | 6 ++++++ src/libcamera/software_isp/debayer_cpu.cpp | 8 ++++++++ src/libcamera/software_isp/swstats_cpu.cpp | 4 ++++ 3 files changed, 18 insertions(+) diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp index f19f72ea..7ad4b9ef 100644 --- a/src/libcamera/camera_sensor.cpp +++ b/src/libcamera/camera_sensor.cpp @@ -34,6 +34,9 @@ namespace libcamera { +// HACK HACK +bool is_ov01a1s = false; + LOG_DEFINE_CATEGORY(CameraSensor) /** @@ -426,6 +429,9 @@ int CameraSensor::initProperties() model_ = subdev_->model(); properties_.set(properties::Model, utils::toAscii(model_)); + if (model_ == "ov01a1s") + is_ov01a1s = true; + /* Generate a unique ID for the sensor. */ int ret = generateId(); if (ret) diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp index 3be3cdfe..d6599805 100644 --- a/src/libcamera/software_isp/debayer_cpu.cpp +++ b/src/libcamera/software_isp/debayer_cpu.cpp @@ -23,6 +23,7 @@ namespace libcamera { +extern bool is_ov01a1s; /** * \class DebayerCpu * \brief Class for debayering on the CPU @@ -262,6 +263,9 @@ int DebayerCpu::getInputConfig(PixelFormat inputFormat, DebayerInputConfig &conf BayerFormat bayerFormat = BayerFormat::fromPixelFormat(inputFormat); + if (is_ov01a1s) + bayerFormat.order = BayerFormat::IGIG_GBGR_IGIG_GRGB; + if ((bayerFormat.bitDepth == 8 || bayerFormat.bitDepth == 10 || bayerFormat.bitDepth == 12) && bayerFormat.packing == BayerFormat::Packing::None && isStandardBayerOrder(bayerFormat.order)) { @@ -330,7 +334,11 @@ int DebayerCpu::setDebayerFunctions(PixelFormat inputFormat, PixelFormat outputF BayerFormat bayerFormat = BayerFormat::fromPixelFormat(inputFormat); + if (is_ov01a1s) + bayerFormat.order = BayerFormat::IGIG_GBGR_IGIG_GRGB; + xShift_ = 0; + swapRedBlueGains_ = false; switch (outputFormat) { diff --git a/src/libcamera/software_isp/swstats_cpu.cpp b/src/libcamera/software_isp/swstats_cpu.cpp index be310f56..cda1894a 100644 --- a/src/libcamera/software_isp/swstats_cpu.cpp +++ b/src/libcamera/software_isp/swstats_cpu.cpp @@ -19,6 +19,7 @@ namespace libcamera { +extern bool is_ov01a1s; /** * \class SwStatsCpu * \brief Class for gathering statistics on the CPU @@ -271,6 +272,9 @@ int SwStatsCpu::configure(const StreamConfiguration &inputCfg) BayerFormat bayerFormat = BayerFormat::fromPixelFormat(inputCfg.pixelFormat); + if (is_ov01a1s) + bayerFormat.order = BayerFormat::IGIG_GBGR_IGIG_GRGB; + if (bayerFormat.packing == BayerFormat::Packing::None && setupStandardBayerOrder(bayerFormat.order) == 0) { switch (bayerFormat.bitDepth) { -- 2.43.2