mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: pick better default format

Browse source 
Pick the first format in the list of supported as something closest
to 640x480 instead of the lowest possible resolution.

Applications that don't suggest a default size will then get something
more sensible than a poster frame.
This commit is contained in:
Wim Taymans 2022-10-25 12:10:42 +02:00
parent b35983eb7e
commit 7182145435
1 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

30
spa/plugins/libcamera/libcamera-utils.cpp
View file

@ -32,6 +32,7 @@
#include <errno.h> #include <errno.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <poll.h> #include <poll.h>
#include <limits.h>
#include <linux/media.h> #include <linux/media.h>
@ -238,6 +239,14 @@ static const struct format_info *find_format_info_by_media_type(uint32_t type,
return NULL; return NULL;
} }
static int score_size(Size &a, Size &b)
{
int x, y;
x = (int)a.width - (int)b.width;
y = (int)a.height - (int)b.height;
return x * x + y * y;
}
static int static int
spa_libcamera_enum_format(struct impl *impl, struct port *port, int seq, spa_libcamera_enum_format(struct impl *impl, struct port *port, int seq,
uint32_t start, uint32_t num, const struct spa_pod *filter) uint32_t start, uint32_t num, const struct spa_pod *filter)
@ -249,7 +258,7 @@ spa_libcamera_enum_format(struct impl *impl, struct port *port, int seq,
struct spa_pod_frame f[2]; struct spa_pod_frame f[2];
struct spa_result_node_params result; struct spa_result_node_params result;
struct spa_pod *fmt; struct spa_pod *fmt;
uint32_t count = 0; uint32_t i, count = 0, num_sizes;
PixelFormat format; PixelFormat format;
Size frameSize; Size frameSize;
SizeRange sizeRange = SizeRange(); SizeRange sizeRange = SizeRange();
@ -284,8 +293,23 @@ next_fmt:
goto next_fmt; goto next_fmt;
} }
if (port->size_index < formats.sizes(format).size()) { num_sizes = formats.sizes(format).size();
frameSize = formats.sizes(format)[port->size_index]; if (num_sizes > 0 && port->size_index <= num_sizes) {
if (port->size_index == 0) {
Size wanted = Size(640, 480), test;
int score, best = INT_MAX;
for (i = 0; i < num_sizes; i++) {
test = formats.sizes(format)[i];
score = score_size(wanted, test);
if (score < best) {
best = score;
frameSize = test;
}
}
}
else {
frameSize = formats.sizes(format)[port->size_index - 1];
}
} else if (port->size_index < 1) { } else if (port->size_index < 1) {
sizeRange = formats.range(format); sizeRange = formats.range(format);
if (sizeRange.hStep == 0 || sizeRange.vStep == 0) { if (sizeRange.hStep == 0 || sizeRange.vStep == 0) {