From d3c716b694b065ca6884499cb75f808f21a07f26 Mon Sep 17 00:00:00 2001 From: Edgard Lima Date: Tue, 22 Aug 2006 20:39:26 +0000 Subject: [PATCH] Fixed query size to work with drivers that uses intermediate step like "width * height" to find closest size. Original commit message from CVS: Fixed query size to work with drivers that uses intermediate step like "width * height" to find closest size. --- ChangeLog | 7 +++++++ sys/v4l2/gstv4l2src.c | 4 ++-- sys/v4l2/v4l2src_calls.c | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d69ac4..af60d66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-08-22 Edgard Lima + + * sys/v4l2/gstv4l2src.c: (gst_v4l2src_get_size_limits) + * sys/v4l2/v4l2src_calls.c: (gst_v4l2src_fixate) + Fixed query size to work with drivers that uses intermediate step + like "width * height" to find closest size. + 2006-08-21 Thomas Vander Stichele * configure.ac: diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index 39e35cb..bf8a2dd 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -399,8 +399,8 @@ gst_v4l2src_fixate (GstPad * pad, GstCaps * caps) structure = gst_caps_get_structure (caps, i); const GValue *v; - gst_structure_fixate_field_nearest_int (structure, "width", G_MAXINT); - gst_structure_fixate_field_nearest_int (structure, "height", G_MAXINT); + gst_structure_fixate_field_nearest_int (structure, "width", 4096); + gst_structure_fixate_field_nearest_int (structure, "height", 4096); gst_structure_fixate_field_nearest_fraction (structure, "framerate", 15, 2); v = gst_structure_get_value (structure, "format"); diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c index f50c647..2f46fac 100644 --- a/sys/v4l2/v4l2src_calls.c +++ b/sys/v4l2/v4l2src_calls.c @@ -592,8 +592,8 @@ gst_v4l2src_get_size_limits (GstV4l2Src * v4l2src, GST_LOG_OBJECT (v4l2src, "got min size %dx%d", fmt.fmt.pix.width, fmt.fmt.pix.height); - fmt.fmt.pix.width = G_MAXINT; - fmt.fmt.pix.height = G_MAXINT; + fmt.fmt.pix.width = 4096; + fmt.fmt.pix.height = 4096; if (ioctl (v4l2src->v4l2object->video_fd, VIDIOC_TRY_FMT, &fmt) < 0) { return FALSE; } -- 2.7.4