mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-16 21:36:35 +00:00
v4l2object: fix some errors in probe_caps_for_fromat
1, there is a mistake when print stepwise.max_height, fix it 2, modify the calculation of width and height under the step wise condition Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4672>
This commit is contained in:
parent
a7f6b878e0
commit
c513855fb7
1 changed files with 5 additions and 6 deletions
|
@ -2873,20 +2873,19 @@ gst_v4l2_object_probe_caps_for_format (GstV4l2Object * v4l2object,
|
|||
size.stepwise.min_height);
|
||||
GST_DEBUG_OBJECT (v4l2object->dbg_obj, "max width: %d",
|
||||
size.stepwise.max_width);
|
||||
GST_DEBUG_OBJECT (v4l2object->dbg_obj, "min height: %d",
|
||||
GST_DEBUG_OBJECT (v4l2object->dbg_obj, "max height: %d",
|
||||
size.stepwise.max_height);
|
||||
GST_DEBUG_OBJECT (v4l2object->dbg_obj, "step width: %d",
|
||||
size.stepwise.step_width);
|
||||
GST_DEBUG_OBJECT (v4l2object->dbg_obj, "step height: %d",
|
||||
size.stepwise.step_height);
|
||||
|
||||
w = MAX (size.stepwise.min_width, 1);
|
||||
h = MAX (size.stepwise.min_height, 1);
|
||||
maxw = MIN (size.stepwise.max_width, G_MAXINT);
|
||||
maxh = MIN (size.stepwise.max_height, G_MAXINT);
|
||||
|
||||
step_w = MAX (size.stepwise.step_width, 1);
|
||||
step_h = MAX (size.stepwise.step_height, 1);
|
||||
w = MAX (size.stepwise.min_width, step_w);
|
||||
h = MAX (size.stepwise.min_height, step_h);
|
||||
maxw = MIN (size.stepwise.max_width, G_MAXINT);
|
||||
maxh = MIN (size.stepwise.max_height, G_MAXINT);
|
||||
|
||||
/* FIXME: check for sanity and that min/max are multiples of the steps */
|
||||
|
||||
|
|
Loading…
Reference in a new issue