[vlc-commits] V4L2: remove exposure control, this is for still cameras

Rémi Denis-Courmont git at videolan.org
Sun Oct 23 12:04:06 CEST 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct 23 12:03:24 2011 +0200| [b663f4481b91cb87c5bbd55f9ce8348d2cf214bc] | committer: Rémi Denis-Courmont

V4L2: remove exposure control, this is for still cameras

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

 modules/access/v4l2/controls.c |    1 -
 modules/access/v4l2/video.c    |    9 ++-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/access/v4l2/controls.c b/modules/access/v4l2/controls.c
index d163629..2bfbabb 100644
--- a/modules/access/v4l2/controls.c
+++ b/modules/access/v4l2/controls.c
@@ -56,7 +56,6 @@ static const vlc_v4l2_ctrl_name_t controls[] =
     { "red-balance", V4L2_CID_RED_BALANCE },
     { "blue-balance", V4L2_CID_BLUE_BALANCE },
     { "gamma", V4L2_CID_GAMMA },
-    { "exposure", V4L2_CID_EXPOSURE },
     { "autogain", V4L2_CID_AUTOGAIN },
     { "gain", V4L2_CID_GAIN },
     { "hflip", V4L2_CID_HFLIP },
diff --git a/modules/access/v4l2/video.c b/modules/access/v4l2/video.c
index 10ffee4..60aeedc 100644
--- a/modules/access/v4l2/video.c
+++ b/modules/access/v4l2/video.c
@@ -120,12 +120,9 @@
 #define GAMMA_TEXT N_( "Gamma" )
 #define GAMMA_LONGTEXT N_( \
     "Gamma adjust." )
-#define EXPOSURE_TEXT N_( "Exposure" )
-#define EXPOSURE_LONGTEXT N_( \
-    "Exposure." )
-#define AUTOGAIN_TEXT N_( "Automatic gain/exposure" )
+#define AUTOGAIN_TEXT N_( "Automatic gain" )
 #define AUTOGAIN_LONGTEXT N_( \
-    "Automatically set the video gain or exposure." )
+    "Automatically set the video gain." )
 #define GAIN_TEXT N_( "Gain" )
 #define GAIN_LONGTEXT N_( \
     "Picture gain." )
@@ -392,8 +389,6 @@ vlc_module_begin ()
                  BLUEBALANCE_LONGTEXT, true )
     add_integer( CFG_PREFIX "gamma", -1, GAMMA_TEXT,
                  GAMMA_LONGTEXT, true )
-    add_integer( CFG_PREFIX "exposure", -1, EXPOSURE_TEXT,
-                 EXPOSURE_LONGTEXT, true )
     add_integer( CFG_PREFIX "autogain", -1, AUTOGAIN_TEXT,
                  AUTOGAIN_LONGTEXT, true )
         change_integer_list( tristate_vlc, tristate_user )



More information about the vlc-commits mailing list