c54777db04
Rebase our downstream patches and drop the one included in the release. See https://gitlab.freedesktop.org/camera/libcamera/-/releases/v0.3.1 Notes: - The abi-compliance checker reports 100% binary and source compatibility, so this release does not change the SONAME. - qcam has been ported to QT6. - This release has some notable improvements to the PPP/rkisp1, however lower frame rates might be encountered sometimes. This will hopefully get fixed in the imx258 driver in Linux 6.11. - The swISP got some fixes but nothing major apart from the patch we were already carrying. [ci:skip-build]: already built successfully in CI
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
From 12d11a74d3a9bf1a3e5ecf31e15219363925bb60 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 4/4] 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.
|
|
---
|
|
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 c2658703..27ac1522 100644
|
|
--- a/src/libcamera/pipeline/simple/simple.cpp
|
|
+++ b/src/libcamera/pipeline/simple/simple.cpp
|
|
@@ -652,9 +652,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.45.2
|
|
|