[vlc-devel] commit: Maemo: saner default resolution for V4L2 ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Oct  3 20:25:23 2009 +0300| [e3f2974d3dacb3081d477c5fcd5c6d8afc11e2e8] | committer: Rémi Denis-Courmont 

Maemo: saner default resolution for V4L2

Otherwise, we'd use the maximum (5Mpixels) which is a bit large for
video purposes. Also, 5Mpixels exceeds the capacity of the XVideo
overlay.

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

 modules/access/v4l2.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index 3d3448d..a308f16 100644
--- a/modules/access/v4l2.c
+++ b/modules/access/v4l2.c
@@ -257,6 +257,16 @@ static const char *const psz_tuner_audio_modes_list_text[] =
 #define V4L2_DEFAULT "/dev/video0"
 #define CFG_PREFIX "v4l2-"
 
+#ifdef HAVE_MAEMO
+# define DEFAULT_WIDTH	640
+# define DEFAULT_HEIGHT	492
+#endif
+
+#ifndef DEFAULT_WIDTH
+# define DEFAULT_WIDTH	(-1)
+# define DEFAULT_HEIGHT	(-1)
+#endif
+
 vlc_module_begin ()
     set_shortname( N_("Video4Linux2") )
     set_description( N_("Video4Linux2 input") )
@@ -276,9 +286,9 @@ vlc_module_begin ()
     add_integer( CFG_PREFIX "io", IO_METHOD_AUTO, NULL, IOMETHOD_TEXT,
                  IOMETHOD_LONGTEXT, true )
         change_integer_list( i_iomethod_list, psz_iomethod_list_text, NULL )
-    add_integer( CFG_PREFIX "width", -1, NULL, WIDTH_TEXT,
+    add_integer( CFG_PREFIX "width", DEFAULT_WIDTH, NULL, WIDTH_TEXT,
                 WIDTH_LONGTEXT, true )
-    add_integer( CFG_PREFIX "height", -1, NULL, HEIGHT_TEXT,
+    add_integer( CFG_PREFIX "height", DEFAULT_HEIGHT, NULL, HEIGHT_TEXT,
                 HEIGHT_LONGTEXT, true )
     add_string( CFG_PREFIX "aspect-ratio", "4:3", NULL, ASPECT_TEXT,
               ASPECT_LONGTEXT, true )