[vlc-commits] v4l2 access: setup the picture format (like the v4l2 demux)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep  9 23:56:07 2012 +0300| [0c4e52ceefd38317803a09cdf5ce26bb783f67a7] | committer: Rémi Denis-Courmont

v4l2 access: setup the picture format (like the v4l2 demux)

If specific dimensions were specified, use that (like PVR).
Otherwise, try to find the best dimensions.

Previously, the current/default settings were always used.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0c4e52ceefd38317803a09cdf5ce26bb783f67a7
---

 modules/access/v4l2/access.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/access/v4l2/access.c b/modules/access/v4l2/access.c
index 07e4727..7e98786 100644
--- a/modules/access/v4l2/access.c
+++ b/modules/access/v4l2/access.c
@@ -114,9 +114,11 @@ int InitVideo (access_t *access, int fd, uint32_t caps)
         return -1;
     }
 
-    /* Print extra info */
-    msg_Dbg (access, "%d bytes maximum for complete image",
-             fmt.fmt.pix.sizeimage );
+    struct v4l2_streamparm parm;
+    if (SetupFormat (access, fd, fmt.fmt.pix.pixelformat, &fmt, &parm))
+        return -1;
+
+    msg_Dbg (access, "%"PRIu32" bytes for complete image", fmt.fmt.pix.sizeimage);
     /* Check interlacing */
     switch (fmt.fmt.pix.field)
     {