1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
From 06add438e4fc53faca6e016bd582df0e7ac5a271 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Wed, 24 Jan 2024 20:44:29 +0100
Subject: [PATCH 3/3] libcamera: debayer_cpu: Make the minimum size 1280x720
pipewire + firefox default to what looks like 640x480 if we export
the entire supported cropping range. Hardcode 720p as minsize for now.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
src/libcamera/software_isp/debayer_cpu.cpp | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp
index 10ea29b1..a354138b 100644
--- a/src/libcamera/software_isp/debayer_cpu.cpp
+++ b/src/libcamera/software_isp/debayer_cpu.cpp
@@ -805,10 +805,17 @@ SizeRange DebayerCpu::sizes(PixelFormat inputFormat, const Size &inputSize)
return {};
}
- return SizeRange(Size(patternSize.width, patternSize.height),
- Size((inputSize.width - 2 * patternSize.width) & ~(patternSize.width - 1),
- (inputSize.height - 2 * borderHeight) & ~(patternSize.height - 1)),
- patternSize.width, patternSize.height);
+ /*
+ * pipewire + firefox default to what looks like 640x480
+ * if we export the entire supported cropping range.
+ * Hardcode 720p as minsize for now. Minsize should be
+ * Size(patternSize.width, patternSize.height)
+ */
+ unsigned int w = (inputSize.width - 2 * patternSize.width) & ~(patternSize.width - 1);
+ unsigned int h = (inputSize.height - 2 * patternSize.height) & ~(patternSize.height - 1);
+ return SizeRange(Size(std::min(w, 1280u), std::min(h, 720u)),
+ Size(w, h),
+ patternSize.width, patternSize.height);
}
} /* namespace libcamera */
--
2.45.2
|
