summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--sys/v4l2/gstv4l2src.c4
-rw-r--r--sys/v4l2/v4l2src_calls.c4
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d69ac40..af60d665 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-22 Edgard Lima <edgard.lima@indt.org.br>
+
+ * 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 <thomas at apestaart dot org>
* configure.ac:
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index 39e35cbe..bf8a2dd4 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 f50c6478..2f46facf 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;
}