From c513855fb704c72a7028cc60b72399abb7324d60 Mon Sep 17 00:00:00 2001 From: Shengqi Yu Date: Sat, 6 May 2023 11:17:43 +0800 Subject: [PATCH] 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: --- subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c index 3fb3a77385..1c08b45943 100644 --- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c +++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c @@ -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 */