Changeset 6d96102abf3f7ee6b569ea339017fc279dd107c0

Timestamp:

02/12/07 00:41:40 (1 year ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1196552500 +0000

git-parent:

[599cf09858843cd2cd97a022b942205c14184f0d]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1196552500 +0000

Message:

Don't fail launching the video device if a video control failed. Update the hue/saturation/brightness/contrast values in the callback before issue the video control. (I haven't been able to test yet due to lack of hardware)

Files:

• modules/access/v4l2.c (modified) (2 diffs)

modules/access/v4l2.c

@@ -1530 +1530 @@
-    VideoControlList( p_demux, i_fd );
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    /* Init vout Picture */
@@ -2423 +2422 @@
-
-    if( !strcmp( psz_var, "brightness" ) )
+    {
+        p_sys->i_brightness = newval.i_int;
-        return VideoControl( p_demux, i_fd,
-                    "brightness", V4L2_CID_BRIGHTNESS, p_sys->i_brightness );
+    }
-    else if( !strcmp( psz_var, "contrast" ) )
+    {
+        p_sys->i_contrast = newval.i_int;
-        return VideoControl( p_demux, i_fd,
-                    "contrast", V4L2_CID_CONTRAST, p_sys->i_contrast );
+    }
-    else if( !strcmp( psz_var, "saturation" ) )
+    {
+        p_sys->i_saturation = newval.i_int;
-        return VideoControl( p_demux, i_fd,
-                    "saturation", V4L2_CID_SATURATION, p_sys->i_saturation );
+    }
-    else if( !strcmp( psz_var, "hue" ) )
+    {
+        p_sys->i_hue = newval.i_int;
-        return VideoControl( p_demux, i_fd,
-                    "hue", V4L2_CID_HUE, p_sys->i_hue );
+    }
-    else
-        return VLC_EGENERIC;