Jorijn van der Graaf
34cfc098d8
All checks were successful
image / image (push) Successful in 1h51m52s
Kernel config: CONFIG_VIDEO_OV13B10=m + CONFIG_VIDEO_DW9714=m — the camss core, CAMCC and CCI were already enabled; the sensor and VCM drivers were the only missing pieces. The camera carries themselves land via milos-linux combined-stable (merge of the 'camera' topic branch, nondescriptpointer's 5 patches, authorship preserved). libcamera: new temp/ aport overriding pmOS 99990.7.2-r1 with -r2, adding nondescriptpointer's OV13B10 sensor helper (gain = code/128, enables the software-ISP AGC/AWB) and sensor properties patches on top of the pmOS 0.7.2 APKBUILD. Patch sha512s re-recorded from the actual files (his APKBUILD diff carried stale hashes); all four patches verified to apply against the v0.7.2 tarball. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
From dc471142932b1f2b0bf596c3ae83dba8bd4b4021 Mon Sep 17 00:00:00 2001
|
|
From: Robert Mader <robert.mader@collabora.com>
|
|
Date: Mon, 6 May 2024 21:21:57 +0200
|
|
Subject: [PATCH 2/2] libcamera: simple: Skip hwISP formats if swISP is active
|
|
|
|
On devices like the Pinephone libcamera will advertise support for
|
|
formats provided by the HW ISP and the SW ISP at the same time. The
|
|
reason why we enable the SW ISP in the first place is, however, that the
|
|
HW ISP does not work reliable atm. Thus filter out formats from the HW
|
|
ISP when the SW ISP is enabled, to ensure we use the later.
|
|
|
|
Signed-off-by: Robert Mader <robert.mader@collabora.com>
|
|
---
|
|
src/libcamera/pipeline/simple/simple.cpp | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp
|
|
index 24538649c..b96b8b529 100644
|
|
--- a/src/libcamera/pipeline/simple/simple.cpp
|
|
+++ b/src/libcamera/pipeline/simple/simple.cpp
|
|
@@ -745,9 +745,7 @@ void SimpleCameraData::tryPipeline(unsigned int code, const Size &size)
|
|
config.outputFormats = swIsp_->formats(pixelFormat);
|
|
config.outputSizes = swIsp_->sizes(pixelFormat, format.size);
|
|
if (config.outputFormats.empty()) {
|
|
- /* Do not use swIsp for unsupported pixelFormat's. */
|
|
- config.outputFormats = { pixelFormat };
|
|
- config.outputSizes = config.captureSize;
|
|
+ continue;
|
|
}
|
|
} else {
|
|
config.outputFormats = { pixelFormat };
|
|
--
|
|
2.55.0
|
|
|