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

v4l2: handle min/max for continuous frame interval correctly

Browse source 
v4l2 frame intervals instead of frame rates, which is basically the
inverse. For the most part, this is already handled correctly and
numerator and denominator are swapped accordingly.

However, the minimim frame interval is the maximum frame rate so those
need to be swapped as well.

Without this, the minimum frame rate is larger than the maximum frame
rate for v4l2 devices that define a continuous frame interval.
This commit is contained in:
Michael Olbrich 2024-11-26 10:24:12 +01:00 • committed by Wim Taymans
parent 89993a3cc6
commit 669f53946e
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
spa/plugins/v4l2/v4l2-utils.c
View file

@ -476,17 +476,17 @@ filter_framerate(struct v4l2_frmivalenum *frmival,
frmival->stepwise.step.denominator *= step->num;
frmival->stepwise.step.numerator *= step->denom;
if (compare_fraction(&frmival->stepwise.max, min) < 0 ||
compare_fraction(&frmival->stepwise.min, max) > 0)
if (compare_fraction(&frmival->stepwise.min, min) < 0 ||
compare_fraction(&frmival->stepwise.max, max) > 0)
return false;
if (compare_fraction(&frmival->stepwise.min, min) < 0) {
frmival->stepwise.min.denominator = min->num;
frmival->stepwise.min.numerator = min->denom;
if (compare_fraction(&frmival->stepwise.max, min) < 0) {
frmival->stepwise.max.denominator = min->num;
frmival->stepwise.max.numerator = min->denom;
}
if (compare_fraction(&frmival->stepwise.max, max) > 0) {
frmival->stepwise.max.denominator = max->num;
frmival->stepwise.max.numerator = max->denom;
if (compare_fraction(&frmival->stepwise.min, max) > 0) {
frmival->stepwise.min.denominator = max->num;
frmival->stepwise.min.numerator = max->denom;
}
} else
return false;
@ -778,9 +778,9 @@ do_frmsize_filter:
if (errno == EINVAL || errno == ENOTTY) {
if (port->frmival.index == 0) {
port->frmival.type = V4L2_FRMIVAL_TYPE_CONTINUOUS;
port->frmival.stepwise.min.denominator = 1;
port->frmival.stepwise.min.denominator = 120;
port->frmival.stepwise.min.numerator = 1;
port->frmival.stepwise.max.denominator = 120;
port->frmival.stepwise.max.denominator = 1;
port->frmival.stepwise.max.numerator = 1;
goto do_frminterval_filter;
}
@ -855,12 +855,12 @@ do_frminterval_filter:
port->frmival.type == V4L2_FRMIVAL_TYPE_STEPWISE) {
if (n_fractions == 0)
spa_pod_builder_fraction(&b.b, 25, 1);
spa_pod_builder_fraction(&b.b,
port->frmival.stepwise.min.denominator,
port->frmival.stepwise.min.numerator);
spa_pod_builder_fraction(&b.b,
port->frmival.stepwise.max.denominator,
port->frmival.stepwise.max.numerator);
spa_pod_builder_fraction(&b.b,
port->frmival.stepwise.min.denominator,
port->frmival.stepwise.min.numerator);
if (port->frmival.type == V4L2_FRMIVAL_TYPE_CONTINUOUS) {
choice->body.type = SPA_CHOICE_Range;