[Ffmpeg-cvslog] CVS: ffmpeg/libavformat v4l2.c,1.3,1.4

[Luca Abeni CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv26852/libavformat

Modified Files:
	v4l2.c 
Log Message:
Add support for drivers that can change the capture size on VIDIOC_S_FMT


Index: v4l2.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/v4l2.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- v4l2.c	28 Feb 2006 11:14:59 -0000	1.3
+++ v4l2.c	28 Feb 2006 11:28:09 -0000	1.4
@@ -148,17 +148,25 @@
     return fd;
 }
 
-static int device_init(int fd, int width, int height, int pix_fmt)
+static int device_init(int fd, int *width, int *height, int pix_fmt)
 {
     struct v4l2_format fmt;
+    int res;
 
     memset(&fmt, 0, sizeof(struct v4l2_format));
     fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-    fmt.fmt.pix.width = width;
-    fmt.fmt.pix.height = height;
+    fmt.fmt.pix.width = *width;
+    fmt.fmt.pix.height = *height;
     fmt.fmt.pix.pixelformat = pix_fmt;
     fmt.fmt.pix.field = V4L2_FIELD_INTERLACED;
-    return ioctl (fd, VIDIOC_S_FMT, &fmt);
+    res = ioctl(fd, VIDIOC_S_FMT, &fmt);
+    if ((*width != fmt.fmt.pix.width) || (*height != fmt.fmt.pix.height)) {
+        av_log(NULL, AV_LOG_INFO, "The V4L2 driver changed the video from %dx%d to %dx%d\n", *width, *height, fmt.fmt.pix.width, fmt.fmt.pix.height);
+        *width = fmt.fmt.pix.width;
+        *height = fmt.fmt.pix.height;
+    }
+
+    return res;
 }
 
 static int first_field(int fd)
@@ -418,13 +426,13 @@
     av_log(s1, AV_LOG_ERROR, "[%d]Capabilities: %x\n", s->fd, capabilities);
 
     desired_format = fmt_ff2v4l(ap->pix_fmt);
-    if (desired_format == 0 || (device_init(s->fd, width, height, desired_format) < 0)) {
+    if (desired_format == 0 || (device_init(s->fd, &width, &height, desired_format) < 0)) {
         int i, done;
 
         done = 0; i = 0;
         while (!done) {
             desired_format = fmt_conversion_table[i].v4l2_fmt;
-            if (device_init(s->fd, width, height, desired_format) < 0) {
+            if (device_init(s->fd, &width, &height, desired_format) < 0) {
                 desired_format = 0;
                 i++;
             } else {