f736e1e360
Rebase our downstream patches and drop the two included in the release. See https://gitlab.freedesktop.org/camera/libcamera/-/tags/v0.3.2 for release notes. [ci:skip-build]: already built successfully in CI
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
From 5b5a0f92969ad1972c6a9fd7a46ac8f4fedb9389 Mon Sep 17 00:00:00 2001
|
|
From: Robert Mader <robert.mader@collabora.com>
|
|
Date: Thu, 9 May 2024 21:07:07 +0200
|
|
Subject: [PATCH 2/4] libcamera: simple: Force-disable softwareISP for
|
|
millipixels
|
|
|
|
As the later uses libcamera and requires raw-streams to get passed
|
|
through. In the future, libcamera will likely support both - raw and
|
|
swIsp - at the same time.
|
|
---
|
|
src/libcamera/pipeline/simple/simple.cpp | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp
|
|
index 8ce8baea..08755b80 100644
|
|
--- a/src/libcamera/pipeline/simple/simple.cpp
|
|
+++ b/src/libcamera/pipeline/simple/simple.cpp
|
|
@@ -7,6 +7,7 @@
|
|
*/
|
|
|
|
#include <algorithm>
|
|
+#include <fstream>
|
|
#include <iterator>
|
|
#include <list>
|
|
#include <map>
|
|
@@ -1542,6 +1543,14 @@ bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)
|
|
|
|
swIspEnabled_ = info->swIspEnabled;
|
|
|
|
+ std::string comm_string;
|
|
+ std::ifstream("/proc/self/comm") >> comm_string;
|
|
+ if (comm_string == "millipixels") {
|
|
+ LOG(SimplePipeline, Warning)
|
|
+ << "Detected millipixels, disabling swIsp";
|
|
+ swIspEnabled_ = false;
|
|
+ }
|
|
+
|
|
/* Locate the sensors. */
|
|
std::vector<MediaEntity *> sensors = locateSensors(media);
|
|
if (sensors.empty()) {
|
|
--
|
|
2.46.1
|
|
|