mirror of
https://gitlab.postmarketos.org/postmarketOS/pmaports.git
synced 2025-07-16 10:15:09 +03:00
5677fe9d6d
See https://gitlab.freedesktop.org/camera/libcamera/-/releases/v0.5.1 Additional changes: - Adopt build to commit "ipa: Move IPA installations to a subdir" - Backport a fix for the simple pipeline Part-of: https://gitlab.postmarketos.org/postmarketos/pmaports/-/merge_requests/6608 [ci:skip-build]: already built successfully in CI
33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
From 21410150b394022ca188c16caa084a6d1c0e9b05 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 05/13] 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 f4b49b1ab..c19ce17d4 100644
|
|
--- a/src/libcamera/pipeline/simple/simple.cpp
|
|
+++ b/src/libcamera/pipeline/simple/simple.cpp
|
|
@@ -721,9 +721,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.49.0
|
|
|